From 214492cd088740fb9af0401321d138dea82c7ada Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Fri, 9 Jul 2021 12:41:13 +0100
Subject: [PATCH 001/833] Use the current standard Closure base.js

The version of base.js we have been using is a cut-down copy of an older
version, stripped of everything that wasn't strictly needed for Blockly.

We now need things that were previously stripped out, so restore the
current version from
https://github.com/google/closure-library/blob/master/closure/goog/base.js
as of commit 5cb5e81 (2021-06-04).

We can always strip out unused sections again in future - once we know
which sections those are.
---
 closure/goog/base.js | 3843 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 3597 insertions(+), 246 deletions(-)

diff --git a/closure/goog/base.js b/closure/goog/base.js
index 52a15dbcb..310db20f7 100644
--- a/closure/goog/base.js
+++ b/closure/goog/base.js
@@ -1,16 +1,8 @@
-// Copyright 2006 The Closure Library Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS-IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/**
+ * @license
+ * Copyright The Closure Library Authors.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 /**
  * @fileoverview Bootstrap for the Google JS Library (Closure).
@@ -26,6 +18,12 @@
  */
 
 
+/**
+ * @define {boolean} Overridden to true by the compiler.
+ */
+var COMPILED = false;
+
+
 /**
  * Base namespace for the Closure library.  Checks to see goog is already
  * defined in the current scope before assigning to prevent clobbering if
@@ -57,17 +55,65 @@ goog.global =
     // For in-page browser environments and workers.
     self;
 
+
+/**
+ * A hook for overriding the define values in uncompiled mode.
+ *
+ * In uncompiled mode, `CLOSURE_UNCOMPILED_DEFINES` may be defined before
+ * loading base.js.  If a key is defined in `CLOSURE_UNCOMPILED_DEFINES`,
+ * `goog.define` will use the value instead of the default value.  This
+ * allows flags to be overwritten without compilation (this is normally
+ * accomplished with the compiler's "define" flag).
+ *
+ * Example:
+ * <pre>
+ *   var CLOSURE_UNCOMPILED_DEFINES = {'goog.DEBUG': false};
+ * </pre>
+ *
+ * @type {Object<string, (string|number|boolean)>|undefined}
+ */
+goog.global.CLOSURE_UNCOMPILED_DEFINES;
+
+
+/**
+ * A hook for overriding the define values in uncompiled or compiled mode,
+ * like CLOSURE_UNCOMPILED_DEFINES but effective in compiled code.  In
+ * uncompiled code CLOSURE_UNCOMPILED_DEFINES takes precedence.
+ *
+ * Also unlike CLOSURE_UNCOMPILED_DEFINES the values must be number, boolean or
+ * string literals or the compiler will emit an error.
+ *
+ * While any @define value may be set, only those set with goog.define will be
+ * effective for uncompiled code.
+ *
+ * Example:
+ * <pre>
+ *   var CLOSURE_DEFINES = {'goog.DEBUG': false} ;
+ * </pre>
+ *
+ * @type {Object<string, (string|number|boolean)>|undefined}
+ */
+goog.global.CLOSURE_DEFINES;
+
+
 /**
  * Builds an object structure for the provided namespace path, ensuring that
  * names that already exist are not overwritten. For example:
  * "a.b.c" -> a = {};a.b={};a.b.c={};
  * Used by goog.provide and goog.exportSymbol.
- * @param {string} name name of the object that this file defines.
+ * @param {string} name The name of the object that this file defines.
+ * @param {*=} object The object to expose at the end of the path.
+ * @param {boolean=} overwriteImplicit If object is set and a previous call
+ *     implicitly constructed the namespace given by name, this parameter
+ *     controls whether object should overwrite the implicitly constructed
+ *     namespace or be merged into it. Defaults to false.
+ * @param {?Object=} objectToExportTo The object to add the path to; if this
+ *     field is not specified, its value defaults to `goog.global`.
  * @private
  */
-goog.exportPath_ = function(name) {
+goog.exportPath_ = function(name, object, overwriteImplicit, objectToExportTo) {
   var parts = name.split('.');
-  var cur = goog.global;
+  var cur = objectToExportTo || goog.global;
 
   // Internet Explorer exhibits strange behavior when throwing errors from
   // methods externed in this manner.  See the testExportSymbolExceptions in
@@ -77,7 +123,24 @@ goog.exportPath_ = function(name) {
   }
 
   for (var part; parts.length && (part = parts.shift());) {
-    if (cur[part] && cur[part] !== Object.prototype[part]) {
+    if (!parts.length && object !== undefined) {
+      if (!overwriteImplicit && goog.isObject(object) &&
+          goog.isObject(cur[part])) {
+        // Merge properties on object (the input parameter) with the existing
+        // implicitly defined namespace, so as to not clobber previously
+        // defined child namespaces.
+        for (var prop in object) {
+          if (object.hasOwnProperty(prop)) {
+            cur[part][prop] = object[prop];
+          }
+        }
+      } else {
+        // Either there is no existing implicit namespace, or overwriteImplicit
+        // is set to true, so directly assign object (the input parameter) to
+        // the namespace.
+        cur[part] = object;
+      }
+    } else if (cur[part] && cur[part] !== Object.prototype[part]) {
       cur = cur[part];
     } else {
       cur = cur[part] = {};
@@ -85,6 +148,152 @@ goog.exportPath_ = function(name) {
   }
 };
 
+
+/**
+ * Defines a named value. In uncompiled mode, the value is retrieved from
+ * CLOSURE_DEFINES or CLOSURE_UNCOMPILED_DEFINES if the object is defined and
+ * has the property specified, and otherwise used the defined defaultValue.
+ * When compiled the default can be overridden using the compiler options or the
+ * value set in the CLOSURE_DEFINES object. Returns the defined value so that it
+ * can be used safely in modules. Note that the value type MUST be either
+ * boolean, number, or string.
+ *
+ * @param {string} name The distinguished name to provide.
+ * @param {T} defaultValue
+ * @return {T} The defined value.
+ * @template T
+ */
+goog.define = function(name, defaultValue) {
+  var value = defaultValue;
+  if (!COMPILED) {
+    var uncompiledDefines = goog.global.CLOSURE_UNCOMPILED_DEFINES;
+    var defines = goog.global.CLOSURE_DEFINES;
+    if (uncompiledDefines &&
+        // Anti DOM-clobbering runtime check (b/37736576).
+        /** @type {?} */ (uncompiledDefines).nodeType === undefined &&
+        Object.prototype.hasOwnProperty.call(uncompiledDefines, name)) {
+      value = uncompiledDefines[name];
+    } else if (
+        defines &&
+        // Anti DOM-clobbering runtime check (b/37736576).
+        /** @type {?} */ (defines).nodeType === undefined &&
+        Object.prototype.hasOwnProperty.call(defines, name)) {
+      value = defines[name];
+    }
+  }
+  return value;
+};
+
+
+/**
+ * @define {number} Integer year indicating the set of browser features that are
+ * guaranteed to be present.  This is defined to include exactly features that
+ * work correctly on all "modern" browsers that are stable on January 1 of the
+ * specified year.  For example,
+ * ```js
+ * if (goog.FEATURESET_YEAR >= 2019) {
+ *   // use APIs known to be available on all major stable browsers Jan 1, 2019
+ * } else {
+ *   // polyfill for older browsers
+ * }
+ * ```
+ * This is intended to be the primary define for removing
+ * unnecessary browser compatibility code (such as ponyfills and workarounds),
+ * and should inform the default value for most other defines:
+ * ```js
+ * const ASSUME_NATIVE_PROMISE =
+ *     goog.define('ASSUME_NATIVE_PROMISE', goog.FEATURESET_YEAR >= 2016);
+ * ```
+ *
+ * The default assumption is that IE9 is the lowest supported browser, which was
+ * first available Jan 1, 2012.
+ *
+ * TODO(user): Reference more thorough documentation when it's available.
+ */
+goog.FEATURESET_YEAR = goog.define('goog.FEATURESET_YEAR', 2012);
+
+
+/**
+ * @define {boolean} DEBUG is provided as a convenience so that debugging code
+ * that should not be included in a production. It can be easily stripped
+ * by specifying --define goog.DEBUG=false to the Closure Compiler aka
+ * JSCompiler. For example, most toString() methods should be declared inside an
+ * "if (goog.DEBUG)" conditional because they are generally used for debugging
+ * purposes and it is difficult for the JSCompiler to statically determine
+ * whether they are used.
+ */
+goog.DEBUG = goog.define('goog.DEBUG', true);
+
+
+/**
+ * @define {string} LOCALE defines the locale being used for compilation. It is
+ * used to select locale specific data to be compiled in js binary. BUILD rule
+ * can specify this value by "--define goog.LOCALE=<locale_name>" as a compiler
+ * option.
+ *
+ * Take into account that the locale code format is important. You should use
+ * the canonical Unicode format with hyphen as a delimiter. Language must be
+ * lowercase, Language Script - Capitalized, Region - UPPERCASE.
+ * There are few examples: pt-BR, en, en-US, sr-Latin-BO, zh-Hans-CN.
+ *
+ * See more info about locale codes here:
+ * http://www.unicode.org/reports/tr35/#Unicode_Language_and_Locale_Identifiers
+ *
+ * For language codes you should use values defined by ISO 693-1. See it here
+ * http://www.w3.org/WAI/ER/IG/ert/iso639.htm. There is only one exception from
+ * this rule: the Hebrew language. For legacy reasons the old code (iw) should
+ * be used instead of the new code (he).
+ *
+ */
+goog.LOCALE = goog.define('goog.LOCALE', 'en');  // default to en
+
+
+/**
+ * This method is intended to be used for bookkeeping purposes.  We would
+ * like to distinguish uses of goog.LOCALE used for code stripping purposes
+ * and uses of goog.LOCALE for other uses (such as URL parameters).
+ *
+ * This allows us to ban direct uses of goog.LOCALE and to ensure that all
+ * code has been transformed to our new localization build scheme.
+ *
+ * @return {string}
+ *
+ */
+goog.getLocale = function() {
+  return goog.LOCALE;
+};
+
+
+/**
+ * @define {boolean} Whether this code is running on trusted sites.
+ *
+ * On untrusted sites, several native functions can be defined or overridden by
+ * external libraries like Prototype, Datejs, and JQuery and setting this flag
+ * to false forces closure to use its own implementations when possible.
+ *
+ * If your JavaScript can be loaded by a third party site and you are wary about
+ * relying on non-standard implementations, specify
+ * "--define goog.TRUSTED_SITE=false" to the compiler.
+ */
+goog.TRUSTED_SITE = goog.define('goog.TRUSTED_SITE', true);
+
+
+/**
+ * @define {boolean} Whether code that calls {@link goog.setTestOnly} should
+ *     be disallowed in the compilation unit.
+ */
+goog.DISALLOW_TEST_ONLY_CODE =
+    goog.define('goog.DISALLOW_TEST_ONLY_CODE', COMPILED && !goog.DEBUG);
+
+
+/**
+ * @define {boolean} Whether to use a Chrome app CSP-compliant method for
+ *     loading scripts via goog.require. @see appendScriptSrcNode_.
+ */
+goog.ENABLE_CHROME_APP_SAFE_SCRIPT_LOADING =
+    goog.define('goog.ENABLE_CHROME_APP_SAFE_SCRIPT_LOADING', false);
+
+
 /**
  * Defines a namespace in Closure.
  *
@@ -106,27 +315,199 @@ goog.exportPath_ = function(name) {
  * @see goog.module
  * @param {string} name Namespace provided by this file in the form
  *     "goog.package.part".
+ * deprecated Use goog.module (see b/159289405)
  */
 goog.provide = function(name) {
-  // Ensure that the same namespace isn't provided twice.
-  // A goog.module/goog.provide maps a goog.require to a specific file
-  if (goog.isProvided_(name)) {
-    throw Error('Namespace "' + name + '" already declared.');
+  if (goog.isInModuleLoader_()) {
+    throw new Error('goog.provide cannot be used within a module.');
   }
-
-  delete goog.implicitNamespaces_[name];
-
-  var namespace = name;
-  while ((namespace = namespace.substring(0, namespace.lastIndexOf('.')))) {
-    if (goog.getObjectByName(namespace)) {
-      break;
+  if (!COMPILED) {
+    // Ensure that the same namespace isn't provided twice.
+    // A goog.module/goog.provide maps a goog.require to a specific file
+    if (goog.isProvided_(name)) {
+      throw new Error('Namespace "' + name + '" already declared.');
     }
-    goog.implicitNamespaces_[namespace] = true;
   }
 
-  goog.exportPath_(name);
+  goog.constructNamespace_(name);
 };
 
+
+/**
+ * @param {string} name Namespace provided by this file in the form
+ *     "goog.package.part".
+ * @param {?Object=} object The object to embed in the namespace.
+ * @param {boolean=} overwriteImplicit If object is set and a previous call
+ *     implicitly constructed the namespace given by name, this parameter
+ *     controls whether opt_obj should overwrite the implicitly constructed
+ *     namespace or be merged into it. Defaults to false.
+ * @private
+ */
+goog.constructNamespace_ = function(name, object, overwriteImplicit) {
+  if (!COMPILED) {
+    delete goog.implicitNamespaces_[name];
+
+    var namespace = name;
+    while ((namespace = namespace.substring(0, namespace.lastIndexOf('.')))) {
+      if (goog.getObjectByName(namespace)) {
+        break;
+      }
+      goog.implicitNamespaces_[namespace] = true;
+    }
+  }
+
+  goog.exportPath_(name, object, overwriteImplicit);
+};
+
+
+/**
+ * According to the CSP3 spec a nonce must be a valid base64 string.
+ * @see https://www.w3.org/TR/CSP3/#grammardef-base64-value
+ * @private @const
+ */
+goog.NONCE_PATTERN_ = /^[\w+/_-]+[=]{0,2}$/;
+
+
+/**
+ * Returns CSP nonce, if set for any script tag.
+ * @param {?Window=} opt_window The window context used to retrieve the nonce.
+ *     Defaults to global context.
+ * @return {string} CSP nonce or empty string if no nonce is present.
+ * @private
+ */
+goog.getScriptNonce_ = function(opt_window) {
+  var doc = (opt_window || goog.global).document;
+  var script = doc.querySelector && doc.querySelector('script[nonce]');
+  if (script) {
+    // Try to get the nonce from the IDL property first, because browsers that
+    // implement additional nonce protection features (currently only Chrome) to
+    // prevent nonce stealing via CSS do not expose the nonce via attributes.
+    // See https://github.com/whatwg/html/issues/2369
+    var nonce = script['nonce'] || script.getAttribute('nonce');
+    if (nonce && goog.NONCE_PATTERN_.test(nonce)) {
+      return nonce;
+    }
+  }
+  return '';
+};
+
+
+/**
+ * Module identifier validation regexp.
+ * Note: This is a conservative check, it is very possible to be more lenient,
+ *   the primary exclusion here is "/" and "\" and a leading ".", these
+ *   restrictions are intended to leave the door open for using goog.require
+ *   with relative file paths rather than module identifiers.
+ * @private
+ */
+goog.VALID_MODULE_RE_ = /^[a-zA-Z_$][a-zA-Z0-9._$]*$/;
+
+
+/**
+ * Defines a module in Closure.
+ *
+ * Marks that this file must be loaded as a module and claims the namespace.
+ *
+ * A namespace may only be defined once in a codebase. It may be defined using
+ * goog.provide() or goog.module().
+ *
+ * goog.module() has three requirements:
+ * - goog.module may not be used in the same file as goog.provide.
+ * - goog.module must be the first statement in the file.
+ * - only one goog.module is allowed per file.
+ *
+ * When a goog.module annotated file is loaded, it is enclosed in
+ * a strict function closure. This means that:
+ * - any variables declared in a goog.module file are private to the file
+ * (not global), though the compiler is expected to inline the module.
+ * - The code must obey all the rules of "strict" JavaScript.
+ * - the file will be marked as "use strict"
+ *
+ * NOTE: unlike goog.provide, goog.module does not declare any symbols by
+ * itself. If declared symbols are desired, use
+ * goog.module.declareLegacyNamespace().
+ *
+ *
+ * See the public goog.module proposal: http://goo.gl/Va1hin
+ *
+ * @param {string} name Namespace provided by this file in the form
+ *     "goog.package.part", is expected but not required.
+ * @return {void}
+ */
+goog.module = function(name) {
+  if (typeof name !== 'string' || !name ||
+      name.search(goog.VALID_MODULE_RE_) == -1) {
+    throw new Error('Invalid module identifier');
+  }
+  if (!goog.isInGoogModuleLoader_()) {
+    throw new Error(
+        'Module ' + name + ' has been loaded incorrectly. Note, ' +
+        'modules cannot be loaded as normal scripts. They require some kind of ' +
+        'pre-processing step. You\'re likely trying to load a module via a ' +
+        'script tag or as a part of a concatenated bundle without rewriting the ' +
+        'module. For more info see: ' +
+        'https://github.com/google/closure-library/wiki/goog.module:-an-ES6-module-like-alternative-to-goog.provide.');
+  }
+  if (goog.moduleLoaderState_.moduleName) {
+    throw new Error('goog.module may only be called once per module.');
+  }
+
+  // Store the module name for the loader.
+  goog.moduleLoaderState_.moduleName = name;
+  if (!COMPILED) {
+    // Ensure that the same namespace isn't provided twice.
+    // A goog.module/goog.provide maps a goog.require to a specific file
+    if (goog.isProvided_(name)) {
+      throw new Error('Namespace "' + name + '" already declared.');
+    }
+    delete goog.implicitNamespaces_[name];
+  }
+};
+
+
+/**
+ * @param {string} name The module identifier.
+ * @return {?} The module exports for an already loaded module or null.
+ *
+ * Note: This is not an alternative to goog.require, it does not
+ * indicate a hard dependency, instead it is used to indicate
+ * an optional dependency or to access the exports of a module
+ * that has already been loaded.
+ * @suppress {missingProvide}
+ */
+goog.module.get = function(name) {
+  return goog.module.getInternal_(name);
+};
+
+
+/**
+ * @param {string} name The module identifier.
+ * @return {?} The module exports for an already loaded module or null.
+ * @private
+ */
+goog.module.getInternal_ = function(name) {
+  if (!COMPILED) {
+    if (name in goog.loadedModules_) {
+      return goog.loadedModules_[name].exports;
+    } else if (!goog.implicitNamespaces_[name]) {
+      var ns = goog.getObjectByName(name);
+      return ns != null ? ns : null;
+    }
+  }
+  return null;
+};
+
+
+/**
+ * Types of modules the debug loader can load.
+ * @enum {string}
+ */
+goog.ModuleType = {
+  ES6: 'es6',
+  GOOG: 'goog'
+};
+
+
 /**
  * @private {?{
  *   moduleName: (string|undefined),
@@ -136,32 +517,210 @@ goog.provide = function(name) {
  */
 goog.moduleLoaderState_ = null;
 
+
 /**
- * Check if the given name has been goog.provided. This will return false for
- * names that are available only as implicit namespaces.
- * @param {string} name name of the object to look for.
- * @return {boolean} Whether the name has been provided.
  * @private
+ * @return {boolean} Whether a goog.module or an es6 module is currently being
+ *     initialized.
  */
-goog.isProvided_ = function(name) {
-  return (!goog.implicitNamespaces_[name] &&
-       goog.isDefAndNotNull(goog.getObjectByName(name)));
+goog.isInModuleLoader_ = function() {
+  return goog.isInGoogModuleLoader_() || goog.isInEs6ModuleLoader_();
 };
 
-/**
- * Namespaces implicitly defined by goog.provide. For example,
- * goog.provide('goog.events.Event') implicitly declares that 'goog' and
- * 'goog.events' must be namespaces.
- *
- * @type {!Object<string, (boolean|undefined)>}
- * @private
- */
-goog.implicitNamespaces_ = {};
 
-// NOTE: We add goog.module as an implicit namespace as goog.module is defined
-// here and because the existing module package has not been moved yet out of
-// the goog.module namespace. This satisfies both the debug loader and
-// ahead-of-time dependency management.
+/**
+ * @private
+ * @return {boolean} Whether a goog.module is currently being initialized.
+ */
+goog.isInGoogModuleLoader_ = function() {
+  return !!goog.moduleLoaderState_ &&
+      goog.moduleLoaderState_.type == goog.ModuleType.GOOG;
+};
+
+
+/**
+ * @private
+ * @return {boolean} Whether an es6 module is currently being initialized.
+ */
+goog.isInEs6ModuleLoader_ = function() {
+  var inLoader = !!goog.moduleLoaderState_ &&
+      goog.moduleLoaderState_.type == goog.ModuleType.ES6;
+
+  if (inLoader) {
+    return true;
+  }
+
+  var jscomp = goog.global['$jscomp'];
+
+  if (jscomp) {
+    // jscomp may not have getCurrentModulePath if this is a compiled bundle
+    // that has some of the runtime, but not all of it. This can happen if
+    // optimizations are turned on so the unused runtime is removed but renaming
+    // and Closure pass are off (so $jscomp is still named $jscomp and the
+    // goog.provide/require calls still exist).
+    if (typeof jscomp.getCurrentModulePath != 'function') {
+      return false;
+    }
+
+    // Bundled ES6 module.
+    return !!jscomp.getCurrentModulePath();
+  }
+
+  return false;
+};
+
+
+/**
+ * Provide the module's exports as a globally accessible object under the
+ * module's declared name.  This is intended to ease migration to goog.module
+ * for files that have existing usages.
+ * @suppress {missingProvide}
+ */
+goog.module.declareLegacyNamespace = function() {
+  if (!COMPILED && !goog.isInGoogModuleLoader_()) {
+    throw new Error(
+        'goog.module.declareLegacyNamespace must be called from ' +
+        'within a goog.module');
+  }
+  if (!COMPILED && !goog.moduleLoaderState_.moduleName) {
+    throw new Error(
+        'goog.module must be called prior to ' +
+        'goog.module.declareLegacyNamespace.');
+  }
+  goog.moduleLoaderState_.declareLegacyNamespace = true;
+};
+
+
+/**
+ * Associates an ES6 module with a Closure module ID so that is available via
+ * goog.require. The associated ID  acts like a goog.module ID - it does not
+ * create any global names, it is merely available via goog.require /
+ * goog.module.get / goog.forwardDeclare / goog.requireType. goog.require and
+ * goog.module.get will return the entire module as if it was import *'d. This
+ * allows Closure files to reference ES6 modules for the sake of migration.
+ *
+ * @param {string} namespace
+ * @suppress {missingProvide}
+ */
+goog.declareModuleId = function(namespace) {
+  if (!COMPILED) {
+    if (!goog.isInEs6ModuleLoader_()) {
+      throw new Error(
+          'goog.declareModuleId may only be called from ' +
+          'within an ES6 module');
+    }
+    if (goog.moduleLoaderState_ && goog.moduleLoaderState_.moduleName) {
+      throw new Error(
+          'goog.declareModuleId may only be called once per module.');
+    }
+    if (namespace in goog.loadedModules_) {
+      throw new Error(
+          'Module with namespace "' + namespace + '" already exists.');
+    }
+  }
+  if (goog.moduleLoaderState_) {
+    // Not bundled - debug loading.
+    goog.moduleLoaderState_.moduleName = namespace;
+  } else {
+    // Bundled - not debug loading, no module loader state.
+    var jscomp = goog.global['$jscomp'];
+    if (!jscomp || typeof jscomp.getCurrentModulePath != 'function') {
+      throw new Error(
+          'Module with namespace "' + namespace +
+          '" has been loaded incorrectly.');
+    }
+    var exports = jscomp.require(jscomp.getCurrentModulePath());
+    goog.loadedModules_[namespace] = {
+      exports: exports,
+      type: goog.ModuleType.ES6,
+      moduleId: namespace
+    };
+  }
+};
+
+
+/**
+ * Marks that the current file should only be used for testing, and never for
+ * live code in production.
+ *
+ * In the case of unit tests, the message may optionally be an exact namespace
+ * for the test (e.g. 'goog.stringTest'). The linter will then ignore the extra
+ * provide (if not explicitly defined in the code).
+ *
+ * @param {string=} opt_message Optional message to add to the error that's
+ *     raised when used in production code.
+ */
+goog.setTestOnly = function(opt_message) {
+  if (goog.DISALLOW_TEST_ONLY_CODE) {
+    opt_message = opt_message || '';
+    throw new Error(
+        'Importing test-only code into non-debug environment' +
+        (opt_message ? ': ' + opt_message : '.'));
+  }
+};
+
+
+/**
+ * Forward declares a symbol. This is an indication to the compiler that the
+ * symbol may be used in the source yet is not required and may not be provided
+ * in compilation.
+ *
+ * The most common usage of forward declaration is code that takes a type as a
+ * function parameter but does not need to require it. By forward declaring
+ * instead of requiring, no hard dependency is made, and (if not required
+ * elsewhere) the namespace may never be required and thus, not be pulled
+ * into the JavaScript binary. If it is required elsewhere, it will be type
+ * checked as normal.
+ *
+ * Before using goog.forwardDeclare, please read the documentation at
+ * https://github.com/google/closure-compiler/wiki/Bad-Type-Annotation to
+ * understand the options and tradeoffs when working with forward declarations.
+ *
+ * @param {string} name The namespace to forward declare in the form of
+ *     "goog.package.part".
+ * @deprecated See go/noforwarddeclaration, Use `goog.requireType` instead.
+ */
+goog.forwardDeclare = function(name) {};
+
+
+/**
+ * Forward declare type information. Used to assign types to goog.global
+ * referenced object that would otherwise result in unknown type references
+ * and thus block property disambiguation.
+ */
+goog.forwardDeclare('Document');
+goog.forwardDeclare('HTMLScriptElement');
+goog.forwardDeclare('XMLHttpRequest');
+
+
+if (!COMPILED) {
+  /**
+   * Check if the given name has been goog.provided. This will return false for
+   * names that are available only as implicit namespaces.
+   * @param {string} name name of the object to look for.
+   * @return {boolean} Whether the name has been provided.
+   * @private
+   */
+  goog.isProvided_ = function(name) {
+    return (name in goog.loadedModules_) ||
+        (!goog.implicitNamespaces_[name] && goog.getObjectByName(name) != null);
+  };
+
+  /**
+   * Namespaces implicitly defined by goog.provide. For example,
+   * goog.provide('goog.events.Event') implicitly declares that 'goog' and
+   * 'goog.events' must be namespaces.
+   *
+   * @type {!Object<string, (boolean|undefined)>}
+   * @private
+   */
+  goog.implicitNamespaces_ = {'goog.module': true};
+
+  // NOTE: We add goog.module as an implicit namespace as goog.module is defined
+  // here and because the existing module package has not been moved yet out of
+  // the goog.module namespace. This satisifies both the debug loader and
+  // ahead-of-time dependency management.
+}
 
 
 /**
@@ -180,7 +739,7 @@ goog.getObjectByName = function(name, opt_obj) {
   var cur = opt_obj || goog.global;
   for (var i = 0; i < parts.length; i++) {
     cur = cur[parts[i]];
-    if (!goog.isDefAndNotNull(cur)) {
+    if (cur == null) {
       return null;
     }
   }
@@ -195,14 +754,18 @@ goog.getObjectByName = function(name, opt_obj) {
  *     the names of the objects this file provides.
  * @param {!Array<string>} requires An array of strings with
  *     the names of the objects this file requires.
+ * @param {boolean|!Object<string>=} opt_loadFlags Parameters indicating
+ *     how the file must be loaded.  The boolean 'true' is equivalent
+ *     to {'module': 'goog'} for backwards-compatibility.  Valid properties
+ *     and values include {'module': 'goog'} and {'lang': 'es6'}.
  */
-goog.addDependency = function(relPath, provides, requires) {
-  goog.debugLoader_.addDependency(relPath, provides, requires);
+goog.addDependency = function(relPath, provides, requires, opt_loadFlags) {
+  if (!COMPILED && goog.DEPENDENCIES_ENABLED) {
+    goog.debugLoader_.addDependency(relPath, provides, requires, opt_loadFlags);
+  }
 };
 
 
-
-
 // NOTE(nnaze): The debug DOM loader was included in base.js as an original way
 // to do "debug-mode" development.  The dependency system can sometimes be
 // confusing, as can the debug DOM loader's asynchronous nature.
@@ -222,6 +785,30 @@ goog.addDependency = function(relPath, provides, requires) {
 // for example). See bootstrap/ for more information.
 
 
+/**
+ * @define {boolean} Whether to enable the debug loader.
+ *
+ * If enabled, a call to goog.require() will attempt to load the namespace by
+ * appending a script tag to the DOM (if the namespace has been registered).
+ *
+ * If disabled, goog.require() will simply assert that the namespace has been
+ * provided (and depend on the fact that some outside tool correctly ordered
+ * the script).
+ */
+goog.ENABLE_DEBUG_LOADER = goog.define('goog.ENABLE_DEBUG_LOADER', true);
+
+
+/**
+ * @param {string} msg
+ * @private
+ */
+goog.logToConsole_ = function(msg) {
+  if (goog.global.console) {
+    goog.global.console['error'](msg);
+  }
+};
+
+
 /**
  * Implements a system for the dynamic resolution of dependencies that works in
  * parallel with the BUILD system.
@@ -236,20 +823,32 @@ goog.addDependency = function(relPath, provides, requires) {
  *     namespace or module otherwise null.
  */
 goog.require = function(namespace) {
-  // If the object already exists we do not need to do anything.
-  if (!goog.isProvided_(namespace)) {
-    var moduleLoaderState = goog.moduleLoaderState_;
-    goog.moduleLoaderState_ = null;
-    try {
-      goog.debugLoader_.load_(namespace);
-    } finally {
-      goog.moduleLoaderState_ = moduleLoaderState;
+  if (!COMPILED) {
+    // Might need to lazy load on old IE.
+    if (goog.ENABLE_DEBUG_LOADER) {
+      goog.debugLoader_.requested(namespace);
     }
-  }
 
-  return null;
+    // If the object already exists we do not need to do anything.
+    if (goog.isProvided_(namespace)) {
+      if (goog.isInModuleLoader_()) {
+        return goog.module.getInternal_(namespace);
+      }
+    } else if (goog.ENABLE_DEBUG_LOADER) {
+      var moduleLoaderState = goog.moduleLoaderState_;
+      goog.moduleLoaderState_ = null;
+      try {
+        goog.debugLoader_.load_(namespace);
+      } finally {
+        goog.moduleLoaderState_ = moduleLoaderState;
+      }
+    }
+
+    return null;
+  }
 };
 
+
 /**
  * Requires a symbol for its type information. This is an indication to the
  * compiler that the symbol may appear in type annotations, yet it is not
@@ -273,12 +872,275 @@ goog.requireType = function(namespace) {
   return {};
 };
 
+
 /**
  * Path for included scripts.
  * @type {string}
  */
 goog.basePath = '';
 
+
+/**
+ * A hook for overriding the base path.
+ * @type {string|undefined}
+ */
+goog.global.CLOSURE_BASE_PATH;
+
+
+/**
+ * Whether to attempt to load Closure's deps file. By default, when uncompiled,
+ * deps files will attempt to be loaded.
+ * @type {boolean|undefined}
+ */
+goog.global.CLOSURE_NO_DEPS;
+
+
+/**
+ * A function to import a single script. This is meant to be overridden when
+ * Closure is being run in non-HTML contexts, such as web workers. It's defined
+ * in the global scope so that it can be set before base.js is loaded, which
+ * allows deps.js to be imported properly.
+ *
+ * The first parameter the script source, which is a relative URI. The second,
+ * optional parameter is the script contents, in the event the script needed
+ * transformation. It should return true if the script was imported, false
+ * otherwise.
+ * @type {(function(string, string=): boolean)|undefined}
+ */
+goog.global.CLOSURE_IMPORT_SCRIPT;
+
+
+/**
+ * Null function used for default values of callbacks, etc.
+ * @return {void} Nothing.
+ * @deprecated use '()=>{}' or 'function(){}' instead.
+ */
+goog.nullFunction = function() {};
+
+
+/**
+ * When defining a class Foo with an abstract method bar(), you can do:
+ * Foo.prototype.bar = goog.abstractMethod
+ *
+ * Now if a subclass of Foo fails to override bar(), an error will be thrown
+ * when bar() is invoked.
+ *
+ * @type {!Function}
+ * @throws {Error} when invoked to indicate the method should be overridden.
+ * @deprecated Use "@abstract" annotation instead of goog.abstractMethod in new
+ *     code. See
+ *     https://github.com/google/closure-compiler/wiki/@abstract-classes-and-methods
+ */
+goog.abstractMethod = function() {
+  throw new Error('unimplemented abstract method');
+};
+
+
+/**
+ * Adds a `getInstance` static method that always returns the same
+ * instance object.
+ * @param {!Function} ctor The constructor for the class to add the static
+ *     method to.
+ * @suppress {missingProperties} 'instance_' isn't a property on 'Function'
+ *     but we don't have a better type to use here.
+ */
+goog.addSingletonGetter = function(ctor) {
+  // instance_ is immediately set to prevent issues with sealed constructors
+  // such as are encountered when a constructor is returned as the export object
+  // of a goog.module in unoptimized code.
+  // Delcare type to avoid conformance violations that ctor.instance_ is unknown
+  /** @type {undefined|!Object} @suppress {underscore} */
+  ctor.instance_ = undefined;
+  ctor.getInstance = function() {
+    if (ctor.instance_) {
+      return ctor.instance_;
+    }
+    if (goog.DEBUG) {
+      // NOTE: JSCompiler can't optimize away Array#push.
+      goog.instantiatedSingletons_[goog.instantiatedSingletons_.length] = ctor;
+    }
+    // Cast to avoid conformance violations that ctor.instance_ is unknown
+    return /** @type {!Object|undefined} */ (ctor.instance_) = new ctor;
+  };
+};
+
+
+/**
+ * All singleton classes that have been instantiated, for testing. Don't read
+ * it directly, use the `goog.testing.singleton` module. The compiler
+ * removes this variable if unused.
+ * @type {!Array<!Function>}
+ * @private
+ */
+goog.instantiatedSingletons_ = [];
+
+
+/**
+ * @define {boolean} Whether to load goog.modules using `eval` when using
+ * the debug loader.  This provides a better debugging experience as the
+ * source is unmodified and can be edited using Chrome Workspaces or similar.
+ * However in some environments the use of `eval` is banned
+ * so we provide an alternative.
+ */
+goog.LOAD_MODULE_USING_EVAL = goog.define('goog.LOAD_MODULE_USING_EVAL', true);
+
+
+/**
+ * @define {boolean} Whether the exports of goog.modules should be sealed when
+ * possible.
+ */
+goog.SEAL_MODULE_EXPORTS = goog.define('goog.SEAL_MODULE_EXPORTS', goog.DEBUG);
+
+
+/**
+ * The registry of initialized modules:
+ * The module identifier or path to module exports map.
+ * @private @const {!Object<string, {exports:?,type:string,moduleId:string}>}
+ */
+goog.loadedModules_ = {};
+
+
+/**
+ * True if the debug loader enabled and used.
+ * @const {boolean}
+ */
+goog.DEPENDENCIES_ENABLED = !COMPILED && goog.ENABLE_DEBUG_LOADER;
+
+
+/**
+ * @define {string} How to decide whether to transpile.  Valid values
+ * are 'always', 'never', and 'detect'.  The default ('detect') is to
+ * use feature detection to determine which language levels need
+ * transpilation.
+ */
+// NOTE(sdh): we could expand this to accept a language level to bypass
+// detection: e.g. goog.TRANSPILE == 'es5' would transpile ES6 files but
+// would leave ES3 and ES5 files alone.
+goog.TRANSPILE = goog.define('goog.TRANSPILE', 'detect');
+
+/**
+ * @define {boolean} If true assume that ES modules have already been
+ * transpiled by the jscompiler (in the same way that transpile.js would
+ * transpile them - to jscomp modules). Useful only for servers that wish to use
+ * the debug loader and transpile server side. Thus this is only respected if
+ * goog.TRANSPILE is "never".
+ */
+goog.ASSUME_ES_MODULES_TRANSPILED =
+    goog.define('goog.ASSUME_ES_MODULES_TRANSPILED', false);
+
+
+/**
+ * @define {string} If a file needs to be transpiled what the output language
+ * should be. By default this is the highest language level this file detects
+ * the current environment supports. Generally this flag should not be set, but
+ * it could be useful to override. Example: If the current environment supports
+ * ES6 then by default ES7+ files will be transpiled to ES6, unless this is
+ * overridden.
+ *
+ * Valid values include: es3, es5, es6, es7, and es8. Anything not recognized
+ * is treated as es3.
+ *
+ * Note that setting this value does not force transpilation. Just if
+ * transpilation occurs this will be the output. So this is most useful when
+ * goog.TRANSPILE is set to 'always' and then forcing the language level to be
+ * something lower than what the environment detects.
+ */
+goog.TRANSPILE_TO_LANGUAGE = goog.define('goog.TRANSPILE_TO_LANGUAGE', '');
+
+
+/**
+ * @define {string} Path to the transpiler.  Executing the script at this
+ * path (relative to base.js) should define a function $jscomp.transpile.
+ */
+goog.TRANSPILER = goog.define('goog.TRANSPILER', 'transpile.js');
+
+
+/**
+ * @define {string} Trusted Types policy name. If non-empty then Closure will
+ * use Trusted Types.
+ */
+goog.TRUSTED_TYPES_POLICY_NAME =
+    goog.define('goog.TRUSTED_TYPES_POLICY_NAME', 'goog');
+
+
+/**
+ * @package {?boolean}
+ * Visible for testing.
+ */
+goog.hasBadLetScoping = null;
+
+
+/**
+ * @param {function(?):?|string} moduleDef The module definition.
+ */
+goog.loadModule = function(moduleDef) {
+  // NOTE: we allow function definitions to be either in the from
+  // of a string to eval (which keeps the original source intact) or
+  // in a eval forbidden environment (CSP) we allow a function definition
+  // which in its body must call `goog.module`, and return the exports
+  // of the module.
+  var previousState = goog.moduleLoaderState_;
+  try {
+    goog.moduleLoaderState_ = {
+      moduleName: '',
+      declareLegacyNamespace: false,
+      type: goog.ModuleType.GOOG
+    };
+    var origExports = {};
+    var exports = origExports;
+    if (typeof moduleDef === 'function') {
+      exports = moduleDef.call(undefined, exports);
+    } else if (typeof moduleDef === 'string') {
+      exports = goog.loadModuleFromSource_.call(undefined, exports, moduleDef);
+    } else {
+      throw new Error('Invalid module definition');
+    }
+
+    var moduleName = goog.moduleLoaderState_.moduleName;
+    if (typeof moduleName === 'string' && moduleName) {
+      // Don't seal legacy namespaces as they may be used as a parent of
+      // another namespace
+      if (goog.moduleLoaderState_.declareLegacyNamespace) {
+        // Whether exports was overwritten via default export assignment.
+        // This is important for legacy namespaces as it dictates whether
+        // previously a previously loaded implicit namespace should be clobbered
+        // or not.
+        var isDefaultExport = origExports !== exports;
+        goog.constructNamespace_(moduleName, exports, isDefaultExport);
+      } else if (
+          goog.SEAL_MODULE_EXPORTS && Object.seal &&
+          typeof exports == 'object' && exports != null) {
+        Object.seal(exports);
+      }
+
+      var data = {
+        exports: exports,
+        type: goog.ModuleType.GOOG,
+        moduleId: goog.moduleLoaderState_.moduleName
+      };
+      goog.loadedModules_[moduleName] = data;
+    } else {
+      throw new Error('Invalid module name \"' + moduleName + '\"');
+    }
+  } finally {
+    goog.moduleLoaderState_ = previousState;
+  }
+};
+
+
+/**
+ * @private @const
+ */
+goog.loadModuleFromSource_ =
+    /** @type {function(!Object, string):?} */ (function(exports) {
+      // NOTE: we avoid declaring parameters or local variables here to avoid
+      // masking globals or leaking values into the module definition.
+      'use strict';
+      eval(goog.CLOSURE_EVAL_PREFILTER_.createScript(arguments[1]));
+      return exports;
+    });
+
+
 /**
  * Normalize a file path by removing redundant ".." and extraneous "." file
  * path components.
@@ -304,228 +1166,2717 @@ goog.normalizePath_ = function(path) {
 };
 
 
+/**
+ * Provides a hook for loading a file when using Closure's goog.require() API
+ * with goog.modules.  In particular this hook is provided to support Node.js.
+ *
+ * @type {(function(string):string)|undefined}
+ */
+goog.global.CLOSURE_LOAD_FILE_SYNC;
+
+
+/**
+ * Loads file by synchronous XHR. Should not be used in production environments.
+ * @param {string} src Source URL.
+ * @return {?string} File contents, or null if load failed.
+ * @private
+ */
+goog.loadFileSync_ = function(src) {
+  if (goog.global.CLOSURE_LOAD_FILE_SYNC) {
+    return goog.global.CLOSURE_LOAD_FILE_SYNC(src);
+  } else {
+    try {
+      /** @type {XMLHttpRequest} */
+      var xhr = new goog.global['XMLHttpRequest']();
+      xhr.open('get', src, false);
+      xhr.send();
+      // NOTE: Successful http: requests have a status of 200, but successful
+      // file: requests may have a status of zero.  Any other status, or a
+      // thrown exception (particularly in case of file: requests) indicates
+      // some sort of error, which we treat as a missing or unavailable file.
+      return xhr.status == 0 || xhr.status == 200 ? xhr.responseText : null;
+    } catch (err) {
+      // No need to rethrow or log, since errors should show up on their own.
+      return null;
+    }
+  }
+};
+
+
+/**
+ * Lazily retrieves the transpiler and applies it to the source.
+ * @param {string} code JS code.
+ * @param {string} path Path to the code.
+ * @param {string} target Language level output.
+ * @return {string} The transpiled code.
+ * @private
+ */
+goog.transpile_ = function(code, path, target) {
+  var jscomp = goog.global['$jscomp'];
+  if (!jscomp) {
+    goog.global['$jscomp'] = jscomp = {};
+  }
+  var transpile = jscomp.transpile;
+  if (!transpile) {
+    var transpilerPath = goog.basePath + goog.TRANSPILER;
+    var transpilerCode = goog.loadFileSync_(transpilerPath);
+    if (transpilerCode) {
+      // This must be executed synchronously, since by the time we know we
+      // need it, we're about to load and write the ES6 code synchronously,
+      // so a normal script-tag load will be too slow. Wrapped in a function
+      // so that code is eval'd in the global scope.
+      (function() {
+        (0, eval)(transpilerCode + '\n//# sourceURL=' + transpilerPath);
+      }).call(goog.global);
+      // Even though the transpiler is optional, if $gwtExport is found, it's
+      // a sign the transpiler was loaded and the $jscomp.transpile *should*
+      // be there.
+      if (goog.global['$gwtExport'] && goog.global['$gwtExport']['$jscomp'] &&
+          !goog.global['$gwtExport']['$jscomp']['transpile']) {
+        throw new Error(
+            'The transpiler did not properly export the "transpile" ' +
+            'method. $gwtExport: ' + JSON.stringify(goog.global['$gwtExport']));
+      }
+      // transpile.js only exports a single $jscomp function, transpile. We
+      // grab just that and add it to the existing definition of $jscomp which
+      // contains the polyfills.
+      goog.global['$jscomp'].transpile =
+          goog.global['$gwtExport']['$jscomp']['transpile'];
+      jscomp = goog.global['$jscomp'];
+      transpile = jscomp.transpile;
+    }
+  }
+  if (!transpile) {
+    // The transpiler is an optional component.  If it's not available then
+    // replace it with a pass-through function that simply logs.
+    var suffix = ' requires transpilation but no transpiler was found.';
+    transpile = jscomp.transpile = function(code, path) {
+      // TODO(sdh): figure out some way to get this error to show up
+      // in test results, noting that the failure may occur in many
+      // different ways, including in loadModule() before the test
+      // runner even comes up.
+      goog.logToConsole_(path + suffix);
+      return code;
+    };
+  }
+  // Note: any transpilation errors/warnings will be logged to the console.
+  return transpile(code, path, target);
+};
+
 //==============================================================================
 // Language Enhancements
 //==============================================================================
 
 
 /**
- * Returns true if the specified value is defined and not null.
- * @param {?} val Variable to test.
- * @return {boolean} Whether variable is defined and not null.
+ * This is a "fixed" version of the typeof operator.  It differs from the typeof
+ * operator in such a way that null returns 'null' and arrays return 'array'.
+ * @param {?} value The value to get the type of.
+ * @return {string} The name of the type.
  */
-goog.isDefAndNotNull = function(val) {
-  // Note that undefined == null.
-  return val != null;
+goog.typeOf = function(value) {
+  var s = typeof value;
+
+  if (s != 'object') {
+    return s;
+  }
+
+  if (!value) {
+    return 'null';
+  }
+
+  if (Array.isArray(value)) {
+    return 'array';
+  }
+  return s;
 };
 
+
+/**
+ * Returns true if the object looks like an array. To qualify as array like
+ * the value needs to be either a NodeList or an object with a Number length
+ * property. Note that for this function neither strings nor functions are
+ * considered "array-like".
+ *
+ * @param {?} val Variable to test.
+ * @return {boolean} Whether variable is an array.
+ */
+goog.isArrayLike = function(val) {
+  var type = goog.typeOf(val);
+  // We do not use goog.isObject here in order to exclude function values.
+  return type == 'array' || type == 'object' && typeof val.length == 'number';
+};
+
+
+/**
+ * Returns true if the object looks like a Date. To qualify as Date-like the
+ * value needs to be an object and have a getFullYear() function.
+ * @param {?} val Variable to test.
+ * @return {boolean} Whether variable is a like a Date.
+ */
+goog.isDateLike = function(val) {
+  return goog.isObject(val) && typeof val.getFullYear == 'function';
+};
+
+
+/**
+ * Returns true if the specified value is an object.  This includes arrays and
+ * functions.
+ * @param {?} val Variable to test.
+ * @return {boolean} Whether variable is an object.
+ */
+goog.isObject = function(val) {
+  var type = typeof val;
+  return type == 'object' && val != null || type == 'function';
+  // return Object(val) === val also works, but is slower, especially if val is
+  // not an object.
+};
+
+
+/**
+ * Gets a unique ID for an object. This mutates the object so that further calls
+ * with the same object as a parameter returns the same value. The unique ID is
+ * guaranteed to be unique across the current session amongst objects that are
+ * passed into `getUid`. There is no guarantee that the ID is unique or
+ * consistent across sessions. It is unsafe to generate unique ID for function
+ * prototypes.
+ *
+ * @param {Object} obj The object to get the unique ID for.
+ * @return {number} The unique ID for the object.
+ */
+goog.getUid = function(obj) {
+  // TODO(arv): Make the type stricter, do not accept null.
+  return Object.prototype.hasOwnProperty.call(obj, goog.UID_PROPERTY_) &&
+      obj[goog.UID_PROPERTY_] ||
+      (obj[goog.UID_PROPERTY_] = ++goog.uidCounter_);
+};
+
+
+/**
+ * Whether the given object is already assigned a unique ID.
+ *
+ * This does not modify the object.
+ *
+ * @param {!Object} obj The object to check.
+ * @return {boolean} Whether there is an assigned unique id for the object.
+ */
+goog.hasUid = function(obj) {
+  return !!obj[goog.UID_PROPERTY_];
+};
+
+
+/**
+ * Removes the unique ID from an object. This is useful if the object was
+ * previously mutated using `goog.getUid` in which case the mutation is
+ * undone.
+ * @param {Object} obj The object to remove the unique ID field from.
+ */
+goog.removeUid = function(obj) {
+  // TODO(arv): Make the type stricter, do not accept null.
+
+  // In IE, DOM nodes are not instances of Object and throw an exception if we
+  // try to delete.  Instead we try to use removeAttribute.
+  if (obj !== null && 'removeAttribute' in obj) {
+    obj.removeAttribute(goog.UID_PROPERTY_);
+  }
+
+  try {
+    delete obj[goog.UID_PROPERTY_];
+  } catch (ex) {
+  }
+};
+
+
+/**
+ * Name for unique ID property. Initialized in a way to help avoid collisions
+ * with other closure JavaScript on the same page.
+ * @type {string}
+ * @private
+ */
+goog.UID_PROPERTY_ = 'closure_uid_' + ((Math.random() * 1e9) >>> 0);
+
+
+/**
+ * Counter for UID.
+ * @type {number}
+ * @private
+ */
+goog.uidCounter_ = 0;
+
+
+/**
+ * Clones a value. The input may be an Object, Array, or basic type. Objects and
+ * arrays will be cloned recursively.
+ *
+ * WARNINGS:
+ * <code>goog.cloneObject</code> does not detect reference loops. Objects that
+ * refer to themselves will cause infinite recursion.
+ *
+ * <code>goog.cloneObject</code> is unaware of unique identifiers, and copies
+ * UIDs created by <code>getUid</code> into cloned results.
+ *
+ * @param {*} obj The value to clone.
+ * @return {*} A clone of the input value.
+ * @deprecated goog.cloneObject is unsafe. Prefer the goog.object methods.
+ */
+goog.cloneObject = function(obj) {
+  var type = goog.typeOf(obj);
+  if (type == 'object' || type == 'array') {
+    if (typeof obj.clone === 'function') {
+      return obj.clone();
+    }
+    if (typeof Map !== 'undefined' && obj instanceof Map) {
+      return new Map(obj);
+    } else if (typeof Set !== 'undefined' && obj instanceof Set) {
+      return new Set(obj);
+    }
+    var clone = type == 'array' ? [] : {};
+    for (var key in obj) {
+      clone[key] = goog.cloneObject(obj[key]);
+    }
+    return clone;
+  }
+
+  return obj;
+};
+
+
+/**
+ * A native implementation of goog.bind.
+ * @param {?function(this:T, ...)} fn A function to partially apply.
+ * @param {T} selfObj Specifies the object which this should point to when the
+ *     function is run.
+ * @param {...*} var_args Additional arguments that are partially applied to the
+ *     function.
+ * @return {!Function} A partially-applied form of the function goog.bind() was
+ *     invoked as a method of.
+ * @template T
+ * @private
+ */
+goog.bindNative_ = function(fn, selfObj, var_args) {
+  return /** @type {!Function} */ (fn.call.apply(fn.bind, arguments));
+};
+
+
+/**
+ * A pure-JS implementation of goog.bind.
+ * @param {?function(this:T, ...)} fn A function to partially apply.
+ * @param {T} selfObj Specifies the object which this should point to when the
+ *     function is run.
+ * @param {...*} var_args Additional arguments that are partially applied to the
+ *     function.
+ * @return {!Function} A partially-applied form of the function goog.bind() was
+ *     invoked as a method of.
+ * @template T
+ * @private
+ */
+goog.bindJs_ = function(fn, selfObj, var_args) {
+  if (!fn) {
+    throw new Error();
+  }
+
+  if (arguments.length > 2) {
+    var boundArgs = Array.prototype.slice.call(arguments, 2);
+    return function() {
+      // Prepend the bound arguments to the current arguments.
+      var newArgs = Array.prototype.slice.call(arguments);
+      Array.prototype.unshift.apply(newArgs, boundArgs);
+      return fn.apply(selfObj, newArgs);
+    };
+
+  } else {
+    return function() {
+      return fn.apply(selfObj, arguments);
+    };
+  }
+};
+
+
+/**
+ * Partially applies this function to a particular 'this object' and zero or
+ * more arguments. The result is a new function with some arguments of the first
+ * function pre-filled and the value of this 'pre-specified'.
+ *
+ * Remaining arguments specified at call-time are appended to the pre-specified
+ * ones.
+ *
+ * Also see: {@link #partial}.
+ *
+ * Usage:
+ * <pre>var barMethBound = goog.bind(myFunction, myObj, 'arg1', 'arg2');
+ * barMethBound('arg3', 'arg4');</pre>
+ *
+ * @param {?function(this:T, ...)} fn A function to partially apply.
+ * @param {T} selfObj Specifies the object which this should point to when the
+ *     function is run.
+ * @param {...*} var_args Additional arguments that are partially applied to the
+ *     function.
+ * @return {!Function} A partially-applied form of the function goog.bind() was
+ *     invoked as a method of.
+ * @template T
+ * @suppress {deprecated} See above.
+ * @deprecated use `=> {}` or Function.prototype.bind instead.
+ */
+goog.bind = function(fn, selfObj, var_args) {
+  // TODO(nicksantos): narrow the type signature.
+  if (Function.prototype.bind &&
+      // NOTE(nicksantos): Somebody pulled base.js into the default Chrome
+      // extension environment. This means that for Chrome extensions, they get
+      // the implementation of Function.prototype.bind that calls goog.bind
+      // instead of the native one. Even worse, we don't want to introduce a
+      // circular dependency between goog.bind and Function.prototype.bind, so
+      // we have to hack this to make sure it works correctly.
+      Function.prototype.bind.toString().indexOf('native code') != -1) {
+    goog.bind = goog.bindNative_;
+  } else {
+    goog.bind = goog.bindJs_;
+  }
+  return goog.bind.apply(null, arguments);
+};
+
+
+/**
+ * Like goog.bind(), except that a 'this object' is not required. Useful when
+ * the target function is already bound.
+ *
+ * Usage:
+ * var g = goog.partial(f, arg1, arg2);
+ * g(arg3, arg4);
+ *
+ * @param {Function} fn A function to partially apply.
+ * @param {...*} var_args Additional arguments that are partially applied to fn.
+ * @return {!Function} A partially-applied form of the function goog.partial()
+ *     was invoked as a method of.
+ */
+goog.partial = function(fn, var_args) {
+  var args = Array.prototype.slice.call(arguments, 1);
+  return function() {
+    // Clone the array (with slice()) and append additional arguments
+    // to the existing arguments.
+    var newArgs = args.slice();
+    newArgs.push.apply(newArgs, arguments);
+    return fn.apply(/** @type {?} */ (this), newArgs);
+  };
+};
+
+
+/**
+ * Copies all the members of a source object to a target object. This method
+ * does not work on all browsers for all objects that contain keys such as
+ * toString or hasOwnProperty. Use goog.object.extend for this purpose.
+ *
+ * NOTE: Some have advocated for the use of goog.mixin to setup classes
+ * with multiple inheritence (traits, mixins, etc).  However, as it simply
+ * uses "for in", this is not compatible with ES6 classes whose methods are
+ * non-enumerable.  Changing this, would break cases where non-enumerable
+ * properties are not expected.
+ *
+ * @param {Object} target Target.
+ * @param {Object} source Source.
+ * @deprecated Prefer Object.assign
+ */
+goog.mixin = function(target, source) {
+  for (var x in source) {
+    target[x] = source[x];
+  }
+
+  // For IE7 or lower, the for-in-loop does not contain any properties that are
+  // not enumerable on the prototype object (for example, isPrototypeOf from
+  // Object.prototype) but also it will not include 'replace' on objects that
+  // extend String and change 'replace' (not that it is common for anyone to
+  // extend anything except Object).
+};
+
+
+/**
+ * @return {number} An integer value representing the number of milliseconds
+ *     between midnight, January 1, 1970 and the current time.
+ * @deprecated Use Date.now
+ */
+goog.now = function() {
+  return Date.now();
+};
+
+
+/**
+ * Evals JavaScript in the global scope.
+ *
+ * Throws an exception if neither execScript or eval is defined.
+ * @param {string|!TrustedScript} script JavaScript string.
+ */
+goog.globalEval = function(script) {
+  (0, eval)(script);
+};
+
+
+/**
+ * Optional map of CSS class names to obfuscated names used with
+ * goog.getCssName().
+ * @private {!Object<string, string>|undefined}
+ * @see goog.setCssNameMapping
+ */
+goog.cssNameMapping_;
+
+
+/**
+ * Optional obfuscation style for CSS class names. Should be set to either
+ * 'BY_WHOLE' or 'BY_PART' if defined.
+ * @type {string|undefined}
+ * @private
+ * @see goog.setCssNameMapping
+ */
+goog.cssNameMappingStyle_;
+
+
+
+/**
+ * A hook for modifying the default behavior goog.getCssName. The function
+ * if present, will receive the standard output of the goog.getCssName as
+ * its input.
+ *
+ * @type {(function(string):string)|undefined}
+ */
+goog.global.CLOSURE_CSS_NAME_MAP_FN;
+
+
+/**
+ * Handles strings that are intended to be used as CSS class names.
+ *
+ * This function works in tandem with @see goog.setCssNameMapping.
+ *
+ * Without any mapping set, the arguments are simple joined with a hyphen and
+ * passed through unaltered.
+ *
+ * When there is a mapping, there are two possible styles in which these
+ * mappings are used. In the BY_PART style, each part (i.e. in between hyphens)
+ * of the passed in css name is rewritten according to the map. In the BY_WHOLE
+ * style, the full css name is looked up in the map directly. If a rewrite is
+ * not specified by the map, the compiler will output a warning.
+ *
+ * When the mapping is passed to the compiler, it will replace calls to
+ * goog.getCssName with the strings from the mapping, e.g.
+ *     var x = goog.getCssName('foo');
+ *     var y = goog.getCssName(this.baseClass, 'active');
+ *  becomes:
+ *     var x = 'foo';
+ *     var y = this.baseClass + '-active';
+ *
+ * If one argument is passed it will be processed, if two are passed only the
+ * modifier will be processed, as it is assumed the first argument was generated
+ * as a result of calling goog.getCssName.
+ *
+ * @param {string} className The class name.
+ * @param {string=} opt_modifier A modifier to be appended to the class name.
+ * @return {string} The class name or the concatenation of the class name and
+ *     the modifier.
+ */
+goog.getCssName = function(className, opt_modifier) {
+  // String() is used for compatibility with compiled soy where the passed
+  // className can be non-string objects.
+  if (String(className).charAt(0) == '.') {
+    throw new Error(
+        'className passed in goog.getCssName must not start with ".".' +
+        ' You passed: ' + className);
+  }
+
+  var getMapping = function(cssName) {
+    return goog.cssNameMapping_[cssName] || cssName;
+  };
+
+  var renameByParts = function(cssName) {
+    // Remap all the parts individually.
+    var parts = cssName.split('-');
+    var mapped = [];
+    for (var i = 0; i < parts.length; i++) {
+      mapped.push(getMapping(parts[i]));
+    }
+    return mapped.join('-');
+  };
+
+  var rename;
+  if (goog.cssNameMapping_) {
+    rename =
+        goog.cssNameMappingStyle_ == 'BY_WHOLE' ? getMapping : renameByParts;
+  } else {
+    rename = function(a) {
+      return a;
+    };
+  }
+
+  var result =
+      opt_modifier ? className + '-' + rename(opt_modifier) : rename(className);
+
+  // The special CLOSURE_CSS_NAME_MAP_FN allows users to specify further
+  // processing of the class name.
+  if (goog.global.CLOSURE_CSS_NAME_MAP_FN) {
+    return goog.global.CLOSURE_CSS_NAME_MAP_FN(result);
+  }
+
+  return result;
+};
+
+
+/**
+ * Sets the map to check when returning a value from goog.getCssName(). Example:
+ * <pre>
+ * goog.setCssNameMapping({
+ *   "goog": "a",
+ *   "disabled": "b",
+ * });
+ *
+ * var x = goog.getCssName('goog');
+ * // The following evaluates to: "a a-b".
+ * goog.getCssName('goog') + ' ' + goog.getCssName(x, 'disabled')
+ * </pre>
+ * When declared as a map of string literals to string literals, the JSCompiler
+ * will replace all calls to goog.getCssName() using the supplied map if the
+ * --process_closure_primitives flag is set.
+ *
+ * @param {!Object} mapping A map of strings to strings where keys are possible
+ *     arguments to goog.getCssName() and values are the corresponding values
+ *     that should be returned.
+ * @param {string=} opt_style The style of css name mapping. There are two valid
+ *     options: 'BY_PART', and 'BY_WHOLE'.
+ * @see goog.getCssName for a description.
+ */
+goog.setCssNameMapping = function(mapping, opt_style) {
+  goog.cssNameMapping_ = mapping;
+  goog.cssNameMappingStyle_ = opt_style;
+};
+
+
+/**
+ * To use CSS renaming in compiled mode, one of the input files should have a
+ * call to goog.setCssNameMapping() with an object literal that the JSCompiler
+ * can extract and use to replace all calls to goog.getCssName(). In uncompiled
+ * mode, JavaScript code should be loaded before this base.js file that declares
+ * a global variable, CLOSURE_CSS_NAME_MAPPING, which is used below. This is
+ * to ensure that the mapping is loaded before any calls to goog.getCssName()
+ * are made in uncompiled mode.
+ *
+ * A hook for overriding the CSS name mapping.
+ * @type {!Object<string, string>|undefined}
+ */
+goog.global.CLOSURE_CSS_NAME_MAPPING;
+
+
+if (!COMPILED && goog.global.CLOSURE_CSS_NAME_MAPPING) {
+  // This does not call goog.setCssNameMapping() because the JSCompiler
+  // requires that goog.setCssNameMapping() be called with an object literal.
+  goog.cssNameMapping_ = goog.global.CLOSURE_CSS_NAME_MAPPING;
+}
+
+
+/**
+ * Gets a localized message.
+ *
+ * This function is a compiler primitive. If you give the compiler a localized
+ * message bundle, it will replace the string at compile-time with a localized
+ * version, and expand goog.getMsg call to a concatenated string.
+ *
+ * Messages must be initialized in the form:
+ * <code>
+ * var MSG_NAME = goog.getMsg('Hello {$placeholder}', {'placeholder': 'world'});
+ * </code>
+ *
+ * This function produces a string which should be treated as plain text. Use
+ * {@link goog.html.SafeHtmlFormatter} in conjunction with goog.getMsg to
+ * produce SafeHtml.
+ *
+ * @param {string} str Translatable string, places holders in the form {$foo}.
+ * @param {Object<string, string>=} opt_values Maps place holder name to value.
+ * @param {{html: (boolean|undefined),
+ *         unescapeHtmlEntities: (boolean|undefined)}=} opt_options Options:
+ *     html: Escape '<' in str to '&lt;'. Used by Closure Templates where the
+ *     generated code size and performance is critical which is why {@link
+ *     goog.html.SafeHtmlFormatter} is not used. The value must be literal true
+ *     or false.
+ *     unescapeHtmlEntities: Unescape common html entities: &gt;, &lt;, &apos;,
+ *     &quot; and &amp;. Used for messages not in HTML context, such as with
+ *     `textContent` property.
+ * @return {string} message with placeholders filled.
+ */
+goog.getMsg = function(str, opt_values, opt_options) {
+  if (opt_options && opt_options.html) {
+    // Note that '&' is not replaced because the translation can contain HTML
+    // entities.
+    str = str.replace(/</g, '&lt;');
+  }
+  if (opt_options && opt_options.unescapeHtmlEntities) {
+    // Note that "&amp;" must be the last to avoid "creating" new entities.
+    str = str.replace(/&lt;/g, '<')
+              .replace(/&gt;/g, '>')
+              .replace(/&apos;/g, '\'')
+              .replace(/&quot;/g, '"')
+              .replace(/&amp;/g, '&');
+  }
+  if (opt_values) {
+    str = str.replace(/\{\$([^}]+)}/g, function(match, key) {
+      return (opt_values != null && key in opt_values) ? opt_values[key] :
+                                                         match;
+    });
+  }
+  return str;
+};
+
+
+/**
+ * Gets a localized message. If the message does not have a translation, gives a
+ * fallback message.
+ *
+ * This is useful when introducing a new message that has not yet been
+ * translated into all languages.
+ *
+ * This function is a compiler primitive. Must be used in the form:
+ * <code>var x = goog.getMsgWithFallback(MSG_A, MSG_B);</code>
+ * where MSG_A and MSG_B were initialized with goog.getMsg.
+ *
+ * @param {string} a The preferred message.
+ * @param {string} b The fallback message.
+ * @return {string} The best translated message.
+ */
+goog.getMsgWithFallback = function(a, b) {
+  return a;
+};
+
+
+/**
+ * Exposes an unobfuscated global namespace path for the given object.
+ * Note that fields of the exported object *will* be obfuscated, unless they are
+ * exported in turn via this function or goog.exportProperty.
+ *
+ * Also handy for making public items that are defined in anonymous closures.
+ *
+ * ex. goog.exportSymbol('public.path.Foo', Foo);
+ *
+ * ex. goog.exportSymbol('public.path.Foo.staticFunction', Foo.staticFunction);
+ *     public.path.Foo.staticFunction();
+ *
+ * ex. goog.exportSymbol('public.path.Foo.prototype.myMethod',
+ *                       Foo.prototype.myMethod);
+ *     new public.path.Foo().myMethod();
+ *
+ * @param {string} publicPath Unobfuscated name to export.
+ * @param {*} object Object the name should point to.
+ * @param {?Object=} objectToExportTo The object to add the path to; default
+ *     is goog.global.
+ */
+goog.exportSymbol = function(publicPath, object, objectToExportTo) {
+  goog.exportPath_(
+      publicPath, object, /* overwriteImplicit= */ true, objectToExportTo);
+};
+
+
+/**
+ * Exports a property unobfuscated into the object's namespace.
+ * ex. goog.exportProperty(Foo, 'staticFunction', Foo.staticFunction);
+ * ex. goog.exportProperty(Foo.prototype, 'myMethod', Foo.prototype.myMethod);
+ * @param {Object} object Object whose static property is being exported.
+ * @param {string} publicName Unobfuscated name to export.
+ * @param {*} symbol Object the name should point to.
+ */
+goog.exportProperty = function(object, publicName, symbol) {
+  object[publicName] = symbol;
+};
+
+
+/**
+ * Inherit the prototype methods from one constructor into another.
+ *
+ * Usage:
+ * <pre>
+ * function ParentClass(a, b) { }
+ * ParentClass.prototype.foo = function(a) { };
+ *
+ * function ChildClass(a, b, c) {
+ *   ChildClass.base(this, 'constructor', a, b);
+ * }
+ * goog.inherits(ChildClass, ParentClass);
+ *
+ * var child = new ChildClass('a', 'b', 'see');
+ * child.foo(); // This works.
+ * </pre>
+ *
+ * @param {!Function} childCtor Child class.
+ * @param {!Function} parentCtor Parent class.
+ * @suppress {strictMissingProperties} superClass_ and base is not defined on
+ *    Function.
+ * @deprecated Use ECMAScript class syntax instead.
+ */
+goog.inherits = function(childCtor, parentCtor) {
+  /** @constructor */
+  function tempCtor() {}
+  tempCtor.prototype = parentCtor.prototype;
+  childCtor.superClass_ = parentCtor.prototype;
+  childCtor.prototype = new tempCtor();
+  /** @override */
+  childCtor.prototype.constructor = childCtor;
+
+  /**
+   * Calls superclass constructor/method.
+   *
+   * This function is only available if you use goog.inherits to
+   * express inheritance relationships between classes.
+   *
+   * NOTE: This is a replacement for goog.base and for superClass_
+   * property defined in childCtor.
+   *
+   * @param {!Object} me Should always be "this".
+   * @param {string} methodName The method name to call. Calling
+   *     superclass constructor can be done with the special string
+   *     'constructor'.
+   * @param {...*} var_args The arguments to pass to superclass
+   *     method/constructor.
+   * @return {*} The return value of the superclass method/constructor.
+   */
+  childCtor.base = function(me, methodName, var_args) {
+    // Copying using loop to avoid deop due to passing arguments object to
+    // function. This is faster in many JS engines as of late 2014.
+    var args = new Array(arguments.length - 2);
+    for (var i = 2; i < arguments.length; i++) {
+      args[i - 2] = arguments[i];
+    }
+    return parentCtor.prototype[methodName].apply(me, args);
+  };
+};
+
+
+/**
+ * Allow for aliasing within scope functions.  This function exists for
+ * uncompiled code - in compiled code the calls will be inlined and the aliases
+ * applied.  In uncompiled code the function is simply run since the aliases as
+ * written are valid JavaScript.
+ *
+ *
+ * @param {function()} fn Function to call.  This function can contain aliases
+ *     to namespaces (e.g. "var dom = goog.dom") or classes
+ *     (e.g. "var Timer = goog.Timer").
+ * @deprecated Use goog.module instead.
+ */
+goog.scope = function(fn) {
+  if (goog.isInModuleLoader_()) {
+    throw new Error('goog.scope is not supported within a module.');
+  }
+  fn.call(goog.global);
+};
+
+
+/*
+ * To support uncompiled, strict mode bundles that use eval to divide source
+ * like so:
+ *    eval('someSource;//# sourceUrl sourcefile.js');
+ * We need to export the globally defined symbols "goog" and "COMPILED".
+ * Exporting "goog" breaks the compiler optimizations, so we required that
+ * be defined externally.
+ * NOTE: We don't use goog.exportSymbol here because we don't want to trigger
+ * extern generation when that compiler option is enabled.
+ */
+if (!COMPILED) {
+  goog.global['COMPILED'] = COMPILED;
+}
+
+
 //==============================================================================
 // goog.defineClass implementation
 //==============================================================================
 
 
+/**
+ * Creates a restricted form of a Closure "class":
+ *   - from the compiler's perspective, the instance returned from the
+ *     constructor is sealed (no new properties may be added).  This enables
+ *     better checks.
+ *   - the compiler will rewrite this definition to a form that is optimal
+ *     for type checking and optimization (initially this will be a more
+ *     traditional form).
+ *
+ * @param {Function} superClass The superclass, Object or null.
+ * @param {goog.defineClass.ClassDescriptor} def
+ *     An object literal describing
+ *     the class.  It may have the following properties:
+ *     "constructor": the constructor function
+ *     "statics": an object literal containing methods to add to the constructor
+ *        as "static" methods or a function that will receive the constructor
+ *        function as its only parameter to which static properties can
+ *        be added.
+ *     all other properties are added to the prototype.
+ * @return {!Function} The class constructor.
+ * @deprecated Use ECMAScript class syntax instead.
+ */
+goog.defineClass = function(superClass, def) {
+  // TODO(johnlenz): consider making the superClass an optional parameter.
+  var constructor = def.constructor;
+  var statics = def.statics;
+  // Wrap the constructor prior to setting up the prototype and static methods.
+  if (!constructor || constructor == Object.prototype.constructor) {
+    constructor = function() {
+      throw new Error(
+          'cannot instantiate an interface (no constructor defined).');
+    };
+  }
+
+  var cls = goog.defineClass.createSealingConstructor_(constructor, superClass);
+  if (superClass) {
+    goog.inherits(cls, superClass);
+  }
+
+  // Remove all the properties that should not be copied to the prototype.
+  delete def.constructor;
+  delete def.statics;
+
+  goog.defineClass.applyProperties_(cls.prototype, def);
+  if (statics != null) {
+    if (statics instanceof Function) {
+      statics(cls);
+    } else {
+      goog.defineClass.applyProperties_(cls, statics);
+    }
+  }
+
+  return cls;
+};
+
+
+/**
+ * @typedef {{
+ *   constructor: (!Function|undefined),
+ *   statics: (Object|undefined|function(Function):void)
+ * }}
+ */
+goog.defineClass.ClassDescriptor;
+
+
+/**
+ * @define {boolean} Whether the instances returned by goog.defineClass should
+ *     be sealed when possible.
+ *
+ * When sealing is disabled the constructor function will not be wrapped by
+ * goog.defineClass, making it incompatible with ES6 class methods.
+ */
+goog.defineClass.SEAL_CLASS_INSTANCES =
+    goog.define('goog.defineClass.SEAL_CLASS_INSTANCES', goog.DEBUG);
+
+
+/**
+ * If goog.defineClass.SEAL_CLASS_INSTANCES is enabled and Object.seal is
+ * defined, this function will wrap the constructor in a function that seals the
+ * results of the provided constructor function.
+ *
+ * @param {!Function} ctr The constructor whose results maybe be sealed.
+ * @param {Function} superClass The superclass constructor.
+ * @return {!Function} The replacement constructor.
+ * @private
+ */
+goog.defineClass.createSealingConstructor_ = function(ctr, superClass) {
+  if (!goog.defineClass.SEAL_CLASS_INSTANCES) {
+    // Do now wrap the constructor when sealing is disabled. Angular code
+    // depends on this for injection to work properly.
+    return ctr;
+  }
+
+  // NOTE: The sealing behavior has been removed
+
+  /**
+   * @this {Object}
+   * @return {?}
+   */
+  var wrappedCtr = function() {
+    // Don't seal an instance of a subclass when it calls the constructor of
+    // its super class as there is most likely still setup to do.
+    var instance = ctr.apply(this, arguments) || this;
+    instance[goog.UID_PROPERTY_] = instance[goog.UID_PROPERTY_];
+
+    return instance;
+  };
+
+  return wrappedCtr;
+};
+
+
+
+// TODO(johnlenz): share these values with the goog.object
+/**
+ * The names of the fields that are defined on Object.prototype.
+ * @type {!Array<string>}
+ * @private
+ * @const
+ */
+goog.defineClass.OBJECT_PROTOTYPE_FIELDS_ = [
+  'constructor', 'hasOwnProperty', 'isPrototypeOf', 'propertyIsEnumerable',
+  'toLocaleString', 'toString', 'valueOf'
+];
+
+
+// TODO(johnlenz): share this function with the goog.object
+/**
+ * @param {!Object} target The object to add properties to.
+ * @param {!Object} source The object to copy properties from.
+ * @private
+ */
+goog.defineClass.applyProperties_ = function(target, source) {
+  // TODO(johnlenz): update this to support ES5 getters/setters
+
+  var key;
+  for (key in source) {
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
+      target[key] = source[key];
+    }
+  }
+
+  // For IE the for-in-loop does not contain any properties that are not
+  // enumerable on the prototype object (for example isPrototypeOf from
+  // Object.prototype) and it will also not include 'replace' on objects that
+  // extend String and change 'replace' (not that it is common for anyone to
+  // extend anything except Object).
+  for (var i = 0; i < goog.defineClass.OBJECT_PROTOTYPE_FIELDS_.length; i++) {
+    key = goog.defineClass.OBJECT_PROTOTYPE_FIELDS_[i];
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
+      target[key] = source[key];
+    }
+  }
+};
+
+/**
+ * Returns the parameter.
+ * @param {string} s
+ * @return {string}
+ * @private
+ */
+goog.identity_ = function(s) {
+  return s;
+};
+
+
+/**
+ * Creates Trusted Types policy if Trusted Types are supported by the browser.
+ * The policy just blesses any string as a Trusted Type. It is not visibility
+ * restricted because anyone can also call trustedTypes.createPolicy directly.
+ * However, the allowed names should be restricted by a HTTP header and the
+ * reference to the created policy should be visibility restricted.
+ * @param {string} name
+ * @return {?TrustedTypePolicy}
+ */
+goog.createTrustedTypesPolicy = function(name) {
+  var policy = null;
+  var policyFactory = goog.global.trustedTypes;
+  if (!policyFactory || !policyFactory.createPolicy) {
+    return policy;
+  }
+  // trustedTypes.createPolicy throws if called with a name that is already
+  // registered, even in report-only mode. Until the API changes, catch the
+  // error not to break the applications functionally. In such case, the code
+  // will fall back to using regular Safe Types.
+  // TODO(koto): Remove catching once createPolicy API stops throwing.
+  try {
+    policy = policyFactory.createPolicy(name, {
+      createHTML: goog.identity_,
+      createScript: goog.identity_,
+      createScriptURL: goog.identity_
+    });
+  } catch (e) {
+    goog.logToConsole_(e.message);
+  }
+  return policy;
+};
+
 // There's a bug in the compiler where without collapse properties the
 // Closure namespace defines do not guard code correctly. To help reduce code
 // size also check for !COMPILED even though it redundant until this is fixed.
+if (!COMPILED && goog.DEPENDENCIES_ENABLED) {
 
-/**
- * Tries to detect the base path of base.js script that bootstraps Closure.
- * @private
- */
-goog.findBasePath_ = function() {
-  /** @type {!Document} */
-  var doc = goog.global.document;
-  // If we have a currentScript available, use it exclusively.
-  var currentScript = doc.currentScript;
-  if (currentScript) {
-    var scripts = [currentScript];
-  } else {
-    var scripts = doc.getElementsByTagName('SCRIPT');
-  }
-  // Search backwards since the current script is in almost all cases the one
-  // that has base.js.
-  for (var i = scripts.length - 1; i >= 0; --i) {
-    var script = /** @type {!HTMLScriptElement} */ (scripts[i]);
-    var src = script.src;
-    var qmark = src.lastIndexOf('?');
-    var l = qmark == -1 ? src.length : qmark;
-    if (src.substr(l - 7, 7) == 'base.js') {
-      goog.basePath = src.substr(0, l - 7);
+
+  /**
+   * Tries to detect whether the current browser is Edge, based on the user
+   * agent. This matches only pre-Chromium Edge.
+   * @see https://docs.microsoft.com/en-us/microsoft-edge/web-platform/user-agent-string
+   * @return {boolean} True if the current browser is Edge.
+   * @private
+   */
+  goog.isEdge_ = function() {
+    var userAgent = goog.global.navigator && goog.global.navigator.userAgent ?
+        goog.global.navigator.userAgent :
+        '';
+    var edgeRe = /Edge\/(\d+)(\.\d)*/i;
+    return !!userAgent.match(edgeRe);
+  };
+
+
+  /**
+   * Tries to detect whether is in the context of an HTML document.
+   * @return {boolean} True if it looks like HTML document.
+   * @private
+   */
+  goog.inHtmlDocument_ = function() {
+    /** @type {!Document} */
+    var doc = goog.global.document;
+    return doc != null && 'write' in doc;  // XULDocument misses write.
+  };
+
+
+  /**
+   * We'd like to check for if the document readyState is 'loading'; however
+   * there are bugs on IE 10 and below where the readyState being anything other
+   * than 'complete' is not reliable.
+   * @return {boolean}
+   * @private
+   */
+  goog.isDocumentLoading_ = function() {
+    // attachEvent is available on IE 6 thru 10 only, and thus can be used to
+    // detect those browsers.
+    /** @type {!HTMLDocument} */
+    var doc = goog.global.document;
+    return doc.attachEvent ? doc.readyState != 'complete' :
+                             doc.readyState == 'loading';
+  };
+
+
+  /**
+   * Tries to detect the base path of base.js script that bootstraps Closure.
+   * @private
+   */
+  goog.findBasePath_ = function() {
+    if (goog.global.CLOSURE_BASE_PATH != undefined &&
+        // Anti DOM-clobbering runtime check (b/37736576).
+        typeof goog.global.CLOSURE_BASE_PATH === 'string') {
+      goog.basePath = goog.global.CLOSURE_BASE_PATH;
+      return;
+    } else if (!goog.inHtmlDocument_()) {
       return;
     }
-  }
-};
+    /** @type {!Document} */
+    var doc = goog.global.document;
+    // If we have a currentScript available, use it exclusively.
+    var currentScript = doc.currentScript;
+    if (currentScript) {
+      var scripts = [currentScript];
+    } else {
+      var scripts = doc.getElementsByTagName('SCRIPT');
+    }
+    // Search backwards since the current script is in almost all cases the one
+    // that has base.js.
+    for (var i = scripts.length - 1; i >= 0; --i) {
+      var script = /** @type {!HTMLScriptElement} */ (scripts[i]);
+      var src = script.src;
+      var qmark = src.lastIndexOf('?');
+      var l = qmark == -1 ? src.length : qmark;
+      if (src.substr(l - 7, 7) == 'base.js') {
+        goog.basePath = src.substr(0, l - 7);
+        return;
+      }
+    }
+  };
 
-goog.findBasePath_();
+  goog.findBasePath_();
 
-/**
- * A debug loader is responsible for downloading and executing javascript
- * files in an unbundled, uncompiled environment.
- *
- * @struct @constructor @final @private
- */
-goog.DebugLoader_ = function() {
-  /** @private @const {!Object<string, !goog.Dependency>} */
-  this.dependencies_ = {};
-  /** @private @const {!Object<string, string>} */
-  this.idToPath_ = {};
-  /** @private @const {!Object<string, boolean>} */
-  this.written_ = {};
-  /** @private {!Array<!goog.Dependency>} */
-  this.depsToLoad_ = [];
-};
+  /** @struct @constructor @final */
+  goog.Transpiler = function() {
+    /** @private {?Object<string, boolean>} */
+    this.requiresTranspilation_ = null;
+    /** @private {string} */
+    this.transpilationTarget_ = goog.TRANSPILE_TO_LANGUAGE;
+  };
+  /**
+   * Returns a newly created map from language mode string to a boolean
+   * indicating whether transpilation should be done for that mode as well as
+   * the highest level language that this environment supports.
+   *
+   * Guaranteed invariant:
+   * For any two modes, l1 and l2 where l2 is a newer mode than l1,
+   * `map[l1] == true` implies that `map[l2] == true`.
+   *
+   * Note this method is extracted and used elsewhere, so it cannot rely on
+   * anything external (it should easily be able to be transformed into a
+   * standalone, top level function).
+   *
+   * @private
+   * @return {{
+   *   target: string,
+   *   map: !Object<string, boolean>
+   * }}
+   */
+  goog.Transpiler.prototype.createRequiresTranspilation_ = function() {
+    var transpilationTarget = 'es3';
+    var /** !Object<string, boolean> */ requiresTranspilation = {'es3': false};
+    var transpilationRequiredForAllLaterModes = false;
+
+    /**
+     * Adds an entry to requiresTranspliation for the given language mode.
+     *
+     * IMPORTANT: Calls must be made in order from oldest to newest language
+     * mode.
+     * @param {string} modeName
+     * @param {function(): boolean} isSupported Returns true if the JS engine
+     *     supports the given mode.
+     */
+    function addNewerLanguageTranspilationCheck(modeName, isSupported) {
+      if (transpilationRequiredForAllLaterModes) {
+        requiresTranspilation[modeName] = true;
+      } else if (isSupported()) {
+        transpilationTarget = modeName;
+        requiresTranspilation[modeName] = false;
+      } else {
+        requiresTranspilation[modeName] = true;
+        transpilationRequiredForAllLaterModes = true;
+      }
+    }
+
+    /**
+     * Does the given code evaluate without syntax errors and return a truthy
+     * result?
+     */
+    function /** boolean */ evalCheck(/** string */ code) {
+      try {
+        return !!eval(goog.CLOSURE_EVAL_PREFILTER_.createScript(code));
+      } catch (ignored) {
+        return false;
+      }
+    }
+
+    // Identify ES3-only browsers by their incorrect treatment of commas.
+    addNewerLanguageTranspilationCheck('es5', function() {
+      return evalCheck('[1,].length==1');
+    });
+    addNewerLanguageTranspilationCheck('es6', function() {
+      // Edge has a non-deterministic (i.e., not reproducible) bug with ES6:
+      // https://github.com/Microsoft/ChakraCore/issues/1496.
+      if (goog.isEdge_()) {
+        // The Reflect.construct test below is flaky on Edge. It can sometimes
+        // pass or fail on 40 15.15063, so just exit early for Edge and treat
+        // it as ES5. Until we're on a more up to date version just always use
+        // ES5. See https://github.com/Microsoft/ChakraCore/issues/3217.
+        return false;
+      }
+      // Test es6: [FF50 (?), Edge 14 (?), Chrome 50]
+      //   (a) default params (specifically shadowing locals),
+      //   (b) destructuring, (c) block-scoped functions,
+      //   (d) for-of (const), (e) new.target/Reflect.construct
+      var es6fullTest =
+          'class X{constructor(){if(new.target!=String)throw 1;this.x=42}}' +
+          'let q=Reflect.construct(X,[],String);if(q.x!=42||!(q instanceof ' +
+          'String))throw 1;for(const a of[2,3]){if(a==2)continue;function ' +
+          'f(z={a}){let a=0;return z.a}{function f(){return 0;}}return f()' +
+          '==3}';
+
+      return evalCheck('(()=>{"use strict";' + es6fullTest + '})()');
+    });
+    // ** and **= are the only new features in 'es7'
+    addNewerLanguageTranspilationCheck('es7', function() {
+      return evalCheck('2**3==8');
+    });
+    // async functions are the only new features in 'es8'
+    addNewerLanguageTranspilationCheck('es8', function() {
+      return evalCheck('async()=>1,1');
+    });
+    addNewerLanguageTranspilationCheck('es9', function() {
+      return evalCheck('({...rest}={}),1');
+    });
+    // optional catch binding, unescaped unicode paragraph separator in strings
+    addNewerLanguageTranspilationCheck('es_2019', function() {
+      return evalCheck('let r;try{r="\u2029"}catch{};r');
+    });
+    // optional chaining, nullish coalescing
+    // untested/unsupported: bigint, import meta
+    addNewerLanguageTranspilationCheck('es_2020', function() {
+      return evalCheck('null?.x??1');
+    });
+    addNewerLanguageTranspilationCheck('es_next', function() {
+      return false;  // assume it always need to transpile
+    });
+    return {target: transpilationTarget, map: requiresTranspilation};
+  };
 
 
-/**
- * Travserses the dependency graph and queues the given dependency, and all of
- * its transitive dependencies, for loading and then starts loading if not
- * paused.
- *
- * @param {string} namespace
- * @private
- */
-goog.DebugLoader_.prototype.load_ = function(namespace) {
-  if (!this.getPathFromDeps_(namespace)) {
-    throw Error('goog.require could not find: ' + namespace);
-  } else {
-    var loader = this;
+  /**
+   * Determines whether the given language needs to be transpiled.
+   * @param {string} lang
+   * @param {string|undefined} module
+   * @return {boolean}
+   */
+  goog.Transpiler.prototype.needsTranspile = function(lang, module) {
+    if (goog.TRANSPILE == 'always') {
+      return true;
+    } else if (goog.TRANSPILE == 'never') {
+      return false;
+    } else if (!this.requiresTranspilation_) {
+      var obj = this.createRequiresTranspilation_();
+      this.requiresTranspilation_ = obj.map;
+      this.transpilationTarget_ = this.transpilationTarget_ || obj.target;
+    }
+    if (lang in this.requiresTranspilation_) {
+      if (this.requiresTranspilation_[lang]) {
+        return true;
+      } else if (
+          goog.inHtmlDocument_() && module == 'es6' &&
+          !('noModule' in goog.global.document.createElement('script'))) {
+        return true;
+      } else {
+        return false;
+      }
+    } else {
+      throw new Error('Unknown language mode: ' + lang);
+    }
+  };
+
+
+  /**
+   * Lazily retrieves the transpiler and applies it to the source.
+   * @param {string} code JS code.
+   * @param {string} path Path to the code.
+   * @return {string} The transpiled code.
+   */
+  goog.Transpiler.prototype.transpile = function(code, path) {
+    // TODO(johnplaisted): We should delete goog.transpile_ and just have this
+    // function. But there's some compile error atm where goog.global is being
+    // stripped incorrectly without this.
+    return goog.transpile_(code, path, this.transpilationTarget_);
+  };
+
+
+  /** @private @final {!goog.Transpiler} */
+  goog.transpiler_ = new goog.Transpiler();
+
+  /**
+   * Rewrites closing script tags in input to avoid ending an enclosing script
+   * tag.
+   *
+   * @param {string} str
+   * @return {string}
+   * @private
+   */
+  goog.protectScriptTag_ = function(str) {
+    return str.replace(/<\/(SCRIPT)/ig, '\\x3c/$1');
+  };
+
+
+  /**
+   * A debug loader is responsible for downloading and executing javascript
+   * files in an unbundled, uncompiled environment.
+   *
+   * This can be custimized via the setDependencyFactory method, or by
+   * CLOSURE_IMPORT_SCRIPT/CLOSURE_LOAD_FILE_SYNC.
+   *
+   * @struct @constructor @final @private
+   */
+  goog.DebugLoader_ = function() {
+    /** @private @const {!Object<string, !goog.Dependency>} */
+    this.dependencies_ = {};
+    /** @private @const {!Object<string, string>} */
+    this.idToPath_ = {};
+    /** @private @const {!Object<string, boolean>} */
+    this.written_ = {};
+    /** @private @const {!Array<!goog.Dependency>} */
+    this.loadingDeps_ = [];
+    /** @private {!Array<!goog.Dependency>} */
+    this.depsToLoad_ = [];
+    /** @private {boolean} */
+    this.paused_ = false;
+    /** @private {!goog.DependencyFactory} */
+    this.factory_ = new goog.DependencyFactory(goog.transpiler_);
+    /** @private @const {!Object<string, !Function>} */
+    this.deferredCallbacks_ = {};
+    /** @private @const {!Array<string>} */
+    this.deferredQueue_ = [];
+  };
+
+  /**
+   * @param {!Array<string>} namespaces
+   * @param {function(): undefined} callback Function to call once all the
+   *     namespaces have loaded.
+   */
+  goog.DebugLoader_.prototype.bootstrap = function(namespaces, callback) {
+    var cb = callback;
+    function resolve() {
+      if (cb) {
+        goog.global.setTimeout(cb, 0);
+        cb = null;
+      }
+    }
+
+    if (!namespaces.length) {
+      resolve();
+      return;
+    }
 
     var deps = [];
-
-    /** @param {string} namespace */
-    var visit = function(namespace) {
-      var path = loader.getPathFromDeps_(namespace);
-
+    for (var i = 0; i < namespaces.length; i++) {
+      var path = this.getPathFromDeps_(namespaces[i]);
       if (!path) {
-        throw Error('Bad dependency path or symbol: ' + namespace);
+        throw new Error('Unregonized namespace: ' + namespaces[i]);
+      }
+      deps.push(this.dependencies_[path]);
+    }
+
+    var require = goog.require;
+    var loaded = 0;
+    for (var i = 0; i < namespaces.length; i++) {
+      require(namespaces[i]);
+      deps[i].onLoad(function() {
+        if (++loaded == namespaces.length) {
+          resolve();
+        }
+      });
+    }
+  };
+
+
+  /**
+   * Loads the Closure Dependency file.
+   *
+   * Exposed a public function so CLOSURE_NO_DEPS can be set to false, base
+   * loaded, setDependencyFactory called, and then this called. i.e. allows
+   * custom loading of the deps file.
+   */
+  goog.DebugLoader_.prototype.loadClosureDeps = function() {
+    // Circumvent addDependency, which would try to transpile deps.js if
+    // transpile is set to always.
+    var relPath = 'deps.js';
+    this.depsToLoad_.push(this.factory_.createDependency(
+        goog.normalizePath_(goog.basePath + relPath), relPath, [], [], {},
+        false));
+    this.loadDeps_();
+  };
+
+
+  /**
+   * Notifies the debug loader when a dependency has been requested.
+   *
+   * @param {string} absPathOrId Path of the dependency or goog id.
+   * @param {boolean=} opt_force
+   */
+  goog.DebugLoader_.prototype.requested = function(absPathOrId, opt_force) {
+    var path = this.getPathFromDeps_(absPathOrId);
+    if (path &&
+        (opt_force || this.areDepsLoaded_(this.dependencies_[path].requires))) {
+      var callback = this.deferredCallbacks_[path];
+      if (callback) {
+        delete this.deferredCallbacks_[path];
+        callback();
+      }
+    }
+  };
+
+
+  /**
+   * Sets the dependency factory, which can be used to create custom
+   * goog.Dependency implementations to control how dependencies are loaded.
+   *
+   * @param {!goog.DependencyFactory} factory
+   */
+  goog.DebugLoader_.prototype.setDependencyFactory = function(factory) {
+    this.factory_ = factory;
+  };
+
+
+  /**
+   * Travserses the dependency graph and queues the given dependency, and all of
+   * its transitive dependencies, for loading and then starts loading if not
+   * paused.
+   *
+   * @param {string} namespace
+   * @private
+   */
+  goog.DebugLoader_.prototype.load_ = function(namespace) {
+    if (!this.getPathFromDeps_(namespace)) {
+      var errorMessage = 'goog.require could not find: ' + namespace;
+      goog.logToConsole_(errorMessage);
+    } else {
+      var loader = this;
+
+      var deps = [];
+
+      /** @param {string} namespace */
+      var visit = function(namespace) {
+        var path = loader.getPathFromDeps_(namespace);
+
+        if (!path) {
+          throw new Error('Bad dependency path or symbol: ' + namespace);
+        }
+
+        if (loader.written_[path]) {
+          return;
+        }
+
+        loader.written_[path] = true;
+
+        var dep = loader.dependencies_[path];
+        for (var i = 0; i < dep.requires.length; i++) {
+          if (!goog.isProvided_(dep.requires[i])) {
+            visit(dep.requires[i]);
+          }
+        }
+
+        deps.push(dep);
+      };
+
+      visit(namespace);
+
+      var wasLoading = !!this.depsToLoad_.length;
+      this.depsToLoad_ = this.depsToLoad_.concat(deps);
+
+      if (!this.paused_ && !wasLoading) {
+        this.loadDeps_();
+      }
+    }
+  };
+
+
+  /**
+   * Loads any queued dependencies until they are all loaded or paused.
+   *
+   * @private
+   */
+  goog.DebugLoader_.prototype.loadDeps_ = function() {
+    var loader = this;
+    var paused = this.paused_;
+
+    while (this.depsToLoad_.length && !paused) {
+      (function() {
+        var loadCallDone = false;
+        var dep = loader.depsToLoad_.shift();
+
+        var loaded = false;
+        loader.loading_(dep);
+
+        var controller = {
+          pause: function() {
+            if (loadCallDone) {
+              throw new Error('Cannot call pause after the call to load.');
+            } else {
+              paused = true;
+            }
+          },
+          resume: function() {
+            if (loadCallDone) {
+              loader.resume_();
+            } else {
+              // Some dep called pause and then resume in the same load call.
+              // Just keep running this same loop.
+              paused = false;
+            }
+          },
+          loaded: function() {
+            if (loaded) {
+              throw new Error('Double call to loaded.');
+            }
+
+            loaded = true;
+            loader.loaded_(dep);
+          },
+          pending: function() {
+            // Defensive copy.
+            var pending = [];
+            for (var i = 0; i < loader.loadingDeps_.length; i++) {
+              pending.push(loader.loadingDeps_[i]);
+            }
+            return pending;
+          },
+          /**
+           * @param {goog.ModuleType} type
+           */
+          setModuleState: function(type) {
+            goog.moduleLoaderState_ = {
+              type: type,
+              moduleName: '',
+              declareLegacyNamespace: false
+            };
+          },
+          /** @type {function(string, string, string=)} */
+          registerEs6ModuleExports: function(
+              path, exports, opt_closureNamespace) {
+            if (opt_closureNamespace) {
+              goog.loadedModules_[opt_closureNamespace] = {
+                exports: exports,
+                type: goog.ModuleType.ES6,
+                moduleId: opt_closureNamespace || ''
+              };
+            }
+          },
+          /** @type {function(string, ?)} */
+          registerGoogModuleExports: function(moduleId, exports) {
+            goog.loadedModules_[moduleId] = {
+              exports: exports,
+              type: goog.ModuleType.GOOG,
+              moduleId: moduleId
+            };
+          },
+          clearModuleState: function() {
+            goog.moduleLoaderState_ = null;
+          },
+          defer: function(callback) {
+            if (loadCallDone) {
+              throw new Error(
+                  'Cannot register with defer after the call to load.');
+            }
+            loader.defer_(dep, callback);
+          },
+          areDepsLoaded: function() {
+            return loader.areDepsLoaded_(dep.requires);
+          }
+        };
+
+        try {
+          dep.load(controller);
+        } finally {
+          loadCallDone = true;
+        }
+      })();
+    }
+
+    if (paused) {
+      this.pause_();
+    }
+  };
+
+
+  /** @private */
+  goog.DebugLoader_.prototype.pause_ = function() {
+    this.paused_ = true;
+  };
+
+
+  /** @private */
+  goog.DebugLoader_.prototype.resume_ = function() {
+    if (this.paused_) {
+      this.paused_ = false;
+      this.loadDeps_();
+    }
+  };
+
+
+  /**
+   * Marks the given dependency as loading (load has been called but it has not
+   * yet marked itself as finished). Useful for dependencies that want to know
+   * what else is loading. Example: goog.modules cannot eval if there are
+   * loading dependencies.
+   *
+   * @param {!goog.Dependency} dep
+   * @private
+   */
+  goog.DebugLoader_.prototype.loading_ = function(dep) {
+    this.loadingDeps_.push(dep);
+  };
+
+
+  /**
+   * Marks the given dependency as having finished loading and being available
+   * for require.
+   *
+   * @param {!goog.Dependency} dep
+   * @private
+   */
+  goog.DebugLoader_.prototype.loaded_ = function(dep) {
+    for (var i = 0; i < this.loadingDeps_.length; i++) {
+      if (this.loadingDeps_[i] == dep) {
+        this.loadingDeps_.splice(i, 1);
+        break;
+      }
+    }
+
+    for (var i = 0; i < this.deferredQueue_.length; i++) {
+      if (this.deferredQueue_[i] == dep.path) {
+        this.deferredQueue_.splice(i, 1);
+        break;
+      }
+    }
+
+    if (this.loadingDeps_.length == this.deferredQueue_.length &&
+        !this.depsToLoad_.length) {
+      // Something has asked to load these, but they may not be directly
+      // required again later, so load them now that we know we're done loading
+      // everything else. e.g. a goog module entry point.
+      while (this.deferredQueue_.length) {
+        this.requested(this.deferredQueue_.shift(), true);
+      }
+    }
+
+    dep.loaded();
+  };
+
+
+  /**
+   * @param {!Array<string>} pathsOrIds
+   * @return {boolean}
+   * @private
+   */
+  goog.DebugLoader_.prototype.areDepsLoaded_ = function(pathsOrIds) {
+    for (var i = 0; i < pathsOrIds.length; i++) {
+      var path = this.getPathFromDeps_(pathsOrIds[i]);
+      if (!path ||
+          (!(path in this.deferredCallbacks_) &&
+           !goog.isProvided_(pathsOrIds[i]))) {
+        return false;
+      }
+    }
+
+    return true;
+  };
+
+
+  /**
+   * @param {string} absPathOrId
+   * @return {?string}
+   * @private
+   */
+  goog.DebugLoader_.prototype.getPathFromDeps_ = function(absPathOrId) {
+    if (absPathOrId in this.idToPath_) {
+      return this.idToPath_[absPathOrId];
+    } else if (absPathOrId in this.dependencies_) {
+      return absPathOrId;
+    } else {
+      return null;
+    }
+  };
+
+
+  /**
+   * @param {!goog.Dependency} dependency
+   * @param {!Function} callback
+   * @private
+   */
+  goog.DebugLoader_.prototype.defer_ = function(dependency, callback) {
+    this.deferredCallbacks_[dependency.path] = callback;
+    this.deferredQueue_.push(dependency.path);
+  };
+
+
+  /**
+   * Interface for goog.Dependency implementations to have some control over
+   * loading of dependencies.
+   *
+   * @record
+   */
+  goog.LoadController = function() {};
+
+
+  /**
+   * Tells the controller to halt loading of more dependencies.
+   */
+  goog.LoadController.prototype.pause = function() {};
+
+
+  /**
+   * Tells the controller to resume loading of more dependencies if paused.
+   */
+  goog.LoadController.prototype.resume = function() {};
+
+
+  /**
+   * Tells the controller that this dependency has finished loading.
+   *
+   * This causes this to be removed from pending() and any load callbacks to
+   * fire.
+   */
+  goog.LoadController.prototype.loaded = function() {};
+
+
+  /**
+   * List of dependencies on which load has been called but which have not
+   * called loaded on their controller. This includes the current dependency.
+   *
+   * @return {!Array<!goog.Dependency>}
+   */
+  goog.LoadController.prototype.pending = function() {};
+
+
+  /**
+   * Registers an object as an ES6 module's exports so that goog.modules may
+   * require it by path.
+   *
+   * @param {string} path Full path of the module.
+   * @param {?} exports
+   * @param {string=} opt_closureNamespace Closure namespace to associate with
+   *     this module.
+   */
+  goog.LoadController.prototype.registerEs6ModuleExports = function(
+      path, exports, opt_closureNamespace) {};
+
+
+  /**
+   * Sets the current module state.
+   *
+   * @param {goog.ModuleType} type Type of module.
+   */
+  goog.LoadController.prototype.setModuleState = function(type) {};
+
+
+  /**
+   * Clears the current module state.
+   */
+  goog.LoadController.prototype.clearModuleState = function() {};
+
+
+  /**
+   * Registers a callback to call once the dependency is actually requested
+   * via goog.require + all of the immediate dependencies have been loaded or
+   * all other files have been loaded. Allows for lazy loading until
+   * require'd without pausing dependency loading, which is needed on old IE.
+   *
+   * @param {!Function} callback
+   */
+  goog.LoadController.prototype.defer = function(callback) {};
+
+
+  /**
+   * @return {boolean}
+   */
+  goog.LoadController.prototype.areDepsLoaded = function() {};
+
+
+  /**
+   * Basic super class for all dependencies Closure Library can load.
+   *
+   * This default implementation is designed to load untranspiled, non-module
+   * scripts in a web broswer.
+   *
+   * For transpiled non-goog.module files {@see goog.TranspiledDependency}.
+   * For goog.modules see {@see goog.GoogModuleDependency}.
+   * For untranspiled ES6 modules {@see goog.Es6ModuleDependency}.
+   *
+   * @param {string} path Absolute path of this script.
+   * @param {string} relativePath Path of this script relative to goog.basePath.
+   * @param {!Array<string>} provides goog.provided or goog.module symbols
+   *     in this file.
+   * @param {!Array<string>} requires goog symbols or relative paths to Closure
+   *     this depends on.
+   * @param {!Object<string, string>} loadFlags
+   * @struct @constructor
+   */
+  goog.Dependency = function(
+      path, relativePath, provides, requires, loadFlags) {
+    /** @const */
+    this.path = path;
+    /** @const */
+    this.relativePath = relativePath;
+    /** @const */
+    this.provides = provides;
+    /** @const */
+    this.requires = requires;
+    /** @const */
+    this.loadFlags = loadFlags;
+    /** @private {boolean} */
+    this.loaded_ = false;
+    /** @private {!Array<function()>} */
+    this.loadCallbacks_ = [];
+  };
+
+
+  /**
+   * @return {string} The pathname part of this dependency's path if it is a
+   *     URI.
+   */
+  goog.Dependency.prototype.getPathName = function() {
+    var pathName = this.path;
+    var protocolIndex = pathName.indexOf('://');
+    if (protocolIndex >= 0) {
+      pathName = pathName.substring(protocolIndex + 3);
+      var slashIndex = pathName.indexOf('/');
+      if (slashIndex >= 0) {
+        pathName = pathName.substring(slashIndex + 1);
+      }
+    }
+    return pathName;
+  };
+
+
+  /**
+   * @param {function()} callback Callback to fire as soon as this has loaded.
+   * @final
+   */
+  goog.Dependency.prototype.onLoad = function(callback) {
+    if (this.loaded_) {
+      callback();
+    } else {
+      this.loadCallbacks_.push(callback);
+    }
+  };
+
+
+  /**
+   * Marks this dependency as loaded and fires any callbacks registered with
+   * onLoad.
+   * @final
+   */
+  goog.Dependency.prototype.loaded = function() {
+    this.loaded_ = true;
+    var callbacks = this.loadCallbacks_;
+    this.loadCallbacks_ = [];
+    for (var i = 0; i < callbacks.length; i++) {
+      callbacks[i]();
+    }
+  };
+
+
+  /**
+   * Whether or not document.written / appended script tags should be deferred.
+   *
+   * @private {boolean}
+   */
+  goog.Dependency.defer_ = false;
+
+
+  /**
+   * Map of script ready / state change callbacks. Old IE cannot handle putting
+   * these properties on goog.global.
+   *
+   * @private @const {!Object<string, function(?):undefined>}
+   */
+  goog.Dependency.callbackMap_ = {};
+
+
+  /**
+   * @param {function(...?):?} callback
+   * @return {string}
+   * @private
+   */
+  goog.Dependency.registerCallback_ = function(callback) {
+    var key = Math.random().toString(32);
+    goog.Dependency.callbackMap_[key] = callback;
+    return key;
+  };
+
+
+  /**
+   * @param {string} key
+   * @private
+   */
+  goog.Dependency.unregisterCallback_ = function(key) {
+    delete goog.Dependency.callbackMap_[key];
+  };
+
+
+  /**
+   * @param {string} key
+   * @param {...?} var_args
+   * @private
+   * @suppress {unusedPrivateMembers}
+   */
+  goog.Dependency.callback_ = function(key, var_args) {
+    if (key in goog.Dependency.callbackMap_) {
+      var callback = goog.Dependency.callbackMap_[key];
+      var args = [];
+      for (var i = 1; i < arguments.length; i++) {
+        args.push(arguments[i]);
+      }
+      callback.apply(undefined, args);
+    } else {
+      var errorMessage = 'Callback key ' + key +
+          ' does not exist (was base.js loaded more than once?).';
+      throw Error(errorMessage);
+    }
+  };
+
+
+  /**
+   * Starts loading this dependency. This dependency can pause loading if it
+   * needs to and resume it later via the controller interface.
+   *
+   * When this is loaded it should call controller.loaded(). Note that this will
+   * end up calling the loaded method of this dependency; there is no need to
+   * call it explicitly.
+   *
+   * @param {!goog.LoadController} controller
+   */
+  goog.Dependency.prototype.load = function(controller) {
+    if (goog.global.CLOSURE_IMPORT_SCRIPT) {
+      if (goog.global.CLOSURE_IMPORT_SCRIPT(this.path)) {
+        controller.loaded();
+      } else {
+        controller.pause();
+      }
+      return;
+    }
+
+    if (!goog.inHtmlDocument_()) {
+      goog.logToConsole_(
+          'Cannot use default debug loader outside of HTML documents.');
+      if (this.relativePath == 'deps.js') {
+        // Some old code is relying on base.js auto loading deps.js failing with
+        // no error before later setting CLOSURE_IMPORT_SCRIPT.
+        // CLOSURE_IMPORT_SCRIPT should be set *before* base.js is loaded, or
+        // CLOSURE_NO_DEPS set to true.
+        goog.logToConsole_(
+            'Consider setting CLOSURE_IMPORT_SCRIPT before loading base.js, ' +
+            'or setting CLOSURE_NO_DEPS to true.');
+        controller.loaded();
+      } else {
+        controller.pause();
+      }
+      return;
+    }
+
+    /** @type {!HTMLDocument} */
+    var doc = goog.global.document;
+
+    // If the user tries to require a new symbol after document load,
+    // something has gone terribly wrong. Doing a document.write would
+    // wipe out the page. This does not apply to the CSP-compliant method
+    // of writing script tags.
+    if (doc.readyState == 'complete' &&
+        !goog.ENABLE_CHROME_APP_SAFE_SCRIPT_LOADING) {
+      // Certain test frameworks load base.js multiple times, which tries
+      // to write deps.js each time. If that happens, just fail silently.
+      // These frameworks wipe the page between each load of base.js, so this
+      // is OK.
+      var isDeps = /\bdeps.js$/.test(this.path);
+      if (isDeps) {
+        controller.loaded();
+        return;
+      } else {
+        throw Error('Cannot write "' + this.path + '" after document load');
+      }
+    }
+
+    var nonce = goog.getScriptNonce_();
+    if (!goog.ENABLE_CHROME_APP_SAFE_SCRIPT_LOADING &&
+        goog.isDocumentLoading_()) {
+      var key;
+      var callback = function(script) {
+        if (script.readyState && script.readyState != 'complete') {
+          script.onload = callback;
+          return;
+        }
+        goog.Dependency.unregisterCallback_(key);
+        controller.loaded();
+      };
+      key = goog.Dependency.registerCallback_(callback);
+
+      var defer = goog.Dependency.defer_ ? ' defer' : '';
+      var nonceAttr = nonce ? ' nonce="' + nonce + '"' : '';
+      var script = '<script src="' + this.path + '"' + nonceAttr + defer +
+          ' id="script-' + key + '"><\/script>';
+
+      script += '<script' + nonceAttr + '>';
+
+      if (goog.Dependency.defer_) {
+        script += 'document.getElementById(\'script-' + key +
+            '\').onload = function() {\n' +
+            '  goog.Dependency.callback_(\'' + key + '\', this);\n' +
+            '};\n';
+      } else {
+        script += 'goog.Dependency.callback_(\'' + key +
+            '\', document.getElementById(\'script-' + key + '\'));';
       }
 
-      if (loader.written_[path]) {
+      script += '<\/script>';
+
+      doc.write(
+          goog.TRUSTED_TYPES_POLICY_ ?
+              goog.TRUSTED_TYPES_POLICY_.createHTML(script) :
+              script);
+    } else {
+      var scriptEl =
+          /** @type {!HTMLScriptElement} */ (doc.createElement('script'));
+      scriptEl.defer = goog.Dependency.defer_;
+      scriptEl.async = false;
+
+      // If CSP nonces are used, propagate them to dynamically created scripts.
+      // This is necessary to allow nonce-based CSPs without 'strict-dynamic'.
+      if (nonce) {
+        scriptEl.nonce = nonce;
+      }
+
+      if (goog.DebugLoader_.IS_OLD_IE_) {
+        // Execution order is not guaranteed on old IE, halt loading and write
+        // these scripts one at a time, after each loads.
+        controller.pause();
+        scriptEl.onreadystatechange = function() {
+          if (scriptEl.readyState == 'loaded' ||
+              scriptEl.readyState == 'complete') {
+            controller.loaded();
+            controller.resume();
+          }
+        };
+      } else {
+        scriptEl.onload = function() {
+          scriptEl.onload = null;
+          controller.loaded();
+        };
+      }
+
+      scriptEl.src = goog.TRUSTED_TYPES_POLICY_ ?
+          goog.TRUSTED_TYPES_POLICY_.createScriptURL(this.path) :
+          this.path;
+      doc.head.appendChild(scriptEl);
+    }
+  };
+
+
+  /**
+   * @param {string} path Absolute path of this script.
+   * @param {string} relativePath Path of this script relative to goog.basePath.
+   * @param {!Array<string>} provides Should be an empty array.
+   *     TODO(johnplaisted) add support for adding closure namespaces to ES6
+   *     modules for interop purposes.
+   * @param {!Array<string>} requires goog symbols or relative paths to Closure
+   *     this depends on.
+   * @param {!Object<string, string>} loadFlags
+   * @struct @constructor
+   * @extends {goog.Dependency}
+   */
+  goog.Es6ModuleDependency = function(
+      path, relativePath, provides, requires, loadFlags) {
+    goog.Es6ModuleDependency.base(
+        this, 'constructor', path, relativePath, provides, requires, loadFlags);
+  };
+  goog.inherits(goog.Es6ModuleDependency, goog.Dependency);
+
+
+  /**
+   * @override
+   * @param {!goog.LoadController} controller
+   */
+  goog.Es6ModuleDependency.prototype.load = function(controller) {
+    if (goog.global.CLOSURE_IMPORT_SCRIPT) {
+      if (goog.global.CLOSURE_IMPORT_SCRIPT(this.path)) {
+        controller.loaded();
+      } else {
+        controller.pause();
+      }
+      return;
+    }
+
+    if (!goog.inHtmlDocument_()) {
+      goog.logToConsole_(
+          'Cannot use default debug loader outside of HTML documents.');
+      controller.pause();
+      return;
+    }
+
+    /** @type {!HTMLDocument} */
+    var doc = goog.global.document;
+
+    var dep = this;
+
+    // TODO(johnplaisted): Does document.writing really speed up anything? Any
+    // difference between this and just waiting for interactive mode and then
+    // appending?
+    function write(src, contents) {
+      var nonceAttr = '';
+      var nonce = goog.getScriptNonce_();
+      if (nonce) {
+        nonceAttr = ' nonce="' + nonce + '"';
+      }
+
+      if (contents) {
+        var script = '<script type="module" crossorigin' + nonceAttr + '>' +
+            contents + '</' +
+            'script>';
+        doc.write(
+            goog.TRUSTED_TYPES_POLICY_ ?
+                goog.TRUSTED_TYPES_POLICY_.createHTML(script) :
+                script);
+      } else {
+        var script = '<script type="module" crossorigin src="' + src + '"' +
+            nonceAttr + '></' +
+            'script>';
+        doc.write(
+            goog.TRUSTED_TYPES_POLICY_ ?
+                goog.TRUSTED_TYPES_POLICY_.createHTML(script) :
+                script);
+      }
+    }
+
+    function append(src, contents) {
+      var scriptEl =
+          /** @type {!HTMLScriptElement} */ (doc.createElement('script'));
+      scriptEl.defer = true;
+      scriptEl.async = false;
+      scriptEl.type = 'module';
+      scriptEl.setAttribute('crossorigin', true);
+
+      // If CSP nonces are used, propagate them to dynamically created scripts.
+      // This is necessary to allow nonce-based CSPs without 'strict-dynamic'.
+      var nonce = goog.getScriptNonce_();
+      if (nonce) {
+        scriptEl.nonce = nonce;
+      }
+
+      if (contents) {
+        scriptEl.text = goog.TRUSTED_TYPES_POLICY_ ?
+            goog.TRUSTED_TYPES_POLICY_.createScript(contents) :
+            contents;
+      } else {
+        scriptEl.src = goog.TRUSTED_TYPES_POLICY_ ?
+            goog.TRUSTED_TYPES_POLICY_.createScriptURL(src) :
+            src;
+      }
+
+      doc.head.appendChild(scriptEl);
+    }
+
+    var create;
+
+    if (goog.isDocumentLoading_()) {
+      create = write;
+      // We can ONLY call document.write if we are guaranteed that any
+      // non-module script tags document.written after this are deferred.
+      // Small optimization, in theory document.writing is faster.
+      goog.Dependency.defer_ = true;
+    } else {
+      create = append;
+    }
+
+    // Write 4 separate tags here:
+    // 1) Sets the module state at the correct time (just before execution).
+    // 2) A src node for this, which just hopefully lets the browser load it a
+    //    little early (no need to parse #3).
+    // 3) Import the module and register it.
+    // 4) Clear the module state at the correct time. Guaranteed to run even
+    //    if there is an error in the module (#3 will not run if there is an
+    //    error in the module).
+    var beforeKey = goog.Dependency.registerCallback_(function() {
+      goog.Dependency.unregisterCallback_(beforeKey);
+      controller.setModuleState(goog.ModuleType.ES6);
+    });
+    create(undefined, 'goog.Dependency.callback_("' + beforeKey + '")');
+
+    // TODO(johnplaisted): Does this really speed up anything?
+    create(this.path, undefined);
+
+    var registerKey = goog.Dependency.registerCallback_(function(exports) {
+      goog.Dependency.unregisterCallback_(registerKey);
+      controller.registerEs6ModuleExports(
+          dep.path, exports, goog.moduleLoaderState_.moduleName);
+    });
+    create(
+        undefined,
+        'import * as m from "' + this.path + '"; goog.Dependency.callback_("' +
+            registerKey + '", m)');
+
+    var afterKey = goog.Dependency.registerCallback_(function() {
+      goog.Dependency.unregisterCallback_(afterKey);
+      controller.clearModuleState();
+      controller.loaded();
+    });
+    create(undefined, 'goog.Dependency.callback_("' + afterKey + '")');
+  };
+
+
+  /**
+   * Superclass of any dependency that needs to be loaded into memory,
+   * transformed, and then eval'd (goog.modules and transpiled files).
+   *
+   * @param {string} path Absolute path of this script.
+   * @param {string} relativePath Path of this script relative to goog.basePath.
+   * @param {!Array<string>} provides goog.provided or goog.module symbols
+   *     in this file.
+   * @param {!Array<string>} requires goog symbols or relative paths to Closure
+   *     this depends on.
+   * @param {!Object<string, string>} loadFlags
+   * @struct @constructor @abstract
+   * @extends {goog.Dependency}
+   */
+  goog.TransformedDependency = function(
+      path, relativePath, provides, requires, loadFlags) {
+    goog.TransformedDependency.base(
+        this, 'constructor', path, relativePath, provides, requires, loadFlags);
+    /** @private {?string} */
+    this.contents_ = null;
+
+    /**
+     * Whether to lazily make the synchronous XHR (when goog.require'd) or make
+     * the synchronous XHR when initially loading. On FireFox 61 there is a bug
+     * where an ES6 module cannot make a synchronous XHR (rather, it can, but if
+     * it does then no other ES6 modules will load after).
+     *
+     * tl;dr we lazy load due to bugs on older browsers and eager load due to
+     * bugs on newer ones.
+     *
+     * https://bugzilla.mozilla.org/show_bug.cgi?id=1477090
+     *
+     * @private @const {boolean}
+     */
+    this.lazyFetch_ = !goog.inHtmlDocument_() ||
+        !('noModule' in goog.global.document.createElement('script'));
+  };
+  goog.inherits(goog.TransformedDependency, goog.Dependency);
+
+
+  /**
+   * @override
+   * @param {!goog.LoadController} controller
+   */
+  goog.TransformedDependency.prototype.load = function(controller) {
+    var dep = this;
+
+    function fetch() {
+      dep.contents_ = goog.loadFileSync_(dep.path);
+
+      if (dep.contents_) {
+        dep.contents_ = dep.transform(dep.contents_);
+        if (dep.contents_) {
+          dep.contents_ += '\n//# sourceURL=' + dep.path;
+        }
+      }
+    }
+
+    if (goog.global.CLOSURE_IMPORT_SCRIPT) {
+      fetch();
+      if (this.contents_ &&
+          goog.global.CLOSURE_IMPORT_SCRIPT('', this.contents_)) {
+        this.contents_ = null;
+        controller.loaded();
+      } else {
+        controller.pause();
+      }
+      return;
+    }
+
+
+    var isEs6 = this.loadFlags['module'] == goog.ModuleType.ES6;
+
+    if (!this.lazyFetch_) {
+      fetch();
+    }
+
+    function load() {
+      if (dep.lazyFetch_) {
+        fetch();
+      }
+
+      if (!dep.contents_) {
+        // loadFileSync_ or transform are responsible. Assume they logged an
+        // error.
         return;
       }
 
-      loader.written_[path] = true;
+      if (isEs6) {
+        controller.setModuleState(goog.ModuleType.ES6);
+      }
 
-      var dep = loader.dependencies_[path];
-      for (var i = 0; i < dep.requires.length; i++) {
-        if (!goog.isProvided_(dep.requires[i])) {
-          visit(dep.requires[i]);
+      var namespace;
+
+      try {
+        var contents = dep.contents_;
+        dep.contents_ = null;
+        goog.globalEval(goog.CLOSURE_EVAL_PREFILTER_.createScript(contents));
+        if (isEs6) {
+          namespace = goog.moduleLoaderState_.moduleName;
+        }
+      } finally {
+        if (isEs6) {
+          controller.clearModuleState();
         }
       }
 
-      deps.push(dep);
-    };
-
-    visit(namespace);
-
-    var wasLoading = !!this.depsToLoad_.length;
-    this.depsToLoad_ = this.depsToLoad_.concat(deps);
-
-    if (!wasLoading) {
-      this.loadDeps_();
-    }
-  }
-};
-
-
-/**
- * Loads any queued dependencies until they are all loaded or paused.
- *
- * @private
- */
-goog.DebugLoader_.prototype.loadDeps_ = function() {
-  var loader = this;
-
-  while (this.depsToLoad_.length) {
-    (function() {
-      var loadCallDone = false;
-      var dep = loader.depsToLoad_.shift();
-
-      try {
-        dep.load();
-      } finally {
-        loadCallDone = true;
+      if (isEs6) {
+        // Due to circular dependencies this may not be available for require
+        // right now.
+        goog.global['$jscomp']['require']['ensure'](
+            [dep.getPathName()], function() {
+              controller.registerEs6ModuleExports(
+                  dep.path,
+                  goog.global['$jscomp']['require'](dep.getPathName()),
+                  namespace);
+            });
       }
-    })();
+
+      controller.loaded();
+    }
+
+    // Do not fetch now; in FireFox 47 the synchronous XHR doesn't block all
+    // events. If we fetched now and then document.write'd the contents the
+    // document.write would be an eval and would execute too soon! Instead write
+    // a script tag to fetch and eval synchronously at the correct time.
+    function fetchInOwnScriptThenLoad() {
+      /** @type {!HTMLDocument} */
+      var doc = goog.global.document;
+
+      var key = goog.Dependency.registerCallback_(function() {
+        goog.Dependency.unregisterCallback_(key);
+        load();
+      });
+
+      var nonce = goog.getScriptNonce_();
+      var nonceAttr = nonce ? ' nonce="' + nonce + '"' : '';
+      var script = '<script' + nonceAttr + '>' +
+          goog.protectScriptTag_('goog.Dependency.callback_("' + key + '");') +
+          '</' +
+          'script>';
+      doc.write(
+          goog.TRUSTED_TYPES_POLICY_ ?
+              goog.TRUSTED_TYPES_POLICY_.createHTML(script) :
+              script);
+    }
+
+    // If one thing is pending it is this.
+    var anythingElsePending = controller.pending().length > 1;
+
+    // If anything else is loading we need to lazy load due to bugs in old IE.
+    // Specifically script tags with src and script tags with contents could
+    // execute out of order if document.write is used, so we cannot use
+    // document.write. Do not pause here; it breaks old IE as well.
+    var useOldIeWorkAround =
+        anythingElsePending && goog.DebugLoader_.IS_OLD_IE_;
+
+    // Additionally if we are meant to defer scripts but the page is still
+    // loading (e.g. an ES6 module is loading) then also defer. Or if we are
+    // meant to defer and anything else is pending then defer (those may be
+    // scripts that did not need transformation and are just script tags with
+    // defer set to true, and we need to evaluate after that deferred script).
+    var needsAsyncLoading = goog.Dependency.defer_ &&
+        (anythingElsePending || goog.isDocumentLoading_());
+
+    if (useOldIeWorkAround || needsAsyncLoading) {
+      // Note that we only defer when we have to rather than 100% of the time.
+      // Always defering would work, but then in theory the order of
+      // goog.require calls would then matter. We want to enforce that most of
+      // the time the order of the require calls does not matter.
+      controller.defer(function() {
+        load();
+      });
+      return;
+    }
+    // TODO(johnplaisted): Externs are missing onreadystatechange for
+    // HTMLDocument.
+    /** @type {?} */
+    var doc = goog.global.document;
+
+    var isInternetExplorerOrEdge = goog.inHtmlDocument_() &&
+        ('ActiveXObject' in goog.global || goog.isEdge_());
+
+    // Don't delay in any version of IE or pre-Chromium Edge. There's a bug
+    // around this that will cause out of order script execution. This means
+    // that on older IE ES6 modules will load too early (while the document is
+    // still loading + the dom is not available). The other option is to load
+    // too late (when the document is complete and the onload even will never
+    // fire). This seems to be the lesser of two evils as scripts already act
+    // like the former.
+    if (isEs6 && goog.inHtmlDocument_() && goog.isDocumentLoading_() &&
+        !isInternetExplorerOrEdge) {
+      goog.Dependency.defer_ = true;
+      // Transpiled ES6 modules still need to load like regular ES6 modules,
+      // aka only after the document is interactive.
+      controller.pause();
+      var oldCallback = doc.onreadystatechange;
+      doc.onreadystatechange = function() {
+        if (doc.readyState == 'interactive') {
+          doc.onreadystatechange = oldCallback;
+          load();
+          controller.resume();
+        }
+        if (typeof oldCallback === 'function') {
+          oldCallback.apply(undefined, arguments);
+        }
+      };
+    } else {
+      // Always eval on old IE.
+      if (goog.DebugLoader_.IS_OLD_IE_ || !goog.inHtmlDocument_() ||
+          !goog.isDocumentLoading_()) {
+        load();
+      } else {
+        fetchInOwnScriptThenLoad();
+      }
+    }
+  };
+
+
+  /**
+   * @param {string} contents
+   * @return {string}
+   * @abstract
+   */
+  goog.TransformedDependency.prototype.transform = function(contents) {};
+
+
+  /**
+   * Any non-goog.module dependency which needs to be transpiled before eval.
+   *
+   * @param {string} path Absolute path of this script.
+   * @param {string} relativePath Path of this script relative to goog.basePath.
+   * @param {!Array<string>} provides goog.provided or goog.module symbols
+   *     in this file.
+   * @param {!Array<string>} requires goog symbols or relative paths to Closure
+   *     this depends on.
+   * @param {!Object<string, string>} loadFlags
+   * @param {!goog.Transpiler} transpiler
+   * @struct @constructor
+   * @extends {goog.TransformedDependency}
+   */
+  goog.TranspiledDependency = function(
+      path, relativePath, provides, requires, loadFlags, transpiler) {
+    goog.TranspiledDependency.base(
+        this, 'constructor', path, relativePath, provides, requires, loadFlags);
+    /** @protected @const*/
+    this.transpiler = transpiler;
+  };
+  goog.inherits(goog.TranspiledDependency, goog.TransformedDependency);
+
+
+  /**
+   * @override
+   * @param {string} contents
+   * @return {string}
+   */
+  goog.TranspiledDependency.prototype.transform = function(contents) {
+    // Transpile with the pathname so that ES6 modules are domain agnostic.
+    return this.transpiler.transpile(contents, this.getPathName());
+  };
+
+
+  /**
+   * An ES6 module dependency that was transpiled to a jscomp module outside
+   * of the debug loader, e.g. server side.
+   *
+   * @param {string} path Absolute path of this script.
+   * @param {string} relativePath Path of this script relative to goog.basePath.
+   * @param {!Array<string>} provides goog.provided or goog.module symbols
+   *     in this file.
+   * @param {!Array<string>} requires goog symbols or relative paths to Closure
+   *     this depends on.
+   * @param {!Object<string, string>} loadFlags
+   * @struct @constructor
+   * @extends {goog.TransformedDependency}
+   */
+  goog.PreTranspiledEs6ModuleDependency = function(
+      path, relativePath, provides, requires, loadFlags) {
+    goog.PreTranspiledEs6ModuleDependency.base(
+        this, 'constructor', path, relativePath, provides, requires, loadFlags);
+  };
+  goog.inherits(
+      goog.PreTranspiledEs6ModuleDependency, goog.TransformedDependency);
+
+
+  /**
+   * @override
+   * @param {string} contents
+   * @return {string}
+   */
+  goog.PreTranspiledEs6ModuleDependency.prototype.transform = function(
+      contents) {
+    return contents;
+  };
+
+
+  /**
+   * A goog.module, transpiled or not. Will always perform some minimal
+   * transformation even when not transpiled to wrap in a goog.loadModule
+   * statement.
+   *
+   * @param {string} path Absolute path of this script.
+   * @param {string} relativePath Path of this script relative to goog.basePath.
+   * @param {!Array<string>} provides goog.provided or goog.module symbols
+   *     in this file.
+   * @param {!Array<string>} requires goog symbols or relative paths to Closure
+   *     this depends on.
+   * @param {!Object<string, string>} loadFlags
+   * @param {boolean} needsTranspile
+   * @param {!goog.Transpiler} transpiler
+   * @struct @constructor
+   * @extends {goog.TransformedDependency}
+   */
+  goog.GoogModuleDependency = function(
+      path, relativePath, provides, requires, loadFlags, needsTranspile,
+      transpiler) {
+    goog.GoogModuleDependency.base(
+        this, 'constructor', path, relativePath, provides, requires, loadFlags);
+    /** @private @const */
+    this.needsTranspile_ = needsTranspile;
+    /** @private @const */
+    this.transpiler_ = transpiler;
+  };
+  goog.inherits(goog.GoogModuleDependency, goog.TransformedDependency);
+
+
+  /**
+   * @override
+   * @param {string} contents
+   * @return {string}
+   */
+  goog.GoogModuleDependency.prototype.transform = function(contents) {
+    if (this.needsTranspile_) {
+      contents = this.transpiler_.transpile(contents, this.getPathName());
+    }
+
+    if (!goog.LOAD_MODULE_USING_EVAL || goog.global.JSON === undefined) {
+      return '' +
+          'goog.loadModule(function(exports) {' +
+          '"use strict";' + contents +
+          '\n' +  // terminate any trailing single line comment.
+          ';return exports' +
+          '});' +
+          '\n//# sourceURL=' + this.path + '\n';
+    } else {
+      return '' +
+          'goog.loadModule(' +
+          goog.global.JSON.stringify(
+              contents + '\n//# sourceURL=' + this.path + '\n') +
+          ');';
+    }
+  };
+
+
+  /**
+   * Whether the browser is IE9 or earlier, which needs special handling
+   * for deferred modules.
+   * @const @private {boolean}
+   */
+  goog.DebugLoader_.IS_OLD_IE_ = !!(
+      !goog.global.atob && goog.global.document && goog.global.document['all']);
+
+
+  /**
+   * @param {string} relPath
+   * @param {!Array<string>|undefined} provides
+   * @param {!Array<string>} requires
+   * @param {boolean|!Object<string>=} opt_loadFlags
+   * @see goog.addDependency
+   */
+  goog.DebugLoader_.prototype.addDependency = function(
+      relPath, provides, requires, opt_loadFlags) {
+    provides = provides || [];
+    relPath = relPath.replace(/\\/g, '/');
+    var path = goog.normalizePath_(goog.basePath + relPath);
+    if (!opt_loadFlags || typeof opt_loadFlags === 'boolean') {
+      opt_loadFlags = opt_loadFlags ? {'module': goog.ModuleType.GOOG} : {};
+    }
+    var dep = this.factory_.createDependency(
+        path, relPath, provides, requires, opt_loadFlags,
+        goog.transpiler_.needsTranspile(
+            opt_loadFlags['lang'] || 'es3', opt_loadFlags['module']));
+    this.dependencies_[path] = dep;
+    for (var i = 0; i < provides.length; i++) {
+      this.idToPath_[provides[i]] = path;
+    }
+    this.idToPath_[relPath] = path;
+  };
+
+
+  /**
+   * Creates goog.Dependency instances for the debug loader to load.
+   *
+   * Should be overridden to have the debug loader use custom subclasses of
+   * goog.Dependency.
+   *
+   * @param {!goog.Transpiler} transpiler
+   * @struct @constructor
+   */
+  goog.DependencyFactory = function(transpiler) {
+    /** @protected @const */
+    this.transpiler = transpiler;
+  };
+
+
+  /**
+   * @param {string} path Absolute path of the file.
+   * @param {string} relativePath Path relative to closure’s base.js.
+   * @param {!Array<string>} provides Array of provided goog.provide/module ids.
+   * @param {!Array<string>} requires Array of required goog.provide/module /
+   *     relative ES6 module paths.
+   * @param {!Object<string, string>} loadFlags
+   * @param {boolean} needsTranspile True if the file needs to be transpiled
+   *     per the goog.Transpiler.
+   * @return {!goog.Dependency}
+   */
+  goog.DependencyFactory.prototype.createDependency = function(
+      path, relativePath, provides, requires, loadFlags, needsTranspile) {
+
+    if (loadFlags['module'] == goog.ModuleType.GOOG) {
+      return new goog.GoogModuleDependency(
+          path, relativePath, provides, requires, loadFlags, needsTranspile,
+          this.transpiler);
+    } else if (needsTranspile) {
+      return new goog.TranspiledDependency(
+          path, relativePath, provides, requires, loadFlags, this.transpiler);
+    } else {
+      if (loadFlags['module'] == goog.ModuleType.ES6) {
+        if (goog.TRANSPILE == 'never' && goog.ASSUME_ES_MODULES_TRANSPILED) {
+          return new goog.PreTranspiledEs6ModuleDependency(
+              path, relativePath, provides, requires, loadFlags);
+        } else {
+          return new goog.Es6ModuleDependency(
+              path, relativePath, provides, requires, loadFlags);
+        }
+      } else {
+        return new goog.Dependency(
+            path, relativePath, provides, requires, loadFlags);
+      }
+    }
+  };
+
+
+  /** @private @const */
+  goog.debugLoader_ = new goog.DebugLoader_();
+
+
+  /**
+   * Loads the Closure Dependency file.
+   *
+   * Exposed a public function so CLOSURE_NO_DEPS can be set to false, base
+   * loaded, setDependencyFactory called, and then this called. i.e. allows
+   * custom loading of the deps file.
+   */
+  goog.loadClosureDeps = function() {
+    goog.debugLoader_.loadClosureDeps();
+  };
+
+
+  /**
+   * Sets the dependency factory, which can be used to create custom
+   * goog.Dependency implementations to control how dependencies are loaded.
+   *
+   * Note: if you wish to call this function and provide your own implemnetation
+   * it is a wise idea to set CLOSURE_NO_DEPS to true, otherwise the dependency
+   * file and all of its goog.addDependency calls will use the default factory.
+   * You can call goog.loadClosureDeps to load the Closure dependency file
+   * later, after your factory is injected.
+   *
+   * @param {!goog.DependencyFactory} factory
+   */
+  goog.setDependencyFactory = function(factory) {
+    goog.debugLoader_.setDependencyFactory(factory);
+  };
+
+
+  /**
+   * Trusted Types policy for the debug loader.
+   * @private @const {?TrustedTypePolicy}
+   */
+  goog.TRUSTED_TYPES_POLICY_ = goog.TRUSTED_TYPES_POLICY_NAME ?
+      goog.createTrustedTypesPolicy(goog.TRUSTED_TYPES_POLICY_NAME + '#base') :
+      null;
+
+  if (!goog.global.CLOSURE_NO_DEPS) {
+    goog.debugLoader_.loadClosureDeps();
   }
-};
 
 
-/**
- * @param {string} absPathOrId
- * @return {?string}
- * @private
- */
-goog.DebugLoader_.prototype.getPathFromDeps_ = function(absPathOrId) {
-  return this.idToPath_[absPathOrId];
-};
+  /**
+   * Bootstraps the given namespaces and calls the callback once they are
+   * available either via goog.require. This is a replacement for using
+   * `goog.require` to bootstrap Closure JavaScript. Previously a `goog.require`
+   * in an HTML file would guarantee that the require'd namespace was available
+   * in the next immediate script tag. With ES6 modules this no longer a
+   * guarantee.
+   *
+   * @param {!Array<string>} namespaces
+   * @param {function(): ?} callback Function to call once all the namespaces
+   *     have loaded. Always called asynchronously.
+   */
+  goog.bootstrap = function(namespaces, callback) {
+    goog.debugLoader_.bootstrap(namespaces, callback);
+  };
+}
 
 
-/**
- * Basic super class for all dependencies Closure Library can load.
- *
- * This default implementation is designed to load untranspiled, non-module
- * scripts in a web broswer.
- *
- * For transpiled non-goog.module files {@see goog.TranspiledDependency}.
- * For goog.modules see {@see goog.GoogModuleDependency}.
- * For untranspiled ES6 modules {@see goog.Es6ModuleDependency}.
- *
- * @param {string} path Absolute path of this script.
- * @param {!Array<string>} requires goog symbols or relative paths to Closure
- *     this depends on.
- * @struct @constructor
- */
-goog.Dependency = function(path, requires) {
-  /** @const */
-  this.path = path;
-  /** @const */
-  this.requires = requires;
-};
-
-/**
- * Map of script ready / state change callbacks. Old IE cannot handle putting
- * these properties on goog.global.
- *
- * @private @const {!Object<string, function(?):undefined>}
- */
-goog.Dependency.callbackMap_ = {};
-
-
-/**
- * Starts loading this dependency. This dependency can pause loading if it
- * needs to and resume it later via the controller interface.
- *
- * When this is loaded it should call controller.loaded(). Note that this will
- * end up calling the loaded method of this dependency; there is no need to
- * call it explicitly.
- */
-goog.Dependency.prototype.load = function() {
-  /** @type {!HTMLDocument} */
-  var doc = goog.global.document;
-  doc.write('<script src="' + this.path + '" type="text/javascript"><' +
-      '/script>');
-};
-
-
-/**
- * @param {string} relPath
- * @param {!Array<string>|undefined} provides
- * @param {!Array<string>} requires
- * @see goog.addDependency
- */
-goog.DebugLoader_.prototype.addDependency = function(
-    relPath, provides, requires) {
-  relPath = relPath.replace(/\\/g, '/');
-  var path = goog.normalizePath_(goog.basePath + relPath);
-  var dep = new goog.Dependency(path, requires);
-  this.dependencies_[path] = dep;
-  for (var i = 0; i < provides.length; i++) {
-    this.idToPath_[provides[i]] = path;
+if (!COMPILED) {
+  var isChrome87 = false;
+  // Cannot run check for Chrome <87 bug in case of strict CSP environments.
+  // TODO(user): Remove once Chrome <87 bug is no longer a problem.
+  try {
+    isChrome87 = eval(goog.global.trustedTypes.emptyScript) !==
+        goog.global.trustedTypes.emptyScript;
+  } catch (err) {
   }
-  this.idToPath_[relPath] = path;
-};
 
-
-/** @private @const */
-goog.debugLoader_ = new goog.DebugLoader_();
+  /**
+   * Trusted Types for running dev servers.
+   *
+   * @private @const
+   */
+  goog.CLOSURE_EVAL_PREFILTER_ =
+      // Detect Chrome <87 bug with TT and eval.
+      goog.global.trustedTypes && isChrome87 &&
+          goog.createTrustedTypesPolicy('goog#base#devonly#eval') ||
+      {createScript: goog.identity_};
+}

From f5a9f2cf2b160f55326a2b5d02420a7e0c841d6b Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Mon, 12 Jul 2021 01:19:57 +0100
Subject: [PATCH 002/833] Load dependency graph from tests/deps.js in
 uncompiled mode

* New gulp task buildDeps (npm run build:deps) to create tests/deps.js.
* Old gulp task buildUncompressed is deleted.
* blockly_uncompressed.js is now handwritten.
  * And simplified; in particular, BLOCKLY_BOOT is gone.
  * And linted!
* For consistency with the Closure documentation and base.js,
  consistently refer to what blockly_uncompressed.js is used for as
  "uncompiled mode" rather than "uncompressed mode" (but don't yet
  rename it to blockly_uncompiled.js)
---
 .eslintignore                    |   1 -
 blockly_uncompressed.js          | 276 +++++--------------------------
 gulpfile.js                      |   2 +-
 package.json                     |   2 +-
 scripts/gulpfiles/build_tasks.js | 107 +++---------
 tests/deps.js                    | 214 ++++++++++++++++++++++++
 6 files changed, 281 insertions(+), 321 deletions(-)
 create mode 100644 tests/deps.js

diff --git a/.eslintignore b/.eslintignore
index 373bf7a87..a8cb9b439 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,4 @@
 *_compressed*.js
-*_uncompressed*.js
 gulpfile.js
 /msg/*
 /dist/*
diff --git a/blockly_uncompressed.js b/blockly_uncompressed.js
index 9a52ca263..47e9b7e9b 100644
--- a/blockly_uncompressed.js
+++ b/blockly_uncompressed.js
@@ -1,244 +1,54 @@
-// Do not edit this file; automatically generated by gulp.
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Bootstrap code to load Blockly in uncompiled mode.
+ * @author cpcallen@google.com (Christopher Allen)
+ */
 'use strict';
 
-this.IS_NODE_JS = !!(typeof module !== 'undefined' && module.exports);
 
-this.BLOCKLY_DIR = (function(root) {
-  if (!root.IS_NODE_JS) {
+/**
+ * Blockly uncompiled-mode startup code.  If running in a browser
+ * loads closure/goog/base.js and tests/deps.js, then (in any case)
+ * requires Blockly.requires.
+ */
+(function(_global) {
+  /* eslint-disable no-undef */
+  var IS_NODE_JS = !!(typeof module !== 'undefined' && module.exports);
+
+  if (IS_NODE_JS) {
+    // Load Blockly.
+    goog.require('Blockly.requires');
+    /* eslint-disable no-undef */
+    module.exports = Blockly;
+  } else {
+    var BLOCKLY_DIR = '';
     // Find name of current directory.
     var scripts = document.getElementsByTagName('script');
-    var re = new RegExp('(.+)[\/]blockly_(.*)uncompressed\.js$');
-    for (var i = 0, script; script = scripts[i]; i++) {
+    var re = /(.+)[\\/]blockly_(?:.*)uncompressed\.js$/;
+    for (var script, i = 0; (script = scripts[i]); i++) {
       var match = re.exec(script.src);
       if (match) {
-        return match[1];
+        BLOCKLY_DIR = match[1];
+        break;
       }
     }
-    alert('Could not detect Blockly\'s directory name.');
+    if (!BLOCKLY_DIR) {
+      alert('Could not detect Blockly\'s directory name.');
+    }
+    // Load Closure Library base.js (the only part of the libary we use,
+    // mainly for goog.require / goog.provide / goog.module).
+    document.write(
+        '<script src="' + BLOCKLY_DIR + '/closure/goog/base.js"></script>');
+    // Load dependency graph info from test/deps.js.  To update
+    // deps.js, run `npm run build:deps`.
+    document.write(
+        '<script src="' + BLOCKLY_DIR + '/tests/deps.js"></script>');
+    // Load the rest of Blockly.
+    document.write('<script>goog.require(\'Blockly.requires\');</script>');
   }
-  return '';
 })(this);
-
-this.BLOCKLY_BOOT = function(root) {
-  // Execute after Closure has loaded.
-goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.IASTNodeLocation', 'Blockly.IDeletable', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.Workspace', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es5'});
-goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom']);
-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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], []);
-goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global']);
-goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
-goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], []);
-goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation']);
-goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.registry']);
-goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.RenderedConnection', 'Blockly.connectionTypes', 'Blockly.constants']);
-goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], []);
-goog.addDependency('../../core/constants.js', ['Blockly.constants'], ['Blockly.connectionTypes']);
-goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es5'});
-goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es5'});
-goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es5'});
-goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea']);
-goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockly.IDragTarget']);
-goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style']);
-goog.addDependency('../../core/events/block_events.js', ['Blockly.Events.BlockBase', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Events.Change', 'Blockly.Events.Create', 'Blockly.Events.Delete', 'Blockly.Events.Move'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
-goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils']);
-goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events']);
-goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/variable_events.js', ['Blockly.Events.VarBase', 'Blockly.Events.VarCreate', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es5'});
-goog.addDependency('../../core/events/ws_comment_events.js', ['Blockly.Events.CommentBase', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
-goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils']);
-goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible', 'Blockly.IRegistrable', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es5'});
-goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object']);
-goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.IdGenerator', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object']);
-goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['Blockly.DropDownDiv', 'Blockly.Field', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
-goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.object']);
-goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabelSerializable'], ['Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.object']);
-goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es5'});
-goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object']);
-goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry']);
-goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object']);
-goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
-goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es5'});
-goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.Block', 'Blockly.constants', 'Blockly.utils.deprecation']);
-goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
-goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.Connection', 'Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es5'});
-goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes']);
-goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es5'});
-goog.addDependency('../../core/interfaces/i_accessibility.js', ['Blockly.IASTNodeLocation', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible'], []);
-goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], ['Blockly.IComponent']);
-goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], []);
-goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], []);
-goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], ['Blockly.IContextMenu', 'Blockly.IDraggable']);
-goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], []);
-goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], []);
-goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], []);
-goog.addDependency('../../core/interfaces/i_copyable.js', ['Blockly.ICopyable'], []);
-goog.addDependency('../../core/interfaces/i_deletable.js', ['Blockly.IDeletable'], []);
-goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], ['Blockly.IDragTarget']);
-goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], ['Blockly.IComponent']);
-goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], ['Blockly.IDeletable']);
-goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], []);
-goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], []);
-goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], []);
-goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], ['Blockly.IComponent']);
-goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], []);
-goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], []);
-goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], []);
-goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], []);
-goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], []);
-goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem', 'Blockly.ISelectableToolboxItem', 'Blockly.IToolboxItem'], []);
-goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Coordinate'], {'lang': 'es5'});
-goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry'], {'lang': 'es5'});
-goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es5'});
-goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], ['Blockly.ASTNode']);
-goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object']);
-goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], ['Blockly.Cursor', 'Blockly.Marker']);
-goog.addDependency('../../core/menu.js', ['Blockly.Menu'], ['Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.style']);
-goog.addDependency('../../core/menuitem.js', ['Blockly.MenuItem'], ['Blockly.utils.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom']);
-goog.addDependency('../../core/metrics_manager.js', ['Blockly.FlyoutMetricsManager', 'Blockly.MetricsManager'], ['Blockly.IMetricsManager', 'Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es5'});
-goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global']);
-goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
-goog.addDependency('../../core/names.js', ['Blockly.Names'], ['Blockly.Msg', 'Blockly.constants']);
-goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.Metrics', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.constants', 'Blockly.utils.xml']);
-goog.addDependency('../../core/registry.js', ['Blockly.registry'], []);
-goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry']);
-goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es5'});
-goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
-goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths']);
-goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], []);
-goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes']);
-goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes', 'Blockly.constants']);
-goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es5'});
-goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.geras.RenderInfo', 'Blockly.utils.object', 'Blockly.utils.svgPaths']);
-goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.svgPaths'], {'lang': 'es5'});
-goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths']);
-goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras', 'Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/geras/measurables/inputs.js', ['Blockly.geras.InlineInput', 'Blockly.geras.StatementInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.PathObject', 'Blockly.geras.ConstantProvider', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types']);
-goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/inputs.js', ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/row_elements.js', ['Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/rows.js', ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], []);
-goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist', 'Blockly.minimalist.RenderInfo'], ['Blockly.utils.object']);
-goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos', 'Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es5'});
-goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.zelos.RenderInfo']);
-goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos', 'Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow']);
-goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/zelos/measurables/rows.js', ['Blockly.zelos.BottomRow', 'Blockly.zelos.TopRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.TopRow', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider']);
-goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo']);
-goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Themes.Dark', 'Blockly.Themes.Deuteranopia', 'Blockly.Themes.HighContrast', 'Blockly.Themes.Tritanopia', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
-goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar', 'Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.utils.KeyCodes']);
-goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object']);
-goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils', 'Blockly.utils.object']);
-goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);
-goog.addDependency('../../core/theme/dark.js', ['Blockly.Themes.Dark'], ['Blockly.Theme']);
-goog.addDependency('../../core/theme/deuteranopia.js', ['Blockly.Themes.Deuteranopia'], ['Blockly.Theme']);
-goog.addDependency('../../core/theme/highcontrast.js', ['Blockly.Themes.HighContrast'], ['Blockly.Theme']);
-goog.addDependency('../../core/theme/modern.js', ['Blockly.Themes.Modern'], ['Blockly.Theme']);
-goog.addDependency('../../core/theme/tritanopia.js', ['Blockly.Themes.Tritanopia'], ['Blockly.Theme']);
-goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme']);
-goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.Theme']);
-goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
-goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.IToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es5'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
-goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem']);
-goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.utils.string']);
-goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.constants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.string']);
-goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
-goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
-goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.constants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
-goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], []);
-goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], []);
-goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], []);
-goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.Svg', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], []);
-goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.IdGenerator'], []);
-goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], []);
-goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], []);
-goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], []);
-goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], []);
-goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], []);
-goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], []);
-goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], []);
-goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Blockly.utils.Coordinate', 'Blockly.utils.Size']);
-goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], []);
-goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], []);
-goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.constants']);
-goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global']);
-goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
-goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.utils', 'Blockly.utils.object']);
-goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils']);
-goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.xml']);
-goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml']);
-goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
-goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.utils.dom']);
-goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);
-goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.constants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es5'});
-goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml']);
-goog.addDependency('../../core/workspace_comment_render_svg.js', ['Blockly.WorkspaceCommentSvg.render'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.WorkspaceComment', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
-goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate']);
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
-goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
-goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
-goog.addDependency("base.js", [], []);
-
-// Load Blockly.
-goog.require('Blockly.requires');
-
-delete root.BLOCKLY_DIR;
-delete root.BLOCKLY_BOOT;
-delete root.IS_NODE_JS;
-};
-
-if (this.IS_NODE_JS) {
-  this.BLOCKLY_BOOT(this);
-  module.exports = Blockly;
-} else {
-  document.write('<script src="' + this.BLOCKLY_DIR +
-      '/closure/goog/base.js"></script>');
-  document.write('<script>this.BLOCKLY_BOOT(this);</script>');
-}
diff --git a/gulpfile.js b/gulpfile.js
index 53a756874..dc5d1e71f 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -25,10 +25,10 @@ module.exports = {
   default: buildTasks.build,
   generateLangfiles: buildTasks.generateLangfiles,
   build: buildTasks.build,
+  buildDeps: buildTasks.deps,
   buildCore: buildTasks.core,
   buildBlocks: buildTasks.blocks,
   buildLangfiles: buildTasks.langfiles,
-  buildUncompressed: buildTasks.uncompressed,
   buildCompressed: buildTasks.compressed,
   buildGenerators: buildTasks.generators,
   buildAdvancedCompilationTest: buildTasks.advancedCompilationTest,
diff --git a/package.json b/package.json
index 75d294dc0..dda2766d2 100644
--- a/package.json
+++ b/package.json
@@ -23,11 +23,11 @@
     "build:core": "gulp buildCore",
     "build:debug": "gulp buildCompressed --verbose --debug",
     "build:debug:log": "npm run build:debug > build-debug.log 2>&1 && tail -3 build-debug.log",
+    "build:deps": "gulp buildDeps",
     "build:strict": "gulp buildCompressed --verbose --strict",
     "build:strict:log": "npm run build:strict > build-debug.log 2>&1 && tail -3 build-debug.log",
     "build:generators": "gulp buildGenerators",
     "build:langfiles": "gulp buildLangfiles",
-    "build:uncompressed": "gulp buildUncompressed",
     "bump": "npm --no-git-tag-version version 4.$(date +'%Y%m%d').0",
     "clean": "gulp clean",
     "clean:build": "gulp cleanBuildDir",
diff --git a/scripts/gulpfiles/build_tasks.js b/scripts/gulpfiles/build_tasks.js
index b27d21a5b..d341b5601 100644
--- a/scripts/gulpfiles/build_tasks.js
+++ b/scripts/gulpfiles/build_tasks.js
@@ -330,84 +330,21 @@ const buildGenerators = gulp.parallel(
 );
 
 /**
- * This task builds Blockly's uncompressed file.
- *     blockly_uncompressed.js
+ * This task updates tests/deps.js, used by blockly_uncompressed.js
+ * when loading Blockly in uncompiled mode.
  */
-function buildUncompressed() {
+function buildDeps(done) {
   const closurePath = argv.closureLibrary ?
-    'node_modules/google-closure-library/closure/goog' :
-    'closure/goog';
-  const header = `// Do not edit this file; automatically generated by gulp.
-'use strict';
-
-this.IS_NODE_JS = !!(typeof module !== 'undefined' && module.exports);
-
-this.BLOCKLY_DIR = (function(root) {
-  if (!root.IS_NODE_JS) {
-    // Find name of current directory.
-    var scripts = document.getElementsByTagName('script');
-    var re = new RegExp('(.+)[\\\/]blockly_(.*)uncompressed\\\.js$');
-    for (var i = 0, script; script = scripts[i]; i++) {
-      var match = re.exec(script.src);
-      if (match) {
-        return match[1];
-      }
-    }
-    alert('Could not detect Blockly\\'s directory name.');
-  }
-  return '';
-})(this);
-
-this.BLOCKLY_BOOT = function(root) {
-  // Execute after Closure has loaded.
-`;
-  const footer = `
-delete root.BLOCKLY_DIR;
-delete root.BLOCKLY_BOOT;
-delete root.IS_NODE_JS;
-};
-
-if (this.IS_NODE_JS) {
-  this.BLOCKLY_BOOT(this);
-  module.exports = Blockly;
-} else {
-  document.write('<script src="' + this.BLOCKLY_DIR +
-      '/${closurePath}/base.js"></script>');
-  document.write('<script>this.BLOCKLY_BOOT(this);</script>');
-}
-`;
-
-let deps = [];
-return gulp.src(maybeAddClosureLibrary(['core/**/**/*.js']))
-  .pipe(through2.obj((file, _enc, cb) => {
-    const result = closureDeps.parser.parseFile(file.path);
-    for (const dep of result.dependencies) {
-      deps.push(dep);
-    }
-    cb(null);
-  }))
-  .on('end', () => {
-    // Update the path to closure for any files that we don't know the full path
-    // of (parsed from a goog.addDependency call).
-    for (const dep of deps) {
-      dep.setClosurePath(closurePath);
-    }
-
-    const addDependency = closureDeps.depFile
-        .getDepFileText(closurePath, deps)
-        .replace(/\\/g, '\/');
-
-    const requires = `goog.addDependency("base.js", [], []);
-
-// Load Blockly.
-goog.require('Blockly.requires');
-`;
-    fs.writeFileSync('blockly_uncompressed.js',
-      header +
-      addDependency +
-      requires +
-      footer);
-  });
+      'node_modules/google-closure-library/closure/goog' :
+      'closure/goog';
+  const roots = [
+    closurePath,
+    'core',
+    'blocks',
+  ];
+  const args = roots.map(root => `--root '${root}' `).join('');
+  execSync(`closure-make-deps ${args} > tests/deps.js`, {stdio: 'inherit'});
+  done();
 };
 
 /**
@@ -517,10 +454,10 @@ function buildAdvancedCompilationTest() {
  *     blockly_uncompressed.js
  */
 const buildCore = gulp.parallel(
-  buildCompressed,
-  buildBlocks,
-  buildUncompressed
-);
+    buildDeps,
+    buildCompressed,
+    buildBlocks,
+    );
 
 /**
  * This task builds all of Blockly:
@@ -535,10 +472,10 @@ const buildCore = gulp.parallel(
  *     msg/json/*.js
  */
 const build = gulp.parallel(
-  buildCore,
-  buildGenerators,
-  buildLangfiles
-);
+    buildCore,
+    buildGenerators,
+    buildLangfiles,
+    );
 
 /**
  * This task copies built files from BUILD_DIR back to the repository
@@ -566,11 +503,11 @@ function cleanBuildDir(done) {
 
 module.exports = {
   build: build,
+  deps: buildDeps,
   core: buildCore,
   blocks: buildBlocks,
   generateLangfiles: generateLangfiles,
   langfiles: buildLangfiles,
-  uncompressed: buildUncompressed,
   compressed: buildCompressed,
   generators: buildGenerators,
   checkinBuilt: checkinBuilt,
diff --git a/tests/deps.js b/tests/deps.js
new file mode 100644
index 000000000..ee068001a
--- /dev/null
+++ b/tests/deps.js
@@ -0,0 +1,214 @@
+goog.addDependency('../../blocks/colour.js', ['Blockly.Blocks.colour', 'Blockly.Constants.Colour'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldColour', 'Blockly.FieldLabel']);
+goog.addDependency('../../blocks/lists.js', ['Blockly.Constants.Lists'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator']);
+goog.addDependency('../../blocks/logic.js', ['Blockly.Blocks.logic', 'Blockly.Constants.Logic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator']);
+goog.addDependency('../../blocks/loops.js', ['Blockly.Blocks.loops', 'Blockly.Constants.Loops'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable', 'Blockly.Warning']);
+goog.addDependency('../../blocks/math.js', ['Blockly.Blocks.math', 'Blockly.Constants.Math'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable']);
+goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'], ['Blockly', 'Blockly.Blocks', 'Blockly.Comment', 'Blockly.FieldCheckbox', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.Mutator', 'Blockly.Warning'], {'lang': 'es5'});
+goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator']);
+goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
+goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
+goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.IASTNodeLocation', 'Blockly.IDeletable', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.Workspace', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es5'});
+goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom']);
+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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], []);
+goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global']);
+goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
+goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], []);
+goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation']);
+goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.registry']);
+goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.RenderedConnection', 'Blockly.connectionTypes', 'Blockly.constants']);
+goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], []);
+goog.addDependency('../../core/constants.js', ['Blockly.constants'], ['Blockly.connectionTypes']);
+goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es5'});
+goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es5'});
+goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es5'});
+goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea']);
+goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockly.IDragTarget']);
+goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style']);
+goog.addDependency('../../core/events/block_events.js', ['Blockly.Events.BlockBase', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Events.Change', 'Blockly.Events.Create', 'Blockly.Events.Delete', 'Blockly.Events.Move'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
+goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils']);
+goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events']);
+goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/variable_events.js', ['Blockly.Events.VarBase', 'Blockly.Events.VarCreate', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es5'});
+goog.addDependency('../../core/events/ws_comment_events.js', ['Blockly.Events.CommentBase', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
+goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils']);
+goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible', 'Blockly.IRegistrable', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es5'});
+goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.IdGenerator', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['Blockly.DropDownDiv', 'Blockly.Field', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabelSerializable'], ['Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.object']);
+goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es5'});
+goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object']);
+goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry']);
+goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object']);
+goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
+goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es5'});
+goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.Block', 'Blockly.constants', 'Blockly.utils.deprecation']);
+goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
+goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.Connection', 'Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es5'});
+goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes']);
+goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es5'});
+goog.addDependency('../../core/interfaces/i_accessibility.js', ['Blockly.IASTNodeLocation', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible'], []);
+goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], ['Blockly.IComponent']);
+goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], []);
+goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], []);
+goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], ['Blockly.IContextMenu', 'Blockly.IDraggable']);
+goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], []);
+goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], []);
+goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], []);
+goog.addDependency('../../core/interfaces/i_copyable.js', ['Blockly.ICopyable'], []);
+goog.addDependency('../../core/interfaces/i_deletable.js', ['Blockly.IDeletable'], []);
+goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], ['Blockly.IDragTarget']);
+goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], ['Blockly.IComponent']);
+goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], ['Blockly.IDeletable']);
+goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], []);
+goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], []);
+goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], []);
+goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], ['Blockly.IComponent']);
+goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], []);
+goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], []);
+goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], []);
+goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], []);
+goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], []);
+goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem', 'Blockly.ISelectableToolboxItem', 'Blockly.IToolboxItem'], []);
+goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Coordinate'], {'lang': 'es5'});
+goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry'], {'lang': 'es5'});
+goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es5'});
+goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], ['Blockly.ASTNode']);
+goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object']);
+goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], ['Blockly.Cursor', 'Blockly.Marker']);
+goog.addDependency('../../core/menu.js', ['Blockly.Menu'], ['Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.style']);
+goog.addDependency('../../core/menuitem.js', ['Blockly.MenuItem'], ['Blockly.utils.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom']);
+goog.addDependency('../../core/metrics_manager.js', ['Blockly.FlyoutMetricsManager', 'Blockly.MetricsManager'], ['Blockly.IMetricsManager', 'Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global']);
+goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
+goog.addDependency('../../core/names.js', ['Blockly.Names'], ['Blockly.Msg', 'Blockly.constants']);
+goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.Metrics', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.constants', 'Blockly.utils.xml']);
+goog.addDependency('../../core/registry.js', ['Blockly.registry'], []);
+goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry']);
+goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es5'});
+goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
+goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths']);
+goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], []);
+goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes']);
+goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes', 'Blockly.constants']);
+goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es5'});
+goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.geras.RenderInfo', 'Blockly.utils.object', 'Blockly.utils.svgPaths']);
+goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.svgPaths'], {'lang': 'es5'});
+goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths']);
+goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras', 'Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/geras/measurables/inputs.js', ['Blockly.geras.InlineInput', 'Blockly.geras.StatementInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.PathObject', 'Blockly.geras.ConstantProvider', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types']);
+goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/inputs.js', ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/row_elements.js', ['Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/rows.js', ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], []);
+goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist', 'Blockly.minimalist.RenderInfo'], ['Blockly.utils.object']);
+goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos', 'Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es5'});
+goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.zelos.RenderInfo']);
+goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos', 'Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow']);
+goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/zelos/measurables/rows.js', ['Blockly.zelos.BottomRow', 'Blockly.zelos.TopRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.TopRow', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider']);
+goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo']);
+goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Themes.Dark', 'Blockly.Themes.Deuteranopia', 'Blockly.Themes.HighContrast', 'Blockly.Themes.Tritanopia', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
+goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar', 'Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.utils.KeyCodes']);
+goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object']);
+goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils', 'Blockly.utils.object']);
+goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);
+goog.addDependency('../../core/theme/dark.js', ['Blockly.Themes.Dark'], ['Blockly.Theme']);
+goog.addDependency('../../core/theme/deuteranopia.js', ['Blockly.Themes.Deuteranopia'], ['Blockly.Theme']);
+goog.addDependency('../../core/theme/highcontrast.js', ['Blockly.Themes.HighContrast'], ['Blockly.Theme']);
+goog.addDependency('../../core/theme/modern.js', ['Blockly.Themes.Modern'], ['Blockly.Theme']);
+goog.addDependency('../../core/theme/tritanopia.js', ['Blockly.Themes.Tritanopia'], ['Blockly.Theme']);
+goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme']);
+goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.Theme']);
+goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.IToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es5'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem']);
+goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.utils.string']);
+goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.constants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.string']);
+goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
+goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.constants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
+goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], []);
+goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], []);
+goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], []);
+goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.Svg', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], []);
+goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.IdGenerator'], []);
+goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], []);
+goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], []);
+goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], []);
+goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], []);
+goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], []);
+goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], []);
+goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], []);
+goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Blockly.utils.Coordinate', 'Blockly.utils.Size']);
+goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], []);
+goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], []);
+goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.constants']);
+goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global']);
+goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
+goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.utils', 'Blockly.utils.object']);
+goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils']);
+goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.xml']);
+goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml']);
+goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.utils.dom']);
+goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);
+goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.constants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es5'});
+goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml']);
+goog.addDependency('../../core/workspace_comment_render_svg.js', ['Blockly.WorkspaceCommentSvg.render'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.WorkspaceComment', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate']);
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
+goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
+goog.addDependency('base.js', [], []);
+

From 173ea2bc795cf725cdbe5e9865787a1109754304 Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Mon, 12 Jul 2021 02:54:59 +0100
Subject: [PATCH 003/833] Have eslint ignore undefined variable "exports"

Modules defined using goog.module declare their exported functions
by assigning them to properties on an object which is the value of
the variable "exports" (e.g., "exports.MyClass = class { ... };").

Normally eslint would complain about this variable being undefined,
but this commit suppresses these errors.
---
 .eslintrc.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 47430bdf2..0d5daf79c 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -79,7 +79,8 @@
     },
     "globals": {
         "Blockly": true,
-        "goog": true
+        "goog": true,
+        "exports": true
     },
     "extends": [
         "eslint:recommended"

From 1197afcee7a6dfcfbdde77f10317ffba90e418c2 Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Mon, 12 Jul 2021 03:17:14 +0100
Subject: [PATCH 004/833] Fix JSDoc type annotations causing closure-make-deps
 warnings

Some type annotations were missing curly brackets, which makes
closure-make-deps emit uninteresting warnings.  Now any output
from the command will be informative and related to whatever
one is presently working on.
---
 blocks/procedures.js           |  4 ++--
 core/contextmenu_items.js      |  3 ++-
 core/renderers/geras/info.js   | 12 ++++++------
 core/renderers/thrasos/info.js | 12 ++++++------
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/blocks/procedures.js b/blocks/procedures.js
index d6127cca0..644d7a751 100644
--- a/blocks/procedures.js
+++ b/blocks/procedures.js
@@ -519,7 +519,7 @@ Blockly.Blocks['procedures_mutatorarg'] = {
    * @param {string} varName User-supplied name.
    * @return {?string} Valid name, or null if a name was not specified.
    * @private
-   * @this Blockly.FieldTextInput
+   * @this {Blockly.FieldTextInput}
    */
   validator_: function(varName) {
     var sourceBlock = this.getSourceBlock();
@@ -571,7 +571,7 @@ Blockly.Blocks['procedures_mutatorarg'] = {
    * variable name.
    * @param {string} newText The new variable name.
    * @private
-   * @this Blockly.FieldTextInput
+   * @this {Blockly.FieldTextInput}
    */
   deleteIntermediateVars_: function(newText) {
     var outerWs = Blockly.Mutator.findParentWs(this.getSourceBlock().workspace);
diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js
index 581de6cdf..a8e3a41e5 100644
--- a/core/contextmenu_items.js
+++ b/core/contextmenu_items.js
@@ -191,7 +191,8 @@ Blockly.ContextMenuItems.addDeletableBlocks_ = function(block, deleteList) {
   if (block.isDeletable()) {
     Array.prototype.push.apply(deleteList, block.getDescendants(false));
   } else {
-    var children = /** @type !Array<!Blockly.BlockSvg> */ (block.getChildren(false));
+    var children =
+        /** @type {!Array<!Blockly.BlockSvg>} */ (block.getChildren(false));
     for (var i = 0; i < children.length; i++) {
       Blockly.ContextMenuItems.addDeletableBlocks_(children[i], deleteList);
     }
diff --git a/core/renderers/geras/info.js b/core/renderers/geras/info.js
index 4bca698f6..ffc515a17 100644
--- a/core/renderers/geras/info.js
+++ b/core/renderers/geras/info.js
@@ -158,7 +158,7 @@ Blockly.geras.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   if (!prev) {
     // Between an editable field and the beginning of the row.
     if (next && Blockly.blockRendering.Types.isField(next) &&
-        (/** @type Blockly.blockRendering.Field */ (next)).isEditable) {
+        (/** @type {Blockly.blockRendering.Field} */ (next)).isEditable) {
       return this.constants_.MEDIUM_PADDING;
     }
     // Inline input at the beginning of the row.
@@ -177,7 +177,7 @@ Blockly.geras.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
       Blockly.blockRendering.Types.isStatementInput(next))) {
     // Between an editable field and the end of the row.
     if (Blockly.blockRendering.Types.isField(prev) &&
-        (/** @type Blockly.blockRendering.Field */ (prev)).isEditable) {
+        (/** @type {Blockly.blockRendering.Field} */ (prev)).isEditable) {
       return this.constants_.MEDIUM_PADDING;
     }
     // Padding at the end of an icon-only row to make the block shape clearer.
@@ -219,7 +219,7 @@ Blockly.geras.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
       next && Blockly.blockRendering.Types.isInput(next)) {
     // Between an editable field and an input.
     if (Blockly.blockRendering.Types.isField(prev) &&
-        (/** @type Blockly.blockRendering.Field */ (prev)).isEditable) {
+        (/** @type {Blockly.blockRendering.Field} */ (prev)).isEditable) {
       if (Blockly.blockRendering.Types.isInlineInput(next)) {
         return this.constants_.SMALL_PADDING;
       } else if (Blockly.blockRendering.Types.isExternalInput(next)) {
@@ -247,7 +247,7 @@ Blockly.geras.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   if (Blockly.blockRendering.Types.isInlineInput(prev) &&
       next && Blockly.blockRendering.Types.isField(next)) {
     // Editable field after inline input.
-    if ((/** @type Blockly.blockRendering.Field */ (next)).isEditable) {
+    if ((/** @type {Blockly.blockRendering.Field} */ (next)).isEditable) {
       return this.constants_.MEDIUM_PADDING;
     } else {
       // Noneditable field after inline input.
@@ -288,8 +288,8 @@ Blockly.geras.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   // Spacing between two fields of the same editability.
   if (Blockly.blockRendering.Types.isField(prev) &&
       next && Blockly.blockRendering.Types.isField(next) &&
-      ((/** @type Blockly.blockRendering.Field */ (prev)).isEditable ==
-          (/** @type Blockly.blockRendering.Field */ (next)).isEditable)) {
+      ((/** @type {Blockly.blockRendering.Field} */ (prev)).isEditable ==
+          (/** @type {Blockly.blockRendering.Field} */ (next)).isEditable)) {
     return this.constants_.LARGE_PADDING;
   }
 
diff --git a/core/renderers/thrasos/info.js b/core/renderers/thrasos/info.js
index a5208c57d..962c6ea6d 100644
--- a/core/renderers/thrasos/info.js
+++ b/core/renderers/thrasos/info.js
@@ -97,7 +97,7 @@ Blockly.thrasos.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   if (!prev) {
     // Between an editable field and the beginning of the row.
     if (next && Blockly.blockRendering.Types.isField(next) &&
-        (/** @type Blockly.blockRendering.Field */ (next)).isEditable) {
+        (/** @type {Blockly.blockRendering.Field} */ (next)).isEditable) {
       return this.constants_.MEDIUM_PADDING;
     }
     // Inline input at the beginning of the row.
@@ -115,7 +115,7 @@ Blockly.thrasos.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   if (!Blockly.blockRendering.Types.isInput(prev) && !next) {
     // Between an editable field and the end of the row.
     if (Blockly.blockRendering.Types.isField(prev) &&
-        (/** @type Blockly.blockRendering.Field */ (prev)).isEditable) {
+        (/** @type {Blockly.blockRendering.Field} */ (prev)).isEditable) {
       return this.constants_.MEDIUM_PADDING;
     }
     // Padding at the end of an icon-only row to make the block shape clearer.
@@ -157,7 +157,7 @@ Blockly.thrasos.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
       next && Blockly.blockRendering.Types.isInput(next)) {
     // Between an editable field and an input.
     if (Blockly.blockRendering.Types.isField(prev) &&
-        (/** @type Blockly.blockRendering.Field */ (prev)).isEditable) {
+        (/** @type {Blockly.blockRendering.Field} */ (prev)).isEditable) {
       if (Blockly.blockRendering.Types.isInlineInput(next)) {
         return this.constants_.SMALL_PADDING;
       } else if (Blockly.blockRendering.Types.isExternalInput(next)) {
@@ -185,7 +185,7 @@ Blockly.thrasos.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   if (Blockly.blockRendering.Types.isInlineInput(prev) &&
       next && Blockly.blockRendering.Types.isField(next)) {
     // Editable field after inline input.
-    if ((/** @type Blockly.blockRendering.Field */ (next)).isEditable) {
+    if ((/** @type {Blockly.blockRendering.Field} */ (next)).isEditable) {
       return this.constants_.MEDIUM_PADDING;
     } else {
       // Noneditable field after inline input.
@@ -213,8 +213,8 @@ Blockly.thrasos.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   // Spacing between two fields of the same editability.
   if (Blockly.blockRendering.Types.isField(prev) &&
       next && Blockly.blockRendering.Types.isField(next) &&
-      ((/** @type Blockly.blockRendering.Field */ (prev)).isEditable ==
-          (/** @type Blockly.blockRendering.Field */ (next)).isEditable)) {
+      ((/** @type {Blockly.blockRendering.Field} */ (prev)).isEditable ==
+          (/** @type {Blockly.blockRendering.Field} */ (next)).isEditable)) {
     return this.constants_.LARGE_PADDING;
   }
 

From 603755f250f4f8da9324f699ba946c2cc67fe7c2 Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Mon, 12 Jul 2021 03:51:17 +0100
Subject: [PATCH 005/833] Suppress spurious eslint error

eslint appears to be confused by the leading JSDoc comment on the
continuation line and suggests it should be indented only 4 rather
than 8 spaces.
---
 core/contextmenu_items.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js
index a8e3a41e5..da417cac6 100644
--- a/core/contextmenu_items.js
+++ b/core/contextmenu_items.js
@@ -191,6 +191,7 @@ Blockly.ContextMenuItems.addDeletableBlocks_ = function(block, deleteList) {
   if (block.isDeletable()) {
     Array.prototype.push.apply(deleteList, block.getDescendants(false));
   } else {
+    /* eslint-disable indent */
     var children =
         /** @type {!Array<!Blockly.BlockSvg>} */ (block.getChildren(false));
     for (var i = 0; i < children.length; i++) {

From 948fade7c5c0593f964c12b305fd8bbb3db09da9 Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Tue, 13 Jul 2021 12:08:35 +0100
Subject: [PATCH 006/833] Only disable eslint indent check on one line
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For whatever reason eslint was rejecting the (styleguide-correct)
indentation of the line beginning with "/** @type ...", and in my
naïvete I got a little more zealous than I intended in suppressing
the error.
---
 core/contextmenu_items.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js
index da417cac6..dffd4a83d 100644
--- a/core/contextmenu_items.js
+++ b/core/contextmenu_items.js
@@ -191,8 +191,7 @@ Blockly.ContextMenuItems.addDeletableBlocks_ = function(block, deleteList) {
   if (block.isDeletable()) {
     Array.prototype.push.apply(deleteList, block.getDescendants(false));
   } else {
-    /* eslint-disable indent */
-    var children =
+    var children =  /* eslint-disable-next-line indent */
         /** @type {!Array<!Blockly.BlockSvg>} */ (block.getChildren(false));
     for (var i = 0; i < children.length; i++) {
       Blockly.ContextMenuItems.addDeletableBlocks_(children[i], deleteList);

From 78b8e2fa85aae38ca3c01ef7b194863a21c9071e Mon Sep 17 00:00:00 2001
From: Aaron Dodson <gonfunko@gmail.com>
Date: Tue, 13 Jul 2021 14:42:56 -0700
Subject: [PATCH 007/833] Migrate object.js to ES6 const/let

---
 core/utils/object.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/utils/object.js b/core/utils/object.js
index 3e95934d2..1317fd58b 100644
--- a/core/utils/object.js
+++ b/core/utils/object.js
@@ -46,7 +46,7 @@ Blockly.utils.object.inherits = function(childCtor, parentCtor) {
  * @param {!Object} source Source.
  */
 Blockly.utils.object.mixin = function(target, source) {
-  for (var x in source) {
+  for (const x in source) {
     target[x] = source[x];
   }
 };
@@ -58,7 +58,7 @@ Blockly.utils.object.mixin = function(target, source) {
  * @return {!Object} The resulting object.
  */
 Blockly.utils.object.deepMerge = function(target, source) {
-  for (var x in source) {
+  for (const x in source) {
     if (source[x] != null && typeof source[x] === 'object') {
       target[x] = Blockly.utils.object.deepMerge(
           target[x] || Object.create(null), source[x]);

From d224a2341deffc33d628d3da148cc7489ad9483e Mon Sep 17 00:00:00 2001
From: Aaron Dodson <gonfunko@gmail.com>
Date: Tue, 13 Jul 2021 15:30:56 -0700
Subject: [PATCH 008/833] Migrate object.js to goog.module

---
 core/utils/object.js | 21 ++++++++++++++-------
 tests/deps.js        |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/core/utils/object.js b/core/utils/object.js
index 1317fd58b..ea7b3632a 100644
--- a/core/utils/object.js
+++ b/core/utils/object.js
@@ -14,7 +14,8 @@
  * @name Blockly.utils.object
  * @namespace
  */
-goog.provide('Blockly.utils.object');
+goog.module('Blockly.utils.object');
+goog.module.declareLegacyNamespace();
 
 
 /**
@@ -23,7 +24,7 @@ goog.provide('Blockly.utils.object');
  * @param {!Function} parentCtor Parent class.
  * @suppress {strictMissingProperties} superClass_ is not defined on Function.
  */
-Blockly.utils.object.inherits = function(childCtor, parentCtor) {
+const inherits = function(childCtor, parentCtor) {
   // Set a .superClass_ property so that methods can call parent methods
   // without hard-coding the parent class name.
   // Could be replaced by ES6's super().
@@ -45,7 +46,7 @@ Blockly.utils.object.inherits = function(childCtor, parentCtor) {
  * @param {!Object} target Target.
  * @param {!Object} source Source.
  */
-Blockly.utils.object.mixin = function(target, source) {
+const mixin = function(target, source) {
   for (const x in source) {
     target[x] = source[x];
   }
@@ -57,11 +58,10 @@ Blockly.utils.object.mixin = function(target, source) {
  * @param {!Object} source Source.
  * @return {!Object} The resulting object.
  */
-Blockly.utils.object.deepMerge = function(target, source) {
+const deepMerge = function(target, source) {
   for (const x in source) {
     if (source[x] != null && typeof source[x] === 'object') {
-      target[x] = Blockly.utils.object.deepMerge(
-          target[x] || Object.create(null), source[x]);
+      target[x] = deepMerge(target[x] || Object.create(null), source[x]);
     } else {
       target[x] = source[x];
     }
@@ -74,7 +74,7 @@ Blockly.utils.object.deepMerge = function(target, source) {
  * @param {!Object} obj Object containing values.
  * @return {!Array} Array of values.
  */
-Blockly.utils.object.values = function(obj) {
+const values = function(obj) {
   if (Object.values) {
     return Object.values(obj);
   }
@@ -83,3 +83,10 @@ Blockly.utils.object.values = function(obj) {
     return obj[e];
   });
 };
+
+exports = {
+  inherits,
+  mixin,
+  deepMerge,
+  values,
+}
\ No newline at end of file
diff --git a/tests/deps.js b/tests/deps.js
index 4cb0f6fd3..01054cdfa 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -179,7 +179,7 @@ goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.IdGenerato
 goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], []);
 goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], []);
 goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], []);
-goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], []);
+goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], []);
 goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], []);
 goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], []);

From 2bdf2627afa2b1ef721b77f0f491ab563c8378b7 Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Tue, 13 Jul 2021 23:54:36 +0100
Subject: [PATCH 009/833] Configure eslint and Closure Compiler to accept ES6

---
 .eslintrc.json                   | 1 +
 scripts/gulpfiles/build_tasks.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.eslintrc.json b/.eslintrc.json
index 0d5daf79c..9d74291da 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -75,6 +75,7 @@
         }]
     },
     "env": {
+        "es6": true,
         "browser": true
     },
     "globals": {
diff --git a/scripts/gulpfiles/build_tasks.js b/scripts/gulpfiles/build_tasks.js
index 3aaa4ac04..e6f496544 100644
--- a/scripts/gulpfiles/build_tasks.js
+++ b/scripts/gulpfiles/build_tasks.js
@@ -118,6 +118,7 @@ function compile(compilerOptions, opt_verbose, opt_warnings_as_error,
   const options = {};
   options.compilation_level = 'SIMPLE_OPTIMIZATIONS';
   options.warning_level = opt_verbose ? 'VERBOSE' : 'DEFAULT';
+  options.language_in = 'ECMASCRIPT6_STRICT',
   options.language_out = 'ECMASCRIPT5_STRICT';
   options.rewrite_polyfills = false;
   options.hide_warnings_for = 'node_modules';

From 632ef12ed577d0aa881b579b0e1625b20faf0e6e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 13 Jul 2021 18:45:34 -0700
Subject: [PATCH 010/833] Migrate core/utils/keycodes.js to goog.module

---
 core/utils/keycodes.js | 7 +++++--
 tests/deps.js          | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/utils/keycodes.js b/core/utils/keycodes.js
index a5be94cb8..586d2f97e 100644
--- a/core/utils/keycodes.js
+++ b/core/utils/keycodes.js
@@ -16,7 +16,8 @@
  * @name Blockly.utils.KeyCodes
  * @namespace
  */
-goog.provide('Blockly.utils.KeyCodes');
+goog.module('Blockly.utils.KeyCodes');
+goog.module.declareLegacyNamespace();
 
 
 /**
@@ -29,7 +30,7 @@ goog.provide('Blockly.utils.KeyCodes');
  *
  * @enum {number}
  */
-Blockly.utils.KeyCodes = {
+const KeyCodes = {
   WIN_KEY_FF_LINUX: 0,
   MAC_ENTER: 3,
   BACKSPACE: 8,
@@ -166,3 +167,5 @@ Blockly.utils.KeyCodes = {
   // http://en.community.dell.com/support-forums/laptop/f/3518/p/19285957/19523128.aspx
   PHANTOM: 255
 };
+
+exports = KeyCodes;
diff --git a/tests/deps.js b/tests/deps.js
index 4cb0f6fd3..45860bd0c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -176,7 +176,7 @@ goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecatio
 goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.Svg', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], []);
 goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.IdGenerator'], []);
-goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], []);
+goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], []);
 goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], []);
 goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], []);

From b92fba1a5a934d051be8e0e1fb9b4b8497c7ecf5 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <gonfunko@gmail.com>
Date: Wed, 14 Jul 2021 10:55:10 -0700
Subject: [PATCH 011/833] Fixed missing semicolon.

---
 core/utils/object.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/utils/object.js b/core/utils/object.js
index ea7b3632a..dae55ec51 100644
--- a/core/utils/object.js
+++ b/core/utils/object.js
@@ -89,4 +89,4 @@ exports = {
   mixin,
   deepMerge,
   values,
-}
\ No newline at end of file
+};

From cd4831537eea7e0547dd68f7626303a2012d0d8e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 13 Jul 2021 17:16:17 -0700
Subject: [PATCH 012/833] Migrate core/utils/deprecation.js to ES6 const/let

---
 core/utils/deprecation.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/utils/deprecation.js b/core/utils/deprecation.js
index 4c948f22b..b849c2a1a 100644
--- a/core/utils/deprecation.js
+++ b/core/utils/deprecation.js
@@ -31,8 +31,8 @@ goog.provide('Blockly.utils.deprecation');
  */
 Blockly.utils.deprecation.warn = function(
     name, deprecationDate, deletionDate, opt_use) {
-  var msg = name + ' was deprecated on ' + deprecationDate +
-        ' and will be deleted on ' + deletionDate + '.';
+  let msg = name + ' was deprecated on ' + deprecationDate +
+      ' and will be deleted on ' + deletionDate + '.';
   if (opt_use) {
     msg += '\nUse ' + opt_use + ' instead.';
   }

From 2bf717019fc555fb9f6d6a713460929b18b105e5 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 13 Jul 2021 18:12:10 -0700
Subject: [PATCH 013/833] Migrate core/utils/deprecation.js to goog.module

---
 core/utils/deprecation.js | 7 +++++--
 tests/deps.js             | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/utils/deprecation.js b/core/utils/deprecation.js
index b849c2a1a..a361f563d 100644
--- a/core/utils/deprecation.js
+++ b/core/utils/deprecation.js
@@ -15,7 +15,8 @@
  * @name Blockly.utils.deprecation
  * @namespace
  */
-goog.provide('Blockly.utils.deprecation');
+goog.module('Blockly.utils.deprecation');
+goog.module.declareLegacyNamespace();
 
 
 /**
@@ -29,7 +30,7 @@ goog.provide('Blockly.utils.deprecation');
  *     if any.
  * @package
  */
-Blockly.utils.deprecation.warn = function(
+const warn = function(
     name, deprecationDate, deletionDate, opt_use) {
   let msg = name + ' was deprecated on ' + deprecationDate +
       ' and will be deleted on ' + deletionDate + '.';
@@ -38,3 +39,5 @@ Blockly.utils.deprecation.warn = function(
   }
   console.warn(msg);
 };
+
+exports = {warn};
diff --git a/tests/deps.js b/tests/deps.js
index 45860bd0c..daed787d5 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -172,7 +172,7 @@ goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Bl
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], []);
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], []);
-goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], []);
+goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.Svg', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], []);
 goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.IdGenerator'], []);

From 819a0f1596c66faa0cf5bcc88fe912d8c42b0422 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 13 Jul 2021 18:12:13 -0700
Subject: [PATCH 014/833] clang-format core/utils/deprecation.js

---
 core/utils/deprecation.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/utils/deprecation.js b/core/utils/deprecation.js
index a361f563d..ad798b1ab 100644
--- a/core/utils/deprecation.js
+++ b/core/utils/deprecation.js
@@ -30,8 +30,7 @@ goog.module.declareLegacyNamespace();
  *     if any.
  * @package
  */
-const warn = function(
-    name, deprecationDate, deletionDate, opt_use) {
+const warn = function(name, deprecationDate, deletionDate, opt_use) {
   let msg = name + ' was deprecated on ' + deprecationDate +
       ' and will be deleted on ' + deletionDate + '.';
   if (opt_use) {

From 08911510d2c18ad66d41007727abc1a688d93239 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Wed, 14 Jul 2021 13:23:57 -0700
Subject: [PATCH 015/833] Migrate core/utils/idgenerator.js to goog.module

---
 core/utils/idgenerator.js | 11 +++++++----
 tests/deps.js             |  3 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/utils/idgenerator.js b/core/utils/idgenerator.js
index 347b71d02..6ad7bcf55 100644
--- a/core/utils/idgenerator.js
+++ b/core/utils/idgenerator.js
@@ -16,7 +16,8 @@
  * @name Blockly.utils.IdGenerator
  * @namespace
  */
-goog.provide('Blockly.utils.IdGenerator');
+goog.module('Blockly.utils.IdGenerator');
+goog.module.declareLegacyNamespace();
 
 
 /**
@@ -24,7 +25,7 @@ goog.provide('Blockly.utils.IdGenerator');
  * @type {number}
  * @private
  */
-Blockly.utils.IdGenerator.nextId_ = 0;
+let nextId = 0;
 
 /**
  * Gets the next unique ID.
@@ -32,6 +33,8 @@ Blockly.utils.IdGenerator.nextId_ = 0;
  * Use only ASCII letters, digits, '_', '-' and '.'
  * @return {string} The next unique identifier.
  */
-Blockly.utils.IdGenerator.getNextUniqueId = function() {
-  return 'blockly-' + (Blockly.utils.IdGenerator.nextId_++).toString(36);
+const getNextUniqueId = function() {
+  return 'blockly-' + (nextId++).toString(36);
 };
+
+exports = {getNextUniqueId};
diff --git a/tests/deps.js b/tests/deps.js
index 45860bd0c..d0f01aef3 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -4,6 +4,7 @@ goog.addDependency('../../blocks/logic.js', ['Blockly.Blocks.logic', 'Blockly.Co
 goog.addDependency('../../blocks/loops.js', ['Blockly.Blocks.loops', 'Blockly.Constants.Loops'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable', 'Blockly.Warning']);
 goog.addDependency('../../blocks/math.js', ['Blockly.Blocks.math', 'Blockly.Constants.Math'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'], ['Blockly', 'Blockly.Blocks', 'Blockly.Comment', 'Blockly.FieldCheckbox', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.Mutator', 'Blockly.Warning'], {'lang': 'es5'});
+goog.addDependency('../../blocks/test_blocks.js', ['Blockly.TestBlocks'], ['Blockly', 'Blockly.Blocks'], {'lang': 'es5'});
 goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator']);
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
@@ -175,7 +176,7 @@ goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'
 goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], []);
 goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.Svg', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], []);
-goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.IdGenerator'], []);
+goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.IdGenerator'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], []);
 goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], []);

From 78e72222c1e82c55b04ff7a836cfec50f06e8479 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <gonfunko@gmail.com>
Date: Wed, 14 Jul 2021 13:48:22 -0700
Subject: [PATCH 016/833] Migrate core/utils/style.js to ES6 const/let

---
 core/utils/style.js | 64 ++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/core/utils/style.js b/core/utils/style.js
index 1c169453d..cdb22139c 100644
--- a/core/utils/style.js
+++ b/core/utils/style.js
@@ -34,17 +34,17 @@ Blockly.utils.style.getSize = function(element) {
   }
 
   // Evaluate size with a temporary element.
-  var style = element.style;
-  var originalDisplay = style.display;
-  var originalVisibility = style.visibility;
-  var originalPosition = style.position;
+  const style = element.style;
+  const originalDisplay = style.display;
+  const originalVisibility = style.visibility;
+  const originalPosition = style.position;
 
   style.visibility = 'hidden';
   style.position = 'absolute';
   style.display = 'inline';
 
-  var offsetWidth = /** @type {!HTMLElement} */ (element).offsetWidth;
-  var offsetHeight = /** @type {!HTMLElement} */ (element).offsetHeight;
+  const offsetWidth = /** @type {!HTMLElement} */ (element).offsetWidth;
+  const offsetHeight = /** @type {!HTMLElement} */ (element).offsetHeight;
 
   style.display = originalDisplay;
   style.position = originalPosition;
@@ -60,8 +60,8 @@ Blockly.utils.style.getSize = function(element) {
  * @private
  */
 Blockly.utils.style.getSizeWithDisplay_ = function(element) {
-  var offsetWidth = /** @type {!HTMLElement} */ (element).offsetWidth;
-  var offsetHeight = /** @type {!HTMLElement} */ (element).offsetHeight;
+  const offsetWidth = /** @type {!HTMLElement} */ (element).offsetWidth;
+  const offsetHeight = /** @type {!HTMLElement} */ (element).offsetHeight;
   return new Blockly.utils.Size(offsetWidth, offsetHeight);
 };
 
@@ -99,7 +99,7 @@ Blockly.utils.style.getStyle_ = function(element, style) {
  */
 Blockly.utils.style.getComputedStyle = function(element, property) {
   if (document.defaultView && document.defaultView.getComputedStyle) {
-    var styles = document.defaultView.getComputedStyle(element, null);
+    const styles = document.defaultView.getComputedStyle(element, null);
     if (styles) {
       // element.style[..] is undefined for browser specific styles
       // as 'filter'.
@@ -132,13 +132,13 @@ Blockly.utils.style.getCascadedStyle = function(element, style) {
  * @return {!Blockly.utils.Coordinate} The page offset.
  */
 Blockly.utils.style.getPageOffset = function(el) {
-  var pos = new Blockly.utils.Coordinate(0, 0);
-  var box = el.getBoundingClientRect();
-  var documentElement = document.documentElement;
+  const pos = new Blockly.utils.Coordinate(0, 0);
+  const box = el.getBoundingClientRect();
+  const documentElement = document.documentElement;
   // Must add the scroll coordinates in to get the absolute page offset
   // of element since getBoundingClientRect returns relative coordinates to
   // the viewport.
-  var scrollCoord = new Blockly.utils.Coordinate(
+  const scrollCoord = new Blockly.utils.Coordinate(
       window.pageXOffset || documentElement.scrollLeft,
       window.pageYOffset || documentElement.scrollTop);
   pos.x = box.left + scrollCoord.x;
@@ -153,10 +153,10 @@ Blockly.utils.style.getPageOffset = function(el) {
  * @return {!Blockly.utils.Coordinate} The page offset of the viewport.
  */
 Blockly.utils.style.getViewportPageOffset = function() {
-  var body = document.body;
-  var documentElement = document.documentElement;
-  var scrollLeft = body.scrollLeft || documentElement.scrollLeft;
-  var scrollTop = body.scrollTop || documentElement.scrollTop;
+  const body = document.body;
+  const documentElement = document.documentElement;
+  const scrollLeft = body.scrollLeft || documentElement.scrollLeft;
+  const scrollTop = body.scrollTop || documentElement.scrollTop;
   return new Blockly.utils.Coordinate(scrollLeft, scrollTop);
 };
 
@@ -194,10 +194,10 @@ Blockly.utils.style.isRightToLeft = function(el) {
  * @return {!Object} The computed border widths.
  */
 Blockly.utils.style.getBorderBox = function(element) {
-  var left = Blockly.utils.style.getComputedStyle(element, 'borderLeftWidth');
-  var right = Blockly.utils.style.getComputedStyle(element, 'borderRightWidth');
-  var top = Blockly.utils.style.getComputedStyle(element, 'borderTopWidth');
-  var bottom = Blockly.utils.style.getComputedStyle(element, 'borderBottomWidth');
+  const left = Blockly.utils.style.getComputedStyle(element, 'borderLeftWidth');
+  const right = Blockly.utils.style.getComputedStyle(element, 'borderRightWidth');
+  const top = Blockly.utils.style.getComputedStyle(element, 'borderTopWidth');
+  const bottom = Blockly.utils.style.getComputedStyle(element, 'borderBottomWidth');
 
   return {
     top: parseFloat(top),
@@ -222,7 +222,7 @@ Blockly.utils.style.getBorderBox = function(element) {
  */
 Blockly.utils.style.scrollIntoContainerView = function(
     element, container, opt_center) {
-  var offset =
+  const offset =
       Blockly.utils.style.getContainerOffsetToScrollInto(element,
           container, opt_center);
   container.scrollLeft = offset.x;
@@ -247,21 +247,21 @@ Blockly.utils.style.scrollIntoContainerView = function(
 Blockly.utils.style.getContainerOffsetToScrollInto = function(
     element, container, opt_center) {
   // Absolute position of the element's border's top left corner.
-  var elementPos = Blockly.utils.style.getPageOffset(element);
+  const elementPos = Blockly.utils.style.getPageOffset(element);
   // Absolute position of the container's border's top left corner.
-  var containerPos = Blockly.utils.style.getPageOffset(container);
-  var containerBorder = Blockly.utils.style.getBorderBox(container);
+  const containerPos = Blockly.utils.style.getPageOffset(container);
+  const containerBorder = Blockly.utils.style.getBorderBox(container);
   // Relative pos. of the element's border box to the container's content box.
-  var relX = elementPos.x - containerPos.x - containerBorder.left;
-  var relY = elementPos.y - containerPos.y - containerBorder.top;
+  const relX = elementPos.x - containerPos.x - containerBorder.left;
+  const relY = elementPos.y - containerPos.y - containerBorder.top;
   // How much the element can move in the container, i.e. the difference between
   // the element's bottom-right-most and top-left-most position where it's
   // fully visible.
-  var elementSize = Blockly.utils.style.getSizeWithDisplay_(element);
-  var spaceX = container.clientWidth - elementSize.width;
-  var spaceY = container.clientHeight - elementSize.height;
-  var scrollLeft = container.scrollLeft;
-  var scrollTop = container.scrollTop;
+  const elementSize = Blockly.utils.style.getSizeWithDisplay_(element);
+  const spaceX = container.clientWidth - elementSize.width;
+  const spaceY = container.clientHeight - elementSize.height;
+  let scrollLeft = container.scrollLeft;
+  let scrollTop = container.scrollTop;
   if (opt_center) {
     // All browsers round non-integer scroll positions down.
     scrollLeft += relX - spaceX / 2;

From 656f4fc9d680fa9e5b4b577942d03900c858ef2a Mon Sep 17 00:00:00 2001
From: Aaron Dodson <gonfunko@gmail.com>
Date: Wed, 14 Jul 2021 13:58:05 -0700
Subject: [PATCH 017/833] Migrate core/utils/style.js to goog.module

---
 core/utils/style.js | 68 +++++++++++++++++++++++++++------------------
 tests/deps.js       |  2 +-
 2 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/core/utils/style.js b/core/utils/style.js
index cdb22139c..9447db11a 100644
--- a/core/utils/style.js
+++ b/core/utils/style.js
@@ -16,7 +16,8 @@
  * @name Blockly.utils.style
  * @namespace
  */
-goog.provide('Blockly.utils.style');
+goog.module('Blockly.utils.style');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.Size');
@@ -28,9 +29,9 @@ goog.require('Blockly.utils.Size');
  * @param {!Element} element Element to get size of.
  * @return {!Blockly.utils.Size} Object with width/height properties.
  */
-Blockly.utils.style.getSize = function(element) {
-  if (Blockly.utils.style.getStyle_(element, 'display') != 'none') {
-    return Blockly.utils.style.getSizeWithDisplay_(element);
+const getSize = function(element) {
+  if (getStyle(element, 'display') != 'none') {
+    return getSizeWithDisplay(element);
   }
 
   // Evaluate size with a temporary element.
@@ -59,7 +60,7 @@ Blockly.utils.style.getSize = function(element) {
  * @return {!Blockly.utils.Size} Object with width/height properties.
  * @private
  */
-Blockly.utils.style.getSizeWithDisplay_ = function(element) {
+const getSizeWithDisplay = function(element) {
   const offsetWidth = /** @type {!HTMLElement} */ (element).offsetWidth;
   const offsetHeight = /** @type {!HTMLElement} */ (element).offsetHeight;
   return new Blockly.utils.Size(offsetWidth, offsetHeight);
@@ -79,9 +80,9 @@ Blockly.utils.style.getSizeWithDisplay_ = function(element) {
  * @return {string} Style value.
  * @private
  */
-Blockly.utils.style.getStyle_ = function(element, style) {
-  return Blockly.utils.style.getComputedStyle(element, style) ||
-      Blockly.utils.style.getCascadedStyle(element, style) ||
+const getStyle = function(element, style) {
+  return getComputedStyle(element, style) ||
+      getCascadedStyle(element, style) ||
       (element.style && element.style[style]);
 };
 
@@ -97,7 +98,7 @@ Blockly.utils.style.getStyle_ = function(element, style) {
  * @param {string} property Property to get (camel-case).
  * @return {string} Style value.
  */
-Blockly.utils.style.getComputedStyle = function(element, property) {
+const getComputedStyle = function(element, property) {
   if (document.defaultView && document.defaultView.getComputedStyle) {
     const styles = document.defaultView.getComputedStyle(element, null);
     if (styles) {
@@ -120,7 +121,7 @@ Blockly.utils.style.getComputedStyle = function(element, property) {
  * @param {string} style Property to get (camel-case).
  * @return {string} Style value.
  */
-Blockly.utils.style.getCascadedStyle = function(element, style) {
+const getCascadedStyle = function(element, style) {
   return /** @type {string} */ (
       element.currentStyle ? element.currentStyle[style] : null);
 };
@@ -131,7 +132,7 @@ Blockly.utils.style.getCascadedStyle = function(element, style) {
  * @param {!Element} el Element to get the page offset for.
  * @return {!Blockly.utils.Coordinate} The page offset.
  */
-Blockly.utils.style.getPageOffset = function(el) {
+const getPageOffset = function(el) {
   const pos = new Blockly.utils.Coordinate(0, 0);
   const box = el.getBoundingClientRect();
   const documentElement = document.documentElement;
@@ -152,7 +153,7 @@ Blockly.utils.style.getPageOffset = function(el) {
  * Similar to Closure's goog.style.getViewportPageOffset
  * @return {!Blockly.utils.Coordinate} The page offset of the viewport.
  */
-Blockly.utils.style.getViewportPageOffset = function() {
+const getViewportPageOffset = function() {
   const body = document.body;
   const documentElement = document.documentElement;
   const scrollLeft = body.scrollLeft || documentElement.scrollLeft;
@@ -172,7 +173,7 @@ Blockly.utils.style.getViewportPageOffset = function() {
  * @param {*} isShown True to render the element in its default style,
  *     false to disable rendering the element.
  */
-Blockly.utils.style.setElementShown = function(el, isShown) {
+const setElementShown = function(el, isShown) {
   el.style.display = isShown ? '' : 'none';
 };
 
@@ -183,8 +184,8 @@ Blockly.utils.style.setElementShown = function(el, isShown) {
  * @param {!Element} el The element to test.
  * @return {boolean} True for right to left, false for left to right.
  */
-Blockly.utils.style.isRightToLeft = function(el) {
-  return 'rtl' == Blockly.utils.style.getStyle_(el, 'direction');
+const isRightToLeft = function(el) {
+  return 'rtl' == getStyle(el, 'direction');
 };
 
 /**
@@ -193,11 +194,11 @@ Blockly.utils.style.isRightToLeft = function(el) {
  * @param {!Element} element  The element to get the border widths for.
  * @return {!Object} The computed border widths.
  */
-Blockly.utils.style.getBorderBox = function(element) {
-  const left = Blockly.utils.style.getComputedStyle(element, 'borderLeftWidth');
-  const right = Blockly.utils.style.getComputedStyle(element, 'borderRightWidth');
-  const top = Blockly.utils.style.getComputedStyle(element, 'borderTopWidth');
-  const bottom = Blockly.utils.style.getComputedStyle(element, 'borderBottomWidth');
+const getBorderBox = function(element) {
+  const left = getComputedStyle(element, 'borderLeftWidth');
+  const right = getComputedStyle(element, 'borderRightWidth');
+  const top = getComputedStyle(element, 'borderTopWidth');
+  const bottom = getComputedStyle(element, 'borderBottomWidth');
 
   return {
     top: parseFloat(top),
@@ -220,10 +221,10 @@ Blockly.utils.style.getBorderBox = function(element) {
  * @param {boolean=} opt_center Whether to center the element in the container.
  *     Defaults to false.
  */
-Blockly.utils.style.scrollIntoContainerView = function(
+const scrollIntoContainerView = function(
     element, container, opt_center) {
   const offset =
-      Blockly.utils.style.getContainerOffsetToScrollInto(element,
+      getContainerOffsetToScrollInto(element,
           container, opt_center);
   container.scrollLeft = offset.x;
   container.scrollTop = offset.y;
@@ -244,20 +245,20 @@ Blockly.utils.style.scrollIntoContainerView = function(
  * @return {!Blockly.utils.Coordinate} The new scroll position of the container,
  *     in form of goog.math.Coordinate(scrollLeft, scrollTop).
  */
-Blockly.utils.style.getContainerOffsetToScrollInto = function(
+const getContainerOffsetToScrollInto = function(
     element, container, opt_center) {
   // Absolute position of the element's border's top left corner.
-  const elementPos = Blockly.utils.style.getPageOffset(element);
+  const elementPos = getPageOffset(element);
   // Absolute position of the container's border's top left corner.
-  const containerPos = Blockly.utils.style.getPageOffset(container);
-  const containerBorder = Blockly.utils.style.getBorderBox(container);
+  const containerPos = getPageOffset(container);
+  const containerBorder = getBorderBox(container);
   // Relative pos. of the element's border box to the container's content box.
   const relX = elementPos.x - containerPos.x - containerBorder.left;
   const relY = elementPos.y - containerPos.y - containerBorder.top;
   // How much the element can move in the container, i.e. the difference between
   // the element's bottom-right-most and top-left-most position where it's
   // fully visible.
-  const elementSize = Blockly.utils.style.getSizeWithDisplay_(element);
+  const elementSize = getSizeWithDisplay(element);
   const spaceX = container.clientWidth - elementSize.width;
   const spaceY = container.clientHeight - elementSize.height;
   let scrollLeft = container.scrollLeft;
@@ -279,3 +280,16 @@ Blockly.utils.style.getContainerOffsetToScrollInto = function(
   }
   return new Blockly.utils.Coordinate(scrollLeft, scrollTop);
 };
+
+exports = {
+  getSize,
+  getComputedStyle,
+  getCascadedStyle,
+  getPageOffset,
+  getViewportPageOffset,
+  setElementShown,
+  isRightToLeft,
+  getBorderBox,
+  scrollIntoContainerView,
+  getContainerOffsetToScrollInto,
+};
diff --git a/tests/deps.js b/tests/deps.js
index 4cb0f6fd3..fafe772f1 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -183,7 +183,7 @@ goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], []);
 goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], []);
 goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], []);
 goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], []);
-goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Blockly.utils.Coordinate', 'Blockly.utils.Size']);
+goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Blockly.utils.Coordinate', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], []);
 goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], []);
 goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.constants']);

From 55ac3741b7ec070315f44d97a604b048db2df43e Mon Sep 17 00:00:00 2001
From: Aaron Dodson <gonfunko@gmail.com>
Date: Wed, 14 Jul 2021 14:10:42 -0700
Subject: [PATCH 018/833] Migrate core/utils/style.js to named requires

---
 core/utils/style.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/core/utils/style.js b/core/utils/style.js
index 9447db11a..90cfa1d9a 100644
--- a/core/utils/style.js
+++ b/core/utils/style.js
@@ -19,15 +19,15 @@
 goog.module('Blockly.utils.style');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.Size');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Size = goog.require('Blockly.utils.Size');
 
 
 /**
  * Gets the height and width of an element.
  * Similar to Closure's goog.style.getSize
  * @param {!Element} element Element to get size of.
- * @return {!Blockly.utils.Size} Object with width/height properties.
+ * @return {!Size} Object with width/height properties.
  */
 const getSize = function(element) {
   if (getStyle(element, 'display') != 'none') {
@@ -51,19 +51,19 @@ const getSize = function(element) {
   style.position = originalPosition;
   style.visibility = originalVisibility;
 
-  return new Blockly.utils.Size(offsetWidth, offsetHeight);
+  return new Size(offsetWidth, offsetHeight);
 };
 
 /**
  * Gets the height and width of an element when the display is not none.
  * @param {!Element} element Element to get size of.
- * @return {!Blockly.utils.Size} Object with width/height properties.
+ * @return {!Size} Object with width/height properties.
  * @private
  */
 const getSizeWithDisplay = function(element) {
   const offsetWidth = /** @type {!HTMLElement} */ (element).offsetWidth;
   const offsetHeight = /** @type {!HTMLElement} */ (element).offsetHeight;
-  return new Blockly.utils.Size(offsetWidth, offsetHeight);
+  return new Size(offsetWidth, offsetHeight);
 };
 
 /**
@@ -130,16 +130,16 @@ const getCascadedStyle = function(element, style) {
  * Returns a Coordinate object relative to the top-left of the HTML document.
  * Similar to Closure's goog.style.getPageOffset
  * @param {!Element} el Element to get the page offset for.
- * @return {!Blockly.utils.Coordinate} The page offset.
+ * @return {!Coordinate} The page offset.
  */
 const getPageOffset = function(el) {
-  const pos = new Blockly.utils.Coordinate(0, 0);
+  const pos = new Coordinate(0, 0);
   const box = el.getBoundingClientRect();
   const documentElement = document.documentElement;
   // Must add the scroll coordinates in to get the absolute page offset
   // of element since getBoundingClientRect returns relative coordinates to
   // the viewport.
-  const scrollCoord = new Blockly.utils.Coordinate(
+  const scrollCoord = new Coordinate(
       window.pageXOffset || documentElement.scrollLeft,
       window.pageYOffset || documentElement.scrollTop);
   pos.x = box.left + scrollCoord.x;
@@ -151,14 +151,14 @@ const getPageOffset = function(el) {
 /**
  * Calculates the viewport coordinates relative to the document.
  * Similar to Closure's goog.style.getViewportPageOffset
- * @return {!Blockly.utils.Coordinate} The page offset of the viewport.
+ * @return {!Coordinate} The page offset of the viewport.
  */
 const getViewportPageOffset = function() {
   const body = document.body;
   const documentElement = document.documentElement;
   const scrollLeft = body.scrollLeft || documentElement.scrollLeft;
   const scrollTop = body.scrollTop || documentElement.scrollTop;
-  return new Blockly.utils.Coordinate(scrollLeft, scrollTop);
+  return new Coordinate(scrollLeft, scrollTop);
 };
 
 /**
@@ -242,7 +242,7 @@ const scrollIntoContainerView = function(
  *     document scroll element will be used.
  * @param {boolean=} opt_center Whether to center the element in the container.
  *     Defaults to false.
- * @return {!Blockly.utils.Coordinate} The new scroll position of the container,
+ * @return {!Coordinate} The new scroll position of the container,
  *     in form of goog.math.Coordinate(scrollLeft, scrollTop).
  */
 const getContainerOffsetToScrollInto = function(
@@ -278,7 +278,7 @@ const getContainerOffsetToScrollInto = function(
     scrollLeft += Math.min(relX, Math.max(relX - spaceX, 0));
     scrollTop += Math.min(relY, Math.max(relY - spaceY, 0));
   }
-  return new Blockly.utils.Coordinate(scrollLeft, scrollTop);
+  return new Coordinate(scrollLeft, scrollTop);
 };
 
 exports = {

From 46a3462026e158f5821207bd32bc1f3836371b87 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <gonfunko@gmail.com>
Date: Wed, 14 Jul 2021 14:11:25 -0700
Subject: [PATCH 019/833] clang-format core/utils/style.js

---
 core/utils/style.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/core/utils/style.js b/core/utils/style.js
index 90cfa1d9a..028b746b8 100644
--- a/core/utils/style.js
+++ b/core/utils/style.js
@@ -81,8 +81,7 @@ const getSizeWithDisplay = function(element) {
  * @private
  */
 const getStyle = function(element, style) {
-  return getComputedStyle(element, style) ||
-      getCascadedStyle(element, style) ||
+  return getComputedStyle(element, style) || getCascadedStyle(element, style) ||
       (element.style && element.style[style]);
 };
 
@@ -221,11 +220,8 @@ const getBorderBox = function(element) {
  * @param {boolean=} opt_center Whether to center the element in the container.
  *     Defaults to false.
  */
-const scrollIntoContainerView = function(
-    element, container, opt_center) {
-  const offset =
-      getContainerOffsetToScrollInto(element,
-          container, opt_center);
+const scrollIntoContainerView = function(element, container, opt_center) {
+  const offset = getContainerOffsetToScrollInto(element, container, opt_center);
   container.scrollLeft = offset.x;
   container.scrollTop = offset.y;
 };

From 72a07613120361d3ecc9425dd2e5127f7bd40016 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <gonfunko@gmail.com>
Date: Wed, 14 Jul 2021 14:43:15 -0700
Subject: [PATCH 020/833] Migrate core/utils/svg_paths.js to goog.module

---
 core/utils/svg_paths.js | 30 +++++++++++++++++++++---------
 tests/deps.js           |  2 +-
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/core/utils/svg_paths.js b/core/utils/svg_paths.js
index e123dca28..d380d45f6 100644
--- a/core/utils/svg_paths.js
+++ b/core/utils/svg_paths.js
@@ -15,7 +15,8 @@
  * @name Blockly.utils.svgPaths
  * @namespace
  */
-goog.provide('Blockly.utils.svgPaths');
+goog.module('Blockly.utils.svgPaths');
+goog.module.declareLegacyNamespace();
 
 
 /**
@@ -28,7 +29,7 @@ goog.provide('Blockly.utils.svgPaths');
  * @return {string} A string of the format ' x,y '
  * @public
  */
-Blockly.utils.svgPaths.point = function(x, y) {
+const point = function(x, y) {
   return ' ' + x + ',' + y + ' ';
 };
 
@@ -45,7 +46,7 @@ Blockly.utils.svgPaths.point = function(x, y) {
  *     documentation for exact format.
  * @public
  */
-Blockly.utils.svgPaths.curve = function(command, points) {
+const curve = function(command, points) {
   return ' ' + command + points.join('');
 };
 
@@ -59,7 +60,7 @@ Blockly.utils.svgPaths.curve = function(command, points) {
  * @return {string} A string of the format ' M x,y '
  * @public
  */
-Blockly.utils.svgPaths.moveTo = function(x, y) {
+const moveTo = function(x, y) {
   return ' M ' + x + ',' + y + ' ';
 };
 
@@ -73,7 +74,7 @@ Blockly.utils.svgPaths.moveTo = function(x, y) {
  * @return {string} A string of the format ' m dx,dy '
  * @public
  */
-Blockly.utils.svgPaths.moveBy = function(dx, dy) {
+const moveBy = function(dx, dy) {
   return ' m ' + dx + ',' + dy + ' ';
 };
 
@@ -87,7 +88,7 @@ Blockly.utils.svgPaths.moveBy = function(dx, dy) {
  * @return {string} A string of the format ' l dx,dy '
  * @public
  */
-Blockly.utils.svgPaths.lineTo = function(dx, dy) {
+const lineTo = function(dx, dy) {
   return ' l ' + dx + ',' + dy + ' ';
 };
 
@@ -102,7 +103,7 @@ Blockly.utils.svgPaths.lineTo = function(dx, dy) {
  * @return {string} A string of the format ' l (dx,dy)+ '
  * @public
  */
-Blockly.utils.svgPaths.line = function(points) {
+const line = function(points) {
   return ' l' + points.join('');
 };
 
@@ -119,7 +120,7 @@ Blockly.utils.svgPaths.line = function(points) {
  * @return {string} A string of the format ' command val '
  * @public
  */
-Blockly.utils.svgPaths.lineOnAxis = function(command, val) {
+const lineOnAxis = function(command, val) {
   return ' ' + command + ' ' + val + ' ';
 };
 
@@ -137,6 +138,17 @@ Blockly.utils.svgPaths.lineOnAxis = function(command, val) {
  * @return {string} A string of the format 'command radius radius flags point'
  * @public
  */
-Blockly.utils.svgPaths.arc = function(command, flags, radius, point) {
+const arc = function(command, flags, radius, point) {
   return command + ' ' + radius + ' ' + radius + ' ' + flags + point;
 };
+
+exports = {
+  point,
+  curve,
+  moveTo,
+  moveBy,
+  lineTo,
+  line,
+  lineOnAxis,
+  arc,
+};
diff --git a/tests/deps.js b/tests/deps.js
index 4cb0f6fd3..1c324ff68 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -185,7 +185,7 @@ goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], []);
 goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], []);
 goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Blockly.utils.Coordinate', 'Blockly.utils.Size']);
 goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], []);
-goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], []);
+goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.constants']);
 goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global']);
 goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);

From 916b49a2e5d4a757dbf4d6504af1713edfee32ff Mon Sep 17 00:00:00 2001
From: Aaron Dodson <gonfunko@gmail.com>
Date: Wed, 14 Jul 2021 14:44:17 -0700
Subject: [PATCH 021/833] clang-format core/utils/svg_paths.js

---
 core/utils/svg_paths.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/utils/svg_paths.js b/core/utils/svg_paths.js
index d380d45f6..02602e4ac 100644
--- a/core/utils/svg_paths.js
+++ b/core/utils/svg_paths.js
@@ -39,9 +39,9 @@ const point = function(x, y) {
  * These coordinates are unitless and hence in the user coordinate system.
  * @param {string} command The command to use.
  *     Should be one of: c, C, s, S, q, Q.
- * @param {!Array<string>} points  An array containing all of the points to pass to the
- *     curve command, in order.  The points are represented as strings of the
- *     format ' x, y '.
+ * @param {!Array<string>} points  An array containing all of the points to pass
+ *     to the curve command, in order.  The points are represented as strings of
+ *     the format ' x, y '.
  * @return {string} A string defining one or more Bezier curves.  See the MDN
  *     documentation for exact format.
  * @public

From 042b235764e98e359d67672121170d487b618534 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <gonfunko@gmail.com>
Date: Wed, 14 Jul 2021 14:52:17 -0700
Subject: [PATCH 022/833] Migrate core/utils/dom.js to ES6 const/let

---
 core/utils/dom.js | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/core/utils/dom.js b/core/utils/dom.js
index 57843c8b9..049aa9f07 100644
--- a/core/utils/dom.js
+++ b/core/utils/dom.js
@@ -84,9 +84,9 @@ Blockly.utils.dom.canvasContext_ = null;
  * @template T
  */
 Blockly.utils.dom.createSvgElement = function(name, attrs, opt_parent) {
-  var e = /** @type {T} */
+  const e = /** @type {T} */
       (document.createElementNS(Blockly.utils.dom.SVG_NS, String(name)));
-  for (var key in attrs) {
+  for (const key in attrs) {
     e.setAttribute(key, attrs[key]);
   }
   // IE defines a unique attribute "runtimeStyle", it is NOT applied to
@@ -109,7 +109,7 @@ Blockly.utils.dom.createSvgElement = function(name, attrs, opt_parent) {
  * @return {boolean} True if class was added, false if already present.
  */
 Blockly.utils.dom.addClass = function(element, className) {
-  var classes = element.getAttribute('class') || '';
+  let classes = element.getAttribute('class') || '';
   if ((' ' + classes + ' ').indexOf(' ' + className + ' ') != -1) {
     return false;
   }
@@ -127,9 +127,9 @@ Blockly.utils.dom.addClass = function(element, className) {
  *    element.
  */
 Blockly.utils.dom.removeClasses = function(element, classNames) {
-  var classList = classNames.split(' ');
-  for (var i = 0; i < classList.length; i++) {
-    var cssName = classList[i];
+  const classList = classNames.split(' ');
+  for (let i = 0; i < classList.length; i++) {
+    const cssName = classList[i];
     Blockly.utils.dom.removeClass(element, cssName);
   }
 };
@@ -142,12 +142,12 @@ Blockly.utils.dom.removeClasses = function(element, classNames) {
  * @return {boolean} True if class was removed, false if never present.
  */
 Blockly.utils.dom.removeClass = function(element, className) {
-  var classes = element.getAttribute('class');
+  const classes = element.getAttribute('class');
   if ((' ' + classes + ' ').indexOf(' ' + className + ' ') == -1) {
     return false;
   }
-  var classList = classes.split(/\s+/);
-  for (var i = 0; i < classList.length; i++) {
+  const classList = classes.split(/\s+/);
+  for (let i = 0; i < classList.length; i++) {
     if (!classList[i] || classList[i] == className) {
       classList.splice(i, 1);
       i--;
@@ -169,7 +169,7 @@ Blockly.utils.dom.removeClass = function(element, className) {
  * @return {boolean} True if class exists, false otherwise.
  */
 Blockly.utils.dom.hasClass = function(element, className) {
-  var classes = element.getAttribute('class');
+  const classes = element.getAttribute('class');
   return (' ' + classes + ' ').indexOf(' ' + className + ' ') != -1;
 };
 
@@ -190,8 +190,8 @@ Blockly.utils.dom.removeNode = function(node) {
  * @param {!Element} refNode Existing element to precede new node.
  */
 Blockly.utils.dom.insertAfter = function(newNode, refNode) {
-  var siblingNode = refNode.nextSibling;
-  var parentNode = refNode.parentNode;
+  const siblingNode = refNode.nextSibling;
+  const parentNode = refNode.parentNode;
   if (!parentNode) {
     throw Error('Reference node has no parent.');
   }
@@ -253,8 +253,8 @@ Blockly.utils.dom.stopTextWidthCache = function() {
  * @return {number} Width of element.
  */
 Blockly.utils.dom.getTextWidth = function(textElement) {
-  var key = textElement.textContent + '\n' + textElement.className.baseVal;
-  var width;
+  const key = textElement.textContent + '\n' + textElement.className.baseVal;
+  let width;
 
   // Return the cached width if it exists.
   if (Blockly.utils.dom.cacheWidths_) {
@@ -316,9 +316,9 @@ Blockly.utils.dom.getFastTextWidth = function(textElement,
  */
 Blockly.utils.dom.getFastTextWidthWithSizeString = function(textElement,
     fontSize, fontWeight, fontFamily) {
-  var text = textElement.textContent;
-  var key = text + '\n' + textElement.className.baseVal;
-  var width;
+  const text = textElement.textContent;
+  const key = text + '\n' + textElement.className.baseVal;
+  let width;
 
   // Return the cached width if it exists.
   if (Blockly.utils.dom.cacheWidths_) {
@@ -330,7 +330,7 @@ Blockly.utils.dom.getFastTextWidthWithSizeString = function(textElement,
 
   if (!Blockly.utils.dom.canvasContext_) {
     // Inject the canvas element used for computing text widths.
-    var computeCanvas = document.createElement('canvas');
+    const computeCanvas = document.createElement('canvas');
     computeCanvas.className = 'blocklyComputeCanvas';
     document.body.appendChild(computeCanvas);
 
@@ -364,15 +364,15 @@ Blockly.utils.dom.getFastTextWidthWithSizeString = function(textElement,
 Blockly.utils.dom.measureFontMetrics = function(text, fontSize, fontWeight,
     fontFamily) {
 
-  var span = document.createElement('span');
+  const span = document.createElement('span');
   span.style.font = fontWeight + ' ' + fontSize + ' ' + fontFamily;
   span.textContent = text;
 
-  var block = document.createElement('div');
+  const block = document.createElement('div');
   block.style.width = '1px';
   block.style.height = 0;
 
-  var div = document.createElement('div');
+  const div = document.createElement('div');
   div.setAttribute('style', 'position: fixed; top: 0; left: 0; display: flex;');
   div.appendChild(span);
   div.appendChild(block);

From 563defa3badcf64f8f18d8f5c1a4d52017b5313b Mon Sep 17 00:00:00 2001
From: Aaron Dodson <gonfunko@gmail.com>
Date: Wed, 14 Jul 2021 15:01:16 -0700
Subject: [PATCH 023/833] Migrate core/utils/dom.js to goog.module

---
 core/utils/dom.js | 113 ++++++++++++++++++++++++++++------------------
 tests/deps.js     |   2 +-
 2 files changed, 69 insertions(+), 46 deletions(-)

diff --git a/core/utils/dom.js b/core/utils/dom.js
index 049aa9f07..7219bd93c 100644
--- a/core/utils/dom.js
+++ b/core/utils/dom.js
@@ -16,7 +16,8 @@
  * @name Blockly.utils.dom
  * @namespace
  */
-goog.provide('Blockly.utils.dom');
+goog.module('Blockly.utils.dom');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.utils.Svg');
 goog.require('Blockly.utils.userAgent');
@@ -26,26 +27,26 @@ goog.require('Blockly.utils.userAgent');
  * Required name space for SVG elements.
  * @const
  */
-Blockly.utils.dom.SVG_NS = 'http://www.w3.org/2000/svg';
+const SVG_NS = 'http://www.w3.org/2000/svg';
 
 /**
  * Required name space for HTML elements.
  * @const
  */
-Blockly.utils.dom.HTML_NS = 'http://www.w3.org/1999/xhtml';
+const HTML_NS = 'http://www.w3.org/1999/xhtml';
 
 /**
  * Required name space for XLINK elements.
  * @const
  */
-Blockly.utils.dom.XLINK_NS = 'http://www.w3.org/1999/xlink';
+const XLINK_NS = 'http://www.w3.org/1999/xlink';
 
 /**
  * Node type constants.
  * https://developer.mozilla.org/en-US/docs/Web/API/Node/nodeType
  * @enum {number}
  */
-Blockly.utils.dom.NodeType = {
+const NodeType = {
   ELEMENT_NODE: 1,
   TEXT_NODE: 3,
   COMMENT_NODE: 8,
@@ -57,21 +58,21 @@ Blockly.utils.dom.NodeType = {
  * @type {Object}
  * @private
  */
-Blockly.utils.dom.cacheWidths_ = null;
+let cacheWidths = null;
 
 /**
  * Number of current references to cache.
  * @type {number}
  * @private
  */
-Blockly.utils.dom.cacheReference_ = 0;
+let cacheReference = 0;
 
 /**
  * A HTML canvas context used for computing text width.
  * @type {CanvasRenderingContext2D}
  * @private
  */
-Blockly.utils.dom.canvasContext_ = null;
+let canvasContext = null;
 
 /**
  * Helper method for creating SVG elements.
@@ -83,9 +84,9 @@ Blockly.utils.dom.canvasContext_ = null;
  *     Blockly.utils.Svg
  * @template T
  */
-Blockly.utils.dom.createSvgElement = function(name, attrs, opt_parent) {
+const createSvgElement = function(name, attrs, opt_parent) {
   const e = /** @type {T} */
-      (document.createElementNS(Blockly.utils.dom.SVG_NS, String(name)));
+      (document.createElementNS(SVG_NS, String(name)));
   for (const key in attrs) {
     e.setAttribute(key, attrs[key]);
   }
@@ -108,7 +109,7 @@ Blockly.utils.dom.createSvgElement = function(name, attrs, opt_parent) {
  * @param {string} className Name of class to add.
  * @return {boolean} True if class was added, false if already present.
  */
-Blockly.utils.dom.addClass = function(element, className) {
+const addClass = function(element, className) {
   let classes = element.getAttribute('class') || '';
   if ((' ' + classes + ' ').indexOf(' ' + className + ' ') != -1) {
     return false;
@@ -126,11 +127,11 @@ Blockly.utils.dom.addClass = function(element, className) {
  * @param {string} classNames A string of one or multiple class names for an
  *    element.
  */
-Blockly.utils.dom.removeClasses = function(element, classNames) {
+const removeClasses = function(element, classNames) {
   const classList = classNames.split(' ');
   for (let i = 0; i < classList.length; i++) {
     const cssName = classList[i];
-    Blockly.utils.dom.removeClass(element, cssName);
+    removeClass(element, cssName);
   }
 };
 
@@ -141,7 +142,7 @@ Blockly.utils.dom.removeClasses = function(element, classNames) {
  * @param {string} className Name of class to remove.
  * @return {boolean} True if class was removed, false if never present.
  */
-Blockly.utils.dom.removeClass = function(element, className) {
+const removeClass = function(element, className) {
   const classes = element.getAttribute('class');
   if ((' ' + classes + ' ').indexOf(' ' + className + ' ') == -1) {
     return false;
@@ -168,7 +169,7 @@ Blockly.utils.dom.removeClass = function(element, className) {
  * @param {string} className Name of class to check.
  * @return {boolean} True if class exists, false otherwise.
  */
-Blockly.utils.dom.hasClass = function(element, className) {
+const hasClass = function(element, className) {
   const classes = element.getAttribute('class');
   return (' ' + classes + ' ').indexOf(' ' + className + ' ') != -1;
 };
@@ -179,7 +180,7 @@ Blockly.utils.dom.hasClass = function(element, className) {
  * @return {?Node} The node removed if removed; else, null.
  */
 // Copied from Closure goog.dom.removeNode
-Blockly.utils.dom.removeNode = function(node) {
+const removeNode = function(node) {
   return node && node.parentNode ? node.parentNode.removeChild(node) : null;
 };
 
@@ -189,7 +190,7 @@ Blockly.utils.dom.removeNode = function(node) {
  * @param {!Element} newNode New element to insert.
  * @param {!Element} refNode Existing element to precede new node.
  */
-Blockly.utils.dom.insertAfter = function(newNode, refNode) {
+const insertAfter = function(newNode, refNode) {
   const siblingNode = refNode.nextSibling;
   const parentNode = refNode.parentNode;
   if (!parentNode) {
@@ -208,9 +209,9 @@ Blockly.utils.dom.insertAfter = function(newNode, refNode) {
  * @param {!Node} descendant The node to test presence of.
  * @return {boolean} Whether the parent node contains the descendant node.
  */
-Blockly.utils.dom.containsNode = function(parent, descendant) {
+const containsNode = function(parent, descendant) {
   return !!(parent.compareDocumentPosition(descendant) &
-            Blockly.utils.dom.NodeType.DOCUMENT_POSITION_CONTAINED_BY);
+            NodeType.DOCUMENT_POSITION_CONTAINED_BY);
 };
 
 /**
@@ -220,7 +221,7 @@ Blockly.utils.dom.containsNode = function(parent, descendant) {
  * @param {!Element} element Element to which the CSS transform will be applied.
  * @param {string} transform The value of the CSS `transform` property.
  */
-Blockly.utils.dom.setCssTransform = function(element, transform) {
+const setCssTransform = function(element, transform) {
   element.style['transform'] = transform;
   element.style['-webkit-transform'] = transform;
 };
@@ -229,10 +230,10 @@ Blockly.utils.dom.setCssTransform = function(element, transform) {
  * Start caching text widths. Every call to this function MUST also call
  * stopTextWidthCache. Caches must not survive between execution threads.
  */
-Blockly.utils.dom.startTextWidthCache = function() {
-  Blockly.utils.dom.cacheReference_++;
-  if (!Blockly.utils.dom.cacheWidths_) {
-    Blockly.utils.dom.cacheWidths_ = Object.create(null);
+const startTextWidthCache = function() {
+  cacheReference++;
+  if (!cacheWidths) {
+    cacheWidths = Object.create(null);
   }
 };
 
@@ -240,10 +241,10 @@ Blockly.utils.dom.startTextWidthCache = function() {
  * Stop caching field widths. Unless caching was already on when the
  * corresponding call to startTextWidthCache was made.
  */
-Blockly.utils.dom.stopTextWidthCache = function() {
-  Blockly.utils.dom.cacheReference_--;
-  if (!Blockly.utils.dom.cacheReference_) {
-    Blockly.utils.dom.cacheWidths_ = null;
+const stopTextWidthCache = function() {
+  cacheReference--;
+  if (!cacheReference) {
+    cacheWidths = null;
   }
 };
 
@@ -252,13 +253,13 @@ Blockly.utils.dom.stopTextWidthCache = function() {
  * @param {!Element} textElement An SVG 'text' element.
  * @return {number} Width of element.
  */
-Blockly.utils.dom.getTextWidth = function(textElement) {
+const getTextWidth = function(textElement) {
   const key = textElement.textContent + '\n' + textElement.className.baseVal;
   let width;
 
   // Return the cached width if it exists.
-  if (Blockly.utils.dom.cacheWidths_) {
-    width = Blockly.utils.dom.cacheWidths_[key];
+  if (cacheWidths) {
+    width = cacheWidths[key];
     if (width) {
       return width;
     }
@@ -280,8 +281,8 @@ Blockly.utils.dom.getTextWidth = function(textElement) {
   }
 
   // Cache the computed width and return.
-  if (Blockly.utils.dom.cacheWidths_) {
-    Blockly.utils.dom.cacheWidths_[key] = width;
+  if (cacheWidths) {
+    cacheWidths[key] = width;
   }
   return width;
 };
@@ -296,9 +297,9 @@ Blockly.utils.dom.getTextWidth = function(textElement) {
  * @param {string} fontFamily The font family to use.
  * @return {number} Width of element.
  */
-Blockly.utils.dom.getFastTextWidth = function(textElement,
+const getFastTextWidth = function(textElement,
     fontSize, fontWeight, fontFamily) {
-  return Blockly.utils.dom.getFastTextWidthWithSizeString(textElement,
+  return getFastTextWidthWithSizeString(textElement,
       fontSize + 'pt', fontWeight, fontFamily);
 };
 
@@ -314,21 +315,21 @@ Blockly.utils.dom.getFastTextWidth = function(textElement,
  * @param {string} fontFamily The font family to use.
  * @return {number} Width of element.
  */
-Blockly.utils.dom.getFastTextWidthWithSizeString = function(textElement,
+const getFastTextWidthWithSizeString = function(textElement,
     fontSize, fontWeight, fontFamily) {
   const text = textElement.textContent;
   const key = text + '\n' + textElement.className.baseVal;
   let width;
 
   // Return the cached width if it exists.
-  if (Blockly.utils.dom.cacheWidths_) {
-    width = Blockly.utils.dom.cacheWidths_[key];
+  if (cacheWidths) {
+    width = cacheWidths[key];
     if (width) {
       return width;
     }
   }
 
-  if (!Blockly.utils.dom.canvasContext_) {
+  if (!canvasContext) {
     // Inject the canvas element used for computing text widths.
     const computeCanvas = document.createElement('canvas');
     computeCanvas.className = 'blocklyComputeCanvas';
@@ -337,18 +338,18 @@ Blockly.utils.dom.getFastTextWidthWithSizeString = function(textElement,
     // Initialize the HTML canvas context and set the font.
     // The context font must match blocklyText's fontsize and font-family
     // set in CSS.
-    Blockly.utils.dom.canvasContext_ = computeCanvas.getContext('2d');
+    canvasContext = computeCanvas.getContext('2d');
   }
   // Set the desired font size and family.
-  Blockly.utils.dom.canvasContext_.font =
+  canvasContext.font =
       fontWeight + ' ' + fontSize + ' ' + fontFamily;
 
   // Measure the text width using the helper canvas context.
-  width = Blockly.utils.dom.canvasContext_.measureText(text).width;
+  width = canvasContext.measureText(text).width;
 
   // Cache the computed width and return.
-  if (Blockly.utils.dom.cacheWidths_) {
-    Blockly.utils.dom.cacheWidths_[key] = width;
+  if (cacheWidths) {
+    cacheWidths[key] = width;
   }
   return width;
 };
@@ -361,7 +362,7 @@ Blockly.utils.dom.getFastTextWidthWithSizeString = function(textElement,
  * @param {string} fontFamily The font family to use.
  * @return {{height: number, baseline: number}} Font measurements.
  */
-Blockly.utils.dom.measureFontMetrics = function(text, fontSize, fontWeight,
+const measureFontMetrics = function(text, fontSize, fontWeight,
     fontFamily) {
 
   const span = document.createElement('span');
@@ -389,3 +390,25 @@ Blockly.utils.dom.measureFontMetrics = function(text, fontSize, fontWeight,
   }
   return result;
 };
+
+exports = {
+  SVG_NS,
+  HTML_NS,
+  XLINK_NS,
+  NodeType,
+  createSvgElement,
+  addClass,
+  removeClasses,
+  removeClass,
+  hasClass,
+  removeNode,
+  insertAfter,
+  containsNode,
+  setCssTransform,
+  startTextWidthCache,
+  stopTextWidthCache,
+  getTextWidth,
+  getFastTextWidth,
+  getFastTextWidthWithSizeString,
+  measureFontMetrics,
+};
diff --git a/tests/deps.js b/tests/deps.js
index 4cb0f6fd3..dc28906b6 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -173,7 +173,7 @@ goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], []);
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], []);
 goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], []);
-goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.Svg', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.Svg', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], []);
 goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.IdGenerator'], []);
 goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], []);

From 5fbf5fe40d97e4ad7b40b0c3c848e4c43478069d Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 14 Jul 2021 10:39:37 -0700
Subject: [PATCH 024/833] Migrate core/utils/math.js to ES6 const/let

---
 core/utils/math.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/utils/math.js b/core/utils/math.js
index 516972579..e85b808e7 100644
--- a/core/utils/math.js
+++ b/core/utils/math.js
@@ -48,7 +48,7 @@ Blockly.utils.math.toDegrees = function(angleRadians) {
  */
 Blockly.utils.math.clamp = function(lowerBound, number, upperBound) {
   if (upperBound < lowerBound) {
-    var temp = upperBound;
+    const temp = upperBound;
     upperBound = lowerBound;
     lowerBound = temp;
   }

From 06cbde1dba0f3dbf11ac9e8d63b5d40abdc9d2d4 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 14 Jul 2021 10:45:45 -0700
Subject: [PATCH 025/833] Migrate core/utils/math.js to goog.module

---
 core/utils/math.js | 11 +++++++----
 tests/deps.js      |  3 +--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/core/utils/math.js b/core/utils/math.js
index e85b808e7..2bc28eefe 100644
--- a/core/utils/math.js
+++ b/core/utils/math.js
@@ -16,7 +16,8 @@
  * @name Blockly.utils.math
  * @namespace
  */
-goog.provide('Blockly.utils.math');
+goog.module('Blockly.utils.math');
+goog.module.declareLegacyNamespace();
 
 
 /**
@@ -25,7 +26,7 @@ goog.provide('Blockly.utils.math');
  * @param {number} angleDegrees Angle in degrees.
  * @return {number} Angle in radians.
  */
-Blockly.utils.math.toRadians = function(angleDegrees) {
+const toRadians = function(angleDegrees) {
   return angleDegrees * Math.PI / 180;
 };
 
@@ -35,7 +36,7 @@ Blockly.utils.math.toRadians = function(angleDegrees) {
  * @param {number} angleRadians Angle in radians.
  * @return {number} Angle in degrees.
  */
-Blockly.utils.math.toDegrees = function(angleRadians) {
+const toDegrees = function(angleRadians) {
   return angleRadians * 180 / Math.PI;
 };
 
@@ -46,7 +47,7 @@ Blockly.utils.math.toDegrees = function(angleRadians) {
  * @param {number} upperBound The desired upper bound.
  * @return {number} The clamped number.
  */
-Blockly.utils.math.clamp = function(lowerBound, number, upperBound) {
+const clamp = function(lowerBound, number, upperBound) {
   if (upperBound < lowerBound) {
     const temp = upperBound;
     upperBound = lowerBound;
@@ -54,3 +55,5 @@ Blockly.utils.math.clamp = function(lowerBound, number, upperBound) {
   }
   return Math.max(lowerBound, Math.min(number, upperBound));
 };
+
+exports = {toRadians, toDegrees, clamp};
diff --git a/tests/deps.js b/tests/deps.js
index f24feabaa..ecc86147d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -4,7 +4,6 @@ goog.addDependency('../../blocks/logic.js', ['Blockly.Blocks.logic', 'Blockly.Co
 goog.addDependency('../../blocks/loops.js', ['Blockly.Blocks.loops', 'Blockly.Constants.Loops'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable', 'Blockly.Warning']);
 goog.addDependency('../../blocks/math.js', ['Blockly.Blocks.math', 'Blockly.Constants.Math'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'], ['Blockly', 'Blockly.Blocks', 'Blockly.Comment', 'Blockly.FieldCheckbox', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.Mutator', 'Blockly.Warning'], {'lang': 'es5'});
-goog.addDependency('../../blocks/test_blocks.js', ['Blockly.TestBlocks'], ['Blockly', 'Blockly.Blocks'], {'lang': 'es5'});
 goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator']);
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
@@ -178,7 +177,7 @@ goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.u
 goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], []);
 goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.IdGenerator'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], []);
+goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], []);
 goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], []);

From 7cc85d9c4a172ce4efba910e8ad4ca848542ce8f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 14 Jul 2021 15:02:20 -0700
Subject: [PATCH 026/833] clang-format core/utils/math.js

---
 core/utils/math.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/utils/math.js b/core/utils/math.js
index 2bc28eefe..dade91c21 100644
--- a/core/utils/math.js
+++ b/core/utils/math.js
@@ -56,4 +56,8 @@ const clamp = function(lowerBound, number, upperBound) {
   return Math.max(lowerBound, Math.min(number, upperBound));
 };
 
-exports = {toRadians, toDegrees, clamp};
+exports = {
+  toRadians,
+  toDegrees,
+  clamp
+};

From 1d8f6e903c2a74bc4ba9e2eeb0e563becd0ae33c Mon Sep 17 00:00:00 2001
From: Aaron Dodson <gonfunko@gmail.com>
Date: Wed, 14 Jul 2021 15:38:35 -0700
Subject: [PATCH 027/833] Migrate core/utils/dom.js to named requires

---
 core/utils/dom.js | 11 +++++------
 tests/deps.js     |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/utils/dom.js b/core/utils/dom.js
index 7219bd93c..192aba58e 100644
--- a/core/utils/dom.js
+++ b/core/utils/dom.js
@@ -19,8 +19,8 @@
 goog.module('Blockly.utils.dom');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.userAgent');
+const Svg = goog.require('Blockly.utils.Svg');
+const userAgent = goog.require('Blockly.utils.userAgent');
 
 
 /**
@@ -76,12 +76,11 @@ let canvasContext = null;
 
 /**
  * Helper method for creating SVG elements.
- * @param {string|Blockly.utils.Svg<T>} name Element's tag name.
+ * @param {string|Svg<T>} name Element's tag name.
  * @param {!Object} attrs Dictionary of attribute names and values.
  * @param {Element=} opt_parent Optional parent on which to append the element.
  * @return {T} Newly created SVG element.  The return type is {!SVGElement} if
- *     name is a string or a more specific type if it a member of
- *     Blockly.utils.Svg
+ *     name is a string or a more specific type if it a member of Svg.
  * @template T
  */
 const createSvgElement = function(name, attrs, opt_parent) {
@@ -267,7 +266,7 @@ const getTextWidth = function(textElement) {
 
   // Attempt to compute fetch the width of the SVG text element.
   try {
-    if (Blockly.utils.userAgent.IE || Blockly.utils.userAgent.EDGE) {
+    if (userAgent.IE || userAgent.EDGE) {
       width = textElement.getBBox().width;
     } else {
       width = textElement.getComputedTextLength();
diff --git a/tests/deps.js b/tests/deps.js
index dc28906b6..b8b42f583 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -173,7 +173,7 @@ goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], []);
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], []);
 goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], []);
-goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.Svg', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], []);
 goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.IdGenerator'], []);
 goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], []);

From 38324a1f637d20f87ca9090e0e1172bc2f4fbaf7 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Wed, 14 Jul 2021 15:59:30 -0700
Subject: [PATCH 028/833] Updates eslint rules to work while converting to
 goog.module (#5063)

---
 .eslintrc.json | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 9d74291da..28766db11 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -2,29 +2,6 @@
     "rules": {
         "curly": ["error"],
         "eol-last": ["error"],
-        // Blockly/Google use 2-space indents.
-        // Blockly/Google uses +4 space indents for line continuations.
-        // Ignore default rules for ternary expressions.
-        "indent": [
-            "error", 2,
-            {
-                "SwitchCase": 1,
-                "MemberExpression": 2,
-                "ObjectExpression": 1,
-                "FunctionDeclaration": {
-                    "body": 1,
-                    "parameters": 2
-                },
-                "FunctionExpression": {
-                    "body": 1,
-                    "parameters": 2
-                },
-                "CallExpression": {
-                    "arguments": 2
-                },
-                "ignoredNodes": ["ConditionalExpression"]
-            }
-        ],
         "keyword-spacing": ["error"],
         "linebreak-style": ["error", "unix"],
         "max-len": [
@@ -39,7 +16,7 @@
         ],
         "no-trailing-spaces": ["error", { "skipBlankLines": true }],
         "no-unused-vars": [
-            "error",
+            "warn",
             {
                 "args": "after-used",
                 // Ignore vars starting with an underscore.
@@ -48,7 +25,6 @@
                 "argsIgnorePattern": "^_"
             }
         ],
-        "no-use-before-define": ["error"],
         // Blockly uses for exporting symbols. no-self-assign added in eslint 5.
         "no-self-assign": ["off"],
         // Blockly uses single quotes except for JSON blobs, which must use double quotes.

From 466a0db8099d34dba282c8c2d55549753ca6a610 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 14 Jul 2021 13:56:18 -0700
Subject: [PATCH 029/833] Migrate core/utils/rect.js to goog.module

---
 core/utils/rect.js | 11 +++++++----
 tests/deps.js      |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/utils/rect.js b/core/utils/rect.js
index 128ec4eae..318cf1d0d 100644
--- a/core/utils/rect.js
+++ b/core/utils/rect.js
@@ -16,7 +16,8 @@
  * @name Blockly.utils.Rect
  * @namespace
  */
-goog.provide('Blockly.utils.Rect');
+goog.module('Blockly.utils.Rect');
+goog.module.declareLegacyNamespace();
 
 
 /**
@@ -28,7 +29,7 @@ goog.provide('Blockly.utils.Rect');
  * @struct
  * @constructor
  */
-Blockly.utils.Rect = function(top, bottom, left, right) {
+const Rect = function(top, bottom, left, right) {
   /** @type {number} */
   this.top = top;
 
@@ -49,7 +50,7 @@ Blockly.utils.Rect = function(top, bottom, left, right) {
  * @param {number} y The y coordinate to test for containment.
  * @return {boolean} Whether this rectangle contains given coordinate.
  */
-Blockly.utils.Rect.prototype.contains = function(x, y) {
+Rect.prototype.contains = function(x, y) {
   return x >= this.left && x <= this.right && y >= this.top && y <= this.bottom;
 };
 
@@ -60,7 +61,9 @@ Blockly.utils.Rect.prototype.contains = function(x, y) {
  *    intersection with.
  * @return {boolean} Whether this rectangle intersects the provided rectangle.
  */
-Blockly.utils.Rect.prototype.intersects = function(other) {
+Rect.prototype.intersects = function(other) {
   return !(this.left > other.right || this.right < other.left ||
       this.top > other.bottom || this.bottom < other.top);
 };
+
+exports = Rect;
diff --git a/tests/deps.js b/tests/deps.js
index 4e222cf85..b98f68ecd 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -180,7 +180,7 @@ goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], [
 goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], []);
 goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], []);
+goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], []);
 goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], []);
 goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Blockly.utils.Coordinate', 'Blockly.utils.Size']);

From de2cff80fdec4a262048bbb401b95d6e90163e80 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 14 Jul 2021 16:11:11 -0700
Subject: [PATCH 030/833] clang-format core/utils/rect.js

---
 core/utils/rect.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/utils/rect.js b/core/utils/rect.js
index 318cf1d0d..85ade5388 100644
--- a/core/utils/rect.js
+++ b/core/utils/rect.js
@@ -62,7 +62,8 @@ Rect.prototype.contains = function(x, y) {
  * @return {boolean} Whether this rectangle intersects the provided rectangle.
  */
 Rect.prototype.intersects = function(other) {
-  return !(this.left > other.right || this.right < other.left ||
+  return !(
+      this.left > other.right || this.right < other.left ||
       this.top > other.bottom || this.bottom < other.top);
 };
 

From 5e31d8d7f3167c38c96e4df1705ebcf2d00cf015 Mon Sep 17 00:00:00 2001
From: Maribeth Bottorff <maribethb@google.com>
Date: Wed, 14 Jul 2021 16:58:10 -0700
Subject: [PATCH 031/833] Migrate core/utils/aria.js to ES6 const/let

---
 core/utils/aria.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/utils/aria.js b/core/utils/aria.js
index 4cacc1ff7..cc731e299 100644
--- a/core/utils/aria.js
+++ b/core/utils/aria.js
@@ -166,6 +166,6 @@ Blockly.utils.aria.setState = function(element, stateName, value) {
   if (Array.isArray(value)) {
     value = value.join(' ');
   }
-  var attrStateName = Blockly.utils.aria.ARIA_PREFIX_ + stateName;
+  const attrStateName = Blockly.utils.aria.ARIA_PREFIX_ + stateName;
   element.setAttribute(attrStateName, value);
 };

From 0ceee1b775edbc73a70e6af020531857edc4ee09 Mon Sep 17 00:00:00 2001
From: Maribeth Bottorff <maribethb@google.com>
Date: Wed, 14 Jul 2021 16:59:32 -0700
Subject: [PATCH 032/833] Update incorrect JsDoc comment.

---
 core/utils/aria.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/utils/aria.js b/core/utils/aria.js
index cc731e299..b75b7e3cd 100644
--- a/core/utils/aria.js
+++ b/core/utils/aria.js
@@ -5,7 +5,7 @@
  */
 
 /**
- * @fileoverview Constant declarations for common key codes.
+ * @fileoverview ARIA-related constants and utilities.
  * These methods are not specific to Blockly, and could be factored out into
  * a JavaScript framework such as Closure.
  * @author samelh@google.com (Sam El-Husseini)

From 9afd937568cb7302cbc50b7f1d63bed33a7575fa Mon Sep 17 00:00:00 2001
From: Maribeth Bottorff <maribethb@google.com>
Date: Wed, 14 Jul 2021 17:33:01 -0700
Subject: [PATCH 033/833] Migrate core/utils/aria.js to goog.module

---
 core/utils/aria.js | 38 ++++++++++++++++++++------------------
 tests/deps.js      |  2 +-
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/core/utils/aria.js b/core/utils/aria.js
index b75b7e3cd..464ba77b0 100644
--- a/core/utils/aria.js
+++ b/core/utils/aria.js
@@ -16,27 +16,22 @@
  * @name Blockly.utils.aria
  * @namespace
  */
-goog.provide('Blockly.utils.aria');
+goog.module('Blockly.utils.aria');
+goog.module.declareLegacyNamespace();
 
 
-/**
- * ARIA states/properties prefix.
- * @private
- */
-Blockly.utils.aria.ARIA_PREFIX_ = 'aria-';
+/** ARIA states/properties prefix. */
+const ARIA_PREFIX = 'aria-';
 
-/**
- * ARIA role attribute.
- * @private
- */
-Blockly.utils.aria.ROLE_ATTRIBUTE_ = 'role';
+/** ARIA role attribute. */
+const ROLE_ATTRIBUTE = 'role';
 
 /**
  * ARIA role values.
  * Copied from Closure's goog.a11y.aria.Role
  * @enum {string}
  */
-Blockly.utils.aria.Role = {
+const Role = {
   // ARIA role for an interactive control of tabular data.
   GRID: 'grid',
 
@@ -80,7 +75,7 @@ Blockly.utils.aria.Role = {
  * Copied from Closure's goog.a11y.aria.State
  * @enum {string}
  */
-Blockly.utils.aria.State = {
+const State = {
   // ARIA property for setting the currently active descendant of an element,
   // for example the selected item in a list box. Value: ID of an element.
   ACTIVEDESCENDANT: 'activedescendant',
@@ -148,24 +143,31 @@ Blockly.utils.aria.State = {
  * @param {!Element} element DOM node to set role of.
  * @param {!Blockly.utils.aria.Role} roleName Role name.
  */
-Blockly.utils.aria.setRole = function(element, roleName) {
-  element.setAttribute(Blockly.utils.aria.ROLE_ATTRIBUTE_, roleName);
+const setRole = function(element, roleName) {
+  element.setAttribute(ROLE_ATTRIBUTE, roleName);
 };
 
 /**
  * Sets the state or property of an element.
  * Copied from Closure's goog.a11y.aria
  * @param {!Element} element DOM node where we set state.
- * @param {!Blockly.utils.aria.State} stateName State attribute being set.
+ * @param {!State} stateName State attribute being set.
  *     Automatically adds prefix 'aria-' to the state name if the attribute is
  *     not an extra attribute.
  * @param {string|boolean|number|!Array<string>} value Value
  * for the state attribute.
  */
-Blockly.utils.aria.setState = function(element, stateName, value) {
+const setState = function(element, stateName, value) {
   if (Array.isArray(value)) {
     value = value.join(' ');
   }
-  const attrStateName = Blockly.utils.aria.ARIA_PREFIX_ + stateName;
+  const attrStateName = ARIA_PREFIX + stateName;
   element.setAttribute(attrStateName, value);
 };
+
+exports = {
+  Role,
+  State,
+  setRole,
+  setState,
+};
diff --git a/tests/deps.js b/tests/deps.js
index ecc86147d..3f6eae7a5 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -169,7 +169,7 @@ goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.constants
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.constants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
+goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], []);
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], []);
 goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], [], {'lang': 'es6', 'module': 'goog'});

From 426c741e90f9134e013f5b37742c8dde6d6b1d11 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 13 Jul 2021 17:03:33 -0700
Subject: [PATCH 034/833] Migrate core/utils/colour.js to ES6 const/let

---
 core/utils/colour.js | 52 ++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/core/utils/colour.js b/core/utils/colour.js
index b64b81eb5..12c9a9998 100644
--- a/core/utils/colour.js
+++ b/core/utils/colour.js
@@ -32,7 +32,7 @@ goog.provide('Blockly.utils.colour');
  */
 Blockly.utils.colour.parse = function(str) {
   str = String(str).toLowerCase().trim();
-  var hex = Blockly.utils.colour.names[str];
+  let hex = Blockly.utils.colour.names[str];
   if (hex) {
     // e.g. 'red'
     return hex;
@@ -47,12 +47,12 @@ Blockly.utils.colour.parse = function(str) {
     // e.g. '#0f8'
     return ['#', hex[1], hex[1], hex[2], hex[2], hex[3], hex[3]].join('');
   }
-  var rgb = str.match(/^(?:rgb)?\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$/);
+  const rgb = str.match(/^(?:rgb)?\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$/);
   if (rgb) {
     // e.g. 'rgb(0, 128, 255)'
-    var r = Number(rgb[1]);
-    var g = Number(rgb[2]);
-    var b = Number(rgb[3]);
+    const r = Number(rgb[1]);
+    const g = Number(rgb[2]);
+    const b = Number(rgb[3]);
     if (r >= 0 && r < 256 && g >= 0 && g < 256 && b >= 0 && b < 256) {
       return Blockly.utils.colour.rgbToHex(r, g, b);
     }
@@ -68,7 +68,7 @@ Blockly.utils.colour.parse = function(str) {
  * @return {string} Hex representation of the colour.
  */
 Blockly.utils.colour.rgbToHex = function(r, g, b) {
-  var rgb = (r << 16) | (g << 8) | b;
+  const rgb = (r << 16) | (g << 8) | b;
   if (r < 0x10) {
     return '#' + (0x1000000 | rgb).toString(16).substr(1);
   }
@@ -82,15 +82,15 @@ Blockly.utils.colour.rgbToHex = function(r, g, b) {
  * @return {!Array<number>} RGB representation of the colour.
  */
 Blockly.utils.colour.hexToRgb = function(colour) {
-  var hex = Blockly.utils.colour.parse(colour);
+  const hex = Blockly.utils.colour.parse(colour);
   if (!hex) {
     return [0, 0, 0];
   }
 
-  var rgb = parseInt(hex.substr(1), 16);
-  var r = rgb >> 16;
-  var g = (rgb >> 8) & 255;
-  var b = rgb & 255;
+  const rgb = parseInt(hex.substr(1), 16);
+  const r = rgb >> 16;
+  const g = (rgb >> 8) & 255;
+  const b = rgb & 255;
 
   return [r, g, b];
 };
@@ -103,19 +103,19 @@ Blockly.utils.colour.hexToRgb = function(colour) {
  * @return {string} Hex representation of the colour.
  */
 Blockly.utils.colour.hsvToHex = function(h, s, v) {
-  var red = 0;
-  var green = 0;
-  var blue = 0;
+  let red = 0;
+  let green = 0;
+  let blue = 0;
   if (s == 0) {
     red = v;
     green = v;
     blue = v;
   } else {
-    var sextant = Math.floor(h / 60);
-    var remainder = (h / 60) - sextant;
-    var val1 = v * (1 - s);
-    var val2 = v * (1 - (s * remainder));
-    var val3 = v * (1 - (s * (1 - remainder)));
+    const sextant = Math.floor(h / 60);
+    const remainder = (h / 60) - sextant;
+    const val1 = v * (1 - s);
+    const val2 = v * (1 - (s * remainder));
+    const val3 = v * (1 - (s * (1 - remainder)));
     switch (sextant) {
       case 1:
         red = val2;
@@ -164,19 +164,19 @@ Blockly.utils.colour.hsvToHex = function(h, s, v) {
  * @return {?string} Combined colour represented in hex.
  */
 Blockly.utils.colour.blend = function(colour1, colour2, factor) {
-  var hex1 = Blockly.utils.colour.parse(colour1);
+  const hex1 = Blockly.utils.colour.parse(colour1);
   if (!hex1) {
     return null;
   }
-  var hex2 = Blockly.utils.colour.parse(colour2);
+  const hex2 = Blockly.utils.colour.parse(colour2);
   if (!hex2) {
     return null;
   }
-  var rgb1 = Blockly.utils.colour.hexToRgb(hex1);
-  var rgb2 = Blockly.utils.colour.hexToRgb(hex2);
-  var r = Math.round(rgb2[0] + factor * (rgb1[0] - rgb2[0]));
-  var g = Math.round(rgb2[1] + factor * (rgb1[1] - rgb2[1]));
-  var b = Math.round(rgb2[2] + factor * (rgb1[2] - rgb2[2]));
+  const rgb1 = Blockly.utils.colour.hexToRgb(hex1);
+  const rgb2 = Blockly.utils.colour.hexToRgb(hex2);
+  const r = Math.round(rgb2[0] + factor * (rgb1[0] - rgb2[0]));
+  const g = Math.round(rgb2[1] + factor * (rgb1[1] - rgb2[1]));
+  const b = Math.round(rgb2[2] + factor * (rgb1[2] - rgb2[2]));
   return Blockly.utils.colour.rgbToHex(r, g, b);
 };
 

From 8abfa3d888f81136d6cc337a154aea7e0a7b0477 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 14 Jul 2021 17:53:16 -0700
Subject: [PATCH 035/833] Migrate core/utils/colour.js to goog.module

---
 core/utils/colour.js | 35 +++++++++++++++++++----------------
 tests/deps.js        |  2 +-
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/core/utils/colour.js b/core/utils/colour.js
index 12c9a9998..dffd193f3 100644
--- a/core/utils/colour.js
+++ b/core/utils/colour.js
@@ -16,7 +16,8 @@
  * @name Blockly.utils.colour
  * @namespace
  */
-goog.provide('Blockly.utils.colour');
+goog.module('Blockly.utils.colour');
+goog.module.declareLegacyNamespace();
 
 
 /**
@@ -30,9 +31,9 @@ goog.provide('Blockly.utils.colour');
  * @return {?string} A string containing a hex representation of the colour,
  *   or null if can't be parsed.
  */
-Blockly.utils.colour.parse = function(str) {
+const parse = function(str) {
   str = String(str).toLowerCase().trim();
-  let hex = Blockly.utils.colour.names[str];
+  let hex = names[str];
   if (hex) {
     // e.g. 'red'
     return hex;
@@ -54,7 +55,7 @@ Blockly.utils.colour.parse = function(str) {
     const g = Number(rgb[2]);
     const b = Number(rgb[3]);
     if (r >= 0 && r < 256 && g >= 0 && g < 256 && b >= 0 && b < 256) {
-      return Blockly.utils.colour.rgbToHex(r, g, b);
+      return rgbToHex(r, g, b);
     }
   }
   return null;
@@ -67,7 +68,7 @@ Blockly.utils.colour.parse = function(str) {
  * @param {number} b Amount of blue, int between 0 and 255.
  * @return {string} Hex representation of the colour.
  */
-Blockly.utils.colour.rgbToHex = function(r, g, b) {
+const rgbToHex = function(r, g, b) {
   const rgb = (r << 16) | (g << 8) | b;
   if (r < 0x10) {
     return '#' + (0x1000000 | rgb).toString(16).substr(1);
@@ -81,8 +82,8 @@ Blockly.utils.colour.rgbToHex = function(r, g, b) {
  *     colour format ('#ff0000', 'red', '0xff000', etc).
  * @return {!Array<number>} RGB representation of the colour.
  */
-Blockly.utils.colour.hexToRgb = function(colour) {
-  const hex = Blockly.utils.colour.parse(colour);
+const hexToRgb = function(colour) {
+  const hex = parse(colour);
   if (!hex) {
     return [0, 0, 0];
   }
@@ -102,7 +103,7 @@ Blockly.utils.colour.hexToRgb = function(colour) {
  * @param {number} v Brightness in [0, 255].
  * @return {string} Hex representation of the colour.
  */
-Blockly.utils.colour.hsvToHex = function(h, s, v) {
+const hsvToHex = function(h, s, v) {
   let red = 0;
   let green = 0;
   let blue = 0;
@@ -150,7 +151,7 @@ Blockly.utils.colour.hsvToHex = function(h, s, v) {
         break;
     }
   }
-  return Blockly.utils.colour.rgbToHex(
+  return rgbToHex(
       Math.floor(red), Math.floor(green), Math.floor(blue));
 };
 
@@ -163,21 +164,21 @@ Blockly.utils.colour.hsvToHex = function(h, s, v) {
  *     Values should be in the range [0, 1].
  * @return {?string} Combined colour represented in hex.
  */
-Blockly.utils.colour.blend = function(colour1, colour2, factor) {
-  const hex1 = Blockly.utils.colour.parse(colour1);
+const blend = function(colour1, colour2, factor) {
+  const hex1 = parse(colour1);
   if (!hex1) {
     return null;
   }
-  const hex2 = Blockly.utils.colour.parse(colour2);
+  const hex2 = parse(colour2);
   if (!hex2) {
     return null;
   }
-  const rgb1 = Blockly.utils.colour.hexToRgb(hex1);
-  const rgb2 = Blockly.utils.colour.hexToRgb(hex2);
+  const rgb1 = hexToRgb(hex1);
+  const rgb2 = hexToRgb(hex2);
   const r = Math.round(rgb2[0] + factor * (rgb1[0] - rgb2[0]));
   const g = Math.round(rgb2[1] + factor * (rgb1[1] - rgb2[1]));
   const b = Math.round(rgb2[2] + factor * (rgb1[2] - rgb2[2]));
-  return Blockly.utils.colour.rgbToHex(r, g, b);
+  return rgbToHex(r, g, b);
 };
 
 /**
@@ -188,7 +189,7 @@ Blockly.utils.colour.blend = function(colour1, colour2, factor) {
  *
  * @type {!Object<string, string>}
  */
-Blockly.utils.colour.names = {
+const names = {
   'aqua': '#00ffff',
   'black': '#000000',
   'blue': '#0000ff',
@@ -206,3 +207,5 @@ Blockly.utils.colour.names = {
   'white': '#ffffff',
   'yellow': '#ffff00'
 };
+
+exports = {parse, rgbToHex, hexToRgb, hsvToHex, blend, names};
diff --git a/tests/deps.js b/tests/deps.js
index b98f68ecd..e83f61c67 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -170,7 +170,7 @@ goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Bl
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.constants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
-goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], []);
+goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], []);
 goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.Svg', 'Blockly.utils.userAgent']);

From f63bf29b7689b0ed92cfa2fb70f1be9b79fda2b8 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 14 Jul 2021 17:53:21 -0700
Subject: [PATCH 036/833] clang-format core/utils/colour.js

---
 core/utils/colour.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/utils/colour.js b/core/utils/colour.js
index dffd193f3..7b2c978f4 100644
--- a/core/utils/colour.js
+++ b/core/utils/colour.js
@@ -151,8 +151,7 @@ const hsvToHex = function(h, s, v) {
         break;
     }
   }
-  return rgbToHex(
-      Math.floor(red), Math.floor(green), Math.floor(blue));
+  return rgbToHex(Math.floor(red), Math.floor(green), Math.floor(blue));
 };
 
 /**
@@ -208,4 +207,11 @@ const names = {
   'yellow': '#ffff00'
 };
 
-exports = {parse, rgbToHex, hexToRgb, hsvToHex, blend, names};
+exports = {
+  parse,
+  rgbToHex,
+  hexToRgb,
+  hsvToHex,
+  blend,
+  names
+};

From 07bd3b3c799fd99aa02ce3c08462bd312925c501 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 15 Jul 2021 08:42:28 -0700
Subject: [PATCH 037/833] clang-format core/utils/dom.js

---
 core/utils/dom.js | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/core/utils/dom.js b/core/utils/dom.js
index 192aba58e..0e0480c0f 100644
--- a/core/utils/dom.js
+++ b/core/utils/dom.js
@@ -209,8 +209,9 @@ const insertAfter = function(newNode, refNode) {
  * @return {boolean} Whether the parent node contains the descendant node.
  */
 const containsNode = function(parent, descendant) {
-  return !!(parent.compareDocumentPosition(descendant) &
-            NodeType.DOCUMENT_POSITION_CONTAINED_BY);
+  return !!(
+      parent.compareDocumentPosition(descendant) &
+      NodeType.DOCUMENT_POSITION_CONTAINED_BY);
 };
 
 /**
@@ -296,10 +297,10 @@ const getTextWidth = function(textElement) {
  * @param {string} fontFamily The font family to use.
  * @return {number} Width of element.
  */
-const getFastTextWidth = function(textElement,
-    fontSize, fontWeight, fontFamily) {
-  return getFastTextWidthWithSizeString(textElement,
-      fontSize + 'pt', fontWeight, fontFamily);
+const getFastTextWidth = function(
+    textElement, fontSize, fontWeight, fontFamily) {
+  return getFastTextWidthWithSizeString(
+      textElement, fontSize + 'pt', fontWeight, fontFamily);
 };
 
 /**
@@ -314,8 +315,8 @@ const getFastTextWidth = function(textElement,
  * @param {string} fontFamily The font family to use.
  * @return {number} Width of element.
  */
-const getFastTextWidthWithSizeString = function(textElement,
-    fontSize, fontWeight, fontFamily) {
+const getFastTextWidthWithSizeString = function(
+    textElement, fontSize, fontWeight, fontFamily) {
   const text = textElement.textContent;
   const key = text + '\n' + textElement.className.baseVal;
   let width;
@@ -340,8 +341,7 @@ const getFastTextWidthWithSizeString = function(textElement,
     canvasContext = computeCanvas.getContext('2d');
   }
   // Set the desired font size and family.
-  canvasContext.font =
-      fontWeight + ' ' + fontSize + ' ' + fontFamily;
+  canvasContext.font = fontWeight + ' ' + fontSize + ' ' + fontFamily;
 
   // Measure the text width using the helper canvas context.
   width = canvasContext.measureText(text).width;
@@ -361,9 +361,7 @@ const getFastTextWidthWithSizeString = function(textElement,
  * @param {string} fontFamily The font family to use.
  * @return {{height: number, baseline: number}} Font measurements.
  */
-const measureFontMetrics = function(text, fontSize, fontWeight,
-    fontFamily) {
-
+const measureFontMetrics = function(text, fontSize, fontWeight, fontFamily) {
   const span = document.createElement('span');
   span.style.font = fontWeight + ' ' + fontSize + ' ' + fontFamily;
   span.textContent = text;

From f0d905dde0371a98f84eb3515d97f609e96b86ff Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Wed, 14 Jul 2021 14:18:05 -0700
Subject: [PATCH 038/833] Migrate core/utils/toolbox.js to ES6 const/let

---
 core/utils/toolbox.js | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/core/utils/toolbox.js b/core/utils/toolbox.js
index e9a9d2b2a..cbca92843 100644
--- a/core/utils/toolbox.js
+++ b/core/utils/toolbox.js
@@ -206,7 +206,7 @@ Blockly.utils.toolbox.convertToolboxDefToJson = function(toolboxDef) {
     toolboxDef = Blockly.utils.toolbox.convertToToolboxJson_(toolboxDef);
   }
 
-  var toolboxJson = /** @type {Blockly.utils.toolbox.ToolboxInfo} */ (toolboxDef);
+  const toolboxJson = /** @type {Blockly.utils.toolbox.ToolboxInfo} */ (toolboxDef);
   Blockly.utils.toolbox.validateToolbox_(toolboxJson);
   return toolboxJson;
 };
@@ -219,8 +219,8 @@ Blockly.utils.toolbox.convertToolboxDefToJson = function(toolboxDef) {
  * @private
  */
 Blockly.utils.toolbox.validateToolbox_ = function(toolboxJson) {
-  var toolboxKind = toolboxJson['kind'];
-  var toolboxContents = toolboxJson['contents'];
+  const toolboxKind = toolboxJson['kind'];
+  const toolboxContents = toolboxJson['contents'];
 
   if (toolboxKind) {
     if (toolboxKind != Blockly.utils.toolbox.FLYOUT_TOOLBOX_KIND &&
@@ -274,12 +274,12 @@ Blockly.utils.toolbox.hasCategories = function(toolboxJson) {
     return false;
   }
 
-  var toolboxKind = toolboxJson['kind'];
+  let toolboxKind = toolboxJson['kind'];
   if (toolboxKind) {
     return toolboxKind == Blockly.utils.toolbox.CATEGORY_TOOLBOX_KIND;
   }
 
-  var categories = toolboxJson['contents'].filter(function(item) {
+  const categories = toolboxJson['contents'].filter(function (item) {
     return item['kind'].toUpperCase() == 'CATEGORY';
   });
   return !!categories.length;
@@ -297,7 +297,7 @@ Blockly.utils.toolbox.isCategoryCollapsible = function(categoryInfo) {
     return false;
   }
 
-  var categories = categoryInfo['contents'].filter(function(item) {
+  const categories = categoryInfo['contents'].filter(function(item) {
     return item['kind'].toUpperCase() == 'CATEGORY';
   });
   return !!categories.length;
@@ -311,9 +311,9 @@ Blockly.utils.toolbox.isCategoryCollapsible = function(categoryInfo) {
  * @private
  */
 Blockly.utils.toolbox.convertToToolboxJson_ = function(toolboxDef) {
-  var contents = Blockly.utils.toolbox.xmlToJsonArray_(
+  const contents = Blockly.utils.toolbox.xmlToJsonArray_(
       /** @type {!Node|!Array<Node>} */ (toolboxDef));
-  var toolboxJson = {'contents': contents};
+  const toolboxJson = {'contents': contents};
   if (toolboxDef instanceof Node) {
     Blockly.utils.toolbox.addAttributes_(toolboxDef, toolboxJson);
   }
@@ -330,19 +330,19 @@ Blockly.utils.toolbox.convertToToolboxJson_ = function(toolboxDef) {
  * @private
  */
 Blockly.utils.toolbox.xmlToJsonArray_ = function(toolboxDef) {
-  var arr = [];
+  const arr = [];
   // If it is a node it will have children.
-  var childNodes = toolboxDef.childNodes;
+  let childNodes = toolboxDef.childNodes;
   if (!childNodes) {
     // Otherwise the toolboxDef is an array or collection.
     childNodes = toolboxDef;
   }
-  for (var i = 0, child; (child = childNodes[i]); i++) {
+  for (let i = 0, child; (child = childNodes[i]); i++) {
     if (!child.tagName) {
       continue;
     }
-    var obj = {};
-    var tagName = child.tagName.toUpperCase();
+    const obj = {};
+    const tagName = child.tagName.toUpperCase();
     obj['kind'] = tagName;
 
     // Store the XML for a block.
@@ -367,8 +367,8 @@ Blockly.utils.toolbox.xmlToJsonArray_ = function(toolboxDef) {
  * @private
  */
 Blockly.utils.toolbox.addAttributes_ = function(node, obj) {
-  for (var j = 0; j < node.attributes.length; j++) {
-    var attr = node.attributes[j];
+  for (let j = 0; j < node.attributes.length; j++) {
+    const attr = node.attributes[j];
     if (attr.nodeName.indexOf('css-') > -1) {
       obj['cssconfig'] = obj['cssconfig'] || {};
       obj['cssconfig'][attr.nodeName.replace('css-', '')] = attr.value;

From d3cc70eb37e367e9707b5757d58e4c4c2e3a4759 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 15 Jul 2021 12:56:01 -0700
Subject: [PATCH 039/833] Migrate core/utils/toolbox.js to goog.module

---
 core/utils/toolbox.js | 140 +++++++++++++++++++++---------------------
 tests/deps.js         |   9 +--
 2 files changed, 76 insertions(+), 73 deletions(-)

diff --git a/core/utils/toolbox.js b/core/utils/toolbox.js
index cbca92843..51ffdc7eb 100644
--- a/core/utils/toolbox.js
+++ b/core/utils/toolbox.js
@@ -14,7 +14,8 @@
  * @name Blockly.utils.toolbox
  * @namespace
  */
-goog.provide('Blockly.utils.toolbox');
+goog.module('Blockly.utils.toolbox');
+goog.module.declareLegacyNamespace();
 
 /** @suppress {extraRequire} */
 goog.require('Blockly.constants');
@@ -34,7 +35,7 @@ goog.requireType('Blockly.ToolboxSeparator');
  *            disabled: (string|boolean|undefined)
  *          }}
  */
-Blockly.utils.toolbox.BlockInfo;
+let BlockInfo;
 
 /**
  * The information needed to create a separator in the toolbox.
@@ -45,7 +46,7 @@ Blockly.utils.toolbox.BlockInfo;
  *            cssconfig:(!Blockly.ToolboxSeparator.CssConfig|undefined)
  *          }}
  */
-Blockly.utils.toolbox.SeparatorInfo;
+let SeparatorInfo;
 
 /**
  * The information needed to create a button in the toolbox.
@@ -55,7 +56,7 @@ Blockly.utils.toolbox.SeparatorInfo;
  *            callbackkey:string
  *          }}
  */
-Blockly.utils.toolbox.ButtonInfo;
+let ButtonInfo;
 
 /**
  * The information needed to create a label in the toolbox.
@@ -65,21 +66,21 @@ Blockly.utils.toolbox.ButtonInfo;
  *            id:(string|undefined)
  *          }}
  */
-Blockly.utils.toolbox.LabelInfo;
+let LabelInfo;
 
 /**
  * The information needed to create either a button or a label in the flyout.
- * @typedef {Blockly.utils.toolbox.ButtonInfo|
- *           Blockly.utils.toolbox.LabelInfo}
+ * @typedef {ButtonInfo|
+ *           LabelInfo}
  */
-Blockly.utils.toolbox.ButtonOrLabelInfo;
+let ButtonOrLabelInfo;
 
 /**
  * The information needed to create a category in the toolbox.
  * @typedef {{
  *            kind:string,
  *            name:string,
- *            contents:!Array<!Blockly.utils.toolbox.ToolboxItemInfo>,
+ *            contents:!Array<!ToolboxItemInfo>,
  *            id:(string|undefined),
  *            categorystyle:(string|undefined),
  *            colour:(string|undefined),
@@ -87,7 +88,7 @@ Blockly.utils.toolbox.ButtonOrLabelInfo;
  *            hidden:(string|undefined)
  *          }}
  */
-Blockly.utils.toolbox.StaticCategoryInfo;
+let StaticCategoryInfo;
 
 /**
  * The information needed to create a custom category.
@@ -101,65 +102,65 @@ Blockly.utils.toolbox.StaticCategoryInfo;
  *            hidden:(string|undefined)
  *          }}
  */
-Blockly.utils.toolbox.DynamicCategoryInfo;
+let DynamicCategoryInfo;
 
 /**
  * The information needed to create either a dynamic or static category.
- * @typedef {Blockly.utils.toolbox.StaticCategoryInfo|
- *           Blockly.utils.toolbox.DynamicCategoryInfo}
+ * @typedef {StaticCategoryInfo|
+ *           DynamicCategoryInfo}
  */
-Blockly.utils.toolbox.CategoryInfo;
+let CategoryInfo;
 
 /**
  * Any information that can be used to create an item in the toolbox.
- * @typedef {Blockly.utils.toolbox.FlyoutItemInfo|
- *           Blockly.utils.toolbox.StaticCategoryInfo}
+ * @typedef {FlyoutItemInfo|
+ *           StaticCategoryInfo}
  */
-Blockly.utils.toolbox.ToolboxItemInfo;
+let ToolboxItemInfo;
 
 /**
  * All the different types that can be displayed in a flyout.
- * @typedef {Blockly.utils.toolbox.BlockInfo|
- *           Blockly.utils.toolbox.SeparatorInfo|
- *           Blockly.utils.toolbox.ButtonInfo|
- *           Blockly.utils.toolbox.LabelInfo|
- *           Blockly.utils.toolbox.DynamicCategoryInfo}
+ * @typedef {BlockInfo|
+ *           SeparatorInfo|
+ *           ButtonInfo|
+ *           LabelInfo|
+ *           DynamicCategoryInfo}
  */
-Blockly.utils.toolbox.FlyoutItemInfo;
+let FlyoutItemInfo;
 
 /**
  * The JSON definition of a toolbox.
  * @typedef {{
  *            kind:(string|undefined),
- *            contents:!Array<!Blockly.utils.toolbox.ToolboxItemInfo>
+ *            contents:!Array<!ToolboxItemInfo>
  *          }}
  */
-Blockly.utils.toolbox.ToolboxInfo;
+let ToolboxInfo;
 
 /**
  * An array holding flyout items.
  * @typedef {
- *            Array<!Blockly.utils.toolbox.FlyoutItemInfo>
+ *            Array<!FlyoutItemInfo>
  *          }
  */
-Blockly.utils.toolbox.FlyoutItemInfoArray;
+let FlyoutItemInfoArray;
 
 /**
  * All of the different types that can create a toolbox.
  * @typedef {Node|
- *           Blockly.utils.toolbox.ToolboxInfo|
+ *           ToolboxInfo|
  *           string}
  */
-Blockly.utils.toolbox.ToolboxDefinition;
+let ToolboxDefinition;
 
 /**
  * All of the different types that can be used to show items in a flyout.
- * @typedef {Blockly.utils.toolbox.FlyoutItemInfoArray|
+ * @typedef {FlyoutItemInfoArray|
  *           NodeList|
- *           Blockly.utils.toolbox.ToolboxInfo|
+ *           ToolboxInfo|
  *           Array<!Node>}
  */
-Blockly.utils.toolbox.FlyoutDefinition;
+let FlyoutDefinition;
 
 /**
  * The name used to identify a toolbox that has category like items.
@@ -168,20 +169,20 @@ Blockly.utils.toolbox.FlyoutDefinition;
  * 'category'.
  * @const {string}
  */
-Blockly.utils.toolbox.CATEGORY_TOOLBOX_KIND = 'categoryToolbox';
+const CATEGORY_TOOLBOX_KIND = 'categoryToolbox';
 
 /**
  * The name used to identify a toolbox that has no categories and is displayed
  * as a simple flyout displaying blocks, buttons, or labels.
  * @const {string}
  */
-Blockly.utils.toolbox.FLYOUT_TOOLBOX_KIND = 'flyoutToolbox';
+const FLYOUT_TOOLBOX_KIND = 'flyoutToolbox';
 
 /**
  * Position of the toolbox and/or flyout relative to the workspace.
  * @enum {number}
  */
-Blockly.utils.toolbox.Position = {
+const Position = {
   TOP: 0,
   BOTTOM: 1,
   LEFT: 2,
@@ -190,45 +191,45 @@ Blockly.utils.toolbox.Position = {
 
 /**
  * Converts the toolbox definition into toolbox JSON.
- * @param {?Blockly.utils.toolbox.ToolboxDefinition} toolboxDef The definition
+ * @param {?ToolboxDefinition} toolboxDef The definition
  *     of the toolbox in one of its many forms.
- * @return {?Blockly.utils.toolbox.ToolboxInfo} Object holding information
+ * @return {?ToolboxInfo} Object holding information
  *     for creating a toolbox.
  * @package
  */
-Blockly.utils.toolbox.convertToolboxDefToJson = function(toolboxDef) {
+const convertToolboxDefToJson = function(toolboxDef) {
   if (!toolboxDef) {
     return null;
   }
 
   if (toolboxDef instanceof Element || typeof toolboxDef == 'string') {
-    toolboxDef = Blockly.utils.toolbox.parseToolboxTree(toolboxDef);
-    toolboxDef = Blockly.utils.toolbox.convertToToolboxJson_(toolboxDef);
+    toolboxDef = parseToolboxTree(toolboxDef);
+    toolboxDef = convertToToolboxJson(toolboxDef);
   }
 
-  const toolboxJson = /** @type {Blockly.utils.toolbox.ToolboxInfo} */ (toolboxDef);
-  Blockly.utils.toolbox.validateToolbox_(toolboxJson);
+  const toolboxJson = /** @type {ToolboxInfo} */ (toolboxDef);
+  validateToolbox(toolboxJson);
   return toolboxJson;
 };
 
 /**
  * Validates the toolbox JSON fields have been set correctly.
- * @param {!Blockly.utils.toolbox.ToolboxInfo} toolboxJson Object holding
+ * @param {!ToolboxInfo} toolboxJson Object holding
  *     information for creating a toolbox.
  * @throws {Error} if the toolbox is not the correct format.
  * @private
  */
-Blockly.utils.toolbox.validateToolbox_ = function(toolboxJson) {
+const validateToolbox = function(toolboxJson) {
   const toolboxKind = toolboxJson['kind'];
   const toolboxContents = toolboxJson['contents'];
 
   if (toolboxKind) {
-    if (toolboxKind != Blockly.utils.toolbox.FLYOUT_TOOLBOX_KIND &&
-      toolboxKind != Blockly.utils.toolbox.CATEGORY_TOOLBOX_KIND) {
+    if (toolboxKind != FLYOUT_TOOLBOX_KIND &&
+      toolboxKind != CATEGORY_TOOLBOX_KIND) {
       throw Error('Invalid toolbox kind ' + toolboxKind + '.' +
         ' Please supply either ' +
-        Blockly.utils.toolbox.FLYOUT_TOOLBOX_KIND + ' or ' +
-        Blockly.utils.toolbox.CATEGORY_TOOLBOX_KIND);
+        FLYOUT_TOOLBOX_KIND + ' or ' +
+        CATEGORY_TOOLBOX_KIND);
     }
   }
   if (!toolboxContents) {
@@ -238,12 +239,12 @@ Blockly.utils.toolbox.validateToolbox_ = function(toolboxJson) {
 
 /**
  * Converts the flyout definition into a list of flyout items.
- * @param {?Blockly.utils.toolbox.FlyoutDefinition} flyoutDef The definition of
+ * @param {?FlyoutDefinition} flyoutDef The definition of
  *    the flyout in one of its many forms.
- * @return {!Blockly.utils.toolbox.FlyoutItemInfoArray} A list of flyout items.
+ * @return {!FlyoutItemInfoArray} A list of flyout items.
  * @package
  */
-Blockly.utils.toolbox.convertFlyoutDefToJsonArray = function(flyoutDef) {
+const convertFlyoutDefToJsonArray = function(flyoutDef) {
   if (!flyoutDef) {
     return [];
   }
@@ -258,25 +259,24 @@ Blockly.utils.toolbox.convertFlyoutDefToJsonArray = function(flyoutDef) {
     return flyoutDef;
   }
 
-  return Blockly.utils.toolbox.xmlToJsonArray_(
-      /** @type {!Array<Node>|!NodeList} */ (flyoutDef));
+  return xmlToJsonArray(/** @type {!Array<Node>|!NodeList} */ (flyoutDef));
 };
 
 /**
  * Whether or not the toolbox definition has categories.
- * @param {?Blockly.utils.toolbox.ToolboxInfo} toolboxJson Object holding
+ * @param {?ToolboxInfo} toolboxJson Object holding
  *     information for creating a toolbox.
  * @return {boolean} True if the toolbox has categories.
  * @package
  */
-Blockly.utils.toolbox.hasCategories = function(toolboxJson) {
+const hasCategories = function(toolboxJson) {
   if (!toolboxJson) {
     return false;
   }
 
   let toolboxKind = toolboxJson['kind'];
   if (toolboxKind) {
-    return toolboxKind == Blockly.utils.toolbox.CATEGORY_TOOLBOX_KIND;
+    return toolboxKind == CATEGORY_TOOLBOX_KIND;
   }
 
   const categories = toolboxJson['contents'].filter(function (item) {
@@ -287,12 +287,12 @@ Blockly.utils.toolbox.hasCategories = function(toolboxJson) {
 
 /**
  * Whether or not the category is collapsible.
- * @param {!Blockly.utils.toolbox.CategoryInfo} categoryInfo Object holing
+ * @param {!CategoryInfo} categoryInfo Object holing
  *    information for creating a category.
  * @return {boolean} True if the category has subcategories.
  * @package
  */
-Blockly.utils.toolbox.isCategoryCollapsible = function(categoryInfo) {
+const isCategoryCollapsible = function(categoryInfo) {
   if (!categoryInfo || !categoryInfo['contents']) {
     return false;
   }
@@ -306,16 +306,16 @@ Blockly.utils.toolbox.isCategoryCollapsible = function(categoryInfo) {
 /**
  * Parses the provided toolbox definition into a consistent format.
  * @param {Node} toolboxDef The definition of the toolbox in one of its many forms.
- * @return {!Blockly.utils.toolbox.ToolboxInfo} Object holding information
+ * @return {!ToolboxInfo} Object holding information
  *     for creating a toolbox.
  * @private
  */
-Blockly.utils.toolbox.convertToToolboxJson_ = function(toolboxDef) {
-  const contents = Blockly.utils.toolbox.xmlToJsonArray_(
+const convertToToolboxJson = function(toolboxDef) {
+  const contents = xmlToJsonArray(
       /** @type {!Node|!Array<Node>} */ (toolboxDef));
   const toolboxJson = {'contents': contents};
   if (toolboxDef instanceof Node) {
-    Blockly.utils.toolbox.addAttributes_(toolboxDef, toolboxJson);
+    addAttributes(toolboxDef, toolboxJson);
   }
   return toolboxJson;
 };
@@ -324,12 +324,12 @@ Blockly.utils.toolbox.convertToToolboxJson_ = function(toolboxDef) {
  * Converts the xml for a toolbox to JSON.
  * @param {!Node|!Array<Node>|!NodeList} toolboxDef The
  *     definition of the toolbox in one of its many forms.
- * @return {!Blockly.utils.toolbox.FlyoutItemInfoArray|
- *          !Array<Blockly.utils.toolbox.ToolboxItemInfo>} A list of objects in
+ * @return {!FlyoutItemInfoArray|
+ *          !Array<ToolboxItemInfo>} A list of objects in
  *          the toolbox.
  * @private
  */
-Blockly.utils.toolbox.xmlToJsonArray_ = function(toolboxDef) {
+const xmlToJsonArray = function(toolboxDef) {
   const arr = [];
   // If it is a node it will have children.
   let childNodes = toolboxDef.childNodes;
@@ -350,11 +350,11 @@ Blockly.utils.toolbox.xmlToJsonArray_ = function(toolboxDef) {
       obj['blockxml'] = child;
     } else if (child.childNodes && child.childNodes.length > 0) {
       // Get the contents of a category
-      obj['contents'] = Blockly.utils.toolbox.xmlToJsonArray_(child);
+      obj['contents'] = xmlToJsonArray(child);
     }
 
     // Add XML attributes to object
-    Blockly.utils.toolbox.addAttributes_(child, obj);
+    addAttributes(child, obj);
     arr.push(obj);
   }
   return arr;
@@ -366,7 +366,7 @@ Blockly.utils.toolbox.xmlToJsonArray_ = function(toolboxDef) {
  * @param {!Object} obj The object to copy the attributes to.
  * @private
  */
-Blockly.utils.toolbox.addAttributes_ = function(node, obj) {
+const addAttributes = function(node, obj) {
   for (let j = 0; j < node.attributes.length; j++) {
     const attr = node.attributes[j];
     if (attr.nodeName.indexOf('css-') > -1) {
@@ -384,7 +384,7 @@ Blockly.utils.toolbox.addAttributes_ = function(node, obj) {
  *    of same.
  * @return {?Node} DOM tree of blocks, or null.
  */
-Blockly.utils.toolbox.parseToolboxTree = function(toolboxDef) {
+const parseToolboxTree = function(toolboxDef) {
   if (toolboxDef) {
     if (typeof toolboxDef != 'string') {
       if (Blockly.utils.userAgent.IE && toolboxDef.outerHTML) {
@@ -408,3 +408,5 @@ Blockly.utils.toolbox.parseToolboxTree = function(toolboxDef) {
   }
   return toolboxDef;
 };
+
+exports = {BlockInfo, SeparatorInfo, ButtonInfo, LabelInfo, ButtonOrLabelInfo, StaticCategoryInfo, DynamicCategoryInfo, CategoryInfo, ToolboxItemInfo, FlyoutItemInfo, ToolboxInfo, FlyoutItemInfoArray, ToolboxDefinition, FlyoutDefinition, Position, convertToolboxDefToJson, convertFlyoutDefToJsonArray, hasCategories, isCategoryCollapsible, parseToolboxTree}
diff --git a/tests/deps.js b/tests/deps.js
index e83f61c67..0654ec508 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -4,6 +4,7 @@ goog.addDependency('../../blocks/logic.js', ['Blockly.Blocks.logic', 'Blockly.Co
 goog.addDependency('../../blocks/loops.js', ['Blockly.Blocks.loops', 'Blockly.Constants.Loops'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable', 'Blockly.Warning']);
 goog.addDependency('../../blocks/math.js', ['Blockly.Blocks.math', 'Blockly.Constants.Math'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'], ['Blockly', 'Blockly.Blocks', 'Blockly.Comment', 'Blockly.FieldCheckbox', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.Mutator', 'Blockly.Warning'], {'lang': 'es5'});
+goog.addDependency('../../blocks/test_blocks.js', ['Blockly.TestBlocks'], ['Blockly', 'Blockly.Blocks'], {'lang': 'es5'});
 goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator']);
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
@@ -170,7 +171,7 @@ goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Bl
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.constants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
-goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], []);
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], []);
 goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.Svg', 'Blockly.utils.userAgent']);
@@ -180,13 +181,13 @@ goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], [
 goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], []);
 goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], []);
 goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], []);
 goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], []);
 goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Blockly.utils.Coordinate', 'Blockly.utils.Size']);
 goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], []);
-goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.constants']);
+goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], []);
+goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global']);
 goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
 goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.utils', 'Blockly.utils.object']);

From 2ab3bfd4cbd51ef1357b6271efb3debcea313c67 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 15 Jul 2021 11:29:50 -0700
Subject: [PATCH 040/833] Migrate core/utils/toolbox.js named requires

---
 core/utils/toolbox.js | 19 +++++++++----------
 tests/deps.js         |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/core/utils/toolbox.js b/core/utils/toolbox.js
index 51ffdc7eb..40e9fe78b 100644
--- a/core/utils/toolbox.js
+++ b/core/utils/toolbox.js
@@ -17,12 +17,11 @@
 goog.module('Blockly.utils.toolbox');
 goog.module.declareLegacyNamespace();
 
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
-goog.require('Blockly.Xml');
+const {IE} = goog.require('Blockly.utils.userAgent');
+const {textToDom} = goog.require('Blockly.Xml');
 
-goog.requireType('Blockly.ToolboxCategory');
-goog.requireType('Blockly.ToolboxSeparator');
+const {CssConfig: CategoryCssConfig} = goog.requireType('Blockly.ToolboxCategory');
+const {CssConfig: SeparatorCssConfig} = goog.requireType('Blockly.ToolboxSeparator');
 
 
 /**
@@ -43,7 +42,7 @@ let BlockInfo;
  *            kind:string,
  *            id:(string|undefined),
  *            gap:(number|undefined),
- *            cssconfig:(!Blockly.ToolboxSeparator.CssConfig|undefined)
+ *            cssconfig:(!SeparatorCssConfig|undefined)
  *          }}
  */
 let SeparatorInfo;
@@ -84,7 +83,7 @@ let ButtonOrLabelInfo;
  *            id:(string|undefined),
  *            categorystyle:(string|undefined),
  *            colour:(string|undefined),
- *            cssconfig:(!Blockly.ToolboxCategory.CssConfig|undefined),
+ *            cssconfig:(!CategoryCssConfig|undefined),
  *            hidden:(string|undefined)
  *          }}
  */
@@ -98,7 +97,7 @@ let StaticCategoryInfo;
  *            id:(string|undefined),
  *            categorystyle:(string|undefined),
  *            colour:(string|undefined),
- *            cssconfig:(!Blockly.ToolboxCategory.CssConfig|undefined),
+ *            cssconfig:(!CategoryCssConfig|undefined),
  *            hidden:(string|undefined)
  *          }}
  */
@@ -387,7 +386,7 @@ const addAttributes = function(node, obj) {
 const parseToolboxTree = function(toolboxDef) {
   if (toolboxDef) {
     if (typeof toolboxDef != 'string') {
-      if (Blockly.utils.userAgent.IE && toolboxDef.outerHTML) {
+      if (IE && toolboxDef.outerHTML) {
         // In this case the tree will not have been properly built by the
         // browser. The HTML will be contained in the element, but it will
         // not have the proper DOM structure since the browser doesn't support
@@ -398,7 +397,7 @@ const parseToolboxTree = function(toolboxDef) {
       }
     }
     if (typeof toolboxDef == 'string') {
-      toolboxDef = Blockly.Xml.textToDom(toolboxDef);
+      toolboxDef = textToDom(toolboxDef);
       if (toolboxDef.nodeName.toLowerCase() != 'xml') {
         throw TypeError('Toolbox should be an <xml> document.');
       }
diff --git a/tests/deps.js b/tests/deps.js
index 0654ec508..81507d9de 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -187,7 +187,7 @@ goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], []);
 goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Blockly.utils.Coordinate', 'Blockly.utils.Size']);
 goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], []);
 goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], []);
-goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global']);
 goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
 goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.utils', 'Blockly.utils.object']);

From fe9273ad5c60a53130a18e6e6806a788893e01b2 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 15 Jul 2021 13:00:45 -0700
Subject: [PATCH 041/833] clang-format core/utils/toolbox.js

---
 core/utils/toolbox.js | 38 ++++++++++++++++++++++++++++++--------
 tests/deps.js         |  6 +++---
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/core/utils/toolbox.js b/core/utils/toolbox.js
index 40e9fe78b..ec050d178 100644
--- a/core/utils/toolbox.js
+++ b/core/utils/toolbox.js
@@ -224,11 +224,11 @@ const validateToolbox = function(toolboxJson) {
 
   if (toolboxKind) {
     if (toolboxKind != FLYOUT_TOOLBOX_KIND &&
-      toolboxKind != CATEGORY_TOOLBOX_KIND) {
-      throw Error('Invalid toolbox kind ' + toolboxKind + '.' +
-        ' Please supply either ' +
-        FLYOUT_TOOLBOX_KIND + ' or ' +
-        CATEGORY_TOOLBOX_KIND);
+        toolboxKind != CATEGORY_TOOLBOX_KIND) {
+      throw Error(
+          'Invalid toolbox kind ' + toolboxKind + '.' +
+          ' Please supply either ' + FLYOUT_TOOLBOX_KIND + ' or ' +
+          CATEGORY_TOOLBOX_KIND);
     }
   }
   if (!toolboxContents) {
@@ -278,7 +278,7 @@ const hasCategories = function(toolboxJson) {
     return toolboxKind == CATEGORY_TOOLBOX_KIND;
   }
 
-  const categories = toolboxJson['contents'].filter(function (item) {
+  const categories = toolboxJson['contents'].filter(function(item) {
     return item['kind'].toUpperCase() == 'CATEGORY';
   });
   return !!categories.length;
@@ -304,7 +304,8 @@ const isCategoryCollapsible = function(categoryInfo) {
 
 /**
  * Parses the provided toolbox definition into a consistent format.
- * @param {Node} toolboxDef The definition of the toolbox in one of its many forms.
+ * @param {Node} toolboxDef The definition of the toolbox in one of its many
+ *     forms.
  * @return {!ToolboxInfo} Object holding information
  *     for creating a toolbox.
  * @private
@@ -408,4 +409,25 @@ const parseToolboxTree = function(toolboxDef) {
   return toolboxDef;
 };
 
-exports = {BlockInfo, SeparatorInfo, ButtonInfo, LabelInfo, ButtonOrLabelInfo, StaticCategoryInfo, DynamicCategoryInfo, CategoryInfo, ToolboxItemInfo, FlyoutItemInfo, ToolboxInfo, FlyoutItemInfoArray, ToolboxDefinition, FlyoutDefinition, Position, convertToolboxDefToJson, convertFlyoutDefToJsonArray, hasCategories, isCategoryCollapsible, parseToolboxTree}
+exports = {
+  BlockInfo,
+  SeparatorInfo,
+  ButtonInfo,
+  LabelInfo,
+  ButtonOrLabelInfo,
+  StaticCategoryInfo,
+  DynamicCategoryInfo,
+  CategoryInfo,
+  ToolboxItemInfo,
+  FlyoutItemInfo,
+  ToolboxInfo,
+  FlyoutItemInfoArray,
+  ToolboxDefinition,
+  FlyoutDefinition,
+  Position,
+  convertToolboxDefToJson,
+  convertFlyoutDefToJsonArray,
+  hasCategories,
+  isCategoryCollapsible,
+  parseToolboxTree
+}
diff --git a/tests/deps.js b/tests/deps.js
index 81507d9de..3d4531cf1 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -171,7 +171,7 @@ goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Bl
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.constants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
-goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], []);
+goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], []);
 goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.Svg', 'Blockly.utils.userAgent']);
@@ -181,12 +181,12 @@ goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], [
 goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], []);
 goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], []);
+goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], []);
 goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], []);
 goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Blockly.utils.Coordinate', 'Blockly.utils.Size']);
 goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], []);
-goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], []);
+goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global']);
 goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);

From b43b19c7a336b59b93986b29cfbb3406a76f8040 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Thu, 15 Jul 2021 14:38:16 -0700
Subject: [PATCH 042/833] Migrate core/renderers/common/drawer.js to ES6
 const/let

---
 core/renderers/common/drawer.js | 120 ++++++++++++++++----------------
 1 file changed, 61 insertions(+), 59 deletions(-)

diff --git a/core/renderers/common/drawer.js b/core/renderers/common/drawer.js
index f91b97d7a..0d3a5bab9 100644
--- a/core/renderers/common/drawer.js
+++ b/core/renderers/common/drawer.js
@@ -90,7 +90,7 @@ Blockly.blockRendering.Drawer.prototype.recordSizeOnBlock_ = function() {
  * @protected
  */
 Blockly.blockRendering.Drawer.prototype.hideHiddenIcons_ = function() {
-  for (var i = 0, iconInfo; (iconInfo = this.info_.hiddenIcons[i]); i++) {
+  for (let i = 0, iconInfo; (iconInfo = this.info_.hiddenIcons[i]); i++) {
     iconInfo.icon.iconGroup_.setAttribute('display', 'none');
   }
 };
@@ -101,8 +101,8 @@ Blockly.blockRendering.Drawer.prototype.hideHiddenIcons_ = function() {
  */
 Blockly.blockRendering.Drawer.prototype.drawOutline_ = function() {
   this.drawTop_();
-  for (var r = 1; r < this.info_.rows.length - 1; r++) {
-    var row = this.info_.rows[r];
+  for (let r = 1; r < this.info_.rows.length - 1; r++) {
+    const row = this.info_.rows[r];
     if (row.hasJaggedEdge) {
       this.drawJaggedEdge_(row);
     } else if (row.hasStatement) {
@@ -124,13 +124,13 @@ Blockly.blockRendering.Drawer.prototype.drawOutline_ = function() {
  * @protected
  */
 Blockly.blockRendering.Drawer.prototype.drawTop_ = function() {
-  var topRow = this.info_.topRow;
-  var elements = topRow.elements;
+  const topRow = this.info_.topRow;
+  const elements = topRow.elements;
 
   this.positionPreviousConnection_();
   this.outlinePath_ +=
       Blockly.utils.svgPaths.moveBy(topRow.xPos, this.info_.startY);
-  for (var i = 0, elem; (elem = elements[i]); i++) {
+  for (let i = 0, elem; (elem = elements[i]); i++) {
     if (Blockly.blockRendering.Types.isLeftRoundedCorner(elem)) {
       this.outlinePath_ +=
           this.constants_.OUTSIDE_CORNERS.topLeft;
@@ -155,8 +155,7 @@ Blockly.blockRendering.Drawer.prototype.drawTop_ = function() {
  * @protected
  */
 Blockly.blockRendering.Drawer.prototype.drawJaggedEdge_ = function(row) {
-  var remainder =
-      row.height - this.constants_.JAGGED_TEETH.height;
+  const remainder = row.height - this.constants_.JAGGED_TEETH.height;
   this.outlinePath_ += this.constants_.JAGGED_TEETH.path +
       Blockly.utils.svgPaths.lineOnAxis('v', remainder);
 };
@@ -169,10 +168,10 @@ Blockly.blockRendering.Drawer.prototype.drawJaggedEdge_ = function(row) {
  * @protected
  */
 Blockly.blockRendering.Drawer.prototype.drawValueInput_ = function(row) {
-  var input = row.getLastInput();
+  const input = row.getLastInput();
   this.positionExternalValueConnection_(row);
 
-  var pathDown = (typeof input.shape.pathDown == "function") ?
+  const pathDown = (typeof input.shape.pathDown == 'function') ?
       input.shape.pathDown(input.height) :
       input.shape.pathDown;
 
@@ -190,18 +189,16 @@ Blockly.blockRendering.Drawer.prototype.drawValueInput_ = function(row) {
  * @protected
  */
 Blockly.blockRendering.Drawer.prototype.drawStatementInput_ = function(row) {
-  var input = row.getLastInput();
+  const input = row.getLastInput();
   // Where to start drawing the notch, which is on the right side in LTR.
-  var x = input.xPos + input.notchOffset + input.shape.width;
+  const x = input.xPos + input.notchOffset + input.shape.width;
 
-  var innerTopLeftCorner =
-      input.shape.pathRight +
-      Blockly.utils.svgPaths.lineOnAxis('h',
-          -(input.notchOffset - this.constants_.INSIDE_CORNERS.width)) +
+  const innerTopLeftCorner = input.shape.pathRight +
+      Blockly.utils.svgPaths.lineOnAxis(
+          'h', -(input.notchOffset - this.constants_.INSIDE_CORNERS.width)) +
       this.constants_.INSIDE_CORNERS.pathTop;
 
-  var innerHeight =
-      row.height - (2 * this.constants_.INSIDE_CORNERS.height);
+  const innerHeight = row.height - (2 * this.constants_.INSIDE_CORNERS.height);
 
   this.outlinePath_ += Blockly.utils.svgPaths.lineOnAxis('H', x) +
       innerTopLeftCorner +
@@ -231,13 +228,13 @@ Blockly.blockRendering.Drawer.prototype.drawRightSideRow_ = function(row) {
  * @protected
  */
 Blockly.blockRendering.Drawer.prototype.drawBottom_ = function() {
-  var bottomRow = this.info_.bottomRow;
-  var elems = bottomRow.elements;
+  const bottomRow = this.info_.bottomRow;
+  const elems = bottomRow.elements;
   this.positionNextConnection_();
 
-  var rightCornerYOffset = 0;
-  var outlinePath = '';
-  for (var i = elems.length - 1, elem; (elem = elems[i]); i--) {
+  let rightCornerYOffset = 0;
+  let outlinePath = '';
+  for (let i = elems.length - 1, elem; (elem = elems[i]); i--) {
     if (Blockly.blockRendering.Types.isNextConnection(elem)) {
       outlinePath += elem.shape.pathRight;
     } else if (Blockly.blockRendering.Types.isLeftSquareCorner(elem)) {
@@ -263,13 +260,13 @@ Blockly.blockRendering.Drawer.prototype.drawBottom_ = function() {
  * @protected
  */
 Blockly.blockRendering.Drawer.prototype.drawLeft_ = function() {
-  var outputConnection = this.info_.outputConnection;
+  const outputConnection = this.info_.outputConnection;
   this.positionOutputConnection_();
 
   if (outputConnection) {
-    var tabBottom = outputConnection.connectionOffsetY +
-        outputConnection.height;
-    var pathUp = (typeof outputConnection.shape.pathUp == "function") ?
+    const tabBottom =
+        outputConnection.connectionOffsetY + outputConnection.height;
+    const pathUp = (typeof outputConnection.shape.pathUp == 'function') ?
         outputConnection.shape.pathUp(outputConnection.height) :
         outputConnection.shape.pathUp;
 
@@ -289,8 +286,8 @@ Blockly.blockRendering.Drawer.prototype.drawLeft_ = function() {
  * @protected
  */
 Blockly.blockRendering.Drawer.prototype.drawInternals_ = function() {
-  for (var i = 0, row; (row = this.info_.rows[i]); i++) {
-    for (var j = 0, elem; (elem = row.elements[j]); j++) {
+  for (let i = 0, row; (row = this.info_.rows[i]); i++) {
+    for (let j = 0, elem; (elem = row.elements[j]); j++) {
       if (Blockly.blockRendering.Types.isInlineInput(elem)) {
         this.drawInlineInput_(
             /** @type {!Blockly.blockRendering.InlineInput} */ (elem));
@@ -311,15 +308,16 @@ Blockly.blockRendering.Drawer.prototype.drawInternals_ = function() {
  * @protected
  */
 Blockly.blockRendering.Drawer.prototype.layoutField_ = function(fieldInfo) {
+  let svgGroup;
   if (Blockly.blockRendering.Types.isField(fieldInfo)) {
-    var svgGroup = fieldInfo.field.getSvgRoot();
+    svgGroup = fieldInfo.field.getSvgRoot();
   } else if (Blockly.blockRendering.Types.isIcon(fieldInfo)) {
-    var svgGroup = fieldInfo.icon.iconGroup_;
+    svgGroup = fieldInfo.icon.iconGroup_;
   }
 
-  var yPos = fieldInfo.centerline - fieldInfo.height / 2;
-  var xPos = fieldInfo.xPos;
-  var scale = '';
+  const yPos = fieldInfo.centerline - fieldInfo.height / 2;
+  let xPos = fieldInfo.xPos;
+  let scale = '';
   if (this.info_.RTL) {
     xPos = -(xPos + fieldInfo.width);
     if (fieldInfo.flipRtl) {
@@ -350,13 +348,13 @@ Blockly.blockRendering.Drawer.prototype.layoutField_ = function(fieldInfo) {
  * @protected
  */
 Blockly.blockRendering.Drawer.prototype.drawInlineInput_ = function(input) {
-  var width = input.width;
-  var height = input.height;
-  var yPos = input.centerline - height / 2;
+  const width = input.width;
+  const height = input.height;
+  const yPos = input.centerline - height / 2;
 
-  var connectionTop = input.connectionOffsetY;
-  var connectionBottom = input.connectionHeight + connectionTop;
-  var connectionRight = input.xPos + input.connectionWidth;
+  const connectionTop = input.connectionOffsetY;
+  const connectionBottom = input.connectionHeight + connectionTop;
+  const connectionRight = input.xPos + input.connectionWidth;
 
   this.inlinePath_ += Blockly.utils.svgPaths.moveTo(connectionRight, yPos) +
       Blockly.utils.svgPaths.lineOnAxis('v', connectionTop) +
@@ -377,12 +375,13 @@ Blockly.blockRendering.Drawer.prototype.drawInlineInput_ = function(input) {
  * the input that the connection is on.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.positionInlineInputConnection_ = function(input) {
-  var yPos = input.centerline - input.height / 2;
+Blockly.blockRendering.Drawer.prototype.positionInlineInputConnection_ =
+    function(input) {
+  const yPos = input.centerline - input.height / 2;
   // Move the connection.
   if (input.connectionModel) {
     // xPos already contains info about startX
-    var connX = input.xPos + input.connectionWidth + input.connectionOffsetX;
+    let connX = input.xPos + input.connectionWidth + input.connectionOffsetX;
     if (this.info_.RTL) {
       connX *= -1;
     }
@@ -398,10 +397,11 @@ Blockly.blockRendering.Drawer.prototype.positionInlineInputConnection_ = functio
  * @param {!Blockly.blockRendering.Row} row The row that the connection is on.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.positionStatementInputConnection_ = function(row) {
-  var input = row.getLastInput();
+Blockly.blockRendering.Drawer.prototype.positionStatementInputConnection_ =
+    function(row) {
+  const input = row.getLastInput();
   if (input.connectionModel) {
-    var connX = row.xPos + row.statementEdge + input.notchOffset;
+    let connX = row.xPos + row.statementEdge + input.notchOffset;
     if (this.info_.RTL) {
       connX *= -1;
     }
@@ -416,10 +416,11 @@ Blockly.blockRendering.Drawer.prototype.positionStatementInputConnection_ = func
  * @param {!Blockly.blockRendering.Row} row The row that the connection is on.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.positionExternalValueConnection_ = function(row) {
-  var input = row.getLastInput();
+Blockly.blockRendering.Drawer.prototype.positionExternalValueConnection_ =
+    function(row) {
+  const input = row.getLastInput();
   if (input.connectionModel) {
-    var connX = row.xPos + row.width;
+    let connX = row.xPos + row.width;
     if (this.info_.RTL) {
       connX *= -1;
     }
@@ -431,11 +432,12 @@ Blockly.blockRendering.Drawer.prototype.positionExternalValueConnection_ = funct
  * Position the previous connection on a block.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.positionPreviousConnection_ = function() {
-  var topRow = this.info_.topRow;
+Blockly.blockRendering.Drawer.prototype.positionPreviousConnection_ =
+    function() {
+  const topRow = this.info_.topRow;
   if (topRow.connection) {
-    var x = topRow.xPos + topRow.notchOffset;
-    var connX = (this.info_.RTL ? -x : x);
+    const x = topRow.xPos + topRow.notchOffset;
+    const connX = (this.info_.RTL ? -x : x);
     topRow.connection.connectionModel.setOffsetInBlock(connX, 0);
   }
 };
@@ -445,12 +447,12 @@ Blockly.blockRendering.Drawer.prototype.positionPreviousConnection_ = function()
  * @protected
  */
 Blockly.blockRendering.Drawer.prototype.positionNextConnection_ = function() {
-  var bottomRow = this.info_.bottomRow;
+  const bottomRow = this.info_.bottomRow;
 
   if (bottomRow.connection) {
-    var connInfo = bottomRow.connection;
-    var x = connInfo.xPos;  // Already contains info about startX.
-    var connX = (this.info_.RTL ? -x : x);
+    const connInfo = bottomRow.connection;
+    const x = connInfo.xPos;  // Already contains info about startX.
+    const connX = (this.info_.RTL ? -x : x);
     connInfo.connectionModel.setOffsetInBlock(connX, bottomRow.baseline);
   }
 };
@@ -461,8 +463,8 @@ Blockly.blockRendering.Drawer.prototype.positionNextConnection_ = function() {
  */
 Blockly.blockRendering.Drawer.prototype.positionOutputConnection_ = function() {
   if (this.info_.outputConnection) {
-    var x = this.info_.startX + this.info_.outputConnection.connectionOffsetX;
-    var connX = this.info_.RTL ? -x : x;
+    const x = this.info_.startX + this.info_.outputConnection.connectionOffsetX;
+    const connX = this.info_.RTL ? -x : x;
     this.block_.outputConnection.setOffsetInBlock(connX,
         this.info_.outputConnection.connectionOffsetY);
   }

From 66c959b4a3e6ca3ad8884303f9a9a4aed85af801 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 15 Jul 2021 14:57:23 -0700
Subject: [PATCH 043/833] Migrate core/block_animations.js to ES6 const/let

---
 core/block_animations.js | 48 ++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/core/block_animations.js b/core/block_animations.js
index 82e2516b1..54b776d98 100644
--- a/core/block_animations.js
+++ b/core/block_animations.js
@@ -38,13 +38,13 @@ Blockly.blockAnimations.disconnectGroup_ = null;
  * @package
  */
 Blockly.blockAnimations.disposeUiEffect = function(block) {
-  var workspace = block.workspace;
-  var svgGroup = block.getSvgRoot();
+  const workspace = block.workspace;
+  const svgGroup = block.getSvgRoot();
   workspace.getAudioManager().play('delete');
 
-  var xy = workspace.getSvgXY(svgGroup);
+  const xy = workspace.getSvgXY(svgGroup);
   // Deeply clone the current block.
-  var clone = svgGroup.cloneNode(true);
+  const clone = svgGroup.cloneNode(true);
   clone.translateX_ = xy.x;
   clone.translateY_ = xy.y;
   clone.setAttribute('transform', 'translate(' + xy.x + ',' + xy.y + ')');
@@ -67,15 +67,15 @@ Blockly.blockAnimations.disposeUiEffect = function(block) {
  */
 Blockly.blockAnimations.disposeUiStep_ = function(clone, rtl, start,
     workspaceScale) {
-  var ms = new Date - start;
-  var percent = ms / 150;
+  const ms = new Date - start;
+  const percent = ms / 150;
   if (percent > 1) {
     Blockly.utils.dom.removeNode(clone);
   } else {
-    var x = clone.translateX_ +
+    const x = clone.translateX_ +
         (rtl ? -1 : 1) * clone.bBox_.width * workspaceScale / 2 * percent;
-    var y = clone.translateY_ + clone.bBox_.height * workspaceScale * percent;
-    var scale = (1 - percent) * workspaceScale;
+    const y = clone.translateY_ + clone.bBox_.height * workspaceScale * percent;
+    const scale = (1 - percent) * workspaceScale;
     clone.setAttribute('transform', 'translate(' + x + ',' + y + ')' +
         ' scale(' + scale + ')');
     setTimeout(Blockly.blockAnimations.disposeUiStep_, 10, clone, rtl, start,
@@ -89,14 +89,14 @@ Blockly.blockAnimations.disposeUiStep_ = function(clone, rtl, start,
  * @package
  */
 Blockly.blockAnimations.connectionUiEffect = function(block) {
-  var workspace = block.workspace;
-  var scale = workspace.scale;
+  const workspace = block.workspace;
+  const scale = workspace.scale;
   workspace.getAudioManager().play('click');
   if (scale < 1) {
     return;  // Too small to care about visual effects.
   }
   // Determine the absolute coordinates of the inferior block.
-  var xy = workspace.getSvgXY(block.getSvgRoot());
+  const xy = workspace.getSvgXY(block.getSvgRoot());
   // Offset the coordinates based on the two connection types, fix scale.
   if (block.outputConnection) {
     xy.x += (block.RTL ? 3 : -3) * scale;
@@ -105,7 +105,7 @@ Blockly.blockAnimations.connectionUiEffect = function(block) {
     xy.x += (block.RTL ? -23 : 23) * scale;
     xy.y += 3 * scale;
   }
-  var ripple = Blockly.utils.dom.createSvgElement(
+  const ripple = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.CIRCLE,
       {
         'cx': xy.x,
@@ -128,8 +128,8 @@ Blockly.blockAnimations.connectionUiEffect = function(block) {
  * @private
  */
 Blockly.blockAnimations.connectionUiStep_ = function(ripple, start, scale) {
-  var ms = new Date - start;
-  var percent = ms / 150;
+  const ms = new Date - start;
+  const percent = ms / 150;
   if (percent > 1) {
     Blockly.utils.dom.removeNode(ripple);
   } else {
@@ -151,10 +151,10 @@ Blockly.blockAnimations.disconnectUiEffect = function(block) {
     return;  // Too small to care about visual effects.
   }
   // Horizontal distance for bottom of block to wiggle.
-  var DISPLACEMENT = 10;
+  const DISPLACEMENT = 10;
   // Scale magnitude of skew to height of block.
-  var height = block.getHeightWidth().height;
-  var magnitude = Math.atan(DISPLACEMENT / height) / Math.PI * 180;
+  const height = block.getHeightWidth().height;
+  let magnitude = Math.atan(DISPLACEMENT / height) / Math.PI * 180;
   if (!block.RTL) {
     magnitude *= -1;
   }
@@ -170,16 +170,16 @@ Blockly.blockAnimations.disconnectUiEffect = function(block) {
  * @private
  */
 Blockly.blockAnimations.disconnectUiStep_ = function(group, magnitude, start) {
-  var DURATION = 200;  // Milliseconds.
-  var WIGGLES = 3;  // Half oscillations.
+  const DURATION = 200;  // Milliseconds.
+  const WIGGLES = 3;  // Half oscillations.
 
-  var ms = new Date - start;
-  var percent = ms / DURATION;
+  const ms = new Date - start;
+  const percent = ms / DURATION;
 
   if (percent > 1) {
     group.skew_ = '';
   } else {
-    var skew = Math.round(
+    const skew = Math.round(
         Math.sin(percent * Math.PI * WIGGLES) * (1 - percent) * magnitude);
     group.skew_ = 'skewX(' + skew + ')';
     Blockly.blockAnimations.disconnectGroup_ = group;
@@ -197,7 +197,7 @@ Blockly.blockAnimations.disconnectUiStep_ = function(group, magnitude, start) {
 Blockly.blockAnimations.disconnectUiStop = function() {
   if (Blockly.blockAnimations.disconnectGroup_) {
     clearTimeout(Blockly.blockAnimations.disconnectPid_);
-    var group = Blockly.blockAnimations.disconnectGroup_;
+    const group = Blockly.blockAnimations.disconnectGroup_;
     group.skew_ = '';
     group.setAttribute('transform', group.translate_);
     Blockly.blockAnimations.disconnectGroup_ = null;

From ab0b03c4725c895e70cf6ecd35616562f5070985 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 15 Jul 2021 15:29:35 -0700
Subject: [PATCH 044/833] Migrate core/block_animations.js to goog.module

---
 core/block_animations.js | 79 ++++++++++++++++++++--------------------
 tests/deps.js            |  2 +-
 2 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/core/block_animations.js b/core/block_animations.js
index 54b776d98..e6a7cf4f2 100644
--- a/core/block_animations.js
+++ b/core/block_animations.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.blockAnimations');
+goog.module('Blockly.blockAnimations');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.Svg');
@@ -21,23 +22,20 @@ goog.requireType('Blockly.BlockSvg');
 /**
  * PID of disconnect UI animation.  There can only be one at a time.
  * @type {number}
- * @private
  */
-Blockly.blockAnimations.disconnectPid_ = 0;
+let disconnectPid = 0;
 
 /**
  * SVG group of wobbling block.  There can only be one at a time.
  * @type {Element}
- * @private
  */
-Blockly.blockAnimations.disconnectGroup_ = null;
+let disconnectGroup = null;
 
 /**
  * Play some UI effects (sound, animation) when disposing of a block.
  * @param {!Blockly.BlockSvg} block The block being disposed of.
- * @package
  */
-Blockly.blockAnimations.disposeUiEffect = function(block) {
+function disposeUiEffect(block) {
   const workspace = block.workspace;
   const svgGroup = block.getSvgRoot();
   workspace.getAudioManager().play('delete');
@@ -51,9 +49,11 @@ Blockly.blockAnimations.disposeUiEffect = function(block) {
   workspace.getParentSvg().appendChild(clone);
   clone.bBox_ = clone.getBBox();
   // Start the animation.
-  Blockly.blockAnimations.disposeUiStep_(clone, workspace.RTL, new Date,
+  disposeUiStep(clone, workspace.RTL, new Date,
       workspace.scale);
-};
+}
+/** @package */
+exports.disposeUiEffect = disposeUiEffect;
 
 /**
  * Animate a cloned block and eventually dispose of it.
@@ -63,9 +63,8 @@ Blockly.blockAnimations.disposeUiEffect = function(block) {
  * @param {boolean} rtl True if RTL, false if LTR.
  * @param {!Date} start Date of animation's start.
  * @param {number} workspaceScale Scale of workspace.
- * @private
  */
-Blockly.blockAnimations.disposeUiStep_ = function(clone, rtl, start,
+function disposeUiStep(clone, rtl, start,
     workspaceScale) {
   const ms = new Date - start;
   const percent = ms / 150;
@@ -78,17 +77,16 @@ Blockly.blockAnimations.disposeUiStep_ = function(clone, rtl, start,
     const scale = (1 - percent) * workspaceScale;
     clone.setAttribute('transform', 'translate(' + x + ',' + y + ')' +
         ' scale(' + scale + ')');
-    setTimeout(Blockly.blockAnimations.disposeUiStep_, 10, clone, rtl, start,
+    setTimeout(disposeUiStep, 10, clone, rtl, start,
         workspaceScale);
   }
-};
+}
 
 /**
  * Play some UI effects (sound, ripple) after a connection has been established.
  * @param {!Blockly.BlockSvg} block The block being connected.
- * @package
  */
-Blockly.blockAnimations.connectionUiEffect = function(block) {
+function connectionUiEffect(block) {
   const workspace = block.workspace;
   const scale = workspace.scale;
   workspace.getAudioManager().play('click');
@@ -117,17 +115,18 @@ Blockly.blockAnimations.connectionUiEffect = function(block) {
       },
       workspace.getParentSvg());
   // Start the animation.
-  Blockly.blockAnimations.connectionUiStep_(ripple, new Date, scale);
-};
+  connectionUiStep(ripple, new Date, scale);
+}
+/** @package */
+exports.connectionUiEffect = connectionUiEffect;
 
 /**
  * Expand a ripple around a connection.
  * @param {!SVGElement} ripple Element to animate.
  * @param {!Date} start Date of animation's start.
  * @param {number} scale Scale of workspace.
- * @private
  */
-Blockly.blockAnimations.connectionUiStep_ = function(ripple, start, scale) {
+function connectionUiStep(ripple, start, scale) {
   const ms = new Date - start;
   const percent = ms / 150;
   if (percent > 1) {
@@ -135,17 +134,16 @@ Blockly.blockAnimations.connectionUiStep_ = function(ripple, start, scale) {
   } else {
     ripple.setAttribute('r', percent * 25 * scale);
     ripple.style.opacity = 1 - percent;
-    Blockly.blockAnimations.disconnectPid_ = setTimeout(
-        Blockly.blockAnimations.connectionUiStep_, 10, ripple, start, scale);
+    disconnectPid = setTimeout(
+        connectionUiStep, 10, ripple, start, scale);
   }
-};
+}
 
 /**
  * Play some UI effects (sound, animation) when disconnecting a block.
  * @param {!Blockly.BlockSvg} block The block being disconnected.
- * @package
  */
-Blockly.blockAnimations.disconnectUiEffect = function(block) {
+function disconnectUiEffect(block) {
   block.workspace.getAudioManager().play('disconnect');
   if (block.workspace.scale < 1) {
     return;  // Too small to care about visual effects.
@@ -159,17 +157,19 @@ Blockly.blockAnimations.disconnectUiEffect = function(block) {
     magnitude *= -1;
   }
   // Start the animation.
-  Blockly.blockAnimations.disconnectUiStep_(
+  disconnectUiStep(
       block.getSvgRoot(), magnitude, new Date);
-};
+}
+/** @package */
+exports.disconnectUiEffect = disconnectUiEffect;
+
 /**
  * Animate a brief wiggle of a disconnected block.
  * @param {!SVGElement} group SVG element to animate.
  * @param {number} magnitude Maximum degrees skew (reversed for RTL).
  * @param {!Date} start Date of animation's start.
- * @private
  */
-Blockly.blockAnimations.disconnectUiStep_ = function(group, magnitude, start) {
+function disconnectUiStep(group, magnitude, start) {
   const DURATION = 200;  // Milliseconds.
   const WIGGLES = 3;  // Half oscillations.
 
@@ -182,24 +182,25 @@ Blockly.blockAnimations.disconnectUiStep_ = function(group, magnitude, start) {
     const skew = Math.round(
         Math.sin(percent * Math.PI * WIGGLES) * (1 - percent) * magnitude);
     group.skew_ = 'skewX(' + skew + ')';
-    Blockly.blockAnimations.disconnectGroup_ = group;
-    Blockly.blockAnimations.disconnectPid_ =
-        setTimeout(Blockly.blockAnimations.disconnectUiStep_, 10, group,
+    disconnectGroup = group;
+    disconnectPid =
+        setTimeout(disconnectUiStep, 10, group,
             magnitude, start);
   }
   group.setAttribute('transform', group.translate_ + group.skew_);
-};
+}
 
 /**
  * Stop the disconnect UI animation immediately.
- * @package
  */
-Blockly.blockAnimations.disconnectUiStop = function() {
-  if (Blockly.blockAnimations.disconnectGroup_) {
-    clearTimeout(Blockly.blockAnimations.disconnectPid_);
-    const group = Blockly.blockAnimations.disconnectGroup_;
+function disconnectUiStop() {
+  if (disconnectGroup) {
+    clearTimeout(disconnectPid);
+    const group = disconnectGroup;
     group.skew_ = '';
     group.setAttribute('transform', group.translate_);
-    Blockly.blockAnimations.disconnectGroup_ = null;
+    disconnectGroup = null;
   }
-};
+}
+/** @package */
+exports.disconnectUiStop = disconnectUiStop;
diff --git a/tests/deps.js b/tests/deps.js
index e83f61c67..f1a4cd48c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -8,7 +8,7 @@ goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Con
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.IASTNodeLocation', 'Blockly.IDeletable', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.Workspace', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es5'});
-goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom']);
 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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);

From 5f025f4d03c64fc8af4ea339fde9a7345a8168bf Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 15 Jul 2021 15:32:40 -0700
Subject: [PATCH 045/833] Migrate core/block_animations.js to named requires

---
 core/block_animations.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/block_animations.js b/core/block_animations.js
index e6a7cf4f2..c973bd097 100644
--- a/core/block_animations.js
+++ b/core/block_animations.js
@@ -13,10 +13,10 @@
 goog.module('Blockly.blockAnimations');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Svg');
+const dom = goog.require('Blockly.utils.dom');
+const Svg = goog.require('Blockly.utils.Svg');
 
-goog.requireType('Blockly.BlockSvg');
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
 
 
 /**
@@ -33,7 +33,7 @@ let disconnectGroup = null;
 
 /**
  * Play some UI effects (sound, animation) when disposing of a block.
- * @param {!Blockly.BlockSvg} block The block being disposed of.
+ * @param {!BlockSvg} block The block being disposed of.
  */
 function disposeUiEffect(block) {
   const workspace = block.workspace;
@@ -69,7 +69,7 @@ function disposeUiStep(clone, rtl, start,
   const ms = new Date - start;
   const percent = ms / 150;
   if (percent > 1) {
-    Blockly.utils.dom.removeNode(clone);
+    dom.removeNode(clone);
   } else {
     const x = clone.translateX_ +
         (rtl ? -1 : 1) * clone.bBox_.width * workspaceScale / 2 * percent;
@@ -84,7 +84,7 @@ function disposeUiStep(clone, rtl, start,
 
 /**
  * Play some UI effects (sound, ripple) after a connection has been established.
- * @param {!Blockly.BlockSvg} block The block being connected.
+ * @param {!BlockSvg} block The block being connected.
  */
 function connectionUiEffect(block) {
   const workspace = block.workspace;
@@ -103,8 +103,8 @@ function connectionUiEffect(block) {
     xy.x += (block.RTL ? -23 : 23) * scale;
     xy.y += 3 * scale;
   }
-  const ripple = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.CIRCLE,
+  const ripple = dom.createSvgElement(
+      Svg.CIRCLE,
       {
         'cx': xy.x,
         'cy': xy.y,
@@ -130,7 +130,7 @@ function connectionUiStep(ripple, start, scale) {
   const ms = new Date - start;
   const percent = ms / 150;
   if (percent > 1) {
-    Blockly.utils.dom.removeNode(ripple);
+    dom.removeNode(ripple);
   } else {
     ripple.setAttribute('r', percent * 25 * scale);
     ripple.style.opacity = 1 - percent;
@@ -141,7 +141,7 @@ function connectionUiStep(ripple, start, scale) {
 
 /**
  * Play some UI effects (sound, animation) when disconnecting a block.
- * @param {!Blockly.BlockSvg} block The block being disconnected.
+ * @param {!BlockSvg} block The block being disconnected.
  */
 function disconnectUiEffect(block) {
   block.workspace.getAudioManager().play('disconnect');

From f93ed6086978fef5619970d74889c6ed8b20f844 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 15 Jul 2021 15:33:59 -0700
Subject: [PATCH 046/833] clang-format core/block_animations.js

---
 core/block_animations.js | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/core/block_animations.js b/core/block_animations.js
index c973bd097..86b4b44b5 100644
--- a/core/block_animations.js
+++ b/core/block_animations.js
@@ -13,11 +13,10 @@
 goog.module('Blockly.blockAnimations');
 goog.module.declareLegacyNamespace();
 
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const dom = goog.require('Blockly.utils.dom');
 const Svg = goog.require('Blockly.utils.Svg');
 
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
-
 
 /**
  * PID of disconnect UI animation.  There can only be one at a time.
@@ -49,8 +48,7 @@ function disposeUiEffect(block) {
   workspace.getParentSvg().appendChild(clone);
   clone.bBox_ = clone.getBBox();
   // Start the animation.
-  disposeUiStep(clone, workspace.RTL, new Date,
-      workspace.scale);
+  disposeUiStep(clone, workspace.RTL, new Date, workspace.scale);
 }
 /** @package */
 exports.disposeUiEffect = disposeUiEffect;
@@ -64,8 +62,7 @@ exports.disposeUiEffect = disposeUiEffect;
  * @param {!Date} start Date of animation's start.
  * @param {number} workspaceScale Scale of workspace.
  */
-function disposeUiStep(clone, rtl, start,
-    workspaceScale) {
+function disposeUiStep(clone, rtl, start, workspaceScale) {
   const ms = new Date - start;
   const percent = ms / 150;
   if (percent > 1) {
@@ -75,10 +72,11 @@ function disposeUiStep(clone, rtl, start,
         (rtl ? -1 : 1) * clone.bBox_.width * workspaceScale / 2 * percent;
     const y = clone.translateY_ + clone.bBox_.height * workspaceScale * percent;
     const scale = (1 - percent) * workspaceScale;
-    clone.setAttribute('transform', 'translate(' + x + ',' + y + ')' +
-        ' scale(' + scale + ')');
-    setTimeout(disposeUiStep, 10, clone, rtl, start,
-        workspaceScale);
+    clone.setAttribute(
+        'transform',
+        'translate(' + x + ',' + y + ')' +
+            ' scale(' + scale + ')');
+    setTimeout(disposeUiStep, 10, clone, rtl, start, workspaceScale);
   }
 }
 
@@ -104,8 +102,7 @@ function connectionUiEffect(block) {
     xy.y += 3 * scale;
   }
   const ripple = dom.createSvgElement(
-      Svg.CIRCLE,
-      {
+      Svg.CIRCLE, {
         'cx': xy.x,
         'cy': xy.y,
         'r': 0,
@@ -134,8 +131,7 @@ function connectionUiStep(ripple, start, scale) {
   } else {
     ripple.setAttribute('r', percent * 25 * scale);
     ripple.style.opacity = 1 - percent;
-    disconnectPid = setTimeout(
-        connectionUiStep, 10, ripple, start, scale);
+    disconnectPid = setTimeout(connectionUiStep, 10, ripple, start, scale);
   }
 }
 
@@ -157,8 +153,7 @@ function disconnectUiEffect(block) {
     magnitude *= -1;
   }
   // Start the animation.
-  disconnectUiStep(
-      block.getSvgRoot(), magnitude, new Date);
+  disconnectUiStep(block.getSvgRoot(), magnitude, new Date);
 }
 /** @package */
 exports.disconnectUiEffect = disconnectUiEffect;
@@ -171,7 +166,7 @@ exports.disconnectUiEffect = disconnectUiEffect;
  */
 function disconnectUiStep(group, magnitude, start) {
   const DURATION = 200;  // Milliseconds.
-  const WIGGLES = 3;  // Half oscillations.
+  const WIGGLES = 3;     // Half oscillations.
 
   const ms = new Date - start;
   const percent = ms / DURATION;
@@ -183,9 +178,7 @@ function disconnectUiStep(group, magnitude, start) {
         Math.sin(percent * Math.PI * WIGGLES) * (1 - percent) * magnitude);
     group.skew_ = 'skewX(' + skew + ')';
     disconnectGroup = group;
-    disconnectPid =
-        setTimeout(disconnectUiStep, 10, group,
-            magnitude, start);
+    disconnectPid = setTimeout(disconnectUiStep, 10, group, magnitude, start);
   }
   group.setAttribute('transform', group.translate_ + group.skew_);
 }

From 46e00f6ac99f8a82a65fd7d2e6beee124c7d6e3c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 14 Jul 2021 17:58:23 -0700
Subject: [PATCH 047/833] Migrate core/block_drag_surface.js to ES6 const/let

---
 core/block_drag_surface.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/core/block_drag_surface.js b/core/block_drag_surface.js
index b2a2cda0f..f1db819e8 100644
--- a/core/block_drag_surface.js
+++ b/core/block_drag_surface.js
@@ -134,8 +134,8 @@ Blockly.BlockDragSurfaceSvg.prototype.translateAndScaleGroup = function(
   this.scale_ = scale;
   // This is a work-around to prevent a the blocks from rendering
   // fuzzy while they are being dragged on the drag surface.
-  var fixedX = x.toFixed(0);
-  var fixedY = y.toFixed(0);
+  const fixedX = x.toFixed(0);
+  const fixedY = y.toFixed(0);
 
   this.childSurfaceXY_.x = parseInt(fixedX, 10);
   this.childSurfaceXY_.y = parseInt(fixedY, 10);
@@ -150,8 +150,8 @@ Blockly.BlockDragSurfaceSvg.prototype.translateAndScaleGroup = function(
  * @private
  */
 Blockly.BlockDragSurfaceSvg.prototype.translateSurfaceInternal_ = function() {
-  var x = this.surfaceXY_.x;
-  var y = this.surfaceXY_.y;
+  let x = this.surfaceXY_.x;
+  let y = this.surfaceXY_.y;
   // This is a work-around to prevent a the blocks from rendering
   // fuzzy while they are being dragged on the drag surface.
   x = x.toFixed(0);
@@ -168,8 +168,8 @@ Blockly.BlockDragSurfaceSvg.prototype.translateSurfaceInternal_ = function() {
  * @param {number} deltaY Vertical offset in pixel units.
  */
 Blockly.BlockDragSurfaceSvg.prototype.translateBy = function(deltaX, deltaY) {
-  var x = this.surfaceXY_.x + deltaX;
-  var y = this.surfaceXY_.y + deltaY;
+  const x = this.surfaceXY_.x + deltaX;
+  const y = this.surfaceXY_.y + deltaY;
   this.surfaceXY_ = new Blockly.utils.Coordinate(x, y);
   this.translateSurfaceInternal_();
 };
@@ -194,7 +194,8 @@ Blockly.BlockDragSurfaceSvg.prototype.translateSurface = function(x, y) {
  * @return {!Blockly.utils.Coordinate} Current translation of the surface.
  */
 Blockly.BlockDragSurfaceSvg.prototype.getSurfaceTranslation = function() {
-  var xy = Blockly.utils.getRelativeXY(/** @type {!SVGElement} */ (this.SVG_));
+  const xy = Blockly.utils.getRelativeXY(/** @type {!SVGElement} */
+      (this.SVG_));
   return new Blockly.utils.Coordinate(xy.x / this.scale_, xy.y / this.scale_);
 };
 

From 4689c30634227e2d6da1294ea2475b5be2555d36 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 14 Jul 2021 18:02:05 -0700
Subject: [PATCH 048/833] Migrate core/block_drag_surface.js to goog.module

---
 core/block_drag_surface.js | 46 +++++++++++++++++++++-----------------
 tests/deps.js              |  2 +-
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/core/block_drag_surface.js b/core/block_drag_surface.js
index f1db819e8..f5bb42aea 100644
--- a/core/block_drag_surface.js
+++ b/core/block_drag_surface.js
@@ -15,7 +15,9 @@
 
 'use strict';
 
-goog.provide('Blockly.BlockDragSurfaceSvg');
+goog.module('Blockly.BlockDragSurfaceSvg');
+goog.module.declareLegacyNamespace();
+
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.dom');
@@ -28,7 +30,7 @@ goog.require('Blockly.utils.Svg');
  * @param {!Element} container Containing element.
  * @constructor
  */
-Blockly.BlockDragSurfaceSvg = function(container) {
+const BlockDragSurfaceSvg = function(container) {
   /**
    * @type {!Element}
    * @private
@@ -38,11 +40,11 @@ Blockly.BlockDragSurfaceSvg = function(container) {
 };
 
 /**
- * The SVG drag surface. Set once by Blockly.BlockDragSurfaceSvg.createDom.
+ * The SVG drag surface. Set once by BlockDragSurfaceSvg.createDom.
  * @type {?SVGElement}
  * @private
  */
-Blockly.BlockDragSurfaceSvg.prototype.SVG_ = null;
+BlockDragSurfaceSvg.prototype.SVG_ = null;
 
 /**
  * This is where blocks live while they are being dragged if the drag surface
@@ -50,14 +52,14 @@ Blockly.BlockDragSurfaceSvg.prototype.SVG_ = null;
  * @type {?SVGElement}
  * @private
  */
-Blockly.BlockDragSurfaceSvg.prototype.dragGroup_ = null;
+BlockDragSurfaceSvg.prototype.dragGroup_ = null;
 
 /**
  * Containing HTML element; parent of the workspace and the drag surface.
  * @type {?Element}
  * @private
  */
-Blockly.BlockDragSurfaceSvg.prototype.container_ = null;
+BlockDragSurfaceSvg.prototype.container_ = null;
 
 /**
  * Cached value for the scale of the drag surface.
@@ -65,7 +67,7 @@ Blockly.BlockDragSurfaceSvg.prototype.container_ = null;
  * @type {number}
  * @private
  */
-Blockly.BlockDragSurfaceSvg.prototype.scale_ = 1;
+BlockDragSurfaceSvg.prototype.scale_ = 1;
 
 /**
  * Cached value for the translation of the drag surface.
@@ -74,7 +76,7 @@ Blockly.BlockDragSurfaceSvg.prototype.scale_ = 1;
  * @type {?Blockly.utils.Coordinate}
  * @private
  */
-Blockly.BlockDragSurfaceSvg.prototype.surfaceXY_ = null;
+BlockDragSurfaceSvg.prototype.surfaceXY_ = null;
 
 /**
  * Cached value for the translation of the child drag surface in pixel units.
@@ -83,13 +85,13 @@ Blockly.BlockDragSurfaceSvg.prototype.surfaceXY_ = null;
  * @type {!Blockly.utils.Coordinate}
  * @private
  */
-Blockly.BlockDragSurfaceSvg.prototype.childSurfaceXY_ =
+BlockDragSurfaceSvg.prototype.childSurfaceXY_ =
     new Blockly.utils.Coordinate(0, 0);
 
 /**
  * Create the drag surface and inject it into the container.
  */
-Blockly.BlockDragSurfaceSvg.prototype.createDom = function() {
+BlockDragSurfaceSvg.prototype.createDom = function() {
   if (this.SVG_) {
     return;  // Already created.
   }
@@ -112,7 +114,7 @@ Blockly.BlockDragSurfaceSvg.prototype.createDom = function() {
  * @param {!SVGElement} blocks Block or group of blocks to place on the drag
  * surface.
  */
-Blockly.BlockDragSurfaceSvg.prototype.setBlocksAndShow = function(blocks) {
+BlockDragSurfaceSvg.prototype.setBlocksAndShow = function(blocks) {
   if (this.dragGroup_.childNodes.length) {
     throw Error('Already dragging a block.');
   }
@@ -129,7 +131,7 @@ Blockly.BlockDragSurfaceSvg.prototype.setBlocksAndShow = function(blocks) {
  * @param {number} y Y translation in pixel coordinates.
  * @param {number} scale Scale of the group.
  */
-Blockly.BlockDragSurfaceSvg.prototype.translateAndScaleGroup = function(
+BlockDragSurfaceSvg.prototype.translateAndScaleGroup = function(
     x, y, scale) {
   this.scale_ = scale;
   // This is a work-around to prevent a the blocks from rendering
@@ -149,7 +151,7 @@ Blockly.BlockDragSurfaceSvg.prototype.translateAndScaleGroup = function(
  * Translate the drag surface's SVG based on its internal state.
  * @private
  */
-Blockly.BlockDragSurfaceSvg.prototype.translateSurfaceInternal_ = function() {
+BlockDragSurfaceSvg.prototype.translateSurfaceInternal_ = function() {
   let x = this.surfaceXY_.x;
   let y = this.surfaceXY_.y;
   // This is a work-around to prevent a the blocks from rendering
@@ -167,7 +169,7 @@ Blockly.BlockDragSurfaceSvg.prototype.translateSurfaceInternal_ = function() {
  * @param {number} deltaX Horizontal offset in pixel units.
  * @param {number} deltaY Vertical offset in pixel units.
  */
-Blockly.BlockDragSurfaceSvg.prototype.translateBy = function(deltaX, deltaY) {
+BlockDragSurfaceSvg.prototype.translateBy = function(deltaX, deltaY) {
   const x = this.surfaceXY_.x + deltaX;
   const y = this.surfaceXY_.y + deltaY;
   this.surfaceXY_ = new Blockly.utils.Coordinate(x, y);
@@ -182,7 +184,7 @@ Blockly.BlockDragSurfaceSvg.prototype.translateBy = function(deltaX, deltaY) {
  * @param {number} x X translation for the entire surface.
  * @param {number} y Y translation for the entire surface.
  */
-Blockly.BlockDragSurfaceSvg.prototype.translateSurface = function(x, y) {
+BlockDragSurfaceSvg.prototype.translateSurface = function(x, y) {
   this.surfaceXY_ =
       new Blockly.utils.Coordinate(x * this.scale_, y * this.scale_);
   this.translateSurfaceInternal_();
@@ -193,7 +195,7 @@ Blockly.BlockDragSurfaceSvg.prototype.translateSurface = function(x, y) {
  * Use this when finishing a drag to return blocks to the correct position.
  * @return {!Blockly.utils.Coordinate} Current translation of the surface.
  */
-Blockly.BlockDragSurfaceSvg.prototype.getSurfaceTranslation = function() {
+BlockDragSurfaceSvg.prototype.getSurfaceTranslation = function() {
   const xy = Blockly.utils.getRelativeXY(/** @type {!SVGElement} */
       (this.SVG_));
   return new Blockly.utils.Coordinate(xy.x / this.scale_, xy.y / this.scale_);
@@ -204,7 +206,7 @@ Blockly.BlockDragSurfaceSvg.prototype.getSurfaceTranslation = function() {
  * BlockSvg.getRelativeToSurfaceXY).
  * @return {?SVGElement} Drag surface group element.
  */
-Blockly.BlockDragSurfaceSvg.prototype.getGroup = function() {
+BlockDragSurfaceSvg.prototype.getGroup = function() {
   return this.dragGroup_;
 };
 
@@ -212,7 +214,7 @@ Blockly.BlockDragSurfaceSvg.prototype.getGroup = function() {
  * Returns the SVG drag surface.
  * @returns {?SVGElement} The SVG drag surface.
  */
-Blockly.BlockDragSurfaceSvg.prototype.getSvgRoot = function() {
+BlockDragSurfaceSvg.prototype.getSvgRoot = function() {
   return this.SVG_;
 };
 
@@ -221,7 +223,7 @@ Blockly.BlockDragSurfaceSvg.prototype.getSvgRoot = function() {
  * for BlockSvg.getRelativeToSurfaceXY).
  * @return {?Element} Drag surface block DOM element, or null if no blocks exist.
  */
-Blockly.BlockDragSurfaceSvg.prototype.getCurrentBlock = function() {
+BlockDragSurfaceSvg.prototype.getCurrentBlock = function() {
   return /** @type {Element} */ (this.dragGroup_.firstChild);
 };
 
@@ -231,7 +233,7 @@ Blockly.BlockDragSurfaceSvg.prototype.getCurrentBlock = function() {
  * moved.
  * @return {!Blockly.utils.Coordinate} The amount the workspace has been moved.
  */
-Blockly.BlockDragSurfaceSvg.prototype.getWsTranslation = function() {
+BlockDragSurfaceSvg.prototype.getWsTranslation = function() {
   // Returning a copy so the coordinate can not be changed outside this class.
   return this.childSurfaceXY_.clone();
 };
@@ -245,7 +247,7 @@ Blockly.BlockDragSurfaceSvg.prototype.getWsTranslation = function() {
  *     to, or null if the blocks should be removed from this surface without
  *     being moved to a different surface.
  */
-Blockly.BlockDragSurfaceSvg.prototype.clearAndHide = function(opt_newSurface) {
+BlockDragSurfaceSvg.prototype.clearAndHide = function(opt_newSurface) {
   if (opt_newSurface) {
     // appendChild removes the node from this.dragGroup_
     opt_newSurface.appendChild(this.getCurrentBlock());
@@ -258,3 +260,5 @@ Blockly.BlockDragSurfaceSvg.prototype.clearAndHide = function(opt_newSurface) {
   }
   this.surfaceXY_ = null;
 };
+
+exports = BlockDragSurfaceSvg;
diff --git a/tests/deps.js b/tests/deps.js
index e83f61c67..2edd38475 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -9,7 +9,7 @@ goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Bl
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.IASTNodeLocation', 'Blockly.IDeletable', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.Workspace', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es5'});
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+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.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom']);
 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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);

From 18996f3aac825b35a4b79c26c813d32c98017076 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 14 Jul 2021 18:10:57 -0700
Subject: [PATCH 049/833] Migrate core/block_drag_surface.js named requires

---
 core/block_drag_surface.js | 43 +++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/core/block_drag_surface.js b/core/block_drag_surface.js
index f5bb42aea..7b573fcfd 100644
--- a/core/block_drag_surface.js
+++ b/core/block_drag_surface.js
@@ -18,10 +18,10 @@
 goog.module('Blockly.BlockDragSurfaceSvg');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Svg');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const {G, SVG} = goog.require('Blockly.utils.Svg');
+const {getRelativeXY} = goog.require('Blockly.utils');
+const {createSvgElement, HTML_NS, setCssTransform, SVG_NS, XLINK_NS} = goog.require('Blockly.utils.dom');
 
 
 /**
@@ -73,7 +73,7 @@ BlockDragSurfaceSvg.prototype.scale_ = 1;
  * Cached value for the translation of the drag surface.
  * This translation is in pixel units, because the scale is applied to the
  * drag group rather than the top-level SVG.
- * @type {?Blockly.utils.Coordinate}
+ * @type {?Coordinate}
  * @private
  */
 BlockDragSurfaceSvg.prototype.surfaceXY_ = null;
@@ -82,11 +82,11 @@ BlockDragSurfaceSvg.prototype.surfaceXY_ = null;
  * Cached value for the translation of the child drag surface in pixel units.
  * Since the child drag surface tracks the translation of the workspace this is
  * ultimately the translation of the workspace.
- * @type {!Blockly.utils.Coordinate}
+ * @type {!Coordinate}
  * @private
  */
 BlockDragSurfaceSvg.prototype.childSurfaceXY_ =
-    new Blockly.utils.Coordinate(0, 0);
+    new Coordinate(0, 0);
 
 /**
  * Create the drag surface and inject it into the container.
@@ -95,17 +95,17 @@ BlockDragSurfaceSvg.prototype.createDom = function() {
   if (this.SVG_) {
     return;  // Already created.
   }
-  this.SVG_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.SVG, {
-        'xmlns': Blockly.utils.dom.SVG_NS,
-        'xmlns:html': Blockly.utils.dom.HTML_NS,
-        'xmlns:xlink': Blockly.utils.dom.XLINK_NS,
+  this.SVG_ = createSvgElement(
+      SVG, {
+        'xmlns': SVG_NS,
+        'xmlns:html': HTML_NS,
+        'xmlns:xlink': XLINK_NS,
         'version': '1.1',
         'class': 'blocklyBlockDragSurface'
       },
       this.container_);
   this.dragGroup_ =
-      Blockly.utils.dom.createSvgElement(Blockly.utils.Svg.G, {}, this.SVG_);
+      createSvgElement(G, {}, this.SVG_);
 };
 
 /**
@@ -121,7 +121,7 @@ BlockDragSurfaceSvg.prototype.setBlocksAndShow = function(blocks) {
   // appendChild removes the blocks from the previous parent
   this.dragGroup_.appendChild(blocks);
   this.SVG_.style.display = 'block';
-  this.surfaceXY_ = new Blockly.utils.Coordinate(0, 0);
+  this.surfaceXY_ = new Coordinate(0, 0);
 };
 
 /**
@@ -160,7 +160,7 @@ BlockDragSurfaceSvg.prototype.translateSurfaceInternal_ = function() {
   y = y.toFixed(0);
   this.SVG_.style.display = 'block';
 
-  Blockly.utils.dom.setCssTransform(
+  setCssTransform(
       this.SVG_, 'translate3d(' + x + 'px, ' + y + 'px, 0)');
 };
 
@@ -172,7 +172,7 @@ BlockDragSurfaceSvg.prototype.translateSurfaceInternal_ = function() {
 BlockDragSurfaceSvg.prototype.translateBy = function(deltaX, deltaY) {
   const x = this.surfaceXY_.x + deltaX;
   const y = this.surfaceXY_.y + deltaY;
-  this.surfaceXY_ = new Blockly.utils.Coordinate(x, y);
+  this.surfaceXY_ = new Coordinate(x, y);
   this.translateSurfaceInternal_();
 };
 
@@ -186,19 +186,18 @@ BlockDragSurfaceSvg.prototype.translateBy = function(deltaX, deltaY) {
  */
 BlockDragSurfaceSvg.prototype.translateSurface = function(x, y) {
   this.surfaceXY_ =
-      new Blockly.utils.Coordinate(x * this.scale_, y * this.scale_);
+      new Coordinate(x * this.scale_, y * this.scale_);
   this.translateSurfaceInternal_();
 };
 
 /**
  * Reports the surface translation in scaled workspace coordinates.
  * Use this when finishing a drag to return blocks to the correct position.
- * @return {!Blockly.utils.Coordinate} Current translation of the surface.
+ * @return {!Coordinate} Current translation of the surface.
  */
 BlockDragSurfaceSvg.prototype.getSurfaceTranslation = function() {
-  const xy = Blockly.utils.getRelativeXY(/** @type {!SVGElement} */
-      (this.SVG_));
-  return new Blockly.utils.Coordinate(xy.x / this.scale_, xy.y / this.scale_);
+  const xy = getRelativeXY(/** @type {!SVGElement} */ (this.SVG_));
+  return new Coordinate(xy.x / this.scale_, xy.y / this.scale_);
 };
 
 /**
@@ -231,7 +230,7 @@ BlockDragSurfaceSvg.prototype.getCurrentBlock = function() {
  * Gets the translation of the child block surface
  * This surface is in charge of keeping track of how much the workspace has
  * moved.
- * @return {!Blockly.utils.Coordinate} The amount the workspace has been moved.
+ * @return {!Coordinate} The amount the workspace has been moved.
  */
 BlockDragSurfaceSvg.prototype.getWsTranslation = function() {
   // Returning a copy so the coordinate can not be changed outside this class.

From 5a834a9ec9874a501ff7fe8eb46778668a147c16 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 14 Jul 2021 18:11:19 -0700
Subject: [PATCH 050/833] clang-format core/block_drag_surface.js

---
 core/block_drag_surface.js | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/core/block_drag_surface.js b/core/block_drag_surface.js
index 7b573fcfd..69b7a5ca5 100644
--- a/core/block_drag_surface.js
+++ b/core/block_drag_surface.js
@@ -85,8 +85,7 @@ BlockDragSurfaceSvg.prototype.surfaceXY_ = null;
  * @type {!Coordinate}
  * @private
  */
-BlockDragSurfaceSvg.prototype.childSurfaceXY_ =
-    new Coordinate(0, 0);
+BlockDragSurfaceSvg.prototype.childSurfaceXY_ = new Coordinate(0, 0);
 
 /**
  * Create the drag surface and inject it into the container.
@@ -104,8 +103,7 @@ BlockDragSurfaceSvg.prototype.createDom = function() {
         'class': 'blocklyBlockDragSurface'
       },
       this.container_);
-  this.dragGroup_ =
-      createSvgElement(G, {}, this.SVG_);
+  this.dragGroup_ = createSvgElement(G, {}, this.SVG_);
 };
 
 /**
@@ -131,8 +129,7 @@ BlockDragSurfaceSvg.prototype.setBlocksAndShow = function(blocks) {
  * @param {number} y Y translation in pixel coordinates.
  * @param {number} scale Scale of the group.
  */
-BlockDragSurfaceSvg.prototype.translateAndScaleGroup = function(
-    x, y, scale) {
+BlockDragSurfaceSvg.prototype.translateAndScaleGroup = function(x, y, scale) {
   this.scale_ = scale;
   // This is a work-around to prevent a the blocks from rendering
   // fuzzy while they are being dragged on the drag surface.
@@ -160,8 +157,7 @@ BlockDragSurfaceSvg.prototype.translateSurfaceInternal_ = function() {
   y = y.toFixed(0);
   this.SVG_.style.display = 'block';
 
-  setCssTransform(
-      this.SVG_, 'translate3d(' + x + 'px, ' + y + 'px, 0)');
+  setCssTransform(this.SVG_, 'translate3d(' + x + 'px, ' + y + 'px, 0)');
 };
 
 /**
@@ -185,8 +181,7 @@ BlockDragSurfaceSvg.prototype.translateBy = function(deltaX, deltaY) {
  * @param {number} y Y translation for the entire surface.
  */
 BlockDragSurfaceSvg.prototype.translateSurface = function(x, y) {
-  this.surfaceXY_ =
-      new Coordinate(x * this.scale_, y * this.scale_);
+  this.surfaceXY_ = new Coordinate(x * this.scale_, y * this.scale_);
   this.translateSurfaceInternal_();
 };
 
@@ -220,7 +215,8 @@ BlockDragSurfaceSvg.prototype.getSvgRoot = function() {
 /**
  * Get the current blocks on the drag surface, if any (primarily
  * for BlockSvg.getRelativeToSurfaceXY).
- * @return {?Element} Drag surface block DOM element, or null if no blocks exist.
+ * @return {?Element} Drag surface block DOM element, or null if no blocks
+ *     exist.
  */
 BlockDragSurfaceSvg.prototype.getCurrentBlock = function() {
   return /** @type {Element} */ (this.dragGroup_.firstChild);

From 81b16abb92d4a89e0c40ecce8aa4cb7126e324a8 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 14 Jul 2021 16:54:21 -0700
Subject: [PATCH 051/833] Migrate core/utils/metrics.js to goog.module

---
 core/utils/metrics.js | 49 +++++++++++++++++++++++--------------------
 tests/deps.js         |  2 +-
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/core/utils/metrics.js b/core/utils/metrics.js
index 226ef0734..55cadfae9 100644
--- a/core/utils/metrics.js
+++ b/core/utils/metrics.js
@@ -14,139 +14,142 @@
  * @name Blockly.utils.Metrics
  * @namespace
  */
-goog.provide('Blockly.utils.Metrics');
+goog.module('Blockly.utils.Metrics');
+goog.module.declareLegacyNamespace();
 
 
 /**
  * @record
  */
-Blockly.utils.Metrics = function() {};
+const Metrics = function() {};
 
 /**
  * Height of the visible portion of the workspace.
  * @type {number}
  */
-Blockly.utils.Metrics.prototype.viewHeight;
+Metrics.prototype.viewHeight;
 
 /**
  * Width of the visible portion of the workspace.
  * @type {number}
  */
-Blockly.utils.Metrics.prototype.viewWidth;
+Metrics.prototype.viewWidth;
 
 /**
  * Height of the content.
  * @type {number}
  */
-Blockly.utils.Metrics.prototype.contentHeight;
+Metrics.prototype.contentHeight;
 
 /**
  * Width of the content.
  * @type {number}
  */
-Blockly.utils.Metrics.prototype.contentWidth;
+Metrics.prototype.contentWidth;
 
 /**
  * Height of the scroll area.
  * @type {number}
  */
-Blockly.utils.Metrics.prototype.scrollHeight;
+Metrics.prototype.scrollHeight;
 
 /**
  * Width of the scroll area.
  * @type {number}
  */
-Blockly.utils.Metrics.prototype.scrollWidth;
+Metrics.prototype.scrollWidth;
 
 /**
  * Top-edge of the visible portion of the workspace, relative to the workspace
  * origin.
  * @type {number}
  */
-Blockly.utils.Metrics.prototype.viewTop;
+Metrics.prototype.viewTop;
 
 /**
  * Left-edge of the visible portion of the workspace, relative to the workspace
  * origin.
  * @type {number}
  */
-Blockly.utils.Metrics.prototype.viewLeft;
+Metrics.prototype.viewLeft;
 
 /**
  * Top-edge of the content, relative to the workspace origin.
  * @type {number}
  */
-Blockly.utils.Metrics.prototype.contentTop;
+Metrics.prototype.contentTop;
 
 /**
  * Left-edge of the content relative to the workspace origin.
  * @type {number}
  */
-Blockly.utils.Metrics.prototype.contentLeft;
+Metrics.prototype.contentLeft;
 
 /**
  * Top-edge of the scroll area, relative to the workspace origin.
  * @type {number}
  */
-Blockly.utils.Metrics.prototype.scrollTop;
+Metrics.prototype.scrollTop;
 
 /**
  * Left-edge of the scroll area relative to the workspace origin.
  * @type {number}
  */
-Blockly.utils.Metrics.prototype.scrollLeft;
+Metrics.prototype.scrollLeft;
 
 /**
  * Top-edge of the visible portion of the workspace, relative to the blocklyDiv.
  * @type {number}
  */
-Blockly.utils.Metrics.prototype.absoluteTop;
+Metrics.prototype.absoluteTop;
 
 /**
  * Left-edge of the visible portion of the workspace, relative to the
  * blocklyDiv.
  * @type {number}
  */
-Blockly.utils.Metrics.prototype.absoluteLeft;
+Metrics.prototype.absoluteLeft;
 
 /**
  * Height of the Blockly div (the view + the toolbox, simple of otherwise).
  * @type {number}
  */
-Blockly.utils.Metrics.prototype.svgHeight;
+Metrics.prototype.svgHeight;
 
 /**
  * Width of the Blockly div (the view + the toolbox, simple or otherwise).
  * @type {number}
  */
-Blockly.utils.Metrics.prototype.svgWidth;
+Metrics.prototype.svgWidth;
 
 /**
  * Width of the toolbox, if it exists.  Otherwise zero.
  * @type {number}
  */
-Blockly.utils.Metrics.prototype.toolboxWidth;
+Metrics.prototype.toolboxWidth;
 
 /**
  * Height of the toolbox, if it exists.  Otherwise zero.
  * @type {number}
  */
-Blockly.utils.Metrics.prototype.toolboxHeight;
+Metrics.prototype.toolboxHeight;
 
 /**
  * Top, bottom, left or right. Use TOOLBOX_AT constants to compare.
  * @type {number}
  */
-Blockly.utils.Metrics.prototype.toolboxPosition;
+Metrics.prototype.toolboxPosition;
 
 /**
  * Width of the flyout if it is always open.  Otherwise zero.
  * @type {number}
  */
-Blockly.utils.Metrics.prototype.flyoutWidth;
+Metrics.prototype.flyoutWidth;
 
 /**
  * Height of the flyout if it is always open.  Otherwise zero.
  * @type {number}
  */
-Blockly.utils.Metrics.prototype.flyoutHeight;
+Metrics.prototype.flyoutHeight;
+
+exports = Metrics;
diff --git a/tests/deps.js b/tests/deps.js
index 2edd38475..d1a516942 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -178,7 +178,7 @@ goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], []);
 goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.IdGenerator'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], []);
+goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], []);

From d8c45411300199db80218f4488f4a156a3f81f49 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 14 Jul 2021 18:16:05 -0700
Subject: [PATCH 052/833] Migrate core/blocks.js to goog.module

---
 core/blocks.js | 7 +++++--
 tests/deps.js  | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/blocks.js b/core/blocks.js
index 5f0d96b21..fadc62959 100644
--- a/core/blocks.js
+++ b/core/blocks.js
@@ -14,10 +14,13 @@
  * A mapping of block type names to block prototype objects.
  * @name Blockly.Blocks
  */
-goog.provide('Blockly.Blocks');
+goog.module('Blockly.Blocks');
+goog.module.declareLegacyNamespace();
 
 /**
  * A mapping of block type names to block prototype objects.
  * @type {!Object<string,Object>}
  */
-Blockly.Blocks = Object.create(null);
+const Blocks = Object.create(null);
+
+exports = Blocks;
diff --git a/tests/deps.js b/tests/deps.js
index d1a516942..89bb3d512 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -13,7 +13,7 @@ goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfac
 goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom']);
 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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], []);
+goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global']);
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate']);

From 99f822665565d72b635bc59292f25d91d5bf9d37 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 15 Jul 2021 18:15:52 -0700
Subject: [PATCH 053/833] Update Blockly.Blocks type annotation

---
 core/blocks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/blocks.js b/core/blocks.js
index fadc62959..37c2105ce 100644
--- a/core/blocks.js
+++ b/core/blocks.js
@@ -19,7 +19,7 @@ goog.module.declareLegacyNamespace();
 
 /**
  * A mapping of block type names to block prototype objects.
- * @type {!Object<string,Object>}
+ * @type {!Object<string,!Object>}
  */
 const Blocks = Object.create(null);
 

From 4c93a048f25d0313bcd65a4a3bd57a5606cac4a4 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 16 Jul 2021 09:09:43 -0700
Subject: [PATCH 054/833] Migrate core/bubble_dragger.js to ES6 const/let

---
 core/bubble_dragger.js | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/core/bubble_dragger.js b/core/bubble_dragger.js
index e014b8738..bec5dba15 100644
--- a/core/bubble_dragger.js
+++ b/core/bubble_dragger.js
@@ -123,14 +123,14 @@ Blockly.BubbleDragger.prototype.startBubbleDrag = function() {
  * @package
  */
 Blockly.BubbleDragger.prototype.dragBubble = function(e, currentDragDeltaXY) {
-  var delta = this.pixelsToWorkspaceUnits_(currentDragDeltaXY);
-  var newLoc = Blockly.utils.Coordinate.sum(this.startXY_, delta);
+  const delta = this.pixelsToWorkspaceUnits_(currentDragDeltaXY);
+  const newLoc = Blockly.utils.Coordinate.sum(this.startXY_, delta);
   this.draggingBubble_.moveDuringDrag(this.dragSurface_, newLoc);
 
-  var oldDragTarget = this.dragTarget_;
+  const oldDragTarget = this.dragTarget_;
   this.dragTarget_ = this.workspace_.getDragTarget(e);
 
-  var oldWouldDeleteBubble = this.wouldDeleteBubble_;
+  const oldWouldDeleteBubble = this.wouldDeleteBubble_;
   this.wouldDeleteBubble_ = this.shouldDelete_(this.dragTarget_);
   if (oldWouldDeleteBubble != this.wouldDeleteBubble_) {
     // Prevent unnecessary add/remove class calls.
@@ -155,8 +155,8 @@ Blockly.BubbleDragger.prototype.dragBubble = function(e, currentDragDeltaXY) {
  */
 Blockly.BubbleDragger.prototype.shouldDelete_ = function(dragTarget) {
   if (dragTarget) {
-    var componentManager = this.workspace_.getComponentManager();
-    var isDeleteArea = componentManager.hasCapability(dragTarget.id,
+    const componentManager = this.workspace_.getComponentManager();
+    const isDeleteArea = componentManager.hasCapability(dragTarget.id,
         Blockly.ComponentManager.Capability.DELETE_AREA);
     if (isDeleteArea) {
       return (/** @type {!Blockly.IDeleteArea} */ (dragTarget))
@@ -187,13 +187,14 @@ Blockly.BubbleDragger.prototype.endBubbleDrag = function(
   // Make sure internal state is fresh.
   this.dragBubble(e, currentDragDeltaXY);
 
-  var preventMove = this.dragTarget_ &&
+  const preventMove = this.dragTarget_ &&
       this.dragTarget_.shouldPreventMove(this.draggingBubble_);
+  let newLoc;
   if (preventMove) {
-    var newLoc = this.startXY_;
+    newLoc = this.startXY_;
   } else {
-    var delta = this.pixelsToWorkspaceUnits_(currentDragDeltaXY);
-    var newLoc = Blockly.utils.Coordinate.sum(this.startXY_, delta);
+    const delta = this.pixelsToWorkspaceUnits_(currentDragDeltaXY);
+    newLoc = Blockly.utils.Coordinate.sum(this.startXY_, delta);
   }
   // Move the bubble to its final location.
   this.draggingBubble_.moveTo(newLoc.x, newLoc.y);
@@ -227,7 +228,7 @@ Blockly.BubbleDragger.prototype.endBubbleDrag = function(
  */
 Blockly.BubbleDragger.prototype.fireMoveEvent_ = function() {
   if (this.draggingBubble_.isComment) {
-    var event = new (Blockly.Events.get(Blockly.Events.COMMENT_MOVE))(
+    const event = new (Blockly.Events.get(Blockly.Events.COMMENT_MOVE))(
         /** @type {!Blockly.WorkspaceCommentSvg} */ (this.draggingBubble_));
     event.setOldCoordinate(this.startXY_);
     event.recordNew();
@@ -249,7 +250,7 @@ Blockly.BubbleDragger.prototype.fireMoveEvent_ = function() {
  * @private
  */
 Blockly.BubbleDragger.prototype.pixelsToWorkspaceUnits_ = function(pixelCoord) {
-  var result = new Blockly.utils.Coordinate(
+  const result = new Blockly.utils.Coordinate(
       pixelCoord.x / this.workspace_.scale,
       pixelCoord.y / this.workspace_.scale);
   if (this.workspace_.isMutator) {
@@ -257,7 +258,7 @@ Blockly.BubbleDragger.prototype.pixelsToWorkspaceUnits_ = function(pixelCoord) {
     // oddities in our rendering optimizations.  The actual scale is the same as
     // the scale on the parent workspace.
     // Fix that for dragging.
-    var mainScale = this.workspace_.options.parentWorkspace.scale;
+    const mainScale = this.workspace_.options.parentWorkspace.scale;
     result.scale(1 / mainScale);
   }
   return result;

From 42fd43b1c6e85e068e56e9fb806dade12139b808 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 16 Jul 2021 09:14:47 -0700
Subject: [PATCH 055/833] Migrate core/bubble_dragger.js to goog.module

---
 core/bubble_dragger.js | 25 ++++++++++++++-----------
 tests/deps.js          |  2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/core/bubble_dragger.js b/core/bubble_dragger.js
index bec5dba15..7b6f932d6 100644
--- a/core/bubble_dragger.js
+++ b/core/bubble_dragger.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.BubbleDragger');
+goog.module('Blockly.BubbleDragger');
+goog.module.declareLegacyNamespace();
 
 /** @suppress {extraRequire} */
 goog.require('Blockly.Bubble');
@@ -36,7 +37,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @param {!Blockly.WorkspaceSvg} workspace The workspace to drag on.
  * @constructor
  */
-Blockly.BubbleDragger = function(bubble, workspace) {
+const BubbleDragger = function(bubble, workspace) {
   /**
    * The item on the bubble canvas that is being dragged.
    * @type {!Blockly.IBubble}
@@ -90,7 +91,7 @@ Blockly.BubbleDragger = function(bubble, workspace) {
  * @package
  * @suppress {checkTypes}
  */
-Blockly.BubbleDragger.prototype.dispose = function() {
+BubbleDragger.prototype.dispose = function() {
   this.draggingBubble_ = null;
   this.workspace_ = null;
   this.dragSurface_ = null;
@@ -100,7 +101,7 @@ Blockly.BubbleDragger.prototype.dispose = function() {
  * Start dragging a bubble.  This includes moving it to the drag surface.
  * @package
  */
-Blockly.BubbleDragger.prototype.startBubbleDrag = function() {
+BubbleDragger.prototype.startBubbleDrag = function() {
   if (!Blockly.Events.getGroup()) {
     Blockly.Events.setGroup(true);
   }
@@ -122,7 +123,7 @@ Blockly.BubbleDragger.prototype.startBubbleDrag = function() {
  *     moved from the position at the start of the drag, in pixel units.
  * @package
  */
-Blockly.BubbleDragger.prototype.dragBubble = function(e, currentDragDeltaXY) {
+BubbleDragger.prototype.dragBubble = function(e, currentDragDeltaXY) {
   const delta = this.pixelsToWorkspaceUnits_(currentDragDeltaXY);
   const newLoc = Blockly.utils.Coordinate.sum(this.startXY_, delta);
   this.draggingBubble_.moveDuringDrag(this.dragSurface_, newLoc);
@@ -153,7 +154,7 @@ Blockly.BubbleDragger.prototype.dragBubble = function(e, currentDragDeltaXY) {
  *    block.
  * @private
  */
-Blockly.BubbleDragger.prototype.shouldDelete_ = function(dragTarget) {
+BubbleDragger.prototype.shouldDelete_ = function(dragTarget) {
   if (dragTarget) {
     const componentManager = this.workspace_.getComponentManager();
     const isDeleteArea = componentManager.hasCapability(dragTarget.id,
@@ -171,7 +172,7 @@ Blockly.BubbleDragger.prototype.shouldDelete_ = function(dragTarget) {
  * dragging bubble would be deleted if released immediately.
  * @private
  */
-Blockly.BubbleDragger.prototype.updateCursorDuringBubbleDrag_ = function() {
+BubbleDragger.prototype.updateCursorDuringBubbleDrag_ = function() {
   this.draggingBubble_.setDeleteStyle(this.wouldDeleteBubble_);
 };
 
@@ -182,7 +183,7 @@ Blockly.BubbleDragger.prototype.updateCursorDuringBubbleDrag_ = function() {
  *     moved from the position at the start of the drag, in pixel units.
  * @package
  */
-Blockly.BubbleDragger.prototype.endBubbleDrag = function(
+BubbleDragger.prototype.endBubbleDrag = function(
     e, currentDragDeltaXY) {
   // Make sure internal state is fresh.
   this.dragBubble(e, currentDragDeltaXY);
@@ -226,7 +227,7 @@ Blockly.BubbleDragger.prototype.endBubbleDrag = function(
  * Fire a move event at the end of a bubble drag.
  * @private
  */
-Blockly.BubbleDragger.prototype.fireMoveEvent_ = function() {
+BubbleDragger.prototype.fireMoveEvent_ = function() {
   if (this.draggingBubble_.isComment) {
     const event = new (Blockly.Events.get(Blockly.Events.COMMENT_MOVE))(
         /** @type {!Blockly.WorkspaceCommentSvg} */ (this.draggingBubble_));
@@ -249,7 +250,7 @@ Blockly.BubbleDragger.prototype.fireMoveEvent_ = function() {
  *     workspace scale.
  * @private
  */
-Blockly.BubbleDragger.prototype.pixelsToWorkspaceUnits_ = function(pixelCoord) {
+BubbleDragger.prototype.pixelsToWorkspaceUnits_ = function(pixelCoord) {
   const result = new Blockly.utils.Coordinate(
       pixelCoord.x / this.workspace_.scale,
       pixelCoord.y / this.workspace_.scale);
@@ -269,9 +270,11 @@ Blockly.BubbleDragger.prototype.pixelsToWorkspaceUnits_ = function(pixelCoord) {
  * drag surface to preserve the apparent location of the bubble.
  * @private
  */
-Blockly.BubbleDragger.prototype.moveToDragSurface_ = function() {
+BubbleDragger.prototype.moveToDragSurface_ = function() {
   this.draggingBubble_.moveTo(0, 0);
   this.dragSurface_.translateSurface(this.startXY_.x, this.startXY_.y);
   // Execute the move on the top-level SVG component.
   this.dragSurface_.setBlocksAndShow(this.draggingBubble_.getSvgRoot());
 };
+
+exports = BubbleDragger;
diff --git a/tests/deps.js b/tests/deps.js
index 89bb3d512..e038319d0 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -16,7 +16,7 @@ goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentMana
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global']);
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
+goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], []);
 goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation']);

From 94685bd8be3450bb746e232c6a408b4b83978cf5 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 16 Jul 2021 09:52:32 -0700
Subject: [PATCH 056/833] Migrate core/renderers/common/drawer.js to
 goog.module

---
 core/renderers/common/drawer.js | 51 ++++++++++++++++-----------------
 tests/deps.js                   |  2 +-
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/core/renderers/common/drawer.js b/core/renderers/common/drawer.js
index 0d3a5bab9..4eca204a3 100644
--- a/core/renderers/common/drawer.js
+++ b/core/renderers/common/drawer.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.blockRendering.Drawer');
+goog.module('Blockly.blockRendering.Drawer');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.RenderInfo');
 goog.require('Blockly.blockRendering.Row');
@@ -32,7 +33,7 @@ goog.requireType('Blockly.BlockSvg');
  * @package
  * @constructor
  */
-Blockly.blockRendering.Drawer = function(block, info) {
+const Drawer = function(block, info) {
   this.block_ = block;
   this.info_ = info;
   this.topLeft_ = block.getRelativeToSurfaceXY();
@@ -57,7 +58,7 @@ Blockly.blockRendering.Drawer = function(block, info) {
  * required.
  * @package
  */
-Blockly.blockRendering.Drawer.prototype.draw = function() {
+Drawer.prototype.draw = function() {
   this.hideHiddenIcons_();
   this.drawOutline_();
   this.drawInternals_();
@@ -78,7 +79,7 @@ Blockly.blockRendering.Drawer.prototype.draw = function() {
  * render. Anything that needs to be kept around should be set in this function.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.recordSizeOnBlock_ = function() {
+Drawer.prototype.recordSizeOnBlock_ = function() {
   // This is used when the block is reporting its size to anyone else.
   // The dark path adds to the size of the block in both X and Y.
   this.block_.height = this.info_.height;
@@ -89,7 +90,7 @@ Blockly.blockRendering.Drawer.prototype.recordSizeOnBlock_ = function() {
  * Hide icons that were marked as hidden.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.hideHiddenIcons_ = function() {
+Drawer.prototype.hideHiddenIcons_ = function() {
   for (let i = 0, iconInfo; (iconInfo = this.info_.hiddenIcons[i]); i++) {
     iconInfo.icon.iconGroup_.setAttribute('display', 'none');
   }
@@ -99,7 +100,7 @@ Blockly.blockRendering.Drawer.prototype.hideHiddenIcons_ = function() {
  * Create the outline of the block.  This is a single continuous path.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.drawOutline_ = function() {
+Drawer.prototype.drawOutline_ = function() {
   this.drawTop_();
   for (let r = 1; r < this.info_.rows.length - 1; r++) {
     const row = this.info_.rows[r];
@@ -123,7 +124,7 @@ Blockly.blockRendering.Drawer.prototype.drawOutline_ = function() {
  * details such as hats and rounded corners.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.drawTop_ = function() {
+Drawer.prototype.drawTop_ = function() {
   const topRow = this.info_.topRow;
   const elements = topRow.elements;
 
@@ -154,7 +155,7 @@ Blockly.blockRendering.Drawer.prototype.drawTop_ = function() {
  * @param {!Blockly.blockRendering.Row} row The row to draw the side of.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.drawJaggedEdge_ = function(row) {
+Drawer.prototype.drawJaggedEdge_ = function(row) {
   const remainder = row.height - this.constants_.JAGGED_TEETH.height;
   this.outlinePath_ += this.constants_.JAGGED_TEETH.path +
       Blockly.utils.svgPaths.lineOnAxis('v', remainder);
@@ -167,7 +168,7 @@ Blockly.blockRendering.Drawer.prototype.drawJaggedEdge_ = function(row) {
  *     belongs to.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.drawValueInput_ = function(row) {
+Drawer.prototype.drawValueInput_ = function(row) {
   const input = row.getLastInput();
   this.positionExternalValueConnection_(row);
 
@@ -188,7 +189,7 @@ Blockly.blockRendering.Drawer.prototype.drawValueInput_ = function(row) {
  *     belongs to.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.drawStatementInput_ = function(row) {
+Drawer.prototype.drawStatementInput_ = function(row) {
   const input = row.getLastInput();
   // Where to start drawing the notch, which is on the right side in LTR.
   const x = input.xPos + input.notchOffset + input.shape.width;
@@ -216,7 +217,7 @@ Blockly.blockRendering.Drawer.prototype.drawStatementInput_ = function(row) {
  *     side of.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.drawRightSideRow_ = function(row) {
+Drawer.prototype.drawRightSideRow_ = function(row) {
   this.outlinePath_ +=
       Blockly.utils.svgPaths.lineOnAxis('V', row.yPos + row.height);
 };
@@ -227,7 +228,7 @@ Blockly.blockRendering.Drawer.prototype.drawRightSideRow_ = function(row) {
  * for the next connection.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.drawBottom_ = function() {
+Drawer.prototype.drawBottom_ = function() {
   const bottomRow = this.info_.bottomRow;
   const elems = bottomRow.elements;
   this.positionNextConnection_();
@@ -259,7 +260,7 @@ Blockly.blockRendering.Drawer.prototype.drawBottom_ = function() {
  * connection
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.drawLeft_ = function() {
+Drawer.prototype.drawLeft_ = function() {
   const outputConnection = this.info_.outputConnection;
   this.positionOutputConnection_();
 
@@ -285,7 +286,7 @@ Blockly.blockRendering.Drawer.prototype.drawLeft_ = function() {
  * not depend on the outer path for placement.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.drawInternals_ = function() {
+Drawer.prototype.drawInternals_ = function() {
   for (let i = 0, row; (row = this.info_.rows[i]); i++) {
     for (let j = 0, elem; (elem = row.elements[j]); j++) {
       if (Blockly.blockRendering.Types.isInlineInput(elem)) {
@@ -307,7 +308,7 @@ Blockly.blockRendering.Drawer.prototype.drawInternals_ = function() {
  *     The rendering information for the field or icon.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.layoutField_ = function(fieldInfo) {
+Drawer.prototype.layoutField_ = function(fieldInfo) {
   let svgGroup;
   if (Blockly.blockRendering.Types.isField(fieldInfo)) {
     svgGroup = fieldInfo.field.getSvgRoot();
@@ -347,7 +348,7 @@ Blockly.blockRendering.Drawer.prototype.layoutField_ = function(fieldInfo) {
  * input to render.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.drawInlineInput_ = function(input) {
+Drawer.prototype.drawInlineInput_ = function(input) {
   const width = input.width;
   const height = input.height;
   const yPos = input.centerline - height / 2;
@@ -375,8 +376,7 @@ Blockly.blockRendering.Drawer.prototype.drawInlineInput_ = function(input) {
  * the input that the connection is on.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.positionInlineInputConnection_ =
-    function(input) {
+Drawer.prototype.positionInlineInputConnection_ = function(input) {
   const yPos = input.centerline - input.height / 2;
   // Move the connection.
   if (input.connectionModel) {
@@ -397,8 +397,7 @@ Blockly.blockRendering.Drawer.prototype.positionInlineInputConnection_ =
  * @param {!Blockly.blockRendering.Row} row The row that the connection is on.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.positionStatementInputConnection_ =
-    function(row) {
+Drawer.prototype.positionStatementInputConnection_ = function(row) {
   const input = row.getLastInput();
   if (input.connectionModel) {
     let connX = row.xPos + row.statementEdge + input.notchOffset;
@@ -416,8 +415,7 @@ Blockly.blockRendering.Drawer.prototype.positionStatementInputConnection_ =
  * @param {!Blockly.blockRendering.Row} row The row that the connection is on.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.positionExternalValueConnection_ =
-    function(row) {
+Drawer.prototype.positionExternalValueConnection_ = function(row) {
   const input = row.getLastInput();
   if (input.connectionModel) {
     let connX = row.xPos + row.width;
@@ -432,8 +430,7 @@ Blockly.blockRendering.Drawer.prototype.positionExternalValueConnection_ =
  * Position the previous connection on a block.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.positionPreviousConnection_ =
-    function() {
+Drawer.prototype.positionPreviousConnection_ = function() {
   const topRow = this.info_.topRow;
   if (topRow.connection) {
     const x = topRow.xPos + topRow.notchOffset;
@@ -446,7 +443,7 @@ Blockly.blockRendering.Drawer.prototype.positionPreviousConnection_ =
  * Position the next connection on a block.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.positionNextConnection_ = function() {
+Drawer.prototype.positionNextConnection_ = function() {
   const bottomRow = this.info_.bottomRow;
 
   if (bottomRow.connection) {
@@ -461,7 +458,7 @@ Blockly.blockRendering.Drawer.prototype.positionNextConnection_ = function() {
  * Position the output connection on a block.
  * @protected
  */
-Blockly.blockRendering.Drawer.prototype.positionOutputConnection_ = function() {
+Drawer.prototype.positionOutputConnection_ = function() {
   if (this.info_.outputConnection) {
     const x = this.info_.startX + this.info_.outputConnection.connectionOffsetX;
     const connX = this.info_.RTL ? -x : x;
@@ -469,3 +466,5 @@ Blockly.blockRendering.Drawer.prototype.positionOutputConnection_ = function() {
         this.info_.outputConnection.connectionOffsetY);
   }
 };
+
+exports = Drawer;
diff --git a/tests/deps.js b/tests/deps.js
index e83f61c67..7cade6c4e 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -116,7 +116,7 @@ goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnec
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry']);
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
-goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths']);
+goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], []);
 goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes']);
 goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Svg', 'Blockly.utils.dom']);

From fef2ccfcc8f7129e6a53dd138638e0eab7a24ee2 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 16 Jul 2021 09:57:43 -0700
Subject: [PATCH 057/833] Migrate core/bubble_dragger.js to named requires

---
 core/bubble_dragger.js | 63 +++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/core/bubble_dragger.js b/core/bubble_dragger.js
index 7b6f932d6..fb4c4e4ef 100644
--- a/core/bubble_dragger.js
+++ b/core/bubble_dragger.js
@@ -13,48 +13,49 @@
 goog.module('Blockly.BubbleDragger');
 goog.module.declareLegacyNamespace();
 
+const BlockDragSurfaceSvg = goog.requireType('Blockly.BlockDragSurfaceSvg');
+const ComponentManager = goog.require('Blockly.ComponentManager');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Events = goog.require('Blockly.Events');
+const IBubble = goog.requireType('Blockly.IBubble');
+const IDeleteArea = goog.requireType('Blockly.IDeleteArea');
+const IDragTarget = goog.requireType('Blockly.IDragTarget');
+const utils = goog.require('Blockly.utils');
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Bubble');
-goog.require('Blockly.ComponentManager');
 /** @suppress {extraRequire} */
 goog.require('Blockly.constants');
-goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.CommentMove');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-
-goog.requireType('Blockly.BlockDragSurfaceSvg');
-goog.requireType('Blockly.IBubble');
-goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
  * Class for a bubble dragger.  It moves things on the bubble canvas around the
  * workspace when they are being dragged by a mouse or touch.  These can be
  * block comments, mutators, warnings, or workspace comments.
- * @param {!Blockly.IBubble} bubble The item on the bubble canvas to drag.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace to drag on.
+ * @param {!IBubble} bubble The item on the bubble canvas to drag.
+ * @param {!WorkspaceSvg} workspace The workspace to drag on.
  * @constructor
  */
 const BubbleDragger = function(bubble, workspace) {
   /**
    * The item on the bubble canvas that is being dragged.
-   * @type {!Blockly.IBubble}
+   * @type {!IBubble}
    * @private
    */
   this.draggingBubble_ = bubble;
 
   /**
    * The workspace on which the bubble is being dragged.
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @private
    */
   this.workspace_ = workspace;
 
   /**
    * Which drag target the mouse pointer is over, if any.
-   * @type {?Blockly.IDragTarget}
+   * @type {?IDragTarget}
    * @private
    */
   this.dragTarget_ = null;
@@ -69,7 +70,7 @@ const BubbleDragger = function(bubble, workspace) {
   /**
    * The location of the top left corner of the dragging bubble's body at the
    * beginning of the drag, in workspace coordinates.
-   * @type {!Blockly.utils.Coordinate}
+   * @type {!Coordinate}
    * @private
    */
   this.startXY_ = this.draggingBubble_.getRelativeToSurfaceXY();
@@ -77,11 +78,11 @@ const BubbleDragger = function(bubble, workspace) {
   /**
    * The drag surface to move bubbles to during a drag, or null if none should
    * be used.  Block dragging and bubble dragging use the same surface.
-   * @type {Blockly.BlockDragSurfaceSvg}
+   * @type {BlockDragSurfaceSvg}
    * @private
    */
   this.dragSurface_ =
-      Blockly.utils.is3dSupported() && !!workspace.getBlockDragSurface() ?
+      utils.is3dSupported() && !!workspace.getBlockDragSurface() ?
       workspace.getBlockDragSurface() :
       null;
 };
@@ -102,8 +103,8 @@ BubbleDragger.prototype.dispose = function() {
  * @package
  */
 BubbleDragger.prototype.startBubbleDrag = function() {
-  if (!Blockly.Events.getGroup()) {
-    Blockly.Events.setGroup(true);
+  if (!Events.getGroup()) {
+    Events.setGroup(true);
   }
 
   this.workspace_.setResizesEnabled(false);
@@ -119,13 +120,13 @@ BubbleDragger.prototype.startBubbleDrag = function() {
  * Execute a step of bubble dragging, based on the given event.  Update the
  * display accordingly.
  * @param {!Event} e The most recent move event.
- * @param {!Blockly.utils.Coordinate} currentDragDeltaXY How far the pointer has
+ * @param {!Coordinate} currentDragDeltaXY How far the pointer has
  *     moved from the position at the start of the drag, in pixel units.
  * @package
  */
 BubbleDragger.prototype.dragBubble = function(e, currentDragDeltaXY) {
   const delta = this.pixelsToWorkspaceUnits_(currentDragDeltaXY);
-  const newLoc = Blockly.utils.Coordinate.sum(this.startXY_, delta);
+  const newLoc = Coordinate.sum(this.startXY_, delta);
   this.draggingBubble_.moveDuringDrag(this.dragSurface_, newLoc);
 
   const oldDragTarget = this.dragTarget_;
@@ -148,7 +149,7 @@ BubbleDragger.prototype.dragBubble = function(e, currentDragDeltaXY) {
 
 /**
  * Whether ending the drag would delete the bubble.
- * @param {?Blockly.IDragTarget} dragTarget The drag target that the bubblee is
+ * @param {?IDragTarget} dragTarget The drag target that the bubblee is
  *     currently over.
  * @return {boolean} Whether dropping the bubble immediately would delete the
  *    block.
@@ -158,9 +159,9 @@ BubbleDragger.prototype.shouldDelete_ = function(dragTarget) {
   if (dragTarget) {
     const componentManager = this.workspace_.getComponentManager();
     const isDeleteArea = componentManager.hasCapability(dragTarget.id,
-        Blockly.ComponentManager.Capability.DELETE_AREA);
+        ComponentManager.Capability.DELETE_AREA);
     if (isDeleteArea) {
-      return (/** @type {!Blockly.IDeleteArea} */ (dragTarget))
+      return (/** @type {!IDeleteArea} */ (dragTarget))
           .wouldDelete(this.draggingBubble_, false);
     }
   }
@@ -179,7 +180,7 @@ BubbleDragger.prototype.updateCursorDuringBubbleDrag_ = function() {
 /**
  * Finish a bubble drag and put the bubble back on the workspace.
  * @param {!Event} e The mouseup/touchend event.
- * @param {!Blockly.utils.Coordinate} currentDragDeltaXY How far the pointer has
+ * @param {!Coordinate} currentDragDeltaXY How far the pointer has
  *     moved from the position at the start of the drag, in pixel units.
  * @package
  */
@@ -195,7 +196,7 @@ BubbleDragger.prototype.endBubbleDrag = function(
     newLoc = this.startXY_;
   } else {
     const delta = this.pixelsToWorkspaceUnits_(currentDragDeltaXY);
-    newLoc = Blockly.utils.Coordinate.sum(this.startXY_, delta);
+    newLoc = Coordinate.sum(this.startXY_, delta);
   }
   // Move the bubble to its final location.
   this.draggingBubble_.moveTo(newLoc.x, newLoc.y);
@@ -220,7 +221,7 @@ BubbleDragger.prototype.endBubbleDrag = function(
   }
   this.workspace_.setResizesEnabled(true);
 
-  Blockly.Events.setGroup(false);
+  Events.setGroup(false);
 };
 
 /**
@@ -229,11 +230,11 @@ BubbleDragger.prototype.endBubbleDrag = function(
  */
 BubbleDragger.prototype.fireMoveEvent_ = function() {
   if (this.draggingBubble_.isComment) {
-    const event = new (Blockly.Events.get(Blockly.Events.COMMENT_MOVE))(
+    const event = new (Events.get(Events.COMMENT_MOVE))(
         /** @type {!Blockly.WorkspaceCommentSvg} */ (this.draggingBubble_));
     event.setOldCoordinate(this.startXY_);
     event.recordNew();
-    Blockly.Events.fire(event);
+    Events.fire(event);
   }
   // TODO (fenichel): move events for comments.
   return;
@@ -244,14 +245,14 @@ BubbleDragger.prototype.fireMoveEvent_ = function() {
  * correction for mutator workspaces.
  * This function does not consider differing origins.  It simply scales the
  * input's x and y values.
- * @param {!Blockly.utils.Coordinate} pixelCoord A coordinate with x and y
+ * @param {!Coordinate} pixelCoord A coordinate with x and y
  *     values in CSS pixel units.
- * @return {!Blockly.utils.Coordinate} The input coordinate divided by the
+ * @return {!Coordinate} The input coordinate divided by the
  *     workspace scale.
  * @private
  */
 BubbleDragger.prototype.pixelsToWorkspaceUnits_ = function(pixelCoord) {
-  const result = new Blockly.utils.Coordinate(
+  const result = new Coordinate(
       pixelCoord.x / this.workspace_.scale,
       pixelCoord.y / this.workspace_.scale);
   if (this.workspace_.isMutator) {

From d9f024eb9e8fa599dcdb6f6988be7010ec03b6d2 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 16 Jul 2021 09:58:30 -0700
Subject: [PATCH 058/833] clang-format core/bubble_dragger.js

---
 core/bubble_dragger.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/bubble_dragger.js b/core/bubble_dragger.js
index fb4c4e4ef..d5cb8beae 100644
--- a/core/bubble_dragger.js
+++ b/core/bubble_dragger.js
@@ -158,8 +158,8 @@ BubbleDragger.prototype.dragBubble = function(e, currentDragDeltaXY) {
 BubbleDragger.prototype.shouldDelete_ = function(dragTarget) {
   if (dragTarget) {
     const componentManager = this.workspace_.getComponentManager();
-    const isDeleteArea = componentManager.hasCapability(dragTarget.id,
-        ComponentManager.Capability.DELETE_AREA);
+    const isDeleteArea = componentManager.hasCapability(
+        dragTarget.id, ComponentManager.Capability.DELETE_AREA);
     if (isDeleteArea) {
       return (/** @type {!IDeleteArea} */ (dragTarget))
           .wouldDelete(this.draggingBubble_, false);
@@ -184,8 +184,7 @@ BubbleDragger.prototype.updateCursorDuringBubbleDrag_ = function() {
  *     moved from the position at the start of the drag, in pixel units.
  * @package
  */
-BubbleDragger.prototype.endBubbleDrag = function(
-    e, currentDragDeltaXY) {
+BubbleDragger.prototype.endBubbleDrag = function(e, currentDragDeltaXY) {
   // Make sure internal state is fresh.
   this.dragBubble(e, currentDragDeltaXY);
 

From 6dcc24901c021c903d51191c2348da88a86e35d5 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 14 Jul 2021 15:37:05 -0700
Subject: [PATCH 059/833] Migrate core/extensions.js to ES6 const/let

---
 core/extensions.js | 53 +++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/core/extensions.js b/core/extensions.js
index 0a2c146ad..4871d4622 100644
--- a/core/extensions.js
+++ b/core/extensions.js
@@ -84,7 +84,7 @@ Blockly.Extensions.registerMixin = function(name, mixinObj) {
  */
 Blockly.Extensions.registerMutator = function(name, mixinObj, opt_helperFn,
     opt_blockList) {
-  var errorPrefix = 'Error when registering mutator "' + name + '": ';
+  const errorPrefix = 'Error when registering mutator "' + name + '": ';
 
   // Sanity check the mixin object before registering it.
   Blockly.Extensions.checkHasFunction_(
@@ -92,7 +92,7 @@ Blockly.Extensions.registerMutator = function(name, mixinObj, opt_helperFn,
   Blockly.Extensions.checkHasFunction_(
       errorPrefix, mixinObj.mutationToDom, 'mutationToDom');
 
-  var hasMutatorDialog =
+  const hasMutatorDialog =
       Blockly.Extensions.checkMutatorDialog_(mixinObj, errorPrefix);
 
   if (opt_helperFn && (typeof opt_helperFn != 'function')) {
@@ -138,22 +138,23 @@ Blockly.Extensions.unregister = function(name) {
  * @throws {Error} if the extension is not found.
  */
 Blockly.Extensions.apply = function(name, block, isMutator) {
-  var extensionFn = Blockly.Extensions.ALL_[name];
+  const extensionFn = Blockly.Extensions.ALL_[name];
   if (typeof extensionFn != 'function') {
     throw Error('Error: Extension "' + name + '" not found.');
   }
+  let mutatorProperties;
   if (isMutator) {
     // Fail early if the block already has mutation properties.
     Blockly.Extensions.checkNoMutatorProperties_(name, block);
   } else {
     // Record the old properties so we can make sure they don't change after
     // applying the extension.
-    var mutatorProperties = Blockly.Extensions.getMutatorProperties_(block);
+    mutatorProperties = Blockly.Extensions.getMutatorProperties_(block);
   }
   extensionFn.apply(block);
 
   if (isMutator) {
-    var errorPrefix = 'Error after applying mutator "' + name + '": ';
+    const errorPrefix = 'Error after applying mutator "' + name + '": ';
     Blockly.Extensions.checkBlockHasMutatorProperties_(errorPrefix, block);
   } else {
     if (!Blockly.Extensions.mutatorPropertiesMatch_(
@@ -194,7 +195,7 @@ Blockly.Extensions.checkHasFunction_ = function(errorPrefix, func,
  * @private
  */
 Blockly.Extensions.checkNoMutatorProperties_ = function(mutationName, block) {
-  var properties = Blockly.Extensions.getMutatorProperties_(block);
+  const properties = Blockly.Extensions.getMutatorProperties_(block);
   if (properties.length) {
     throw Error('Error: tried to apply mutation "' + mutationName +
         '" to a block that already has mutator functions.' +
@@ -215,8 +216,8 @@ Blockly.Extensions.checkNoMutatorProperties_ = function(mutationName, block) {
  * @private
  */
 Blockly.Extensions.checkMutatorDialog_ = function(object, errorPrefix) {
-  var hasCompose = object.compose !== undefined;
-  var hasDecompose = object.decompose !== undefined;
+  const hasCompose = object.compose !== undefined;
+  const hasDecompose = object.decompose !== undefined;
 
   if (hasCompose && hasDecompose) {
     if (typeof object.compose != 'function') {
@@ -261,7 +262,7 @@ Blockly.Extensions.checkBlockHasMutatorProperties_ = function(errorPrefix,
  * @private
  */
 Blockly.Extensions.getMutatorProperties_ = function(block) {
-  var result = [];
+  const result = [];
   // List each function explicitly by reference to allow for renaming
   // during compilation.
   if (block.domToMutation !== undefined) {
@@ -289,11 +290,11 @@ Blockly.Extensions.getMutatorProperties_ = function(block) {
  * @private
  */
 Blockly.Extensions.mutatorPropertiesMatch_ = function(oldProperties, block) {
-  var newProperties = Blockly.Extensions.getMutatorProperties_(block);
+  const newProperties = Blockly.Extensions.getMutatorProperties_(block);
   if (newProperties.length != oldProperties.length) {
     return false;
   }
-  for (var i = 0; i < newProperties.length; i++) {
+  for (let i = 0; i < newProperties.length; i++) {
     if (oldProperties[i] != newProperties[i]) {
       return false;
     }
@@ -323,7 +324,7 @@ Blockly.Extensions.mutatorPropertiesMatch_ = function(oldProperties, block) {
 Blockly.Extensions.buildTooltipForDropdown = function(dropdownName,
     lookupTable) {
   // List of block types already validated, to minimize duplicate warnings.
-  var blockTypesChecked = [];
+  const blockTypesChecked = [];
 
   // Check the tooltip string messages for invalid references.
   // Wait for load, in case Blockly.Msg is not yet populated.
@@ -331,7 +332,7 @@ Blockly.Extensions.buildTooltipForDropdown = function(dropdownName,
   // document object, in which case skip the validation.
   if (typeof document == 'object') {  // Relies on document.readyState
     Blockly.utils.runAfterPageLoad(function() {
-      for (var key in lookupTable) {
+      for (let key in lookupTable) {
         // Will print warnings if reference is missing.
         Blockly.utils.checkMessageReferences(lookupTable[key]);
       }
@@ -342,20 +343,20 @@ Blockly.Extensions.buildTooltipForDropdown = function(dropdownName,
    * The actual extension.
    * @this {Blockly.Block}
    */
-  var extensionFn = function() {
+  const extensionFn = function () {
     if (this.type && blockTypesChecked.indexOf(this.type) == -1) {
       Blockly.Extensions.checkDropdownOptionsInTable_(
           this, dropdownName, lookupTable);
       blockTypesChecked.push(this.type);
     }
 
-    this.setTooltip(function() {
-      var value = String(this.getFieldValue(dropdownName));
-      var tooltip = lookupTable[value];
+    this.setTooltip(function () {
+      const value = String(this.getFieldValue(dropdownName));
+      let tooltip = lookupTable[value];
       if (tooltip == null) {
         if (blockTypesChecked.indexOf(this.type) == -1) {
           // Warn for missing values on generated tooltips.
-          var warning = 'No tooltip mapping for value ' + value +
+          let warning = 'No tooltip mapping for value ' + value +
               ' of field ' + dropdownName;
           if (this.type != null) {
             warning += (' of block type ' + this.type);
@@ -382,11 +383,11 @@ Blockly.Extensions.buildTooltipForDropdown = function(dropdownName,
 Blockly.Extensions.checkDropdownOptionsInTable_ = function(block, dropdownName,
     lookupTable) {
   // Validate all dropdown options have values.
-  var dropdown = block.getField(dropdownName);
+  const dropdown = block.getField(dropdownName);
   if (!dropdown.isOptionListDynamic()) {
-    var options = dropdown.getOptions();
-    for (var i = 0; i < options.length; ++i) {
-      var optionKey = options[i][1];  // label, then value
+    const options = dropdown.getOptions();
+    for (let i = 0; i < options.length; ++i) {
+      const optionKey = options[i][1];  // label, then value
       if (lookupTable[optionKey] == null) {
         console.warn('No tooltip mapping for value ' + optionKey +
            ' of field ' + dropdownName + ' of block type ' + block.type);
@@ -421,9 +422,9 @@ Blockly.Extensions.buildTooltipWithFieldText = function(msgTemplate,
    * The actual extension.
    * @this {Blockly.Block}
    */
-  var extensionFn = function() {
-    this.setTooltip(function() {
-      var field = this.getField(fieldName);
+  const extensionFn = function () {
+    this.setTooltip(function () {
+      const field = this.getField(fieldName);
       return Blockly.utils.replaceMessageReferences(msgTemplate)
           .replace('%1', field ? field.getText() : '');
     }.bind(this));
@@ -442,7 +443,7 @@ Blockly.Extensions.buildTooltipWithFieldText = function(msgTemplate,
 Blockly.Extensions.extensionParentTooltip_ = function() {
   this.tooltipWhenNotConnected_ = this.tooltip;
   this.setTooltip(function() {
-    var parent = this.getParent();
+    const parent = this.getParent();
     return (parent && parent.getInputsInline() && parent.tooltip) ||
         this.tooltipWhenNotConnected_;
   }.bind(this));

From fed47362cd7fe77bd1cff3e7a3ddaf1786492ceb Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 14 Jul 2021 15:45:22 -0700
Subject: [PATCH 060/833] Migrate core/extensions.js to goog.module

---
 core/extensions.js | 81 ++++++++++++++++++++++++----------------------
 tests/deps.js      |  2 +-
 2 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/core/extensions.js b/core/extensions.js
index 4871d4622..8a287e33a 100644
--- a/core/extensions.js
+++ b/core/extensions.js
@@ -17,7 +17,8 @@
  * @name Blockly.Extensions
  * @namespace
  */
-goog.provide('Blockly.Extensions');
+goog.module('Blockly.Extensions');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.utils');
 
@@ -28,7 +29,7 @@ goog.requireType('Blockly.Block');
  * The set of all registered extensions, keyed by extension name/id.
  * @private
  */
-Blockly.Extensions.ALL_ = Object.create(null);
+const ALL = Object.create(null);
 
 /**
  * Registers a new extension function. Extensions are functions that help
@@ -40,17 +41,17 @@ Blockly.Extensions.ALL_ = Object.create(null);
  * @throws {Error} if the extension name is empty, the extension is already
  *     registered, or extensionFn is not a function.
  */
-Blockly.Extensions.register = function(name, initFn) {
+const register = function(name, initFn) {
   if ((typeof name != 'string') || (name.trim() == '')) {
     throw Error('Error: Invalid extension name "' + name + '"');
   }
-  if (Blockly.Extensions.ALL_[name]) {
+  if (ALL[name]) {
     throw Error('Error: Extension "' + name + '" is already registered.');
   }
   if (typeof initFn != 'function') {
     throw Error('Error: Extension "' + name + '" must be a function');
   }
-  Blockly.Extensions.ALL_[name] = initFn;
+  ALL[name] = initFn;
 };
 
 /**
@@ -60,11 +61,11 @@ Blockly.Extensions.register = function(name, initFn) {
  * @throws {Error} if the extension name is empty or the extension is already
  *     registered.
  */
-Blockly.Extensions.registerMixin = function(name, mixinObj) {
+const registerMixin = function(name, mixinObj) {
   if (!mixinObj || typeof mixinObj != 'object') {
     throw Error('Error: Mixin "' + name + '" must be a object');
   }
-  Blockly.Extensions.register(name, function() {
+  register(name, function() {
     this.mixin(mixinObj);
   });
 };
@@ -82,25 +83,25 @@ Blockly.Extensions.registerMixin = function(name, mixinObj) {
  *     flyout of the mutator dialog.
  * @throws {Error} if the mutation is invalid or can't be applied to the block.
  */
-Blockly.Extensions.registerMutator = function(name, mixinObj, opt_helperFn,
+const registerMutator = function(name, mixinObj, opt_helperFn,
     opt_blockList) {
   const errorPrefix = 'Error when registering mutator "' + name + '": ';
 
   // Sanity check the mixin object before registering it.
-  Blockly.Extensions.checkHasFunction_(
+  checkHasFunction(
       errorPrefix, mixinObj.domToMutation, 'domToMutation');
-  Blockly.Extensions.checkHasFunction_(
+  checkHasFunction(
       errorPrefix, mixinObj.mutationToDom, 'mutationToDom');
 
   const hasMutatorDialog =
-      Blockly.Extensions.checkMutatorDialog_(mixinObj, errorPrefix);
+      checkMutatorDialog(mixinObj, errorPrefix);
 
   if (opt_helperFn && (typeof opt_helperFn != 'function')) {
     throw Error('Extension "' + name + '" is not a function');
   }
 
   // Sanity checks passed.
-  Blockly.Extensions.register(name, function() {
+  register(name, function() {
     if (hasMutatorDialog) {
       if (!Blockly.Mutator) {
         throw Error(errorPrefix + 'Missing require for Blockly.Mutator');
@@ -120,9 +121,9 @@ Blockly.Extensions.registerMutator = function(name, mixinObj, opt_helperFn,
  * Unregisters the extension registered with the given name.
  * @param {string} name The name of the extension to unregister.
  */
-Blockly.Extensions.unregister = function(name) {
-  if (Blockly.Extensions.ALL_[name]) {
-    delete Blockly.Extensions.ALL_[name];
+const unregister = function(name) {
+  if (ALL[name]) {
+    delete ALL[name];
   } else {
     console.warn('No extension mapping for name "' + name +
         '" found to unregister');
@@ -137,27 +138,27 @@ Blockly.Extensions.unregister = function(name) {
  * @param {boolean} isMutator True if this extension defines a mutator.
  * @throws {Error} if the extension is not found.
  */
-Blockly.Extensions.apply = function(name, block, isMutator) {
-  const extensionFn = Blockly.Extensions.ALL_[name];
+const apply = function(name, block, isMutator) {
+  const extensionFn = ALL[name];
   if (typeof extensionFn != 'function') {
     throw Error('Error: Extension "' + name + '" not found.');
   }
   let mutatorProperties;
   if (isMutator) {
     // Fail early if the block already has mutation properties.
-    Blockly.Extensions.checkNoMutatorProperties_(name, block);
+    checkNoMutatorProperties(name, block);
   } else {
     // Record the old properties so we can make sure they don't change after
     // applying the extension.
-    mutatorProperties = Blockly.Extensions.getMutatorProperties_(block);
+    mutatorProperties = getMutatorProperties(block);
   }
   extensionFn.apply(block);
 
   if (isMutator) {
     const errorPrefix = 'Error after applying mutator "' + name + '": ';
-    Blockly.Extensions.checkBlockHasMutatorProperties_(errorPrefix, block);
+    checkBlockHasMutatorProperties(errorPrefix, block);
   } else {
-    if (!Blockly.Extensions.mutatorPropertiesMatch_(
+    if (!mutatorPropertiesMatch(
         /** @type {!Array<Object>} */ (mutatorProperties), block)) {
       throw Error('Error when applying extension "' + name + '": ' +
           'mutation properties changed when applying a non-mutator extension.');
@@ -173,7 +174,7 @@ Blockly.Extensions.apply = function(name, block, isMutator) {
  * @throws {Error} if the property does not exist or is not a function.
  * @private
  */
-Blockly.Extensions.checkHasFunction_ = function(errorPrefix, func,
+const checkHasFunction = function(errorPrefix, func,
     propertyName) {
   if (!func) {
     throw Error(errorPrefix +
@@ -194,8 +195,8 @@ Blockly.Extensions.checkHasFunction_ = function(errorPrefix, func,
  * @throws {Error} if any of the properties already exist on the block.
  * @private
  */
-Blockly.Extensions.checkNoMutatorProperties_ = function(mutationName, block) {
-  const properties = Blockly.Extensions.getMutatorProperties_(block);
+const checkNoMutatorProperties = function(mutationName, block) {
+  const properties = getMutatorProperties(block);
   if (properties.length) {
     throw Error('Error: tried to apply mutation "' + mutationName +
         '" to a block that already has mutator functions.' +
@@ -215,7 +216,7 @@ Blockly.Extensions.checkNoMutatorProperties_ = function(mutationName, block) {
  * @throws {Error} if the object has only one of the functions.
  * @private
  */
-Blockly.Extensions.checkMutatorDialog_ = function(object, errorPrefix) {
+const checkMutatorDialog = function(object, errorPrefix) {
   const hasCompose = object.compose !== undefined;
   const hasDecompose = object.decompose !== undefined;
 
@@ -240,7 +241,7 @@ Blockly.Extensions.checkMutatorDialog_ = function(object, errorPrefix) {
  * @param {!Blockly.Block} block The block to inspect.
  * @private
  */
-Blockly.Extensions.checkBlockHasMutatorProperties_ = function(errorPrefix,
+const checkBlockHasMutatorProperties = function(errorPrefix,
     block) {
   if (typeof block.domToMutation != 'function') {
     throw Error(errorPrefix + 'Applying a mutator didn\'t add "domToMutation"');
@@ -251,7 +252,7 @@ Blockly.Extensions.checkBlockHasMutatorProperties_ = function(errorPrefix,
 
   // A block with a mutator isn't required to have a mutation dialog, but
   // it should still have both or neither of compose and decompose.
-  Blockly.Extensions.checkMutatorDialog_(block, errorPrefix);
+  checkMutatorDialog(block, errorPrefix);
 };
 
 /**
@@ -261,7 +262,7 @@ Blockly.Extensions.checkBlockHasMutatorProperties_ = function(errorPrefix,
  *     should be functions, but may be anything other than undefined.
  * @private
  */
-Blockly.Extensions.getMutatorProperties_ = function(block) {
+const getMutatorProperties = function(block) {
   const result = [];
   // List each function explicitly by reference to allow for renaming
   // during compilation.
@@ -289,8 +290,8 @@ Blockly.Extensions.getMutatorProperties_ = function(block) {
  * @return {boolean} True if the property lists match.
  * @private
  */
-Blockly.Extensions.mutatorPropertiesMatch_ = function(oldProperties, block) {
-  const newProperties = Blockly.Extensions.getMutatorProperties_(block);
+const mutatorPropertiesMatch = function(oldProperties, block) {
+  const newProperties = getMutatorProperties(block);
   if (newProperties.length != oldProperties.length) {
     return false;
   }
@@ -321,7 +322,7 @@ Blockly.Extensions.mutatorPropertiesMatch_ = function(oldProperties, block) {
  *     tooltip text.
  * @return {!Function} The extension function.
  */
-Blockly.Extensions.buildTooltipForDropdown = function(dropdownName,
+const buildTooltipForDropdown = function(dropdownName,
     lookupTable) {
   // List of block types already validated, to minimize duplicate warnings.
   const blockTypesChecked = [];
@@ -345,7 +346,7 @@ Blockly.Extensions.buildTooltipForDropdown = function(dropdownName,
    */
   const extensionFn = function () {
     if (this.type && blockTypesChecked.indexOf(this.type) == -1) {
-      Blockly.Extensions.checkDropdownOptionsInTable_(
+      checkDropdownOptionsInTable(
           this, dropdownName, lookupTable);
       blockTypesChecked.push(this.type);
     }
@@ -380,7 +381,7 @@ Blockly.Extensions.buildTooltipForDropdown = function(dropdownName,
  * @param {!Object<string, string>} lookupTable The string lookup table
  * @private
  */
-Blockly.Extensions.checkDropdownOptionsInTable_ = function(block, dropdownName,
+const checkDropdownOptionsInTable = function(block, dropdownName,
     lookupTable) {
   // Validate all dropdown options have values.
   const dropdown = block.getField(dropdownName);
@@ -405,7 +406,7 @@ Blockly.Extensions.checkDropdownOptionsInTable_ = function(block, dropdownName,
  * @param {string} fieldName The field with the replacement text.
  * @return {!Function} The extension function.
  */
-Blockly.Extensions.buildTooltipWithFieldText = function(msgTemplate,
+const buildTooltipWithFieldText = function(msgTemplate,
     fieldName) {
   // Check the tooltip string messages for invalid references.
   // Wait for load, in case Blockly.Msg is not yet populated.
@@ -440,13 +441,15 @@ Blockly.Extensions.buildTooltipWithFieldText = function(msgTemplate,
  * @this {Blockly.Block}
  * @private
  */
-Blockly.Extensions.extensionParentTooltip_ = function() {
-  this.tooltipWhenNotConnected_ = this.tooltip;
+const extensionParentTooltip = function() {
+  this.tooltipWhenNotConnected = this.tooltip;
   this.setTooltip(function() {
     const parent = this.getParent();
     return (parent && parent.getInputsInline() && parent.tooltip) ||
-        this.tooltipWhenNotConnected_;
+        this.tooltipWhenNotConnected;
   }.bind(this));
 };
-Blockly.Extensions.register('parent_tooltip_when_inline',
-    Blockly.Extensions.extensionParentTooltip_);
+register('parent_tooltip_when_inline',
+    extensionParentTooltip);
+
+exports = {ALL_: ALL, register, registerMixin, registerMutator, unregister, apply, buildTooltipForDropdown, buildTooltipWithFieldText};
diff --git a/tests/deps.js b/tests/deps.js
index 89bb3d512..5c46df3f6 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -47,7 +47,7 @@ goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Bloc
 goog.addDependency('../../core/events/variable_events.js', ['Blockly.Events.VarBase', 'Blockly.Events.VarCreate', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es5'});
 goog.addDependency('../../core/events/ws_comment_events.js', ['Blockly.Events.CommentBase', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
-goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils']);
+goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible', 'Blockly.IRegistrable', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es5'});
 goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object']);

From 0bd678fe556db1c68f961abd65a6453ad112b6a1 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 14 Jul 2021 15:54:37 -0700
Subject: [PATCH 061/833] Migrate core/extensions.js named requires

---
 core/extensions.js | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/core/extensions.js b/core/extensions.js
index 8a287e33a..c382c615c 100644
--- a/core/extensions.js
+++ b/core/extensions.js
@@ -20,9 +20,8 @@
 goog.module('Blockly.Extensions');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.utils');
-
-goog.requireType('Blockly.Block');
+const Block = goog.requireType('Blockly.Block');
+const {checkMessageReferences, replaceMessageReferences, runAfterPageLoad} = goog.require('Blockly.utils');
 
 
 /**
@@ -134,7 +133,7 @@ const unregister = function(name) {
  * Applies an extension method to a block. This should only be called during
  * block construction.
  * @param {string} name The name of the extension.
- * @param {!Blockly.Block} block The block to apply the named extension to.
+ * @param {!Block} block The block to apply the named extension to.
  * @param {boolean} isMutator True if this extension defines a mutator.
  * @throws {Error} if the extension is not found.
  */
@@ -191,7 +190,7 @@ const checkHasFunction = function(errorPrefix, func,
  * extension to a block, to make sure we are not overwriting properties.
  * @param {string} mutationName The name of the mutation to reference in error
  *     messages.
- * @param {!Blockly.Block} block The block to check.
+ * @param {!Block} block The block to check.
  * @throws {Error} if any of the properties already exist on the block.
  * @private
  */
@@ -238,7 +237,7 @@ const checkMutatorDialog = function(object, errorPrefix) {
  * Check that a block has required mutator properties.  This should be called
  * after applying a mutation extension.
  * @param {string} errorPrefix The string to prepend to any error message.
- * @param {!Blockly.Block} block The block to inspect.
+ * @param {!Block} block The block to inspect.
  * @private
  */
 const checkBlockHasMutatorProperties = function(errorPrefix,
@@ -257,7 +256,7 @@ const checkBlockHasMutatorProperties = function(errorPrefix,
 
 /**
  * Get a list of values of mutator properties on the given block.
- * @param {!Blockly.Block} block The block to inspect.
+ * @param {!Block} block The block to inspect.
  * @return {!Array<Object>} A list with all of the defined properties, which
  *     should be functions, but may be anything other than undefined.
  * @private
@@ -286,7 +285,7 @@ const getMutatorProperties = function(block) {
  * properties.  This should be called after applying a non-mutator extension,
  * to verify that the extension didn't change properties it shouldn't.
  * @param {!Array<Object>} oldProperties The old values to compare to.
- * @param {!Blockly.Block} block The block to inspect for new values.
+ * @param {!Block} block The block to inspect for new values.
  * @return {boolean} True if the property lists match.
  * @private
  */
@@ -332,17 +331,17 @@ const buildTooltipForDropdown = function(dropdownName,
   // runAfterPageLoad() does not run in a Node.js environment due to lack of
   // document object, in which case skip the validation.
   if (typeof document == 'object') {  // Relies on document.readyState
-    Blockly.utils.runAfterPageLoad(function() {
+    runAfterPageLoad(function() {
       for (let key in lookupTable) {
         // Will print warnings if reference is missing.
-        Blockly.utils.checkMessageReferences(lookupTable[key]);
+        checkMessageReferences(lookupTable[key]);
       }
     });
   }
 
   /**
    * The actual extension.
-   * @this {Blockly.Block}
+   * @this {Block}
    */
   const extensionFn = function () {
     if (this.type && blockTypesChecked.indexOf(this.type) == -1) {
@@ -365,7 +364,7 @@ const buildTooltipForDropdown = function(dropdownName,
           console.warn(warning + '.');
         }
       } else {
-        tooltip = Blockly.utils.replaceMessageReferences(tooltip);
+        tooltip = replaceMessageReferences(tooltip);
       }
       return tooltip;
     }.bind(this));
@@ -376,7 +375,7 @@ const buildTooltipForDropdown = function(dropdownName,
 /**
  * Checks all options keys are present in the provided string lookup table.
  * Emits console warnings when they are not.
- * @param {!Blockly.Block} block The block containing the dropdown
+ * @param {!Block} block The block containing the dropdown
  * @param {string} dropdownName The name of the dropdown
  * @param {!Object<string, string>} lookupTable The string lookup table
  * @private
@@ -413,20 +412,20 @@ const buildTooltipWithFieldText = function(msgTemplate,
   // runAfterPageLoad() does not run in a Node.js environment due to lack of
   // document object, in which case skip the validation.
   if (typeof document == 'object') {  // Relies on document.readyState
-    Blockly.utils.runAfterPageLoad(function() {
+    runAfterPageLoad(function() {
       // Will print warnings if reference is missing.
-      Blockly.utils.checkMessageReferences(msgTemplate);
+      checkMessageReferences(msgTemplate);
     });
   }
 
   /**
    * The actual extension.
-   * @this {Blockly.Block}
+   * @this {Block}
    */
   const extensionFn = function () {
     this.setTooltip(function () {
       const field = this.getField(fieldName);
-      return Blockly.utils.replaceMessageReferences(msgTemplate)
+      return replaceMessageReferences(msgTemplate)
           .replace('%1', field ? field.getText() : '');
     }.bind(this));
   };
@@ -438,7 +437,7 @@ const buildTooltipWithFieldText = function(msgTemplate,
  * uses the tooltip text at the time this extension is initialized. This takes
  * advantage of the fact that all other values from JSON are initialized before
  * extensions.
- * @this {Blockly.Block}
+ * @this {Block}
  * @private
  */
 const extensionParentTooltip = function() {

From 9ba9627ed164f8719d3ce54e4766c55b28d8b907 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 14 Jul 2021 18:03:56 -0700
Subject: [PATCH 062/833] clang-format core/extensions.js

---
 core/extensions.js | 86 ++++++++++++++++++++++++----------------------
 1 file changed, 44 insertions(+), 42 deletions(-)

diff --git a/core/extensions.js b/core/extensions.js
index c382c615c..50eb8a70b 100644
--- a/core/extensions.js
+++ b/core/extensions.js
@@ -82,18 +82,14 @@ const registerMixin = function(name, mixinObj) {
  *     flyout of the mutator dialog.
  * @throws {Error} if the mutation is invalid or can't be applied to the block.
  */
-const registerMutator = function(name, mixinObj, opt_helperFn,
-    opt_blockList) {
+const registerMutator = function(name, mixinObj, opt_helperFn, opt_blockList) {
   const errorPrefix = 'Error when registering mutator "' + name + '": ';
 
   // Sanity check the mixin object before registering it.
-  checkHasFunction(
-      errorPrefix, mixinObj.domToMutation, 'domToMutation');
-  checkHasFunction(
-      errorPrefix, mixinObj.mutationToDom, 'mutationToDom');
+  checkHasFunction(errorPrefix, mixinObj.domToMutation, 'domToMutation');
+  checkHasFunction(errorPrefix, mixinObj.mutationToDom, 'mutationToDom');
 
-  const hasMutatorDialog =
-      checkMutatorDialog(mixinObj, errorPrefix);
+  const hasMutatorDialog = checkMutatorDialog(mixinObj, errorPrefix);
 
   if (opt_helperFn && (typeof opt_helperFn != 'function')) {
     throw Error('Extension "' + name + '" is not a function');
@@ -124,8 +120,8 @@ const unregister = function(name) {
   if (ALL[name]) {
     delete ALL[name];
   } else {
-    console.warn('No extension mapping for name "' + name +
-        '" found to unregister');
+    console.warn(
+        'No extension mapping for name "' + name + '" found to unregister');
   }
 };
 
@@ -158,8 +154,9 @@ const apply = function(name, block, isMutator) {
     checkBlockHasMutatorProperties(errorPrefix, block);
   } else {
     if (!mutatorPropertiesMatch(
-        /** @type {!Array<Object>} */ (mutatorProperties), block)) {
-      throw Error('Error when applying extension "' + name + '": ' +
+            /** @type {!Array<Object>} */ (mutatorProperties), block)) {
+      throw Error(
+          'Error when applying extension "' + name + '": ' +
           'mutation properties changed when applying a non-mutator extension.');
     }
   }
@@ -173,14 +170,14 @@ const apply = function(name, block, isMutator) {
  * @throws {Error} if the property does not exist or is not a function.
  * @private
  */
-const checkHasFunction = function(errorPrefix, func,
-    propertyName) {
+const checkHasFunction = function(errorPrefix, func, propertyName) {
   if (!func) {
-    throw Error(errorPrefix +
-        'missing required property "' + propertyName + '"');
+    throw Error(
+        errorPrefix + 'missing required property "' + propertyName + '"');
   } else if (typeof func != 'function') {
-    throw Error(errorPrefix +
-        '" required property "' + propertyName + '" must be a function');
+    throw Error(
+        errorPrefix + '" required property "' + propertyName +
+        '" must be a function');
   }
 };
 
@@ -197,7 +194,8 @@ const checkHasFunction = function(errorPrefix, func,
 const checkNoMutatorProperties = function(mutationName, block) {
   const properties = getMutatorProperties(block);
   if (properties.length) {
-    throw Error('Error: tried to apply mutation "' + mutationName +
+    throw Error(
+        'Error: tried to apply mutation "' + mutationName +
         '" to a block that already has mutator functions.' +
         '  Block id: ' + block.id);
   }
@@ -229,8 +227,8 @@ const checkMutatorDialog = function(object, errorPrefix) {
   } else if (!hasCompose && !hasDecompose) {
     return false;
   }
-  throw Error(errorPrefix +
-      'Must have both or neither of "compose" and "decompose"');
+  throw Error(
+      errorPrefix + 'Must have both or neither of "compose" and "decompose"');
 };
 
 /**
@@ -240,8 +238,7 @@ const checkMutatorDialog = function(object, errorPrefix) {
  * @param {!Block} block The block to inspect.
  * @private
  */
-const checkBlockHasMutatorProperties = function(errorPrefix,
-    block) {
+const checkBlockHasMutatorProperties = function(errorPrefix, block) {
   if (typeof block.domToMutation != 'function') {
     throw Error(errorPrefix + 'Applying a mutator didn\'t add "domToMutation"');
   }
@@ -321,8 +318,7 @@ const mutatorPropertiesMatch = function(oldProperties, block) {
  *     tooltip text.
  * @return {!Function} The extension function.
  */
-const buildTooltipForDropdown = function(dropdownName,
-    lookupTable) {
+const buildTooltipForDropdown = function(dropdownName, lookupTable) {
   // List of block types already validated, to minimize duplicate warnings.
   const blockTypesChecked = [];
 
@@ -343,21 +339,20 @@ const buildTooltipForDropdown = function(dropdownName,
    * The actual extension.
    * @this {Block}
    */
-  const extensionFn = function () {
+  const extensionFn = function() {
     if (this.type && blockTypesChecked.indexOf(this.type) == -1) {
-      checkDropdownOptionsInTable(
-          this, dropdownName, lookupTable);
+      checkDropdownOptionsInTable(this, dropdownName, lookupTable);
       blockTypesChecked.push(this.type);
     }
 
-    this.setTooltip(function () {
+    this.setTooltip(function() {
       const value = String(this.getFieldValue(dropdownName));
       let tooltip = lookupTable[value];
       if (tooltip == null) {
         if (blockTypesChecked.indexOf(this.type) == -1) {
           // Warn for missing values on generated tooltips.
-          let warning = 'No tooltip mapping for value ' + value +
-              ' of field ' + dropdownName;
+          let warning = 'No tooltip mapping for value ' + value + ' of field ' +
+              dropdownName;
           if (this.type != null) {
             warning += (' of block type ' + this.type);
           }
@@ -380,8 +375,7 @@ const buildTooltipForDropdown = function(dropdownName,
  * @param {!Object<string, string>} lookupTable The string lookup table
  * @private
  */
-const checkDropdownOptionsInTable = function(block, dropdownName,
-    lookupTable) {
+const checkDropdownOptionsInTable = function(block, dropdownName, lookupTable) {
   // Validate all dropdown options have values.
   const dropdown = block.getField(dropdownName);
   if (!dropdown.isOptionListDynamic()) {
@@ -389,8 +383,9 @@ const checkDropdownOptionsInTable = function(block, dropdownName,
     for (let i = 0; i < options.length; ++i) {
       const optionKey = options[i][1];  // label, then value
       if (lookupTable[optionKey] == null) {
-        console.warn('No tooltip mapping for value ' + optionKey +
-           ' of field ' + dropdownName + ' of block type ' + block.type);
+        console.warn(
+            'No tooltip mapping for value ' + optionKey + ' of field ' +
+            dropdownName + ' of block type ' + block.type);
       }
     }
   }
@@ -405,8 +400,7 @@ const checkDropdownOptionsInTable = function(block, dropdownName,
  * @param {string} fieldName The field with the replacement text.
  * @return {!Function} The extension function.
  */
-const buildTooltipWithFieldText = function(msgTemplate,
-    fieldName) {
+const buildTooltipWithFieldText = function(msgTemplate, fieldName) {
   // Check the tooltip string messages for invalid references.
   // Wait for load, in case Blockly.Msg is not yet populated.
   // runAfterPageLoad() does not run in a Node.js environment due to lack of
@@ -422,8 +416,8 @@ const buildTooltipWithFieldText = function(msgTemplate,
    * The actual extension.
    * @this {Block}
    */
-  const extensionFn = function () {
-    this.setTooltip(function () {
+  const extensionFn = function() {
+    this.setTooltip(function() {
       const field = this.getField(fieldName);
       return replaceMessageReferences(msgTemplate)
           .replace('%1', field ? field.getText() : '');
@@ -448,7 +442,15 @@ const extensionParentTooltip = function() {
         this.tooltipWhenNotConnected;
   }.bind(this));
 };
-register('parent_tooltip_when_inline',
-    extensionParentTooltip);
+register('parent_tooltip_when_inline', extensionParentTooltip);
 
-exports = {ALL_: ALL, register, registerMixin, registerMutator, unregister, apply, buildTooltipForDropdown, buildTooltipWithFieldText};
+exports = {
+  ALL_: ALL,
+  register,
+  registerMixin,
+  registerMutator,
+  unregister,
+  apply,
+  buildTooltipForDropdown,
+  buildTooltipWithFieldText
+};

From fa9a175296d40c8db1e9d4e4fd7b2300321b57cc Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 15 Jul 2021 12:30:09 -0700
Subject: [PATCH 063/833] Update name of private property

---
 core/extensions.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/extensions.js b/core/extensions.js
index 50eb8a70b..c73737c43 100644
--- a/core/extensions.js
+++ b/core/extensions.js
@@ -28,7 +28,7 @@ const {checkMessageReferences, replaceMessageReferences, runAfterPageLoad} = goo
  * The set of all registered extensions, keyed by extension name/id.
  * @private
  */
-const ALL = Object.create(null);
+const allExtensions = Object.create(null);
 
 /**
  * Registers a new extension function. Extensions are functions that help
@@ -44,13 +44,13 @@ const register = function(name, initFn) {
   if ((typeof name != 'string') || (name.trim() == '')) {
     throw Error('Error: Invalid extension name "' + name + '"');
   }
-  if (ALL[name]) {
+  if (allExtensions[name]) {
     throw Error('Error: Extension "' + name + '" is already registered.');
   }
   if (typeof initFn != 'function') {
     throw Error('Error: Extension "' + name + '" must be a function');
   }
-  ALL[name] = initFn;
+  allExtensions[name] = initFn;
 };
 
 /**
@@ -117,8 +117,8 @@ const registerMutator = function(name, mixinObj, opt_helperFn, opt_blockList) {
  * @param {string} name The name of the extension to unregister.
  */
 const unregister = function(name) {
-  if (ALL[name]) {
-    delete ALL[name];
+  if (allExtensions[name]) {
+    delete allExtensions[name];
   } else {
     console.warn(
         'No extension mapping for name "' + name + '" found to unregister');
@@ -134,7 +134,7 @@ const unregister = function(name) {
  * @throws {Error} if the extension is not found.
  */
 const apply = function(name, block, isMutator) {
-  const extensionFn = ALL[name];
+  const extensionFn = allExtensions[name];
   if (typeof extensionFn != 'function') {
     throw Error('Error: Extension "' + name + '" not found.');
   }
@@ -445,7 +445,7 @@ const extensionParentTooltip = function() {
 register('parent_tooltip_when_inline', extensionParentTooltip);
 
 exports = {
-  ALL_: ALL,
+  ALL_: allExtensions,
   register,
   registerMixin,
   registerMutator,

From 80d953d5b964eb45576854ff5a80e93dc18a93b9 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 14 Jul 2021 17:29:55 -0700
Subject: [PATCH 064/833] Migrate core/css.js to ES6 const/let

---
 core/css.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/css.js b/core/css.js
index 9f6037d7b..a72088a7f 100644
--- a/core/css.js
+++ b/core/css.js
@@ -55,19 +55,19 @@ Blockly.Css.inject = function(hasCss, pathToMedia) {
     return;
   }
   Blockly.Css.injected_ = true;
-  var text = Blockly.Css.CONTENT.join('\n');
+  let text = Blockly.Css.CONTENT.join('\n');
   Blockly.Css.CONTENT.length = 0;  // Garbage collect CSS content.
   if (!hasCss) {
     return;
   }
   // Strip off any trailing slash (either Unix or Windows).
-  var mediaPath = pathToMedia.replace(/[\\/]$/, '');
+  const mediaPath = pathToMedia.replace(/[\\/]$/, '');
   text = text.replace(/<<<PATH>>>/g, mediaPath);
 
   // Inject CSS tag at start of head.
-  var cssNode = document.createElement('style');
+  const cssNode = document.createElement('style');
   cssNode.id = 'blockly-common-style';
-  var cssTextNode = document.createTextNode(text);
+  const cssTextNode = document.createTextNode(text);
   cssNode.appendChild(cssTextNode);
   document.head.insertBefore(cssNode, document.head.firstChild);
 };

From 902112be3d88493261435b2c786b274d261fcccb Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 10:00:56 -0700
Subject: [PATCH 065/833] Use ES6 template strings in core/css.js

---
 core/css.js | 766 ++++++++++++++++++++++++++--------------------------
 1 file changed, 384 insertions(+), 382 deletions(-)

diff --git a/core/css.js b/core/css.js
index a72088a7f..b63c7ed8e 100644
--- a/core/css.js
+++ b/core/css.js
@@ -76,477 +76,479 @@ Blockly.Css.inject = function(hasCss, pathToMedia) {
  * Array making up the CSS content for Blockly.
  */
 Blockly.Css.CONTENT = [
-  /* eslint-disable indent */
-  '.blocklySvg {',
-    'background-color: #fff;',
-    'outline: none;',
-    'overflow: hidden;',  /* IE overflows by default. */
-    'position: absolute;',
-    'display: block;',
-  '}',
+`.blocklySvg {
+  background-color: #fff;
+  outline: none;
+  overflow: hidden;  /* IE overflows by default. */
+  position: absolute;
+  display: block;
+}`,
 
-  '.blocklyWidgetDiv {',
-    'display: none;',
-    'position: absolute;',
-    'z-index: 99999;',  /* big value for bootstrap3 compatibility */
-  '}',
+`.blocklyWidgetDiv {
+  display: none;
+  position: absolute;
+  z-index: 99999;  /* big value for bootstrap3 compatibility */
+}`,
 
-  '.injectionDiv {',
-    'height: 100%;',
-    'position: relative;',
-    'overflow: hidden;',  /* So blocks in drag surface disappear at edges */
-    'touch-action: none;',
-  '}',
+`.injectionDiv {
+  height: 100%;
+  position: relative;
+  overflow: hidden;  /* So blocks in drag surface disappear at edges */
+  touch-action: none;
+}`,
 
-  '.blocklyNonSelectable {',
-    'user-select: none;',
-    '-ms-user-select: none;',
-    '-webkit-user-select: none;',
-  '}',
+`.blocklyNonSelectable {
+  user-select: none;
+  -ms-user-select: none;
+  -webkit-user-select: none;
+}`,
+
+`.blocklyWsDragSurface {
+  display: none;
+  position: absolute;
+  top: 0;
+  left: 0;
+}`,
 
-  '.blocklyWsDragSurface {',
-    'display: none;',
-    'position: absolute;',
-    'top: 0;',
-    'left: 0;',
-  '}',
   /* Added as a separate rule with multiple classes to make it more specific
      than a bootstrap rule that selects svg:root. See issue #1275 for context.
   */
-  '.blocklyWsDragSurface.blocklyOverflowVisible {',
-    'overflow: visible;',
-  '}',
+`.blocklyWsDragSurface.blocklyOverflowVisible {
+  overflow: visible;
+}`,
 
-  '.blocklyBlockDragSurface {',
-    'display: none;',
-    'position: absolute;',
-    'top: 0;',
-    'left: 0;',
-    'right: 0;',
-    'bottom: 0;',
-    'overflow: visible !important;',
-    'z-index: 50;',  /* Display below toolbox, but above everything else. */
-  '}',
+`.blocklyBlockDragSurface {
+  display: none;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  overflow: visible !important;
+  z-index: 50;',  /* Display below toolbox, but above everything else. */
+}`,
 
-  '.blocklyBlockCanvas.blocklyCanvasTransitioning,',
-  '.blocklyBubbleCanvas.blocklyCanvasTransitioning {',
-    'transition: transform .5s;',
-  '}',
+`.blocklyBlockCanvas.blocklyCanvasTransitioning,
+.blocklyBubbleCanvas.blocklyCanvasTransitioning {
+  transition: transform .5s;
+}`,
 
-  '.blocklyTooltipDiv {',
-    'background-color: #ffffc7;',
-    'border: 1px solid #ddc;',
-    'box-shadow: 4px 4px 20px 1px rgba(0,0,0,.15);',
-    'color: #000;',
-    'display: none;',
-    'font: 9pt sans-serif;',
-    'opacity: .9;',
-    'padding: 2px;',
-    'position: absolute;',
-    'z-index: 100000;',  /* big value for bootstrap3 compatibility */
-  '}',
+`.blocklyTooltipDiv {
+  background-color: #ffffc7;
+  border: 1px solid #ddc;
+  box-shadow: 4px 4px 20px 1px rgba(0,0,0,.15);
+  color: #000;
+  display: none;
+  font: 9pt sans-serif;
+  opacity: .9;
+  padding: 2px;
+  position: absolute;
+  z-index: 100000;',  /* big value for bootstrap3 compatibility */
+}`,
 
-  '.blocklyDropDownDiv {',
-    'position: absolute;',
-    'left: 0;',
-    'top: 0;',
-    'z-index: 1000;',
-    'display: none;',
-    'border: 1px solid;',
-    'border-color: #dadce0;',
-    'background-color: #fff;',
-    'border-radius: 2px;',
-    'padding: 4px;',
-    'box-shadow: 0 0 3px 1px rgba(0,0,0,.3);',
-  '}',
+`.blocklyDropDownDiv {
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 1000;
+  display: none;
+  border: 1px solid;
+  border-color: #dadce0;
+  background-color: #fff;
+  border-radius: 2px;
+  padding: 4px;
+  box-shadow: 0 0 3px 1px rgba(0,0,0,.3);
+}`,
 
-  '.blocklyDropDownDiv.blocklyFocused {',
-    'box-shadow: 0 0 6px 1px rgba(0,0,0,.3);',
-  '}',
+`.blocklyDropDownDiv.blocklyFocused {
+  box-shadow: 0 0 6px 1px rgba(0,0,0,.3);
+}`,
 
-  '.blocklyDropDownContent {',
-    'max-height: 300px;',  // @todo: spec for maximum height.
-    'overflow: auto;',
-    'overflow-x: hidden;',
-    'position: relative;',
-  '}',
+`.blocklyDropDownContent {
+  max-height: 300px;',  // @todo: spec for maximum height.
+  overflow: auto;
+  overflow-x: hidden;
+  position: relative;
+}`,
 
-  '.blocklyDropDownArrow {',
-    'position: absolute;',
-    'left: 0;',
-    'top: 0;',
-    'width: 16px;',
-    'height: 16px;',
-    'z-index: -1;',
-    'background-color: inherit;',
-    'border-color: inherit;',
-  '}',
+`.blocklyDropDownArrow {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 16px;
+  height: 16px;
+  z-index: -1;
+  background-color: inherit;
+  border-color: inherit;
+}`,
 
-  '.blocklyDropDownButton {',
-    'display: inline-block;',
-    'float: left;',
-    'padding: 0;',
-    'margin: 4px;',
-    'border-radius: 4px;',
-    'outline: none;',
-    'border: 1px solid;',
-    'transition: box-shadow .1s;',
-    'cursor: pointer;',
-  '}',
+`.blocklyDropDownButton {
+  display: inline-block;
+  float: left;
+  padding: 0;
+  margin: 4px;
+  border-radius: 4px;
+  outline: none;
+  border: 1px solid;
+  transition: box-shadow .1s;
+  cursor: pointer;
+}`,
 
-  '.blocklyArrowTop {',
-    'border-top: 1px solid;',
-    'border-left: 1px solid;',
-    'border-top-left-radius: 4px;',
-    'border-color: inherit;',
-  '}',
+`.blocklyArrowTop {
+  border-top: 1px solid;
+  border-left: 1px solid;
+  border-top-left-radius: 4px;
+  border-color: inherit;
+}`,
 
-  '.blocklyArrowBottom {',
-    'border-bottom: 1px solid;',
-    'border-right: 1px solid;',
-    'border-bottom-right-radius: 4px;',
-    'border-color: inherit;',
-  '}',
+`.blocklyArrowBottom {
+  border-bottom: 1px solid;
+  border-right: 1px solid;
+  border-bottom-right-radius: 4px;
+  border-color: inherit;
+}`,
 
-  '.blocklyResizeSE {',
-    'cursor: se-resize;',
-    'fill: #aaa;',
-  '}',
+`.blocklyResizeSE {
+  cursor: se-resize;
+  fill: #aaa;
+}`,
 
-  '.blocklyResizeSW {',
-    'cursor: sw-resize;',
-    'fill: #aaa;',
-  '}',
+`.blocklyResizeSW {
+  cursor: sw-resize;
+  fill: #aaa;
+}`,
 
-  '.blocklyResizeLine {',
-    'stroke: #515A5A;',
-    'stroke-width: 1;',
-  '}',
+`.blocklyResizeLine {
+  stroke: #515A5A;
+  stroke-width: 1;
+}`,
 
-  '.blocklyHighlightedConnectionPath {',
-    'fill: none;',
-    'stroke: #fc3;',
-    'stroke-width: 4px;',
-  '}',
+`.blocklyHighlightedConnectionPath {
+  fill: none;
+  stroke: #fc3;
+  stroke-width: 4px;
+}`,
 
-  '.blocklyPathLight {',
-    'fill: none;',
-    'stroke-linecap: round;',
-    'stroke-width: 1;',
-  '}',
+`.blocklyPathLight {
+  fill: none;
+  stroke-linecap: round;
+  stroke-width: 1;
+}`,
 
-  '.blocklySelected>.blocklyPathLight {',
-    'display: none;',
-  '}',
+`.blocklySelected>.blocklyPathLight {
+  display: none;
+}`,
 
-  '.blocklyDraggable {',
-    /* backup for browsers (e.g. IE11) that don't support grab */
-    'cursor: url("<<<PATH>>>/handopen.cur"), auto;',
-    'cursor: grab;',
-    'cursor: -webkit-grab;',
-  '}',
+`.blocklyDraggable {
+  /* backup for browsers (e.g. IE11) that don't support grab */
+  cursor: url("<<<PATH>>>/handopen.cur"), auto;
+  cursor: grab;
+  cursor: -webkit-grab;
+}`,
+
+  /* backup for browsers (e.g. IE11) that don't support grabbing */
+`.blocklyDragging {
+  /* backup for browsers (e.g. IE11) that don't support grabbing */
+  cursor: url("<<<PATH>>>/handclosed.cur"), auto;
+  cursor: grabbing;
+  cursor: -webkit-grabbing;
+}`,
 
-  '.blocklyDragging {',
-    /* backup for browsers (e.g. IE11) that don't support grabbing */
-    'cursor: url("<<<PATH>>>/handclosed.cur"), auto;',
-    'cursor: grabbing;',
-    'cursor: -webkit-grabbing;',
-  '}',
   /* Changes cursor on mouse down. Not effective in Firefox because of
-    https://bugzilla.mozilla.org/show_bug.cgi?id=771241 */
-  '.blocklyDraggable:active {',
-    /* backup for browsers (e.g. IE11) that don't support grabbing */
-    'cursor: url("<<<PATH>>>/handclosed.cur"), auto;',
-    'cursor: grabbing;',
-    'cursor: -webkit-grabbing;',
-  '}',
+     https://bugzilla.mozilla.org/show_bug.cgi?id=771241 */
+`.blocklyDraggable:active {
+  /* backup for browsers (e.g. IE11) that don't support grabbing */
+  cursor: url("<<<PATH>>>/handclosed.cur"), auto;
+  cursor: grabbing;
+  cursor: -webkit-grabbing;
+}`,
+
   /* Change the cursor on the whole drag surface in case the mouse gets
      ahead of block during a drag. This way the cursor is still a closed hand.
    */
-  '.blocklyBlockDragSurface .blocklyDraggable {',
-    /* backup for browsers (e.g. IE11) that don't support grabbing */
-    'cursor: url("<<<PATH>>>/handclosed.cur"), auto;',
-    'cursor: grabbing;',
-    'cursor: -webkit-grabbing;',
-  '}',
+`.blocklyBlockDragSurface .blocklyDraggable {
+  /* backup for browsers (e.g. IE11) that don't support grabbing */
+  cursor: url("<<<PATH>>>/handclosed.cur"), auto;
+  cursor: grabbing;
+  cursor: -webkit-grabbing;
+}`,
 
-  '.blocklyDragging.blocklyDraggingDelete {',
-    'cursor: url("<<<PATH>>>/handdelete.cur"), auto;',
-  '}',
+`.blocklyDragging.blocklyDraggingDelete {
+  cursor: url("<<<PATH>>>/handdelete.cur"), auto;
+}`,
 
-  '.blocklyDragging>.blocklyPath,',
-  '.blocklyDragging>.blocklyPathLight {',
-    'fill-opacity: .8;',
-    'stroke-opacity: .8;',
-  '}',
+`.blocklyDragging>.blocklyPath,
+.blocklyDragging>.blocklyPathLight {
+  fill-opacity: .8;
+  stroke-opacity: .8;
+}`,
 
-  '.blocklyDragging>.blocklyPathDark {',
-    'display: none;',
-  '}',
+`.blocklyDragging>.blocklyPathDark {
+  display: none;
+}`,
 
-  '.blocklyDisabled>.blocklyPath {',
-    'fill-opacity: .5;',
-    'stroke-opacity: .5;',
-  '}',
+`.blocklyDisabled>.blocklyPath {
+  fill-opacity: .5;
+  stroke-opacity: .5;
+}`,
 
-  '.blocklyDisabled>.blocklyPathLight,',
-  '.blocklyDisabled>.blocklyPathDark {',
-    'display: none;',
-  '}',
+`.blocklyDisabled>.blocklyPathLight,
+.blocklyDisabled>.blocklyPathDark {
+  display: none;
+}`,
 
-  '.blocklyInsertionMarker>.blocklyPath,',
-  '.blocklyInsertionMarker>.blocklyPathLight,',
-  '.blocklyInsertionMarker>.blocklyPathDark {',
-    'fill-opacity: .2;',
-    'stroke: none;',
-  '}',
+`.blocklyInsertionMarker>.blocklyPath,
+.blocklyInsertionMarker>.blocklyPathLight,
+.blocklyInsertionMarker>.blocklyPathDark {
+  fill-opacity: .2;
+  stroke: none;
+}`,
 
-  '.blocklyMultilineText {',
-    'font-family: monospace;',
-  '}',
+`.blocklyMultilineText {
+  font-family: monospace;
+}`,
 
-  '.blocklyNonEditableText>text {',
-    'pointer-events: none;',
-  '}',
+`.blocklyNonEditableText>text {
+  pointer-events: none;
+}`,
 
-  '.blocklyFlyout {',
-    'position: absolute;',
-    'z-index: 20;',
-  '}',
+`.blocklyFlyout {
+  position: absolute;
+  z-index: 20;
+}`,
 
-  '.blocklyText text {',
-    'cursor: default;',
-  '}',
+`.blocklyText text {
+  cursor: default;
+}`,
 
   /*
     Don't allow users to select text.  It gets annoying when trying to
     drag a block and selected text moves instead.
   */
-  '.blocklySvg text,',
-  '.blocklyBlockDragSurface text {',
-    'user-select: none;',
-    '-ms-user-select: none;',
-    '-webkit-user-select: none;',
-    'cursor: inherit;',
-  '}',
+`.blocklySvg text,
+.blocklyBlockDragSurface text {
+  user-select: none;
+  -ms-user-select: none;
+  -webkit-user-select: none;
+  cursor: inherit;
+}`,
 
-  '.blocklyHidden {',
-    'display: none;',
-  '}',
+`.blocklyHidden {
+  display: none;
+}`,
 
-  '.blocklyFieldDropdown:not(.blocklyHidden) {',
-    'display: block;',
-  '}',
+`.blocklyFieldDropdown:not(.blocklyHidden) {
+  display: block;
+}`,
 
-  '.blocklyIconGroup {',
-    'cursor: default;',
-  '}',
+`.blocklyIconGroup {
+  cursor: default;
+}`,
 
-  '.blocklyIconGroup:not(:hover),',
-  '.blocklyIconGroupReadonly {',
-    'opacity: .6;',
-  '}',
+`.blocklyIconGroup:not(:hover),
+.blocklyIconGroupReadonly {
+  opacity: .6;
+}`,
 
-  '.blocklyIconShape {',
-    'fill: #00f;',
-    'stroke: #fff;',
-    'stroke-width: 1px;',
-  '}',
+`.blocklyIconShape {
+  fill: #00f;
+  stroke: #fff;
+  stroke-width: 1px;
+}`,
 
-  '.blocklyIconSymbol {',
-    'fill: #fff;',
-  '}',
+`.blocklyIconSymbol {
+  fill: #fff;
+}`,
 
-  '.blocklyMinimalBody {',
-    'margin: 0;',
-    'padding: 0;',
-  '}',
+`.blocklyMinimalBody {
+  margin: 0;
+  padding: 0;
+}`,
 
-  '.blocklyHtmlInput {',
-    'border: none;',
-    'border-radius: 4px;',
-    'height: 100%;',
-    'margin: 0;',
-    'outline: none;',
-    'padding: 0;',
-    'width: 100%;',
-    'text-align: center;',
-    'display: block;',
-    'box-sizing: border-box;',
-  '}',
+`.blocklyHtmlInput {
+  border: none;
+  border-radius: 4px;
+  height: 100%;
+  margin: 0;
+  outline: none;
+  padding: 0;
+  width: 100%;
+  text-align: center;
+  display: block;
+  box-sizing: border-box;
+}`,
 
   /* Edge and IE introduce a close icon when the input value is longer than a
      certain length. This affects our sizing calculations of the text input.
      Hiding the close icon to avoid that. */
-  '.blocklyHtmlInput::-ms-clear {',
-    'display: none;',
-  '}',
+`.blocklyHtmlInput::-ms-clear {
+  display: none;
+}`,
 
-  '.blocklyMainBackground {',
-    'stroke-width: 1;',
-    'stroke: #c6c6c6;',  /* Equates to #ddd due to border being off-pixel. */
-  '}',
+`.blocklyMainBackground {
+  stroke-width: 1;
+  stroke: #c6c6c6;',  /* Equates to #ddd due to border being off-pixel. */
+}`,
 
-  '.blocklyMutatorBackground {',
-    'fill: #fff;',
-    'stroke: #ddd;',
-    'stroke-width: 1;',
-  '}',
+`.blocklyMutatorBackground {
+  fill: #fff;
+  stroke: #ddd;
+  stroke-width: 1;
+}`,
 
-  '.blocklyFlyoutBackground {',
-    'fill: #ddd;',
-    'fill-opacity: .8;',
-  '}',
+`.blocklyFlyoutBackground {
+  fill: #ddd;
+  fill-opacity: .8;
+}`,
 
-  '.blocklyMainWorkspaceScrollbar {',
-    'z-index: 20;',
-  '}',
+`.blocklyMainWorkspaceScrollbar {
+  z-index: 20;
+}`,
 
-  '.blocklyFlyoutScrollbar {',
-    'z-index: 30;',
-  '}',
+`.blocklyFlyoutScrollbar {
+  z-index: 30;
+}`,
 
-  '.blocklyScrollbarHorizontal,',
-  '.blocklyScrollbarVertical {',
-    'position: absolute;',
-    'outline: none;',
-  '}',
+`.blocklyScrollbarHorizontal,
+.blocklyScrollbarVertical {
+  position: absolute;
+  outline: none;
+}`,
 
-  '.blocklyScrollbarBackground {',
-    'opacity: 0;',
-  '}',
+`.blocklyScrollbarBackground {
+  opacity: 0;
+}`,
 
-  '.blocklyScrollbarHandle {',
-    'fill: #ccc;',
-  '}',
+`.blocklyScrollbarHandle {
+  fill: #ccc;
+}`,
 
-  '.blocklyScrollbarBackground:hover+.blocklyScrollbarHandle,',
-  '.blocklyScrollbarHandle:hover {',
-    'fill: #bbb;',
-  '}',
+`.blocklyScrollbarBackground:hover+.blocklyScrollbarHandle,
+.blocklyScrollbarHandle:hover {
+  fill: #bbb;
+}`,
 
   /* Darken flyout scrollbars due to being on a grey background. */
   /* By contrast, workspace scrollbars are on a white background. */
-  '.blocklyFlyout .blocklyScrollbarHandle {',
-    'fill: #bbb;',
-  '}',
+`.blocklyFlyout .blocklyScrollbarHandle {
+  fill: #bbb;
+}`,
 
-  '.blocklyFlyout .blocklyScrollbarBackground:hover+.blocklyScrollbarHandle,',
-  '.blocklyFlyout .blocklyScrollbarHandle:hover {',
-    'fill: #aaa;',
-  '}',
+`.blocklyFlyout .blocklyScrollbarBackground:hover+.blocklyScrollbarHandle,
+.blocklyFlyout .blocklyScrollbarHandle:hover {
+  fill: #aaa;
+}`,
 
-  '.blocklyInvalidInput {',
-    'background: #faa;',
-  '}',
+`.blocklyInvalidInput {
+  background: #faa;
+}`,
 
-  '.blocklyVerticalMarker {',
-    'stroke-width: 3px;',
-    'fill: rgba(255,255,255,.5);',
-    'pointer-events: none;',
-  '}',
+`.blocklyVerticalMarker {
+  stroke-width: 3px;
+  fill: rgba(255,255,255,.5);
+  pointer-events: none;
+}`,
 
-  '.blocklyComputeCanvas {',
-    'position: absolute;',
-    'width: 0;',
-    'height: 0;',
-  '}',
+`.blocklyComputeCanvas {
+  position: absolute;
+  width: 0;
+  height: 0;
+}`,
 
-  '.blocklyNoPointerEvents {',
-    'pointer-events: none;',
-  '}',
+`.blocklyNoPointerEvents {
+  pointer-events: none;
+}`,
 
-  '.blocklyContextMenu {',
-    'border-radius: 4px;',
-    'max-height: 100%;',
-  '}',
+`.blocklyContextMenu {
+  border-radius: 4px;
+  max-height: 100%;
+}`,
 
-  '.blocklyDropdownMenu {',
-    'border-radius: 2px;',
-    'padding: 0 !important;',
-  '}',
+`.blocklyDropdownMenu {
+  border-radius: 2px;
+  padding: 0 !important;
+}`,
 
-  '.blocklyDropdownMenu .blocklyMenuItem {',
-    /* 28px on the left for icon or checkbox. */
-    'padding-left: 28px;',
-  '}',
+`.blocklyDropdownMenu .blocklyMenuItem {
+  /* 28px on the left for icon or checkbox. */
+  padding-left: 28px;
+}`,
 
   /* BiDi override for the resting state. */
-  '.blocklyDropdownMenu .blocklyMenuItemRtl {',
-     /* Flip left/right padding for BiDi. */
-    'padding-left: 5px;',
-    'padding-right: 28px;',
-  '}',
+`.blocklyDropdownMenu .blocklyMenuItemRtl {
+  /* Flip left/right padding for BiDi. */
+  padding-left: 5px;
+  padding-right: 28px;
+}`,
 
-  '.blocklyWidgetDiv .blocklyMenu {',
-    'background: #fff;',
-    'border: 1px solid transparent;',
-    'box-shadow: 0 0 3px 1px rgba(0,0,0,.3);',
-    'font: normal 13px Arial, sans-serif;',
-    'margin: 0;',
-    'outline: none;',
-    'padding: 4px 0;',
-    'position: absolute;',
-    'overflow-y: auto;',
-    'overflow-x: hidden;',
-    'max-height: 100%;',
-    'z-index: 20000;',  /* Arbitrary, but some apps depend on it... */
-  '}',
+`.blocklyWidgetDiv .blocklyMenu {
+  background: #fff;
+  border: 1px solid transparent;
+  box-shadow: 0 0 3px 1px rgba(0,0,0,.3);
+  font: normal 13px Arial, sans-serif;
+  margin: 0;
+  outline: none;
+  padding: 4px 0;
+  position: absolute;
+  overflow-y: auto;
+  overflow-x: hidden;
+  max-height: 100%;
+  z-index: 20000;',  /* Arbitrary, but some apps depend on it... */
+}`,
 
-  '.blocklyWidgetDiv .blocklyMenu.blocklyFocused {',
-    'box-shadow: 0 0 6px 1px rgba(0,0,0,.3);',
-  '}',
+`.blocklyWidgetDiv .blocklyMenu.blocklyFocused {
+  box-shadow: 0 0 6px 1px rgba(0,0,0,.3);
+}`,
 
-  '.blocklyDropDownDiv .blocklyMenu {',
-    'background: inherit;',  /* Compatibility with gapi, reset from goog-menu */
-    'border: inherit;',  /* Compatibility with gapi, reset from goog-menu */
-    'font: normal 13px "Helvetica Neue", Helvetica, sans-serif;',
-    'outline: none;',
-    'position: relative;',  /* Compatibility with gapi, reset from goog-menu */
-    'z-index: 20000;',  /* Arbitrary, but some apps depend on it... */
-  '}',
+`.blocklyDropDownDiv .blocklyMenu {
+  background: inherit;',  /* Compatibility with gapi, reset from goog-menu */
+  border: inherit;',  /* Compatibility with gapi, reset from goog-menu */
+  font: normal 13px "Helvetica Neue", Helvetica, sans-serif;
+  outline: none;
+  position: relative;',  /* Compatibility with gapi, reset from goog-menu */
+  z-index: 20000;',  /* Arbitrary, but some apps depend on it... */
+}`,
 
   /* State: resting. */
-  '.blocklyMenuItem {',
-    'border: none;',
-    'color: #000;',
-    'cursor: pointer;',
-    'list-style: none;',
-    'margin: 0;',
-     /* 7em on the right for shortcut. */
-    'min-width: 7em;',
-    'padding: 6px 15px;',
-    'white-space: nowrap;',
-  '}',
+`.blocklyMenuItem {
+  border: none;
+  color: #000;
+  cursor: pointer;
+  list-style: none;
+  margin: 0;
+  /* 7em on the right for shortcut. */
+  min-width: 7em;
+  padding: 6px 15px;
+  white-space: nowrap;
+}`,
 
   /* State: disabled. */
-  '.blocklyMenuItemDisabled {',
-    'color: #ccc;',
-    'cursor: inherit;',
-  '}',
+`.blocklyMenuItemDisabled {
+  color: #ccc;
+  cursor: inherit;
+}`,
 
   /* State: hover. */
-  '.blocklyMenuItemHighlight {',
-    'background-color: rgba(0,0,0,.1);',
-  '}',
+`.blocklyMenuItemHighlight {
+  background-color: rgba(0,0,0,.1);
+}`,
 
   /* State: selected/checked. */
-  '.blocklyMenuItemCheckbox {',
-    'height: 16px;',
-    'position: absolute;',
-    'width: 16px;',
-  '}',
+`.blocklyMenuItemCheckbox {
+  height: 16px;
+  position: absolute;
+  width: 16px;
+}`,
 
-  '.blocklyMenuItemSelected .blocklyMenuItemCheckbox {',
-    'background: url(<<<PATH>>>/sprites.png) no-repeat -48px -16px;',
-    'float: left;',
-    'margin-left: -24px;',
-    'position: static;',  /* Scroll with the menu. */
-  '}',
+`.blocklyMenuItemSelected .blocklyMenuItemCheckbox {
+  background: url(<<<PATH>>>/sprites.png) no-repeat -48px -16px;
+  float: left;
+  margin-left: -24px;
+  position: static;',  /* Scroll with the menu. */
+}`,
 
-  '.blocklyMenuItemRtl .blocklyMenuItemCheckbox {',
-    'float: right;',
-    'margin-right: -24px;',
-  '}',
-  /* eslint-enable indent */
+`.blocklyMenuItemRtl .blocklyMenuItemCheckbox {
+  float: right;
+  margin-right: -24px;
+}`,
 ];

From 7c23985d30493cc1f60399ffbcce111444da3f11 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 10:04:38 -0700
Subject: [PATCH 066/833] Migrate core/css.js to goog.module

---
 core/css.js   | 27 +++++++++++++++------------
 tests/deps.js |  2 +-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/core/css.js b/core/css.js
index b63c7ed8e..02d3db4bf 100644
--- a/core/css.js
+++ b/core/css.js
@@ -14,7 +14,8 @@
  * @name Blockly.Css
  * @namespace
  */
-goog.provide('Blockly.Css');
+goog.module('Blockly.Css');
+goog.module.declareLegacyNamespace();
 
 
 /**
@@ -22,7 +23,7 @@ goog.provide('Blockly.Css');
  * @type {boolean}
  * @private
  */
-Blockly.Css.injected_ = false;
+let injected = false;
 
 /**
  * Add some CSS to the blob that will be injected later.  Allows optional
@@ -30,12 +31,12 @@ Blockly.Css.injected_ = false;
  * The provided array of CSS will be destroyed by this function.
  * @param {!Array<string>} cssArray Array of CSS strings.
  */
-Blockly.Css.register = function(cssArray) {
-  if (Blockly.Css.injected_) {
+const register = function(cssArray) {
+  if (injected) {
     throw Error('CSS already injected');
   }
-  // Concatenate cssArray onto Blockly.Css.CONTENT.
-  Array.prototype.push.apply(Blockly.Css.CONTENT, cssArray);
+  // Concatenate cssArray onto CONTENT.
+  Array.prototype.push.apply(CONTENT, cssArray);
   cssArray.length = 0;  // Garbage collect provided CSS content.
 };
 
@@ -49,14 +50,14 @@ Blockly.Css.register = function(cssArray) {
  *     (providing CSS becomes the document's responsibility).
  * @param {string} pathToMedia Path from page to the Blockly media directory.
  */
-Blockly.Css.inject = function(hasCss, pathToMedia) {
+const inject = function(hasCss, pathToMedia) {
   // Only inject the CSS once.
-  if (Blockly.Css.injected_) {
+  if (injected) {
     return;
   }
-  Blockly.Css.injected_ = true;
-  let text = Blockly.Css.CONTENT.join('\n');
-  Blockly.Css.CONTENT.length = 0;  // Garbage collect CSS content.
+  injected = true;
+  let text = CONTENT.join('\n');
+  CONTENT.length = 0;  // Garbage collect CSS content.
   if (!hasCss) {
     return;
   }
@@ -75,7 +76,7 @@ Blockly.Css.inject = function(hasCss, pathToMedia) {
 /**
  * Array making up the CSS content for Blockly.
  */
-Blockly.Css.CONTENT = [
+const CONTENT = [
 `.blocklySvg {
   background-color: #fff;
   outline: none;
@@ -552,3 +553,5 @@ Blockly.Css.CONTENT = [
   margin-right: -24px;
 }`,
 ];
+
+exports = {register, inject, CONTENT};
diff --git a/tests/deps.js b/tests/deps.js
index 5c46df3f6..a44954c4f 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -27,7 +27,7 @@ goog.addDependency('../../core/constants.js', ['Blockly.constants'], ['Blockly.c
 goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es5'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es5'});
-goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es5'});
+goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea']);
 goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockly.IDragTarget']);
 goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style']);

From 7aae731a521b91c32bc102d55d9461f18becb3dd Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 10:05:00 -0700
Subject: [PATCH 067/833] clang-format core/css.js

---
 core/css.js | 154 +++++++++++++++++++++++++++-------------------------
 1 file changed, 79 insertions(+), 75 deletions(-)

diff --git a/core/css.js b/core/css.js
index 02d3db4bf..52228b4fb 100644
--- a/core/css.js
+++ b/core/css.js
@@ -77,7 +77,7 @@ const inject = function(hasCss, pathToMedia) {
  * Array making up the CSS content for Blockly.
  */
 const CONTENT = [
-`.blocklySvg {
+  `.blocklySvg {
   background-color: #fff;
   outline: none;
   overflow: hidden;  /* IE overflows by default. */
@@ -85,26 +85,26 @@ const CONTENT = [
   display: block;
 }`,
 
-`.blocklyWidgetDiv {
+  `.blocklyWidgetDiv {
   display: none;
   position: absolute;
   z-index: 99999;  /* big value for bootstrap3 compatibility */
 }`,
 
-`.injectionDiv {
+  `.injectionDiv {
   height: 100%;
   position: relative;
   overflow: hidden;  /* So blocks in drag surface disappear at edges */
   touch-action: none;
 }`,
 
-`.blocklyNonSelectable {
+  `.blocklyNonSelectable {
   user-select: none;
   -ms-user-select: none;
   -webkit-user-select: none;
 }`,
 
-`.blocklyWsDragSurface {
+  `.blocklyWsDragSurface {
   display: none;
   position: absolute;
   top: 0;
@@ -114,11 +114,11 @@ const CONTENT = [
   /* Added as a separate rule with multiple classes to make it more specific
      than a bootstrap rule that selects svg:root. See issue #1275 for context.
   */
-`.blocklyWsDragSurface.blocklyOverflowVisible {
+  `.blocklyWsDragSurface.blocklyOverflowVisible {
   overflow: visible;
 }`,
 
-`.blocklyBlockDragSurface {
+  `.blocklyBlockDragSurface {
   display: none;
   position: absolute;
   top: 0;
@@ -129,12 +129,12 @@ const CONTENT = [
   z-index: 50;',  /* Display below toolbox, but above everything else. */
 }`,
 
-`.blocklyBlockCanvas.blocklyCanvasTransitioning,
+  `.blocklyBlockCanvas.blocklyCanvasTransitioning,
 .blocklyBubbleCanvas.blocklyCanvasTransitioning {
   transition: transform .5s;
 }`,
 
-`.blocklyTooltipDiv {
+  `.blocklyTooltipDiv {
   background-color: #ffffc7;
   border: 1px solid #ddc;
   box-shadow: 4px 4px 20px 1px rgba(0,0,0,.15);
@@ -147,7 +147,7 @@ const CONTENT = [
   z-index: 100000;',  /* big value for bootstrap3 compatibility */
 }`,
 
-`.blocklyDropDownDiv {
+  `.blocklyDropDownDiv {
   position: absolute;
   left: 0;
   top: 0;
@@ -161,18 +161,18 @@ const CONTENT = [
   box-shadow: 0 0 3px 1px rgba(0,0,0,.3);
 }`,
 
-`.blocklyDropDownDiv.blocklyFocused {
+  `.blocklyDropDownDiv.blocklyFocused {
   box-shadow: 0 0 6px 1px rgba(0,0,0,.3);
 }`,
 
-`.blocklyDropDownContent {
+  `.blocklyDropDownContent {
   max-height: 300px;',  // @todo: spec for maximum height.
   overflow: auto;
   overflow-x: hidden;
   position: relative;
 }`,
 
-`.blocklyDropDownArrow {
+  `.blocklyDropDownArrow {
   position: absolute;
   left: 0;
   top: 0;
@@ -183,7 +183,7 @@ const CONTENT = [
   border-color: inherit;
 }`,
 
-`.blocklyDropDownButton {
+  `.blocklyDropDownButton {
   display: inline-block;
   float: left;
   padding: 0;
@@ -195,52 +195,52 @@ const CONTENT = [
   cursor: pointer;
 }`,
 
-`.blocklyArrowTop {
+  `.blocklyArrowTop {
   border-top: 1px solid;
   border-left: 1px solid;
   border-top-left-radius: 4px;
   border-color: inherit;
 }`,
 
-`.blocklyArrowBottom {
+  `.blocklyArrowBottom {
   border-bottom: 1px solid;
   border-right: 1px solid;
   border-bottom-right-radius: 4px;
   border-color: inherit;
 }`,
 
-`.blocklyResizeSE {
+  `.blocklyResizeSE {
   cursor: se-resize;
   fill: #aaa;
 }`,
 
-`.blocklyResizeSW {
+  `.blocklyResizeSW {
   cursor: sw-resize;
   fill: #aaa;
 }`,
 
-`.blocklyResizeLine {
+  `.blocklyResizeLine {
   stroke: #515A5A;
   stroke-width: 1;
 }`,
 
-`.blocklyHighlightedConnectionPath {
+  `.blocklyHighlightedConnectionPath {
   fill: none;
   stroke: #fc3;
   stroke-width: 4px;
 }`,
 
-`.blocklyPathLight {
+  `.blocklyPathLight {
   fill: none;
   stroke-linecap: round;
   stroke-width: 1;
 }`,
 
-`.blocklySelected>.blocklyPathLight {
+  `.blocklySelected>.blocklyPathLight {
   display: none;
 }`,
 
-`.blocklyDraggable {
+  `.blocklyDraggable {
   /* backup for browsers (e.g. IE11) that don't support grab */
   cursor: url("<<<PATH>>>/handopen.cur"), auto;
   cursor: grab;
@@ -248,7 +248,7 @@ const CONTENT = [
 }`,
 
   /* backup for browsers (e.g. IE11) that don't support grabbing */
-`.blocklyDragging {
+  `.blocklyDragging {
   /* backup for browsers (e.g. IE11) that don't support grabbing */
   cursor: url("<<<PATH>>>/handclosed.cur"), auto;
   cursor: grabbing;
@@ -257,7 +257,7 @@ const CONTENT = [
 
   /* Changes cursor on mouse down. Not effective in Firefox because of
      https://bugzilla.mozilla.org/show_bug.cgi?id=771241 */
-`.blocklyDraggable:active {
+  `.blocklyDraggable:active {
   /* backup for browsers (e.g. IE11) that don't support grabbing */
   cursor: url("<<<PATH>>>/handclosed.cur"), auto;
   cursor: grabbing;
@@ -267,58 +267,58 @@ const CONTENT = [
   /* Change the cursor on the whole drag surface in case the mouse gets
      ahead of block during a drag. This way the cursor is still a closed hand.
    */
-`.blocklyBlockDragSurface .blocklyDraggable {
+  `.blocklyBlockDragSurface .blocklyDraggable {
   /* backup for browsers (e.g. IE11) that don't support grabbing */
   cursor: url("<<<PATH>>>/handclosed.cur"), auto;
   cursor: grabbing;
   cursor: -webkit-grabbing;
 }`,
 
-`.blocklyDragging.blocklyDraggingDelete {
+  `.blocklyDragging.blocklyDraggingDelete {
   cursor: url("<<<PATH>>>/handdelete.cur"), auto;
 }`,
 
-`.blocklyDragging>.blocklyPath,
+  `.blocklyDragging>.blocklyPath,
 .blocklyDragging>.blocklyPathLight {
   fill-opacity: .8;
   stroke-opacity: .8;
 }`,
 
-`.blocklyDragging>.blocklyPathDark {
+  `.blocklyDragging>.blocklyPathDark {
   display: none;
 }`,
 
-`.blocklyDisabled>.blocklyPath {
+  `.blocklyDisabled>.blocklyPath {
   fill-opacity: .5;
   stroke-opacity: .5;
 }`,
 
-`.blocklyDisabled>.blocklyPathLight,
+  `.blocklyDisabled>.blocklyPathLight,
 .blocklyDisabled>.blocklyPathDark {
   display: none;
 }`,
 
-`.blocklyInsertionMarker>.blocklyPath,
+  `.blocklyInsertionMarker>.blocklyPath,
 .blocklyInsertionMarker>.blocklyPathLight,
 .blocklyInsertionMarker>.blocklyPathDark {
   fill-opacity: .2;
   stroke: none;
 }`,
 
-`.blocklyMultilineText {
+  `.blocklyMultilineText {
   font-family: monospace;
 }`,
 
-`.blocklyNonEditableText>text {
+  `.blocklyNonEditableText>text {
   pointer-events: none;
 }`,
 
-`.blocklyFlyout {
+  `.blocklyFlyout {
   position: absolute;
   z-index: 20;
 }`,
 
-`.blocklyText text {
+  `.blocklyText text {
   cursor: default;
 }`,
 
@@ -326,7 +326,7 @@ const CONTENT = [
     Don't allow users to select text.  It gets annoying when trying to
     drag a block and selected text moves instead.
   */
-`.blocklySvg text,
+  `.blocklySvg text,
 .blocklyBlockDragSurface text {
   user-select: none;
   -ms-user-select: none;
@@ -334,39 +334,39 @@ const CONTENT = [
   cursor: inherit;
 }`,
 
-`.blocklyHidden {
+  `.blocklyHidden {
   display: none;
 }`,
 
-`.blocklyFieldDropdown:not(.blocklyHidden) {
+  `.blocklyFieldDropdown:not(.blocklyHidden) {
   display: block;
 }`,
 
-`.blocklyIconGroup {
+  `.blocklyIconGroup {
   cursor: default;
 }`,
 
-`.blocklyIconGroup:not(:hover),
+  `.blocklyIconGroup:not(:hover),
 .blocklyIconGroupReadonly {
   opacity: .6;
 }`,
 
-`.blocklyIconShape {
+  `.blocklyIconShape {
   fill: #00f;
   stroke: #fff;
   stroke-width: 1px;
 }`,
 
-`.blocklyIconSymbol {
+  `.blocklyIconSymbol {
   fill: #fff;
 }`,
 
-`.blocklyMinimalBody {
+  `.blocklyMinimalBody {
   margin: 0;
   padding: 0;
 }`,
 
-`.blocklyHtmlInput {
+  `.blocklyHtmlInput {
   border: none;
   border-radius: 4px;
   height: 100%;
@@ -382,107 +382,107 @@ const CONTENT = [
   /* Edge and IE introduce a close icon when the input value is longer than a
      certain length. This affects our sizing calculations of the text input.
      Hiding the close icon to avoid that. */
-`.blocklyHtmlInput::-ms-clear {
+  `.blocklyHtmlInput::-ms-clear {
   display: none;
 }`,
 
-`.blocklyMainBackground {
+  `.blocklyMainBackground {
   stroke-width: 1;
   stroke: #c6c6c6;',  /* Equates to #ddd due to border being off-pixel. */
 }`,
 
-`.blocklyMutatorBackground {
+  `.blocklyMutatorBackground {
   fill: #fff;
   stroke: #ddd;
   stroke-width: 1;
 }`,
 
-`.blocklyFlyoutBackground {
+  `.blocklyFlyoutBackground {
   fill: #ddd;
   fill-opacity: .8;
 }`,
 
-`.blocklyMainWorkspaceScrollbar {
+  `.blocklyMainWorkspaceScrollbar {
   z-index: 20;
 }`,
 
-`.blocklyFlyoutScrollbar {
+  `.blocklyFlyoutScrollbar {
   z-index: 30;
 }`,
 
-`.blocklyScrollbarHorizontal,
+  `.blocklyScrollbarHorizontal,
 .blocklyScrollbarVertical {
   position: absolute;
   outline: none;
 }`,
 
-`.blocklyScrollbarBackground {
+  `.blocklyScrollbarBackground {
   opacity: 0;
 }`,
 
-`.blocklyScrollbarHandle {
+  `.blocklyScrollbarHandle {
   fill: #ccc;
 }`,
 
-`.blocklyScrollbarBackground:hover+.blocklyScrollbarHandle,
+  `.blocklyScrollbarBackground:hover+.blocklyScrollbarHandle,
 .blocklyScrollbarHandle:hover {
   fill: #bbb;
 }`,
 
   /* Darken flyout scrollbars due to being on a grey background. */
   /* By contrast, workspace scrollbars are on a white background. */
-`.blocklyFlyout .blocklyScrollbarHandle {
+  `.blocklyFlyout .blocklyScrollbarHandle {
   fill: #bbb;
 }`,
 
-`.blocklyFlyout .blocklyScrollbarBackground:hover+.blocklyScrollbarHandle,
+  `.blocklyFlyout .blocklyScrollbarBackground:hover+.blocklyScrollbarHandle,
 .blocklyFlyout .blocklyScrollbarHandle:hover {
   fill: #aaa;
 }`,
 
-`.blocklyInvalidInput {
+  `.blocklyInvalidInput {
   background: #faa;
 }`,
 
-`.blocklyVerticalMarker {
+  `.blocklyVerticalMarker {
   stroke-width: 3px;
   fill: rgba(255,255,255,.5);
   pointer-events: none;
 }`,
 
-`.blocklyComputeCanvas {
+  `.blocklyComputeCanvas {
   position: absolute;
   width: 0;
   height: 0;
 }`,
 
-`.blocklyNoPointerEvents {
+  `.blocklyNoPointerEvents {
   pointer-events: none;
 }`,
 
-`.blocklyContextMenu {
+  `.blocklyContextMenu {
   border-radius: 4px;
   max-height: 100%;
 }`,
 
-`.blocklyDropdownMenu {
+  `.blocklyDropdownMenu {
   border-radius: 2px;
   padding: 0 !important;
 }`,
 
-`.blocklyDropdownMenu .blocklyMenuItem {
+  `.blocklyDropdownMenu .blocklyMenuItem {
   /* 28px on the left for icon or checkbox. */
   padding-left: 28px;
 }`,
 
   /* BiDi override for the resting state. */
-`.blocklyDropdownMenu .blocklyMenuItemRtl {
+  `.blocklyDropdownMenu .blocklyMenuItemRtl {
   /* Flip left/right padding for BiDi. */
   padding-left: 5px;
   padding-right: 28px;
 }`,
 
-`.blocklyWidgetDiv .blocklyMenu {
+  `.blocklyWidgetDiv .blocklyMenu {
   background: #fff;
   border: 1px solid transparent;
   box-shadow: 0 0 3px 1px rgba(0,0,0,.3);
@@ -497,11 +497,11 @@ const CONTENT = [
   z-index: 20000;',  /* Arbitrary, but some apps depend on it... */
 }`,
 
-`.blocklyWidgetDiv .blocklyMenu.blocklyFocused {
+  `.blocklyWidgetDiv .blocklyMenu.blocklyFocused {
   box-shadow: 0 0 6px 1px rgba(0,0,0,.3);
 }`,
 
-`.blocklyDropDownDiv .blocklyMenu {
+  `.blocklyDropDownDiv .blocklyMenu {
   background: inherit;',  /* Compatibility with gapi, reset from goog-menu */
   border: inherit;',  /* Compatibility with gapi, reset from goog-menu */
   font: normal 13px "Helvetica Neue", Helvetica, sans-serif;
@@ -511,7 +511,7 @@ const CONTENT = [
 }`,
 
   /* State: resting. */
-`.blocklyMenuItem {
+  `.blocklyMenuItem {
   border: none;
   color: #000;
   cursor: pointer;
@@ -524,34 +524,38 @@ const CONTENT = [
 }`,
 
   /* State: disabled. */
-`.blocklyMenuItemDisabled {
+  `.blocklyMenuItemDisabled {
   color: #ccc;
   cursor: inherit;
 }`,
 
   /* State: hover. */
-`.blocklyMenuItemHighlight {
+  `.blocklyMenuItemHighlight {
   background-color: rgba(0,0,0,.1);
 }`,
 
   /* State: selected/checked. */
-`.blocklyMenuItemCheckbox {
+  `.blocklyMenuItemCheckbox {
   height: 16px;
   position: absolute;
   width: 16px;
 }`,
 
-`.blocklyMenuItemSelected .blocklyMenuItemCheckbox {
+  `.blocklyMenuItemSelected .blocklyMenuItemCheckbox {
   background: url(<<<PATH>>>/sprites.png) no-repeat -48px -16px;
   float: left;
   margin-left: -24px;
   position: static;',  /* Scroll with the menu. */
 }`,
 
-`.blocklyMenuItemRtl .blocklyMenuItemCheckbox {
+  `.blocklyMenuItemRtl .blocklyMenuItemCheckbox {
   float: right;
   margin-right: -24px;
 }`,
 ];
 
-exports = {register, inject, CONTENT};
+exports = {
+  register,
+  inject,
+  CONTENT
+};

From f80764e1537232c0903d7ba0b7694f2219fde92c Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 16 Jul 2021 10:51:14 -0700
Subject: [PATCH 068/833] Migrate core/renderers/common/drawer.js to named
 requires

---
 core/renderers/common/drawer.js | 130 +++++++++++++++-----------------
 1 file changed, 60 insertions(+), 70 deletions(-)

diff --git a/core/renderers/common/drawer.js b/core/renderers/common/drawer.js
index 4eca204a3..30018aae1 100644
--- a/core/renderers/common/drawer.js
+++ b/core/renderers/common/drawer.js
@@ -13,22 +13,22 @@
 goog.module('Blockly.blockRendering.Drawer');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.RenderInfo');
-goog.require('Blockly.blockRendering.Row');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.svgPaths');
+const RenderInfo = goog.require('Blockly.blockRendering.RenderInfo');
+const Row = goog.require('Blockly.blockRendering.Row');
+const Types = goog.require('Blockly.blockRendering.Types');
+const svgPaths = goog.require('Blockly.utils.svgPaths');
 
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.blockRendering.Field');
-goog.requireType('Blockly.blockRendering.Icon');
-goog.requireType('Blockly.blockRendering.InlineInput');
-goog.requireType('Blockly.BlockSvg');
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const Field = goog.requireType('Blockly.blockRendering.Field');
+const Icon = goog.requireType('Blockly.blockRendering.Icon');
+const InlineInput = goog.requireType('Blockly.blockRendering.InlineInput');
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
 
 
 /**
  * An object that draws a block based on the given rendering information.
- * @param {!Blockly.BlockSvg} block The block to render.
- * @param {!Blockly.blockRendering.RenderInfo} info An object containing all
+ * @param {!BlockSvg} block The block to render.
+ * @param {!RenderInfo} info An object containing all
  *   information needed to render this block.
  * @package
  * @constructor
@@ -42,7 +42,7 @@ const Drawer = function(block, info) {
 
   /**
    * The renderer's constant provider.
-   * @type {!Blockly.blockRendering.ConstantProvider}
+   * @type {!ConstantProvider}
    * @protected
    */
   this.constants_ = info.getRenderer().getConstants();
@@ -129,42 +129,41 @@ Drawer.prototype.drawTop_ = function() {
   const elements = topRow.elements;
 
   this.positionPreviousConnection_();
-  this.outlinePath_ +=
-      Blockly.utils.svgPaths.moveBy(topRow.xPos, this.info_.startY);
+  this.outlinePath_ += svgPaths.moveBy(topRow.xPos, this.info_.startY);
   for (let i = 0, elem; (elem = elements[i]); i++) {
-    if (Blockly.blockRendering.Types.isLeftRoundedCorner(elem)) {
+    if (Types.isLeftRoundedCorner(elem)) {
       this.outlinePath_ +=
           this.constants_.OUTSIDE_CORNERS.topLeft;
-    } else if (Blockly.blockRendering.Types.isRightRoundedCorner(elem)) {
+    } else if (Types.isRightRoundedCorner(elem)) {
       this.outlinePath_ +=
           this.constants_.OUTSIDE_CORNERS.topRight;
-    } else if (Blockly.blockRendering.Types.isPreviousConnection(elem)) {
+    } else if (Types.isPreviousConnection(elem)) {
       this.outlinePath_ += elem.shape.pathLeft;
-    } else if (Blockly.blockRendering.Types.isHat(elem)) {
+    } else if (Types.isHat(elem)) {
       this.outlinePath_ += this.constants_.START_HAT.path;
-    } else if (Blockly.blockRendering.Types.isSpacer(elem)) {
-      this.outlinePath_ += Blockly.utils.svgPaths.lineOnAxis('h', elem.width);
+    } else if (Types.isSpacer(elem)) {
+      this.outlinePath_ += svgPaths.lineOnAxis('h', elem.width);
     }
     // No branch for a square corner, because it's a no-op.
   }
-  this.outlinePath_ += Blockly.utils.svgPaths.lineOnAxis('v', topRow.height);
+  this.outlinePath_ += svgPaths.lineOnAxis('v', topRow.height);
 };
 
 /**
  * Add steps for the jagged edge of a row on a collapsed block.
- * @param {!Blockly.blockRendering.Row} row The row to draw the side of.
+ * @param {!Row} row The row to draw the side of.
  * @protected
  */
 Drawer.prototype.drawJaggedEdge_ = function(row) {
   const remainder = row.height - this.constants_.JAGGED_TEETH.height;
-  this.outlinePath_ += this.constants_.JAGGED_TEETH.path +
-      Blockly.utils.svgPaths.lineOnAxis('v', remainder);
+  this.outlinePath_ +=
+      this.constants_.JAGGED_TEETH.path + svgPaths.lineOnAxis('v', remainder);
 };
 
 /**
  * Add steps for an external value input, rendered as a notch in the side
  * of the block.
- * @param {!Blockly.blockRendering.Row} row The row that this input
+ * @param {!Row} row The row that this input
  *     belongs to.
  * @protected
  */
@@ -176,16 +175,14 @@ Drawer.prototype.drawValueInput_ = function(row) {
       input.shape.pathDown(input.height) :
       input.shape.pathDown;
 
-  this.outlinePath_ +=
-      Blockly.utils.svgPaths.lineOnAxis('H', input.xPos + input.width) +
-      pathDown +
-      Blockly.utils.svgPaths.lineOnAxis('v', row.height - input.connectionHeight);
+  this.outlinePath_ += svgPaths.lineOnAxis('H', input.xPos + input.width) +
+      pathDown + svgPaths.lineOnAxis('v', row.height - input.connectionHeight);
 };
 
 
 /**
  * Add steps for a statement input.
- * @param {!Blockly.blockRendering.Row} row The row that this input
+ * @param {!Row} row The row that this input
  *     belongs to.
  * @protected
  */
@@ -195,17 +192,16 @@ Drawer.prototype.drawStatementInput_ = function(row) {
   const x = input.xPos + input.notchOffset + input.shape.width;
 
   const innerTopLeftCorner = input.shape.pathRight +
-      Blockly.utils.svgPaths.lineOnAxis(
+      svgPaths.lineOnAxis(
           'h', -(input.notchOffset - this.constants_.INSIDE_CORNERS.width)) +
       this.constants_.INSIDE_CORNERS.pathTop;
 
   const innerHeight = row.height - (2 * this.constants_.INSIDE_CORNERS.height);
 
-  this.outlinePath_ += Blockly.utils.svgPaths.lineOnAxis('H', x) +
-      innerTopLeftCorner +
-      Blockly.utils.svgPaths.lineOnAxis('v', innerHeight) +
+  this.outlinePath_ += svgPaths.lineOnAxis('H', x) + innerTopLeftCorner +
+      svgPaths.lineOnAxis('v', innerHeight) +
       this.constants_.INSIDE_CORNERS.pathBottom +
-      Blockly.utils.svgPaths.lineOnAxis('H', row.xPos + row.width);
+      svgPaths.lineOnAxis('H', row.xPos + row.width);
 
   this.positionStatementInputConnection_(row);
 };
@@ -213,13 +209,12 @@ Drawer.prototype.drawStatementInput_ = function(row) {
 /**
  * Add steps for the right side of a row that does not have value or
  * statement input connections.
- * @param {!Blockly.blockRendering.Row} row The row to draw the
+ * @param {!Row} row The row to draw the
  *     side of.
  * @protected
  */
 Drawer.prototype.drawRightSideRow_ = function(row) {
-  this.outlinePath_ +=
-      Blockly.utils.svgPaths.lineOnAxis('V', row.yPos + row.height);
+  this.outlinePath_ += svgPaths.lineOnAxis('V', row.yPos + row.height);
 };
 
 
@@ -236,22 +231,22 @@ Drawer.prototype.drawBottom_ = function() {
   let rightCornerYOffset = 0;
   let outlinePath = '';
   for (let i = elems.length - 1, elem; (elem = elems[i]); i--) {
-    if (Blockly.blockRendering.Types.isNextConnection(elem)) {
+    if (Types.isNextConnection(elem)) {
       outlinePath += elem.shape.pathRight;
-    } else if (Blockly.blockRendering.Types.isLeftSquareCorner(elem)) {
-      outlinePath += Blockly.utils.svgPaths.lineOnAxis('H', bottomRow.xPos);
-    } else if (Blockly.blockRendering.Types.isLeftRoundedCorner(elem)) {
+    } else if (Types.isLeftSquareCorner(elem)) {
+      outlinePath += svgPaths.lineOnAxis('H', bottomRow.xPos);
+    } else if (Types.isLeftRoundedCorner(elem)) {
       outlinePath += this.constants_.OUTSIDE_CORNERS.bottomLeft;
-    } else if (Blockly.blockRendering.Types.isRightRoundedCorner(elem)) {
+    } else if (Types.isRightRoundedCorner(elem)) {
       outlinePath += this.constants_.OUTSIDE_CORNERS.bottomRight;
       rightCornerYOffset = this.constants_.OUTSIDE_CORNERS.rightHeight;
-    } else if (Blockly.blockRendering.Types.isSpacer(elem)) {
-      outlinePath += Blockly.utils.svgPaths.lineOnAxis('h', elem.width * -1);
+    } else if (Types.isSpacer(elem)) {
+      outlinePath += svgPaths.lineOnAxis('h', elem.width * -1);
     }
   }
 
-  this.outlinePath_ += Blockly.utils.svgPaths.lineOnAxis('V',
-      bottomRow.baseline - rightCornerYOffset);
+  this.outlinePath_ +=
+      svgPaths.lineOnAxis('V', bottomRow.baseline - rightCornerYOffset);
   this.outlinePath_ += outlinePath;
 };
 
@@ -272,9 +267,7 @@ Drawer.prototype.drawLeft_ = function() {
         outputConnection.shape.pathUp;
 
     // Draw a line up to the bottom of the tab.
-    this.outlinePath_ +=
-        Blockly.utils.svgPaths.lineOnAxis('V', tabBottom) +
-        pathUp;
+    this.outlinePath_ += svgPaths.lineOnAxis('V', tabBottom) + pathUp;
   }
   // Close off the path.  This draws a vertical line up to the start of the
   // block's path, which may be either a rounded or a sharp corner.
@@ -289,13 +282,12 @@ Drawer.prototype.drawLeft_ = function() {
 Drawer.prototype.drawInternals_ = function() {
   for (let i = 0, row; (row = this.info_.rows[i]); i++) {
     for (let j = 0, elem; (elem = row.elements[j]); j++) {
-      if (Blockly.blockRendering.Types.isInlineInput(elem)) {
+      if (Types.isInlineInput(elem)) {
         this.drawInlineInput_(
-            /** @type {!Blockly.blockRendering.InlineInput} */ (elem));
-      } else if (Blockly.blockRendering.Types.isIcon(elem) ||
-          Blockly.blockRendering.Types.isField(elem)) {
+            /** @type {!InlineInput} */ (elem));
+      } else if (Types.isIcon(elem) || Types.isField(elem)) {
         this.layoutField_(
-            /** @type {!Blockly.blockRendering.Field|!Blockly.blockRendering.Icon} */
+            /** @type {!Field|!Icon} */
             (elem));
       }
     }
@@ -304,15 +296,15 @@ Drawer.prototype.drawInternals_ = function() {
 
 /**
  * Push a field or icon's new position to its SVG root.
- * @param {!Blockly.blockRendering.Icon|!Blockly.blockRendering.Field} fieldInfo
+ * @param {!Icon|!Field} fieldInfo
  *     The rendering information for the field or icon.
  * @protected
  */
 Drawer.prototype.layoutField_ = function(fieldInfo) {
   let svgGroup;
-  if (Blockly.blockRendering.Types.isField(fieldInfo)) {
+  if (Types.isField(fieldInfo)) {
     svgGroup = fieldInfo.field.getSvgRoot();
-  } else if (Blockly.blockRendering.Types.isIcon(fieldInfo)) {
+  } else if (Types.isIcon(fieldInfo)) {
     svgGroup = fieldInfo.icon.iconGroup_;
   }
 
@@ -326,7 +318,7 @@ Drawer.prototype.layoutField_ = function(fieldInfo) {
       scale = 'scale(-1 1)';
     }
   }
-  if (Blockly.blockRendering.Types.isIcon(fieldInfo)) {
+  if (Types.isIcon(fieldInfo)) {
     svgGroup.setAttribute('display', 'block');
     svgGroup.setAttribute('transform', 'translate(' + xPos + ',' + yPos + ')');
     fieldInfo.icon.computeIconLocation();
@@ -344,7 +336,7 @@ Drawer.prototype.layoutField_ = function(fieldInfo) {
 
 /**
  * Add steps for an inline input.
- * @param {!Blockly.blockRendering.InlineInput} input The information about the
+ * @param {!InlineInput} input The information about the
  * input to render.
  * @protected
  */
@@ -357,13 +349,11 @@ Drawer.prototype.drawInlineInput_ = function(input) {
   const connectionBottom = input.connectionHeight + connectionTop;
   const connectionRight = input.xPos + input.connectionWidth;
 
-  this.inlinePath_ += Blockly.utils.svgPaths.moveTo(connectionRight, yPos) +
-      Blockly.utils.svgPaths.lineOnAxis('v', connectionTop) +
-      input.shape.pathDown +
-      Blockly.utils.svgPaths.lineOnAxis('v', height - connectionBottom) +
-      Blockly.utils.svgPaths.lineOnAxis('h', width - input.connectionWidth) +
-      Blockly.utils.svgPaths.lineOnAxis('v', -height) +
-      'z';
+  this.inlinePath_ += svgPaths.moveTo(connectionRight, yPos) +
+      svgPaths.lineOnAxis('v', connectionTop) + input.shape.pathDown +
+      svgPaths.lineOnAxis('v', height - connectionBottom) +
+      svgPaths.lineOnAxis('h', width - input.connectionWidth) +
+      svgPaths.lineOnAxis('v', -height) + 'z';
 
   this.positionInlineInputConnection_(input);
 };
@@ -372,7 +362,7 @@ Drawer.prototype.drawInlineInput_ = function(input) {
  * Position the connection on an inline value input, taking into account
  * RTL and the small gap between the parent block and child block which lets the
  * parent block's dark path show through.
- * @param {Blockly.blockRendering.InlineInput} input The information about
+ * @param {InlineInput} input The information about
  * the input that the connection is on.
  * @protected
  */
@@ -394,7 +384,7 @@ Drawer.prototype.positionInlineInputConnection_ = function(input) {
  * Position the connection on a statement input, taking into account
  * RTL and the small gap between the parent block and child block which lets the
  * parent block's dark path show through.
- * @param {!Blockly.blockRendering.Row} row The row that the connection is on.
+ * @param {!Row} row The row that the connection is on.
  * @protected
  */
 Drawer.prototype.positionStatementInputConnection_ = function(row) {
@@ -412,7 +402,7 @@ Drawer.prototype.positionStatementInputConnection_ = function(row) {
  * Position the connection on an external value input, taking into account
  * RTL and the small gap between the parent block and child block which lets the
  * parent block's dark path show through.
- * @param {!Blockly.blockRendering.Row} row The row that the connection is on.
+ * @param {!Row} row The row that the connection is on.
  * @protected
  */
 Drawer.prototype.positionExternalValueConnection_ = function(row) {

From 7e74017342561048ece8520c9a1f0d316e69eb5d Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 15 Jul 2021 16:12:10 -0700
Subject: [PATCH 069/833] Migrate core/connection_types.js to goog.module

---
 core/connection_types.js | 7 +++++--
 tests/deps.js            | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/connection_types.js b/core/connection_types.js
index b2116812b..569ffc442 100644
--- a/core/connection_types.js
+++ b/core/connection_types.js
@@ -11,13 +11,14 @@
 
 'use strict';
 
-goog.provide('Blockly.connectionTypes');
+goog.module('Blockly.connectionTypes');
+goog.module.declareLegacyNamespace();
 
 /**
  * Enum for the type of a connection or input.
  * @enum {number}
  */
-Blockly.connectionTypes = {
+const connectionTypes = {
   // A right-facing value input.  E.g. 'set item to' or 'return'.
   INPUT_VALUE: 1,
   // A left-facing value output.  E.g. 'random fraction'.
@@ -27,3 +28,5 @@ Blockly.connectionTypes = {
   // An up-facing block stack.  E.g. 'break out of loop'.
   PREVIOUS_STATEMENT: 4
 };
+
+exports = connectionTypes;
diff --git a/tests/deps.js b/tests/deps.js
index a44954c4f..2e7e55bf8 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -22,7 +22,7 @@ goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager
 goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation']);
 goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.registry']);
 goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.RenderedConnection', 'Blockly.connectionTypes', 'Blockly.constants']);
-goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], []);
+goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], ['Blockly.connectionTypes']);
 goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es5'});

From d2142a2e9ff17dd8f530e1fa8d97fbb967abc9f7 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 16 Jul 2021 11:00:50 -0700
Subject: [PATCH 070/833] Clang-format core/renderers/common/drawer.js and
 remove unused require

---
 core/renderers/common/drawer.js | 25 ++++++++++---------------
 tests/deps.js                   |  2 +-
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/core/renderers/common/drawer.js b/core/renderers/common/drawer.js
index 30018aae1..a0181bf8f 100644
--- a/core/renderers/common/drawer.js
+++ b/core/renderers/common/drawer.js
@@ -13,7 +13,6 @@
 goog.module('Blockly.blockRendering.Drawer');
 goog.module.declareLegacyNamespace();
 
-const RenderInfo = goog.require('Blockly.blockRendering.RenderInfo');
 const Row = goog.require('Blockly.blockRendering.Row');
 const Types = goog.require('Blockly.blockRendering.Types');
 const svgPaths = goog.require('Blockly.utils.svgPaths');
@@ -22,6 +21,7 @@ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvid
 const Field = goog.requireType('Blockly.blockRendering.Field');
 const Icon = goog.requireType('Blockly.blockRendering.Icon');
 const InlineInput = goog.requireType('Blockly.blockRendering.InlineInput');
+const RenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
 
 
@@ -132,11 +132,9 @@ Drawer.prototype.drawTop_ = function() {
   this.outlinePath_ += svgPaths.moveBy(topRow.xPos, this.info_.startY);
   for (let i = 0, elem; (elem = elements[i]); i++) {
     if (Types.isLeftRoundedCorner(elem)) {
-      this.outlinePath_ +=
-          this.constants_.OUTSIDE_CORNERS.topLeft;
+      this.outlinePath_ += this.constants_.OUTSIDE_CORNERS.topLeft;
     } else if (Types.isRightRoundedCorner(elem)) {
-      this.outlinePath_ +=
-          this.constants_.OUTSIDE_CORNERS.topRight;
+      this.outlinePath_ += this.constants_.OUTSIDE_CORNERS.topRight;
     } else if (Types.isPreviousConnection(elem)) {
       this.outlinePath_ += elem.shape.pathLeft;
     } else if (Types.isHat(elem)) {
@@ -163,8 +161,7 @@ Drawer.prototype.drawJaggedEdge_ = function(row) {
 /**
  * Add steps for an external value input, rendered as a notch in the side
  * of the block.
- * @param {!Row} row The row that this input
- *     belongs to.
+ * @param {!Row} row The row that this input belongs to.
  * @protected
  */
 Drawer.prototype.drawValueInput_ = function(row) {
@@ -182,8 +179,7 @@ Drawer.prototype.drawValueInput_ = function(row) {
 
 /**
  * Add steps for a statement input.
- * @param {!Row} row The row that this input
- *     belongs to.
+ * @param {!Row} row The row that this input belongs to.
  * @protected
  */
 Drawer.prototype.drawStatementInput_ = function(row) {
@@ -209,8 +205,7 @@ Drawer.prototype.drawStatementInput_ = function(row) {
 /**
  * Add steps for the right side of a row that does not have value or
  * statement input connections.
- * @param {!Row} row The row to draw the
- *     side of.
+ * @param {!Row} row The row to draw the side of.
  * @protected
  */
 Drawer.prototype.drawRightSideRow_ = function(row) {
@@ -375,8 +370,8 @@ Drawer.prototype.positionInlineInputConnection_ = function(input) {
     if (this.info_.RTL) {
       connX *= -1;
     }
-    input.connectionModel.setOffsetInBlock(connX,
-        yPos + input.connectionOffsetY);
+    input.connectionModel.setOffsetInBlock(
+        connX, yPos + input.connectionOffsetY);
   }
 };
 
@@ -452,8 +447,8 @@ Drawer.prototype.positionOutputConnection_ = function() {
   if (this.info_.outputConnection) {
     const x = this.info_.startX + this.info_.outputConnection.connectionOffsetX;
     const connX = this.info_.RTL ? -x : x;
-    this.block_.outputConnection.setOffsetInBlock(connX,
-        this.info_.outputConnection.connectionOffsetY);
+    this.block_.outputConnection.setOffsetInBlock(
+        connX, this.info_.outputConnection.connectionOffsetY);
   }
 };
 
diff --git a/tests/deps.js b/tests/deps.js
index 7cade6c4e..b0183d469 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -116,7 +116,7 @@ goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnec
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry']);
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
-goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], []);
 goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes']);
 goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Svg', 'Blockly.utils.dom']);

From 8f5da9c41d6cedf9c334406e565b960218fb1605 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 10:55:04 -0700
Subject: [PATCH 071/833] Migrate core/component_manager.js to ES6 const/let

---
 core/component_manager.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/component_manager.js b/core/component_manager.js
index d8b215504..5d50dcf91 100644
--- a/core/component_manager.js
+++ b/core/component_manager.js
@@ -62,16 +62,16 @@ Blockly.ComponentManager.ComponentDatum;
 Blockly.ComponentManager.prototype.addComponent = function(
     componentInfo, opt_allowOverrides) {
   // Don't throw an error if opt_allowOverrides is true.
-  var id = componentInfo.component.id;
+  const id = componentInfo.component.id;
   if (!opt_allowOverrides && this.componentData_[id]) {
     throw Error(
         'Plugin "' + id + '" with capabilities "' +
         this.componentData_[id].capabilities + '" already added.');
   }
   this.componentData_[id] = componentInfo;
-  var stringCapabilities = [];
-  for (var i = 0; i < componentInfo.capabilities.length; i++) {
-    var capability = String(componentInfo.capabilities[i]).toLowerCase();
+  const stringCapabilities = [];
+  for (let i = 0; i < componentInfo.capabilities.length; i++) {
+    const capability = String(componentInfo.capabilities[i]).toLowerCase();
     stringCapabilities.push(capability);
     if (this.capabilityToComponentIds_[capability] === undefined) {
       this.capabilityToComponentIds_[capability] = [id];
@@ -87,12 +87,12 @@ Blockly.ComponentManager.prototype.addComponent = function(
  * @param {string} id The ID of the component to remove.
  */
 Blockly.ComponentManager.prototype.removeComponent = function(id) {
-  var componentInfo = this.componentData_[id];
+  const componentInfo = this.componentData_[id];
   if (!componentInfo) {
     return;
   }
-  for (var i = 0; i < componentInfo.capabilities.length; i++) {
-    var capability = String(componentInfo.capabilities[i]).toLowerCase();
+  for (let i = 0; i < componentInfo.capabilities.length; i++) {
+    const capability = String(componentInfo.capabilities[i]).toLowerCase();
     this.capabilityToComponentIds_[capability].splice(
         this.capabilityToComponentIds_[capability].indexOf(id), 1);
   }
@@ -178,14 +178,14 @@ Blockly.ComponentManager.prototype.getComponent = function(id) {
  */
 Blockly.ComponentManager.prototype.getComponents = function(capability, sorted) {
   capability = String(capability).toLowerCase();
-  var componentIds = this.capabilityToComponentIds_[capability];
+  const componentIds = this.capabilityToComponentIds_[capability];
   if (!componentIds) {
     return [];
   }
-  var components = [];
+  const components = [];
   if (sorted) {
-    var componentDataList = [];
-    var componentData = this.componentData_;
+    const componentDataList = [];
+    const componentData = this.componentData_;
     componentIds.forEach(function(id) {
       componentDataList.push(componentData[id]);
     });
@@ -196,7 +196,7 @@ Blockly.ComponentManager.prototype.getComponents = function(capability, sorted)
       components.push(ComponentDatum.component);
     });
   } else {
-    var componentData = this.componentData_;
+    const componentData = this.componentData_;
     componentIds.forEach(function(id) {
       components.push(componentData[id].component);
     });

From 85b8ffce8ba56d04992850a68c8f8744d7adffec Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 11:06:05 -0700
Subject: [PATCH 072/833] Migrate core/component_manager.js to goog.module

---
 core/component_manager.js | 65 ++++++++++++++++++++-------------------
 tests/deps.js             |  2 +-
 2 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/core/component_manager.js b/core/component_manager.js
index 5d50dcf91..fbf66d544 100644
--- a/core/component_manager.js
+++ b/core/component_manager.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-goog.provide('Blockly.ComponentManager');
+goog.module('Blockly.ComponentManager');
+goog.module.declareLegacyNamespace();
 
 goog.requireType('Blockly.IAutoHideable');
 goog.requireType('Blockly.IComponent');
@@ -24,10 +25,10 @@ goog.requireType('Blockly.IPositionable');
  * Manager for all items registered with the workspace.
  * @constructor
  */
-Blockly.ComponentManager = function() {
+const ComponentManager = function() {
   /**
    * A map of the components registered with the workspace, mapped to id.
-   * @type {!Object<string, !Blockly.ComponentManager.ComponentDatum>}
+   * @type {!Object<string, !ComponentManager.ComponentDatum>}
    * @private
    */
   this.componentData_ = Object.create(null);
@@ -45,21 +46,21 @@ Blockly.ComponentManager = function() {
  * @typedef {{
  *    component: !Blockly.IComponent,
  *    capabilities: (
- *     !Array<string|!Blockly.ComponentManager.Capability<!Blockly.IComponent>>
+ *     !Array<string|!ComponentManager.Capability<!Blockly.IComponent>>
  *       ),
  *    weight: number
  *  }}
  */
-Blockly.ComponentManager.ComponentDatum;
+ComponentManager.ComponentDatum;
 
 /**
  * Adds a component.
- * @param {!Blockly.ComponentManager.ComponentDatum} componentInfo The data for
+ * @param {!ComponentManager.ComponentDatum} componentInfo The data for
  *   the component to register.
  * @param {boolean=} opt_allowOverrides True to prevent an error when overriding
  *     an already registered item.
  */
-Blockly.ComponentManager.prototype.addComponent = function(
+ComponentManager.prototype.addComponent = function(
     componentInfo, opt_allowOverrides) {
   // Don't throw an error if opt_allowOverrides is true.
   const id = componentInfo.component.id;
@@ -86,7 +87,7 @@ Blockly.ComponentManager.prototype.addComponent = function(
  * Removes a component.
  * @param {string} id The ID of the component to remove.
  */
-Blockly.ComponentManager.prototype.removeComponent = function(id) {
+ComponentManager.prototype.removeComponent = function(id) {
   const componentInfo = this.componentData_[id];
   if (!componentInfo) {
     return;
@@ -102,11 +103,11 @@ Blockly.ComponentManager.prototype.removeComponent = function(id) {
 /**
  * Adds a capability to a existing registered component.
  * @param {string} id The ID of the component to add the capability to.
- * @param {string|!Blockly.ComponentManager.Capability<T>} capability The
+ * @param {string|!ComponentManager.Capability<T>} capability The
  *     capability to add.
  * @template T
  */
-Blockly.ComponentManager.prototype.addCapability = function(id, capability) {
+ComponentManager.prototype.addCapability = function(id, capability) {
   if (!this.getComponent(id)) {
     throw Error('Cannot add capability, "' + capability + '". Plugin "' +
         id + '" has not been added to the ComponentManager');
@@ -124,11 +125,11 @@ Blockly.ComponentManager.prototype.addCapability = function(id, capability) {
 /**
  * Removes a capability from an existing registered component.
  * @param {string} id The ID of the component to remove the capability from.
- * @param {string|!Blockly.ComponentManager.Capability<T>} capability The
+ * @param {string|!ComponentManager.Capability<T>} capability The
  *     capability to remove.
  * @template T
  */
-Blockly.ComponentManager.prototype.removeCapability = function(id, capability) {
+ComponentManager.prototype.removeCapability = function(id, capability) {
   if (!this.getComponent(id)) {
     throw Error('Cannot remove capability, "' + capability + '". Plugin "' +
         id + '" has not been added to the ComponentManager');
@@ -148,12 +149,12 @@ Blockly.ComponentManager.prototype.removeCapability = function(id, capability) {
 /**
  * Returns whether the component with this id has the specified capability.
  * @param {string} id The ID of the component to check.
- * @param {string|!Blockly.ComponentManager.Capability<T>} capability The
+ * @param {string|!ComponentManager.Capability<T>} capability The
  *     capability to check for.
  * @return {boolean} Whether the component has the capability.
  * @template T
  */
-Blockly.ComponentManager.prototype.hasCapability = function(id, capability) {
+ComponentManager.prototype.hasCapability = function(id, capability) {
   capability = String(capability).toLowerCase();
   return this.componentData_[id].capabilities.indexOf(capability) !== -1;
 };
@@ -164,19 +165,19 @@ Blockly.ComponentManager.prototype.hasCapability = function(id, capability) {
  * @return {!Blockly.IComponent|undefined} The component with the given name
  *    or undefined if not found.
  */
-Blockly.ComponentManager.prototype.getComponent = function(id) {
+ComponentManager.prototype.getComponent = function(id) {
   return this.componentData_[id] && this.componentData_[id].component;
 };
 
 /**
  * Gets all the components with the specified capability.
- * @param {string|!Blockly.ComponentManager.Capability<T>
+ * @param {string|!ComponentManager.Capability<T>
  *   } capability The capability of the component.
  * @param {boolean} sorted Whether to return list ordered by weights.
  * @return {!Array<T>} The components that match the specified capability.
  * @template T
  */
-Blockly.ComponentManager.prototype.getComponents = function(capability, sorted) {
+ComponentManager.prototype.getComponents = function(capability, sorted) {
   capability = String(capability).toLowerCase();
   const componentIds = this.capabilityToComponentIds_[capability];
   if (!componentIds) {
@@ -210,7 +211,7 @@ Blockly.ComponentManager.prototype.getComponents = function(capability, sorted)
  * @constructor
  * @template T
  */
-Blockly.ComponentManager.Capability = function(name) {
+ComponentManager.Capability = function(name) {
   /**
    * @type {string}
    * @private
@@ -223,22 +224,24 @@ Blockly.ComponentManager.Capability = function(name) {
  * @return {string} The name.
  * @override
  */
-Blockly.ComponentManager.Capability.prototype.toString = function() {
+ComponentManager.Capability.prototype.toString = function() {
   return this.name_;
 };
 
-/** @type {!Blockly.ComponentManager.Capability<!Blockly.IPositionable>} */
-Blockly.ComponentManager.Capability.POSITIONABLE =
-    new Blockly.ComponentManager.Capability('positionable');
+/** @type {!ComponentManager.Capability<!Blockly.IPositionable>} */
+ComponentManager.Capability.POSITIONABLE =
+    new ComponentManager.Capability('positionable');
 
-/** @type {!Blockly.ComponentManager.Capability<!Blockly.IDragTarget>} */
-Blockly.ComponentManager.Capability.DRAG_TARGET =
-    new Blockly.ComponentManager.Capability('drag_target');
+/** @type {!ComponentManager.Capability<!Blockly.IDragTarget>} */
+ComponentManager.Capability.DRAG_TARGET =
+    new ComponentManager.Capability('drag_target');
 
-/** @type {!Blockly.ComponentManager.Capability<!Blockly.IDeleteArea>} */
-Blockly.ComponentManager.Capability.DELETE_AREA =
-    new Blockly.ComponentManager.Capability('delete_area');
+/** @type {!ComponentManager.Capability<!Blockly.IDeleteArea>} */
+ComponentManager.Capability.DELETE_AREA =
+    new ComponentManager.Capability('delete_area');
 
-/** @type {!Blockly.ComponentManager.Capability<!Blockly.IAutoHideable>} */
-Blockly.ComponentManager.Capability.AUTOHIDEABLE =
-    new Blockly.ComponentManager.Capability('autohideable');
+/** @type {!ComponentManager.Capability<!Blockly.IAutoHideable>} */
+ComponentManager.Capability.AUTOHIDEABLE =
+    new ComponentManager.Capability('autohideable');
+
+exports = ComponentManager;
diff --git a/tests/deps.js b/tests/deps.js
index 7baee6eb9..052655acd 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -18,7 +18,7 @@ goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
 goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], []);
+goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation']);
 goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.registry']);
 goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.RenderedConnection', 'Blockly.connectionTypes', 'Blockly.constants']);

From 3c5479e0009333190e9db8acb24f470796cf0dd1 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 11:07:34 -0700
Subject: [PATCH 073/833] Migrate core/component_manager.js named requires

---
 core/component_manager.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/component_manager.js b/core/component_manager.js
index fbf66d544..cbc4baa60 100644
--- a/core/component_manager.js
+++ b/core/component_manager.js
@@ -14,11 +14,11 @@
 goog.module('Blockly.ComponentManager');
 goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.IAutoHideable');
-goog.requireType('Blockly.IComponent');
-goog.requireType('Blockly.IDeleteArea');
-goog.requireType('Blockly.IDragTarget');
-goog.requireType('Blockly.IPositionable');
+const IAutoHideable = goog.requireType('Blockly.IAutoHideable');
+const IComponent = goog.requireType('Blockly.IComponent');
+const IDeleteArea = goog.requireType('Blockly.IDeleteArea');
+const IDragTarget = goog.requireType('Blockly.IDragTarget');
+const IPositionable = goog.requireType('Blockly.IPositionable');
 
 
 /**
@@ -44,9 +44,9 @@ const ComponentManager = function() {
 /**
  * An object storing component information.
  * @typedef {{
- *    component: !Blockly.IComponent,
+ *    component: !IComponent,
  *    capabilities: (
- *     !Array<string|!ComponentManager.Capability<!Blockly.IComponent>>
+ *     !Array<string|!ComponentManager.Capability<!IComponent>>
  *       ),
  *    weight: number
  *  }}
@@ -162,7 +162,7 @@ ComponentManager.prototype.hasCapability = function(id, capability) {
 /**
  * Gets the component with the given ID.
  * @param {string} id The ID of the component to get.
- * @return {!Blockly.IComponent|undefined} The component with the given name
+ * @return {!IComponent|undefined} The component with the given name
  *    or undefined if not found.
  */
 ComponentManager.prototype.getComponent = function(id) {
@@ -228,19 +228,19 @@ ComponentManager.Capability.prototype.toString = function() {
   return this.name_;
 };
 
-/** @type {!ComponentManager.Capability<!Blockly.IPositionable>} */
+/** @type {!ComponentManager.Capability<!IPositionable>} */
 ComponentManager.Capability.POSITIONABLE =
     new ComponentManager.Capability('positionable');
 
-/** @type {!ComponentManager.Capability<!Blockly.IDragTarget>} */
+/** @type {!ComponentManager.Capability<!IDragTarget>} */
 ComponentManager.Capability.DRAG_TARGET =
     new ComponentManager.Capability('drag_target');
 
-/** @type {!ComponentManager.Capability<!Blockly.IDeleteArea>} */
+/** @type {!ComponentManager.Capability<!IDeleteArea>} */
 ComponentManager.Capability.DELETE_AREA =
     new ComponentManager.Capability('delete_area');
 
-/** @type {!ComponentManager.Capability<!Blockly.IAutoHideable>} */
+/** @type {!ComponentManager.Capability<!IAutoHideable>} */
 ComponentManager.Capability.AUTOHIDEABLE =
     new ComponentManager.Capability('autohideable');
 

From 81658d78ce82fcb2babb21a9d3cc19ea50183357 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 11:07:37 -0700
Subject: [PATCH 074/833] clang-format core/component_manager.js

---
 core/component_manager.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/core/component_manager.js b/core/component_manager.js
index cbc4baa60..31b661e8a 100644
--- a/core/component_manager.js
+++ b/core/component_manager.js
@@ -109,12 +109,13 @@ ComponentManager.prototype.removeComponent = function(id) {
  */
 ComponentManager.prototype.addCapability = function(id, capability) {
   if (!this.getComponent(id)) {
-    throw Error('Cannot add capability, "' + capability + '". Plugin "' +
-        id + '" has not been added to the ComponentManager');
+    throw Error(
+        'Cannot add capability, "' + capability + '". Plugin "' + id +
+        '" has not been added to the ComponentManager');
   }
   if (this.hasCapability(id, capability)) {
-    console.warn('Plugin "' + id + 'already has capability "' +
-        capability + '"');
+    console.warn(
+        'Plugin "' + id + 'already has capability "' + capability + '"');
     return;
   }
   capability = String(capability).toLowerCase();
@@ -131,12 +132,14 @@ ComponentManager.prototype.addCapability = function(id, capability) {
  */
 ComponentManager.prototype.removeCapability = function(id, capability) {
   if (!this.getComponent(id)) {
-    throw Error('Cannot remove capability, "' + capability + '". Plugin "' +
-        id + '" has not been added to the ComponentManager');
+    throw Error(
+        'Cannot remove capability, "' + capability + '". Plugin "' + id +
+        '" has not been added to the ComponentManager');
   }
   if (!this.hasCapability(id, capability)) {
-    console.warn('Plugin "' + id + 'doesn\'t have capability "' +
-        capability + '" to remove');
+    console.warn(
+        'Plugin "' + id + 'doesn\'t have capability "' + capability +
+        '" to remove');
     return;
   }
   capability = String(capability).toLowerCase();

From a9e60851ef87625f915a1fe33da6cb5b909f313a Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 16 Jul 2021 11:49:35 -0700
Subject: [PATCH 075/833] Auto-tag and add milestones for cleanup PRs

For new pull requests against the goog_module branch, adds the 'type: cleanup'  label and sets the milestone to q3 2021 release.

Based on [this PR](https://github.com/eclipse-theia/theia/pull/8631/files).
---
 .github/workflows/tag_module_cleanup.yml | 34 ++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 .github/workflows/tag_module_cleanup.yml

diff --git a/.github/workflows/tag_module_cleanup.yml b/.github/workflows/tag_module_cleanup.yml
new file mode 100644
index 000000000..8ee344066
--- /dev/null
+++ b/.github/workflows/tag_module_cleanup.yml
@@ -0,0 +1,34 @@
+# For new pull requests against the goog_module branch, adds the 'type: cleanup'
+# label and sets the milestone to q3 2021 release.
+
+name: Tag module cleanup
+
+# Trigger on pull requests against goog_module branch only
+on: 
+  pull_request:
+    branches:
+      - goog_module
+
+jobs:
+  tag-module-cleanup:
+  
+    # Add the type: cleanup label
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/github-script@a3e7071
+        with:
+          script: |
+            // 2021 q3 release milestone.
+            // https://github.com/google/blockly/milestone/18
+            const milestoneNumber = 18;
+            // Note that pull requests are accessed through the issues API.
+            const issuesUpdateParams = { 
+              owner: context.repo.owner, 
+              repo: context.repo.repo, 
+              // Adds the milestone
+              milestone: milestoneNumber, 
+              issue_number: context.issue.number,
+              // Sets the labels
+              labels: ['type: cleanup']
+            }
+            await github.issues.update(issuesUpdateParams)

From 05f8c27302718a89136532b57d18e87557542bcb Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 16 Jul 2021 11:52:38 -0700
Subject: [PATCH 076/833] Use full commit hash.

---
 .github/workflows/tag_module_cleanup.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tag_module_cleanup.yml b/.github/workflows/tag_module_cleanup.yml
index 8ee344066..2b14426ad 100644
--- a/.github/workflows/tag_module_cleanup.yml
+++ b/.github/workflows/tag_module_cleanup.yml
@@ -15,7 +15,7 @@ jobs:
     # Add the type: cleanup label
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@a3e7071
+      - uses: actions/github-script@a3e7071a34d7e1f219a8a4de9a5e0a34d1ee1293
         with:
           script: |
             // 2021 q3 release milestone.

From fb7bba34916a184761f365d92fbcbbe984f67acc Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 13 Jul 2021 15:56:05 -0700
Subject: [PATCH 077/833] Migrate core/utils/coordinate.js to ES6 const/let

---
 core/utils/coordinate.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/utils/coordinate.js b/core/utils/coordinate.js
index edf513b28..da50f2623 100644
--- a/core/utils/coordinate.js
+++ b/core/utils/coordinate.js
@@ -63,8 +63,8 @@ Blockly.utils.Coordinate.equals = function(a, b) {
  * @return {number} The distance between `a` and `b`.
  */
 Blockly.utils.Coordinate.distance = function(a, b) {
-  var dx = a.x - b.x;
-  var dy = a.y - b.y;
+  const dx = a.x - b.x;
+  const dy = a.y - b.y;
   return Math.sqrt(dx * dx + dy * dy);
 };
 

From 972f3022ed29dc52f3ebe3d4194d8ae3f396ebd1 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 13 Jul 2021 18:37:28 -0700
Subject: [PATCH 078/833] Migrate core/utils/coordinate.js to goog.module

---
 core/utils/coordinate.js | 62 +++++++++++++++++++++-------------------
 tests/deps.js            |  2 +-
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/core/utils/coordinate.js b/core/utils/coordinate.js
index da50f2623..ca5a248d3 100644
--- a/core/utils/coordinate.js
+++ b/core/utils/coordinate.js
@@ -16,8 +16,8 @@
  * @name Blockly.utils.Coordinate
  * @namespace
  */
-goog.provide('Blockly.utils.Coordinate');
-
+goog.module('Blockly.utils.Coordinate');
+goog.module.declareLegacyNamespace();
 
 /**
  * Class for representing coordinates and positions.
@@ -26,7 +26,7 @@ goog.provide('Blockly.utils.Coordinate');
  * @struct
  * @constructor
  */
-Blockly.utils.Coordinate = function(x, y) {
+const Coordinate = function(x, y) {
   /**
    * X-value
    * @type {number}
@@ -42,11 +42,11 @@ Blockly.utils.Coordinate = function(x, y) {
 
 /**
  * Compares coordinates for equality.
- * @param {?Blockly.utils.Coordinate} a A Coordinate.
- * @param {?Blockly.utils.Coordinate} b A Coordinate.
+ * @param {?Coordinate} a A Coordinate.
+ * @param {?Coordinate} b A Coordinate.
  * @return {boolean} True iff the coordinates are equal, or if both are null.
  */
-Blockly.utils.Coordinate.equals = function(a, b) {
+Coordinate.equals = function(a, b) {
   if (a == b) {
     return true;
   }
@@ -58,11 +58,11 @@ Blockly.utils.Coordinate.equals = function(a, b) {
 
 /**
  * Returns the distance between two coordinates.
- * @param {!Blockly.utils.Coordinate} a A Coordinate.
- * @param {!Blockly.utils.Coordinate} b A Coordinate.
+ * @param {!Coordinate} a A Coordinate.
+ * @param {!Coordinate} b A Coordinate.
  * @return {number} The distance between `a` and `b`.
  */
-Blockly.utils.Coordinate.distance = function(a, b) {
+Coordinate.distance = function(a, b) {
   const dx = a.x - b.x;
   const dy = a.y - b.y;
   return Math.sqrt(dx * dx + dy * dy);
@@ -70,50 +70,50 @@ Blockly.utils.Coordinate.distance = function(a, b) {
 
 /**
  * Returns the magnitude of a coordinate.
- * @param {!Blockly.utils.Coordinate} a A Coordinate.
+ * @param {!Coordinate} a A Coordinate.
  * @return {number} The distance between the origin and `a`.
  */
-Blockly.utils.Coordinate.magnitude = function(a) {
+Coordinate.magnitude = function(a) {
   return Math.sqrt(a.x * a.x + a.y * a.y);
 };
 
 /**
  * Returns the difference between two coordinates as a new
- * Blockly.utils.Coordinate.
- * @param {!Blockly.utils.Coordinate|!SVGPoint} a An x/y coordinate.
- * @param {!Blockly.utils.Coordinate|!SVGPoint} b An x/y coordinate.
- * @return {!Blockly.utils.Coordinate} A Coordinate representing the difference
+ * Coordinate.
+ * @param {!Coordinate|!SVGPoint} a An x/y coordinate.
+ * @param {!Coordinate|!SVGPoint} b An x/y coordinate.
+ * @return {!Coordinate} A Coordinate representing the difference
  *     between `a` and `b`.
  */
-Blockly.utils.Coordinate.difference = function(a, b) {
-  return new Blockly.utils.Coordinate(a.x - b.x, a.y - b.y);
+Coordinate.difference = function(a, b) {
+  return new Coordinate(a.x - b.x, a.y - b.y);
 };
 
 /**
- * Returns the sum of two coordinates as a new Blockly.utils.Coordinate.
- * @param {!Blockly.utils.Coordinate|!SVGPoint} a An x/y coordinate.
- * @param {!Blockly.utils.Coordinate|!SVGPoint} b An x/y coordinate.
- * @return {!Blockly.utils.Coordinate} A Coordinate representing the sum of
+ * Returns the sum of two coordinates as a new Coordinate.
+ * @param {!Coordinate|!SVGPoint} a An x/y coordinate.
+ * @param {!Coordinate|!SVGPoint} b An x/y coordinate.
+ * @return {!Coordinate} A Coordinate representing the sum of
  *     the two coordinates.
  */
-Blockly.utils.Coordinate.sum = function(a, b) {
-  return new Blockly.utils.Coordinate(a.x + b.x, a.y + b.y);
+Coordinate.sum = function(a, b) {
+  return new Coordinate(a.x + b.x, a.y + b.y);
 };
 
 /**
  * Creates a new copy of this coordinate.
- * @return {!Blockly.utils.Coordinate} A copy of this coordinate.
+ * @return {!Coordinate} A copy of this coordinate.
  */
-Blockly.utils.Coordinate.prototype.clone = function() {
-  return new Blockly.utils.Coordinate(this.x, this.y);
+Coordinate.prototype.clone = function() {
+  return new Coordinate(this.x, this.y);
 };
 
 /**
  * Scales this coordinate by the given scale factor.
  * @param {number} s The scale factor to use for both x and y dimensions.
- * @return {!Blockly.utils.Coordinate} This coordinate after scaling.
+ * @return {!Coordinate} This coordinate after scaling.
  */
-Blockly.utils.Coordinate.prototype.scale = function(s) {
+Coordinate.prototype.scale = function(s) {
   this.x *= s;
   this.y *= s;
   return this;
@@ -124,10 +124,12 @@ Blockly.utils.Coordinate.prototype.scale = function(s) {
  * respectively.
  * @param {number} tx The value to translate x by.
  * @param {number} ty The value to translate y by.
- * @return {!Blockly.utils.Coordinate} This coordinate after translating.
+ * @return {!Coordinate} This coordinate after translating.
  */
-Blockly.utils.Coordinate.prototype.translate = function(tx, ty) {
+Coordinate.prototype.translate = function(tx, ty) {
   this.x += tx;
   this.y += ty;
   return this;
 };
+
+exports = Coordinate;
diff --git a/tests/deps.js b/tests/deps.js
index 052655acd..c9321eaf9 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -171,7 +171,7 @@ goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.Com
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.constants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], []);
+goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.Svg', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], []);

From 19e86ed5dbca92be79e9d6de17454922b5e7d22c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 11:52:13 -0700
Subject: [PATCH 079/833] Migrate core/interfaces/i_block_dragger.js to
 goog.module

---
 core/interfaces/i_block_dragger.js | 15 +++++++++------
 tests/deps.js                      |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/interfaces/i_block_dragger.js b/core/interfaces/i_block_dragger.js
index ec7b79ac6..2276c7459 100644
--- a/core/interfaces/i_block_dragger.js
+++ b/core/interfaces/i_block_dragger.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-goog.provide('Blockly.IBlockDragger');
+goog.module('Blockly.IBlockDragger');
+goog.module.declareLegacyNamespace();
 
 goog.requireType('Blockly.BlockSvg');
 goog.requireType('Blockly.utils.Coordinate');
@@ -21,7 +22,7 @@ goog.requireType('Blockly.utils.Coordinate');
  * A block dragger interface.
  * @interface
  */
-Blockly.IBlockDragger = function() {};
+const IBlockDragger = function() {};
 
 /**
  * Start dragging a block.  This includes moving it to the drag surface.
@@ -30,7 +31,7 @@ Blockly.IBlockDragger = function() {};
  * @param {boolean} healStack Whether or not to heal the stack after
  *     disconnecting.
  */
-Blockly.IBlockDragger.prototype.startDrag;
+IBlockDragger.prototype.startDrag;
 
 /**
  * Execute a step of block dragging, based on the given event.  Update the
@@ -39,7 +40,7 @@ Blockly.IBlockDragger.prototype.startDrag;
  * @param {!Blockly.utils.Coordinate} currentDragDeltaXY How far the pointer has
  *     moved from the position at the start of the drag, in pixel units.
  */
-Blockly.IBlockDragger.prototype.drag;
+IBlockDragger.prototype.drag;
 
 /**
  * Finish a block drag and put the block back on the workspace.
@@ -47,7 +48,7 @@ Blockly.IBlockDragger.prototype.drag;
  * @param {!Blockly.utils.Coordinate} currentDragDeltaXY How far the pointer has
  *     moved from the position at the start of the drag, in pixel units.
  */
-Blockly.IBlockDragger.prototype.endDrag;
+IBlockDragger.prototype.endDrag;
 
 /**
  * Get a list of the insertion markers that currently exist.  Drags have 0, 1,
@@ -55,4 +56,6 @@ Blockly.IBlockDragger.prototype.endDrag;
  * @return {!Array.<!Blockly.BlockSvg>} A possibly empty list of insertion
  *     marker blocks.
  */
-Blockly.IBlockDragger.prototype.getInsertionMarkers;
+IBlockDragger.prototype.getInsertionMarkers;
+
+exports = IBlockDragger;
diff --git a/tests/deps.js b/tests/deps.js
index c9321eaf9..5a06dd4ae 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -75,7 +75,7 @@ goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockl
 goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es5'});
 goog.addDependency('../../core/interfaces/i_accessibility.js', ['Blockly.IASTNodeLocation', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible'], []);
 goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], ['Blockly.IComponent']);
-goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], []);
+goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], []);
 goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], ['Blockly.IContextMenu', 'Blockly.IDraggable']);
 goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], []);

From 88525f5ab4aeb0d4ddef54b2f7aba6b67c42eab0 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 11:54:26 -0700
Subject: [PATCH 080/833] Migrate core/interfaces/i_block_dragger.js named
 requires

---
 core/interfaces/i_block_dragger.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/interfaces/i_block_dragger.js b/core/interfaces/i_block_dragger.js
index 2276c7459..ebfc820ba 100644
--- a/core/interfaces/i_block_dragger.js
+++ b/core/interfaces/i_block_dragger.js
@@ -14,8 +14,8 @@
 goog.module('Blockly.IBlockDragger');
 goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.utils.Coordinate');
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const Coordinate = goog.requireType('Blockly.utils.Coordinate');
 
 
 /**
@@ -26,7 +26,7 @@ const IBlockDragger = function() {};
 
 /**
  * Start dragging a block.  This includes moving it to the drag surface.
- * @param {!Blockly.utils.Coordinate} currentDragDeltaXY How far the pointer has
+ * @param {!Coordinate} currentDragDeltaXY How far the pointer has
  *     moved from the position at mouse down, in pixel units.
  * @param {boolean} healStack Whether or not to heal the stack after
  *     disconnecting.
@@ -37,7 +37,7 @@ IBlockDragger.prototype.startDrag;
  * Execute a step of block dragging, based on the given event.  Update the
  * display accordingly.
  * @param {!Event} e The most recent move event.
- * @param {!Blockly.utils.Coordinate} currentDragDeltaXY How far the pointer has
+ * @param {!Coordinate} currentDragDeltaXY How far the pointer has
  *     moved from the position at the start of the drag, in pixel units.
  */
 IBlockDragger.prototype.drag;
@@ -45,7 +45,7 @@ IBlockDragger.prototype.drag;
 /**
  * Finish a block drag and put the block back on the workspace.
  * @param {!Event} e The mouseup/touchend event.
- * @param {!Blockly.utils.Coordinate} currentDragDeltaXY How far the pointer has
+ * @param {!Coordinate} currentDragDeltaXY How far the pointer has
  *     moved from the position at the start of the drag, in pixel units.
  */
 IBlockDragger.prototype.endDrag;
@@ -53,7 +53,7 @@ IBlockDragger.prototype.endDrag;
 /**
  * Get a list of the insertion markers that currently exist.  Drags have 0, 1,
  * or 2 insertion markers.
- * @return {!Array.<!Blockly.BlockSvg>} A possibly empty list of insertion
+ * @return {!Array.<!BlockSvg>} A possibly empty list of insertion
  *     marker blocks.
  */
 IBlockDragger.prototype.getInsertionMarkers;

From e922d2a831ea76bcf1c2ddc10f3ad3f2ce8e12a9 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 12:05:21 -0700
Subject: [PATCH 081/833] Migrate core/interfaces/i_bounded_element.js to
 goog.module

---
 core/interfaces/i_bounded_element.js | 11 +++++++----
 tests/deps.js                        |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/interfaces/i_bounded_element.js b/core/interfaces/i_bounded_element.js
index bc5ffeee6..fdbeb5b99 100644
--- a/core/interfaces/i_bounded_element.js
+++ b/core/interfaces/i_bounded_element.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-goog.provide('Blockly.IBoundedElement');
+goog.module('Blockly.IBoundedElement');
+goog.module.declareLegacyNamespace();
 
 goog.requireType('Blockly.utils.Rect');
 
@@ -20,7 +21,7 @@ goog.requireType('Blockly.utils.Rect');
  * A bounded element interface.
  * @interface
  */
-Blockly.IBoundedElement = function() {};
+const IBoundedElement = function() {};
 
 /**
  * Returns the coordinates of a bounded element describing the dimensions of the
@@ -28,11 +29,13 @@ Blockly.IBoundedElement = function() {};
  * Coordinate system: workspace coordinates.
  * @return {!Blockly.utils.Rect} Object with coordinates of the bounded element.
  */
-Blockly.IBoundedElement.prototype.getBoundingRectangle;
+IBoundedElement.prototype.getBoundingRectangle;
 
 /**
  * Move the element by a relative offset.
  * @param {number} dx Horizontal offset in workspace units.
  * @param {number} dy Vertical offset in workspace units.
  */
-Blockly.IBoundedElement.prototype.moveBy;
+IBoundedElement.prototype.moveBy;
+
+exports = IBoundedElement;
diff --git a/tests/deps.js b/tests/deps.js
index 5a06dd4ae..ac9153ec9 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -76,7 +76,7 @@ goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.Insertion
 goog.addDependency('../../core/interfaces/i_accessibility.js', ['Blockly.IASTNodeLocation', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible'], []);
 goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], ['Blockly.IComponent']);
 goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], []);
+goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], ['Blockly.IContextMenu', 'Blockly.IDraggable']);
 goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], []);
 goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], []);

From bfc801ed9f9baa9ff37894dea9ecf88a7fdb2cd1 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 12:05:45 -0700
Subject: [PATCH 082/833] Migrate core/interfaces/i_bounded_element.js named
 requires

---
 core/interfaces/i_bounded_element.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/interfaces/i_bounded_element.js b/core/interfaces/i_bounded_element.js
index fdbeb5b99..461d52ca1 100644
--- a/core/interfaces/i_bounded_element.js
+++ b/core/interfaces/i_bounded_element.js
@@ -14,7 +14,7 @@
 goog.module('Blockly.IBoundedElement');
 goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.utils.Rect');
+const Rect = goog.requireType('Blockly.utils.Rect');
 
 
 /**
@@ -27,7 +27,7 @@ const IBoundedElement = function() {};
  * Returns the coordinates of a bounded element describing the dimensions of the
  * element.
  * Coordinate system: workspace coordinates.
- * @return {!Blockly.utils.Rect} Object with coordinates of the bounded element.
+ * @return {!Rect} Object with coordinates of the bounded element.
  */
 IBoundedElement.prototype.getBoundingRectangle;
 

From 4ab9380434d6a435c65a8adcf46d48d5e90fd5f6 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 12:33:07 -0700
Subject: [PATCH 083/833] Migrate core/interfaces/i_component.js to goog.module

---
 core/interfaces/i_component.js | 9 ++++++---
 tests/deps.js                  | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/interfaces/i_component.js b/core/interfaces/i_component.js
index efb195966..d1acc592f 100644
--- a/core/interfaces/i_component.js
+++ b/core/interfaces/i_component.js
@@ -12,7 +12,8 @@
 
 'use strict';
 
-goog.provide('Blockly.IComponent');
+goog.module('Blockly.IComponent');
+goog.module.declareLegacyNamespace();
 
 
 /**
@@ -20,11 +21,13 @@ goog.provide('Blockly.IComponent');
  * ComponentManager.
  * @interface
  */
-Blockly.IComponent = function() {};
+const IComponent = function() {};
 
 /**
  * The unique id for this component that is used to register with the
  * ComponentManager.
  * @type {string}
  */
-Blockly.IComponent.id;
+IComponent.id;
+
+exports = IComponent;
diff --git a/tests/deps.js b/tests/deps.js
index ac9153ec9..ed2af0dc9 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -78,7 +78,7 @@ goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHid
 goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], ['Blockly.IContextMenu', 'Blockly.IDraggable']);
-goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], []);
+goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], []);
 goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], []);
 goog.addDependency('../../core/interfaces/i_copyable.js', ['Blockly.ICopyable'], []);

From 218046495f052fb7400f7afb736e52bfa0626618 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 16 Jul 2021 13:12:05 -0700
Subject: [PATCH 084/833] Sort requires

---
 core/renderers/common/drawer.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/renderers/common/drawer.js b/core/renderers/common/drawer.js
index a0181bf8f..9504695a2 100644
--- a/core/renderers/common/drawer.js
+++ b/core/renderers/common/drawer.js
@@ -13,16 +13,15 @@
 goog.module('Blockly.blockRendering.Drawer');
 goog.module.declareLegacyNamespace();
 
-const Row = goog.require('Blockly.blockRendering.Row');
-const Types = goog.require('Blockly.blockRendering.Types');
-const svgPaths = goog.require('Blockly.utils.svgPaths');
-
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
 const Field = goog.requireType('Blockly.blockRendering.Field');
 const Icon = goog.requireType('Blockly.blockRendering.Icon');
 const InlineInput = goog.requireType('Blockly.blockRendering.InlineInput');
 const RenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const Row = goog.require('Blockly.blockRendering.Row');
+const svgPaths = goog.require('Blockly.utils.svgPaths');
+const Types = goog.require('Blockly.blockRendering.Types');
 
 
 /**

From a2d12a1536a1cf223bab1ba40a4f1027b41c5263 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 13:00:31 -0700
Subject: [PATCH 085/833] Migrate core/interfaces/i_deletable.js to goog.module

---
 core/interfaces/i_deletable.js | 9 ++++++---
 tests/deps.js                  | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/interfaces/i_deletable.js b/core/interfaces/i_deletable.js
index 8e8524863..ff24023d9 100644
--- a/core/interfaces/i_deletable.js
+++ b/core/interfaces/i_deletable.js
@@ -11,17 +11,20 @@
 
 'use strict';
 
-goog.provide('Blockly.IDeletable');
+goog.module('Blockly.IDeletable');
+goog.module.declareLegacyNamespace();
 
 
 /**
  * The interface for an object that can be deleted.
  * @interface
  */
-Blockly.IDeletable = function() {};
+const IDeletable = function() {};
 
 /**
  * Get whether this object is deletable or not.
  * @return {boolean} True if deletable.
  */
-Blockly.IDeletable.prototype.isDeletable;
+IDeletable.prototype.isDeletable;
+
+exports = IDeletable;
diff --git a/tests/deps.js b/tests/deps.js
index ed2af0dc9..5ab286fc5 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -82,7 +82,7 @@ goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'
 goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], []);
 goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], []);
 goog.addDependency('../../core/interfaces/i_copyable.js', ['Blockly.ICopyable'], []);
-goog.addDependency('../../core/interfaces/i_deletable.js', ['Blockly.IDeletable'], []);
+goog.addDependency('../../core/interfaces/i_deletable.js', ['Blockly.IDeletable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], ['Blockly.IDragTarget']);
 goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], ['Blockly.IComponent']);
 goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], ['Blockly.IDeletable']);

From fa158d143ec4f74a759557b232ae9d959401e122 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 16 Jul 2021 13:48:33 -0700
Subject: [PATCH 086/833] Migrate core/connection.js to ES6 const/let

---
 core/connection.js | 82 +++++++++++++++++++++++-----------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/core/connection.js b/core/connection.js
index 27526c711..23d2193bd 100644
--- a/core/connection.js
+++ b/core/connection.js
@@ -104,10 +104,10 @@ Blockly.Connection.prototype.y = 0;
  * @protected
  */
 Blockly.Connection.prototype.connect_ = function(childConnection) {
-  var INPUT = Blockly.connectionTypes.INPUT_VALUE;
-  var parentConnection = this;
-  var parentBlock = parentConnection.getSourceBlock();
-  var childBlock = childConnection.getSourceBlock();
+  const INPUT = Blockly.connectionTypes.INPUT_VALUE;
+  const parentConnection = this;
+  const parentBlock = parentConnection.getSourceBlock();
+  const childBlock = childConnection.getSourceBlock();
 
   // Make sure the childConnection is available.
   if (childConnection.isConnected()) {
@@ -115,11 +115,11 @@ Blockly.Connection.prototype.connect_ = function(childConnection) {
   }
 
   // Make sure the parentConnection is available.
-  var orphan;
+  let orphan;
   if (parentConnection.isConnected()) {
-    var shadowDom = parentConnection.getShadowDom(true);
+    const shadowDom = parentConnection.getShadowDom(true);
     parentConnection.shadowDom_ = null;  // Set to null so it doesn't respawn.
-    var target = parentConnection.targetBlock();
+    const target = parentConnection.targetBlock();
     if (target.isShadow()) {
       target.dispose(false);
     } else {
@@ -130,7 +130,7 @@ Blockly.Connection.prototype.connect_ = function(childConnection) {
   }
 
   // Connect the new connection to the parent.
-  var event;
+  let event;
   if (Blockly.Events.isEnabled()) {
     event = new (Blockly.Events.get(Blockly.Events.BLOCK_MOVE))(childBlock);
   }
@@ -143,9 +143,9 @@ Blockly.Connection.prototype.connect_ = function(childConnection) {
 
   // Deal with the orphan if it exists.
   if (orphan) {
-    var orphanConnection = parentConnection.type === INPUT ?
+    const orphanConnection = parentConnection.type === INPUT ?
         orphan.outputConnection : orphan.previousConnection;
-    var connection = Blockly.Connection.getConnectionForOrphanedConnection(
+    const connection = Blockly.Connection.getConnectionForOrphanedConnection(
         childBlock, /** @type {!Blockly.Connection} */ (orphanConnection));
     if (connection) {
       orphanConnection.connect(connection);
@@ -167,7 +167,7 @@ Blockly.Connection.prototype.dispose = function() {
     // Destroy the attached shadow block & its children (if it exists).
     this.setShadowDom(null);
 
-    var targetBlock = this.targetBlock();
+    const targetBlock = this.targetBlock();
     if (targetBlock) {
       // Disconnect the attached normal block.
       targetBlock.unplug();
@@ -236,8 +236,8 @@ Blockly.Connection.prototype.checkConnection = function(target) {
       'July 2020',
       'July 2021',
       'the workspace\'s connection checker');
-  var checker = this.getConnectionChecker();
-  var reason = checker.canConnectWithReason(this, target, false);
+  const checker = this.getConnectionChecker();
+  const reason = checker.canConnectWithReason(this, target, false);
   if (reason != Blockly.Connection.CAN_CONNECT) {
     throw new Error(checker.getErrorMessage(reason, this, target));
   }
@@ -290,9 +290,9 @@ Blockly.Connection.prototype.connect = function(otherConnection) {
     return;
   }
 
-  var checker = this.getConnectionChecker();
+  const checker = this.getConnectionChecker();
   if (checker.canConnect(this, otherConnection, false)) {
-    var eventGroup = Blockly.Events.getGroup();
+    const eventGroup = Blockly.Events.getGroup();
     if (!eventGroup) {
       Blockly.Events.setGroup(true);
     }
@@ -336,12 +336,12 @@ Blockly.Connection.connectReciprocally_ = function(first, second) {
  * @private
  */
 Blockly.Connection.getSingleConnection_ = function(block, orphanBlock) {
-  var foundConnection = null;
-  var output = orphanBlock.outputConnection;
-  var typeChecker = output.getConnectionChecker();
+  let foundConnection = null;
+  const output = orphanBlock.outputConnection;
+  const typeChecker = output.getConnectionChecker();
 
-  for (var i = 0, input; (input = block.inputList[i]); i++) {
-    var connection = input.connection;
+  for (let i = 0, input; (input = block.inputList[i]); i++) {
+    const connection = input.connection;
     if (connection && typeChecker.canConnect(output, connection, false)) {
       if (foundConnection) {
         return null;  // More than one connection.
@@ -366,8 +366,8 @@ Blockly.Connection.getSingleConnection_ = function(block, orphanBlock) {
  */
 Blockly.Connection.getConnectionForOrphanedOutput_ =
     function(startBlock, orphanBlock) {
-      var newBlock = startBlock;
-      var connection;
+      let newBlock = startBlock;
+      let connection;
       while ((connection = Blockly.Connection.getSingleConnection_(
           /** @type {!Blockly.Block} */ (newBlock), orphanBlock))) {
         newBlock = connection.targetBlock();
@@ -395,8 +395,8 @@ Blockly.Connection.getConnectionForOrphanedConnection =
             startBlock, orphanConnection.getSourceBlock());
       }
       // Otherwise we're dealing with a stack.
-      var connection = startBlock.lastConnectionInStack(true);
-      var checker = orphanConnection.getConnectionChecker();
+      const connection = startBlock.lastConnectionInStack(true);
+      const checker = orphanConnection.getConnectionChecker();
       if (connection &&
           checker.canConnect(orphanConnection, connection, false)) {
         return connection;
@@ -408,14 +408,14 @@ Blockly.Connection.getConnectionForOrphanedConnection =
  * Disconnect this connection.
  */
 Blockly.Connection.prototype.disconnect = function() {
-  var otherConnection = this.targetConnection;
+  const otherConnection = this.targetConnection;
   if (!otherConnection) {
     throw Error('Source connection not connected.');
   }
   if (otherConnection.targetConnection != this) {
     throw Error('Target connection not connected to source connection.');
   }
-  var parentBlock, childBlock, parentConnection;
+  let parentBlock, childBlock, parentConnection;
   if (this.isSuperior()) {
     // Superior block.
     parentBlock = this.sourceBlock_;
@@ -428,7 +428,7 @@ Blockly.Connection.prototype.disconnect = function() {
     parentConnection = otherConnection;
   }
 
-  var eventGroup = Blockly.Events.getGroup();
+  const eventGroup = Blockly.Events.getGroup();
   if (!eventGroup) {
     Blockly.Events.setGroup(true);
   }
@@ -450,11 +450,11 @@ Blockly.Connection.prototype.disconnect = function() {
  */
 Blockly.Connection.prototype.disconnectInternal_ = function(parentBlock,
     childBlock) {
-  var event;
+  let event;
   if (Blockly.Events.isEnabled()) {
     event = new (Blockly.Events.get(Blockly.Events.BLOCK_MOVE))(childBlock);
   }
-  var otherConnection = this.targetConnection;
+  const otherConnection = this.targetConnection;
   otherConnection.targetConnection = null;
   this.targetConnection = null;
   childBlock.setParent(null);
@@ -469,10 +469,10 @@ Blockly.Connection.prototype.disconnectInternal_ = function(parentBlock,
  * @protected
  */
 Blockly.Connection.prototype.respawnShadow_ = function() {
-  var parentBlock = this.getSourceBlock();
-  var shadow = this.getShadowDom();
+  const parentBlock = this.getSourceBlock();
+  const shadow = this.getShadowDom();
   if (parentBlock.workspace && shadow) {
-    var blockShadow = Blockly.Xml.domToBlock(shadow, parentBlock.workspace);
+    const blockShadow = Blockly.Xml.domToBlock(shadow, parentBlock.workspace);
     if (blockShadow.outputConnection) {
       this.connect(blockShadow.outputConnection);
     } else if (blockShadow.previousConnection) {
@@ -540,7 +540,7 @@ Blockly.Connection.prototype.onCheckChanged_ = function() {
   if (this.isConnected() && (!this.targetConnection ||
       !this.getConnectionChecker().canConnect(
           this, this.targetConnection, false))) {
-    var child = this.isSuperior() ? this.targetBlock() : this.sourceBlock_;
+    const child = this.isSuperior() ? this.targetBlock() : this.sourceBlock_;
     child.unplug();
   }
 };
@@ -582,7 +582,7 @@ Blockly.Connection.prototype.getCheck = function() {
  */
 Blockly.Connection.prototype.setShadowDom = function(shadow) {
   this.shadowDom_ = shadow;
-  var target = this.targetBlock();
+  const target = this.targetBlock();
   if (!target) {
     this.respawnShadow_();
   } else if (target.isShadow()) {
@@ -630,9 +630,9 @@ Blockly.Connection.prototype.neighbours = function(_maxLimit) {
  * @package
  */
 Blockly.Connection.prototype.getParentInput = function() {
-  var parentInput = null;
-  var inputs = this.sourceBlock_.inputList;
-  for (var i = 0; i < inputs.length; i++) {
+  let parentInput = null;
+  const inputs = this.sourceBlock_.inputList;
+  for (let i = 0; i < inputs.length; i++) {
     if (inputs[i].connection === this) {
       parentInput = inputs[i];
       break;
@@ -647,11 +647,11 @@ Blockly.Connection.prototype.getParentInput = function() {
  * @return {string} The description.
  */
 Blockly.Connection.prototype.toString = function() {
-  var block = this.sourceBlock_;
+  const block = this.sourceBlock_;
   if (!block) {
     return 'Orphan Connection';
   }
-  var msg;
+  let msg;
   if (block.outputConnection == this) {
     msg = 'Output Connection of ';
   } else if (block.previousConnection == this) {
@@ -659,8 +659,8 @@ Blockly.Connection.prototype.toString = function() {
   } else if (block.nextConnection == this) {
     msg = 'Next Connection of ';
   } else {
-    var parentInput = null;
-    for (var i = 0, input; (input = block.inputList[i]); i++) {
+    let parentInput = null;
+    for (let i = 0, input; (input = block.inputList[i]); i++) {
       if (input.connection == this) {
         parentInput = input;
         break;

From fc62fed33c94564449d521644bc0d44dbca739f9 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 16 Jul 2021 13:55:08 -0700
Subject: [PATCH 087/833] Migrate core/connection.js to goog.module

---
 core/connection.js | 141 +++++++++++++++++++++++----------------------
 tests/deps.js      |   2 +-
 2 files changed, 73 insertions(+), 70 deletions(-)

diff --git a/core/connection.js b/core/connection.js
index 23d2193bd..be9a08eb9 100644
--- a/core/connection.js
+++ b/core/connection.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Connection');
+goog.module('Blockly.Connection');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.connectionTypes');
 /** @suppress {extraRequire} */
@@ -34,7 +35,7 @@ goog.requireType('Blockly.Input');
  * @constructor
  * @implements {Blockly.IASTNodeLocationWithBlock}
  */
-Blockly.Connection = function(source, type) {
+const Connection = function(source, type) {
   /**
    * @type {!Blockly.Block}
    * @protected
@@ -47,63 +48,63 @@ Blockly.Connection = function(source, type) {
 /**
  * Constants for checking whether two connections are compatible.
  */
-Blockly.Connection.CAN_CONNECT = 0;
-Blockly.Connection.REASON_SELF_CONNECTION = 1;
-Blockly.Connection.REASON_WRONG_TYPE = 2;
-Blockly.Connection.REASON_TARGET_NULL = 3;
-Blockly.Connection.REASON_CHECKS_FAILED = 4;
-Blockly.Connection.REASON_DIFFERENT_WORKSPACES = 5;
-Blockly.Connection.REASON_SHADOW_PARENT = 6;
-Blockly.Connection.REASON_DRAG_CHECKS_FAILED = 7;
+Connection.CAN_CONNECT = 0;
+Connection.REASON_SELF_CONNECTION = 1;
+Connection.REASON_WRONG_TYPE = 2;
+Connection.REASON_TARGET_NULL = 3;
+Connection.REASON_CHECKS_FAILED = 4;
+Connection.REASON_DIFFERENT_WORKSPACES = 5;
+Connection.REASON_SHADOW_PARENT = 6;
+Connection.REASON_DRAG_CHECKS_FAILED = 7;
 
 /**
  * Connection this connection connects to.  Null if not connected.
- * @type {Blockly.Connection}
+ * @type {Connection}
  */
-Blockly.Connection.prototype.targetConnection = null;
+Connection.prototype.targetConnection = null;
 
 /**
  * Has this connection been disposed of?
  * @type {boolean}
  * @package
  */
-Blockly.Connection.prototype.disposed = false;
+Connection.prototype.disposed = false;
 
 /**
  * List of compatible value types.  Null if all types are compatible.
  * @type {Array}
  * @private
  */
-Blockly.Connection.prototype.check_ = null;
+Connection.prototype.check_ = null;
 
 /**
  * DOM representation of a shadow block, or null if none.
  * @type {Element}
  * @private
  */
-Blockly.Connection.prototype.shadowDom_ = null;
+Connection.prototype.shadowDom_ = null;
 
 /**
  * Horizontal location of this connection.
  * @type {number}
  * @package
  */
-Blockly.Connection.prototype.x = 0;
+Connection.prototype.x = 0;
 
 /**
  * Vertical location of this connection.
  * @type {number}
  * @package
  */
-Blockly.Connection.prototype.y = 0;
+Connection.prototype.y = 0;
 
 /**
  * Connect two connections together.  This is the connection on the superior
  * block.
- * @param {!Blockly.Connection} childConnection Connection on inferior block.
+ * @param {!Connection} childConnection Connection on inferior block.
  * @protected
  */
-Blockly.Connection.prototype.connect_ = function(childConnection) {
+Connection.prototype.connect_ = function(childConnection) {
   const INPUT = Blockly.connectionTypes.INPUT_VALUE;
   const parentConnection = this;
   const parentBlock = parentConnection.getSourceBlock();
@@ -134,7 +135,7 @@ Blockly.Connection.prototype.connect_ = function(childConnection) {
   if (Blockly.Events.isEnabled()) {
     event = new (Blockly.Events.get(Blockly.Events.BLOCK_MOVE))(childBlock);
   }
-  Blockly.Connection.connectReciprocally_(parentConnection, childConnection);
+  Connection.connectReciprocally_(parentConnection, childConnection);
   childBlock.setParent(parentBlock);
   if (event) {
     event.recordNew();
@@ -145,8 +146,8 @@ Blockly.Connection.prototype.connect_ = function(childConnection) {
   if (orphan) {
     const orphanConnection = parentConnection.type === INPUT ?
         orphan.outputConnection : orphan.previousConnection;
-    const connection = Blockly.Connection.getConnectionForOrphanedConnection(
-        childBlock, /** @type {!Blockly.Connection} */ (orphanConnection));
+    const connection = Connection.getConnectionForOrphanedConnection(
+        childBlock, /** @type {!Connection} */ (orphanConnection));
     if (connection) {
       orphanConnection.connect(connection);
     } else {
@@ -160,7 +161,7 @@ Blockly.Connection.prototype.connect_ = function(childConnection) {
  * Dispose of this connection and deal with connected blocks.
  * @package
  */
-Blockly.Connection.prototype.dispose = function() {
+Connection.prototype.dispose = function() {
 
   // isConnected returns true for shadows and non-shadows.
   if (this.isConnected()) {
@@ -181,7 +182,7 @@ Blockly.Connection.prototype.dispose = function() {
  * Get the source block for this connection.
  * @return {!Blockly.Block} The source block.
  */
-Blockly.Connection.prototype.getSourceBlock = function() {
+Connection.prototype.getSourceBlock = function() {
   return this.sourceBlock_;
 };
 
@@ -189,7 +190,7 @@ Blockly.Connection.prototype.getSourceBlock = function() {
  * Does the connection belong to a superior block (higher in the source stack)?
  * @return {boolean} True if connection faces down or right.
  */
-Blockly.Connection.prototype.isSuperior = function() {
+Connection.prototype.isSuperior = function() {
   return this.type == Blockly.connectionTypes.INPUT_VALUE ||
       this.type == Blockly.connectionTypes.NEXT_STATEMENT;
 };
@@ -198,20 +199,20 @@ Blockly.Connection.prototype.isSuperior = function() {
  * Is the connection connected?
  * @return {boolean} True if connection is connected to another connection.
  */
-Blockly.Connection.prototype.isConnected = function() {
+Connection.prototype.isConnected = function() {
   return !!this.targetConnection;
 };
 
 /**
  * Checks whether the current connection can connect with the target
  * connection.
- * @param {Blockly.Connection} target Connection to check compatibility with.
- * @return {number} Blockly.Connection.CAN_CONNECT if the connection is legal,
+ * @param {Connection} target Connection to check compatibility with.
+ * @return {number} Connection.CAN_CONNECT if the connection is legal,
  *    an error code otherwise.
  * @deprecated July 2020. Will be deleted July 2021. Use the workspace's
  *     connectionChecker instead.
  */
-Blockly.Connection.prototype.canConnectWithReason = function(target) {
+Connection.prototype.canConnectWithReason = function(target) {
   Blockly.utils.deprecation.warn(
       'Connection.prototype.canConnectWithReason',
       'July 2020',
@@ -224,13 +225,13 @@ Blockly.Connection.prototype.canConnectWithReason = function(target) {
 /**
  * Checks whether the current connection and target connection are compatible
  * and throws an exception if they are not.
- * @param {Blockly.Connection} target The connection to check compatibility
+ * @param {Connection} target The connection to check compatibility
  *    with.
  * @package
  * @deprecated July 2020. Will be deleted July 2021. Use the workspace's
  *     connectionChecker instead.
  */
-Blockly.Connection.prototype.checkConnection = function(target) {
+Connection.prototype.checkConnection = function(target) {
   Blockly.utils.deprecation.warn(
       'Connection.prototype.checkConnection',
       'July 2020',
@@ -238,7 +239,7 @@ Blockly.Connection.prototype.checkConnection = function(target) {
       'the workspace\'s connection checker');
   const checker = this.getConnectionChecker();
   const reason = checker.canConnectWithReason(this, target, false);
-  if (reason != Blockly.Connection.CAN_CONNECT) {
+  if (reason != Connection.CAN_CONNECT) {
     throw new Error(checker.getErrorMessage(reason, this, target));
   }
 };
@@ -249,18 +250,18 @@ Blockly.Connection.prototype.checkConnection = function(target) {
  *     source block's workspace.
  * @package
  */
-Blockly.Connection.prototype.getConnectionChecker = function() {
+Connection.prototype.getConnectionChecker = function() {
   return this.sourceBlock_.workspace.connectionChecker;
 };
 
 /**
  * Check if the two connections can be dragged to connect to each other.
- * @param {!Blockly.Connection} candidate A nearby connection to check.
+ * @param {!Connection} candidate A nearby connection to check.
  * @return {boolean} True if the connection is allowed, false otherwise.
  * @deprecated July 2020. Will be deleted July 2021. Use the workspace's
  *     connectionChecker instead.
  */
-Blockly.Connection.prototype.isConnectionAllowed = function(candidate) {
+Connection.prototype.isConnectionAllowed = function(candidate) {
   Blockly.utils.deprecation.warn(
       'Connection.prototype.isConnectionAllowed',
       'July 2020',
@@ -272,19 +273,19 @@ Blockly.Connection.prototype.isConnectionAllowed = function(candidate) {
 /**
  * Called when an attempted connection fails. NOP by default (i.e. for headless
  * workspaces).
- * @param {!Blockly.Connection} _otherConnection Connection that this connection
+ * @param {!Connection} _otherConnection Connection that this connection
  *     failed to connect to.
  * @package
  */
-Blockly.Connection.prototype.onFailedConnect = function(_otherConnection) {
+Connection.prototype.onFailedConnect = function(_otherConnection) {
   // NOP
 };
 
 /**
  * Connect this connection to another connection.
- * @param {!Blockly.Connection} otherConnection Connection to connect to.
+ * @param {!Connection} otherConnection Connection to connect to.
  */
-Blockly.Connection.prototype.connect = function(otherConnection) {
+Connection.prototype.connect = function(otherConnection) {
   if (this.targetConnection == otherConnection) {
     // Already connected together.  NOP.
     return;
@@ -312,11 +313,11 @@ Blockly.Connection.prototype.connect = function(otherConnection) {
 
 /**
  * Update two connections to target each other.
- * @param {Blockly.Connection} first The first connection to update.
- * @param {Blockly.Connection} second The second connection to update.
+ * @param {Connection} first The first connection to update.
+ * @param {Connection} second The second connection to update.
  * @private
  */
-Blockly.Connection.connectReciprocally_ = function(first, second) {
+Connection.connectReciprocally_ = function(first, second) {
   if (!first || !second) {
     throw Error('Cannot connect null connections.');
   }
@@ -331,11 +332,11 @@ Blockly.Connection.connectReciprocally_ = function(first, second) {
  * connections, this returns null.
  * @param {!Blockly.Block} block The superior block.
  * @param {!Blockly.Block} orphanBlock The inferior block.
- * @return {?Blockly.Connection} The suitable connection point on 'block',
+ * @return {?Connection} The suitable connection point on 'block',
  *     or null.
  * @private
  */
-Blockly.Connection.getSingleConnection_ = function(block, orphanBlock) {
+Connection.getSingleConnection_ = function(block, orphanBlock) {
   let foundConnection = null;
   const output = orphanBlock.outputConnection;
   const typeChecker = output.getConnectionChecker();
@@ -360,15 +361,15 @@ Blockly.Connection.getSingleConnection_ = function(block, orphanBlock) {
  * Terminates early for shadow blocks.
  * @param {!Blockly.Block} startBlock The block on which to start the search.
  * @param {!Blockly.Block} orphanBlock The block that is looking for a home.
- * @return {?Blockly.Connection} The suitable connection point on the chain
+ * @return {?Connection} The suitable connection point on the chain
  *     of blocks, or null.
  * @private
  */
-Blockly.Connection.getConnectionForOrphanedOutput_ =
+Connection.getConnectionForOrphanedOutput_ =
     function(startBlock, orphanBlock) {
       let newBlock = startBlock;
       let connection;
-      while ((connection = Blockly.Connection.getSingleConnection_(
+      while ((connection = Connection.getSingleConnection_(
           /** @type {!Blockly.Block} */ (newBlock), orphanBlock))) {
         newBlock = connection.targetBlock();
         if (!newBlock || newBlock.isShadow()) {
@@ -383,15 +384,15 @@ Blockly.Connection.getConnectionForOrphanedOutput_ =
  * the given connection. This includes compatible connection types and
  * connection checks.
  * @param {!Blockly.Block} startBlock The block on which to start the search.
- * @param {!Blockly.Connection} orphanConnection The connection that is looking
+ * @param {!Connection} orphanConnection The connection that is looking
  *     for a home.
- * @return {?Blockly.Connection} The suitable connection point on the chain of
+ * @return {?Connection} The suitable connection point on the chain of
  *     blocks, or null.
  */
-Blockly.Connection.getConnectionForOrphanedConnection =
+Connection.getConnectionForOrphanedConnection =
     function(startBlock, orphanConnection) {
       if (orphanConnection.type === Blockly.connectionTypes.OUTPUT_VALUE) {
-        return Blockly.Connection.getConnectionForOrphanedOutput_(
+        return Connection.getConnectionForOrphanedOutput_(
             startBlock, orphanConnection.getSourceBlock());
       }
       // Otherwise we're dealing with a stack.
@@ -407,7 +408,7 @@ Blockly.Connection.getConnectionForOrphanedConnection =
 /**
  * Disconnect this connection.
  */
-Blockly.Connection.prototype.disconnect = function() {
+Connection.prototype.disconnect = function() {
   const otherConnection = this.targetConnection;
   if (!otherConnection) {
     throw Error('Source connection not connected.');
@@ -448,7 +449,7 @@ Blockly.Connection.prototype.disconnect = function() {
  * @param {!Blockly.Block} childBlock The inferior block.
  * @protected
  */
-Blockly.Connection.prototype.disconnectInternal_ = function(parentBlock,
+Connection.prototype.disconnectInternal_ = function(parentBlock,
     childBlock) {
   let event;
   if (Blockly.Events.isEnabled()) {
@@ -468,7 +469,7 @@ Blockly.Connection.prototype.disconnectInternal_ = function(parentBlock,
  * Respawn the shadow block if there was one connected to the this connection.
  * @protected
  */
-Blockly.Connection.prototype.respawnShadow_ = function() {
+Connection.prototype.respawnShadow_ = function() {
   const parentBlock = this.getSourceBlock();
   const shadow = this.getShadowDom();
   if (parentBlock.workspace && shadow) {
@@ -487,7 +488,7 @@ Blockly.Connection.prototype.respawnShadow_ = function() {
  * Returns the block that this connection connects to.
  * @return {?Blockly.Block} The connected block or null if none is connected.
  */
-Blockly.Connection.prototype.targetBlock = function() {
+Connection.prototype.targetBlock = function() {
   if (this.isConnected()) {
     return this.targetConnection.getSourceBlock();
   }
@@ -497,12 +498,12 @@ Blockly.Connection.prototype.targetBlock = function() {
 /**
  * Is this connection compatible with another connection with respect to the
  * value type system.  E.g. square_root("Hello") is not compatible.
- * @param {!Blockly.Connection} otherConnection Connection to compare against.
+ * @param {!Connection} otherConnection Connection to compare against.
  * @return {boolean} True if the connections share a type.
  * @deprecated July 2020. Will be deleted July 2021. Use the workspace's
  *     connectionChecker instead.
  */
-Blockly.Connection.prototype.checkType = function(otherConnection) {
+Connection.prototype.checkType = function(otherConnection) {
   Blockly.utils.deprecation.warn(
       'Connection.prototype.checkType',
       'October 2019',
@@ -515,14 +516,14 @@ Blockly.Connection.prototype.checkType = function(otherConnection) {
 /**
  * Is this connection compatible with another connection with respect to the
  * value type system.  E.g. square_root("Hello") is not compatible.
- * @param {!Blockly.Connection} otherConnection Connection to compare against.
+ * @param {!Connection} otherConnection Connection to compare against.
  * @return {boolean} True if the connections share a type.
  * @private
  * @deprecated October 2019. Will be deleted January 2021. Use the workspace's
  *     connectionChecker instead.
  * @suppress {unusedPrivateMembers}
  */
-Blockly.Connection.prototype.checkType_ = function(otherConnection) {
+Connection.prototype.checkType_ = function(otherConnection) {
   Blockly.utils.deprecation.warn(
       'Connection.prototype.checkType_',
       'October 2019',
@@ -535,7 +536,7 @@ Blockly.Connection.prototype.checkType_ = function(otherConnection) {
  * Function to be called when this connection's compatible types have changed.
  * @protected
  */
-Blockly.Connection.prototype.onCheckChanged_ = function() {
+Connection.prototype.onCheckChanged_ = function() {
   // The new value type may not be compatible with the existing connection.
   if (this.isConnected() && (!this.targetConnection ||
       !this.getConnectionChecker().canConnect(
@@ -549,10 +550,10 @@ Blockly.Connection.prototype.onCheckChanged_ = function() {
  * Change a connection's compatibility.
  * @param {?(string|!Array<string>)} check Compatible value type or list of
  *     value types. Null if all types are compatible.
- * @return {!Blockly.Connection} The connection being modified
+ * @return {!Connection} The connection being modified
  *     (to allow chaining).
  */
-Blockly.Connection.prototype.setCheck = function(check) {
+Connection.prototype.setCheck = function(check) {
   if (check) {
     // Ensure that check is in an array.
     if (!Array.isArray(check)) {
@@ -572,7 +573,7 @@ Blockly.Connection.prototype.setCheck = function(check) {
  *     Null if all types are compatible.
  * @public
  */
-Blockly.Connection.prototype.getCheck = function() {
+Connection.prototype.getCheck = function() {
   return this.check_;
 };
 
@@ -580,7 +581,7 @@ Blockly.Connection.prototype.getCheck = function() {
  * Changes the connection's shadow block.
  * @param {?Element} shadow DOM representation of a block or null.
  */
-Blockly.Connection.prototype.setShadowDom = function(shadow) {
+Connection.prototype.setShadowDom = function(shadow) {
   this.shadowDom_ = shadow;
   const target = this.targetBlock();
   if (!target) {
@@ -600,7 +601,7 @@ Blockly.Connection.prototype.setShadowDom = function(shadow) {
  *     shadowDom is just returned.
  * @return {?Element} Shadow DOM representation of a block or null.
  */
-Blockly.Connection.prototype.getShadowDom = function(returnCurrent) {
+Connection.prototype.getShadowDom = function(returnCurrent) {
   return (returnCurrent && this.targetBlock().isShadow()) ?
       /** @type {!Element} */ (Blockly.Xml.blockToDom(
           /** @type {!Blockly.Block} */ (this.targetBlock()))) :
@@ -616,10 +617,10 @@ Blockly.Connection.prototype.getShadowDom = function(returnCurrent) {
  * {@link Blockly.RenderedConnection} overrides this behavior with a list
  * computed from the rendered positioning.
  * @param {number} _maxLimit The maximum radius to another connection.
- * @return {!Array<!Blockly.Connection>} List of connections.
+ * @return {!Array<!Connection>} List of connections.
  * @package
  */
-Blockly.Connection.prototype.neighbours = function(_maxLimit) {
+Connection.prototype.neighbours = function(_maxLimit) {
   return [];
 };
 
@@ -629,7 +630,7 @@ Blockly.Connection.prototype.neighbours = function(_maxLimit) {
  *     no parent exists.
  * @package
  */
-Blockly.Connection.prototype.getParentInput = function() {
+Connection.prototype.getParentInput = function() {
   let parentInput = null;
   const inputs = this.sourceBlock_.inputList;
   for (let i = 0; i < inputs.length; i++) {
@@ -646,7 +647,7 @@ Blockly.Connection.prototype.getParentInput = function() {
  * (English only). Intended to on be used in console logs and errors.
  * @return {string} The description.
  */
-Blockly.Connection.prototype.toString = function() {
+Connection.prototype.toString = function() {
   const block = this.sourceBlock_;
   if (!block) {
     return 'Orphan Connection';
@@ -675,3 +676,5 @@ Blockly.Connection.prototype.toString = function() {
   }
   return msg + block.toDevString();
 };
+
+exports = Connection;
diff --git a/tests/deps.js b/tests/deps.js
index ed2af0dc9..b435a26ba 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -19,7 +19,7 @@ goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
 goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation']);
+goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.registry']);
 goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.RenderedConnection', 'Blockly.connectionTypes', 'Blockly.constants']);
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});

From 8c0304ece883d9adc77b3f1c9445cf057aa8b50a Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 16 Jul 2021 14:02:44 -0700
Subject: [PATCH 088/833] Use pull request target trigger for tagging cleanup

---
 .github/workflows/tag_module_cleanup.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tag_module_cleanup.yml b/.github/workflows/tag_module_cleanup.yml
index 2b14426ad..94e7ec692 100644
--- a/.github/workflows/tag_module_cleanup.yml
+++ b/.github/workflows/tag_module_cleanup.yml
@@ -4,8 +4,9 @@
 name: Tag module cleanup
 
 # Trigger on pull requests against goog_module branch only
+# Uses pull_request_target to get write permissions so that it can write labels.
 on: 
-  pull_request:
+  pull_request_target:
     branches:
       - goog_module
 

From 210fcea19889f19c008899e3f89a1837d76a8174 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 16 Jul 2021 14:13:40 -0700
Subject: [PATCH 089/833] Migrate core/connection.js to named requires

---
 core/connection.js | 95 +++++++++++++++++++++++-----------------------
 1 file changed, 47 insertions(+), 48 deletions(-)

diff --git a/core/connection.js b/core/connection.js
index be9a08eb9..0c7f54605 100644
--- a/core/connection.js
+++ b/core/connection.js
@@ -13,31 +13,30 @@
 goog.module('Blockly.Connection');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.connectionTypes');
+const connectionTypes = goog.require('Blockly.connectionTypes');
+const Block = goog.requireType('Blockly.Block');
+const deprecation = goog.require('Blockly.utils.deprecation');
+const Events = goog.require('Blockly.Events');
+const IASTNodeLocationWithBlock = goog.require('Blockly.IASTNodeLocationWithBlock');
+const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');
+const Input = goog.requireType('Blockly.Input');
+const Xml = goog.require('Blockly.Xml');
 /** @suppress {extraRequire} */
 goog.require('Blockly.constants');
-goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockMove');
-goog.require('Blockly.IASTNodeLocationWithBlock');
-goog.require('Blockly.utils.deprecation');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.IConnectionChecker');
-goog.requireType('Blockly.Input');
 
 
 /**
  * Class for a connection between blocks.
- * @param {!Blockly.Block} source The block establishing this connection.
+ * @param {!Block} source The block establishing this connection.
  * @param {number} type The type of the connection.
  * @constructor
- * @implements {Blockly.IASTNodeLocationWithBlock}
+ * @implements {IASTNodeLocationWithBlock}
  */
 const Connection = function(source, type) {
   /**
-   * @type {!Blockly.Block}
+   * @type {!Block}
    * @protected
    */
   this.sourceBlock_ = source;
@@ -105,7 +104,7 @@ Connection.prototype.y = 0;
  * @protected
  */
 Connection.prototype.connect_ = function(childConnection) {
-  const INPUT = Blockly.connectionTypes.INPUT_VALUE;
+  const INPUT = connectionTypes.INPUT_VALUE;
   const parentConnection = this;
   const parentBlock = parentConnection.getSourceBlock();
   const childBlock = childConnection.getSourceBlock();
@@ -132,14 +131,14 @@ Connection.prototype.connect_ = function(childConnection) {
 
   // Connect the new connection to the parent.
   let event;
-  if (Blockly.Events.isEnabled()) {
-    event = new (Blockly.Events.get(Blockly.Events.BLOCK_MOVE))(childBlock);
+  if (Events.isEnabled()) {
+    event = new (Events.get(Events.BLOCK_MOVE))(childBlock);
   }
   Connection.connectReciprocally_(parentConnection, childConnection);
   childBlock.setParent(parentBlock);
   if (event) {
     event.recordNew();
-    Blockly.Events.fire(event);
+    Events.fire(event);
   }
 
   // Deal with the orphan if it exists.
@@ -180,7 +179,7 @@ Connection.prototype.dispose = function() {
 
 /**
  * Get the source block for this connection.
- * @return {!Blockly.Block} The source block.
+ * @return {!Block} The source block.
  */
 Connection.prototype.getSourceBlock = function() {
   return this.sourceBlock_;
@@ -191,8 +190,8 @@ Connection.prototype.getSourceBlock = function() {
  * @return {boolean} True if connection faces down or right.
  */
 Connection.prototype.isSuperior = function() {
-  return this.type == Blockly.connectionTypes.INPUT_VALUE ||
-      this.type == Blockly.connectionTypes.NEXT_STATEMENT;
+  return this.type == connectionTypes.INPUT_VALUE ||
+      this.type == connectionTypes.NEXT_STATEMENT;
 };
 
 /**
@@ -213,7 +212,7 @@ Connection.prototype.isConnected = function() {
  *     connectionChecker instead.
  */
 Connection.prototype.canConnectWithReason = function(target) {
-  Blockly.utils.deprecation.warn(
+  deprecation.warn(
       'Connection.prototype.canConnectWithReason',
       'July 2020',
       'July 2021',
@@ -232,7 +231,7 @@ Connection.prototype.canConnectWithReason = function(target) {
  *     connectionChecker instead.
  */
 Connection.prototype.checkConnection = function(target) {
-  Blockly.utils.deprecation.warn(
+  deprecation.warn(
       'Connection.prototype.checkConnection',
       'July 2020',
       'July 2021',
@@ -246,7 +245,7 @@ Connection.prototype.checkConnection = function(target) {
 
 /**
  * Get the workspace's connection type checker object.
- * @return {!Blockly.IConnectionChecker} The connection type checker for the
+ * @return {!IConnectionChecker} The connection type checker for the
  *     source block's workspace.
  * @package
  */
@@ -262,7 +261,7 @@ Connection.prototype.getConnectionChecker = function() {
  *     connectionChecker instead.
  */
 Connection.prototype.isConnectionAllowed = function(candidate) {
-  Blockly.utils.deprecation.warn(
+  deprecation.warn(
       'Connection.prototype.isConnectionAllowed',
       'July 2020',
       'July 2021',
@@ -293,9 +292,9 @@ Connection.prototype.connect = function(otherConnection) {
 
   const checker = this.getConnectionChecker();
   if (checker.canConnect(this, otherConnection, false)) {
-    const eventGroup = Blockly.Events.getGroup();
+    const eventGroup = Events.getGroup();
     if (!eventGroup) {
-      Blockly.Events.setGroup(true);
+      Events.setGroup(true);
     }
     // Determine which block is superior (higher in the source stack).
     if (this.isSuperior()) {
@@ -306,7 +305,7 @@ Connection.prototype.connect = function(otherConnection) {
       otherConnection.connect_(this);
     }
     if (!eventGroup) {
-      Blockly.Events.setGroup(false);
+      Events.setGroup(false);
     }
   }
 };
@@ -330,8 +329,8 @@ Connection.connectReciprocally_ = function(first, second) {
  * block, if one can be found. If the block has multiple compatible connections
  * (even if they are filled) this returns null. If the block has no compatible
  * connections, this returns null.
- * @param {!Blockly.Block} block The superior block.
- * @param {!Blockly.Block} orphanBlock The inferior block.
+ * @param {!Block} block The superior block.
+ * @param {!Block} orphanBlock The inferior block.
  * @return {?Connection} The suitable connection point on 'block',
  *     or null.
  * @private
@@ -359,8 +358,8 @@ Connection.getSingleConnection_ = function(block, orphanBlock) {
  * are zero or multiple eligible connections, returns null.  Otherwise
  * returns the only input on the last block in the chain.
  * Terminates early for shadow blocks.
- * @param {!Blockly.Block} startBlock The block on which to start the search.
- * @param {!Blockly.Block} orphanBlock The block that is looking for a home.
+ * @param {!Block} startBlock The block on which to start the search.
+ * @param {!Block} orphanBlock The block that is looking for a home.
  * @return {?Connection} The suitable connection point on the chain
  *     of blocks, or null.
  * @private
@@ -370,7 +369,7 @@ Connection.getConnectionForOrphanedOutput_ =
       let newBlock = startBlock;
       let connection;
       while ((connection = Connection.getSingleConnection_(
-          /** @type {!Blockly.Block} */ (newBlock), orphanBlock))) {
+          /** @type {!Block} */ (newBlock), orphanBlock))) {
         newBlock = connection.targetBlock();
         if (!newBlock || newBlock.isShadow()) {
           return connection;
@@ -383,7 +382,7 @@ Connection.getConnectionForOrphanedOutput_ =
  * Returns the connection (starting at the startBlock) which will accept
  * the given connection. This includes compatible connection types and
  * connection checks.
- * @param {!Blockly.Block} startBlock The block on which to start the search.
+ * @param {!Block} startBlock The block on which to start the search.
  * @param {!Connection} orphanConnection The connection that is looking
  *     for a home.
  * @return {?Connection} The suitable connection point on the chain of
@@ -391,7 +390,7 @@ Connection.getConnectionForOrphanedOutput_ =
  */
 Connection.getConnectionForOrphanedConnection =
     function(startBlock, orphanConnection) {
-      if (orphanConnection.type === Blockly.connectionTypes.OUTPUT_VALUE) {
+      if (orphanConnection.type === connectionTypes.OUTPUT_VALUE) {
         return Connection.getConnectionForOrphanedOutput_(
             startBlock, orphanConnection.getSourceBlock());
       }
@@ -429,9 +428,9 @@ Connection.prototype.disconnect = function() {
     parentConnection = otherConnection;
   }
 
-  const eventGroup = Blockly.Events.getGroup();
+  const eventGroup = Events.getGroup();
   if (!eventGroup) {
-    Blockly.Events.setGroup(true);
+    Events.setGroup(true);
   }
   this.disconnectInternal_(parentBlock, childBlock);
   if (!childBlock.isShadow()) {
@@ -439,21 +438,21 @@ Connection.prototype.disconnect = function() {
     parentConnection.respawnShadow_();
   }
   if (!eventGroup) {
-    Blockly.Events.setGroup(false);
+    Events.setGroup(false);
   }
 };
 
 /**
  * Disconnect two blocks that are connected by this connection.
- * @param {!Blockly.Block} parentBlock The superior block.
- * @param {!Blockly.Block} childBlock The inferior block.
+ * @param {!Block} parentBlock The superior block.
+ * @param {!Block} childBlock The inferior block.
  * @protected
  */
 Connection.prototype.disconnectInternal_ = function(parentBlock,
     childBlock) {
   let event;
-  if (Blockly.Events.isEnabled()) {
-    event = new (Blockly.Events.get(Blockly.Events.BLOCK_MOVE))(childBlock);
+  if (Events.isEnabled()) {
+    event = new (Events.get(Events.BLOCK_MOVE))(childBlock);
   }
   const otherConnection = this.targetConnection;
   otherConnection.targetConnection = null;
@@ -461,7 +460,7 @@ Connection.prototype.disconnectInternal_ = function(parentBlock,
   childBlock.setParent(null);
   if (event) {
     event.recordNew();
-    Blockly.Events.fire(event);
+    Events.fire(event);
   }
 };
 
@@ -473,7 +472,7 @@ Connection.prototype.respawnShadow_ = function() {
   const parentBlock = this.getSourceBlock();
   const shadow = this.getShadowDom();
   if (parentBlock.workspace && shadow) {
-    const blockShadow = Blockly.Xml.domToBlock(shadow, parentBlock.workspace);
+    const blockShadow = Xml.domToBlock(shadow, parentBlock.workspace);
     if (blockShadow.outputConnection) {
       this.connect(blockShadow.outputConnection);
     } else if (blockShadow.previousConnection) {
@@ -486,7 +485,7 @@ Connection.prototype.respawnShadow_ = function() {
 
 /**
  * Returns the block that this connection connects to.
- * @return {?Blockly.Block} The connected block or null if none is connected.
+ * @return {?Block} The connected block or null if none is connected.
  */
 Connection.prototype.targetBlock = function() {
   if (this.isConnected()) {
@@ -504,7 +503,7 @@ Connection.prototype.targetBlock = function() {
  *     connectionChecker instead.
  */
 Connection.prototype.checkType = function(otherConnection) {
-  Blockly.utils.deprecation.warn(
+  deprecation.warn(
       'Connection.prototype.checkType',
       'October 2019',
       'January 2021',
@@ -524,7 +523,7 @@ Connection.prototype.checkType = function(otherConnection) {
  * @suppress {unusedPrivateMembers}
  */
 Connection.prototype.checkType_ = function(otherConnection) {
-  Blockly.utils.deprecation.warn(
+  deprecation.warn(
       'Connection.prototype.checkType_',
       'October 2019',
       'January 2021',
@@ -603,8 +602,8 @@ Connection.prototype.setShadowDom = function(shadow) {
  */
 Connection.prototype.getShadowDom = function(returnCurrent) {
   return (returnCurrent && this.targetBlock().isShadow()) ?
-      /** @type {!Element} */ (Blockly.Xml.blockToDom(
-          /** @type {!Blockly.Block} */ (this.targetBlock()))) :
+      /** @type {!Element} */ (Xml.blockToDom(
+          /** @type {!Block} */ (this.targetBlock()))) :
       this.shadowDom_;
 };
 
@@ -626,7 +625,7 @@ Connection.prototype.neighbours = function(_maxLimit) {
 
 /**
  * Get the parent input of a connection.
- * @return {?Blockly.Input} The input that the connection belongs to or null if
+ * @return {?Input} The input that the connection belongs to or null if
  *     no parent exists.
  * @package
  */

From cae985369dbc913006ee91bda183f8da84375538 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 13:05:36 -0700
Subject: [PATCH 090/833] Migrate core/interfaces/i_delete_area.js to
 goog.module

---
 core/interfaces/i_delete_area.js | 9 ++++++---
 tests/deps.js                    | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/interfaces/i_delete_area.js b/core/interfaces/i_delete_area.js
index 31f53350e..923c0bd7c 100644
--- a/core/interfaces/i_delete_area.js
+++ b/core/interfaces/i_delete_area.js
@@ -12,7 +12,8 @@
 
 'use strict';
 
-goog.provide('Blockly.IDeleteArea');
+goog.module('Blockly.IDeleteArea');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.IDragTarget');
 
@@ -25,7 +26,7 @@ goog.requireType('Blockly.IDraggable');
  * @extends {Blockly.IDragTarget}
  * @interface
  */
-Blockly.IDeleteArea = function() {};
+const IDeleteArea = function() {};
 
 /**
  * Returns whether the provided block or bubble would be deleted if dropped on
@@ -39,4 +40,6 @@ Blockly.IDeleteArea = function() {};
  * @return {boolean} Whether the element provided would be deleted if dropped on
  *     this area.
  */
-Blockly.IDeleteArea.prototype.wouldDelete;
+IDeleteArea.prototype.wouldDelete;
+
+exports = IDeleteArea;
diff --git a/tests/deps.js b/tests/deps.js
index c23b3f10c..234dbe062 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -83,7 +83,7 @@ goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IC
 goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], []);
 goog.addDependency('../../core/interfaces/i_copyable.js', ['Blockly.ICopyable'], []);
 goog.addDependency('../../core/interfaces/i_deletable.js', ['Blockly.IDeletable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], ['Blockly.IDragTarget']);
+goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], ['Blockly.IComponent']);
 goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], ['Blockly.IDeletable']);
 goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], []);

From 98e6020baf1e8d4904bb3c4a751e3cb030e80e34 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 13:06:35 -0700
Subject: [PATCH 091/833] Migrate core/interfaces/i_delete_area.js named
 requires

---
 core/interfaces/i_delete_area.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/interfaces/i_delete_area.js b/core/interfaces/i_delete_area.js
index 923c0bd7c..5c5cbd380 100644
--- a/core/interfaces/i_delete_area.js
+++ b/core/interfaces/i_delete_area.js
@@ -15,15 +15,14 @@
 goog.module('Blockly.IDeleteArea');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.IDragTarget');
-
-goog.requireType('Blockly.IDraggable');
+const IDraggable = goog.requireType('Blockly.IDraggable');
+const IDragTarget = goog.require('Blockly.IDragTarget');
 
 
 /**
  * Interface for a component that can delete a block or bubble that is dropped
  * on top of it.
- * @extends {Blockly.IDragTarget}
+ * @extends {IDragTarget}
  * @interface
  */
 const IDeleteArea = function() {};
@@ -33,7 +32,7 @@ const IDeleteArea = function() {};
  * this area.
  * This method should check if the element is deletable and is always called
  * before onDragEnter/onDragOver/onDragExit.
- * @param {!Blockly.IDraggable} element The block or bubble currently being
+ * @param {!IDraggable} element The block or bubble currently being
  *   dragged.
  * @param {boolean} couldConnect Whether the element could could connect to
  *     another.

From 9806fc13f97819ba76ad077b8d0e5f2fc63dd0e5 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 13:32:10 -0700
Subject: [PATCH 092/833] Migrate core/interfaces/i_draggable.js to goog.module

---
 core/interfaces/i_draggable.js | 7 +++++--
 tests/deps.js                  | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/interfaces/i_draggable.js b/core/interfaces/i_draggable.js
index f140555a1..cb77f3dce 100644
--- a/core/interfaces/i_draggable.js
+++ b/core/interfaces/i_draggable.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-goog.provide('Blockly.IDraggable');
+goog.module('Blockly.IDraggable');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.IDeletable');
 
@@ -21,4 +22,6 @@ goog.require('Blockly.IDeletable');
  * @extends {Blockly.IDeletable}
  * @interface
  */
-Blockly.IDraggable = function() {};
+const IDraggable = function() {};
+
+exports = IDraggable;
diff --git a/tests/deps.js b/tests/deps.js
index 234dbe062..5f5f93d89 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -85,7 +85,7 @@ goog.addDependency('../../core/interfaces/i_copyable.js', ['Blockly.ICopyable'],
 goog.addDependency('../../core/interfaces/i_deletable.js', ['Blockly.IDeletable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], ['Blockly.IComponent']);
-goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], ['Blockly.IDeletable']);
+goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], ['Blockly.IDeletable'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], []);
 goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], []);
 goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], []);

From 1b15437e2fb296688b3750fca6f1aa1f906a5848 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 13:32:40 -0700
Subject: [PATCH 093/833] Migrate core/interfaces/i_draggable.js named requires

---
 core/interfaces/i_draggable.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/interfaces/i_draggable.js b/core/interfaces/i_draggable.js
index cb77f3dce..81303a24b 100644
--- a/core/interfaces/i_draggable.js
+++ b/core/interfaces/i_draggable.js
@@ -14,12 +14,12 @@
 goog.module('Blockly.IDraggable');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.IDeletable');
+const IDeletable = goog.require('Blockly.IDeletable');
 
 
 /**
  * The interface for an object that can be dragged.
- * @extends {Blockly.IDeletable}
+ * @extends {IDeletable}
  * @interface
  */
 const IDraggable = function() {};

From 1e81334c15cffda802a0d44f27ffc993052483a8 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 16 Jul 2021 14:15:25 -0700
Subject: [PATCH 094/833] Migrate core/renderers/common/info.js to ES6
 const/let

---
 core/renderers/common/info.js | 108 +++++++++++++++++-----------------
 1 file changed, 55 insertions(+), 53 deletions(-)

diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js
index f3eac053a..9c5d62a9a 100644
--- a/core/renderers/common/info.js
+++ b/core/renderers/common/info.js
@@ -205,13 +205,13 @@ Blockly.blockRendering.RenderInfo.prototype.measure = function() {
 Blockly.blockRendering.RenderInfo.prototype.createRows_ = function() {
   this.populateTopRow_();
   this.rows.push(this.topRow);
-  var activeRow = new Blockly.blockRendering.InputRow(this.constants_);
+  let activeRow = new Blockly.blockRendering.InputRow(this.constants_);
   this.inputRows.push(activeRow);
 
   // Icons always go on the first row, before anything else.
-  var icons = this.block_.getIcons();
-  for (var i = 0, icon; (icon = icons[i]); i++) {
-    var iconInfo = new Blockly.blockRendering.Icon(this.constants_, icon);
+  const icons = this.block_.getIcons();
+  for (let i = 0, icon; (icon = icons[i]); i++) {
+    const iconInfo = new Blockly.blockRendering.Icon(this.constants_, icon);
     if (this.isCollapsed && icon.collapseHidden) {
       this.hiddenIcons.push(iconInfo);
     } else {
@@ -219,10 +219,10 @@ Blockly.blockRendering.RenderInfo.prototype.createRows_ = function() {
     }
   }
 
-  var lastInput = null;
+  let lastInput = null;
   // Loop across all of the inputs on the block, creating objects for anything
   // that needs to be rendered and breaking the block up into visual rows.
-  for (var i = 0, input; (input = this.block_.inputList[i]); i++) {
+  for (let i = 0, input; (input = this.block_.inputList[i]); i++) {
     if (!input.isVisible()) {
       continue;
     }
@@ -234,7 +234,7 @@ Blockly.blockRendering.RenderInfo.prototype.createRows_ = function() {
     }
 
     // All of the fields in an input go on the same row.
-    for (var j = 0, field; (field = input.fieldRow[j]); j++) {
+    for (let j = 0, field; (field = input.fieldRow[j]); j++) {
       activeRow.elements.push(
           new Blockly.blockRendering.Field(this.constants_, field, input));
     }
@@ -260,17 +260,18 @@ Blockly.blockRendering.RenderInfo.prototype.createRows_ = function() {
  * @package
  */
 Blockly.blockRendering.RenderInfo.prototype.populateTopRow_ = function() {
-  var hasPrevious = !!this.block_.previousConnection;
-  var hasHat = (this.block_.hat ?
-      this.block_.hat === 'cap' : this.constants_.ADD_START_HATS) &&
+  const hasPrevious = !!this.block_.previousConnection;
+  const hasHat = (this.block_.hat ? this.block_.hat === 'cap' :
+                                    this.constants_.ADD_START_HATS) &&
       !this.outputConnection && !hasPrevious;
 
-  var cornerClass = this.topRow.hasLeftSquareCorner(this.block_) ?
-      Blockly.blockRendering.SquareCorner : Blockly.blockRendering.RoundCorner;
+  let cornerClass = this.topRow.hasLeftSquareCorner(this.block_) ?
+      Blockly.blockRendering.SquareCorner :
+      Blockly.blockRendering.RoundCorner;
   this.topRow.elements.push(new cornerClass(this.constants_));
 
   if (hasHat) {
-    var hat = new Blockly.blockRendering.Hat(this.constants_);
+    const hat = new Blockly.blockRendering.Hat(this.constants_);
     this.topRow.elements.push(hat);
     this.topRow.capline = hat.ascenderHeight;
   } else if (hasPrevious) {
@@ -282,7 +283,7 @@ Blockly.blockRendering.RenderInfo.prototype.populateTopRow_ = function() {
     this.topRow.elements.push(this.topRow.connection);
   }
 
-  var precedesStatement = this.block_.inputList.length &&
+  const precedesStatement = this.block_.inputList.length &&
       this.block_.inputList[0].type == Blockly.inputTypes.STATEMENT;
 
   // This is the minimum height for the row. If one of its elements has a
@@ -306,7 +307,7 @@ Blockly.blockRendering.RenderInfo.prototype.populateTopRow_ = function() {
 Blockly.blockRendering.RenderInfo.prototype.populateBottomRow_ = function() {
   this.bottomRow.hasNextConnection = !!this.block_.nextConnection;
 
-  var followsStatement = this.block_.inputList.length &&
+  const followsStatement = this.block_.inputList.length &&
       this.block_.inputList[this.block_.inputList.length - 1].type ==
           Blockly.inputTypes.STATEMENT;
 
@@ -319,7 +320,7 @@ Blockly.blockRendering.RenderInfo.prototype.populateBottomRow_ = function() {
     this.bottomRow.minHeight = this.constants_.BOTTOM_ROW_MIN_HEIGHT;
   }
 
-  var leftSquareCorner = this.bottomRow.hasLeftSquareCorner(this.block_);
+  const leftSquareCorner = this.bottomRow.hasLeftSquareCorner(this.block_);
 
   if (leftSquareCorner) {
     this.bottomRow.elements.push(
@@ -336,7 +337,7 @@ Blockly.blockRendering.RenderInfo.prototype.populateBottomRow_ = function() {
     this.bottomRow.elements.push(this.bottomRow.connection);
   }
 
-  var rightSquareCorner = this.bottomRow.hasRightSquareCorner(this.block_);
+  const rightSquareCorner = this.bottomRow.hasRightSquareCorner(this.block_);
 
   if (rightSquareCorner) {
     this.bottomRow.elements.push(
@@ -414,8 +415,8 @@ Blockly.blockRendering.RenderInfo.prototype.shouldStartNewRow_ = function(input,
  * @protected
  */
 Blockly.blockRendering.RenderInfo.prototype.addElemSpacing_ = function() {
-  for (var i = 0, row; (row = this.rows[i]); i++) {
-    var oldElems = row.elements;
+  for (let i = 0, row; (row = this.rows[i]); i++) {
+    const oldElems = row.elements;
     row.elements = [];
     // No spacing needed before the corner on the top row or the bottom row.
     if (row.startsWithElemSpacer()) {
@@ -426,9 +427,9 @@ Blockly.blockRendering.RenderInfo.prototype.addElemSpacing_ = function() {
     if (!oldElems.length) {
       continue;
     }
-    for (var e = 0; e < oldElems.length - 1; e++) {
+    for (let e = 0; e < oldElems.length - 1; e++) {
       row.elements.push(oldElems[e]);
-      var spacing = this.getInRowSpacing_(oldElems[e], oldElems[e + 1]);
+      const spacing = this.getInRowSpacing_(oldElems[e], oldElems[e + 1]);
       row.elements.push(
           new Blockly.blockRendering.InRowSpacer(this.constants_, spacing));
     }
@@ -496,15 +497,15 @@ Blockly.blockRendering.RenderInfo.prototype.getInRowSpacing_ = function(prev, ne
  */
 // TODO: More cleanup.
 Blockly.blockRendering.RenderInfo.prototype.computeBounds_ = function() {
-  var widestStatementRowFields = 0;
-  var blockWidth = 0;
-  var widestRowWithConnectedBlocks = 0;
-  for (var i = 0, row; (row = this.rows[i]); i++) {
+  let widestStatementRowFields = 0;
+  let blockWidth = 0;
+  let widestRowWithConnectedBlocks = 0;
+  for (let i = 0, row; (row = this.rows[i]); i++) {
     row.measure();
     blockWidth = Math.max(blockWidth, row.width);
     if (row.hasStatement) {
-      var statementInput = row.getLastInput();
-      var innerWidth = row.width - statementInput.width;
+      const statementInput = row.getLastInput();
+      const innerWidth = row.width - statementInput.width;
       widestStatementRowFields = Math.max(widestStatementRowFields, innerWidth);
     }
     widestRowWithConnectedBlocks =
@@ -514,7 +515,7 @@ Blockly.blockRendering.RenderInfo.prototype.computeBounds_ = function() {
   this.statementEdge = widestStatementRowFields;
   this.width = blockWidth;
 
-  for (var i = 0, row; (row = this.rows[i]); i++) {
+  for (let i = 0, row; (row = this.rows[i]); i++) {
     if (row.hasStatement) {
       row.statementEdge = this.statementEdge;
     }
@@ -536,14 +537,14 @@ Blockly.blockRendering.RenderInfo.prototype.computeBounds_ = function() {
  * @protected
  */
 Blockly.blockRendering.RenderInfo.prototype.alignRowElements_ = function() {
-  for (var i = 0, row; (row = this.rows[i]); i++) {
+  for (let i = 0, row; (row = this.rows[i]); i++) {
     if (row.hasStatement) {
       this.alignStatementRow_(
           /** @type {!Blockly.blockRendering.InputRow} */ (row));
     } else {
-      var currentWidth = row.width;
-      var desiredWidth = this.getDesiredRowWidth_(row);
-      var missingSpace = desiredWidth - currentWidth;
+      const currentWidth = row.width;
+      const desiredWidth = this.getDesiredRowWidth_(row);
+      const missingSpace = desiredWidth - currentWidth;
       if (missingSpace > 0) {
         this.addAlignmentPadding_(row, missingSpace);
       }
@@ -573,10 +574,10 @@ Blockly.blockRendering.RenderInfo.prototype.getDesiredRowWidth_ = function(
  * @param {number} missingSpace How much padding to add.
  * @protected
  */
-Blockly.blockRendering.RenderInfo.prototype.addAlignmentPadding_ = function(row,
-    missingSpace) {
-  var firstSpacer = row.getFirstSpacer();
-  var lastSpacer = row.getLastSpacer();
+Blockly.blockRendering.RenderInfo.prototype.addAlignmentPadding_ = function(
+    row, missingSpace) {
+  const firstSpacer = row.getFirstSpacer();
+  const lastSpacer = row.getLastSpacer();
   if (row.hasExternalInput || row.hasStatement) {
     row.widthWithConnectedBlocks += missingSpace;
   }
@@ -606,11 +607,11 @@ Blockly.blockRendering.RenderInfo.prototype.addAlignmentPadding_ = function(row,
  * @protected
  */
 Blockly.blockRendering.RenderInfo.prototype.alignStatementRow_ = function(row) {
-  var statementInput = row.getLastInput();
-  var currentWidth = row.width - statementInput.width;
-  var desiredWidth = this.statementEdge;
+  const statementInput = row.getLastInput();
+  let currentWidth = row.width - statementInput.width;
+  let desiredWidth = this.statementEdge;
   // Add padding before the statement input.
-  var missingSpace = desiredWidth - currentWidth;
+  const missingSpace = desiredWidth - currentWidth;
   if (missingSpace > 0) {
     this.addAlignmentPadding_(row, missingSpace);
   }
@@ -630,10 +631,10 @@ Blockly.blockRendering.RenderInfo.prototype.alignStatementRow_ = function(row) {
  * @protected
  */
 Blockly.blockRendering.RenderInfo.prototype.addRowSpacing_ = function() {
-  var oldRows = this.rows;
+  const oldRows = this.rows;
   this.rows = [];
 
-  for (var r = 0; r < oldRows.length; r++) {
+  for (let r = 0; r < oldRows.length; r++) {
     this.rows.push(oldRows[r]);
     if (r != oldRows.length - 1) {
       this.rows.push(this.makeSpacerRow_(oldRows[r], oldRows[r + 1]));
@@ -648,11 +649,12 @@ Blockly.blockRendering.RenderInfo.prototype.addRowSpacing_ = function() {
  * @return {!Blockly.blockRendering.SpacerRow} The newly created spacer row.
  * @protected
  */
-Blockly.blockRendering.RenderInfo.prototype.makeSpacerRow_ = function(prev, next) {
-  var height = this.getSpacerRowHeight_(prev, next);
-  var width = this.getSpacerRowWidth_(prev, next);
-  var spacer = new Blockly.blockRendering.SpacerRow(
-      this.constants_, height, width);
+Blockly.blockRendering.RenderInfo.prototype.makeSpacerRow_ = function(
+    prev, next) {
+  const height = this.getSpacerRowHeight_(prev, next);
+  const width = this.getSpacerRowWidth_(prev, next);
+  const spacer =
+      new Blockly.blockRendering.SpacerRow(this.constants_, height, width);
   if (prev.hasStatement) {
     spacer.followsStatement = true;
   }
@@ -703,7 +705,7 @@ Blockly.blockRendering.RenderInfo.prototype.getElemCenterline_ = function(row,
     return row.yPos + elem.height / 2;
   }
   if (Blockly.blockRendering.Types.isBottomRow(row)) {
-    var baseline = row.yPos + row.height - row.descenderHeight;
+    const baseline = row.yPos + row.height - row.descenderHeight;
     if (Blockly.blockRendering.Types.isNextConnection(elem)) {
       return baseline + elem.height / 2;
     }
@@ -726,8 +728,8 @@ Blockly.blockRendering.RenderInfo.prototype.getElemCenterline_ = function(row,
  */
 Blockly.blockRendering.RenderInfo.prototype.recordElemPositions_ = function(
     row) {
-  var xCursor = row.xPos;
-  for (var j = 0, elem; (elem = row.elements[j]); j++) {
+  let xCursor = row.xPos;
+  for (let j = 0, elem; (elem = row.elements[j]); j++) {
     // Now that row heights are finalized, make spacers use the row height.
     if (Blockly.blockRendering.Types.isSpacer(elem)) {
       elem.height = row.height;
@@ -747,9 +749,9 @@ Blockly.blockRendering.RenderInfo.prototype.finalize_ = function() {
   // Performance note: this could be combined with the draw pass, if the time
   // that this takes is excessive.  But it shouldn't be, because it only
   // accesses and sets properties that already exist on the objects.
-  var widestRowWithConnectedBlocks = 0;
-  var yCursor = 0;
-  for (var i = 0, row; (row = this.rows[i]); i++) {
+  let widestRowWithConnectedBlocks = 0;
+  let yCursor = 0;
+  for (let i = 0, row; (row = this.rows[i]); i++) {
     row.yPos = yCursor;
     row.xPos = this.startX;
     yCursor += row.height;

From bdd0353549c57936601e884fcaffc5c4e209db70 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 16 Jul 2021 14:16:06 -0700
Subject: [PATCH 095/833] clang-format core/connection.js

---
 core/connection.js | 95 ++++++++++++++++++++--------------------------
 1 file changed, 41 insertions(+), 54 deletions(-)

diff --git a/core/connection.js b/core/connection.js
index 0c7f54605..0b26e9ace 100644
--- a/core/connection.js
+++ b/core/connection.js
@@ -144,7 +144,8 @@ Connection.prototype.connect_ = function(childConnection) {
   // Deal with the orphan if it exists.
   if (orphan) {
     const orphanConnection = parentConnection.type === INPUT ?
-        orphan.outputConnection : orphan.previousConnection;
+        orphan.outputConnection :
+        orphan.previousConnection;
     const connection = Connection.getConnectionForOrphanedConnection(
         childBlock, /** @type {!Connection} */ (orphanConnection));
     if (connection) {
@@ -161,7 +162,6 @@ Connection.prototype.connect_ = function(childConnection) {
  * @package
  */
 Connection.prototype.dispose = function() {
-
   // isConnected returns true for shadows and non-shadows.
   if (this.isConnected()) {
     // Destroy the attached shadow block & its children (if it exists).
@@ -213,12 +213,9 @@ Connection.prototype.isConnected = function() {
  */
 Connection.prototype.canConnectWithReason = function(target) {
   deprecation.warn(
-      'Connection.prototype.canConnectWithReason',
-      'July 2020',
-      'July 2021',
+      'Connection.prototype.canConnectWithReason', 'July 2020', 'July 2021',
       'the workspace\'s connection checker');
-  return this.getConnectionChecker().canConnectWithReason(
-      this, target, false);
+  return this.getConnectionChecker().canConnectWithReason(this, target, false);
 };
 
 /**
@@ -232,9 +229,7 @@ Connection.prototype.canConnectWithReason = function(target) {
  */
 Connection.prototype.checkConnection = function(target) {
   deprecation.warn(
-      'Connection.prototype.checkConnection',
-      'July 2020',
-      'July 2021',
+      'Connection.prototype.checkConnection', 'July 2020', 'July 2021',
       'the workspace\'s connection checker');
   const checker = this.getConnectionChecker();
   const reason = checker.canConnectWithReason(this, target, false);
@@ -262,9 +257,7 @@ Connection.prototype.getConnectionChecker = function() {
  */
 Connection.prototype.isConnectionAllowed = function(candidate) {
   deprecation.warn(
-      'Connection.prototype.isConnectionAllowed',
-      'July 2020',
-      'July 2021',
+      'Connection.prototype.isConnectionAllowed', 'July 2020', 'July 2021',
       'the workspace\'s connection checker');
   return this.getConnectionChecker().canConnect(this, candidate, true);
 };
@@ -364,19 +357,19 @@ Connection.getSingleConnection_ = function(block, orphanBlock) {
  *     of blocks, or null.
  * @private
  */
-Connection.getConnectionForOrphanedOutput_ =
-    function(startBlock, orphanBlock) {
-      let newBlock = startBlock;
-      let connection;
-      while ((connection = Connection.getSingleConnection_(
-          /** @type {!Block} */ (newBlock), orphanBlock))) {
-        newBlock = connection.targetBlock();
-        if (!newBlock || newBlock.isShadow()) {
-          return connection;
-        }
-      }
-      return null;
-    };
+Connection.getConnectionForOrphanedOutput_ = function(startBlock, orphanBlock) {
+  let newBlock = startBlock;
+  let connection;
+  while (
+      (connection = Connection.getSingleConnection_(
+           /** @type {!Block} */ (newBlock), orphanBlock))) {
+    newBlock = connection.targetBlock();
+    if (!newBlock || newBlock.isShadow()) {
+      return connection;
+    }
+  }
+  return null;
+};
 
 /**
  * Returns the connection (starting at the startBlock) which will accept
@@ -388,21 +381,20 @@ Connection.getConnectionForOrphanedOutput_ =
  * @return {?Connection} The suitable connection point on the chain of
  *     blocks, or null.
  */
-Connection.getConnectionForOrphanedConnection =
-    function(startBlock, orphanConnection) {
-      if (orphanConnection.type === connectionTypes.OUTPUT_VALUE) {
-        return Connection.getConnectionForOrphanedOutput_(
-            startBlock, orphanConnection.getSourceBlock());
-      }
-      // Otherwise we're dealing with a stack.
-      const connection = startBlock.lastConnectionInStack(true);
-      const checker = orphanConnection.getConnectionChecker();
-      if (connection &&
-          checker.canConnect(orphanConnection, connection, false)) {
-        return connection;
-      }
-      return null;
-    };
+Connection.getConnectionForOrphanedConnection = function(
+    startBlock, orphanConnection) {
+  if (orphanConnection.type === connectionTypes.OUTPUT_VALUE) {
+    return Connection.getConnectionForOrphanedOutput_(
+        startBlock, orphanConnection.getSourceBlock());
+  }
+  // Otherwise we're dealing with a stack.
+  const connection = startBlock.lastConnectionInStack(true);
+  const checker = orphanConnection.getConnectionChecker();
+  if (connection && checker.canConnect(orphanConnection, connection, false)) {
+    return connection;
+  }
+  return null;
+};
 
 /**
  * Disconnect this connection.
@@ -448,8 +440,7 @@ Connection.prototype.disconnect = function() {
  * @param {!Block} childBlock The inferior block.
  * @protected
  */
-Connection.prototype.disconnectInternal_ = function(parentBlock,
-    childBlock) {
+Connection.prototype.disconnectInternal_ = function(parentBlock, childBlock) {
   let event;
   if (Events.isEnabled()) {
     event = new (Events.get(Events.BLOCK_MOVE))(childBlock);
@@ -504,12 +495,9 @@ Connection.prototype.targetBlock = function() {
  */
 Connection.prototype.checkType = function(otherConnection) {
   deprecation.warn(
-      'Connection.prototype.checkType',
-      'October 2019',
-      'January 2021',
+      'Connection.prototype.checkType', 'October 2019', 'January 2021',
       'the workspace\'s connection checker');
-  return this.getConnectionChecker().canConnect(this, otherConnection,
-      false);
+  return this.getConnectionChecker().canConnect(this, otherConnection, false);
 };
 
 /**
@@ -524,9 +512,7 @@ Connection.prototype.checkType = function(otherConnection) {
  */
 Connection.prototype.checkType_ = function(otherConnection) {
   deprecation.warn(
-      'Connection.prototype.checkType_',
-      'October 2019',
-      'January 2021',
+      'Connection.prototype.checkType_', 'October 2019', 'January 2021',
       'the workspace\'s connection checker');
   return this.checkType(otherConnection);
 };
@@ -537,9 +523,10 @@ Connection.prototype.checkType_ = function(otherConnection) {
  */
 Connection.prototype.onCheckChanged_ = function() {
   // The new value type may not be compatible with the existing connection.
-  if (this.isConnected() && (!this.targetConnection ||
-      !this.getConnectionChecker().canConnect(
-          this, this.targetConnection, false))) {
+  if (this.isConnected() &&
+      (!this.targetConnection ||
+       !this.getConnectionChecker().canConnect(
+           this, this.targetConnection, false))) {
     const child = this.isSuperior() ? this.targetBlock() : this.sourceBlock_;
     child.unplug();
   }

From 29c560dfbb225d702f95a30a9560baca65a4e457 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 16 Jul 2021 14:26:36 -0700
Subject: [PATCH 096/833] Migrate core/connection_checker.js to ES6 const/let

---
 core/connection_checker.js | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/core/connection_checker.js b/core/connection_checker.js
index 004d5e3f3..d0e4576c2 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -64,14 +64,14 @@ Blockly.ConnectionChecker.prototype.canConnect = function(a, b,
  */
 Blockly.ConnectionChecker.prototype.canConnectWithReason = function(
     a, b, isDragging, opt_distance) {
-  var safety = this.doSafetyChecks(a, b);
+  const safety = this.doSafetyChecks(a, b);
   if (safety != Blockly.Connection.CAN_CONNECT) {
     return safety;
   }
 
   // If the safety checks passed, both connections are non-null.
-  var connOne = /** @type {!Blockly.Connection} **/ (a);
-  var connTwo = /** @type {!Blockly.Connection} **/ (b);
+  const connOne = /** @type {!Blockly.Connection} **/ (a);
+  const connTwo = /** @type {!Blockly.Connection} **/ (b);
   if (!this.doTypeChecks(connOne, connTwo)) {
     return Blockly.Connection.REASON_CHECKS_FAILED;
   }
@@ -108,12 +108,13 @@ Blockly.ConnectionChecker.prototype.getErrorMessage = function(errorCode,
       return 'Attempt to connect incompatible types.';
     case Blockly.Connection.REASON_TARGET_NULL:
       return 'Target connection is null.';
-    case Blockly.Connection.REASON_CHECKS_FAILED:
-      var connOne = /** @type {!Blockly.Connection} **/ (a);
-      var connTwo = /** @type {!Blockly.Connection} **/ (b);
-      var msg = 'Connection checks failed. ';
+    case Blockly.Connection.REASON_CHECKS_FAILED: {
+      const connOne = /** @type {!Blockly.Connection} **/ (a);
+      const connTwo = /** @type {!Blockly.Connection} **/ (b);
+      let msg = 'Connection checks failed. ';
       msg += connOne + ' expected ' + connOne.getCheck() + ', found ' + connTwo.getCheck();
       return msg;
+    }
     case Blockly.Connection.REASON_SHADOW_PARENT:
       return 'Connecting non-shadow to shadow block.';
     case Blockly.Connection.REASON_DRAG_CHECKS_FAILED:
@@ -135,12 +136,13 @@ Blockly.ConnectionChecker.prototype.doSafetyChecks = function(a, b) {
   if (!a || !b) {
     return Blockly.Connection.REASON_TARGET_NULL;
   }
+  let blockA, blockB;
   if (a.isSuperior()) {
-    var blockA = a.getSourceBlock();
-    var blockB = b.getSourceBlock();
+    blockA = a.getSourceBlock();
+    blockB = b.getSourceBlock();
   } else {
-    var blockB = a.getSourceBlock();
-    var blockA = b.getSourceBlock();
+    blockB = a.getSourceBlock();
+    blockA = b.getSourceBlock();
   }
   if (blockA == blockB) {
     return Blockly.Connection.REASON_SELF_CONNECTION;
@@ -164,15 +166,15 @@ Blockly.ConnectionChecker.prototype.doSafetyChecks = function(a, b) {
  * @public
  */
 Blockly.ConnectionChecker.prototype.doTypeChecks = function(a, b) {
-  var checkArrayOne = a.getCheck();
-  var checkArrayTwo = b.getCheck();
+  const checkArrayOne = a.getCheck();
+  const checkArrayTwo = b.getCheck();
 
   if (!checkArrayOne || !checkArrayTwo) {
     // One or both sides are promiscuous enough that anything will fit.
     return true;
   }
   // Find any intersection in the check lists.
-  for (var i = 0; i < checkArrayOne.length; i++) {
+  for (let i = 0; i < checkArrayOne.length; i++) {
     if (checkArrayTwo.indexOf(checkArrayOne[i]) != -1) {
       return true;
     }
@@ -274,7 +276,7 @@ Blockly.ConnectionChecker.prototype.canConnectToPrevious_ = function(a, b) {
     return true;
   }
 
-  var targetBlock = b.targetBlock();
+  const targetBlock = b.targetBlock();
   // If it is connected to a real block, game over.
   if (!targetBlock.isInsertionMarker()) {
     return false;

From 50793c20cb507eceb5385c4e9f298a8702824798 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 16 Jul 2021 14:30:16 -0700
Subject: [PATCH 097/833] Migrate core/connection_checker.js to goog.module

---
 core/connection_checker.js | 23 +++++++++++++----------
 tests/deps.js              |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/core/connection_checker.js b/core/connection_checker.js
index d0e4576c2..c4086a141 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.ConnectionChecker');
+goog.module('Blockly.ConnectionChecker');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Connection');
 goog.require('Blockly.connectionTypes');
@@ -28,7 +29,7 @@ goog.requireType('Blockly.RenderedConnection');
  * @implements {Blockly.IConnectionChecker}
  * @constructor
  */
-Blockly.ConnectionChecker = function() {
+const ConnectionChecker = function() {
 };
 
 /**
@@ -43,7 +44,7 @@ Blockly.ConnectionChecker = function() {
  * @return {boolean} Whether the connection is legal.
  * @public
  */
-Blockly.ConnectionChecker.prototype.canConnect = function(a, b,
+ConnectionChecker.prototype.canConnect = function(a, b,
     isDragging, opt_distance) {
   return this.canConnectWithReason(a, b, isDragging, opt_distance) ==
       Blockly.Connection.CAN_CONNECT;
@@ -62,7 +63,7 @@ Blockly.ConnectionChecker.prototype.canConnect = function(a, b,
  *    an error code otherwise.
  * @public
  */
-Blockly.ConnectionChecker.prototype.canConnectWithReason = function(
+ConnectionChecker.prototype.canConnectWithReason = function(
     a, b, isDragging, opt_distance) {
   const safety = this.doSafetyChecks(a, b);
   if (safety != Blockly.Connection.CAN_CONNECT) {
@@ -96,7 +97,7 @@ Blockly.ConnectionChecker.prototype.canConnectWithReason = function(
  * @return {string} A developer-readable error string.
  * @public
  */
-Blockly.ConnectionChecker.prototype.getErrorMessage = function(errorCode,
+ConnectionChecker.prototype.getErrorMessage = function(errorCode,
     a, b) {
   switch (errorCode) {
     case Blockly.Connection.REASON_SELF_CONNECTION:
@@ -132,7 +133,7 @@ Blockly.ConnectionChecker.prototype.getErrorMessage = function(errorCode,
  * @return {number} An enum with the reason this connection is safe or unsafe.
  * @public
  */
-Blockly.ConnectionChecker.prototype.doSafetyChecks = function(a, b) {
+ConnectionChecker.prototype.doSafetyChecks = function(a, b) {
   if (!a || !b) {
     return Blockly.Connection.REASON_TARGET_NULL;
   }
@@ -165,7 +166,7 @@ Blockly.ConnectionChecker.prototype.doSafetyChecks = function(a, b) {
  * @return {boolean} True if the connections share a type.
  * @public
  */
-Blockly.ConnectionChecker.prototype.doTypeChecks = function(a, b) {
+ConnectionChecker.prototype.doTypeChecks = function(a, b) {
   const checkArrayOne = a.getCheck();
   const checkArrayTwo = b.getCheck();
 
@@ -191,7 +192,7 @@ Blockly.ConnectionChecker.prototype.doTypeChecks = function(a, b) {
  * @return {boolean} True if the connection is allowed during a drag.
  * @public
  */
-Blockly.ConnectionChecker.prototype.doDragChecks = function(a, b, distance) {
+ConnectionChecker.prototype.doDragChecks = function(a, b, distance) {
   if (a.distanceFrom(b) > distance) {
     return false;
   }
@@ -260,7 +261,7 @@ Blockly.ConnectionChecker.prototype.doDragChecks = function(a, b, distance) {
  * @return {boolean} True if the connection is allowed, false otherwise.
  * @protected
  */
-Blockly.ConnectionChecker.prototype.canConnectToPrevious_ = function(a, b) {
+ConnectionChecker.prototype.canConnectToPrevious_ = function(a, b) {
   if (a.targetConnection) {
     // This connection is already occupied.
     // A next connection will never disconnect itself mid-drag.
@@ -288,4 +289,6 @@ Blockly.ConnectionChecker.prototype.canConnectToPrevious_ = function(a, b) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.CONNECTION_CHECKER,
-    Blockly.registry.DEFAULT, Blockly.ConnectionChecker);
+    Blockly.registry.DEFAULT, ConnectionChecker);
+
+exports = ConnectionChecker;
diff --git a/tests/deps.js b/tests/deps.js
index 5f5f93d89..328c3bee3 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -20,7 +20,7 @@ goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['
 goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation']);
-goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.registry']);
+goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.RenderedConnection', 'Blockly.connectionTypes', 'Blockly.constants']);
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], ['Blockly.connectionTypes']);

From 35cc70c52801cc5d68f27a64877943515ca0a686 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 12:56:16 -0700
Subject: [PATCH 098/833] Migrate core/interfaces/i_copyable.js to goog.module

---
 core/interfaces/i_copyable.js | 13 ++++++++-----
 tests/deps.js                 |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/core/interfaces/i_copyable.js b/core/interfaces/i_copyable.js
index 4aeac9776..db3381fae 100644
--- a/core/interfaces/i_copyable.js
+++ b/core/interfaces/i_copyable.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-goog.provide('Blockly.ICopyable');
+goog.module('Blockly.ICopyable');
+goog.module.declareLegacyNamespace();
 
 goog.requireType('Blockly.ISelectable');
 goog.requireType('Blockly.WorkspaceSvg');
@@ -21,13 +22,13 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @extends {Blockly.ISelectable}
  * @interface
  */
-Blockly.ICopyable = function() {};
+const ICopyable = function() {};
 
 /**
  * Encode for copying.
- * @return {?Blockly.ICopyable.CopyData} Copy metadata.
+ * @return {?ICopyable.CopyData} Copy metadata.
  */
-Blockly.ICopyable.prototype.toCopyData;
+ICopyable.prototype.toCopyData;
 
 /**
  * Copy Metadata.
@@ -37,4 +38,6 @@ Blockly.ICopyable.prototype.toCopyData;
  *            typeCounts:?Object
  *          }}
  */
-Blockly.ICopyable.CopyData;
+ICopyable.CopyData;
+
+exports = ICopyable;
diff --git a/tests/deps.js b/tests/deps.js
index 5f5f93d89..230083d23 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -81,7 +81,7 @@ goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], ['B
 goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], []);
 goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], []);
-goog.addDependency('../../core/interfaces/i_copyable.js', ['Blockly.ICopyable'], []);
+goog.addDependency('../../core/interfaces/i_copyable.js', ['Blockly.ICopyable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_deletable.js', ['Blockly.IDeletable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], ['Blockly.IComponent']);

From fb512f8b8ecb0221bc8556c9d97d0cf697b5577c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 12:57:09 -0700
Subject: [PATCH 099/833] Migrate core/interfaces/i_copyable.js named requires

---
 core/interfaces/i_copyable.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/interfaces/i_copyable.js b/core/interfaces/i_copyable.js
index db3381fae..07556eb23 100644
--- a/core/interfaces/i_copyable.js
+++ b/core/interfaces/i_copyable.js
@@ -14,12 +14,12 @@
 goog.module('Blockly.ICopyable');
 goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.ISelectable');
-goog.requireType('Blockly.WorkspaceSvg');
+const ISelectable = goog.requireType('Blockly.ISelectable');
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
- * @extends {Blockly.ISelectable}
+ * @extends {ISelectable}
  * @interface
  */
 const ICopyable = function() {};
@@ -34,7 +34,7 @@ ICopyable.prototype.toCopyData;
  * Copy Metadata.
  * @typedef {{
  *            xml:!Element,
- *            source:Blockly.WorkspaceSvg,
+ *            source:WorkspaceSvg,
  *            typeCounts:?Object
  *          }}
  */

From 20079a64aa66b87ca2ee8026801178fb4178ebb3 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 16 Jul 2021 14:38:01 -0700
Subject: [PATCH 100/833] Migrate core/renderers/common/info.js to goog.module

---
 core/renderers/common/info.js | 56 ++++++++++++++++-------------------
 tests/deps.js                 |  2 +-
 2 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js
index 9c5d62a9a..6efc4692f 100644
--- a/core/renderers/common/info.js
+++ b/core/renderers/common/info.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.blockRendering.RenderInfo');
+goog.module('Blockly.blockRendering.RenderInfo');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.BottomRow');
 goog.require('Blockly.blockRendering.ExternalValueInput');
@@ -55,7 +56,7 @@ goog.requireType('Blockly.RenderedConnection');
  * @constructor
  * @package
  */
-Blockly.blockRendering.RenderInfo = function(renderer, block) {
+const RenderInfo = function(renderer, block) {
   this.block_ = block;
 
   /**
@@ -174,7 +175,7 @@ Blockly.blockRendering.RenderInfo = function(renderer, block) {
  * @return {!Blockly.blockRendering.Renderer} The block renderer in use.
  * @package
  */
-Blockly.blockRendering.RenderInfo.prototype.getRenderer = function() {
+RenderInfo.prototype.getRenderer = function() {
   return this.renderer_;
 };
 
@@ -188,7 +189,7 @@ Blockly.blockRendering.RenderInfo.prototype.getRenderer = function() {
  *
  * @package
  */
-Blockly.blockRendering.RenderInfo.prototype.measure = function() {
+RenderInfo.prototype.measure = function() {
   this.createRows_();
   this.addElemSpacing_();
   this.addRowSpacing_();
@@ -202,7 +203,7 @@ Blockly.blockRendering.RenderInfo.prototype.measure = function() {
  * block.
  * @protected
  */
-Blockly.blockRendering.RenderInfo.prototype.createRows_ = function() {
+RenderInfo.prototype.createRows_ = function() {
   this.populateTopRow_();
   this.rows.push(this.topRow);
   let activeRow = new Blockly.blockRendering.InputRow(this.constants_);
@@ -259,7 +260,7 @@ Blockly.blockRendering.RenderInfo.prototype.createRows_ = function() {
  * Create all non-spacer elements that belong on the top row.
  * @package
  */
-Blockly.blockRendering.RenderInfo.prototype.populateTopRow_ = function() {
+RenderInfo.prototype.populateTopRow_ = function() {
   const hasPrevious = !!this.block_.previousConnection;
   const hasHat = (this.block_.hat ? this.block_.hat === 'cap' :
                                     this.constants_.ADD_START_HATS) &&
@@ -304,7 +305,7 @@ Blockly.blockRendering.RenderInfo.prototype.populateTopRow_ = function() {
  * Create all non-spacer elements that belong on the bottom row.
  * @package
  */
-Blockly.blockRendering.RenderInfo.prototype.populateBottomRow_ = function() {
+RenderInfo.prototype.populateBottomRow_ = function() {
   this.bottomRow.hasNextConnection = !!this.block_.nextConnection;
 
   const followsStatement = this.block_.inputList.length &&
@@ -356,7 +357,7 @@ Blockly.blockRendering.RenderInfo.prototype.populateBottomRow_ = function() {
  *     populated.
  * @protected
  */
-Blockly.blockRendering.RenderInfo.prototype.addInput_ = function(input, activeRow) {
+RenderInfo.prototype.addInput_ = function(input, activeRow) {
   // Non-dummy inputs have visual representations onscreen.
   if (this.isInline && input.type == Blockly.inputTypes.VALUE) {
     activeRow.elements.push(
@@ -391,7 +392,7 @@ Blockly.blockRendering.RenderInfo.prototype.addInput_ = function(input, activeRo
  * @return {boolean} True if the next input should be rendered on a new row.
  * @protected
  */
-Blockly.blockRendering.RenderInfo.prototype.shouldStartNewRow_ = function(input, lastInput) {
+RenderInfo.prototype.shouldStartNewRow_ = function(input, lastInput) {
   // If this is the first input, just add to the existing row.
   // That row is either empty or has some icons in it.
   if (!lastInput) {
@@ -414,7 +415,7 @@ Blockly.blockRendering.RenderInfo.prototype.shouldStartNewRow_ = function(input,
  * Add horizontal spacing between and around elements within each row.
  * @protected
  */
-Blockly.blockRendering.RenderInfo.prototype.addElemSpacing_ = function() {
+RenderInfo.prototype.addElemSpacing_ = function() {
   for (let i = 0, row; (row = this.rows[i]); i++) {
     const oldElems = row.elements;
     row.elements = [];
@@ -453,7 +454,7 @@ Blockly.blockRendering.RenderInfo.prototype.addElemSpacing_ = function() {
  * @return {number} The size of the spacing between the two elements.
  * @protected
  */
-Blockly.blockRendering.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
+RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   if (!prev) {
     // Statement input padding.
     if (next && Blockly.blockRendering.Types.isStatementInput(next)) {
@@ -496,7 +497,7 @@ Blockly.blockRendering.RenderInfo.prototype.getInRowSpacing_ = function(prev, ne
  * @protected
  */
 // TODO: More cleanup.
-Blockly.blockRendering.RenderInfo.prototype.computeBounds_ = function() {
+RenderInfo.prototype.computeBounds_ = function() {
   let widestStatementRowFields = 0;
   let blockWidth = 0;
   let widestRowWithConnectedBlocks = 0;
@@ -536,7 +537,7 @@ Blockly.blockRendering.RenderInfo.prototype.computeBounds_ = function() {
  * the sizes of all rows.
  * @protected
  */
-Blockly.blockRendering.RenderInfo.prototype.alignRowElements_ = function() {
+RenderInfo.prototype.alignRowElements_ = function() {
   for (let i = 0, row; (row = this.rows[i]); i++) {
     if (row.hasStatement) {
       this.alignStatementRow_(
@@ -561,8 +562,7 @@ Blockly.blockRendering.RenderInfo.prototype.alignRowElements_ = function() {
  * @return {number} The desired width of the input row.
  * @protected
  */
-Blockly.blockRendering.RenderInfo.prototype.getDesiredRowWidth_ = function(
-    _row) {
+RenderInfo.prototype.getDesiredRowWidth_ = function(_row) {
   return this.width - this.startX;
 };
 
@@ -574,8 +574,7 @@ Blockly.blockRendering.RenderInfo.prototype.getDesiredRowWidth_ = function(
  * @param {number} missingSpace How much padding to add.
  * @protected
  */
-Blockly.blockRendering.RenderInfo.prototype.addAlignmentPadding_ = function(
-    row, missingSpace) {
+RenderInfo.prototype.addAlignmentPadding_ = function(row, missingSpace) {
   const firstSpacer = row.getFirstSpacer();
   const lastSpacer = row.getLastSpacer();
   if (row.hasExternalInput || row.hasStatement) {
@@ -606,7 +605,7 @@ Blockly.blockRendering.RenderInfo.prototype.addAlignmentPadding_ = function(
  * @param {!Blockly.blockRendering.InputRow} row The statement row to resize.
  * @protected
  */
-Blockly.blockRendering.RenderInfo.prototype.alignStatementRow_ = function(row) {
+RenderInfo.prototype.alignStatementRow_ = function(row) {
   const statementInput = row.getLastInput();
   let currentWidth = row.width - statementInput.width;
   let desiredWidth = this.statementEdge;
@@ -630,7 +629,7 @@ Blockly.blockRendering.RenderInfo.prototype.alignStatementRow_ = function(row) {
  * Add spacers between rows and set their sizes.
  * @protected
  */
-Blockly.blockRendering.RenderInfo.prototype.addRowSpacing_ = function() {
+RenderInfo.prototype.addRowSpacing_ = function() {
   const oldRows = this.rows;
   this.rows = [];
 
@@ -649,8 +648,7 @@ Blockly.blockRendering.RenderInfo.prototype.addRowSpacing_ = function() {
  * @return {!Blockly.blockRendering.SpacerRow} The newly created spacer row.
  * @protected
  */
-Blockly.blockRendering.RenderInfo.prototype.makeSpacerRow_ = function(
-    prev, next) {
+RenderInfo.prototype.makeSpacerRow_ = function(prev, next) {
   const height = this.getSpacerRowHeight_(prev, next);
   const width = this.getSpacerRowWidth_(prev, next);
   const spacer =
@@ -671,8 +669,7 @@ Blockly.blockRendering.RenderInfo.prototype.makeSpacerRow_ = function(
  * @return {number} The desired width of the spacer row between these two rows.
  * @protected
  */
-Blockly.blockRendering.RenderInfo.prototype.getSpacerRowWidth_ = function(
-    _prev, _next) {
+RenderInfo.prototype.getSpacerRowWidth_ = function(_prev, _next) {
   return this.width - this.startX;
 };
 
@@ -683,8 +680,7 @@ Blockly.blockRendering.RenderInfo.prototype.getSpacerRowWidth_ = function(
  * @return {number} The desired height of the spacer row between these two rows.
  * @protected
  */
-Blockly.blockRendering.RenderInfo.prototype.getSpacerRowHeight_ = function(
-    _prev, _next) {
+RenderInfo.prototype.getSpacerRowHeight_ = function(_prev, _next) {
   return this.constants_.MEDIUM_PADDING;
 };
 
@@ -699,8 +695,7 @@ Blockly.blockRendering.RenderInfo.prototype.getSpacerRowHeight_ = function(
  *     from the top left of the block.
  * @protected
  */
-Blockly.blockRendering.RenderInfo.prototype.getElemCenterline_ = function(row,
-    elem) {
+RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
   if (Blockly.blockRendering.Types.isSpacer(elem)) {
     return row.yPos + elem.height / 2;
   }
@@ -726,8 +721,7 @@ Blockly.blockRendering.RenderInfo.prototype.getElemCenterline_ = function(row,
  * @param {!Blockly.blockRendering.Row} row The row containing the elements.
  * @protected
  */
-Blockly.blockRendering.RenderInfo.prototype.recordElemPositions_ = function(
-    row) {
+RenderInfo.prototype.recordElemPositions_ = function(row) {
   let xCursor = row.xPos;
   for (let j = 0, elem; (elem = row.elements[j]); j++) {
     // Now that row heights are finalized, make spacers use the row height.
@@ -745,7 +739,7 @@ Blockly.blockRendering.RenderInfo.prototype.recordElemPositions_ = function(
  * store the y position of each row, and record the height of the full block.
  * @protected
  */
-Blockly.blockRendering.RenderInfo.prototype.finalize_ = function() {
+RenderInfo.prototype.finalize_ = function() {
   // Performance note: this could be combined with the draw pass, if the time
   // that this takes is excessive.  But it shouldn't be, because it only
   // accesses and sets properties that already exist on the objects.
@@ -774,3 +768,5 @@ Blockly.blockRendering.RenderInfo.prototype.finalize_ = function() {
   this.startY = this.topRow.capline;
   this.bottomRow.baseline = yCursor - this.bottomRow.descenderHeight;
 };
+
+exports = RenderInfo;
diff --git a/tests/deps.js b/tests/deps.js
index 5a06dd4ae..8baeee5ab 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -118,7 +118,7 @@ goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRe
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths']);
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], []);
-goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes']);
+goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes', 'Blockly.constants']);

From e23560343ed0d9ab3fc80ae4bd908fd23e12d576 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 16 Jul 2021 14:45:35 -0700
Subject: [PATCH 101/833] Migrate core/connection_checker.js to named requires

---
 core/connection_checker.js | 103 ++++++++++++++++++-------------------
 1 file changed, 51 insertions(+), 52 deletions(-)

diff --git a/core/connection_checker.js b/core/connection_checker.js
index c4086a141..4c350fc9c 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -14,19 +14,18 @@
 goog.module('Blockly.ConnectionChecker');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Connection');
-goog.require('Blockly.connectionTypes');
+const Connection = goog.require('Blockly.Connection');
+const connectionTypes = goog.require('Blockly.connectionTypes');
+const IConnectionChecker = goog.require('Blockly.IConnectionChecker');
+const registry = goog.require('Blockly.registry');
+const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 /** @suppress {extraRequire} */
 goog.require('Blockly.constants');
-goog.require('Blockly.IConnectionChecker');
-goog.require('Blockly.registry');
-
-goog.requireType('Blockly.RenderedConnection');
 
 
 /**
  * Class for connection type checking logic.
- * @implements {Blockly.IConnectionChecker}
+ * @implements {IConnectionChecker}
  * @constructor
  */
 const ConnectionChecker = function() {
@@ -35,8 +34,8 @@ const ConnectionChecker = function() {
 /**
  * Check whether the current connection can connect with the target
  * connection.
- * @param {Blockly.Connection} a Connection to check compatibility with.
- * @param {Blockly.Connection} b Connection to check compatibility with.
+ * @param {Connection} a Connection to check compatibility with.
+ * @param {Connection} b Connection to check compatibility with.
  * @param {boolean} isDragging True if the connection is being made by dragging
  *     a block.
  * @param {number=} opt_distance The max allowable distance between the
@@ -47,52 +46,52 @@ const ConnectionChecker = function() {
 ConnectionChecker.prototype.canConnect = function(a, b,
     isDragging, opt_distance) {
   return this.canConnectWithReason(a, b, isDragging, opt_distance) ==
-      Blockly.Connection.CAN_CONNECT;
+      Connection.CAN_CONNECT;
 };
 
 /**
  * Checks whether the current connection can connect with the target
  * connection, and return an error code if there are problems.
- * @param {Blockly.Connection} a Connection to check compatibility with.
- * @param {Blockly.Connection} b Connection to check compatibility with.
+ * @param {Connection} a Connection to check compatibility with.
+ * @param {Connection} b Connection to check compatibility with.
  * @param {boolean} isDragging True if the connection is being made by dragging
  *     a block.
  * @param {number=} opt_distance The max allowable distance between the
  *     connections for drag checks.
- * @return {number} Blockly.Connection.CAN_CONNECT if the connection is legal,
+ * @return {number} Connection.CAN_CONNECT if the connection is legal,
  *    an error code otherwise.
  * @public
  */
 ConnectionChecker.prototype.canConnectWithReason = function(
     a, b, isDragging, opt_distance) {
   const safety = this.doSafetyChecks(a, b);
-  if (safety != Blockly.Connection.CAN_CONNECT) {
+  if (safety != Connection.CAN_CONNECT) {
     return safety;
   }
 
   // If the safety checks passed, both connections are non-null.
-  const connOne = /** @type {!Blockly.Connection} **/ (a);
-  const connTwo = /** @type {!Blockly.Connection} **/ (b);
+  const connOne = /** @type {!Connection} **/ (a);
+  const connTwo = /** @type {!Connection} **/ (b);
   if (!this.doTypeChecks(connOne, connTwo)) {
-    return Blockly.Connection.REASON_CHECKS_FAILED;
+    return Connection.REASON_CHECKS_FAILED;
   }
 
   if (isDragging &&
       !this.doDragChecks(
-          /** @type {!Blockly.RenderedConnection} **/ (a),
-          /** @type {!Blockly.RenderedConnection} **/ (b),
+          /** @type {!RenderedConnection} **/ (a),
+          /** @type {!RenderedConnection} **/ (b),
           opt_distance || 0)) {
-    return Blockly.Connection.REASON_DRAG_CHECKS_FAILED;
+    return Connection.REASON_DRAG_CHECKS_FAILED;
   }
 
-  return Blockly.Connection.CAN_CONNECT;
+  return Connection.CAN_CONNECT;
 };
 
 /**
  * Helper method that translates a connection error code into a string.
  * @param {number} errorCode The error code.
- * @param {Blockly.Connection} a One of the two connections being checked.
- * @param {Blockly.Connection} b The second of the two connections being
+ * @param {Connection} a One of the two connections being checked.
+ * @param {Connection} b The second of the two connections being
  *     checked.
  * @return {string} A developer-readable error string.
  * @public
@@ -100,25 +99,25 @@ ConnectionChecker.prototype.canConnectWithReason = function(
 ConnectionChecker.prototype.getErrorMessage = function(errorCode,
     a, b) {
   switch (errorCode) {
-    case Blockly.Connection.REASON_SELF_CONNECTION:
+    case Connection.REASON_SELF_CONNECTION:
       return 'Attempted to connect a block to itself.';
-    case Blockly.Connection.REASON_DIFFERENT_WORKSPACES:
+    case Connection.REASON_DIFFERENT_WORKSPACES:
       // Usually this means one block has been deleted.
       return 'Blocks not on same workspace.';
-    case Blockly.Connection.REASON_WRONG_TYPE:
+    case Connection.REASON_WRONG_TYPE:
       return 'Attempt to connect incompatible types.';
-    case Blockly.Connection.REASON_TARGET_NULL:
+    case Connection.REASON_TARGET_NULL:
       return 'Target connection is null.';
-    case Blockly.Connection.REASON_CHECKS_FAILED: {
-      const connOne = /** @type {!Blockly.Connection} **/ (a);
-      const connTwo = /** @type {!Blockly.Connection} **/ (b);
+    case Connection.REASON_CHECKS_FAILED: {
+      const connOne = /** @type {!Connection} **/ (a);
+      const connTwo = /** @type {!Connection} **/ (b);
       let msg = 'Connection checks failed. ';
       msg += connOne + ' expected ' + connOne.getCheck() + ', found ' + connTwo.getCheck();
       return msg;
     }
-    case Blockly.Connection.REASON_SHADOW_PARENT:
+    case Connection.REASON_SHADOW_PARENT:
       return 'Connecting non-shadow to shadow block.';
-    case Blockly.Connection.REASON_DRAG_CHECKS_FAILED:
+    case Connection.REASON_DRAG_CHECKS_FAILED:
       return 'Drag checks failed.';
     default:
       return 'Unknown connection failure: this should never happen!';
@@ -128,14 +127,14 @@ ConnectionChecker.prototype.getErrorMessage = function(errorCode,
 /**
  * Check that connecting the given connections is safe, meaning that it would
  * not break any of Blockly's basic assumptions (e.g. no self connections).
- * @param {Blockly.Connection} a The first of the connections to check.
- * @param {Blockly.Connection} b The second of the connections to check.
+ * @param {Connection} a The first of the connections to check.
+ * @param {Connection} b The second of the connections to check.
  * @return {number} An enum with the reason this connection is safe or unsafe.
  * @public
  */
 ConnectionChecker.prototype.doSafetyChecks = function(a, b) {
   if (!a || !b) {
-    return Blockly.Connection.REASON_TARGET_NULL;
+    return Connection.REASON_TARGET_NULL;
   }
   let blockA, blockB;
   if (a.isSuperior()) {
@@ -146,23 +145,23 @@ ConnectionChecker.prototype.doSafetyChecks = function(a, b) {
     blockA = b.getSourceBlock();
   }
   if (blockA == blockB) {
-    return Blockly.Connection.REASON_SELF_CONNECTION;
+    return Connection.REASON_SELF_CONNECTION;
   } else if (b.type != Blockly.OPPOSITE_TYPE[a.type]) {
-    return Blockly.Connection.REASON_WRONG_TYPE;
+    return Connection.REASON_WRONG_TYPE;
   } else if (blockA.workspace !== blockB.workspace) {
-    return Blockly.Connection.REASON_DIFFERENT_WORKSPACES;
+    return Connection.REASON_DIFFERENT_WORKSPACES;
   } else if (blockA.isShadow() && !blockB.isShadow()) {
-    return Blockly.Connection.REASON_SHADOW_PARENT;
+    return Connection.REASON_SHADOW_PARENT;
   }
-  return Blockly.Connection.CAN_CONNECT;
+  return Connection.CAN_CONNECT;
 };
 
 /**
  * Check whether this connection is compatible with another connection with
  * respect to the value type system.  E.g. square_root("Hello") is not
  * compatible.
- * @param {!Blockly.Connection} a Connection to compare.
- * @param {!Blockly.Connection} b Connection to compare against.
+ * @param {!Connection} a Connection to compare.
+ * @param {!Connection} b Connection to compare against.
  * @return {boolean} True if the connections share a type.
  * @public
  */
@@ -186,8 +185,8 @@ ConnectionChecker.prototype.doTypeChecks = function(a, b) {
 
 /**
  * Check whether this connection can be made by dragging.
- * @param {!Blockly.RenderedConnection} a Connection to compare.
- * @param {!Blockly.RenderedConnection} b Connection to compare against.
+ * @param {!RenderedConnection} a Connection to compare.
+ * @param {!RenderedConnection} b Connection to compare against.
  * @param {number} distance The maximum allowable distance between connections.
  * @return {boolean} True if the connection is allowed during a drag.
  * @public
@@ -203,9 +202,9 @@ ConnectionChecker.prototype.doDragChecks = function(a, b, distance) {
   }
 
   switch (b.type) {
-    case Blockly.connectionTypes.PREVIOUS_STATEMENT:
+    case connectionTypes.PREVIOUS_STATEMENT:
       return this.canConnectToPrevious_(a, b);
-    case Blockly.connectionTypes.OUTPUT_VALUE: {
+    case connectionTypes.OUTPUT_VALUE: {
       // Don't offer to connect an already connected left (male) value plug to
       // an available right (female) value plug.
       if ((b.isConnected() &&
@@ -215,7 +214,7 @@ ConnectionChecker.prototype.doDragChecks = function(a, b, distance) {
       }
       break;
     }
-    case Blockly.connectionTypes.INPUT_VALUE: {
+    case connectionTypes.INPUT_VALUE: {
       // Offering to connect the left (male) of a value block to an already
       // connected value pair is ok, we'll splice it in.
       // However, don't offer to splice into an immovable block.
@@ -226,7 +225,7 @@ ConnectionChecker.prototype.doDragChecks = function(a, b, distance) {
       }
       break;
     }
-    case Blockly.connectionTypes.NEXT_STATEMENT: {
+    case connectionTypes.NEXT_STATEMENT: {
       // Don't let a block with no next connection bump other blocks out of the
       // stack.  But covering up a shadow block or stack of shadow blocks is
       // fine.  Similarly, replacing a terminal statement with another terminal
@@ -254,9 +253,9 @@ ConnectionChecker.prototype.doDragChecks = function(a, b, distance) {
 
 /**
  * Helper function for drag checking.
- * @param {!Blockly.Connection} a The connection to check, which must be a
+ * @param {!Connection} a The connection to check, which must be a
  *     statement input or next connection.
- * @param {!Blockly.Connection} b A nearby connection to check, which
+ * @param {!Connection} b A nearby connection to check, which
  *     must be a previous connection.
  * @return {boolean} True if the connection is allowed, false otherwise.
  * @protected
@@ -288,7 +287,7 @@ ConnectionChecker.prototype.canConnectToPrevious_ = function(a, b) {
   return !targetBlock.getPreviousBlock();
 };
 
-Blockly.registry.register(Blockly.registry.Type.CONNECTION_CHECKER,
-    Blockly.registry.DEFAULT, ConnectionChecker);
+registry.register(registry.Type.CONNECTION_CHECKER,
+    registry.DEFAULT, ConnectionChecker);
 
 exports = ConnectionChecker;

From 5b9505802e4aea4e403cb1ef4fcc1adbd6a92f67 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 16 Jul 2021 14:46:07 -0700
Subject: [PATCH 102/833] clang-format core/connection_checker.js

---
 core/connection_checker.js | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/core/connection_checker.js b/core/connection_checker.js
index 4c350fc9c..3a405edcb 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -5,8 +5,8 @@
  */
 
 /**
- * @fileoverview An object that encapsulates logic for checking whether a potential
- * connection is safe and valid.
+ * @fileoverview An object that encapsulates logic for checking whether a
+ * potential connection is safe and valid.
  * @author fenichel@google.com (Rachel Fenichel)
  */
 'use strict';
@@ -28,8 +28,7 @@ goog.require('Blockly.constants');
  * @implements {IConnectionChecker}
  * @constructor
  */
-const ConnectionChecker = function() {
-};
+const ConnectionChecker = function() {};
 
 /**
  * Check whether the current connection can connect with the target
@@ -43,8 +42,8 @@ const ConnectionChecker = function() {
  * @return {boolean} Whether the connection is legal.
  * @public
  */
-ConnectionChecker.prototype.canConnect = function(a, b,
-    isDragging, opt_distance) {
+ConnectionChecker.prototype.canConnect = function(
+    a, b, isDragging, opt_distance) {
   return this.canConnectWithReason(a, b, isDragging, opt_distance) ==
       Connection.CAN_CONNECT;
 };
@@ -79,8 +78,7 @@ ConnectionChecker.prototype.canConnectWithReason = function(
   if (isDragging &&
       !this.doDragChecks(
           /** @type {!RenderedConnection} **/ (a),
-          /** @type {!RenderedConnection} **/ (b),
-          opt_distance || 0)) {
+          /** @type {!RenderedConnection} **/ (b), opt_distance || 0)) {
     return Connection.REASON_DRAG_CHECKS_FAILED;
   }
 
@@ -96,8 +94,7 @@ ConnectionChecker.prototype.canConnectWithReason = function(
  * @return {string} A developer-readable error string.
  * @public
  */
-ConnectionChecker.prototype.getErrorMessage = function(errorCode,
-    a, b) {
+ConnectionChecker.prototype.getErrorMessage = function(errorCode, a, b) {
   switch (errorCode) {
     case Connection.REASON_SELF_CONNECTION:
       return 'Attempted to connect a block to itself.';
@@ -112,7 +109,8 @@ ConnectionChecker.prototype.getErrorMessage = function(errorCode,
       const connOne = /** @type {!Connection} **/ (a);
       const connTwo = /** @type {!Connection} **/ (b);
       let msg = 'Connection checks failed. ';
-      msg += connOne + ' expected ' + connOne.getCheck() + ', found ' + connTwo.getCheck();
+      msg += connOne + ' expected ' + connOne.getCheck() + ', found ' +
+          connTwo.getCheck();
       return msg;
     }
     case Connection.REASON_SHADOW_PARENT:
@@ -207,8 +205,7 @@ ConnectionChecker.prototype.doDragChecks = function(a, b, distance) {
     case connectionTypes.OUTPUT_VALUE: {
       // Don't offer to connect an already connected left (male) value plug to
       // an available right (female) value plug.
-      if ((b.isConnected() &&
-          !b.targetBlock().isInsertionMarker()) ||
+      if ((b.isConnected() && !b.targetBlock().isInsertionMarker()) ||
           a.isConnected()) {
         return false;
       }
@@ -218,8 +215,7 @@ ConnectionChecker.prototype.doDragChecks = function(a, b, distance) {
       // Offering to connect the left (male) of a value block to an already
       // connected value pair is ok, we'll splice it in.
       // However, don't offer to splice into an immovable block.
-      if (b.isConnected() &&
-          !b.targetBlock().isMovable() &&
+      if (b.isConnected() && !b.targetBlock().isMovable() &&
           !b.targetBlock().isShadow()) {
         return false;
       }
@@ -230,10 +226,8 @@ ConnectionChecker.prototype.doDragChecks = function(a, b, distance) {
       // stack.  But covering up a shadow block or stack of shadow blocks is
       // fine.  Similarly, replacing a terminal statement with another terminal
       // statement is allowed.
-      if (b.isConnected() &&
-          !a.getSourceBlock().nextConnection &&
-          !b.targetBlock().isShadow() &&
-          b.targetBlock().nextConnection) {
+      if (b.isConnected() && !a.getSourceBlock().nextConnection &&
+          !b.targetBlock().isShadow() && b.targetBlock().nextConnection) {
         return false;
       }
       break;
@@ -287,7 +281,7 @@ ConnectionChecker.prototype.canConnectToPrevious_ = function(a, b) {
   return !targetBlock.getPreviousBlock();
 };
 
-registry.register(registry.Type.CONNECTION_CHECKER,
-    registry.DEFAULT, ConnectionChecker);
+registry.register(
+    registry.Type.CONNECTION_CHECKER, registry.DEFAULT, ConnectionChecker);
 
 exports = ConnectionChecker;

From f38a4519878a0e6c70218af505c4aaf5a01eaef7 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 16 Jul 2021 13:11:19 -0700
Subject: [PATCH 103/833] Migrate core/comment.js to ES6 const/let

---
 core/comment.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/comment.js b/core/comment.js
index 7917b2ec5..5e867d9df 100644
--- a/core/comment.js
+++ b/core/comment.js
@@ -152,13 +152,13 @@ Blockly.Comment.prototype.createEditor_ = function() {
       {'x': Blockly.Bubble.BORDER_WIDTH, 'y': Blockly.Bubble.BORDER_WIDTH},
       null);
 
-  var body = document.createElementNS(Blockly.utils.dom.HTML_NS, 'body');
+  const body = document.createElementNS(Blockly.utils.dom.HTML_NS, 'body');
   body.setAttribute('xmlns', Blockly.utils.dom.HTML_NS);
   body.className = 'blocklyMinimalBody';
 
   this.textarea_ = document.createElementNS(
       Blockly.utils.dom.HTML_NS, 'textarea');
-  var textarea = this.textarea_;
+  const textarea = this.textarea_;
   textarea.className = 'blocklyCommentTextarea';
   textarea.setAttribute('dir', this.block_.RTL ? 'RTL' : 'LTR');
   textarea.value = this.model_.text;
@@ -228,10 +228,10 @@ Blockly.Comment.prototype.onBubbleResize_ = function() {
  * @private
  */
 Blockly.Comment.prototype.resizeTextarea_ = function() {
-  var size = this.model_.size;
-  var doubleBorderWidth = 2 * Blockly.Bubble.BORDER_WIDTH;
-  var widthMinusBorder = size.width - doubleBorderWidth;
-  var heightMinusBorder = size.height - doubleBorderWidth;
+  const size = this.model_.size;
+  const doubleBorderWidth = 2 * Blockly.Bubble.BORDER_WIDTH;
+  const widthMinusBorder = size.width - doubleBorderWidth;
+  const heightMinusBorder = size.height - doubleBorderWidth;
   this.foreignObject_.setAttribute('width', widthMinusBorder);
   this.foreignObject_.setAttribute('height', heightMinusBorder);
   this.textarea_.style.width = (widthMinusBorder - 4) + 'px';

From 530964e03b83a26f0e6880040bc73dcdad8dabed Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 16 Jul 2021 13:15:42 -0700
Subject: [PATCH 104/833] Migrate core/comment.js to goog.module

---
 core/comment.js | 43 +++++++++++++++++++++++--------------------
 tests/deps.js   |  2 +-
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/core/comment.js b/core/comment.js
index 5e867d9df..1e585d63c 100644
--- a/core/comment.js
+++ b/core/comment.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Comment');
+goog.module('Blockly.Comment');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.Bubble');
@@ -41,8 +42,8 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @extends {Blockly.Icon}
  * @constructor
  */
-Blockly.Comment = function(block) {
-  Blockly.Comment.superClass_.constructor.call(this, block);
+const Comment = function(block) {
+  Comment.superClass_.constructor.call(this, block);
 
   /**
    * The model for this comment.
@@ -92,14 +93,14 @@ Blockly.Comment = function(block) {
 
   this.createIcon();
 };
-Blockly.utils.object.inherits(Blockly.Comment, Blockly.Icon);
+Blockly.utils.object.inherits(Comment, Blockly.Icon);
 
 /**
  * Draw the comment icon.
  * @param {!Element} group The icon group.
  * @protected
  */
-Blockly.Comment.prototype.drawIcon_ = function(group) {
+Comment.prototype.drawIcon_ = function(group) {
   // Circle.
   Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.CIRCLE,
@@ -134,7 +135,7 @@ Blockly.Comment.prototype.drawIcon_ = function(group) {
  * @return {!SVGElement} The top-level node of the editor.
  * @private
  */
-Blockly.Comment.prototype.createEditor_ = function() {
+Comment.prototype.createEditor_ = function() {
   /* Create the editor.  Here's the markup that will be generated in
    * editable mode:
     <foreignObject x="8" y="8" width="164" height="164">
@@ -200,8 +201,8 @@ Blockly.Comment.prototype.createEditor_ = function() {
  * Add or remove editability of the comment.
  * @override
  */
-Blockly.Comment.prototype.updateEditable = function() {
-  Blockly.Comment.superClass_.updateEditable.call(this);
+Comment.prototype.updateEditable = function() {
+  Comment.superClass_.updateEditable.call(this);
   if (this.isVisible()) {
     // Recreate the bubble with the correct UI.
     this.disposeBubble_();
@@ -214,7 +215,7 @@ Blockly.Comment.prototype.updateEditable = function() {
  * Resize the text area accordingly.
  * @private
  */
-Blockly.Comment.prototype.onBubbleResize_ = function() {
+Comment.prototype.onBubbleResize_ = function() {
   if (!this.isVisible()) {
     return;
   }
@@ -227,7 +228,7 @@ Blockly.Comment.prototype.onBubbleResize_ = function() {
  * the size of the bubble).
  * @private
  */
-Blockly.Comment.prototype.resizeTextarea_ = function() {
+Comment.prototype.resizeTextarea_ = function() {
   const size = this.model_.size;
   const doubleBorderWidth = 2 * Blockly.Bubble.BORDER_WIDTH;
   const widthMinusBorder = size.width - doubleBorderWidth;
@@ -242,7 +243,7 @@ Blockly.Comment.prototype.resizeTextarea_ = function() {
  * Show or hide the comment bubble.
  * @param {boolean} visible True if the bubble should be visible.
  */
-Blockly.Comment.prototype.setVisible = function(visible) {
+Comment.prototype.setVisible = function(visible) {
   if (visible == this.isVisible()) {
     return;
   }
@@ -260,7 +261,7 @@ Blockly.Comment.prototype.setVisible = function(visible) {
  * Show the bubble. Handles deciding if it should be editable or not.
  * @private
  */
-Blockly.Comment.prototype.createBubble_ = function() {
+Comment.prototype.createBubble_ = function() {
   if (!this.block_.isEditable() || Blockly.utils.userAgent.IE) {
     // MSIE does not support foreignobject; textareas are impossible.
     // https://docs.microsoft.com/en-us/openspecs/ie_standards/ms-svg/56e6e04c-7c8c-44dd-8100-bd745ee42034
@@ -275,7 +276,7 @@ Blockly.Comment.prototype.createBubble_ = function() {
  * Show an editable bubble.
  * @private
  */
-Blockly.Comment.prototype.createEditableBubble_ = function() {
+Comment.prototype.createEditableBubble_ = function() {
   this.bubble_ = new Blockly.Bubble(
       /** @type {!Blockly.WorkspaceSvg} */ (this.block_.workspace),
       this.createEditor_(), this.block_.pathObject.svgPath,
@@ -292,7 +293,7 @@ Blockly.Comment.prototype.createEditableBubble_ = function() {
  * @private
  * @suppress {checkTypes} Suppress `this` type mismatch.
  */
-Blockly.Comment.prototype.createNonEditableBubble_ = function() {
+Comment.prototype.createNonEditableBubble_ = function() {
   // TODO (#2917): It would be great if the comment could support line breaks.
   this.paragraphElement_ = Blockly.Bubble.textToDom(this.block_.getCommentText());
   this.bubble_ = Blockly.Bubble.createNonEditableBubble(
@@ -306,7 +307,7 @@ Blockly.Comment.prototype.createNonEditableBubble_ = function() {
  * @private
  * @suppress {checkTypes} Suppress `this` type mismatch.
  */
-Blockly.Comment.prototype.disposeBubble_ = function() {
+Comment.prototype.disposeBubble_ = function() {
   if (this.onMouseUpWrapper_) {
     Blockly.browserEvents.unbind(this.onMouseUpWrapper_);
     this.onMouseUpWrapper_ = null;
@@ -338,7 +339,7 @@ Blockly.Comment.prototype.disposeBubble_ = function() {
  * @param {!Event} _e Mouse up event.
  * @private
  */
-Blockly.Comment.prototype.startEdit_ = function(_e) {
+Comment.prototype.startEdit_ = function(_e) {
   if (this.bubble_.promote()) {
     // Since the act of moving this node within the DOM causes a loss of focus,
     // we need to reapply the focus.
@@ -352,7 +353,7 @@ Blockly.Comment.prototype.startEdit_ = function(_e) {
  * Get the dimensions of this comment's bubble.
  * @return {Blockly.utils.Size} Object with width and height properties.
  */
-Blockly.Comment.prototype.getBubbleSize = function() {
+Comment.prototype.getBubbleSize = function() {
   return this.model_.size;
 };
 
@@ -361,7 +362,7 @@ Blockly.Comment.prototype.getBubbleSize = function() {
  * @param {number} width Width of the bubble.
  * @param {number} height Height of the bubble.
  */
-Blockly.Comment.prototype.setBubbleSize = function(width, height) {
+Comment.prototype.setBubbleSize = function(width, height) {
   if (this.bubble_) {
     this.bubble_.setBubbleSize(width, height);
   } else {
@@ -374,7 +375,7 @@ Blockly.Comment.prototype.setBubbleSize = function(width, height) {
  * Update the comment's view to match the model.
  * @package
  */
-Blockly.Comment.prototype.updateText = function() {
+Comment.prototype.updateText = function() {
   if (this.textarea_) {
     this.textarea_.value = this.model_.text;
   } else if (this.paragraphElement_) {
@@ -390,7 +391,7 @@ Blockly.Comment.prototype.updateText = function() {
  * If you want to receive a comment "delete" event (newValue: null), then this
  * should not be called directly. Instead call block.setCommentText(null);
  */
-Blockly.Comment.prototype.dispose = function() {
+Comment.prototype.dispose = function() {
   this.block_.comment = null;
   Blockly.Icon.prototype.dispose.call(this);
 };
@@ -412,3 +413,5 @@ Blockly.Css.register([
   '}'
   /* eslint-enable indent */
 ]);
+
+exports = Comment;
diff --git a/tests/deps.js b/tests/deps.js
index 5f5f93d89..f04468cf7 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -17,7 +17,7 @@ goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6
 goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global']);
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
-goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation']);
 goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.registry']);

From 30a6948a9a30a04ad60de79831d56a3a0ea79e82 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 16 Jul 2021 13:37:05 -0700
Subject: [PATCH 105/833] Migrate core/comment.js to named requires

---
 core/comment.js | 116 ++++++++++++++++++++++++------------------------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/core/comment.js b/core/comment.js
index 1e585d63c..18615d669 100644
--- a/core/comment.js
+++ b/core/comment.js
@@ -13,33 +13,33 @@
 goog.module('Blockly.Comment');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.Bubble');
-goog.require('Blockly.Css');
-goog.require('Blockly.Events');
+const Block = goog.requireType('Blockly.Block');
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const browserEvents = goog.require('Blockly.browserEvents');
+const Bubble = goog.require('Blockly.Bubble');
+const Coordinate = goog.requireType('Blockly.utils.Coordinate');
+const Css = goog.require('Blockly.Css');
+const dom = goog.require('Blockly.utils.dom');
+const Events = goog.require('Blockly.Events');
+const Icon = goog.require('Blockly.Icon');
+const Size = goog.requireType('Blockly.utils.Size');
+const Svg = goog.require('Blockly.utils.Svg');
+const userAgent = goog.require('Blockly.utils.userAgent');
+const utilsObject = goog.require('Blockly.utils.object');
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const {CommentModel} = goog.requireType('Blockly.Block');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BubbleOpen');
-goog.require('Blockly.Icon');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.userAgent');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Warning');
 
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.utils.Coordinate');
-goog.requireType('Blockly.utils.Size');
-goog.requireType('Blockly.WorkspaceSvg');
-
 
 /**
  * Class for a comment.
- * @param {!Blockly.Block} block The block associated with this comment.
- * @extends {Blockly.Icon}
+ * @param {!Block} block The block associated with this comment.
+ * @extends {Icon}
  * @constructor
  */
 const Comment = function(block) {
@@ -47,7 +47,7 @@ const Comment = function(block) {
 
   /**
    * The model for this comment.
-   * @type {!Blockly.Block.CommentModel}
+   * @type {!CommentModel}
    * @private
    */
   this.model_ = block.commentModel;
@@ -65,35 +65,35 @@ const Comment = function(block) {
 
   /**
    * Mouse up event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onMouseUpWrapper_ = null;
 
   /**
    * Wheel event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onWheelWrapper_ = null;
 
   /**
    * Change event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onChangeWrapper_ = null;
 
   /**
    * Input event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onInputWrapper_ = null;
 
   this.createIcon();
 };
-Blockly.utils.object.inherits(Comment, Blockly.Icon);
+utilsObject.inherits(Comment, Icon);
 
 /**
  * Draw the comment icon.
@@ -102,15 +102,15 @@ Blockly.utils.object.inherits(Comment, Blockly.Icon);
  */
 Comment.prototype.drawIcon_ = function(group) {
   // Circle.
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.CIRCLE,
+  dom.createSvgElement(
+      Svg.CIRCLE,
       {'class': 'blocklyIconShape', 'r': '8', 'cx': '8', 'cy': '8'},
       group);
   // Can't use a real '?' text character since different browsers and operating
   // systems render it differently.
   // Body of question mark.
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
+  dom.createSvgElement(
+      Svg.PATH,
       {
         'class': 'blocklyIconSymbol',
         'd': 'm6.8,10h2c0.003,-0.617 0.271,-0.962 0.633,-1.266 2.875,-2.405' +
@@ -118,8 +118,8 @@ Comment.prototype.drawIcon_ = function(group) {
           '-1.201,0.998 -1.201,1.528 -1.204,2.19z'},
       group);
   // Dot of question mark.
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  dom.createSvgElement(
+      Svg.RECT,
       {
         'class': 'blocklyIconSymbol',
         'x': '6.8',
@@ -148,17 +148,17 @@ Comment.prototype.createEditor_ = function() {
    * For non-editable mode see Warning.textToDom_.
    */
 
-  this.foreignObject_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FOREIGNOBJECT,
-      {'x': Blockly.Bubble.BORDER_WIDTH, 'y': Blockly.Bubble.BORDER_WIDTH},
+  this.foreignObject_ = dom.createSvgElement(
+      Svg.FOREIGNOBJECT,
+      {'x': Bubble.BORDER_WIDTH, 'y': Bubble.BORDER_WIDTH},
       null);
 
-  const body = document.createElementNS(Blockly.utils.dom.HTML_NS, 'body');
-  body.setAttribute('xmlns', Blockly.utils.dom.HTML_NS);
+  const body = document.createElementNS(dom.HTML_NS, 'body');
+  body.setAttribute('xmlns', dom.HTML_NS);
   body.className = 'blocklyMinimalBody';
 
   this.textarea_ = document.createElementNS(
-      Blockly.utils.dom.HTML_NS, 'textarea');
+      dom.HTML_NS, 'textarea');
   const textarea = this.textarea_;
   textarea.className = 'blocklyCommentTextarea';
   textarea.setAttribute('dir', this.block_.RTL ? 'RTL' : 'LTR');
@@ -171,23 +171,23 @@ Comment.prototype.createEditor_ = function() {
   // Ideally this would be hooked to the focus event for the comment.
   // However doing so in Firefox swallows the cursor for unknown reasons.
   // So this is hooked to mouseup instead.  No big deal.
-  this.onMouseUpWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onMouseUpWrapper_ = browserEvents.conditionalBind(
       textarea, 'mouseup', this, this.startEdit_, true, true);
   // Don't zoom with mousewheel.
-  this.onWheelWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onWheelWrapper_ = browserEvents.conditionalBind(
       textarea, 'wheel', this, function(e) {
         e.stopPropagation();
       });
-  this.onChangeWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onChangeWrapper_ = browserEvents.conditionalBind(
       textarea, 'change', this, function(_e) {
         if (this.cachedText_ != this.model_.text) {
-          Blockly.Events.fire(
-              new (Blockly.Events.get(Blockly.Events.BLOCK_CHANGE))(
+          Events.fire(
+              new (Events.get(Events.BLOCK_CHANGE))(
                   this.block_, 'comment', null, this.cachedText_,
                   this.model_.text));
         }
       });
-  this.onInputWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onInputWrapper_ = browserEvents.conditionalBind(
       textarea, 'input', this, function(_e) {
         this.model_.text = textarea.value;
       });
@@ -230,7 +230,7 @@ Comment.prototype.onBubbleResize_ = function() {
  */
 Comment.prototype.resizeTextarea_ = function() {
   const size = this.model_.size;
-  const doubleBorderWidth = 2 * Blockly.Bubble.BORDER_WIDTH;
+  const doubleBorderWidth = 2 * Bubble.BORDER_WIDTH;
   const widthMinusBorder = size.width - doubleBorderWidth;
   const heightMinusBorder = size.height - doubleBorderWidth;
   this.foreignObject_.setAttribute('width', widthMinusBorder);
@@ -247,7 +247,7 @@ Comment.prototype.setVisible = function(visible) {
   if (visible == this.isVisible()) {
     return;
   }
-  Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BUBBLE_OPEN))(
+  Events.fire(new (Events.get(Events.BUBBLE_OPEN))(
       this.block_, visible, 'comment'));
   this.model_.pinned = visible;
   if (visible) {
@@ -262,7 +262,7 @@ Comment.prototype.setVisible = function(visible) {
  * @private
  */
 Comment.prototype.createBubble_ = function() {
-  if (!this.block_.isEditable() || Blockly.utils.userAgent.IE) {
+  if (!this.block_.isEditable() || userAgent.IE) {
     // MSIE does not support foreignobject; textareas are impossible.
     // https://docs.microsoft.com/en-us/openspecs/ie_standards/ms-svg/56e6e04c-7c8c-44dd-8100-bd745ee42034
     // Always treat comments in IE as uneditable.
@@ -277,10 +277,10 @@ Comment.prototype.createBubble_ = function() {
  * @private
  */
 Comment.prototype.createEditableBubble_ = function() {
-  this.bubble_ = new Blockly.Bubble(
-      /** @type {!Blockly.WorkspaceSvg} */ (this.block_.workspace),
+  this.bubble_ = new Bubble(
+      /** @type {!WorkspaceSvg} */ (this.block_.workspace),
       this.createEditor_(), this.block_.pathObject.svgPath,
-      /** @type {!Blockly.utils.Coordinate} */ (this.iconXY_),
+      /** @type {!Coordinate} */ (this.iconXY_),
       this.model_.size.width, this.model_.size.height);
   // Expose this comment's block's ID on its top-level SVG group.
   this.bubble_.setSvgId(this.block_.id);
@@ -295,10 +295,10 @@ Comment.prototype.createEditableBubble_ = function() {
  */
 Comment.prototype.createNonEditableBubble_ = function() {
   // TODO (#2917): It would be great if the comment could support line breaks.
-  this.paragraphElement_ = Blockly.Bubble.textToDom(this.block_.getCommentText());
-  this.bubble_ = Blockly.Bubble.createNonEditableBubble(
-      this.paragraphElement_, /** @type {!Blockly.BlockSvg} */ (this.block_),
-      /** @type {!Blockly.utils.Coordinate} */ (this.iconXY_));
+  this.paragraphElement_ = Bubble.textToDom(this.block_.getCommentText());
+  this.bubble_ = Bubble.createNonEditableBubble(
+      this.paragraphElement_, /** @type {!BlockSvg} */ (this.block_),
+      /** @type {!Coordinate} */ (this.iconXY_));
   this.applyColour();
 };
 
@@ -309,19 +309,19 @@ Comment.prototype.createNonEditableBubble_ = function() {
  */
 Comment.prototype.disposeBubble_ = function() {
   if (this.onMouseUpWrapper_) {
-    Blockly.browserEvents.unbind(this.onMouseUpWrapper_);
+    browserEvents.unbind(this.onMouseUpWrapper_);
     this.onMouseUpWrapper_ = null;
   }
   if (this.onWheelWrapper_) {
-    Blockly.browserEvents.unbind(this.onWheelWrapper_);
+    browserEvents.unbind(this.onWheelWrapper_);
     this.onWheelWrapper_ = null;
   }
   if (this.onChangeWrapper_) {
-    Blockly.browserEvents.unbind(this.onChangeWrapper_);
+    browserEvents.unbind(this.onChangeWrapper_);
     this.onChangeWrapper_ = null;
   }
   if (this.onInputWrapper_) {
-    Blockly.browserEvents.unbind(this.onInputWrapper_);
+    browserEvents.unbind(this.onInputWrapper_);
     this.onInputWrapper_ = null;
   }
   this.bubble_.dispose();
@@ -351,7 +351,7 @@ Comment.prototype.startEdit_ = function(_e) {
 
 /**
  * Get the dimensions of this comment's bubble.
- * @return {Blockly.utils.Size} Object with width and height properties.
+ * @return {Size} Object with width and height properties.
  */
 Comment.prototype.getBubbleSize = function() {
   return this.model_.size;
@@ -393,13 +393,13 @@ Comment.prototype.updateText = function() {
  */
 Comment.prototype.dispose = function() {
   this.block_.comment = null;
-  Blockly.Icon.prototype.dispose.call(this);
+  Icon.prototype.dispose.call(this);
 };
 
 /**
  * CSS for block comment.  See css.js for use.
  */
-Blockly.Css.register([
+Css.register([
   /* eslint-disable indent */
   '.blocklyCommentTextarea {',
     'background-color: #fef49c;',

From d1ae27eb6071981e60751fa44244790e15c9bfa1 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 16 Jul 2021 13:38:00 -0700
Subject: [PATCH 106/833] clang-format core/comment.js

---
 core/comment.js | 47 +++++++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/core/comment.js b/core/comment.js
index 18615d669..fe0c940a6 100644
--- a/core/comment.js
+++ b/core/comment.js
@@ -103,24 +103,22 @@ utilsObject.inherits(Comment, Icon);
 Comment.prototype.drawIcon_ = function(group) {
   // Circle.
   dom.createSvgElement(
-      Svg.CIRCLE,
-      {'class': 'blocklyIconShape', 'r': '8', 'cx': '8', 'cy': '8'},
+      Svg.CIRCLE, {'class': 'blocklyIconShape', 'r': '8', 'cx': '8', 'cy': '8'},
       group);
   // Can't use a real '?' text character since different browsers and operating
   // systems render it differently.
   // Body of question mark.
   dom.createSvgElement(
-      Svg.PATH,
-      {
+      Svg.PATH, {
         'class': 'blocklyIconSymbol',
         'd': 'm6.8,10h2c0.003,-0.617 0.271,-0.962 0.633,-1.266 2.875,-2.405' +
-          '0.607,-5.534 -3.765,-3.874v1.7c3.12,-1.657 3.698,0.118 2.336,1.25' +
-          '-1.201,0.998 -1.201,1.528 -1.204,2.19z'},
+            '0.607,-5.534 -3.765,-3.874v1.7c3.12,-1.657 3.698,0.118 2.336,1.25' +
+            '-1.201,0.998 -1.201,1.528 -1.204,2.19z'
+      },
       group);
   // Dot of question mark.
   dom.createSvgElement(
-      Svg.RECT,
-      {
+      Svg.RECT, {
         'class': 'blocklyIconSymbol',
         'x': '6.8',
         'y': '10.78',
@@ -149,16 +147,14 @@ Comment.prototype.createEditor_ = function() {
    */
 
   this.foreignObject_ = dom.createSvgElement(
-      Svg.FOREIGNOBJECT,
-      {'x': Bubble.BORDER_WIDTH, 'y': Bubble.BORDER_WIDTH},
+      Svg.FOREIGNOBJECT, {'x': Bubble.BORDER_WIDTH, 'y': Bubble.BORDER_WIDTH},
       null);
 
   const body = document.createElementNS(dom.HTML_NS, 'body');
   body.setAttribute('xmlns', dom.HTML_NS);
   body.className = 'blocklyMinimalBody';
 
-  this.textarea_ = document.createElementNS(
-      dom.HTML_NS, 'textarea');
+  this.textarea_ = document.createElementNS(dom.HTML_NS, 'textarea');
   const textarea = this.textarea_;
   textarea.className = 'blocklyCommentTextarea';
   textarea.setAttribute('dir', this.block_.RTL ? 'RTL' : 'LTR');
@@ -174,21 +170,20 @@ Comment.prototype.createEditor_ = function() {
   this.onMouseUpWrapper_ = browserEvents.conditionalBind(
       textarea, 'mouseup', this, this.startEdit_, true, true);
   // Don't zoom with mousewheel.
-  this.onWheelWrapper_ = browserEvents.conditionalBind(
-      textarea, 'wheel', this, function(e) {
+  this.onWheelWrapper_ =
+      browserEvents.conditionalBind(textarea, 'wheel', this, function(e) {
         e.stopPropagation();
       });
-  this.onChangeWrapper_ = browserEvents.conditionalBind(
-      textarea, 'change', this, function(_e) {
+  this.onChangeWrapper_ =
+      browserEvents.conditionalBind(textarea, 'change', this, function(_e) {
         if (this.cachedText_ != this.model_.text) {
-          Events.fire(
-              new (Events.get(Events.BLOCK_CHANGE))(
-                  this.block_, 'comment', null, this.cachedText_,
-                  this.model_.text));
+          Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
+              this.block_, 'comment', null, this.cachedText_,
+              this.model_.text));
         }
       });
-  this.onInputWrapper_ = browserEvents.conditionalBind(
-      textarea, 'input', this, function(_e) {
+  this.onInputWrapper_ =
+      browserEvents.conditionalBind(textarea, 'input', this, function(_e) {
         this.model_.text = textarea.value;
       });
 
@@ -247,8 +242,8 @@ Comment.prototype.setVisible = function(visible) {
   if (visible == this.isVisible()) {
     return;
   }
-  Events.fire(new (Events.get(Events.BUBBLE_OPEN))(
-      this.block_, visible, 'comment'));
+  Events.fire(
+      new (Events.get(Events.BUBBLE_OPEN))(this.block_, visible, 'comment'));
   this.model_.pinned = visible;
   if (visible) {
     this.createBubble_();
@@ -280,8 +275,8 @@ Comment.prototype.createEditableBubble_ = function() {
   this.bubble_ = new Bubble(
       /** @type {!WorkspaceSvg} */ (this.block_.workspace),
       this.createEditor_(), this.block_.pathObject.svgPath,
-      /** @type {!Coordinate} */ (this.iconXY_),
-      this.model_.size.width, this.model_.size.height);
+      /** @type {!Coordinate} */ (this.iconXY_), this.model_.size.width,
+      this.model_.size.height);
   // Expose this comment's block's ID on its top-level SVG group.
   this.bubble_.setSvgId(this.block_.id);
   this.bubble_.registerResizeEvent(this.onBubbleResize_.bind(this));

From b3877ffbb9e720351bb2e3aa27982584233fffe1 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 16 Jul 2021 15:13:41 -0700
Subject: [PATCH 107/833] Migrate core/renderers/common/info.js to named
 requires

---
 core/renderers/common/info.js | 249 ++++++++++++++++------------------
 tests/deps.js                 |   2 +-
 2 files changed, 118 insertions(+), 133 deletions(-)

diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js
index 6efc4692f..3c5e70ee4 100644
--- a/core/renderers/common/info.js
+++ b/core/renderers/common/info.js
@@ -13,35 +13,34 @@
 goog.module('Blockly.blockRendering.RenderInfo');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.BottomRow');
-goog.require('Blockly.blockRendering.ExternalValueInput');
-goog.require('Blockly.blockRendering.Field');
-goog.require('Blockly.blockRendering.Hat');
-goog.require('Blockly.blockRendering.InlineInput');
-goog.require('Blockly.blockRendering.InputRow');
-goog.require('Blockly.blockRendering.InRowSpacer');
-goog.require('Blockly.blockRendering.JaggedEdge');
-goog.require('Blockly.blockRendering.Measurable');
-goog.require('Blockly.blockRendering.NextConnection');
-goog.require('Blockly.blockRendering.OutputConnection');
-goog.require('Blockly.blockRendering.PreviousConnection');
-goog.require('Blockly.blockRendering.RoundCorner');
-goog.require('Blockly.blockRendering.Row');
-goog.require('Blockly.blockRendering.SpacerRow');
-goog.require('Blockly.blockRendering.SquareCorner');
-goog.require('Blockly.blockRendering.StatementInput');
-goog.require('Blockly.blockRendering.TopRow');
-goog.require('Blockly.blockRendering.Types');
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const BottomRow = goog.require('Blockly.blockRendering.BottomRow');
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const ExternalValueInput = goog.require('Blockly.blockRendering.ExternalValueInput');
+const Field = goog.require('Blockly.blockRendering.Field');
+const Hat = goog.require('Blockly.blockRendering.Hat');
+const Icon = goog.require('Blockly.blockRendering.Icon');
+const InlineInput = goog.require('Blockly.blockRendering.InlineInput');
+const Input = goog.requireType('Blockly.Input');
+const InputRow = goog.require('Blockly.blockRendering.InputRow');
+const inputTypes = goog.require('Blockly.inputTypes');
+const InRowSpacer = goog.require('Blockly.blockRendering.InRowSpacer');
+const JaggedEdge = goog.require('Blockly.blockRendering.JaggedEdge');
+const Measurable = goog.require('Blockly.blockRendering.Measurable');
+const NextConnection = goog.require('Blockly.blockRendering.NextConnection');
+const OutputConnection = goog.require('Blockly.blockRendering.OutputConnection');
+const PreviousConnection = goog.require('Blockly.blockRendering.PreviousConnection');
+const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
+const Renderer = goog.requireType('Blockly.blockRendering.Renderer');
+const RoundCorner = goog.require('Blockly.blockRendering.RoundCorner');
+const Row = goog.require('Blockly.blockRendering.Row');
+const SpacerRow = goog.require('Blockly.blockRendering.SpacerRow');
+const SquareCorner = goog.require('Blockly.blockRendering.SquareCorner');
+const StatementInput = goog.require('Blockly.blockRendering.StatementInput');
+const TopRow = goog.require('Blockly.blockRendering.TopRow');
+const Types = goog.require('Blockly.blockRendering.Types');
 /** @suppress {extraRequire} */
-goog.require('Blockly.constants');
-goog.require('Blockly.inputTypes');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.blockRendering.Icon');
-goog.requireType('Blockly.blockRendering.Renderer');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.Input');
-goog.requireType('Blockly.RenderedConnection');
+const blocklyConstants = goog.require('Blockly.constants');
 
 
 /**
@@ -51,8 +50,8 @@ goog.requireType('Blockly.RenderedConnection');
  * may choose to rerender when getSize() is called).  However, calling it
  * repeatedly may be expensive.
  *
- * @param {!Blockly.blockRendering.Renderer} renderer The renderer in use.
- * @param {!Blockly.BlockSvg} block The block to measure.
+ * @param {!Renderer} renderer The renderer in use.
+ * @param {!BlockSvg} block The block to measure.
  * @constructor
  * @package
  */
@@ -61,14 +60,14 @@ const RenderInfo = function(renderer, block) {
 
   /**
    * The block renderer in use.
-   * @type {!Blockly.blockRendering.Renderer}
+   * @type {!Renderer}
    * @protected
    */
   this.renderer_ = renderer;
 
   /**
    * The renderer's constant provider.
-   * @type {!Blockly.blockRendering.ConstantProvider}
+   * @type {!ConstantProvider}
    * @protected
    */
   this.constants_ = this.renderer_.getConstants();
@@ -76,12 +75,13 @@ const RenderInfo = function(renderer, block) {
   /**
    * A measurable representing the output connection if the block has one.
    * Otherwise null.
-   * @type {Blockly.blockRendering.OutputConnection}
+   * @type {OutputConnection}
    */
-  this.outputConnection = !block.outputConnection ? null :
-      new Blockly.blockRendering.OutputConnection(
+  this.outputConnection = !block.outputConnection ?
+      null :
+      new OutputConnection(
           this.constants_,
-          /** @type {Blockly.RenderedConnection} */(block.outputConnection));
+          /** @type {RenderedConnection} */ (block.outputConnection));
 
   /**
    * Whether the block should be rendered as a single line, either because it's
@@ -136,33 +136,33 @@ const RenderInfo = function(renderer, block) {
 
   /**
    * An array of Row objects containing sizing information.
-   * @type {!Array<!Blockly.blockRendering.Row>}
+   * @type {!Array<!Row>}
    */
   this.rows = [];
 
   /**
    * An array of input rows on the block.
-   * @type {!Array<!Blockly.blockRendering.InputRow>}
+   * @type {!Array<!InputRow>}
    */
   this.inputRows = [];
 
   /**
    * An array of measurable objects containing hidden icons.
-   * @type {!Array<!Blockly.blockRendering.Icon>}
+   * @type {!Array<!Icon>}
    */
   this.hiddenIcons = [];
 
   /**
    * An object with rendering information about the top row of the block.
-   * @type {!Blockly.blockRendering.TopRow}
+   * @type {!TopRow}
    */
-  this.topRow = new Blockly.blockRendering.TopRow(this.constants_);
+  this.topRow = new TopRow(this.constants_);
 
   /**
    * An object with rendering information about the bottom row of the block.
-   * @type {!Blockly.blockRendering.BottomRow}
+   * @type {!BottomRow}
    */
-  this.bottomRow = new Blockly.blockRendering.BottomRow(this.constants_);
+  this.bottomRow = new BottomRow(this.constants_);
 
   // The position of the start point for drawing, relative to the block's
   // location.
@@ -172,7 +172,7 @@ const RenderInfo = function(renderer, block) {
 
 /**
  * Get the block renderer in use.
- * @return {!Blockly.blockRendering.Renderer} The block renderer in use.
+ * @return {!Renderer} The block renderer in use.
  * @package
  */
 RenderInfo.prototype.getRenderer = function() {
@@ -206,13 +206,13 @@ RenderInfo.prototype.measure = function() {
 RenderInfo.prototype.createRows_ = function() {
   this.populateTopRow_();
   this.rows.push(this.topRow);
-  let activeRow = new Blockly.blockRendering.InputRow(this.constants_);
+  let activeRow = new InputRow(this.constants_);
   this.inputRows.push(activeRow);
 
   // Icons always go on the first row, before anything else.
   const icons = this.block_.getIcons();
   for (let i = 0, icon; (icon = icons[i]); i++) {
-    const iconInfo = new Blockly.blockRendering.Icon(this.constants_, icon);
+    const iconInfo = new Icon(this.constants_, icon);
     if (this.isCollapsed && icon.collapseHidden) {
       this.hiddenIcons.push(iconInfo);
     } else {
@@ -230,14 +230,13 @@ RenderInfo.prototype.createRows_ = function() {
     if (this.shouldStartNewRow_(input, lastInput)) {
       // Finish this row and create a new one.
       this.rows.push(activeRow);
-      activeRow = new Blockly.blockRendering.InputRow(this.constants_);
+      activeRow = new InputRow(this.constants_);
       this.inputRows.push(activeRow);
     }
 
     // All of the fields in an input go on the same row.
     for (let j = 0, field; (field = input.fieldRow[j]); j++) {
-      activeRow.elements.push(
-          new Blockly.blockRendering.Field(this.constants_, field, input));
+      activeRow.elements.push(new Field(this.constants_, field, input));
     }
     this.addInput_(input, activeRow);
     lastInput = input;
@@ -245,8 +244,7 @@ RenderInfo.prototype.createRows_ = function() {
 
   if (this.isCollapsed) {
     activeRow.hasJaggedEdge = true;
-    activeRow.elements.push(
-        new Blockly.blockRendering.JaggedEdge(this.constants_));
+    activeRow.elements.push(new JaggedEdge(this.constants_));
   }
 
   if (activeRow.elements.length || activeRow.hasDummyInput) {
@@ -266,26 +264,25 @@ RenderInfo.prototype.populateTopRow_ = function() {
                                     this.constants_.ADD_START_HATS) &&
       !this.outputConnection && !hasPrevious;
 
-  let cornerClass = this.topRow.hasLeftSquareCorner(this.block_) ?
-      Blockly.blockRendering.SquareCorner :
-      Blockly.blockRendering.RoundCorner;
+  let cornerClass =
+      this.topRow.hasLeftSquareCorner(this.block_) ? SquareCorner : RoundCorner;
   this.topRow.elements.push(new cornerClass(this.constants_));
 
   if (hasHat) {
-    const hat = new Blockly.blockRendering.Hat(this.constants_);
+    const hat = new Hat(this.constants_);
     this.topRow.elements.push(hat);
     this.topRow.capline = hat.ascenderHeight;
   } else if (hasPrevious) {
     this.topRow.hasPreviousConnection = true;
-    this.topRow.connection = new Blockly.blockRendering.PreviousConnection(
+    this.topRow.connection = new PreviousConnection(
         this.constants_,
-        /** @type {Blockly.RenderedConnection} */
+        /** @type {RenderedConnection} */
         (this.block_.previousConnection));
     this.topRow.elements.push(this.topRow.connection);
   }
 
   const precedesStatement = this.block_.inputList.length &&
-      this.block_.inputList[0].type == Blockly.inputTypes.STATEMENT;
+      this.block_.inputList[0].type == inputTypes.STATEMENT;
 
   // This is the minimum height for the row. If one of its elements has a
   // greater height it will be overwritten in the compute pass.
@@ -296,8 +293,8 @@ RenderInfo.prototype.populateTopRow_ = function() {
     this.topRow.minHeight = this.constants_.TOP_ROW_MIN_HEIGHT;
   }
 
-  cornerClass = this.topRow.hasRightSquareCorner(this.block_) ?
-      Blockly.blockRendering.SquareCorner : Blockly.blockRendering.RoundCorner;
+  cornerClass = this.topRow.hasRightSquareCorner(this.block_) ? SquareCorner :
+                                                                RoundCorner;
   this.topRow.elements.push(new cornerClass(this.constants_, 'right'));
 };
 
@@ -310,7 +307,7 @@ RenderInfo.prototype.populateBottomRow_ = function() {
 
   const followsStatement = this.block_.inputList.length &&
       this.block_.inputList[this.block_.inputList.length - 1].type ==
-          Blockly.inputTypes.STATEMENT;
+          inputTypes.STATEMENT;
 
   // This is the minimum height for the row. If one of its elements has a
   // greater height it will be overwritten in the compute pass.
@@ -324,54 +321,47 @@ RenderInfo.prototype.populateBottomRow_ = function() {
   const leftSquareCorner = this.bottomRow.hasLeftSquareCorner(this.block_);
 
   if (leftSquareCorner) {
-    this.bottomRow.elements.push(
-        new Blockly.blockRendering.SquareCorner(this.constants_));
+    this.bottomRow.elements.push(new SquareCorner(this.constants_));
   } else {
-    this.bottomRow.elements.push(
-        new Blockly.blockRendering.RoundCorner(this.constants_));
+    this.bottomRow.elements.push(new RoundCorner(this.constants_));
   }
 
   if (this.bottomRow.hasNextConnection) {
-    this.bottomRow.connection = new Blockly.blockRendering.NextConnection(
+    this.bottomRow.connection = new NextConnection(
         this.constants_,
-        /** @type {Blockly.RenderedConnection} */ (this.block_.nextConnection));
+        /** @type {RenderedConnection} */ (this.block_.nextConnection));
     this.bottomRow.elements.push(this.bottomRow.connection);
   }
 
   const rightSquareCorner = this.bottomRow.hasRightSquareCorner(this.block_);
 
   if (rightSquareCorner) {
-    this.bottomRow.elements.push(
-        new Blockly.blockRendering.SquareCorner(this.constants_, 'right'));
+    this.bottomRow.elements.push(new SquareCorner(this.constants_, 'right'));
   } else {
-    this.bottomRow.elements.push(
-        new Blockly.blockRendering.RoundCorner(this.constants_, 'right'));
+    this.bottomRow.elements.push(new RoundCorner(this.constants_, 'right'));
   }
 };
 
 /**
  * Add an input element to the active row, if needed, and record the type of the
  * input on the row.
- * @param {!Blockly.Input} input The input to record information about.
- * @param {!Blockly.blockRendering.Row} activeRow The row that is currently being
+ * @param {!Input} input The input to record information about.
+ * @param {!Row} activeRow The row that is currently being
  *     populated.
  * @protected
  */
 RenderInfo.prototype.addInput_ = function(input, activeRow) {
   // Non-dummy inputs have visual representations onscreen.
-  if (this.isInline && input.type == Blockly.inputTypes.VALUE) {
-    activeRow.elements.push(
-        new Blockly.blockRendering.InlineInput(this.constants_, input));
+  if (this.isInline && input.type == inputTypes.VALUE) {
+    activeRow.elements.push(new InlineInput(this.constants_, input));
     activeRow.hasInlineInput = true;
-  } else if (input.type == Blockly.inputTypes.STATEMENT) {
-    activeRow.elements.push(
-        new Blockly.blockRendering.StatementInput(this.constants_, input));
+  } else if (input.type == inputTypes.STATEMENT) {
+    activeRow.elements.push(new StatementInput(this.constants_, input));
     activeRow.hasStatement = true;
-  } else if (input.type == Blockly.inputTypes.VALUE) {
-    activeRow.elements.push(
-        new Blockly.blockRendering.ExternalValueInput(this.constants_, input));
+  } else if (input.type == inputTypes.VALUE) {
+    activeRow.elements.push(new ExternalValueInput(this.constants_, input));
     activeRow.hasExternalInput = true;
-  } else if (input.type == Blockly.inputTypes.DUMMY) {
+  } else if (input.type == inputTypes.DUMMY) {
     // Dummy inputs have no visual representation, but the information is still
     // important.
     activeRow.minHeight = Math.max(activeRow.minHeight,
@@ -387,8 +377,8 @@ RenderInfo.prototype.addInput_ = function(input, activeRow) {
 
 /**
  * Decide whether to start a new row between the two Blockly.Inputs.
- * @param {!Blockly.Input} input The first input to consider
- * @param {Blockly.Input} lastInput The input that follows.
+ * @param {!Input} input The first input to consider
+ * @param {Input} lastInput The input that follows.
  * @return {boolean} True if the next input should be rendered on a new row.
  * @protected
  */
@@ -399,13 +389,12 @@ RenderInfo.prototype.shouldStartNewRow_ = function(input, lastInput) {
     return false;
   }
   // A statement input or an input following one always gets a new row.
-  if (input.type == Blockly.inputTypes.STATEMENT ||
-      lastInput.type == Blockly.inputTypes.STATEMENT) {
+  if (input.type == inputTypes.STATEMENT ||
+      lastInput.type == inputTypes.STATEMENT) {
     return true;
   }
   // Value and dummy inputs get new row if inputs are not inlined.
-  if (input.type == Blockly.inputTypes.VALUE ||
-      input.type == Blockly.inputTypes.DUMMY) {
+  if (input.type == inputTypes.VALUE || input.type == inputTypes.DUMMY) {
     return !this.isInline;
   }
   return false;
@@ -422,7 +411,7 @@ RenderInfo.prototype.addElemSpacing_ = function() {
     // No spacing needed before the corner on the top row or the bottom row.
     if (row.startsWithElemSpacer()) {
       // There's a spacer before the first element in the row.
-      row.elements.push(new Blockly.blockRendering.InRowSpacer(
+      row.elements.push(new InRowSpacer(
           this.constants_, this.getInRowSpacing_(null, oldElems[0])));
     }
     if (!oldElems.length) {
@@ -431,13 +420,12 @@ RenderInfo.prototype.addElemSpacing_ = function() {
     for (let e = 0; e < oldElems.length - 1; e++) {
       row.elements.push(oldElems[e]);
       const spacing = this.getInRowSpacing_(oldElems[e], oldElems[e + 1]);
-      row.elements.push(
-          new Blockly.blockRendering.InRowSpacer(this.constants_, spacing));
+      row.elements.push(new InRowSpacer(this.constants_, spacing));
     }
     row.elements.push(oldElems[oldElems.length - 1]);
     if (row.endsWithElemSpacer()) {
       // There's a spacer after the last element in the row.
-      row.elements.push(new Blockly.blockRendering.InRowSpacer(
+      row.elements.push(new InRowSpacer(
           this.constants_,
           this.getInRowSpacing_(oldElems[oldElems.length - 1], null)));
     }
@@ -448,42 +436,40 @@ RenderInfo.prototype.addElemSpacing_ = function() {
  * Calculate the width of a spacer element in a row based on the previous and
  * next elements in that row.  For instance, extra padding is added between two
  * editable fields.
- * @param {Blockly.blockRendering.Measurable} prev The element before the
+ * @param {Measurable} prev The element before the
  *     spacer.
- * @param {Blockly.blockRendering.Measurable} next The element after the spacer.
+ * @param {Measurable} next The element after the spacer.
  * @return {number} The size of the spacing between the two elements.
  * @protected
  */
 RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   if (!prev) {
     // Statement input padding.
-    if (next && Blockly.blockRendering.Types.isStatementInput(next)) {
+    if (next && Types.isStatementInput(next)) {
       return this.constants_.STATEMENT_INPUT_PADDING_LEFT;
     }
   }
   // Between inputs and the end of the row.
-  if (prev && Blockly.blockRendering.Types.isInput(prev) && !next) {
-    if (Blockly.blockRendering.Types.isExternalInput(prev)) {
+  if (prev && Types.isInput(prev) && !next) {
+    if (Types.isExternalInput(prev)) {
       return this.constants_.NO_PADDING;
-    } else if (Blockly.blockRendering.Types.isInlineInput(prev)) {
+    } else if (Types.isInlineInput(prev)) {
       return this.constants_.LARGE_PADDING;
-    } else if (Blockly.blockRendering.Types.isStatementInput(prev)) {
+    } else if (Types.isStatementInput(prev)) {
       return this.constants_.NO_PADDING;
     }
   }
 
   // Spacing between a square corner and a previous or next connection
-  if (prev && Blockly.blockRendering.Types.isLeftSquareCorner(prev) && next) {
-    if (Blockly.blockRendering.Types.isPreviousConnection(next) ||
-        Blockly.blockRendering.Types.isNextConnection(next)) {
+  if (prev && Types.isLeftSquareCorner(prev) && next) {
+    if (Types.isPreviousConnection(next) || Types.isNextConnection(next)) {
       return next.notchOffset;
     }
   }
 
   // Spacing between a rounded corner and a previous or next connection.
-  if (prev && Blockly.blockRendering.Types.isLeftRoundedCorner(prev) && next) {
-    if (Blockly.blockRendering.Types.isPreviousConnection(next) ||
-      Blockly.blockRendering.Types.isNextConnection(next)) {
+  if (prev && Types.isLeftRoundedCorner(prev) && next) {
+    if (Types.isPreviousConnection(next) || Types.isNextConnection(next)) {
       return next.notchOffset - this.constants_.CORNER_RADIUS;
     }
   }
@@ -541,7 +527,7 @@ RenderInfo.prototype.alignRowElements_ = function() {
   for (let i = 0, row; (row = this.rows[i]); i++) {
     if (row.hasStatement) {
       this.alignStatementRow_(
-          /** @type {!Blockly.blockRendering.InputRow} */ (row));
+          /** @type {!InputRow} */ (row));
     } else {
       const currentWidth = row.width;
       const desiredWidth = this.getDesiredRowWidth_(row);
@@ -549,7 +535,7 @@ RenderInfo.prototype.alignRowElements_ = function() {
       if (missingSpace > 0) {
         this.addAlignmentPadding_(row, missingSpace);
       }
-      if (Blockly.blockRendering.Types.isTopOrBottomRow(row)) {
+      if (Types.isTopOrBottomRow(row)) {
         row.widthWithConnectedBlocks = row.width;
       }
     }
@@ -558,7 +544,7 @@ RenderInfo.prototype.alignRowElements_ = function() {
 
 /**
  * Calculate the desired width of an input row.
- * @param {!Blockly.blockRendering.Row} _row The input row.
+ * @param {!Row} _row The input row.
  * @return {number} The desired width of the input row.
  * @protected
  */
@@ -570,7 +556,7 @@ RenderInfo.prototype.getDesiredRowWidth_ = function(_row) {
  * Modify the given row to add the given amount of padding around its fields.
  * The exact location of the padding is based on the alignment property of the
  * last input in the field.
- * @param {Blockly.blockRendering.Row} row The row to add padding to.
+ * @param {Row} row The row to add padding to.
  * @param {number} missingSpace How much padding to add.
  * @protected
  */
@@ -582,14 +568,14 @@ RenderInfo.prototype.addAlignmentPadding_ = function(row, missingSpace) {
   }
 
   // Decide where the extra padding goes.
-  if (row.align == Blockly.constants.ALIGN.LEFT) {
+  if (row.align == blocklyConstants.ALIGN.LEFT) {
     // Add padding to the end of the row.
     lastSpacer.width += missingSpace;
-  } else if (row.align == Blockly.constants.ALIGN.CENTRE) {
+  } else if (row.align == blocklyConstants.ALIGN.CENTRE) {
     // Split the padding between the beginning and end of the row.
     firstSpacer.width += missingSpace / 2;
     lastSpacer.width += missingSpace / 2;
-  } else if (row.align == Blockly.constants.ALIGN.RIGHT) {
+  } else if (row.align == blocklyConstants.ALIGN.RIGHT) {
     // Add padding at the beginning of the row.
     firstSpacer.width += missingSpace;
   } else {
@@ -602,7 +588,7 @@ RenderInfo.prototype.addAlignmentPadding_ = function(row, missingSpace) {
 /**
  * Align the elements of a statement row based on computed bounds.
  * Unlike other types of rows, statement rows add space in multiple places.
- * @param {!Blockly.blockRendering.InputRow} row The statement row to resize.
+ * @param {!InputRow} row The statement row to resize.
  * @protected
  */
 RenderInfo.prototype.alignStatementRow_ = function(row) {
@@ -643,16 +629,15 @@ RenderInfo.prototype.addRowSpacing_ = function() {
 
 /**
  * Create a spacer row to go between prev and next, and set its size.
- * @param {!Blockly.blockRendering.Row} prev The previous row.
- * @param {!Blockly.blockRendering.Row} next The next row.
- * @return {!Blockly.blockRendering.SpacerRow} The newly created spacer row.
+ * @param {!Row} prev The previous row.
+ * @param {!Row} next The next row.
+ * @return {!SpacerRow} The newly created spacer row.
  * @protected
  */
 RenderInfo.prototype.makeSpacerRow_ = function(prev, next) {
   const height = this.getSpacerRowHeight_(prev, next);
   const width = this.getSpacerRowWidth_(prev, next);
-  const spacer =
-      new Blockly.blockRendering.SpacerRow(this.constants_, height, width);
+  const spacer = new SpacerRow(this.constants_, height, width);
   if (prev.hasStatement) {
     spacer.followsStatement = true;
   }
@@ -664,8 +649,8 @@ RenderInfo.prototype.makeSpacerRow_ = function(prev, next) {
 
 /**
  * Calculate the width of a spacer row.
- * @param {!Blockly.blockRendering.Row} _prev The row before the spacer.
- * @param {!Blockly.blockRendering.Row} _next The row after the spacer.
+ * @param {!Row} _prev The row before the spacer.
+ * @param {!Row} _next The row after the spacer.
  * @return {number} The desired width of the spacer row between these two rows.
  * @protected
  */
@@ -675,8 +660,8 @@ RenderInfo.prototype.getSpacerRowWidth_ = function(_prev, _next) {
 
 /**
  * Calculate the height of a spacer row.
- * @param {!Blockly.blockRendering.Row} _prev The row before the spacer.
- * @param {!Blockly.blockRendering.Row} _next The row after the spacer.
+ * @param {!Row} _prev The row before the spacer.
+ * @param {!Row} _next The row after the spacer.
  * @return {number} The desired height of the spacer row between these two rows.
  * @protected
  */
@@ -689,25 +674,25 @@ RenderInfo.prototype.getSpacerRowHeight_ = function(_prev, _next) {
  * This base implementation puts the centerline at the middle of the row
  * vertically, with no special cases.  You will likely need extra logic to
  * handle (at minimum) top and bottom rows.
- * @param {!Blockly.blockRendering.Row} row The row containing the element.
- * @param {!Blockly.blockRendering.Measurable} elem The element to place.
+ * @param {!Row} row The row containing the element.
+ * @param {!Measurable} elem The element to place.
  * @return {number} The desired centerline of the given element, as an offset
  *     from the top left of the block.
  * @protected
  */
 RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
-  if (Blockly.blockRendering.Types.isSpacer(elem)) {
+  if (Types.isSpacer(elem)) {
     return row.yPos + elem.height / 2;
   }
-  if (Blockly.blockRendering.Types.isBottomRow(row)) {
+  if (Types.isBottomRow(row)) {
     const baseline = row.yPos + row.height - row.descenderHeight;
-    if (Blockly.blockRendering.Types.isNextConnection(elem)) {
+    if (Types.isNextConnection(elem)) {
       return baseline + elem.height / 2;
     }
     return baseline - elem.height / 2;
   }
-  if (Blockly.blockRendering.Types.isTopRow(row)) {
-    if (Blockly.blockRendering.Types.isHat(elem)) {
+  if (Types.isTopRow(row)) {
+    if (Types.isHat(elem)) {
       return row.capline - elem.height / 2;
     }
     return row.capline + elem.height / 2;
@@ -718,14 +703,14 @@ RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
 /**
  * Record final position information on elements on the given row, for use in
  * drawing.  At minimum this records xPos and centerline on each element.
- * @param {!Blockly.blockRendering.Row} row The row containing the elements.
+ * @param {!Row} row The row containing the elements.
  * @protected
  */
 RenderInfo.prototype.recordElemPositions_ = function(row) {
   let xCursor = row.xPos;
   for (let j = 0, elem; (elem = row.elements[j]); j++) {
     // Now that row heights are finalized, make spacers use the row height.
-    if (Blockly.blockRendering.Types.isSpacer(elem)) {
+    if (Types.isSpacer(elem)) {
       elem.height = row.height;
     }
     elem.xPos = xCursor;
diff --git a/tests/deps.js b/tests/deps.js
index 8baeee5ab..f2de1b0f9 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -118,7 +118,7 @@ goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRe
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths']);
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], []);
-goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes', 'Blockly.constants']);

From f7a5d809bc3e37fd736aa29c7c35a47791c569d0 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 16 Jul 2021 15:14:32 -0700
Subject: [PATCH 108/833] clang-format core/renderers/common/info.js

---
 core/renderers/common/info.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js
index 3c5e70ee4..146ca5cdd 100644
--- a/core/renderers/common/info.js
+++ b/core/renderers/common/info.js
@@ -313,7 +313,7 @@ RenderInfo.prototype.populateBottomRow_ = function() {
   // greater height it will be overwritten in the compute pass.
   if (followsStatement) {
     this.bottomRow.minHeight =
-      this.constants_.BOTTOM_ROW_AFTER_STATEMENT_MIN_HEIGHT;
+        this.constants_.BOTTOM_ROW_AFTER_STATEMENT_MIN_HEIGHT;
   } else {
     this.bottomRow.minHeight = this.constants_.BOTTOM_ROW_MIN_HEIGHT;
   }
@@ -364,10 +364,11 @@ RenderInfo.prototype.addInput_ = function(input, activeRow) {
   } else if (input.type == inputTypes.DUMMY) {
     // Dummy inputs have no visual representation, but the information is still
     // important.
-    activeRow.minHeight = Math.max(activeRow.minHeight,
+    activeRow.minHeight = Math.max(
+        activeRow.minHeight,
         input.getSourceBlock() && input.getSourceBlock().isShadow() ?
-        this.constants_.DUMMY_INPUT_SHADOW_MIN_HEIGHT :
-        this.constants_.DUMMY_INPUT_MIN_HEIGHT);
+            this.constants_.DUMMY_INPUT_SHADOW_MIN_HEIGHT :
+            this.constants_.DUMMY_INPUT_MIN_HEIGHT);
     activeRow.hasDummyInput = true;
   }
   if (activeRow.align == null) {
@@ -478,8 +479,8 @@ RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
 };
 
 /**
- * Figure out where the right edge of the block and right edge of statement inputs
- * should be placed.
+ * Figure out where the right edge of the block and right edge of statement
+ * inputs should be placed.
  * @protected
  */
 // TODO: More cleanup.
@@ -607,8 +608,8 @@ RenderInfo.prototype.alignStatementRow_ = function(row) {
   statementInput.width += (desiredWidth - currentWidth);
   statementInput.height = Math.max(statementInput.height, row.height);
   row.width += (desiredWidth - currentWidth);
-  row.widthWithConnectedBlocks = Math.max(row.width,
-      this.statementEdge + row.connectedBlockWidths);
+  row.widthWithConnectedBlocks =
+      Math.max(row.width, this.statementEdge + row.connectedBlockWidths);
 };
 
 /**
@@ -742,9 +743,9 @@ RenderInfo.prototype.finalize_ = function() {
   if (this.outputConnection && this.block_.nextConnection &&
       this.block_.nextConnection.isConnected()) {
     // Include width of connected block in value to stack width measurement.
-    widestRowWithConnectedBlocks =
-        Math.max(widestRowWithConnectedBlocks,
-            this.block_.nextConnection.targetBlock().getHeightWidth().width);
+    widestRowWithConnectedBlocks = Math.max(
+        widestRowWithConnectedBlocks,
+        this.block_.nextConnection.targetBlock().getHeightWidth().width);
   }
 
   this.widthWithChildren = widestRowWithConnectedBlocks + this.startX;

From dbf6308f03e6db01eb77022c7891879665dea9f9 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 14:36:34 -0700
Subject: [PATCH 109/833] Migrate core/interfaces/i_movable.js to goog.module

---
 core/interfaces/i_movable.js | 9 ++++++---
 tests/deps.js                | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/interfaces/i_movable.js b/core/interfaces/i_movable.js
index bc0c3bf9f..25a92d6bb 100644
--- a/core/interfaces/i_movable.js
+++ b/core/interfaces/i_movable.js
@@ -11,17 +11,20 @@
 
 'use strict';
 
-goog.provide('Blockly.IMovable');
+goog.module('Blockly.IMovable');
+goog.module.declareLegacyNamespace();
 
 
 /**
  * The interface for an object that is movable.
  * @interface
  */
-Blockly.IMovable = function() {};
+const IMovable = function() {};
 
 /**
  * Get whether this is movable or not.
  * @return {boolean} True if movable.
  */
-Blockly.IMovable.prototype.isMovable;
+IMovable.prototype.isMovable;
+
+exports = IMovable;
diff --git a/tests/deps.js b/tests/deps.js
index 230083d23..3ce0457fb 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -88,7 +88,7 @@ goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarg
 goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], ['Blockly.IDeletable'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], []);
 goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], []);
-goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], []);
+goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], ['Blockly.IComponent']);
 goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], []);
 goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], []);

From b990eb08a3021f9cdc71f3325e31774507ee0b75 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 16:15:15 -0700
Subject: [PATCH 110/833] Migrate core/interfaces/i_styleable.js to goog.module

---
 core/interfaces/i_styleable.js | 11 +++++++----
 tests/deps.js                  |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/interfaces/i_styleable.js b/core/interfaces/i_styleable.js
index 944ee9d65..14dea3ce1 100644
--- a/core/interfaces/i_styleable.js
+++ b/core/interfaces/i_styleable.js
@@ -11,23 +11,26 @@
 
 'use strict';
 
-goog.provide('Blockly.IStyleable');
+goog.module('Blockly.IStyleable');
+goog.module.declareLegacyNamespace();
 
 
 /**
  * Interface for an object that a style can be added to.
  * @interface
  */
-Blockly.IStyleable = function() {};
+const IStyleable = function() {};
 
 /**
  * Adds a style on the toolbox. Usually used to change the cursor.
  * @param {string} style The name of the class to add.
  */
-Blockly.IStyleable.prototype.addStyle;
+IStyleable.prototype.addStyle;
 
 /**
  * Removes a style from the toolbox. Usually used to change the cursor.
  * @param {string} style The name of the class to remove.
  */
-Blockly.IStyleable.prototype.removeStyle;
+IStyleable.prototype.removeStyle;
+
+exports = IStyleable;
diff --git a/tests/deps.js b/tests/deps.js
index 3ce0457fb..c9ef15a2f 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -93,7 +93,7 @@ goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositio
 goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], []);
 goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], []);
 goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], []);
-goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], []);
+goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], []);
 goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem', 'Blockly.ISelectableToolboxItem', 'Blockly.IToolboxItem'], []);
 goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Coordinate'], {'lang': 'es5'});

From bbdf5730f6aec7af34be3582d80e39e088ba61b8 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 19 Jul 2021 08:10:47 -0700
Subject: [PATCH 111/833] Reordered core/connection_checker.js requires

---
 core/connection_checker.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/connection_checker.js b/core/connection_checker.js
index 3a405edcb..4bd7bd4e2 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -15,10 +15,10 @@ goog.module('Blockly.ConnectionChecker');
 goog.module.declareLegacyNamespace();
 
 const Connection = goog.require('Blockly.Connection');
-const connectionTypes = goog.require('Blockly.connectionTypes');
 const IConnectionChecker = goog.require('Blockly.IConnectionChecker');
-const registry = goog.require('Blockly.registry');
 const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
+const connectionTypes = goog.require('Blockly.connectionTypes');
+const registry = goog.require('Blockly.registry');
 /** @suppress {extraRequire} */
 goog.require('Blockly.constants');
 

From c6112df77a17f8e130c43cd1959e3391cea41fdf Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 19 Jul 2021 09:16:29 -0700
Subject: [PATCH 112/833] Switch some requires in core/comment.js to
 destructuring

---
 core/comment.js | 46 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/core/comment.js b/core/comment.js
index fe0c940a6..de947fa5f 100644
--- a/core/comment.js
+++ b/core/comment.js
@@ -15,19 +15,17 @@ goog.module.declareLegacyNamespace();
 
 const Block = goog.requireType('Blockly.Block');
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
-const browserEvents = goog.require('Blockly.browserEvents');
 const Bubble = goog.require('Blockly.Bubble');
 const Coordinate = goog.requireType('Blockly.utils.Coordinate');
-const Css = goog.require('Blockly.Css');
-const dom = goog.require('Blockly.utils.dom');
 const Events = goog.require('Blockly.Events');
 const Icon = goog.require('Blockly.Icon');
 const Size = goog.requireType('Blockly.utils.Size');
 const Svg = goog.require('Blockly.utils.Svg');
-const userAgent = goog.require('Blockly.utils.userAgent');
-const utilsObject = goog.require('Blockly.utils.object');
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const {CommentModel} = goog.requireType('Blockly.Block');
+const {conditionalBind, Data, unbind} = goog.require('Blockly.browserEvents');
+const {dom, userAgent, object: utilsObject} = goog.require('Blockly.utils');
+const {register} = goog.require('Blockly.Css');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
@@ -65,28 +63,28 @@ const Comment = function(block) {
 
   /**
    * Mouse up event data.
-   * @type {?browserEvents.Data}
+   * @type {?Data}
    * @private
    */
   this.onMouseUpWrapper_ = null;
 
   /**
    * Wheel event data.
-   * @type {?browserEvents.Data}
+   * @type {?Data}
    * @private
    */
   this.onWheelWrapper_ = null;
 
   /**
    * Change event data.
-   * @type {?browserEvents.Data}
+   * @type {?Data}
    * @private
    */
   this.onChangeWrapper_ = null;
 
   /**
    * Input event data.
-   * @type {?browserEvents.Data}
+   * @type {?Data}
    * @private
    */
   this.onInputWrapper_ = null;
@@ -167,25 +165,23 @@ Comment.prototype.createEditor_ = function() {
   // Ideally this would be hooked to the focus event for the comment.
   // However doing so in Firefox swallows the cursor for unknown reasons.
   // So this is hooked to mouseup instead.  No big deal.
-  this.onMouseUpWrapper_ = browserEvents.conditionalBind(
-      textarea, 'mouseup', this, this.startEdit_, true, true);
+  this.onMouseUpWrapper_ =
+      conditionalBind(textarea, 'mouseup', this, this.startEdit_, true, true);
   // Don't zoom with mousewheel.
-  this.onWheelWrapper_ =
-      browserEvents.conditionalBind(textarea, 'wheel', this, function(e) {
-        e.stopPropagation();
-      });
+  this.onWheelWrapper_ = conditionalBind(textarea, 'wheel', this, function(e) {
+    e.stopPropagation();
+  });
   this.onChangeWrapper_ =
-      browserEvents.conditionalBind(textarea, 'change', this, function(_e) {
+      conditionalBind(textarea, 'change', this, function(_e) {
         if (this.cachedText_ != this.model_.text) {
           Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
               this.block_, 'comment', null, this.cachedText_,
               this.model_.text));
         }
       });
-  this.onInputWrapper_ =
-      browserEvents.conditionalBind(textarea, 'input', this, function(_e) {
-        this.model_.text = textarea.value;
-      });
+  this.onInputWrapper_ = conditionalBind(textarea, 'input', this, function(_e) {
+    this.model_.text = textarea.value;
+  });
 
   setTimeout(textarea.focus.bind(textarea), 0);
 
@@ -304,19 +300,19 @@ Comment.prototype.createNonEditableBubble_ = function() {
  */
 Comment.prototype.disposeBubble_ = function() {
   if (this.onMouseUpWrapper_) {
-    browserEvents.unbind(this.onMouseUpWrapper_);
+    unbind(this.onMouseUpWrapper_);
     this.onMouseUpWrapper_ = null;
   }
   if (this.onWheelWrapper_) {
-    browserEvents.unbind(this.onWheelWrapper_);
+    unbind(this.onWheelWrapper_);
     this.onWheelWrapper_ = null;
   }
   if (this.onChangeWrapper_) {
-    browserEvents.unbind(this.onChangeWrapper_);
+    unbind(this.onChangeWrapper_);
     this.onChangeWrapper_ = null;
   }
   if (this.onInputWrapper_) {
-    browserEvents.unbind(this.onInputWrapper_);
+    unbind(this.onInputWrapper_);
     this.onInputWrapper_ = null;
   }
   this.bubble_.dispose();
@@ -394,7 +390,7 @@ Comment.prototype.dispose = function() {
 /**
  * CSS for block comment.  See css.js for use.
  */
-Css.register([
+register([
   /* eslint-disable indent */
   '.blocklyCommentTextarea {',
     'background-color: #fef49c;',

From 11b47aab2537c1ad8b26eb815f357717729e9bff Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 14:39:35 -0700
Subject: [PATCH 113/833] Migrate core/interfaces/i_positionable.js to
 goog.module

---
 core/interfaces/i_positionable.js | 11 +++++++----
 tests/deps.js                     |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/interfaces/i_positionable.js b/core/interfaces/i_positionable.js
index 356510c81..3ab5b88f4 100644
--- a/core/interfaces/i_positionable.js
+++ b/core/interfaces/i_positionable.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-goog.provide('Blockly.IPositionable');
+goog.module('Blockly.IPositionable');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.IComponent');
 
@@ -24,7 +25,7 @@ goog.requireType('Blockly.utils.Rect');
  * @extends {Blockly.IComponent}
  * @interface
  */
-Blockly.IPositionable = function() {};
+const IPositionable = function() {};
 
 /**
  * Positions the element. Called when the window is resized.
@@ -32,7 +33,7 @@ Blockly.IPositionable = function() {};
  * @param {!Array<!Blockly.utils.Rect>} savedPositions List of rectangles that
  *     are already on the workspace.
  */
-Blockly.IPositionable.prototype.position;
+IPositionable.prototype.position;
 
 /**
  * Returns the bounding rectangle of the UI element in pixel units relative to
@@ -40,4 +41,6 @@ Blockly.IPositionable.prototype.position;
  * @return {?Blockly.utils.Rect} The UI elements’s bounding box. Null if
  *   bounding box should be ignored by other UI elements.
  */
-Blockly.IPositionable.prototype.getBoundingRectangle;
+IPositionable.prototype.getBoundingRectangle;
+
+exports = IPositionable;
diff --git a/tests/deps.js b/tests/deps.js
index e8a2a7f06..56cbcce9e 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -89,7 +89,7 @@ goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'
 goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], []);
 goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], []);
 goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], ['Blockly.IComponent']);
+goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], []);
 goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], []);
 goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], []);

From 282cd26edeaeca7c71fe70863f1283f6e5178c9b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 14:41:40 -0700
Subject: [PATCH 114/833] Migrate core/interfaces/i_positionable.js named
 requires

---
 core/interfaces/i_positionable.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/interfaces/i_positionable.js b/core/interfaces/i_positionable.js
index 3ab5b88f4..ed324196b 100644
--- a/core/interfaces/i_positionable.js
+++ b/core/interfaces/i_positionable.js
@@ -14,23 +14,22 @@
 goog.module('Blockly.IPositionable');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.IComponent');
-
-goog.requireType('Blockly.MetricsManager');
-goog.requireType('Blockly.utils.Rect');
+const IComponent = goog.require('Blockly.IComponent');
+const Rect = goog.requireType('Blockly.utils.Rect');
+const {UiMetrics} = goog.requireType('Blockly.MetricsManager');
 
 
 /**
  * Interface for a component that is positioned on top of the workspace.
- * @extends {Blockly.IComponent}
+ * @extends {IComponent}
  * @interface
  */
 const IPositionable = function() {};
 
 /**
  * Positions the element. Called when the window is resized.
- * @param {!Blockly.MetricsManager.UiMetrics} metrics The workspace metrics.
- * @param {!Array<!Blockly.utils.Rect>} savedPositions List of rectangles that
+ * @param {!UiMetrics} metrics The workspace metrics.
+ * @param {!Array<!Rect>} savedPositions List of rectangles that
  *     are already on the workspace.
  */
 IPositionable.prototype.position;
@@ -38,7 +37,7 @@ IPositionable.prototype.position;
 /**
  * Returns the bounding rectangle of the UI element in pixel units relative to
  * the Blockly injection div.
- * @return {?Blockly.utils.Rect} The UI elements’s bounding box. Null if
+ * @return {?Rect} The UI elements’s bounding box. Null if
  *   bounding box should be ignored by other UI elements.
  */
 IPositionable.prototype.getBoundingRectangle;

From f723d1d3842cac4caa4dd75c253f4455db1b8079 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 13:09:04 -0700
Subject: [PATCH 115/833] Migrate core/interfaces/i_drag_target.js to
 goog.module

---
 core/interfaces/i_drag_target.js | 19 +++++++++++--------
 tests/deps.js                    |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/core/interfaces/i_drag_target.js b/core/interfaces/i_drag_target.js
index 0af765d57..ada85a8e3 100644
--- a/core/interfaces/i_drag_target.js
+++ b/core/interfaces/i_drag_target.js
@@ -12,7 +12,8 @@
 
 'use strict';
 
-goog.provide('Blockly.IDragTarget');
+goog.module('Blockly.IDragTarget');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.IComponent');
 
@@ -25,7 +26,7 @@ goog.requireType('Blockly.utils.Rect');
  * @extends {Blockly.IComponent}
  * @interface
  */
-Blockly.IDragTarget = function() {};
+const IDragTarget = function() {};
 
 /**
  * Returns the bounding rectangle of the drag target area in pixel units
@@ -33,14 +34,14 @@ Blockly.IDragTarget = function() {};
  * @return {?Blockly.utils.Rect} The component's bounding box. Null if drag
  *   target area should be ignored.
  */
-Blockly.IDragTarget.prototype.getClientRect;
+IDragTarget.prototype.getClientRect;
 
 /**
  * Handles when a cursor with a block or bubble enters this drag target.
  * @param {!Blockly.IDraggable} dragElement The block or bubble currently being
  *   dragged.
  */
-Blockly.IDragTarget.prototype.onDragEnter;
+IDragTarget.prototype.onDragEnter;
 
 /**
  * Handles when a cursor with a block or bubble is dragged over this drag
@@ -48,7 +49,7 @@ Blockly.IDragTarget.prototype.onDragEnter;
  * @param {!Blockly.IDraggable} dragElement The block or bubble currently being
  *   dragged.
  */
-Blockly.IDragTarget.prototype.onDragOver;
+IDragTarget.prototype.onDragOver;
 
 
 /**
@@ -56,7 +57,7 @@ Blockly.IDragTarget.prototype.onDragOver;
  * @param {!Blockly.IDraggable} dragElement The block or bubble currently being
  *   dragged.
  */
-Blockly.IDragTarget.prototype.onDragExit;
+IDragTarget.prototype.onDragExit;
 
 /**
  * Handles when a block or bubble is dropped on this component.
@@ -64,7 +65,7 @@ Blockly.IDragTarget.prototype.onDragExit;
  * @param {!Blockly.IDraggable} dragElement The block or bubble currently being
  *   dragged.
  */
-Blockly.IDragTarget.prototype.onDrop;
+IDragTarget.prototype.onDrop;
 
 /**
  * Returns whether the provided block or bubble should not be moved after being
@@ -75,4 +76,6 @@ Blockly.IDragTarget.prototype.onDrop;
  * @return {boolean} Whether the block or bubble provided should be returned to
  *     drag start.
  */
-Blockly.IDragTarget.prototype.shouldPreventMove;
+IDragTarget.prototype.shouldPreventMove;
+
+exports = IDragTarget;
diff --git a/tests/deps.js b/tests/deps.js
index 56cbcce9e..7a562a115 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -84,7 +84,7 @@ goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextM
 goog.addDependency('../../core/interfaces/i_copyable.js', ['Blockly.ICopyable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_deletable.js', ['Blockly.IDeletable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], ['Blockly.IComponent']);
+goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], ['Blockly.IDeletable'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], []);
 goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], []);

From cc324d53e59cf0f9145643e7e12583065dcebb3b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 13:20:23 -0700
Subject: [PATCH 116/833] Migrate core/interfaces/i_drag_target.js named
 requires

---
 core/interfaces/i_drag_target.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/interfaces/i_drag_target.js b/core/interfaces/i_drag_target.js
index ada85a8e3..803bcbc74 100644
--- a/core/interfaces/i_drag_target.js
+++ b/core/interfaces/i_drag_target.js
@@ -15,15 +15,15 @@
 goog.module('Blockly.IDragTarget');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.IComponent');
+const IComponent = goog.require('Blockly.IComponent');
+const IDraggable = goog.requireType('Blockly.IDraggable');
+const Rect = goog.requireType('Blockly.utils.Rect');
 
-goog.requireType('Blockly.IDraggable');
-goog.requireType('Blockly.utils.Rect');
 
 /**
  * Interface for a component with custom behaviour when a block or bubble is
  * dragged over or dropped on top of it.
- * @extends {Blockly.IComponent}
+ * @extends {IComponent}
  * @interface
  */
 const IDragTarget = function() {};
@@ -31,14 +31,14 @@ const IDragTarget = function() {};
 /**
  * Returns the bounding rectangle of the drag target area in pixel units
  * relative to viewport.
- * @return {?Blockly.utils.Rect} The component's bounding box. Null if drag
+ * @return {?Rect} The component's bounding box. Null if drag
  *   target area should be ignored.
  */
 IDragTarget.prototype.getClientRect;
 
 /**
  * Handles when a cursor with a block or bubble enters this drag target.
- * @param {!Blockly.IDraggable} dragElement The block or bubble currently being
+ * @param {!IDraggable} dragElement The block or bubble currently being
  *   dragged.
  */
 IDragTarget.prototype.onDragEnter;
@@ -46,7 +46,7 @@ IDragTarget.prototype.onDragEnter;
 /**
  * Handles when a cursor with a block or bubble is dragged over this drag
  * target.
- * @param {!Blockly.IDraggable} dragElement The block or bubble currently being
+ * @param {!IDraggable} dragElement The block or bubble currently being
  *   dragged.
  */
 IDragTarget.prototype.onDragOver;
@@ -54,7 +54,7 @@ IDragTarget.prototype.onDragOver;
 
 /**
  * Handles when a cursor with a block or bubble exits this drag target.
- * @param {!Blockly.IDraggable} dragElement The block or bubble currently being
+ * @param {!IDraggable} dragElement The block or bubble currently being
  *   dragged.
  */
 IDragTarget.prototype.onDragExit;
@@ -62,7 +62,7 @@ IDragTarget.prototype.onDragExit;
 /**
  * Handles when a block or bubble is dropped on this component.
  * Should not handle delete here.
- * @param {!Blockly.IDraggable} dragElement The block or bubble currently being
+ * @param {!IDraggable} dragElement The block or bubble currently being
  *   dragged.
  */
 IDragTarget.prototype.onDrop;
@@ -71,7 +71,7 @@ IDragTarget.prototype.onDrop;
  * Returns whether the provided block or bubble should not be moved after being
  * dropped on this component. If true, the element will return to where it was
  * when the drag started.
- * @param {!Blockly.IDraggable} dragElement The block or bubble currently being
+ * @param {!IDraggable} dragElement The block or bubble currently being
  *   dragged.
  * @return {boolean} Whether the block or bubble provided should be returned to
  *     drag start.

From daa0b3bfb557482579c8e30cbe61320f14c0ed27 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 19 Jul 2021 09:26:17 -0700
Subject: [PATCH 117/833] Add TODO for resolving WorkspaceCommentSvg require
 issue

---
 core/bubble_dragger.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/bubble_dragger.js b/core/bubble_dragger.js
index d5cb8beae..3a6d36331 100644
--- a/core/bubble_dragger.js
+++ b/core/bubble_dragger.js
@@ -229,6 +229,7 @@ BubbleDragger.prototype.endBubbleDrag = function(e, currentDragDeltaXY) {
  */
 BubbleDragger.prototype.fireMoveEvent_ = function() {
   if (this.draggingBubble_.isComment) {
+    // TODO (adodson): Resolve build errors when requiring WorkspaceCommentSvg.
     const event = new (Events.get(Events.COMMENT_MOVE))(
         /** @type {!Blockly.WorkspaceCommentSvg} */ (this.draggingBubble_));
     event.setOldCoordinate(this.startXY_);

From 9b5a9192124d4952e3591535584957d2875b1ab9 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 19 Jul 2021 09:41:58 -0700
Subject: [PATCH 118/833] Convert core/utils/styles.js to inline export style

---
 core/utils/style.js | 74 +++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 40 deletions(-)

diff --git a/core/utils/style.js b/core/utils/style.js
index 028b746b8..1fcfbdd62 100644
--- a/core/utils/style.js
+++ b/core/utils/style.js
@@ -29,7 +29,7 @@ const Size = goog.require('Blockly.utils.Size');
  * @param {!Element} element Element to get size of.
  * @return {!Size} Object with width/height properties.
  */
-const getSize = function(element) {
+function getSize(element) {
   if (getStyle(element, 'display') != 'none') {
     return getSizeWithDisplay(element);
   }
@@ -52,19 +52,19 @@ const getSize = function(element) {
   style.visibility = originalVisibility;
 
   return new Size(offsetWidth, offsetHeight);
-};
+}
+exports.getSize = getSize;
 
 /**
  * Gets the height and width of an element when the display is not none.
  * @param {!Element} element Element to get size of.
  * @return {!Size} Object with width/height properties.
- * @private
  */
-const getSizeWithDisplay = function(element) {
+function getSizeWithDisplay(element) {
   const offsetWidth = /** @type {!HTMLElement} */ (element).offsetWidth;
   const offsetHeight = /** @type {!HTMLElement} */ (element).offsetHeight;
   return new Size(offsetWidth, offsetHeight);
-};
+}
 
 /**
  * Cross-browser pseudo get computed style. It returns the computed style where
@@ -78,12 +78,11 @@ const getSizeWithDisplay = function(element) {
  * @param {!Element} element Element to get style of.
  * @param {string} style Property to get (must be camelCase, not CSS-style).
  * @return {string} Style value.
- * @private
  */
-const getStyle = function(element, style) {
+function getStyle(element, style) {
   return getComputedStyle(element, style) || getCascadedStyle(element, style) ||
       (element.style && element.style[style]);
-};
+}
 
 /**
  * Retrieves a computed style value of a node. It returns empty string if the
@@ -97,7 +96,7 @@ const getStyle = function(element, style) {
  * @param {string} property Property to get (camel-case).
  * @return {string} Style value.
  */
-const getComputedStyle = function(element, property) {
+function getComputedStyle(element, property) {
   if (document.defaultView && document.defaultView.getComputedStyle) {
     const styles = document.defaultView.getComputedStyle(element, null);
     if (styles) {
@@ -108,7 +107,8 @@ const getComputedStyle = function(element, property) {
   }
 
   return '';
-};
+}
+exports.getComputedStyle = getComputedStyle;
 
 /**
  * Gets the cascaded style value of a node, or null if the value cannot be
@@ -120,10 +120,11 @@ const getComputedStyle = function(element, property) {
  * @param {string} style Property to get (camel-case).
  * @return {string} Style value.
  */
-const getCascadedStyle = function(element, style) {
+function getCascadedStyle(element, style) {
   return /** @type {string} */ (
       element.currentStyle ? element.currentStyle[style] : null);
-};
+}
+exports.getCascadedStyle = getCascadedStyle;
 
 /**
  * Returns a Coordinate object relative to the top-left of the HTML document.
@@ -131,7 +132,7 @@ const getCascadedStyle = function(element, style) {
  * @param {!Element} el Element to get the page offset for.
  * @return {!Coordinate} The page offset.
  */
-const getPageOffset = function(el) {
+function getPageOffset(el) {
   const pos = new Coordinate(0, 0);
   const box = el.getBoundingClientRect();
   const documentElement = document.documentElement;
@@ -145,20 +146,22 @@ const getPageOffset = function(el) {
   pos.y = box.top + scrollCoord.y;
 
   return pos;
-};
+}
+exports.getPageOffset = getPageOffset;
 
 /**
  * Calculates the viewport coordinates relative to the document.
  * Similar to Closure's goog.style.getViewportPageOffset
  * @return {!Coordinate} The page offset of the viewport.
  */
-const getViewportPageOffset = function() {
+function getViewportPageOffset() {
   const body = document.body;
   const documentElement = document.documentElement;
   const scrollLeft = body.scrollLeft || documentElement.scrollLeft;
   const scrollTop = body.scrollTop || documentElement.scrollTop;
   return new Coordinate(scrollLeft, scrollTop);
-};
+}
+exports.getViewportPageOffset = getViewportPageOffset;
 
 /**
  * Shows or hides an element from the page. Hiding the element is done by
@@ -172,9 +175,10 @@ const getViewportPageOffset = function() {
  * @param {*} isShown True to render the element in its default style,
  *     false to disable rendering the element.
  */
-const setElementShown = function(el, isShown) {
+function setElementShown(el, isShown) {
   el.style.display = isShown ? '' : 'none';
-};
+}
+exports.setElementShown = setElementShown;
 
 /**
  * Returns true if the element is using right to left (RTL) direction.
@@ -183,9 +187,10 @@ const setElementShown = function(el, isShown) {
  * @param {!Element} el The element to test.
  * @return {boolean} True for right to left, false for left to right.
  */
-const isRightToLeft = function(el) {
+function isRightToLeft(el) {
   return 'rtl' == getStyle(el, 'direction');
-};
+}
+exports.isRightToLeft = isRightToLeft;
 
 /**
  * Gets the computed border widths (on all sides) in pixels
@@ -193,7 +198,7 @@ const isRightToLeft = function(el) {
  * @param {!Element} element  The element to get the border widths for.
  * @return {!Object} The computed border widths.
  */
-const getBorderBox = function(element) {
+function getBorderBox(element) {
   const left = getComputedStyle(element, 'borderLeftWidth');
   const right = getComputedStyle(element, 'borderRightWidth');
   const top = getComputedStyle(element, 'borderTopWidth');
@@ -205,7 +210,8 @@ const getBorderBox = function(element) {
     bottom: parseFloat(bottom),
     left: parseFloat(left)
   };
-};
+}
+exports.getBorderBox = getBorderBox;
 
 /**
  * Changes the scroll position of `container` with the minimum amount so
@@ -220,11 +226,12 @@ const getBorderBox = function(element) {
  * @param {boolean=} opt_center Whether to center the element in the container.
  *     Defaults to false.
  */
-const scrollIntoContainerView = function(element, container, opt_center) {
+function scrollIntoContainerView(element, container, opt_center) {
   const offset = getContainerOffsetToScrollInto(element, container, opt_center);
   container.scrollLeft = offset.x;
   container.scrollTop = offset.y;
-};
+}
+exports.scrollIntoContainerView = scrollIntoContainerView;
 
 /**
  * Calculate the scroll position of `container` with the minimum amount so
@@ -241,8 +248,7 @@ const scrollIntoContainerView = function(element, container, opt_center) {
  * @return {!Coordinate} The new scroll position of the container,
  *     in form of goog.math.Coordinate(scrollLeft, scrollTop).
  */
-const getContainerOffsetToScrollInto = function(
-    element, container, opt_center) {
+function getContainerOffsetToScrollInto(element, container, opt_center) {
   // Absolute position of the element's border's top left corner.
   const elementPos = getPageOffset(element);
   // Absolute position of the container's border's top left corner.
@@ -275,17 +281,5 @@ const getContainerOffsetToScrollInto = function(
     scrollTop += Math.min(relY, Math.max(relY - spaceY, 0));
   }
   return new Coordinate(scrollLeft, scrollTop);
-};
-
-exports = {
-  getSize,
-  getComputedStyle,
-  getCascadedStyle,
-  getPageOffset,
-  getViewportPageOffset,
-  setElementShown,
-  isRightToLeft,
-  getBorderBox,
-  scrollIntoContainerView,
-  getContainerOffsetToScrollInto,
-};
+}
+exports.getContainerOffsetToScrollInto = getContainerOffsetToScrollInto;

From 30f27606c8d01b69260a79fb30e159f65d16b36e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 12:12:44 -0700
Subject: [PATCH 119/833] Migrate core/interfaces/i_bubble.js to goog.module

---
 core/interfaces/i_bubble.js | 23 +++++++++++++----------
 tests/deps.js               |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/core/interfaces/i_bubble.js b/core/interfaces/i_bubble.js
index 7fae99edf..487d2a8a8 100644
--- a/core/interfaces/i_bubble.js
+++ b/core/interfaces/i_bubble.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-goog.provide('Blockly.IBubble');
+goog.module('Blockly.IBubble');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.IContextMenu');
 goog.require('Blockly.IDraggable');
@@ -26,20 +27,20 @@ goog.requireType('Blockly.utils.Coordinate');
  * @extends {Blockly.IDraggable}
  * @extends {Blockly.IContextMenu}
  */
-Blockly.IBubble = function() {};
+const IBubble = function() {};
 
 /**
  * Return the coordinates of the top-left corner of this bubble's body relative
  * to the drawing surface's origin (0,0), in workspace units.
  * @return {!Blockly.utils.Coordinate} Object with .x and .y properties.
  */
-Blockly.IBubble.prototype.getRelativeToSurfaceXY;
+IBubble.prototype.getRelativeToSurfaceXY;
 
 /**
  * Return the root node of the bubble's SVG group.
  * @return {!SVGElement} The root SVG node of the bubble's group.
  */
-Blockly.IBubble.prototype.getSvgRoot;
+IBubble.prototype.getSvgRoot;
 
 /**
  * Set whether auto-layout of this bubble is enabled.  The first time a bubble
@@ -48,13 +49,13 @@ Blockly.IBubble.prototype.getSvgRoot;
  * @param {boolean} enable True if auto-layout should be enabled, false
  *     otherwise.
  */
-Blockly.IBubble.prototype.setAutoLayout;
+IBubble.prototype.setAutoLayout;
 
 /**
  * Triggers a move callback if one exists at the end of a drag.
  * @param {boolean} adding True if adding, false if removing.
  */
-Blockly.IBubble.prototype.setDragging;
+IBubble.prototype.setDragging;
 
 /**
  * Move this bubble during a drag, taking into account whether or not there is
@@ -64,23 +65,25 @@ Blockly.IBubble.prototype.setDragging;
  * @param {!Blockly.utils.Coordinate} newLoc The location to translate to, in
  *     workspace coordinates.
  */
-Blockly.IBubble.prototype.moveDuringDrag;
+IBubble.prototype.moveDuringDrag;
 
 /**
  * Move the bubble to the specified location in workspace coordinates.
  * @param {number} x The x position to move to.
  * @param {number} y The y position to move to.
  */
-Blockly.IBubble.prototype.moveTo;
+IBubble.prototype.moveTo;
 
 /**
  * Update the style of this bubble when it is dragged over a delete area.
  * @param {boolean} enable True if the bubble is about to be deleted, false
  *     otherwise.
  */
-Blockly.IBubble.prototype.setDeleteStyle;
+IBubble.prototype.setDeleteStyle;
 
 /**
  * Dispose of this bubble.
  */
-Blockly.IBubble.prototype.dispose;
+IBubble.prototype.dispose;
+
+exports = IBubble;
diff --git a/tests/deps.js b/tests/deps.js
index cdeae73f4..8ce3faaae 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -77,7 +77,7 @@ goog.addDependency('../../core/interfaces/i_accessibility.js', ['Blockly.IASTNod
 goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], ['Blockly.IComponent']);
 goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], ['Blockly.IContextMenu', 'Blockly.IDraggable']);
+goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], ['Blockly.IContextMenu', 'Blockly.IDraggable'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], []);
 goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], []);

From 2c80b90dab65941610882aeebe598016724a2baa Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 12:17:08 -0700
Subject: [PATCH 120/833] Migrate core/interfaces/i_bubble.js named requires

---
 core/interfaces/i_bubble.js | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/core/interfaces/i_bubble.js b/core/interfaces/i_bubble.js
index 487d2a8a8..08e339a19 100644
--- a/core/interfaces/i_bubble.js
+++ b/core/interfaces/i_bubble.js
@@ -14,25 +14,24 @@
 goog.module('Blockly.IBubble');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.IContextMenu');
-goog.require('Blockly.IDraggable');
-
-goog.requireType('Blockly.BlockDragSurfaceSvg');
-goog.requireType('Blockly.utils.Coordinate');
+const BlockDragSurfaceSvg = goog.requireType('Blockly.BlockDragSurfaceSvg');
+const Coordinate = goog.requireType('Blockly.utils.Coordinate');
+const IContextMenu = goog.require('Blockly.IContextMenu');
+const IDraggable = goog.require('Blockly.IDraggable');
 
 
 /**
  * A bubble interface.
  * @interface
- * @extends {Blockly.IDraggable}
- * @extends {Blockly.IContextMenu}
+ * @extends {IDraggable}
+ * @extends {IContextMenu}
  */
 const IBubble = function() {};
 
 /**
  * Return the coordinates of the top-left corner of this bubble's body relative
  * to the drawing surface's origin (0,0), in workspace units.
- * @return {!Blockly.utils.Coordinate} Object with .x and .y properties.
+ * @return {!Coordinate} Object with .x and .y properties.
  */
 IBubble.prototype.getRelativeToSurfaceXY;
 
@@ -60,9 +59,9 @@ IBubble.prototype.setDragging;
 /**
  * Move this bubble during a drag, taking into account whether or not there is
  * a drag surface.
- * @param {Blockly.BlockDragSurfaceSvg} dragSurface The surface that carries
+ * @param {BlockDragSurfaceSvg} dragSurface The surface that carries
  *     rendered items during a drag, or null if no drag surface is in use.
- * @param {!Blockly.utils.Coordinate} newLoc The location to translate to, in
+ * @param {!Coordinate} newLoc The location to translate to, in
  *     workspace coordinates.
  */
 IBubble.prototype.moveDuringDrag;

From bac62dc9be141d4c2433a02235d1be57d7d12868 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 19 Jul 2021 09:26:39 -0700
Subject: [PATCH 121/833] Update jsdoc annotation in
 core/interfaces/i_bubble.js

---
 core/interfaces/i_bubble.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/interfaces/i_bubble.js b/core/interfaces/i_bubble.js
index 08e339a19..e41a1bf25 100644
--- a/core/interfaces/i_bubble.js
+++ b/core/interfaces/i_bubble.js
@@ -59,7 +59,7 @@ IBubble.prototype.setDragging;
 /**
  * Move this bubble during a drag, taking into account whether or not there is
  * a drag surface.
- * @param {BlockDragSurfaceSvg} dragSurface The surface that carries
+ * @param {?BlockDragSurfaceSvg} dragSurface The surface that carries
  *     rendered items during a drag, or null if no drag surface is in use.
  * @param {!Coordinate} newLoc The location to translate to, in
  *     workspace coordinates.

From 456969767b4f9d29abf4e9709407d7fed0df892c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 16:03:50 -0700
Subject: [PATCH 122/833] Migrate core/interfaces/i_selectable.js to
 goog.module

---
 core/interfaces/i_selectable.js | 13 ++++++++-----
 tests/deps.js                   |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/core/interfaces/i_selectable.js b/core/interfaces/i_selectable.js
index e3d817fde..d3355f9ab 100644
--- a/core/interfaces/i_selectable.js
+++ b/core/interfaces/i_selectable.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-goog.provide('Blockly.ISelectable');
+goog.module('Blockly.ISelectable');
+goog.module.declareLegacyNamespace();
 
 goog.requireType('Blockly.IDeletable');
 goog.requireType('Blockly.IMovable');
@@ -23,21 +24,23 @@ goog.requireType('Blockly.IMovable');
  * @extends {Blockly.IMovable}
  * @interface
  */
-Blockly.ISelectable = function() {};
+const ISelectable = function() {};
 
 /**
  * @type {string}
  */
-Blockly.ISelectable.prototype.id;
+ISelectable.prototype.id;
 
 /**
  * Select this.  Highlight it visually.
  * @return {void}
  */
-Blockly.ISelectable.prototype.select;
+ISelectable.prototype.select;
 
 /**
  * Unselect this.  Unhighlight it visually.
  * @return {void}
  */
-Blockly.ISelectable.prototype.unselect;
+ISelectable.prototype.unselect;
+
+exports = ISelectable;
diff --git a/tests/deps.js b/tests/deps.js
index 8ce3faaae..33396a17b 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -92,7 +92,7 @@ goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [
 goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], []);
 goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], []);
-goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], []);
+goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], []);
 goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem', 'Blockly.ISelectableToolboxItem', 'Blockly.IToolboxItem'], []);

From e722097c1bac2e658e5dedbfa9c2b9c0df66cef3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 11:21:47 -0700
Subject: [PATCH 123/833] Break up interfaces in core/i_accessibility.js into
 separate files

---
 core/interfaces/i_accessibility.js            | 75 -------------------
 core/interfaces/i_ast_node_location.js        | 20 +++++
 core/interfaces/i_ast_node_location_svg.js    | 38 ++++++++++
 .../i_ast_node_location_with_block.js         | 32 ++++++++
 core/interfaces/i_keyboard_accessible.js      | 30 ++++++++
 5 files changed, 120 insertions(+), 75 deletions(-)
 delete mode 100644 core/interfaces/i_accessibility.js
 create mode 100644 core/interfaces/i_ast_node_location.js
 create mode 100644 core/interfaces/i_ast_node_location_svg.js
 create mode 100644 core/interfaces/i_ast_node_location_with_block.js
 create mode 100644 core/interfaces/i_keyboard_accessible.js

diff --git a/core/interfaces/i_accessibility.js b/core/interfaces/i_accessibility.js
deleted file mode 100644
index 30d724959..000000000
--- a/core/interfaces/i_accessibility.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * @license
- * Copyright 2020 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview AST Node and keyboard navigation interfaces.
- * @author samelh@google.com (Sam El-Husseini)
- */
-
-'use strict';
-
-goog.provide('Blockly.IASTNodeLocation');
-goog.provide('Blockly.IASTNodeLocationSvg');
-goog.provide('Blockly.IASTNodeLocationWithBlock');
-goog.provide('Blockly.IKeyboardAccessible');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.ShortcutRegistry');
-
-
-/**
- * An AST node location interface.
- * @interface
- */
-Blockly.IASTNodeLocation = function() {};
-
-/**
- * An AST node location SVG interface.
- * @interface
- * @extends {Blockly.IASTNodeLocation}
- */
-Blockly.IASTNodeLocationSvg = function() {};
-
-/**
- * Add the marker SVG to this node's SVG group.
- * @param {SVGElement} markerSvg The SVG root of the marker to be added to the
- *     SVG group.
- */
-Blockly.IASTNodeLocationSvg.prototype.setMarkerSvg;
-
-/**
- * Add the cursor SVG to this node's SVG group.
- * @param {SVGElement} cursorSvg The SVG root of the cursor to be added to the
- *     SVG group.
- */
-Blockly.IASTNodeLocationSvg.prototype.setCursorSvg;
-
-/**
- * An AST node location that has an associated block.
- * @interface
- * @extends {Blockly.IASTNodeLocation}
- */
-Blockly.IASTNodeLocationWithBlock = function() {};
-
-/**
- * Get the source block associated with this node.
- * @return {Blockly.Block} The source block.
- */
-Blockly.IASTNodeLocationWithBlock.prototype.getSourceBlock;
-
-
-/**
- * An interface for an object that handles keyboard shortcuts.
- * @interface
- */
-Blockly.IKeyboardAccessible = function() {};
-
-/**
- * Handles the given keyboard shortcut.
- * @param {!Blockly.ShortcutRegistry.KeyboardShortcut} shortcut The shortcut to be handled.
- * @return {boolean} True if the shortcut has been handled, false otherwise.
- */
-Blockly.IKeyboardAccessible.prototype.onShortcut;
diff --git a/core/interfaces/i_ast_node_location.js b/core/interfaces/i_ast_node_location.js
new file mode 100644
index 000000000..8d3d8cb97
--- /dev/null
+++ b/core/interfaces/i_ast_node_location.js
@@ -0,0 +1,20 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview The interface for an AST node location.
+ * @author samelh@google.com (Sam El-Husseini)
+ */
+
+'use strict';
+
+goog.provide('Blockly.IASTNodeLocation');
+
+/**
+ * An AST node location interface.
+ * @interface
+ */
+Blockly.IASTNodeLocation = function() {};
diff --git a/core/interfaces/i_ast_node_location_svg.js b/core/interfaces/i_ast_node_location_svg.js
new file mode 100644
index 000000000..7711289b1
--- /dev/null
+++ b/core/interfaces/i_ast_node_location_svg.js
@@ -0,0 +1,38 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview The interface for an AST node location SVG.
+ * @author samelh@google.com (Sam El-Husseini)
+ */
+
+'use strict';
+
+goog.provide('Blockly.IASTNodeLocationSvg');
+
+goog.require('Blockly.IASTNodeLocation');
+
+
+/**
+ * An AST node location SVG interface.
+ * @interface
+ * @extends {Blockly.IASTNodeLocation}
+ */
+Blockly.IASTNodeLocationSvg = function() {};
+
+/**
+ * Add the marker SVG to this node's SVG group.
+ * @param {SVGElement} markerSvg The SVG root of the marker to be added to the
+ *     SVG group.
+ */
+Blockly.IASTNodeLocationSvg.prototype.setMarkerSvg;
+
+/**
+ * Add the cursor SVG to this node's SVG group.
+ * @param {SVGElement} cursorSvg The SVG root of the cursor to be added to the
+ *     SVG group.
+ */
+Blockly.IASTNodeLocationSvg.prototype.setCursorSvg;
diff --git a/core/interfaces/i_ast_node_location_with_block.js b/core/interfaces/i_ast_node_location_with_block.js
new file mode 100644
index 000000000..612ef0e73
--- /dev/null
+++ b/core/interfaces/i_ast_node_location_with_block.js
@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview The interface for an AST node location that has an associated
+ * block.
+ * @author samelh@google.com (Sam El-Husseini)
+ */
+
+'use strict';
+
+goog.provide('Blockly.IASTNodeLocationWithBlock');
+
+goog.require('Blockly.IASTNodeLocation');
+goog.requireType('Blockly.Block');
+
+
+/**
+ * An AST node location that has an associated block.
+ * @interface
+ * @extends {Blockly.IASTNodeLocation}
+ */
+Blockly.IASTNodeLocationWithBlock = function() {};
+
+/**
+ * Get the source block associated with this node.
+ * @return {Blockly.Block} The source block.
+ */
+Blockly.IASTNodeLocationWithBlock.prototype.getSourceBlock;
diff --git a/core/interfaces/i_keyboard_accessible.js b/core/interfaces/i_keyboard_accessible.js
new file mode 100644
index 000000000..5807e47bf
--- /dev/null
+++ b/core/interfaces/i_keyboard_accessible.js
@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview The interface for objects that handle keyboard shortcuts.
+ * @author samelh@google.com (Sam El-Husseini)
+ */
+
+'use strict';
+
+goog.provide('Blockly.IKeyboardAccessible');
+
+goog.requireType('Blockly.ShortcutRegistry');
+
+
+/**
+ * An interface for an object that handles keyboard shortcuts.
+ * @interface
+ */
+Blockly.IKeyboardAccessible = function() {};
+
+/**
+ * Handles the given keyboard shortcut.
+ * @param {!Blockly.ShortcutRegistry.KeyboardShortcut} shortcut The shortcut to be handled.
+ * @return {boolean} True if the shortcut has been handled, false otherwise.
+ */
+Blockly.IKeyboardAccessible.prototype.onShortcut;

From 81b067f83acce2898372771d25cdc08b76f0d148 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 11:41:41 -0700
Subject: [PATCH 124/833] Migrate core/interfaces/i_ast_node_location.js to
 goog.module

---
 core/interfaces/i_ast_node_location.js | 7 +++++--
 tests/deps.js                          | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/interfaces/i_ast_node_location.js b/core/interfaces/i_ast_node_location.js
index 8d3d8cb97..0ebec8ebd 100644
--- a/core/interfaces/i_ast_node_location.js
+++ b/core/interfaces/i_ast_node_location.js
@@ -11,10 +11,13 @@
 
 'use strict';
 
-goog.provide('Blockly.IASTNodeLocation');
+goog.module('Blockly.IASTNodeLocation');
+goog.module.declareLegacyNamespace();
 
 /**
  * An AST node location interface.
  * @interface
  */
-Blockly.IASTNodeLocation = function() {};
+const IASTNodeLocation = function() {};
+
+exports = IASTNodeLocation;
diff --git a/tests/deps.js b/tests/deps.js
index 33396a17b..274980325 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -73,7 +73,9 @@ goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDr
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.Connection', 'Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es5'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes']);
 goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es5'});
-goog.addDependency('../../core/interfaces/i_accessibility.js', ['Blockly.IASTNodeLocation', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible'], []);
+goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], ['Blockly.IASTNodeLocation']);
+goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], ['Blockly.IASTNodeLocation']);
 goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], ['Blockly.IComponent']);
 goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], [], {'lang': 'es6', 'module': 'goog'});
@@ -87,6 +89,7 @@ goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteAr
 goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], ['Blockly.IDeletable'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], []);
+goog.addDependency('../../core/interfaces/i_keyboard_accessible.js', ['Blockly.IKeyboardAccessible'], []);
 goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], []);
 goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});

From 1c72055e4f798cd98d4c2d8ddf304092f2a67835 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 11:42:08 -0700
Subject: [PATCH 125/833] Migrate core/interfaces/i_ast_node_location_svg.js to
 goog.module

---
 core/interfaces/i_ast_node_location_svg.js | 11 +++++++----
 tests/deps.js                              |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/interfaces/i_ast_node_location_svg.js b/core/interfaces/i_ast_node_location_svg.js
index 7711289b1..cf7c1e1cf 100644
--- a/core/interfaces/i_ast_node_location_svg.js
+++ b/core/interfaces/i_ast_node_location_svg.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-goog.provide('Blockly.IASTNodeLocationSvg');
+goog.module('Blockly.IASTNodeLocationSvg');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.IASTNodeLocation');
 
@@ -21,18 +22,20 @@ goog.require('Blockly.IASTNodeLocation');
  * @interface
  * @extends {Blockly.IASTNodeLocation}
  */
-Blockly.IASTNodeLocationSvg = function() {};
+const IASTNodeLocationSvg = function() {};
 
 /**
  * Add the marker SVG to this node's SVG group.
  * @param {SVGElement} markerSvg The SVG root of the marker to be added to the
  *     SVG group.
  */
-Blockly.IASTNodeLocationSvg.prototype.setMarkerSvg;
+IASTNodeLocationSvg.prototype.setMarkerSvg;
 
 /**
  * Add the cursor SVG to this node's SVG group.
  * @param {SVGElement} cursorSvg The SVG root of the cursor to be added to the
  *     SVG group.
  */
-Blockly.IASTNodeLocationSvg.prototype.setCursorSvg;
+IASTNodeLocationSvg.prototype.setCursorSvg;
+
+exports = IASTNodeLocationSvg;
diff --git a/tests/deps.js b/tests/deps.js
index 274980325..d2f153f3c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -74,7 +74,7 @@ goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.Connectio
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes']);
 goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es5'});
 goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], ['Blockly.IASTNodeLocation']);
+goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], ['Blockly.IASTNodeLocation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], ['Blockly.IASTNodeLocation']);
 goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], ['Blockly.IComponent']);
 goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});

From cdea0789dd79a06b0b06fd9e410d28cd838063af Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 11:42:37 -0700
Subject: [PATCH 126/833] Migrate core/interfaces/i_ast_node_location_svg.js
 named requires

---
 core/interfaces/i_ast_node_location_svg.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/interfaces/i_ast_node_location_svg.js b/core/interfaces/i_ast_node_location_svg.js
index cf7c1e1cf..5b58d4abc 100644
--- a/core/interfaces/i_ast_node_location_svg.js
+++ b/core/interfaces/i_ast_node_location_svg.js
@@ -14,13 +14,13 @@
 goog.module('Blockly.IASTNodeLocationSvg');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.IASTNodeLocation');
+const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation');
 
 
 /**
  * An AST node location SVG interface.
  * @interface
- * @extends {Blockly.IASTNodeLocation}
+ * @extends {IASTNodeLocation}
  */
 const IASTNodeLocationSvg = function() {};
 

From 794e4554fe3b7f191d12787b7060ea28021e2bc8 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 11:43:03 -0700
Subject: [PATCH 127/833] Migrate
 core/interfaces/i_ast_node_location_with_block.js to goog.module

---
 core/interfaces/i_ast_node_location_with_block.js | 9 ++++++---
 tests/deps.js                                     | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/interfaces/i_ast_node_location_with_block.js b/core/interfaces/i_ast_node_location_with_block.js
index 612ef0e73..85606e546 100644
--- a/core/interfaces/i_ast_node_location_with_block.js
+++ b/core/interfaces/i_ast_node_location_with_block.js
@@ -12,7 +12,8 @@
 
 'use strict';
 
-goog.provide('Blockly.IASTNodeLocationWithBlock');
+goog.module('Blockly.IASTNodeLocationWithBlock');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.IASTNodeLocation');
 goog.requireType('Blockly.Block');
@@ -23,10 +24,12 @@ goog.requireType('Blockly.Block');
  * @interface
  * @extends {Blockly.IASTNodeLocation}
  */
-Blockly.IASTNodeLocationWithBlock = function() {};
+const IASTNodeLocationWithBlock = function() {};
 
 /**
  * Get the source block associated with this node.
  * @return {Blockly.Block} The source block.
  */
-Blockly.IASTNodeLocationWithBlock.prototype.getSourceBlock;
+IASTNodeLocationWithBlock.prototype.getSourceBlock;
+
+exports = IASTNodeLocationWithBlock;
diff --git a/tests/deps.js b/tests/deps.js
index d2f153f3c..9346e750f 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -75,7 +75,7 @@ goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockl
 goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es5'});
 goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], ['Blockly.IASTNodeLocation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], ['Blockly.IASTNodeLocation']);
+goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], ['Blockly.IASTNodeLocation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], ['Blockly.IComponent']);
 goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], [], {'lang': 'es6', 'module': 'goog'});

From 04ef2705d169aead800b17336fb85c7569765d16 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 11:43:27 -0700
Subject: [PATCH 128/833] Migrate
 core/interfaces/i_ast_node_location_with_block.js named requires

---
 core/interfaces/i_ast_node_location_with_block.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/interfaces/i_ast_node_location_with_block.js b/core/interfaces/i_ast_node_location_with_block.js
index 85606e546..58da7a902 100644
--- a/core/interfaces/i_ast_node_location_with_block.js
+++ b/core/interfaces/i_ast_node_location_with_block.js
@@ -15,20 +15,20 @@
 goog.module('Blockly.IASTNodeLocationWithBlock');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.IASTNodeLocation');
-goog.requireType('Blockly.Block');
+const Block = goog.requireType('Blockly.Block');
+const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation');
 
 
 /**
  * An AST node location that has an associated block.
  * @interface
- * @extends {Blockly.IASTNodeLocation}
+ * @extends {IASTNodeLocation}
  */
 const IASTNodeLocationWithBlock = function() {};
 
 /**
  * Get the source block associated with this node.
- * @return {Blockly.Block} The source block.
+ * @return {Block} The source block.
  */
 IASTNodeLocationWithBlock.prototype.getSourceBlock;
 

From 3d174ae058ddb2bea96b942d95b5bc4329931ada Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 12:32:12 -0700
Subject: [PATCH 129/833] Migrate core/interfaces/i_keyboard_accessible.js to
 goog.module

---
 core/interfaces/i_keyboard_accessible.js | 9 ++++++---
 tests/deps.js                            | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/interfaces/i_keyboard_accessible.js b/core/interfaces/i_keyboard_accessible.js
index 5807e47bf..3720ddc08 100644
--- a/core/interfaces/i_keyboard_accessible.js
+++ b/core/interfaces/i_keyboard_accessible.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-goog.provide('Blockly.IKeyboardAccessible');
+goog.module('Blockly.IKeyboardAccessible');
+goog.module.declareLegacyNamespace();
 
 goog.requireType('Blockly.ShortcutRegistry');
 
@@ -20,11 +21,13 @@ goog.requireType('Blockly.ShortcutRegistry');
  * An interface for an object that handles keyboard shortcuts.
  * @interface
  */
-Blockly.IKeyboardAccessible = function() {};
+const IKeyboardAccessible = function() {};
 
 /**
  * Handles the given keyboard shortcut.
  * @param {!Blockly.ShortcutRegistry.KeyboardShortcut} shortcut The shortcut to be handled.
  * @return {boolean} True if the shortcut has been handled, false otherwise.
  */
-Blockly.IKeyboardAccessible.prototype.onShortcut;
+IKeyboardAccessible.prototype.onShortcut;
+
+exports = IKeyboardAccessible;
diff --git a/tests/deps.js b/tests/deps.js
index 9346e750f..188e4ed43 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -89,7 +89,7 @@ goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteAr
 goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], ['Blockly.IDeletable'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], []);
-goog.addDependency('../../core/interfaces/i_keyboard_accessible.js', ['Blockly.IKeyboardAccessible'], []);
+goog.addDependency('../../core/interfaces/i_keyboard_accessible.js', ['Blockly.IKeyboardAccessible'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], []);
 goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});

From 94e36dba319bb1580b3e16a1f9496f5f54377740 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 12:32:21 -0700
Subject: [PATCH 130/833] Migrate core/interfaces/i_keyboard_accessible.js
 named requires

---
 core/interfaces/i_keyboard_accessible.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/interfaces/i_keyboard_accessible.js b/core/interfaces/i_keyboard_accessible.js
index 3720ddc08..8f21153da 100644
--- a/core/interfaces/i_keyboard_accessible.js
+++ b/core/interfaces/i_keyboard_accessible.js
@@ -14,7 +14,7 @@
 goog.module('Blockly.IKeyboardAccessible');
 goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.ShortcutRegistry');
+const {KeyboardShortcut} = goog.requireType('Blockly.ShortcutRegistry');
 
 
 /**
@@ -25,7 +25,7 @@ const IKeyboardAccessible = function() {};
 
 /**
  * Handles the given keyboard shortcut.
- * @param {!Blockly.ShortcutRegistry.KeyboardShortcut} shortcut The shortcut to be handled.
+ * @param {!KeyboardShortcut} shortcut The shortcut to be handled.
  * @return {boolean} True if the shortcut has been handled, false otherwise.
  */
 IKeyboardAccessible.prototype.onShortcut;

From bdede7c1ab5bbef39421c90db0ab5d5aceb8a734 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 12:41:13 -0700
Subject: [PATCH 131/833] Migrate core/interfaces/i_contextmenu.js to
 goog.module

---
 core/interfaces/i_contextmenu.js | 9 ++++++---
 tests/deps.js                    | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/interfaces/i_contextmenu.js b/core/interfaces/i_contextmenu.js
index fcc406b05..79117d5ed 100644
--- a/core/interfaces/i_contextmenu.js
+++ b/core/interfaces/i_contextmenu.js
@@ -11,16 +11,19 @@
 
 'use strict';
 
-goog.provide('Blockly.IContextMenu');
+goog.module('Blockly.IContextMenu');
+goog.module.declareLegacyNamespace();
 
 
 /**
  * @interface
  */
-Blockly.IContextMenu = function() {};
+const IContextMenu = function() {};
 
 /**
  * Show the context menu for this object.
  * @param {!Event} e Mouse event.
  */
-Blockly.IContextMenu.prototype.showContextMenu;
+IContextMenu.prototype.showContextMenu;
+
+exports = IContextMenu;
diff --git a/tests/deps.js b/tests/deps.js
index 188e4ed43..455f21cc6 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -82,7 +82,7 @@ goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoun
 goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], ['Blockly.IContextMenu', 'Blockly.IDraggable'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], []);
-goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], []);
+goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_copyable.js', ['Blockly.ICopyable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_deletable.js', ['Blockly.IDeletable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});

From f77d5f12647fcfa3c9d262cd32187a4539bf1886 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 19 Jul 2021 10:49:20 -0700
Subject: [PATCH 132/833] Migrate core/connection_db.js to ES6 const/let

---
 core/connection_db.js | 52 +++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/core/connection_db.js b/core/connection_db.js
index 4b2615725..b6d990af1 100644
--- a/core/connection_db.js
+++ b/core/connection_db.js
@@ -56,7 +56,7 @@ Blockly.ConnectionDB = function(checker) {
  * @package
  */
 Blockly.ConnectionDB.prototype.addConnection = function(connection, yPos) {
-  var index = this.calculateIndexForYPos_(yPos);
+  const index = this.calculateIndexForYPos_(yPos);
   this.connections_.splice(index, 0, connection);
 };
 
@@ -76,7 +76,7 @@ Blockly.ConnectionDB.prototype.findIndexOfConnection_ = function(conn, yPos) {
     return -1;
   }
 
-  var bestGuess = this.calculateIndexForYPos_(yPos);
+  const bestGuess = this.calculateIndexForYPos_(yPos);
   if (bestGuess >= this.connections_.length) {
     // Not in list
     return -1;
@@ -84,7 +84,7 @@ Blockly.ConnectionDB.prototype.findIndexOfConnection_ = function(conn, yPos) {
 
   yPos = conn.y;
   // Walk forward and back on the y axis looking for the connection.
-  var pointer = bestGuess;
+  let pointer = bestGuess;
   while (pointer >= 0 && this.connections_[pointer].y == yPos) {
     if (this.connections_[pointer] == conn) {
       return pointer;
@@ -114,10 +114,10 @@ Blockly.ConnectionDB.prototype.calculateIndexForYPos_ = function(yPos) {
   if (!this.connections_.length) {
     return 0;
   }
-  var pointerMin = 0;
-  var pointerMax = this.connections_.length;
+  let pointerMin = 0;
+  let pointerMax = this.connections_.length;
   while (pointerMin < pointerMax) {
-    var pointerMid = Math.floor((pointerMin + pointerMax) / 2);
+    const pointerMid = Math.floor((pointerMin + pointerMax) / 2);
     if (this.connections_[pointerMid].y < yPos) {
       pointerMin = pointerMid + 1;
     } else if (this.connections_[pointerMid].y > yPos) {
@@ -137,7 +137,7 @@ Blockly.ConnectionDB.prototype.calculateIndexForYPos_ = function(yPos) {
  * @throws {Error} If the connection cannot be found in the database.
  */
 Blockly.ConnectionDB.prototype.removeConnection = function(connection, yPos) {
-  var index = this.findIndexOfConnection_(connection, yPos);
+  const index = this.findIndexOfConnection_(connection, yPos);
   if (index == -1) {
     throw Error('Unable to find connection in connectionDB.');
   }
@@ -153,14 +153,14 @@ Blockly.ConnectionDB.prototype.removeConnection = function(connection, yPos) {
  * @return {!Array<!Blockly.RenderedConnection>} List of connections.
  */
 Blockly.ConnectionDB.prototype.getNeighbours = function(connection, maxRadius) {
-  var db = this.connections_;
-  var currentX = connection.x;
-  var currentY = connection.y;
+  const db = this.connections_;
+  const currentX = connection.x;
+  const currentY = connection.y;
 
   // Binary search to find the closest y location.
-  var pointerMin = 0;
-  var pointerMax = db.length - 2;
-  var pointerMid = pointerMax;
+  let pointerMin = 0;
+  let pointerMax = db.length - 2;
+  let pointerMid = pointerMax;
   while (pointerMin < pointerMid) {
     if (db[pointerMid].y < currentY) {
       pointerMin = pointerMid;
@@ -170,7 +170,7 @@ Blockly.ConnectionDB.prototype.getNeighbours = function(connection, maxRadius) {
     pointerMid = Math.floor((pointerMin + pointerMax) / 2);
   }
 
-  var neighbours = [];
+  const neighbours = [];
   /**
    * Computes if the current connection is within the allowed radius of another
    * connection.
@@ -180,9 +180,9 @@ Blockly.ConnectionDB.prototype.getNeighbours = function(connection, maxRadius) {
    *     the other connection is less than the allowed radius.
    */
   function checkConnection_(yIndex) {
-    var dx = currentX - db[yIndex].x;
-    var dy = currentY - db[yIndex].y;
-    var r = Math.sqrt(dx * dx + dy * dy);
+    const dx = currentX - db[yIndex].x;
+    const dy = currentY - db[yIndex].y;
+    const r = Math.sqrt(dx * dx + dy * dy);
     if (r <= maxRadius) {
       neighbours.push(db[yIndex]);
     }
@@ -237,8 +237,8 @@ Blockly.ConnectionDB.prototype.searchForClosest = function(conn, maxRadius,
   }
 
   // Stash the values of x and y from before the drag.
-  var baseY = conn.y;
-  var baseX = conn.x;
+  const baseY = conn.y;
+  const baseX = conn.x;
 
   conn.x = baseX + dxy.x;
   conn.y = baseY + dxy.y;
@@ -246,14 +246,14 @@ Blockly.ConnectionDB.prototype.searchForClosest = function(conn, maxRadius,
   // calculateIndexForYPos_ finds an index for insertion, which is always
   // after any block with the same y index.  We want to search both forward
   // and back, so search on both sides of the index.
-  var closestIndex = this.calculateIndexForYPos_(conn.y);
+  const closestIndex = this.calculateIndexForYPos_(conn.y);
 
-  var bestConnection = null;
-  var bestRadius = maxRadius;
-  var temp;
+  let bestConnection = null;
+  let bestRadius = maxRadius;
+  let temp;
 
   // Walk forward and back on the y axis looking for the closest x,y point.
-  var pointerMin = closestIndex - 1;
+  let pointerMin = closestIndex - 1;
   while (pointerMin >= 0 && this.isInYRange_(pointerMin, conn.y, maxRadius)) {
     temp = this.connections_[pointerMin];
     if (this.connectionChecker_.canConnect(conn, temp, true, bestRadius)) {
@@ -263,7 +263,7 @@ Blockly.ConnectionDB.prototype.searchForClosest = function(conn, maxRadius,
     pointerMin--;
   }
 
-  var pointerMax = closestIndex;
+  let pointerMax = closestIndex;
   while (pointerMax < this.connections_.length &&
       this.isInYRange_(pointerMax, conn.y, maxRadius)) {
     temp = this.connections_[pointerMax];
@@ -290,7 +290,7 @@ Blockly.ConnectionDB.prototype.searchForClosest = function(conn, maxRadius,
  */
 Blockly.ConnectionDB.init = function(checker) {
   // Create four databases, one for each connection type.
-  var dbList = [];
+  const dbList = [];
   dbList[Blockly.connectionTypes.INPUT_VALUE] =
       new Blockly.ConnectionDB(checker);
   dbList[Blockly.connectionTypes.OUTPUT_VALUE] =

From a87b2b0bfa8cb88cc8dec88362b9c0ee4b05a888 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 19 Jul 2021 10:53:42 -0700
Subject: [PATCH 133/833] Migrate core/connection_db.js to goog.module

---
 core/connection_db.js | 33 ++++++++++++++++++---------------
 tests/deps.js         |  2 +-
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/core/connection_db.js b/core/connection_db.js
index b6d990af1..81782397b 100644
--- a/core/connection_db.js
+++ b/core/connection_db.js
@@ -12,7 +12,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.ConnectionDB');
+goog.module('Blockly.ConnectionDB');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.connectionTypes');
 /** @suppress {extraRequire} */
@@ -32,7 +33,7 @@ goog.requireType('Blockly.utils.Coordinate');
  *     drag.
  * @constructor
  */
-Blockly.ConnectionDB = function(checker) {
+const ConnectionDB = function(checker) {
   /**
    * Array of connections sorted by y position in workspace units.
    * @type {!Array<!Blockly.RenderedConnection>}
@@ -55,7 +56,7 @@ Blockly.ConnectionDB = function(checker) {
  *    connection.
  * @package
  */
-Blockly.ConnectionDB.prototype.addConnection = function(connection, yPos) {
+ConnectionDB.prototype.addConnection = function(connection, yPos) {
   const index = this.calculateIndexForYPos_(yPos);
   this.connections_.splice(index, 0, connection);
 };
@@ -71,7 +72,7 @@ Blockly.ConnectionDB.prototype.addConnection = function(connection, yPos) {
  *     not found.
  * @private
  */
-Blockly.ConnectionDB.prototype.findIndexOfConnection_ = function(conn, yPos) {
+ConnectionDB.prototype.findIndexOfConnection_ = function(conn, yPos) {
   if (!this.connections_.length) {
     return -1;
   }
@@ -110,7 +111,7 @@ Blockly.ConnectionDB.prototype.findIndexOfConnection_ = function(conn, yPos) {
  * @return {number} The candidate index.
  * @private
  */
-Blockly.ConnectionDB.prototype.calculateIndexForYPos_ = function(yPos) {
+ConnectionDB.prototype.calculateIndexForYPos_ = function(yPos) {
   if (!this.connections_.length) {
     return 0;
   }
@@ -136,7 +137,7 @@ Blockly.ConnectionDB.prototype.calculateIndexForYPos_ = function(yPos) {
  * @param {number} yPos The y position used to find the index of the connection.
  * @throws {Error} If the connection cannot be found in the database.
  */
-Blockly.ConnectionDB.prototype.removeConnection = function(connection, yPos) {
+ConnectionDB.prototype.removeConnection = function(connection, yPos) {
   const index = this.findIndexOfConnection_(connection, yPos);
   if (index == -1) {
     throw Error('Unable to find connection in connectionDB.');
@@ -152,7 +153,7 @@ Blockly.ConnectionDB.prototype.removeConnection = function(connection, yPos) {
  * @param {number} maxRadius The maximum radius to another connection.
  * @return {!Array<!Blockly.RenderedConnection>} List of connections.
  */
-Blockly.ConnectionDB.prototype.getNeighbours = function(connection, maxRadius) {
+ConnectionDB.prototype.getNeighbours = function(connection, maxRadius) {
   const db = this.connections_;
   const currentX = connection.x;
   const currentY = connection.y;
@@ -213,7 +214,7 @@ Blockly.ConnectionDB.prototype.getNeighbours = function(connection, maxRadius) {
  * @return {boolean} True if connection is in range.
  * @private
  */
-Blockly.ConnectionDB.prototype.isInYRange_ = function(index, baseY, maxRadius) {
+ConnectionDB.prototype.isInYRange_ = function(index, baseY, maxRadius) {
   return (Math.abs(this.connections_[index].y - baseY) <= maxRadius);
 };
 
@@ -229,7 +230,7 @@ Blockly.ConnectionDB.prototype.isInYRange_ = function(index, baseY, maxRadius) {
  *     Contains two properties: 'connection' which is either another
  *     connection or null, and 'radius' which is the distance.
  */
-Blockly.ConnectionDB.prototype.searchForClosest = function(conn, maxRadius,
+ConnectionDB.prototype.searchForClosest = function(conn, maxRadius,
     dxy) {
   if (!this.connections_.length) {
     // Don't bother.
@@ -286,18 +287,20 @@ Blockly.ConnectionDB.prototype.searchForClosest = function(conn, maxRadius,
  * Initialize a set of connection DBs for a workspace.
  * @param {!Blockly.IConnectionChecker} checker The workspace's
  *     connection checker, used to decide if connections are valid during a drag.
- * @return {!Array<!Blockly.ConnectionDB>} Array of databases.
+ * @return {!Array<!ConnectionDB>} Array of databases.
  */
-Blockly.ConnectionDB.init = function(checker) {
+ConnectionDB.init = function(checker) {
   // Create four databases, one for each connection type.
   const dbList = [];
   dbList[Blockly.connectionTypes.INPUT_VALUE] =
-      new Blockly.ConnectionDB(checker);
+      new ConnectionDB(checker);
   dbList[Blockly.connectionTypes.OUTPUT_VALUE] =
-      new Blockly.ConnectionDB(checker);
+      new ConnectionDB(checker);
   dbList[Blockly.connectionTypes.NEXT_STATEMENT] =
-      new Blockly.ConnectionDB(checker);
+      new ConnectionDB(checker);
   dbList[Blockly.connectionTypes.PREVIOUS_STATEMENT] =
-      new Blockly.ConnectionDB(checker);
+      new ConnectionDB(checker);
   return dbList;
 };
+
+exports = ConnectionDB;
diff --git a/tests/deps.js b/tests/deps.js
index cdeae73f4..7531e34ae 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -21,7 +21,7 @@ goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubbl
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation']);
 goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.RenderedConnection', 'Blockly.connectionTypes', 'Blockly.constants']);
+goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.RenderedConnection', 'Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], ['Blockly.connectionTypes']);
 goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);

From acd7e5596898e39097a7a91faf2760226137ba25 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 19 Jul 2021 10:59:08 -0700
Subject: [PATCH 134/833] Migrate core/connection_db.js to named requires

---
 core/connection_db.js | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/core/connection_db.js b/core/connection_db.js
index 81782397b..0493cf077 100644
--- a/core/connection_db.js
+++ b/core/connection_db.js
@@ -15,20 +15,19 @@
 goog.module('Blockly.ConnectionDB');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.connectionTypes');
+const Coordinate = goog.requireType('Blockly.utils.Coordinate');
+const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');
+const RenderedConnection = goog.require('Blockly.RenderedConnection');
+const connectionTypes = goog.require('Blockly.connectionTypes');
 /** @suppress {extraRequire} */
 goog.require('Blockly.constants');
-goog.require('Blockly.RenderedConnection');
-
-goog.requireType('Blockly.IConnectionChecker');
-goog.requireType('Blockly.utils.Coordinate');
 
 
 /**
  * Database of connections.
  * Connections are stored in order of their vertical component.  This way
  * connections in an area may be looked up quickly using a binary search.
- * @param {!Blockly.IConnectionChecker} checker The workspace's
+ * @param {!IConnectionChecker} checker The workspace's
  *     connection type checker, used to decide if connections are valid during a
  *     drag.
  * @constructor
@@ -36,14 +35,14 @@ goog.requireType('Blockly.utils.Coordinate');
 const ConnectionDB = function(checker) {
   /**
    * Array of connections sorted by y position in workspace units.
-   * @type {!Array<!Blockly.RenderedConnection>}
+   * @type {!Array<!RenderedConnection>}
    * @private
    */
   this.connections_ = [];
   /**
    * The workspace's connection type checker, used to decide if connections are
    * valid during a drag.
-   * @type {!Blockly.IConnectionChecker}
+   * @type {!IConnectionChecker}
    * @private
    */
   this.connectionChecker_ = checker;
@@ -51,7 +50,7 @@ const ConnectionDB = function(checker) {
 
 /**
  * Add a connection to the database. Should not already exist in the database.
- * @param {!Blockly.RenderedConnection} connection The connection to be added.
+ * @param {!RenderedConnection} connection The connection to be added.
  * @param {number} yPos The y position used to decide where to insert the
  *    connection.
  * @package
@@ -66,7 +65,7 @@ ConnectionDB.prototype.addConnection = function(connection, yPos) {
  *
  * Starts by doing a binary search to find the approximate location, then
  * linearly searches nearby for the exact connection.
- * @param {!Blockly.RenderedConnection} conn The connection to find.
+ * @param {!RenderedConnection} conn The connection to find.
  * @param {number} yPos The y position used to find the index of the connection.
  * @return {number} The index of the connection, or -1 if the connection was
  *     not found.
@@ -133,7 +132,7 @@ ConnectionDB.prototype.calculateIndexForYPos_ = function(yPos) {
 
 /**
  * Remove a connection from the database.  Must already exist in DB.
- * @param {!Blockly.RenderedConnection} connection The connection to be removed.
+ * @param {!RenderedConnection} connection The connection to be removed.
  * @param {number} yPos The y position used to find the index of the connection.
  * @throws {Error} If the connection cannot be found in the database.
  */
@@ -148,10 +147,10 @@ ConnectionDB.prototype.removeConnection = function(connection, yPos) {
 /**
  * Find all nearby connections to the given connection.
  * Type checking does not apply, since this function is used for bumping.
- * @param {!Blockly.RenderedConnection} connection The connection whose
+ * @param {!RenderedConnection} connection The connection whose
  *     neighbours should be returned.
  * @param {number} maxRadius The maximum radius to another connection.
- * @return {!Array<!Blockly.RenderedConnection>} List of connections.
+ * @return {!Array<!RenderedConnection>} List of connections.
  */
 ConnectionDB.prototype.getNeighbours = function(connection, maxRadius) {
   const db = this.connections_;
@@ -220,13 +219,13 @@ ConnectionDB.prototype.isInYRange_ = function(index, baseY, maxRadius) {
 
 /**
  * Find the closest compatible connection to this connection.
- * @param {!Blockly.RenderedConnection} conn The connection searching for a compatible
+ * @param {!RenderedConnection} conn The connection searching for a compatible
  *     mate.
  * @param {number} maxRadius The maximum radius to another connection.
- * @param {!Blockly.utils.Coordinate} dxy Offset between this connection's
+ * @param {!Coordinate} dxy Offset between this connection's
  *     location in the database and the current location (as a result of
  *     dragging).
- * @return {!{connection: Blockly.RenderedConnection, radius: number}}
+ * @return {!{connection: RenderedConnection, radius: number}}
  *     Contains two properties: 'connection' which is either another
  *     connection or null, and 'radius' which is the distance.
  */
@@ -285,20 +284,20 @@ ConnectionDB.prototype.searchForClosest = function(conn, maxRadius,
 
 /**
  * Initialize a set of connection DBs for a workspace.
- * @param {!Blockly.IConnectionChecker} checker The workspace's
+ * @param {!IConnectionChecker} checker The workspace's
  *     connection checker, used to decide if connections are valid during a drag.
  * @return {!Array<!ConnectionDB>} Array of databases.
  */
 ConnectionDB.init = function(checker) {
   // Create four databases, one for each connection type.
   const dbList = [];
-  dbList[Blockly.connectionTypes.INPUT_VALUE] =
+  dbList[connectionTypes.INPUT_VALUE] =
       new ConnectionDB(checker);
-  dbList[Blockly.connectionTypes.OUTPUT_VALUE] =
+  dbList[connectionTypes.OUTPUT_VALUE] =
       new ConnectionDB(checker);
-  dbList[Blockly.connectionTypes.NEXT_STATEMENT] =
+  dbList[connectionTypes.NEXT_STATEMENT] =
       new ConnectionDB(checker);
-  dbList[Blockly.connectionTypes.PREVIOUS_STATEMENT] =
+  dbList[connectionTypes.PREVIOUS_STATEMENT] =
       new ConnectionDB(checker);
   return dbList;
 };

From f2ca65944763ac76339eadb708d0caca8db447cc Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 19 Jul 2021 10:59:44 -0700
Subject: [PATCH 135/833] clang-format core/connection_db.js

---
 core/connection_db.js | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/core/connection_db.js b/core/connection_db.js
index 0493cf077..abc47beb3 100644
--- a/core/connection_db.js
+++ b/core/connection_db.js
@@ -229,8 +229,7 @@ ConnectionDB.prototype.isInYRange_ = function(index, baseY, maxRadius) {
  *     Contains two properties: 'connection' which is either another
  *     connection or null, and 'radius' which is the distance.
  */
-ConnectionDB.prototype.searchForClosest = function(conn, maxRadius,
-    dxy) {
+ConnectionDB.prototype.searchForClosest = function(conn, maxRadius, dxy) {
   if (!this.connections_.length) {
     // Don't bother.
     return {connection: null, radius: maxRadius};
@@ -265,7 +264,7 @@ ConnectionDB.prototype.searchForClosest = function(conn, maxRadius,
 
   let pointerMax = closestIndex;
   while (pointerMax < this.connections_.length &&
-      this.isInYRange_(pointerMax, conn.y, maxRadius)) {
+         this.isInYRange_(pointerMax, conn.y, maxRadius)) {
     temp = this.connections_[pointerMax];
     if (this.connectionChecker_.canConnect(conn, temp, true, bestRadius)) {
       bestConnection = temp;
@@ -285,20 +284,17 @@ ConnectionDB.prototype.searchForClosest = function(conn, maxRadius,
 /**
  * Initialize a set of connection DBs for a workspace.
  * @param {!IConnectionChecker} checker The workspace's
- *     connection checker, used to decide if connections are valid during a drag.
+ *     connection checker, used to decide if connections are valid during a
+ * drag.
  * @return {!Array<!ConnectionDB>} Array of databases.
  */
 ConnectionDB.init = function(checker) {
   // Create four databases, one for each connection type.
   const dbList = [];
-  dbList[connectionTypes.INPUT_VALUE] =
-      new ConnectionDB(checker);
-  dbList[connectionTypes.OUTPUT_VALUE] =
-      new ConnectionDB(checker);
-  dbList[connectionTypes.NEXT_STATEMENT] =
-      new ConnectionDB(checker);
-  dbList[connectionTypes.PREVIOUS_STATEMENT] =
-      new ConnectionDB(checker);
+  dbList[connectionTypes.INPUT_VALUE] = new ConnectionDB(checker);
+  dbList[connectionTypes.OUTPUT_VALUE] = new ConnectionDB(checker);
+  dbList[connectionTypes.NEXT_STATEMENT] = new ConnectionDB(checker);
+  dbList[connectionTypes.PREVIOUS_STATEMENT] = new ConnectionDB(checker);
   return dbList;
 };
 

From 8afef7f59861c0b0af34f99dee6e36aa0fd19607 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Mon, 19 Jul 2021 13:29:45 -0700
Subject: [PATCH 136/833] Destructure some requires

---
 core/renderers/common/info.js | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js
index 146ca5cdd..1cc61af85 100644
--- a/core/renderers/common/info.js
+++ b/core/renderers/common/info.js
@@ -23,7 +23,6 @@ const Icon = goog.require('Blockly.blockRendering.Icon');
 const InlineInput = goog.require('Blockly.blockRendering.InlineInput');
 const Input = goog.requireType('Blockly.Input');
 const InputRow = goog.require('Blockly.blockRendering.InputRow');
-const inputTypes = goog.require('Blockly.inputTypes');
 const InRowSpacer = goog.require('Blockly.blockRendering.InRowSpacer');
 const JaggedEdge = goog.require('Blockly.blockRendering.JaggedEdge');
 const Measurable = goog.require('Blockly.blockRendering.Measurable');
@@ -39,8 +38,9 @@ const SquareCorner = goog.require('Blockly.blockRendering.SquareCorner');
 const StatementInput = goog.require('Blockly.blockRendering.StatementInput');
 const TopRow = goog.require('Blockly.blockRendering.TopRow');
 const Types = goog.require('Blockly.blockRendering.Types');
-/** @suppress {extraRequire} */
-const blocklyConstants = goog.require('Blockly.constants');
+const {ALIGN} = goog.require('Blockly.constants');
+const {VALUE, STATEMENT, DUMMY} = goog.require('Blockly.inputTypes');
+
 
 
 /**
@@ -282,7 +282,7 @@ RenderInfo.prototype.populateTopRow_ = function() {
   }
 
   const precedesStatement = this.block_.inputList.length &&
-      this.block_.inputList[0].type == inputTypes.STATEMENT;
+      this.block_.inputList[0].type == STATEMENT;
 
   // This is the minimum height for the row. If one of its elements has a
   // greater height it will be overwritten in the compute pass.
@@ -306,8 +306,7 @@ RenderInfo.prototype.populateBottomRow_ = function() {
   this.bottomRow.hasNextConnection = !!this.block_.nextConnection;
 
   const followsStatement = this.block_.inputList.length &&
-      this.block_.inputList[this.block_.inputList.length - 1].type ==
-          inputTypes.STATEMENT;
+      this.block_.inputList[this.block_.inputList.length - 1].type == STATEMENT;
 
   // This is the minimum height for the row. If one of its elements has a
   // greater height it will be overwritten in the compute pass.
@@ -352,16 +351,16 @@ RenderInfo.prototype.populateBottomRow_ = function() {
  */
 RenderInfo.prototype.addInput_ = function(input, activeRow) {
   // Non-dummy inputs have visual representations onscreen.
-  if (this.isInline && input.type == inputTypes.VALUE) {
+  if (this.isInline && input.type == VALUE) {
     activeRow.elements.push(new InlineInput(this.constants_, input));
     activeRow.hasInlineInput = true;
-  } else if (input.type == inputTypes.STATEMENT) {
+  } else if (input.type == STATEMENT) {
     activeRow.elements.push(new StatementInput(this.constants_, input));
     activeRow.hasStatement = true;
-  } else if (input.type == inputTypes.VALUE) {
+  } else if (input.type == VALUE) {
     activeRow.elements.push(new ExternalValueInput(this.constants_, input));
     activeRow.hasExternalInput = true;
-  } else if (input.type == inputTypes.DUMMY) {
+  } else if (input.type == DUMMY) {
     // Dummy inputs have no visual representation, but the information is still
     // important.
     activeRow.minHeight = Math.max(
@@ -390,12 +389,11 @@ RenderInfo.prototype.shouldStartNewRow_ = function(input, lastInput) {
     return false;
   }
   // A statement input or an input following one always gets a new row.
-  if (input.type == inputTypes.STATEMENT ||
-      lastInput.type == inputTypes.STATEMENT) {
+  if (input.type == STATEMENT || lastInput.type == STATEMENT) {
     return true;
   }
   // Value and dummy inputs get new row if inputs are not inlined.
-  if (input.type == inputTypes.VALUE || input.type == inputTypes.DUMMY) {
+  if (input.type == VALUE || input.type == DUMMY) {
     return !this.isInline;
   }
   return false;
@@ -569,14 +567,14 @@ RenderInfo.prototype.addAlignmentPadding_ = function(row, missingSpace) {
   }
 
   // Decide where the extra padding goes.
-  if (row.align == blocklyConstants.ALIGN.LEFT) {
+  if (row.align == ALIGN.LEFT) {
     // Add padding to the end of the row.
     lastSpacer.width += missingSpace;
-  } else if (row.align == blocklyConstants.ALIGN.CENTRE) {
+  } else if (row.align == ALIGN.CENTRE) {
     // Split the padding between the beginning and end of the row.
     firstSpacer.width += missingSpace / 2;
     lastSpacer.width += missingSpace / 2;
-  } else if (row.align == blocklyConstants.ALIGN.RIGHT) {
+  } else if (row.align == ALIGN.RIGHT) {
     // Add padding at the beginning of the row.
     firstSpacer.width += missingSpace;
   } else {

From 268a83d054a0c62e6a67a0b5062c037237cb1dda Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Mon, 19 Jul 2021 13:40:05 -0700
Subject: [PATCH 137/833] Address PR comments

---
 core/utils/toolbox.js | 8 ++++----
 tests/deps.js         | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/utils/toolbox.js b/core/utils/toolbox.js
index ec050d178..aab51d826 100644
--- a/core/utils/toolbox.js
+++ b/core/utils/toolbox.js
@@ -17,7 +17,7 @@
 goog.module('Blockly.utils.toolbox');
 goog.module.declareLegacyNamespace();
 
-const {IE} = goog.require('Blockly.utils.userAgent');
+const userAgent = goog.require('Blockly.utils.userAgent');
 const {textToDom} = goog.require('Blockly.Xml');
 
 const {CssConfig: CategoryCssConfig} = goog.requireType('Blockly.ToolboxCategory');
@@ -273,7 +273,7 @@ const hasCategories = function(toolboxJson) {
     return false;
   }
 
-  let toolboxKind = toolboxJson['kind'];
+  const toolboxKind = toolboxJson['kind'];
   if (toolboxKind) {
     return toolboxKind == CATEGORY_TOOLBOX_KIND;
   }
@@ -387,7 +387,7 @@ const addAttributes = function(node, obj) {
 const parseToolboxTree = function(toolboxDef) {
   if (toolboxDef) {
     if (typeof toolboxDef != 'string') {
-      if (IE && toolboxDef.outerHTML) {
+      if (userAgent.IE && toolboxDef.outerHTML) {
         // In this case the tree will not have been properly built by the
         // browser. The HTML will be contained in the element, but it will
         // not have the proper DOM structure since the browser doesn't support
@@ -430,4 +430,4 @@ exports = {
   hasCategories,
   isCategoryCollapsible,
   parseToolboxTree
-}
+};
diff --git a/tests/deps.js b/tests/deps.js
index 3d4531cf1..00ce56da3 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -4,7 +4,6 @@ goog.addDependency('../../blocks/logic.js', ['Blockly.Blocks.logic', 'Blockly.Co
 goog.addDependency('../../blocks/loops.js', ['Blockly.Blocks.loops', 'Blockly.Constants.Loops'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable', 'Blockly.Warning']);
 goog.addDependency('../../blocks/math.js', ['Blockly.Blocks.math', 'Blockly.Constants.Math'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'], ['Blockly', 'Blockly.Blocks', 'Blockly.Comment', 'Blockly.FieldCheckbox', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.Mutator', 'Blockly.Warning'], {'lang': 'es5'});
-goog.addDependency('../../blocks/test_blocks.js', ['Blockly.TestBlocks'], ['Blockly', 'Blockly.Blocks'], {'lang': 'es5'});
 goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator']);
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);

From ac1fb9a4ddd628d630ce0a049371f15b42884623 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 19 Jul 2021 13:53:47 -0700
Subject: [PATCH 138/833] Revise imports in core/comment.js

---
 core/comment.js | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/core/comment.js b/core/comment.js
index de947fa5f..7caf61614 100644
--- a/core/comment.js
+++ b/core/comment.js
@@ -22,10 +22,11 @@ const Icon = goog.require('Blockly.Icon');
 const Size = goog.requireType('Blockly.utils.Size');
 const Svg = goog.require('Blockly.utils.Svg');
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
-const {CommentModel} = goog.requireType('Blockly.Block');
 const {conditionalBind, Data, unbind} = goog.require('Blockly.browserEvents');
-const {dom, userAgent, object: utilsObject} = goog.require('Blockly.utils');
+const {createSvgElement, HTML_NS} = goog.require('Blockly.utils.dom');
+const {inherits} = goog.require('Blockly.utils.object');
 const {register} = goog.require('Blockly.Css');
+const {IE} = goog.require('Blockly.utils.userAgent');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
@@ -45,7 +46,7 @@ const Comment = function(block) {
 
   /**
    * The model for this comment.
-   * @type {!CommentModel}
+   * @type {!Block.CommentModel}
    * @private
    */
   this.model_ = block.commentModel;
@@ -91,7 +92,7 @@ const Comment = function(block) {
 
   this.createIcon();
 };
-utilsObject.inherits(Comment, Icon);
+inherits(Comment, Icon);
 
 /**
  * Draw the comment icon.
@@ -100,13 +101,13 @@ utilsObject.inherits(Comment, Icon);
  */
 Comment.prototype.drawIcon_ = function(group) {
   // Circle.
-  dom.createSvgElement(
+  createSvgElement(
       Svg.CIRCLE, {'class': 'blocklyIconShape', 'r': '8', 'cx': '8', 'cy': '8'},
       group);
   // Can't use a real '?' text character since different browsers and operating
   // systems render it differently.
   // Body of question mark.
-  dom.createSvgElement(
+  createSvgElement(
       Svg.PATH, {
         'class': 'blocklyIconSymbol',
         'd': 'm6.8,10h2c0.003,-0.617 0.271,-0.962 0.633,-1.266 2.875,-2.405' +
@@ -115,7 +116,7 @@ Comment.prototype.drawIcon_ = function(group) {
       },
       group);
   // Dot of question mark.
-  dom.createSvgElement(
+  createSvgElement(
       Svg.RECT, {
         'class': 'blocklyIconSymbol',
         'x': '6.8',
@@ -144,15 +145,15 @@ Comment.prototype.createEditor_ = function() {
    * For non-editable mode see Warning.textToDom_.
    */
 
-  this.foreignObject_ = dom.createSvgElement(
+  this.foreignObject_ = createSvgElement(
       Svg.FOREIGNOBJECT, {'x': Bubble.BORDER_WIDTH, 'y': Bubble.BORDER_WIDTH},
       null);
 
-  const body = document.createElementNS(dom.HTML_NS, 'body');
-  body.setAttribute('xmlns', dom.HTML_NS);
+  const body = document.createElementNS(HTML_NS, 'body');
+  body.setAttribute('xmlns', HTML_NS);
   body.className = 'blocklyMinimalBody';
 
-  this.textarea_ = document.createElementNS(dom.HTML_NS, 'textarea');
+  this.textarea_ = document.createElementNS(HTML_NS, 'textarea');
   const textarea = this.textarea_;
   textarea.className = 'blocklyCommentTextarea';
   textarea.setAttribute('dir', this.block_.RTL ? 'RTL' : 'LTR');
@@ -253,7 +254,7 @@ Comment.prototype.setVisible = function(visible) {
  * @private
  */
 Comment.prototype.createBubble_ = function() {
-  if (!this.block_.isEditable() || userAgent.IE) {
+  if (!this.block_.isEditable() || IE) {
     // MSIE does not support foreignobject; textareas are impossible.
     // https://docs.microsoft.com/en-us/openspecs/ie_standards/ms-svg/56e6e04c-7c8c-44dd-8100-bd745ee42034
     // Always treat comments in IE as uneditable.
@@ -392,16 +393,9 @@ Comment.prototype.dispose = function() {
  */
 register([
   /* eslint-disable indent */
-  '.blocklyCommentTextarea {',
-    'background-color: #fef49c;',
-    'border: 0;',
-    'outline: 0;',
-    'margin: 0;',
-    'padding: 3px;',
-    'resize: none;',
-    'display: block;',
-    'text-overflow: hidden;',
-  '}'
+  '.blocklyCommentTextarea {', 'background-color: #fef49c;', 'border: 0;',
+  'outline: 0;', 'margin: 0;', 'padding: 3px;', 'resize: none;',
+  'display: block;', 'text-overflow: hidden;', '}'
   /* eslint-enable indent */
 ]);
 

From a8cba441e7d2a7766b4b5941a2519ce0e45e61af Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 19 Jul 2021 14:33:15 -0700
Subject: [PATCH 139/833] Fix comment indentation in core/connection_db.js

---
 core/connection_db.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/connection_db.js b/core/connection_db.js
index abc47beb3..49bccb504 100644
--- a/core/connection_db.js
+++ b/core/connection_db.js
@@ -285,7 +285,7 @@ ConnectionDB.prototype.searchForClosest = function(conn, maxRadius, dxy) {
  * Initialize a set of connection DBs for a workspace.
  * @param {!IConnectionChecker} checker The workspace's
  *     connection checker, used to decide if connections are valid during a
- * drag.
+ *     drag.
  * @return {!Array<!ConnectionDB>} Array of databases.
  */
 ConnectionDB.init = function(checker) {

From 583e321647b14f58501c2773177e516601fd57ed Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 13:38:22 -0700
Subject: [PATCH 140/833] Migrate core/interfaces/i_flyout.js to goog.module

---
 core/interfaces/i_flyout.js | 55 +++++++++++++++++++------------------
 tests/deps.js               |  2 +-
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/core/interfaces/i_flyout.js b/core/interfaces/i_flyout.js
index b819c3347..7a05fb9da 100644
--- a/core/interfaces/i_flyout.js
+++ b/core/interfaces/i_flyout.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-goog.provide('Blockly.IFlyout');
+goog.module('Blockly.IFlyout');
+goog.module.declareLegacyNamespace();
 
 goog.requireType('Blockly.BlockSvg');
 goog.requireType('Blockly.IRegistrable');
@@ -26,45 +27,45 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @extends {Blockly.IRegistrable}
  * @interface
  */
-Blockly.IFlyout = function() {};
+const IFlyout = function() {};
 
 /**
  * Whether the flyout is laid out horizontally or not.
  * @type {boolean}
  */
-Blockly.IFlyout.prototype.horizontalLayout;
+IFlyout.prototype.horizontalLayout;
 
 /**
  * Is RTL vs LTR.
  * @type {boolean}
  */
-Blockly.IFlyout.prototype.RTL;
+IFlyout.prototype.RTL;
 
 /**
  * The target workspace
  * @type {?Blockly.WorkspaceSvg}
  */
-Blockly.IFlyout.prototype.targetWorkspace;
+IFlyout.prototype.targetWorkspace;
 
 /**
  * Margin around the edges of the blocks in the flyout.
  * @type {number}
  * @const
  */
-Blockly.IFlyout.prototype.MARGIN;
+IFlyout.prototype.MARGIN;
 
 /**
  * Does the flyout automatically close when a block is created?
  * @type {boolean}
  */
-Blockly.IFlyout.prototype.autoClose;
+IFlyout.prototype.autoClose;
 
 /**
  * Corner radius of the flyout background.
  * @type {number}
  * @const
  */
-Blockly.IFlyout.prototype.CORNER_RADIUS;
+IFlyout.prototype.CORNER_RADIUS;
 
 /**
  * Creates the flyout's DOM.  Only needs to be called once.  The flyout can
@@ -76,62 +77,62 @@ Blockly.IFlyout.prototype.CORNER_RADIUS;
  *     put the flyout in. This should be <svg> or <g>.
  * @return {!SVGElement} The flyout's SVG group.
  */
-Blockly.IFlyout.prototype.createDom;
+IFlyout.prototype.createDom;
 
 /**
  * Initializes the flyout.
  * @param {!Blockly.WorkspaceSvg} targetWorkspace The workspace in which to
  *     create new blocks.
  */
-Blockly.IFlyout.prototype.init;
+IFlyout.prototype.init;
 
 /**
  * Dispose of this flyout.
  * Unlink from all DOM elements to prevent memory leaks.
  */
-Blockly.IFlyout.prototype.dispose;
+IFlyout.prototype.dispose;
 
 /**
  * Get the width of the flyout.
  * @return {number} The width of the flyout.
  */
-Blockly.IFlyout.prototype.getWidth;
+IFlyout.prototype.getWidth;
 
 /**
  * Get the height of the flyout.
  * @return {number} The width of the flyout.
  */
-Blockly.IFlyout.prototype.getHeight;
+IFlyout.prototype.getHeight;
 
 /**
  * Get the workspace inside the flyout.
  * @return {!Blockly.WorkspaceSvg} The workspace inside the flyout.
  */
-Blockly.IFlyout.prototype.getWorkspace;
+IFlyout.prototype.getWorkspace;
 
 /**
  * Is the flyout visible?
  * @return {boolean} True if visible.
  */
-Blockly.IFlyout.prototype.isVisible;
+IFlyout.prototype.isVisible;
 
 /**
  * Set whether the flyout is visible. A value of true does not necessarily mean
  * that the flyout is shown. It could be hidden because its container is hidden.
  * @param {boolean} visible True if visible.
  */
-Blockly.IFlyout.prototype.setVisible;
+IFlyout.prototype.setVisible;
 
 /**
  * Set whether this flyout's container is visible.
  * @param {boolean} visible Whether the container is visible.
  */
-Blockly.IFlyout.prototype.setContainerVisible;
+IFlyout.prototype.setContainerVisible;
 
 /**
  * Hide and empty the flyout.
  */
-Blockly.IFlyout.prototype.hide;
+IFlyout.prototype.hide;
 
 /**
  * Show and populate the flyout.
@@ -139,7 +140,7 @@ Blockly.IFlyout.prototype.hide;
  *     display in the flyout. This is either an array of Nodes, a NodeList, a
  *     toolbox definition, or a string with the name of the dynamic category.
  */
-Blockly.IFlyout.prototype.show;
+IFlyout.prototype.show;
 
 /**
  * Create a copy of this block on the workspace.
@@ -147,36 +148,36 @@ Blockly.IFlyout.prototype.show;
  * @return {!Blockly.BlockSvg} The newly created block.
  * @throws {Error} if something went wrong with deserialization.
  */
-Blockly.IFlyout.prototype.createBlock;
+IFlyout.prototype.createBlock;
 
 /**
  * Reflow blocks and their mats.
  */
-Blockly.IFlyout.prototype.reflow;
+IFlyout.prototype.reflow;
 
 /**
  * @return {boolean} True if this flyout may be scrolled with a scrollbar or by
  *     dragging.
  */
-Blockly.IFlyout.prototype.isScrollable;
+IFlyout.prototype.isScrollable;
 
 /**
  * Calculates the x coordinate for the flyout position.
  * @return {number} X coordinate.
  */
-Blockly.IFlyout.prototype.getX;
+IFlyout.prototype.getX;
 
 /**
  * Calculates the y coordinate for the flyout position.
  * @return {number} Y coordinate.
  */
-Blockly.IFlyout.prototype.getY;
+IFlyout.prototype.getY;
 
 /**
  * Position the flyout.
  * @return {void}
  */
-Blockly.IFlyout.prototype.position;
+IFlyout.prototype.position;
 
 /**
  * Determine if a drag delta is toward the workspace, based on the position
@@ -186,4 +187,6 @@ Blockly.IFlyout.prototype.position;
  *     moved from the position at mouse down, in pixel units.
  * @return {boolean} True if the drag is toward the workspace.
  */
-Blockly.IFlyout.prototype.isDragTowardWorkspace;
+IFlyout.prototype.isDragTowardWorkspace;
+
+exports = IFlyout;
diff --git a/tests/deps.js b/tests/deps.js
index b4d64e1fa..3163a584c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -88,7 +88,7 @@ goog.addDependency('../../core/interfaces/i_deletable.js', ['Blockly.IDeletable'
 goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], ['Blockly.IDeletable'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], []);
+goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_keyboard_accessible.js', ['Blockly.IKeyboardAccessible'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], []);
 goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [], {'lang': 'es6', 'module': 'goog'});

From d55ce5922441f0926915ebb2a0f7e20f6e4eb0eb Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 14:09:04 -0700
Subject: [PATCH 141/833] Migrate core/interfaces/i_flyout.js named requires

---
 core/interfaces/i_flyout.js | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/core/interfaces/i_flyout.js b/core/interfaces/i_flyout.js
index 7a05fb9da..b9b1c8e15 100644
--- a/core/interfaces/i_flyout.js
+++ b/core/interfaces/i_flyout.js
@@ -14,17 +14,17 @@
 goog.module('Blockly.IFlyout');
 goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.IRegistrable');
-goog.requireType('Blockly.utils.Coordinate');
-goog.requireType('Blockly.utils.Svg');
-goog.requireType('Blockly.utils.toolbox');
-goog.requireType('Blockly.WorkspaceSvg');
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const Coordinate = goog.requireType('Blockly.utils.Coordinate');
+const IRegistrable = goog.require('Blockly.IRegistrable');
+const Svg = goog.requireType('Blockly.utils.Svg');
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const {FlyoutDefinition} = goog.requireType('Blockly.utils.toolbox');
 
 
 /**
  * Interface for a flyout.
- * @extends {Blockly.IRegistrable}
+ * @extends {IRegistrable}
  * @interface
  */
 const IFlyout = function() {};
@@ -43,7 +43,7 @@ IFlyout.prototype.RTL;
 
 /**
  * The target workspace
- * @type {?Blockly.WorkspaceSvg}
+ * @type {?WorkspaceSvg}
  */
 IFlyout.prototype.targetWorkspace;
 
@@ -72,8 +72,8 @@ IFlyout.prototype.CORNER_RADIUS;
  * either exist as its own svg element or be a g element nested inside a
  * separate svg element.
  * @param {string|
- * !Blockly.utils.Svg<!SVGSVGElement>|
- * !Blockly.utils.Svg<!SVGGElement>} tagName The type of tag to
+ * !Svg<!SVGSVGElement>|
+ * !Svg<!SVGGElement>} tagName The type of tag to
  *     put the flyout in. This should be <svg> or <g>.
  * @return {!SVGElement} The flyout's SVG group.
  */
@@ -81,7 +81,7 @@ IFlyout.prototype.createDom;
 
 /**
  * Initializes the flyout.
- * @param {!Blockly.WorkspaceSvg} targetWorkspace The workspace in which to
+ * @param {!WorkspaceSvg} targetWorkspace The workspace in which to
  *     create new blocks.
  */
 IFlyout.prototype.init;
@@ -106,7 +106,7 @@ IFlyout.prototype.getHeight;
 
 /**
  * Get the workspace inside the flyout.
- * @return {!Blockly.WorkspaceSvg} The workspace inside the flyout.
+ * @return {!WorkspaceSvg} The workspace inside the flyout.
  */
 IFlyout.prototype.getWorkspace;
 
@@ -136,7 +136,7 @@ IFlyout.prototype.hide;
 
 /**
  * Show and populate the flyout.
- * @param {!Blockly.utils.toolbox.FlyoutDefinition|string} flyoutDef Contents to
+ * @param {!FlyoutDefinition|string} flyoutDef Contents to
  *     display in the flyout. This is either an array of Nodes, a NodeList, a
  *     toolbox definition, or a string with the name of the dynamic category.
  */
@@ -144,8 +144,8 @@ IFlyout.prototype.show;
 
 /**
  * Create a copy of this block on the workspace.
- * @param {!Blockly.BlockSvg} originalBlock The block to copy from the flyout.
- * @return {!Blockly.BlockSvg} The newly created block.
+ * @param {!BlockSvg} originalBlock The block to copy from the flyout.
+ * @return {!BlockSvg} The newly created block.
  * @throws {Error} if something went wrong with deserialization.
  */
 IFlyout.prototype.createBlock;
@@ -183,7 +183,7 @@ IFlyout.prototype.position;
  * Determine if a drag delta is toward the workspace, based on the position
  * and orientation of the flyout. This is used in determineDragIntention_ to
  * determine if a new block should be created or if the flyout should scroll.
- * @param {!Blockly.utils.Coordinate} currentDragDeltaXY How far the pointer has
+ * @param {!Coordinate} currentDragDeltaXY How far the pointer has
  *     moved from the position at mouse down, in pixel units.
  * @return {boolean} True if the drag is toward the workspace.
  */

From c72805b48a9fb4c9204e39fd5d9649b69402d23b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 16:18:09 -0700
Subject: [PATCH 142/833] Migrate core/interfaces/i_toolbox.js to goog.module

---
 core/interfaces/i_toolbox.js | 39 +++++++++++++++++++-----------------
 tests/deps.js                |  2 +-
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/core/interfaces/i_toolbox.js b/core/interfaces/i_toolbox.js
index 208be48cc..b530a10f4 100644
--- a/core/interfaces/i_toolbox.js
+++ b/core/interfaces/i_toolbox.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-goog.provide('Blockly.IToolbox');
+goog.module('Blockly.IToolbox');
+goog.module.declareLegacyNamespace();
 
 goog.requireType('Blockly.IFlyout');
 goog.requireType('Blockly.IRegistrable');
@@ -25,76 +26,76 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @extends {Blockly.IRegistrable}
  * @interface
  */
-Blockly.IToolbox = function() {};
+const IToolbox = function() {};
 
 /**
  * Initializes the toolbox.
  * @return {void}
  */
-Blockly.IToolbox.prototype.init;
+IToolbox.prototype.init;
 
 /**
  * Fills the toolbox with new toolbox items and removes any old contents.
  * @param {!Blockly.utils.toolbox.ToolboxInfo} toolboxDef Object holding information
  *     for creating a toolbox.
  */
-Blockly.IToolbox.prototype.render;
+IToolbox.prototype.render;
 
 /**
  * Gets the width of the toolbox.
  * @return {number} The width of the toolbox.
  */
-Blockly.IToolbox.prototype.getWidth;
+IToolbox.prototype.getWidth;
 
 /**
  * Gets the height of the toolbox.
  * @return {number} The width of the toolbox.
  */
-Blockly.IToolbox.prototype.getHeight;
+IToolbox.prototype.getHeight;
 
 /**
  * Gets the toolbox flyout.
  * @return {?Blockly.IFlyout} The toolbox flyout.
  */
-Blockly.IToolbox.prototype.getFlyout;
+IToolbox.prototype.getFlyout;
 
 /**
  * Gets the workspace for the toolbox.
  * @return {!Blockly.WorkspaceSvg} The parent workspace for the toolbox.
  */
-Blockly.IToolbox.prototype.getWorkspace;
+IToolbox.prototype.getWorkspace;
 
 /**
  * Gets whether or not the toolbox is horizontal.
  * @return {boolean} True if the toolbox is horizontal, false if the toolbox is
  *     vertical.
  */
-Blockly.IToolbox.prototype.isHorizontal;
+IToolbox.prototype.isHorizontal;
 
 /**
  * Positions the toolbox based on whether it is a horizontal toolbox and whether
  * the workspace is in rtl.
  * @return {void}
  */
-Blockly.IToolbox.prototype.position;
+IToolbox.prototype.position;
 
 /**
  * Handles resizing the toolbox when a toolbox item resizes.
  * @return {void}
  */
-Blockly.IToolbox.prototype.handleToolboxItemResize;
+IToolbox.prototype.handleToolboxItemResize;
 
 /**
  * Unhighlights any previously selected item.
  * @return {void}
  */
-Blockly.IToolbox.prototype.clearSelection;
+IToolbox.prototype.clearSelection;
 
 /**
  * Updates the category colours and background colour of selected categories.
  * @return {void}
  */
-Blockly.IToolbox.prototype.refreshTheme;
+IToolbox.prototype.refreshTheme;
 
 /**
  * Updates the flyout's content without closing it.  Should be used in response
@@ -102,30 +103,32 @@ Blockly.IToolbox.prototype.refreshTheme;
  * procedures.
  * @return {void}
  */
-Blockly.IToolbox.prototype.refreshSelection;
+IToolbox.prototype.refreshSelection;
 
 /**
  * Sets the visibility of the toolbox.
  * @param {boolean} isVisible True if toolbox should be visible.
  */
-Blockly.IToolbox.prototype.setVisible;
+IToolbox.prototype.setVisible;
 
 /**
  * Selects the toolbox item by it's position in the list of toolbox items.
  * @param {number} position The position of the item to select.
  * @return {void}
  */
-Blockly.IToolbox.prototype.selectItemByPosition;
+IToolbox.prototype.selectItemByPosition;
 
 /**
  * Gets the selected item.
  * @return {?Blockly.IToolboxItem} The selected item, or null if no item is
  *     currently selected.
  */
-Blockly.IToolbox.prototype.getSelectedItem;
+IToolbox.prototype.getSelectedItem;
 
 /**
  * Disposes of this toolbox.
  * @return {void}
  */
-Blockly.IToolbox.prototype.dispose;
+IToolbox.prototype.dispose;
+
+exports = IToolbox;
diff --git a/tests/deps.js b/tests/deps.js
index 3163a584c..fe97eefd7 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -97,7 +97,7 @@ goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistra
 goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], []);
 goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], []);
+goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem', 'Blockly.ISelectableToolboxItem', 'Blockly.IToolboxItem'], []);
 goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Coordinate'], {'lang': 'es5'});
 goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry'], {'lang': 'es5'});

From 867c6cb140f37957b2ab5a3753e259462237ece4 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 16:26:08 -0700
Subject: [PATCH 143/833] Migrate core/interfaces/i_toolbox.js named requires

---
 core/interfaces/i_toolbox.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/interfaces/i_toolbox.js b/core/interfaces/i_toolbox.js
index b530a10f4..5ecd0a69f 100644
--- a/core/interfaces/i_toolbox.js
+++ b/core/interfaces/i_toolbox.js
@@ -14,16 +14,16 @@
 goog.module('Blockly.IToolbox');
 goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.IFlyout');
-goog.requireType('Blockly.IRegistrable');
-goog.requireType('Blockly.IToolboxItem');
-goog.requireType('Blockly.utils.toolbox');
-goog.requireType('Blockly.WorkspaceSvg');
+const IFlyout = goog.requireType('Blockly.IFlyout');
+const IRegistrable = goog.require('Blockly.IRegistrable');
+const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const {ToolboxInfo} = goog.requireType('Blockly.utils.toolbox');
 
 
 /**
  * Interface for a toolbox.
- * @extends {Blockly.IRegistrable}
+ * @extends {IRegistrable}
  * @interface
  */
 const IToolbox = function() {};
@@ -36,7 +36,7 @@ IToolbox.prototype.init;
 
 /**
  * Fills the toolbox with new toolbox items and removes any old contents.
- * @param {!Blockly.utils.toolbox.ToolboxInfo} toolboxDef Object holding information
+ * @param {!ToolboxInfo} toolboxDef Object holding information
  *     for creating a toolbox.
  */
 IToolbox.prototype.render;
@@ -55,13 +55,13 @@ IToolbox.prototype.getHeight;
 
 /**
  * Gets the toolbox flyout.
- * @return {?Blockly.IFlyout} The toolbox flyout.
+ * @return {?IFlyout} The toolbox flyout.
  */
 IToolbox.prototype.getFlyout;
 
 /**
  * Gets the workspace for the toolbox.
- * @return {!Blockly.WorkspaceSvg} The parent workspace for the toolbox.
+ * @return {!WorkspaceSvg} The parent workspace for the toolbox.
  */
 IToolbox.prototype.getWorkspace;
 
@@ -120,7 +120,7 @@ IToolbox.prototype.selectItemByPosition;
 
 /**
  * Gets the selected item.
- * @return {?Blockly.IToolboxItem} The selected item, or null if no item is
+ * @return {?IToolboxItem} The selected item, or null if no item is
  *     currently selected.
  */
 IToolbox.prototype.getSelectedItem;

From e43c82d9bb3d71b72f7d42d81f2994a8f15253f9 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 11:03:40 -0700
Subject: [PATCH 144/833] Migrate core/interfaces/i_autohideable.js to
 goog.module

---
 core/interfaces/i_autohideable.js | 9 ++++++---
 tests/deps.js                     | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/interfaces/i_autohideable.js b/core/interfaces/i_autohideable.js
index ff976c549..7b1613405 100644
--- a/core/interfaces/i_autohideable.js
+++ b/core/interfaces/i_autohideable.js
@@ -12,7 +12,8 @@
 
 'use strict';
 
-goog.provide('Blockly.IAutoHideable');
+goog.module('Blockly.IAutoHideable');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.IComponent');
 
@@ -22,11 +23,13 @@ goog.require('Blockly.IComponent');
  * @extends {Blockly.IComponent}
  * @interface
  */
-Blockly.IAutoHideable = function() {};
+const IAutoHideable = function() {};
 
 /**
  * Hides the component. Called in Blockly.hideChaff.
  * @param {boolean} onlyClosePopups Whether only popups should be closed.
  *   Flyouts should not be closed if this is true.
  */
-Blockly.IAutoHideable.prototype.autoHide;
+IAutoHideable.prototype.autoHide;
+
+exports = IAutoHideable;
diff --git a/tests/deps.js b/tests/deps.js
index fe97eefd7..c3788886c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -76,7 +76,7 @@ goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.Insertion
 goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], ['Blockly.IASTNodeLocation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], ['Blockly.IASTNodeLocation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], ['Blockly.IComponent']);
+goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], ['Blockly.IContextMenu', 'Blockly.IDraggable'], {'lang': 'es6', 'module': 'goog'});

From 514f744a6f348f14f1cce37d72356b2eeb062885 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 11:08:54 -0700
Subject: [PATCH 145/833] Migrate core/interfaces/i_autohideable.js named
 requires

---
 core/interfaces/i_autohideable.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/interfaces/i_autohideable.js b/core/interfaces/i_autohideable.js
index 7b1613405..bf11adc01 100644
--- a/core/interfaces/i_autohideable.js
+++ b/core/interfaces/i_autohideable.js
@@ -15,12 +15,12 @@
 goog.module('Blockly.IAutoHideable');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.IComponent');
+const IComponent = goog.require('Blockly.IComponent');
 
 
 /**
  * Interface for a component that can be automatically hidden.
- * @extends {Blockly.IComponent}
+ * @extends {IComponent}
  * @interface
  */
 const IAutoHideable = function() {};

From ff591b0e732395085f89fc5e1d0d7c100a455317 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Mon, 19 Jul 2021 21:26:53 -0700
Subject: [PATCH 146/833] Alphabetize

---
 core/renderers/common/info.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js
index 1cc61af85..73e02dfff 100644
--- a/core/renderers/common/info.js
+++ b/core/renderers/common/info.js
@@ -39,7 +39,7 @@ const StatementInput = goog.require('Blockly.blockRendering.StatementInput');
 const TopRow = goog.require('Blockly.blockRendering.TopRow');
 const Types = goog.require('Blockly.blockRendering.Types');
 const {ALIGN} = goog.require('Blockly.constants');
-const {VALUE, STATEMENT, DUMMY} = goog.require('Blockly.inputTypes');
+const {DUMMY, STATEMENT, VALUE} = goog.require('Blockly.inputTypes');
 
 
 

From d9625b1cafd3b94afa0ced4061527d2ad406e04b Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Tue, 20 Jul 2021 09:38:06 -0700
Subject: [PATCH 147/833] Require userAgent module instead of destructuring in
 core/comment.js

---
 core/comment.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/comment.js b/core/comment.js
index 7caf61614..7f4085faf 100644
--- a/core/comment.js
+++ b/core/comment.js
@@ -22,11 +22,11 @@ const Icon = goog.require('Blockly.Icon');
 const Size = goog.requireType('Blockly.utils.Size');
 const Svg = goog.require('Blockly.utils.Svg');
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const userAgent = goog.require('Blockly.utils.userAgent');
 const {conditionalBind, Data, unbind} = goog.require('Blockly.browserEvents');
 const {createSvgElement, HTML_NS} = goog.require('Blockly.utils.dom');
 const {inherits} = goog.require('Blockly.utils.object');
 const {register} = goog.require('Blockly.Css');
-const {IE} = goog.require('Blockly.utils.userAgent');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
@@ -254,7 +254,7 @@ Comment.prototype.setVisible = function(visible) {
  * @private
  */
 Comment.prototype.createBubble_ = function() {
-  if (!this.block_.isEditable() || IE) {
+  if (!this.block_.isEditable() || userAgent.IE) {
     // MSIE does not support foreignobject; textareas are impossible.
     // https://docs.microsoft.com/en-us/openspecs/ie_standards/ms-svg/56e6e04c-7c8c-44dd-8100-bd745ee42034
     // Always treat comments in IE as uneditable.

From 09b020e62fbc22d4866543581aae61d2528bd4c2 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 19 Jul 2021 16:02:02 -0700
Subject: [PATCH 148/833] Migrate core/keyboard_nav/basic_cursor.js to ES6
 const/let

---
 core/keyboard_nav/basic_cursor.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/keyboard_nav/basic_cursor.js b/core/keyboard_nav/basic_cursor.js
index e38031321..89a61cf09 100644
--- a/core/keyboard_nav/basic_cursor.js
+++ b/core/keyboard_nav/basic_cursor.js
@@ -43,11 +43,11 @@ Blockly.BasicCursor.registrationName = 'basicCursor';
  * @override
  */
 Blockly.BasicCursor.prototype.next = function() {
-  var curNode = this.getCurNode();
+  const curNode = this.getCurNode();
   if (!curNode) {
     return null;
   }
-  var newNode = this.getNextNode_(curNode, this.validNode_);
+  const newNode = this.getNextNode_(curNode, this.validNode_);
 
   if (newNode) {
     this.setCurNode(newNode);
@@ -74,11 +74,11 @@ Blockly.BasicCursor.prototype.in = function() {
  * @override
  */
 Blockly.BasicCursor.prototype.prev = function() {
-  var curNode = this.getCurNode();
+  const curNode = this.getCurNode();
   if (!curNode) {
     return null;
   }
-  var newNode = this.getPreviousNode_(curNode, this.validNode_);
+  const newNode = this.getPreviousNode_(curNode, this.validNode_);
 
   if (newNode) {
     this.setCurNode(newNode);
@@ -112,13 +112,13 @@ Blockly.BasicCursor.prototype.getNextNode_ = function(node, isValid) {
   if (!node) {
     return null;
   }
-  var newNode = node.in() || node.next();
+  const newNode = node.in() || node.next();
   if (isValid(newNode)) {
     return newNode;
   } else if (newNode) {
     return this.getNextNode_(newNode, isValid);
   }
-  var siblingOrParent = this.findSiblingOrParent_(node.out());
+  const siblingOrParent = this.findSiblingOrParent_(node.out());
   if (isValid(siblingOrParent)) {
     return siblingOrParent;
   } else if (siblingOrParent) {
@@ -142,7 +142,7 @@ Blockly.BasicCursor.prototype.getPreviousNode_ = function(node, isValid) {
   if (!node) {
     return null;
   }
-  var newNode = node.prev();
+  let newNode = node.prev();
 
   if (newNode) {
     newNode = this.getRightMostChild_(newNode);
@@ -165,8 +165,8 @@ Blockly.BasicCursor.prototype.getPreviousNode_ = function(node, isValid) {
  * @protected
  */
 Blockly.BasicCursor.prototype.validNode_ = function(node) {
-  var isValid = false;
-  var type = node && node.getType();
+  let isValid = false;
+  const type = node && node.getType();
   if (type == Blockly.ASTNode.types.OUTPUT ||
       type == Blockly.ASTNode.types.INPUT ||
       type == Blockly.ASTNode.types.FIELD ||
@@ -189,7 +189,7 @@ Blockly.BasicCursor.prototype.findSiblingOrParent_ = function(node) {
   if (!node) {
     return null;
   }
-  var nextNode = node.next();
+  const nextNode = node.next();
   if (nextNode) {
     return nextNode;
   }
@@ -208,7 +208,7 @@ Blockly.BasicCursor.prototype.getRightMostChild_ = function(node) {
   if (!node.in()) {
     return node;
   }
-  var newNode = node.in();
+  let newNode = node.in();
   while (newNode.next()) {
     newNode = newNode.next();
   }

From 29cfb470aa21db332ca01ec3822a5df47350b1a4 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 19 Jul 2021 16:17:53 -0700
Subject: [PATCH 149/833] Migrate core/keyboard_nav/basic_cursor.js to
 goog.module

---
 core/keyboard_nav/basic_cursor.js | 35 +++++++++++++++++--------------
 tests/deps.js                     |  6 +++---
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/core/keyboard_nav/basic_cursor.js b/core/keyboard_nav/basic_cursor.js
index 89a61cf09..63df6a03f 100644
--- a/core/keyboard_nav/basic_cursor.js
+++ b/core/keyboard_nav/basic_cursor.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.BasicCursor');
+goog.module('Blockly.BasicCursor');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.ASTNode');
 goog.require('Blockly.Cursor');
@@ -25,16 +26,16 @@ goog.require('Blockly.registry');
  * @constructor
  * @extends {Blockly.Cursor}
  */
-Blockly.BasicCursor = function() {
-  Blockly.BasicCursor.superClass_.constructor.call(this);
+const BasicCursor = function() {
+  BasicCursor.superClass_.constructor.call(this);
 };
-Blockly.utils.object.inherits(Blockly.BasicCursor, Blockly.Cursor);
+Blockly.utils.object.inherits(BasicCursor, Blockly.Cursor);
 
 /**
  * Name used for registering a basic cursor.
  * @const {string}
  */
-Blockly.BasicCursor.registrationName = 'basicCursor';
+BasicCursor.registrationName = 'basicCursor';
 
 /**
  * Find the next node in the pre order traversal.
@@ -42,7 +43,7 @@ Blockly.BasicCursor.registrationName = 'basicCursor';
  *     not set or there is no next value.
  * @override
  */
-Blockly.BasicCursor.prototype.next = function() {
+BasicCursor.prototype.next = function() {
   const curNode = this.getCurNode();
   if (!curNode) {
     return null;
@@ -63,7 +64,7 @@ Blockly.BasicCursor.prototype.next = function() {
  *     not set or there is no next value.
  * @override
  */
-Blockly.BasicCursor.prototype.in = function() {
+BasicCursor.prototype.in = function() {
   return this.next();
 };
 
@@ -73,7 +74,7 @@ Blockly.BasicCursor.prototype.in = function() {
  *     is not set or there is no previous value.
  * @override
  */
-Blockly.BasicCursor.prototype.prev = function() {
+BasicCursor.prototype.prev = function() {
   const curNode = this.getCurNode();
   if (!curNode) {
     return null;
@@ -94,7 +95,7 @@ Blockly.BasicCursor.prototype.prev = function() {
  *     not set or there is no previous value.
  * @override
  */
-Blockly.BasicCursor.prototype.out = function() {
+BasicCursor.prototype.out = function() {
   return this.prev();
 };
 
@@ -108,7 +109,7 @@ Blockly.BasicCursor.prototype.out = function() {
  * @return {Blockly.ASTNode} The next node in the traversal.
  * @protected
  */
-Blockly.BasicCursor.prototype.getNextNode_ = function(node, isValid) {
+BasicCursor.prototype.getNextNode_ = function(node, isValid) {
   if (!node) {
     return null;
   }
@@ -138,7 +139,7 @@ Blockly.BasicCursor.prototype.getNextNode_ = function(node, isValid) {
  *     previous node exists.
  * @protected
  */
-Blockly.BasicCursor.prototype.getPreviousNode_ = function(node, isValid) {
+BasicCursor.prototype.getPreviousNode_ = function(node, isValid) {
   if (!node) {
     return null;
   }
@@ -164,7 +165,7 @@ Blockly.BasicCursor.prototype.getPreviousNode_ = function(node, isValid) {
  * @return {boolean} True if the node should be visited, false otherwise.
  * @protected
  */
-Blockly.BasicCursor.prototype.validNode_ = function(node) {
+BasicCursor.prototype.validNode_ = function(node) {
   let isValid = false;
   const type = node && node.getType();
   if (type == Blockly.ASTNode.types.OUTPUT ||
@@ -185,7 +186,7 @@ Blockly.BasicCursor.prototype.validNode_ = function(node) {
  *     valid parents.
  * @private
  */
-Blockly.BasicCursor.prototype.findSiblingOrParent_ = function(node) {
+BasicCursor.prototype.findSiblingOrParent_ = function(node) {
   if (!node) {
     return null;
   }
@@ -204,7 +205,7 @@ Blockly.BasicCursor.prototype.findSiblingOrParent_ = function(node) {
  *     if no child exists.
  * @private
  */
-Blockly.BasicCursor.prototype.getRightMostChild_ = function(node) {
+BasicCursor.prototype.getRightMostChild_ = function(node) {
   if (!node.in()) {
     return node;
   }
@@ -216,5 +217,7 @@ Blockly.BasicCursor.prototype.getRightMostChild_ = function(node) {
 };
 
 Blockly.registry.register(
-    Blockly.registry.Type.CURSOR, Blockly.BasicCursor.registrationName,
-    Blockly.BasicCursor);
+    Blockly.registry.Type.CURSOR, BasicCursor.registrationName,
+    BasicCursor);
+
+exports = BasicCursor;
diff --git a/tests/deps.js b/tests/deps.js
index dfbcfe352..74512fae5 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -88,7 +88,7 @@ goog.addDependency('../../core/interfaces/i_deletable.js', ['Blockly.IDeletable'
 goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], ['Blockly.IDeletable'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], ['Blockly.IRegistrable'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_keyboard_accessible.js', ['Blockly.IKeyboardAccessible'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], []);
 goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [], {'lang': 'es6', 'module': 'goog'});
@@ -97,10 +97,10 @@ goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistra
 goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], []);
 goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], ['Blockly.IRegistrable'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem', 'Blockly.ISelectableToolboxItem', 'Blockly.IToolboxItem'], []);
 goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Coordinate'], {'lang': 'es5'});
-goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry'], {'lang': 'es5'});
+goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es5'});
 goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], ['Blockly.ASTNode']);
 goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object']);

From 4a3d67abebdf3e0b79728ae8b7d382c13d968e93 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 19 Jul 2021 18:00:30 -0700
Subject: [PATCH 150/833] Migrate core/keyboard_nav/basic_cursor.js named
 requires

---
 core/keyboard_nav/basic_cursor.js | 57 ++++++++++++++++---------------
 tests/deps.js                     |  2 +-
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/core/keyboard_nav/basic_cursor.js b/core/keyboard_nav/basic_cursor.js
index 63df6a03f..9260fa62a 100644
--- a/core/keyboard_nav/basic_cursor.js
+++ b/core/keyboard_nav/basic_cursor.js
@@ -14,9 +14,10 @@
 goog.module('Blockly.BasicCursor');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.ASTNode');
-goog.require('Blockly.Cursor');
-goog.require('Blockly.registry');
+const ASTNode = goog.require('Blockly.ASTNode');
+const Cursor = goog.require('Blockly.Cursor');
+const {register, Type} = goog.require('Blockly.registry');
+const {inherits} = goog.require('Blockly.utils.object');
 
 
 /**
@@ -24,12 +25,12 @@ goog.require('Blockly.registry');
  * This will allow the user to get to all nodes in the AST by hitting next or
  * previous.
  * @constructor
- * @extends {Blockly.Cursor}
+ * @extends {Cursor}
  */
 const BasicCursor = function() {
   BasicCursor.superClass_.constructor.call(this);
 };
-Blockly.utils.object.inherits(BasicCursor, Blockly.Cursor);
+inherits(BasicCursor, Cursor);
 
 /**
  * Name used for registering a basic cursor.
@@ -39,7 +40,7 @@ BasicCursor.registrationName = 'basicCursor';
 
 /**
  * Find the next node in the pre order traversal.
- * @return {Blockly.ASTNode} The next node, or null if the current node is
+ * @return {?ASTNode} The next node, or null if the current node is
  *     not set or there is no next value.
  * @override
  */
@@ -60,7 +61,7 @@ BasicCursor.prototype.next = function() {
  * For a basic cursor we only have the ability to go next and previous, so
  * in will also allow the user to get to the next node in the pre order
  * traversal.
- * @return {Blockly.ASTNode} The next node, or null if the current node is
+ * @return {?ASTNode} The next node, or null if the current node is
  *     not set or there is no next value.
  * @override
  */
@@ -70,7 +71,7 @@ BasicCursor.prototype.in = function() {
 
 /**
  * Find the previous node in the pre order traversal.
- * @return {Blockly.ASTNode} The previous node, or null if the current node
+ * @return {?ASTNode} The previous node, or null if the current node
  *     is not set or there is no previous value.
  * @override
  */
@@ -91,7 +92,7 @@ BasicCursor.prototype.prev = function() {
  * For a basic cursor we only have the ability to go next and previous, so
  * out will allow the user to get to the previous node in the pre order
  * traversal.
- * @return {Blockly.ASTNode} The previous node, or null if the current node is
+ * @return {?ASTNode} The previous node, or null if the current node is
  *     not set or there is no previous value.
  * @override
  */
@@ -103,10 +104,10 @@ BasicCursor.prototype.out = function() {
  * Uses pre order traversal to navigate the Blockly AST. This will allow
  * a user to easily navigate the entire Blockly AST without having to go in
  * and out levels on the tree.
- * @param {Blockly.ASTNode} node The current position in the AST.
- * @param {!function(Blockly.ASTNode) : boolean} isValid A function true/false
+ * @param {?ASTNode} node The current position in the AST.
+ * @param {!function(ASTNode) : boolean} isValid A function true/false
  *     depending on whether the given node should be traversed.
- * @return {Blockly.ASTNode} The next node in the traversal.
+ * @return {?ASTNode} The next node in the traversal.
  * @protected
  */
 BasicCursor.prototype.getNextNode_ = function(node, isValid) {
@@ -132,10 +133,10 @@ BasicCursor.prototype.getNextNode_ = function(node, isValid) {
  * Reverses the pre order traversal in order to find the previous node. This
  * will allow a user to easily navigate the entire Blockly AST without having to
  * go in and out levels on the tree.
- * @param {Blockly.ASTNode} node The current position in the AST.
- * @param {!function(Blockly.ASTNode) : boolean} isValid A function true/false
+ * @param {?ASTNode} node The current position in the AST.
+ * @param {!function(ASTNode) : boolean} isValid A function true/false
  *     depending on whether the given node should be traversed.
- * @return {Blockly.ASTNode} The previous node in the traversal or null if no
+ * @return {?ASTNode} The previous node in the traversal or null if no
  *     previous node exists.
  * @protected
  */
@@ -161,19 +162,19 @@ BasicCursor.prototype.getPreviousNode_ = function(node, isValid) {
 /**
  * Decides what nodes to traverse and which ones to skip. Currently, it
  * skips output, stack and workspace nodes.
- * @param {Blockly.ASTNode} node The AST node to check whether it is valid.
+ * @param {?ASTNode} node The AST node to check whether it is valid.
  * @return {boolean} True if the node should be visited, false otherwise.
  * @protected
  */
 BasicCursor.prototype.validNode_ = function(node) {
   let isValid = false;
   const type = node && node.getType();
-  if (type == Blockly.ASTNode.types.OUTPUT ||
-      type == Blockly.ASTNode.types.INPUT ||
-      type == Blockly.ASTNode.types.FIELD ||
-      type == Blockly.ASTNode.types.NEXT ||
-      type == Blockly.ASTNode.types.PREVIOUS ||
-      type == Blockly.ASTNode.types.WORKSPACE) {
+  if (type == ASTNode.types.OUTPUT ||
+      type == ASTNode.types.INPUT ||
+      type == ASTNode.types.FIELD ||
+      type == ASTNode.types.NEXT ||
+      type == ASTNode.types.PREVIOUS ||
+      type == ASTNode.types.WORKSPACE) {
     isValid = true;
   }
   return isValid;
@@ -181,8 +182,8 @@ BasicCursor.prototype.validNode_ = function(node) {
 
 /**
  * From the given node find either the next valid sibling or parent.
- * @param {Blockly.ASTNode} node The current position in the AST.
- * @return {Blockly.ASTNode} The parent AST node or null if there are no
+ * @param {?ASTNode} node The current position in the AST.
+ * @return {?ASTNode} The parent AST node or null if there are no
  *     valid parents.
  * @private
  */
@@ -200,8 +201,8 @@ BasicCursor.prototype.findSiblingOrParent_ = function(node) {
 
 /**
  * Get the right most child of a node.
- * @param {Blockly.ASTNode} node The node to find the right most child of.
- * @return {Blockly.ASTNode} The right most child of the given node, or the node
+ * @param {?ASTNode} node The node to find the right most child of.
+ * @return {?ASTNode} The right most child of the given node, or the node
  *     if no child exists.
  * @private
  */
@@ -216,8 +217,8 @@ BasicCursor.prototype.getRightMostChild_ = function(node) {
   return this.getRightMostChild_(newNode);
 };
 
-Blockly.registry.register(
-    Blockly.registry.Type.CURSOR, BasicCursor.registrationName,
+register(
+    Type.CURSOR, BasicCursor.registrationName,
     BasicCursor);
 
 exports = BasicCursor;
diff --git a/tests/deps.js b/tests/deps.js
index 74512fae5..0b641086e 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -100,7 +100,7 @@ goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'
 goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], ['Blockly.IRegistrable'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem', 'Blockly.ISelectableToolboxItem', 'Blockly.IToolboxItem'], []);
 goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Coordinate'], {'lang': 'es5'});
-goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es5'});
 goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], ['Blockly.ASTNode']);
 goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object']);

From 2ef8b2c86b2e55bb8e51115ed89b46cf0f04f42d Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 19 Jul 2021 18:02:39 -0700
Subject: [PATCH 151/833] clang-format core/keyboard_nav/basic_cursor.js

---
 core/keyboard_nav/basic_cursor.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/core/keyboard_nav/basic_cursor.js b/core/keyboard_nav/basic_cursor.js
index 9260fa62a..e9780e119 100644
--- a/core/keyboard_nav/basic_cursor.js
+++ b/core/keyboard_nav/basic_cursor.js
@@ -169,12 +169,9 @@ BasicCursor.prototype.getPreviousNode_ = function(node, isValid) {
 BasicCursor.prototype.validNode_ = function(node) {
   let isValid = false;
   const type = node && node.getType();
-  if (type == ASTNode.types.OUTPUT ||
-      type == ASTNode.types.INPUT ||
-      type == ASTNode.types.FIELD ||
-      type == ASTNode.types.NEXT ||
-      type == ASTNode.types.PREVIOUS ||
-      type == ASTNode.types.WORKSPACE) {
+  if (type == ASTNode.types.OUTPUT || type == ASTNode.types.INPUT ||
+      type == ASTNode.types.FIELD || type == ASTNode.types.NEXT ||
+      type == ASTNode.types.PREVIOUS || type == ASTNode.types.WORKSPACE) {
     isValid = true;
   }
   return isValid;
@@ -217,8 +214,6 @@ BasicCursor.prototype.getRightMostChild_ = function(node) {
   return this.getRightMostChild_(newNode);
 };
 
-register(
-    Type.CURSOR, BasicCursor.registrationName,
-    BasicCursor);
+register(Type.CURSOR, BasicCursor.registrationName, BasicCursor);
 
 exports = BasicCursor;

From da960d5973912c660d802b2d3c4850b58d25b0ff Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Tue, 20 Jul 2021 10:49:21 -0700
Subject: [PATCH 152/833] Convert private static functions to module-internal
 functions in core/connection.js

---
 core/connection.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/core/connection.js b/core/connection.js
index 0b26e9ace..553938825 100644
--- a/core/connection.js
+++ b/core/connection.js
@@ -134,7 +134,7 @@ Connection.prototype.connect_ = function(childConnection) {
   if (Events.isEnabled()) {
     event = new (Events.get(Events.BLOCK_MOVE))(childBlock);
   }
-  Connection.connectReciprocally_(parentConnection, childConnection);
+  connectReciprocally(parentConnection, childConnection);
   childBlock.setParent(parentBlock);
   if (event) {
     event.recordNew();
@@ -307,9 +307,8 @@ Connection.prototype.connect = function(otherConnection) {
  * Update two connections to target each other.
  * @param {Connection} first The first connection to update.
  * @param {Connection} second The second connection to update.
- * @private
  */
-Connection.connectReciprocally_ = function(first, second) {
+const connectReciprocally = function(first, second) {
   if (!first || !second) {
     throw Error('Cannot connect null connections.');
   }
@@ -326,9 +325,8 @@ Connection.connectReciprocally_ = function(first, second) {
  * @param {!Block} orphanBlock The inferior block.
  * @return {?Connection} The suitable connection point on 'block',
  *     or null.
- * @private
  */
-Connection.getSingleConnection_ = function(block, orphanBlock) {
+const getSingleConnection = function(block, orphanBlock) {
   let foundConnection = null;
   const output = orphanBlock.outputConnection;
   const typeChecker = output.getConnectionChecker();
@@ -355,13 +353,12 @@ Connection.getSingleConnection_ = function(block, orphanBlock) {
  * @param {!Block} orphanBlock The block that is looking for a home.
  * @return {?Connection} The suitable connection point on the chain
  *     of blocks, or null.
- * @private
  */
-Connection.getConnectionForOrphanedOutput_ = function(startBlock, orphanBlock) {
+const getConnectionForOrphanedOutput = function(startBlock, orphanBlock) {
   let newBlock = startBlock;
   let connection;
   while (
-      (connection = Connection.getSingleConnection_(
+      (connection = getSingleConnection(
            /** @type {!Block} */ (newBlock), orphanBlock))) {
     newBlock = connection.targetBlock();
     if (!newBlock || newBlock.isShadow()) {
@@ -384,7 +381,7 @@ Connection.getConnectionForOrphanedOutput_ = function(startBlock, orphanBlock) {
 Connection.getConnectionForOrphanedConnection = function(
     startBlock, orphanConnection) {
   if (orphanConnection.type === connectionTypes.OUTPUT_VALUE) {
-    return Connection.getConnectionForOrphanedOutput_(
+    return getConnectionForOrphanedOutput(
         startBlock, orphanConnection.getSourceBlock());
   }
   // Otherwise we're dealing with a stack.

From 77aaab0e1f0496115cebedc5c81307ab4e78982b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 12:35:32 -0700
Subject: [PATCH 153/833] Migrate core/interfaces/i_connection_checker.js to
 goog.module

---
 core/interfaces/i_connection_checker.js | 19 +++++++++++--------
 tests/deps.js                           |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/core/interfaces/i_connection_checker.js b/core/interfaces/i_connection_checker.js
index 4b6120da1..527dec4c5 100644
--- a/core/interfaces/i_connection_checker.js
+++ b/core/interfaces/i_connection_checker.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.IConnectionChecker');
+goog.module('Blockly.IConnectionChecker');
+goog.module.declareLegacyNamespace();
 
 goog.requireType('Blockly.Connection');
 goog.requireType('Blockly.RenderedConnection');
@@ -21,7 +22,7 @@ goog.requireType('Blockly.RenderedConnection');
  * Class for connection type checking logic.
  * @interface
  */
-Blockly.IConnectionChecker = function() {};
+const IConnectionChecker = function() {};
 
 /**
  * Check whether the current connection can connect with the target
@@ -35,7 +36,7 @@ Blockly.IConnectionChecker = function() {};
  * @return {boolean} Whether the connection is legal.
  * @public
  */
-Blockly.IConnectionChecker.prototype.canConnect;
+IConnectionChecker.prototype.canConnect;
 
 /**
  * Checks whether the current connection can connect with the target
@@ -50,7 +51,7 @@ Blockly.IConnectionChecker.prototype.canConnect;
  *    an error code otherwise.
  * @public
  */
-Blockly.IConnectionChecker.prototype.canConnectWithReason;
+IConnectionChecker.prototype.canConnectWithReason;
 
 /**
  * Helper method that translates a connection error code into a string.
@@ -61,7 +62,7 @@ Blockly.IConnectionChecker.prototype.canConnectWithReason;
  * @return {string} A developer-readable error string.
  * @public
  */
-Blockly.IConnectionChecker.prototype.getErrorMessage;
+IConnectionChecker.prototype.getErrorMessage;
 
 /**
  * Check that connecting the given connections is safe, meaning that it would
@@ -71,7 +72,7 @@ Blockly.IConnectionChecker.prototype.getErrorMessage;
  * @return {number} An enum with the reason this connection is safe or unsafe.
  * @public
  */
-Blockly.IConnectionChecker.prototype.doSafetyChecks;
+IConnectionChecker.prototype.doSafetyChecks;
 
 /**
  * Check whether this connection is compatible with another connection with
@@ -82,7 +83,7 @@ Blockly.IConnectionChecker.prototype.doSafetyChecks;
  * @return {boolean} True if the connections share a type.
  * @public
  */
-Blockly.IConnectionChecker.prototype.doTypeChecks;
+IConnectionChecker.prototype.doTypeChecks;
 
 /**
  * Check whether this connection can be made by dragging.
@@ -92,4 +93,6 @@ Blockly.IConnectionChecker.prototype.doTypeChecks;
  * @return {boolean} True if the connection is allowed during a drag.
  * @public
  */
-Blockly.IConnectionChecker.prototype.doDragChecks;
+IConnectionChecker.prototype.doDragChecks;
+
+exports = IConnectionChecker;
diff --git a/tests/deps.js b/tests/deps.js
index 0b641086e..aa3fc9275 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -81,7 +81,7 @@ goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockD
 goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], ['Blockly.IContextMenu', 'Blockly.IDraggable'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], []);
+goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_copyable.js', ['Blockly.ICopyable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_deletable.js', ['Blockly.IDeletable'], [], {'lang': 'es6', 'module': 'goog'});

From 9eee8869256cd8637e56d528f097ebf35cf80829 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 12:37:10 -0700
Subject: [PATCH 154/833] Migrate core/interfaces/i_connection_checker.js named
 requires

---
 core/interfaces/i_connection_checker.js | 30 ++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/core/interfaces/i_connection_checker.js b/core/interfaces/i_connection_checker.js
index 527dec4c5..03693604c 100644
--- a/core/interfaces/i_connection_checker.js
+++ b/core/interfaces/i_connection_checker.js
@@ -14,8 +14,8 @@
 goog.module('Blockly.IConnectionChecker');
 goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.Connection');
-goog.requireType('Blockly.RenderedConnection');
+const Connection = goog.requireType('Blockly.Connection');
+const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 
 
 /**
@@ -27,8 +27,8 @@ const IConnectionChecker = function() {};
 /**
  * Check whether the current connection can connect with the target
  * connection.
- * @param {Blockly.Connection} a Connection to check compatibility with.
- * @param {Blockly.Connection} b Connection to check compatibility with.
+ * @param {Connection} a Connection to check compatibility with.
+ * @param {Connection} b Connection to check compatibility with.
  * @param {boolean} isDragging True if the connection is being made by dragging
  *     a block.
  * @param {number=} opt_distance The max allowable distance between the
@@ -41,13 +41,13 @@ IConnectionChecker.prototype.canConnect;
 /**
  * Checks whether the current connection can connect with the target
  * connection, and return an error code if there are problems.
- * @param {Blockly.Connection} a Connection to check compatibility with.
- * @param {Blockly.Connection} b Connection to check compatibility with.
+ * @param {Connection} a Connection to check compatibility with.
+ * @param {Connection} b Connection to check compatibility with.
  * @param {boolean} isDragging True if the connection is being made by dragging
  *     a block.
  * @param {number=} opt_distance The max allowable distance between the
  *     connections for drag checks.
- * @return {number} Blockly.Connection.CAN_CONNECT if the connection is legal,
+ * @return {number} Connection.CAN_CONNECT if the connection is legal,
  *    an error code otherwise.
  * @public
  */
@@ -56,8 +56,8 @@ IConnectionChecker.prototype.canConnectWithReason;
 /**
  * Helper method that translates a connection error code into a string.
  * @param {number} errorCode The error code.
- * @param {Blockly.Connection} a One of the two connections being checked.
- * @param {Blockly.Connection} b The second of the two connections being
+ * @param {Connection} a One of the two connections being checked.
+ * @param {Connection} b The second of the two connections being
  *     checked.
  * @return {string} A developer-readable error string.
  * @public
@@ -67,8 +67,8 @@ IConnectionChecker.prototype.getErrorMessage;
 /**
  * Check that connecting the given connections is safe, meaning that it would
  * not break any of Blockly's basic assumptions (e.g. no self connections).
- * @param {Blockly.Connection} a The first of the connections to check.
- * @param {Blockly.Connection} b The second of the connections to check.
+ * @param {Connection} a The first of the connections to check.
+ * @param {Connection} b The second of the connections to check.
  * @return {number} An enum with the reason this connection is safe or unsafe.
  * @public
  */
@@ -78,8 +78,8 @@ IConnectionChecker.prototype.doSafetyChecks;
  * Check whether this connection is compatible with another connection with
  * respect to the value type system.  E.g. square_root("Hello") is not
  * compatible.
- * @param {!Blockly.Connection} a Connection to compare.
- * @param {!Blockly.Connection} b Connection to compare against.
+ * @param {!Connection} a Connection to compare.
+ * @param {!Connection} b Connection to compare against.
  * @return {boolean} True if the connections share a type.
  * @public
  */
@@ -87,8 +87,8 @@ IConnectionChecker.prototype.doTypeChecks;
 
 /**
  * Check whether this connection can be made by dragging.
- * @param {!Blockly.RenderedConnection} a Connection to compare.
- * @param {!Blockly.RenderedConnection} b Connection to compare against.
+ * @param {!RenderedConnection} a Connection to compare.
+ * @param {!RenderedConnection} b Connection to compare against.
  * @param {number} distance The maximum allowable distance between connections.
  * @return {boolean} True if the connection is allowed during a drag.
  * @public

From 317a2e6f53d46e07c6eca16c18be07a295612ae5 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 19 Jul 2021 12:17:10 -0700
Subject: [PATCH 155/833] Migrate core/keyboard_nav/cursor.js to ES6 const/let

---
 core/keyboard_nav/cursor.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/keyboard_nav/cursor.js b/core/keyboard_nav/cursor.js
index 882be726a..c73d49046 100644
--- a/core/keyboard_nav/cursor.js
+++ b/core/keyboard_nav/cursor.js
@@ -42,12 +42,12 @@ Blockly.utils.object.inherits(Blockly.Cursor, Blockly.Marker);
  * @public
  */
 Blockly.Cursor.prototype.next = function() {
-  var curNode = this.getCurNode();
+  const curNode = this.getCurNode();
   if (!curNode) {
     return null;
   }
 
-  var newNode = curNode.next();
+  let newNode = curNode.next();
   while (newNode && newNode.next() &&
          (newNode.getType() == Blockly.ASTNode.types.NEXT ||
           newNode.getType() == Blockly.ASTNode.types.BLOCK)) {
@@ -67,7 +67,7 @@ Blockly.Cursor.prototype.next = function() {
  * @public
  */
 Blockly.Cursor.prototype.in = function() {
-  var curNode = this.getCurNode();
+  let curNode = this.getCurNode();
   if (!curNode) {
     return null;
   }
@@ -77,7 +77,7 @@ Blockly.Cursor.prototype.in = function() {
       curNode.getType() == Blockly.ASTNode.types.OUTPUT) {
     curNode = curNode.next();
   }
-  var newNode = curNode.in();
+  const newNode = curNode.in();
 
   if (newNode) {
     this.setCurNode(newNode);
@@ -92,11 +92,11 @@ Blockly.Cursor.prototype.in = function() {
  * @public
  */
 Blockly.Cursor.prototype.prev = function() {
-  var curNode = this.getCurNode();
+  const curNode = this.getCurNode();
   if (!curNode) {
     return null;
   }
-  var newNode = curNode.prev();
+  let newNode = curNode.prev();
 
   while (newNode && newNode.prev() &&
          (newNode.getType() == Blockly.ASTNode.types.NEXT ||
@@ -117,11 +117,11 @@ Blockly.Cursor.prototype.prev = function() {
  * @public
  */
 Blockly.Cursor.prototype.out = function() {
-  var curNode = this.getCurNode();
+  const curNode = this.getCurNode();
   if (!curNode) {
     return null;
   }
-  var newNode = curNode.out();
+  let newNode = curNode.out();
 
   if (newNode && newNode.getType() == Blockly.ASTNode.types.BLOCK) {
     newNode = newNode.prev() || newNode;

From e50c60bfdbaf92af822cb1dcb819a90c4c057d43 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 19 Jul 2021 12:17:18 -0700
Subject: [PATCH 156/833] Migrate core/keyboard_nav/cursor.js to goog.module

---
 core/keyboard_nav/cursor.js | 21 ++++++++++++---------
 tests/deps.js               |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/core/keyboard_nav/cursor.js b/core/keyboard_nav/cursor.js
index c73d49046..87375108a 100644
--- a/core/keyboard_nav/cursor.js
+++ b/core/keyboard_nav/cursor.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Cursor');
+goog.module('Blockly.Cursor');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.ASTNode');
 goog.require('Blockly.Marker');
@@ -25,15 +26,15 @@ goog.require('Blockly.utils.object');
  * @constructor
  * @extends {Blockly.Marker}
  */
-Blockly.Cursor = function() {
-  Blockly.Cursor.superClass_.constructor.call(this);
+const Cursor = function() {
+  Cursor.superClass_.constructor.call(this);
 
   /**
    * @override
    */
   this.type = 'cursor';
 };
-Blockly.utils.object.inherits(Blockly.Cursor, Blockly.Marker);
+Blockly.utils.object.inherits(Cursor, Blockly.Marker);
 
 /**
  * Find the next connection, field, or block.
@@ -41,7 +42,7 @@ Blockly.utils.object.inherits(Blockly.Cursor, Blockly.Marker);
  *     not set or there is no next value.
  * @public
  */
-Blockly.Cursor.prototype.next = function() {
+Cursor.prototype.next = function() {
   const curNode = this.getCurNode();
   if (!curNode) {
     return null;
@@ -66,7 +67,7 @@ Blockly.Cursor.prototype.next = function() {
  *     not set or there is no in value.
  * @public
  */
-Blockly.Cursor.prototype.in = function() {
+Cursor.prototype.in = function() {
   let curNode = this.getCurNode();
   if (!curNode) {
     return null;
@@ -91,7 +92,7 @@ Blockly.Cursor.prototype.in = function() {
  *     is not set or there is no previous value.
  * @public
  */
-Blockly.Cursor.prototype.prev = function() {
+Cursor.prototype.prev = function() {
   const curNode = this.getCurNode();
   if (!curNode) {
     return null;
@@ -116,7 +117,7 @@ Blockly.Cursor.prototype.prev = function() {
  *     not set or there is no out value.
  * @public
  */
-Blockly.Cursor.prototype.out = function() {
+Cursor.prototype.out = function() {
   const curNode = this.getCurNode();
   if (!curNode) {
     return null;
@@ -134,4 +135,6 @@ Blockly.Cursor.prototype.out = function() {
 };
 
 Blockly.registry.register(
-    Blockly.registry.Type.CURSOR, Blockly.registry.DEFAULT, Blockly.Cursor);
+    Blockly.registry.Type.CURSOR, Blockly.registry.DEFAULT, Cursor);
+
+exports = Cursor;
diff --git a/tests/deps.js b/tests/deps.js
index aa3fc9275..6128287ca 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -101,7 +101,7 @@ goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], [
 goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem', 'Blockly.ISelectableToolboxItem', 'Blockly.IToolboxItem'], []);
 goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Coordinate'], {'lang': 'es5'});
 goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es5'});
+goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], ['Blockly.ASTNode']);
 goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object']);
 goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], ['Blockly.Cursor', 'Blockly.Marker']);

From c9f2a92ace5497c6dd70cdd7c8037e770a921fde Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 19 Jul 2021 15:01:12 -0700
Subject: [PATCH 157/833] Migrate core/keyboard_nav/cursor.js named requires

---
 core/keyboard_nav/cursor.js | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/core/keyboard_nav/cursor.js b/core/keyboard_nav/cursor.js
index 87375108a..de3d97498 100644
--- a/core/keyboard_nav/cursor.js
+++ b/core/keyboard_nav/cursor.js
@@ -14,17 +14,17 @@
 goog.module('Blockly.Cursor');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.ASTNode');
-goog.require('Blockly.Marker');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
+const ASTNode = goog.require('Blockly.ASTNode');
+const Marker = goog.require('Blockly.Marker');
+const {DEFAULT, register, Type} = goog.require('Blockly.registry');
+const {inherits} = goog.require('Blockly.utils.object');
 
 
 /**
  * Class for a cursor.
  * A cursor controls how a user navigates the Blockly AST.
  * @constructor
- * @extends {Blockly.Marker}
+ * @extends {Marker}
  */
 const Cursor = function() {
   Cursor.superClass_.constructor.call(this);
@@ -34,11 +34,11 @@ const Cursor = function() {
    */
   this.type = 'cursor';
 };
-Blockly.utils.object.inherits(Cursor, Blockly.Marker);
+inherits(Cursor, Marker);
 
 /**
  * Find the next connection, field, or block.
- * @return {Blockly.ASTNode} The next element, or null if the current node is
+ * @return {ASTNode} The next element, or null if the current node is
  *     not set or there is no next value.
  * @public
  */
@@ -50,8 +50,8 @@ Cursor.prototype.next = function() {
 
   let newNode = curNode.next();
   while (newNode && newNode.next() &&
-         (newNode.getType() == Blockly.ASTNode.types.NEXT ||
-          newNode.getType() == Blockly.ASTNode.types.BLOCK)) {
+         (newNode.getType() == ASTNode.types.NEXT ||
+          newNode.getType() == ASTNode.types.BLOCK)) {
     newNode = newNode.next();
   }
 
@@ -63,7 +63,7 @@ Cursor.prototype.next = function() {
 
 /**
  * Find the in connection or field.
- * @return {Blockly.ASTNode} The in element, or null if the current node is
+ * @return {ASTNode} The in element, or null if the current node is
  *     not set or there is no in value.
  * @public
  */
@@ -74,8 +74,8 @@ Cursor.prototype.in = function() {
   }
   // If we are on a previous or output connection, go to the block level before
   // performing next operation.
-  if (curNode.getType() == Blockly.ASTNode.types.PREVIOUS ||
-      curNode.getType() == Blockly.ASTNode.types.OUTPUT) {
+  if (curNode.getType() == ASTNode.types.PREVIOUS ||
+      curNode.getType() == ASTNode.types.OUTPUT) {
     curNode = curNode.next();
   }
   const newNode = curNode.in();
@@ -88,7 +88,7 @@ Cursor.prototype.in = function() {
 
 /**
  * Find the previous connection, field, or block.
- * @return {Blockly.ASTNode} The previous element, or null if the current node
+ * @return {ASTNode} The previous element, or null if the current node
  *     is not set or there is no previous value.
  * @public
  */
@@ -100,8 +100,8 @@ Cursor.prototype.prev = function() {
   let newNode = curNode.prev();
 
   while (newNode && newNode.prev() &&
-         (newNode.getType() == Blockly.ASTNode.types.NEXT ||
-          newNode.getType() == Blockly.ASTNode.types.BLOCK)) {
+         (newNode.getType() == ASTNode.types.NEXT ||
+          newNode.getType() == ASTNode.types.BLOCK)) {
     newNode = newNode.prev();
   }
 
@@ -113,7 +113,7 @@ Cursor.prototype.prev = function() {
 
 /**
  * Find the out connection, field, or block.
- * @return {Blockly.ASTNode} The out element, or null if the current node is
+ * @return {ASTNode} The out element, or null if the current node is
  *     not set or there is no out value.
  * @public
  */
@@ -124,7 +124,7 @@ Cursor.prototype.out = function() {
   }
   let newNode = curNode.out();
 
-  if (newNode && newNode.getType() == Blockly.ASTNode.types.BLOCK) {
+  if (newNode && newNode.getType() == ASTNode.types.BLOCK) {
     newNode = newNode.prev() || newNode;
   }
 
@@ -134,7 +134,6 @@ Cursor.prototype.out = function() {
   return newNode;
 };
 
-Blockly.registry.register(
-    Blockly.registry.Type.CURSOR, Blockly.registry.DEFAULT, Cursor);
+register(Type.CURSOR, DEFAULT, Cursor);
 
 exports = Cursor;

From f0fc360bfa8849cac38f68988f3f1370797ecac8 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Tue, 20 Jul 2021 11:30:09 -0700
Subject: [PATCH 158/833] Inline otherwise-unused variable in core/utils/dom.js

---
 core/utils/dom.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/utils/dom.js b/core/utils/dom.js
index 0e0480c0f..5ec684acf 100644
--- a/core/utils/dom.js
+++ b/core/utils/dom.js
@@ -129,8 +129,7 @@ const addClass = function(element, className) {
 const removeClasses = function(element, classNames) {
   const classList = classNames.split(' ');
   for (let i = 0; i < classList.length; i++) {
-    const cssName = classList[i];
-    removeClass(element, cssName);
+    removeClass(element, classList[i]);
   }
 };
 

From d101e591de50f7e74f9ed288cdc5dc555e9c2bfe Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Tue, 20 Jul 2021 13:06:39 -0700
Subject: [PATCH 159/833] Removes unnecessary test

---
 tests/mocha/workspace_svg_test.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/mocha/workspace_svg_test.js b/tests/mocha/workspace_svg_test.js
index 339a19a98..d79707d08 100644
--- a/tests/mocha/workspace_svg_test.js
+++ b/tests/mocha/workspace_svg_test.js
@@ -112,11 +112,6 @@ suite('WorkspaceSvg', function() {
         this.workspace.updateToolbox({'contents': []});
       }.bind(this), 'Existing toolbox has categories.  Can\'t change mode.');
     });
-    test('Passing in string as toolboxdef', function() {
-      var parseToolboxFake = sinon.spy(Blockly.utils.toolbox, 'parseToolboxTree');
-      this.workspace.updateToolbox('<xml><category name="something"></category></xml>');
-      sinon.assert.calledOnce(parseToolboxFake);
-    });
   });
 
   suite('addTopBlock', function() {

From 5f5b4370250dd3784ed83feb97e7e24528c2113d Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 20 Jul 2021 12:06:50 -0700
Subject: [PATCH 160/833] Add script for partially automating goog.module
 conversion steps

---
 scripts/goog_module/convert-file.sh | 281 ++++++++++++++++++++++++++++
 1 file changed, 281 insertions(+)
 create mode 100755 scripts/goog_module/convert-file.sh

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
new file mode 100755
index 000000000..aae6a9191
--- /dev/null
+++ b/scripts/goog_module/convert-file.sh
@@ -0,0 +1,281 @@
+#!/bin/bash
+
+#######################################
+# Logging functions
+#######################################
+COLOR_NONE="\033[0m"
+GREEN="\033[0;32m"
+BLUE="\033[0;34m"
+ORANGE="\033[0;33m"
+RED="\033[0;31m"
+success() {
+  echo -e  "${GREEN}[SUCCESS]:${COLOR_NONE} $*" >&2
+}
+inf() {
+  echo -e  "${BLUE}[INFO]:${COLOR_NONE} $*" >&2
+}
+warn() {
+  echo -e  "${ORANGE}[WARN]:${COLOR_NONE} $*" >&2
+}
+err() {
+  echo -e  "${RED}[ERROR]:${COLOR_NONE} $*" >&2
+}
+#######################################
+# Checks whether the provided filepath exists.
+# Arguments:
+#   The filepath to check for existence.
+#######################################
+verify-filepath() {
+  if [[ ! -f "$1" ]]; then
+    err "File $1 does not exist"
+    return 1
+  fi
+}
+#######################################
+# Creates a commit with a message based on the specified step and file.
+# Arguments:
+#   Which conversion step this message is for.
+#   The filepath of the file being converted.
+#######################################
+commit-step() {
+  local step="$1"
+  local filepath="$2"
+  if [ -z "${step}" ]; then
+    err "Missing argument (1-4)"
+    return 1
+  fi
+  if [ -z "${filepath}" ]; then
+    err "Missing argument filepath"
+    return 1
+  fi
+  verify-filepath "${filepath}"
+  if [[ $? -eq 1 ]]; then return 1; fi
+
+  local message=''
+  case $1 in
+    1)
+      message="Migrate ${filepath} to ES6 const/let"
+      ;;
+    2)
+      message="Migrate ${filepath} to goog.module"
+      ;;
+    3)
+      message="Migrate ${filepath} named requires"
+      ;;
+    4)
+      message="clang-format ${filepath}"
+      ;;
+    *)
+      err 'INVALID ARGUMENT'
+      return 1
+      ;;
+  esac
+  git add .
+  if [[ -z $(git status --porcelain) ]]; then
+    success "Nothing to commit"
+    return 0
+  fi
+  git commit -m "${message}"
+  success "created commit with message: \"${message}\""
+}
+#######################################
+# Runs step 2 of the automated conversion.
+# Arguments:
+#   The filepath of the file being converted.
+#######################################
+step2 () {
+  local filepath="$1"
+  if [ -z "${filepath}" ]; then
+    err "Missing argument filepath"
+    return 1
+  fi
+
+  inf "Verifying single goog.provide declarations..."
+  local provide_count=$(grep -o 'goog.provide' ${filepath} | wc -l)
+  if [[ "${provide_count}" -gt "1" ]]; then
+    err "Cannot convert file with multiple provides. Please split the file first."
+    return 1
+  elif [[ "${provide_count}" -eq "0" ]]; then
+    err "Cannot convert file without a provide."
+    return 1
+  fi
+
+  inf "Updating goog.provide declaration..."
+  perl -pi -e 's/^goog\.provide(\([^\)]+\)\;)/goog\.module\1\ngoog.module.declareLegacyNamespace\(\)\;/g' "${filepath}"
+
+
+  inf "Extracting module name..."
+  local module_name=$(grep -oP "(?<=^goog\.module\(\')([^\')]+)" "${filepath}")
+  if [[ -z "${module_name}" ]]; then
+    err "Could not extract module name"
+    return 1
+  fi
+  inf "Extracted module name \"${module_name}\""
+
+  if [[ $(grep "${module_name} = " "${filepath}") ]]; then
+    local class_name=$(echo "${module_name}" | grep -oP "(\w+)$")
+    inf "Found class \"${class_name}\" in file."
+    inf "Updating class declaration..."
+    perl -pi -e 's/^('"${module_name}"') =/const '"${class_name}"' =/g' "${filepath}"
+    inf 'Updating class properties...'
+    perl -pi -e 's/^'"${module_name}"'((\.\w+)+) =/'"${class_name}"'\1 =/g' "${filepath}"
+
+    inf "Updating local references to class..."
+    perl -pi -e 's/'"${module_name}"'([^'\''])/'"${class_name}"'\1/g' "${filepath}"
+
+    inf "Appending class export to end of file..."
+    echo "" >> "${filepath}"
+    echo "exports = ${class_name};" >> "${filepath}"
+
+    npm run build:deps
+
+    success "Completed automated conversion to goog.module. Please manually review before committing."
+    return 0
+  fi
+
+  # No top level class.
+  inf 'Updating top-level property declarations...'
+  perl -pi -e 's/^'"${module_name}"'\.([^ ]+) =/const \1 =/g' "${filepath}"
+  inf "Updating local references to module..."
+  perl -pi -e 's/'"${module_name}"'\.([^ ]+)/\1/g' "${filepath}"
+
+  npm run build:deps
+  success "Completed automation for step 3. Please manually review and add exports for non-private top-level functions."
+
+}
+#######################################
+# Runs step 3 of the automated conversion.
+# Arguments:
+#   The filepath of the file being converted.
+#######################################
+step3() {
+  local filepath="$1"
+  if [ -z "${filepath}" ]; then
+    err "Missing argument filepath"
+    return 1
+  fi
+
+  local requires=$(grep -E -o '^goog.require(|Type)\('\''(.*)'\''\)' "${filepath}" | perl -pe 's/goog.require(|Type)\('\''(.*)'\''\)/\2/g')
+
+  # Process each require
+  echo "${requires}" | while read -r require ; do
+    local usages=$(grep -Pe ''"${require}"'(?!'\'')' "${filepath}" | wc -l)
+    if [[ "${usages}" -eq "0" ]]; then
+      warn "Unused require \"${require}\""
+      continue
+    fi
+
+    local direct_access_count=$(grep -Pe ''"${require}"'[^\.'\'']' "${filepath}" | wc -l)
+    local prop_access_count=$(grep -Pe ''"${require}"'\.(?!prototype)' "${filepath}" | wc -l)
+    if [[ "${direct_access_count}" -eq "0" && "${prop_access_count}" -gt "0" ]]; then
+      local deconstructed=$(grep -Pe ''"${require}"'\.(?!prototype)' "${filepath}" | perl -pe 's/'"${require}"'\.([^\(\[,\.]+).*/\1/g')
+      local deconstructed_comma=$(echo "${deconstructed}" | perl -zpe 's/\s+/, /g' | perl 's/, $//')
+      inf "Deconstructing ${require} into \"${deconstructed_comma}\""
+
+      inf "Updating require declaration for ${require}..."
+    perl -pi -e 's/^(goog\.(require|requireType)\('\'"${require}"\''\);)/const \{'"${deconstructed_comma}"'\} = \1/' "${filepath}"
+
+      echo "${deconstructed}" | while read -r require_prop ; do
+        inf "Updating references of ${require}.${require_prop} to ${require_prop}..."
+        perl -pi -e 's/'"${require}"'\.'"${require_prop}"'([^'\''])/'"${require_prop}"'\1/g' "${filepath}"
+      done
+      continue
+    fi
+
+    local require_name=$(echo "${require}" | perl -pe 's/(\w+\.)+(\w+)/\2/g')
+    inf "Updating require declaration for ${require}..."
+    perl -pi -e 's/^(goog\.(require|requireType)\('\'"${require}"\''\);)/const '"${require_name}"' = \1/' "${filepath}"
+
+    inf "Updating references of ${require} to ${require_name}..."
+    perl -pi -e 's/'"${require}"'([^'\''])/'"${require_name}"'\1/g' "${filepath}"
+  done
+
+  local missing_requires=$(grep -Pe '(?<!'\'')Blockly\.' "${filepath}")
+  local missing_require_lines=$(grep -Pe '(?<!'\'')Blockly\.' "${filepath}" | wc -l)
+  if [[ "${missing_require_lines}" -gt "0" ]]; then
+    warn "Missing require for \"${missing_requires}\". Please manually fix."
+  fi
+
+  inf "Add missing nullability modifier..."
+  perl -pi -e 's/@(param|return) \{([A-Z])/@\1 \{?\2/g' "${filepath}"
+
+  success "Completed automation for step 3. Please manually review and reorder requires."
+}
+#######################################
+# Runs step 4 of the automated conversion.
+# Arguments:
+#   The filepath of the file being converted.
+#######################################
+step4() {
+  local filepath="$1"
+  if [ -z ${filepath} ]; then
+    err "filepath is unset"
+    return 1
+  fi
+  inf "Running clang-format"
+  npx clang-format -i "${filepath}"
+}
+#######################################
+# Runs the specified step.
+# Arguments:
+#   Which step to run.
+#   The filepath of the file being converted.
+#######################################
+run-step() {
+  local step="$1"
+  local filepath="$2"
+  if [ -z "${step}" ]; then
+    err "Missing argument (1-4)"
+    return 1
+  fi
+  if [ -z "${filepath}" ]; then
+    err "Missing argument filepath"
+    return 1
+  fi
+  verify-filepath "${filepath}"
+  if [[ $? -eq 1 ]]; then return 1; fi
+
+  case "${step}" in
+    2)
+      step2 ${filepath}
+      ;;
+    3)
+      step3 ${filepath}
+      ;;
+    4)
+      step4 ${filepath}
+      ;;
+    *)
+      err 'INVALID ARGUMENT'
+      return 1
+      ;;
+  esac
+}
+#######################################
+# Prints usage information.
+#######################################
+function help {
+  echo "Conversion steps:"
+  echo " 1. Use IDE to convert var to let/const"
+  echo " 2. Rewrite the goog.provide statement as goog.module and explicitly enumerate exports"
+  echo " 3. Rewrite goog.requires statements and add missing requires (often skipped for simple files)"
+  echo " 4. Run clang-format on the whole file"
+  echo ""
+  echo "Usage: $0 [-h|-c <number>|-s <number>|-f] <filepath>"
+  echo "  -h                      Display help"
+  echo "  -c <step> <filepath>    Create a commit for the specified step [2-4]"
+  echo "  -s <step> <filepath>    Run the specified step [1-4]"
+}
+
+if [ "$1" = "" ]; then
+  help
+else
+  command="$1"
+  shift
+  case $command in
+    -h)         help $@;;
+    -c)         commit-step $@;;
+    -s)         run-step $@;;
+    *)          help;;
+  esac
+fi

From 89e4151810c08500d04cbd984a9f5a04e02e76e2 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 20 Jul 2021 14:48:11 -0700
Subject: [PATCH 161/833] Update commands to be OSX compatible

---
 scripts/goog_module/convert-file.sh | 33 ++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index aae6a9191..6673106ee 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -159,6 +159,7 @@ step3() {
 
   # Process each require
   echo "${requires}" | while read -r require ; do
+    inf "Processing require \"${require}\""
     local usages=$(grep -Pe ''"${require}"'(?!'\'')' "${filepath}" | wc -l)
     if [[ "${usages}" -eq "0" ]]; then
       warn "Unused require \"${require}\""
@@ -166,18 +167,26 @@ step3() {
     fi
 
     local direct_access_count=$(grep -Pe ''"${require}"'[^\.'\'']' "${filepath}" | wc -l)
-    local prop_access_count=$(grep -Pe ''"${require}"'\.(?!prototype)' "${filepath}" | wc -l)
-    if [[ "${direct_access_count}" -eq "0" && "${prop_access_count}" -gt "0" ]]; then
-      local deconstructed=$(grep -Pe ''"${require}"'\.(?!prototype)' "${filepath}" | perl -pe 's/'"${require}"'\.([^\(\[,\.]+).*/\1/g')
-      local deconstructed_comma=$(echo "${deconstructed}" | perl -zpe 's/\s+/, /g' | perl 's/, $//')
-      inf "Deconstructing ${require} into \"${deconstructed_comma}\""
+    local properties_accessed=$(grep -Po '(?<='"${require}"'\.)(?!prototype)\w+' "${filepath}" | tr ' ' '\n' | sort -u)
+    # Detect overlap (ex: Blockly.utils and Blockly.utils.dom)
+    local overlap=$(echo "${requires}"| grep -Po "(?<=${require}\.)\w+")
+    if [[ ! -z "${overlap}" ]]; then
+      while read -r overlap_prop ; do
+        properties_accessed=$(echo "$properties_accessed" | perl -pe 's/'"${overlap_prop}"'//g')
+      done <<<"${overlap}"
+      properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/\s+/ /g' | xargs)
+    fi
+
+    if [[ "${direct_access_count}" -eq "0" && ! -z "${properties_accessed}" ]]; then
+      local deconstructed_comma=$(echo "${properties_accessed}" | perl -pe 's/\s+/, /g' | perl -pe 's/, $//')
+      inf "Deconstructing ${require} into \"{${deconstructed_comma}}\""
 
       inf "Updating require declaration for ${require}..."
-    perl -pi -e 's/^(goog\.(require|requireType)\('\'"${require}"\''\);)/const \{'"${deconstructed_comma}"'\} = \1/' "${filepath}"
+      perl -pi -e 's/^(goog\.(require|requireType)\('\'"${require}"\''\);)/const \{'"${deconstructed_comma}"'\} = \1/' "${filepath}"
 
-      echo "${deconstructed}" | while read -r require_prop ; do
+      echo "${properties_accessed}" | while read -r require_prop ; do
         inf "Updating references of ${require}.${require_prop} to ${require_prop}..."
-        perl -pi -e 's/'"${require}"'\.'"${require_prop}"'([^'\''])/'"${require_prop}"'\1/g' "${filepath}"
+        perl -pi -e 's/'"${require}"'\.'"${require_prop}"'([^'\''\w])/'"${require_prop}"'\1/g' "${filepath}"
       done
       continue
     fi
@@ -187,13 +196,13 @@ step3() {
     perl -pi -e 's/^(goog\.(require|requireType)\('\'"${require}"\''\);)/const '"${require_name}"' = \1/' "${filepath}"
 
     inf "Updating references of ${require} to ${require_name}..."
-    perl -pi -e 's/'"${require}"'([^'\''])/'"${require_name}"'\1/g' "${filepath}"
+    perl -pi -e 's/'"${require}"'([^'\''\w])/'"${require_name}"'\1/g' "${filepath}"
   done
 
-  local missing_requires=$(grep -Pe '(?<!'\'')Blockly\.' "${filepath}")
-  local missing_require_lines=$(grep -Pe '(?<!'\'')Blockly\.' "${filepath}" | wc -l)
+  local missing_requires=$(grep -Po '(?<!'\'')Blockly(\.\w+)+' "${filepath}")
+  local missing_require_lines=$(echo "${missing_requires}" | wc -l)
   if [[ "${missing_require_lines}" -gt "0" ]]; then
-    warn "Missing require for \"${missing_requires}\". Please manually fix."
+    err "Missing requires for: ${missing_requires} Please manually fix."
   fi
 
   inf "Add missing nullability modifier..."

From 41eead78ff5f30839314dd91525127785be7dc3f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 20 Jul 2021 15:11:51 -0700
Subject: [PATCH 162/833] Update grep calls

---
 scripts/goog_module/convert-file.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index 6673106ee..f7adee01e 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -105,7 +105,7 @@ step2 () {
 
 
   inf "Extracting module name..."
-  local module_name=$(grep -oP "(?<=^goog\.module\(\')([^\')]+)" "${filepath}")
+  local module_name=$(perl -nle'print $& while m{(?<=^goog\.module\('\'')([^'\'')]+)}g' "${filepath}")
   if [[ -z "${module_name}" ]]; then
     err "Could not extract module name"
     return 1
@@ -113,7 +113,7 @@ step2 () {
   inf "Extracted module name \"${module_name}\""
 
   if [[ $(grep "${module_name} = " "${filepath}") ]]; then
-    local class_name=$(echo "${module_name}" | grep -oP "(\w+)$")
+    local class_name=$(echo "${module_name}" | grep -E -o "(\w+)$")
     inf "Found class \"${class_name}\" in file."
     inf "Updating class declaration..."
     perl -pi -e 's/^('"${module_name}"') =/const '"${class_name}"' =/g' "${filepath}"
@@ -160,16 +160,17 @@ step3() {
   # Process each require
   echo "${requires}" | while read -r require ; do
     inf "Processing require \"${require}\""
-    local usages=$(grep -Pe ''"${require}"'(?!'\'')' "${filepath}" | wc -l)
+    local usages=$(perl -nle'print $& while m{'"${require}"'(?!'\'')}g' "${filepath}" | wc -l)
+
     if [[ "${usages}" -eq "0" ]]; then
       warn "Unused require \"${require}\""
       continue
     fi
 
-    local direct_access_count=$(grep -Pe ''"${require}"'[^\.'\'']' "${filepath}" | wc -l)
-    local properties_accessed=$(grep -Po '(?<='"${require}"'\.)(?!prototype)\w+' "${filepath}" | tr ' ' '\n' | sort -u)
+    local direct_access_count=$(perl -nle'print $& while m{'"${require}"'[^\.'\'']}g' "${filepath}" | wc -l)
+    local properties_accessed=$(perl -nle'print $& while m{(?<='"${require}"'\.)(?!prototype)\w+}g' "${filepath}" | tr ' ' '\n' | sort -u)
     # Detect overlap (ex: Blockly.utils and Blockly.utils.dom)
-    local overlap=$(echo "${requires}"| grep -Po "(?<=${require}\.)\w+")
+    local overlap=$(echo "${requires}"| perl -nle'print $& while m{(?<='"${require}"'\.)\w+}g')
     if [[ ! -z "${overlap}" ]]; then
       while read -r overlap_prop ; do
         properties_accessed=$(echo "$properties_accessed" | perl -pe 's/'"${overlap_prop}"'//g')

From edfb87fd6150b4b14c65f5f769e405b543d099c3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 20 Jul 2021 15:37:50 -0700
Subject: [PATCH 163/833] Update more grep calls

---
 scripts/goog_module/convert-file.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index f7adee01e..9b62892b5 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -113,7 +113,7 @@ step2 () {
   inf "Extracted module name \"${module_name}\""
 
   if [[ $(grep "${module_name} = " "${filepath}") ]]; then
-    local class_name=$(echo "${module_name}" | grep -E -o "(\w+)$")
+    local class_name=$(echo "${module_name}" | perl -nle'print $& while m{(\w+)$}g')
     inf "Found class \"${class_name}\" in file."
     inf "Updating class declaration..."
     perl -pi -e 's/^('"${module_name}"') =/const '"${class_name}"' =/g' "${filepath}"
@@ -155,7 +155,7 @@ step3() {
     return 1
   fi
 
-  local requires=$(grep -E -o '^goog.require(|Type)\('\''(.*)'\''\)' "${filepath}" | perl -pe 's/goog.require(|Type)\('\''(.*)'\''\)/\2/g')
+  local requires=$(perl -nle'print $& while m{^goog.require(|Type)\('\''(.*)'\''\)}g' "${filepath}" | perl -pe 's/goog.require(|Type)\('\''(.*)'\''\)/\2/g')
 
   # Process each require
   echo "${requires}" | while read -r require ; do
@@ -200,7 +200,7 @@ step3() {
     perl -pi -e 's/'"${require}"'([^'\''\w])/'"${require_name}"'\1/g' "${filepath}"
   done
 
-  local missing_requires=$(grep -Po '(?<!'\'')Blockly(\.\w+)+' "${filepath}")
+  local missing_requires=$(perl -nle'print $& while m{(?<!'\'')Blockly(\.\w+)+}g' "${filepath}")
   local missing_require_lines=$(echo "${missing_requires}" | wc -l)
   if [[ "${missing_require_lines}" -gt "0" ]]; then
     err "Missing requires for: ${missing_requires} Please manually fix."

From 1d2e19bb4f79b6896582f99efee6e147f90ff38b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 24 Jun 2021 20:24:53 +0000
Subject: [PATCH 164/833] Bump google-closure-compiler from 20210505.0.0 to
 20210601.0.0

Bumps [google-closure-compiler](https://github.com/google/closure-compiler-npm) from 20210505.0.0 to 20210601.0.0.
- [Release notes](https://github.com/google/closure-compiler-npm/releases)
- [Commits](https://github.com/google/closure-compiler-npm/compare/v20210505.0.0...v20210601.0.0)

---
updated-dependencies:
- dependency-name: google-closure-compiler
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 38 +++++++++++++++++++-------------------
 package.json      |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d70d69a71..bc2e15371 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16916,45 +16916,45 @@
       }
     },
     "google-closure-compiler": {
-      "version": "20210505.0.0",
-      "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20210505.0.0.tgz",
-      "integrity": "sha512-moeYaj4S6YTdOOvjv1ZLdUld/2YXw7q1GqUUHJJd+rE/uViyesozg8yKQZWcB3tvurhb+qEvFFet8CYoeaQHng==",
+      "version": "20210601.0.0",
+      "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20210601.0.0.tgz",
+      "integrity": "sha512-lzzEoG2VTB7uUjnWnMyeZMU163w69HJpM27yh8Up9Ha5McHZeESjt3NRwU8cWMbCRdY06nFbRCDIVCRcadHCiw==",
       "dev": true,
       "requires": {
         "chalk": "2.x",
-        "google-closure-compiler-java": "^20210505.0.0",
-        "google-closure-compiler-linux": "^20210505.0.0",
-        "google-closure-compiler-osx": "^20210505.0.0",
-        "google-closure-compiler-windows": "^20210505.0.0",
+        "google-closure-compiler-java": "^20210601.0.0",
+        "google-closure-compiler-linux": "^20210601.0.0",
+        "google-closure-compiler-osx": "^20210601.0.0",
+        "google-closure-compiler-windows": "^20210601.0.0",
         "minimist": "1.x",
         "vinyl": "2.x",
         "vinyl-sourcemaps-apply": "^0.2.0"
       }
     },
     "google-closure-compiler-java": {
-      "version": "20210505.0.0",
-      "resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20210505.0.0.tgz",
-      "integrity": "sha512-h+DfQAaaCLFmmtasOS8eyh0M4D+JInTJfEP4byV5R1cnMninpGGLHOG3PNgLLzkXkIO/fu4ILEcVzoGmgJEoMA==",
+      "version": "20210601.0.0",
+      "resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20210601.0.0.tgz",
+      "integrity": "sha512-bH6nIwOmp4qDWvlbXx5/DE3XA2aDGQoCpmRYZJGONY1Sy6Xfbq0ioXRHH9eBDP9hxhCJ5Sd/K89A0NZ8Nz9RJA==",
       "dev": true
     },
     "google-closure-compiler-linux": {
-      "version": "20210505.0.0",
-      "resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20210505.0.0.tgz",
-      "integrity": "sha512-ADN2kFfIR1NiR24kLYb4YkX4MeXDJaT5OfRQEkiuIdZMtd28oEkm80LxCGuC7ftKEixoMm3f9/OG01B4U+xsnA==",
+      "version": "20210601.0.0",
+      "resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20210601.0.0.tgz",
+      "integrity": "sha512-rnEQt7zz/1P1SfPhJiHQpfCgMPrsVVyEgDs09h67xn6+LXa9L0RP+hrJDEHqSWwjDPz0BkfUUv6zkqZvp1h/lw==",
       "dev": true,
       "optional": true
     },
     "google-closure-compiler-osx": {
-      "version": "20210505.0.0",
-      "resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20210505.0.0.tgz",
-      "integrity": "sha512-JTwdh23aD2pwRU4QZjujxp/+rGfhex3utNWEdUDRMNpUGstUK7XPCDG8jNBtUpyuRiXFnpZa90qButqRgotQBA==",
+      "version": "20210601.0.0",
+      "resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20210601.0.0.tgz",
+      "integrity": "sha512-A5r4s/WthR2iLMM0mxsluw8EW2AcOomC5ri/H6FjzpMq0RVEnLTgaGYdXolUAfEzH/7XtJJT2+JkYk3HSLCtrg==",
       "dev": true,
       "optional": true
     },
     "google-closure-compiler-windows": {
-      "version": "20210505.0.0",
-      "resolved": "https://registry.npmjs.org/google-closure-compiler-windows/-/google-closure-compiler-windows-20210505.0.0.tgz",
-      "integrity": "sha512-bKTbg/f4ak72OggEMaH/7oExqOO9dS+TxwGhoovYOt/YaVR/8MDfGdxsOhqoiboiFwYysTPz8bwINjYQK6AwnA==",
+      "version": "20210601.0.0",
+      "resolved": "https://registry.npmjs.org/google-closure-compiler-windows/-/google-closure-compiler-windows-20210601.0.0.tgz",
+      "integrity": "sha512-6r94bPShnB0XXh9+5/qXGDHJN2PQGhF9yJPcgBZj+FAZlQGzlYkT0pkyp+loZT3lG+YRbjD28Lgo7xMcY4xgkA==",
       "dev": true,
       "optional": true
     },
diff --git a/package.json b/package.json
index dda2766d2..969a07cba 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "clang-format": "^1.5.0",
     "concurrently": "^6.0.0",
     "eslint": "^7.28.0",
-    "google-closure-compiler": "^20210505.0.0",
+    "google-closure-compiler": "^20210601.0.0",
     "google-closure-deps": "^20210601.0.0",
     "gulp": "^4.0.2",
     "gulp-concat": "^2.6.1",

From ce078a013941b466ebe6982d61798a9ccf3ac688 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 15:59:05 +0000
Subject: [PATCH 165/833] Bump typescript from 4.3.2 to 4.3.5

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.3.2 to 4.3.5.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.3.2...v4.3.5)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bc2e15371..899eb7600 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21533,9 +21533,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.2.tgz",
-      "integrity": "sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
+      "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
       "dev": true
     },
     "typescript-closure-tools": {

From 8d3c39212b370c54f2262d5e4955632c2b3455cb Mon Sep 17 00:00:00 2001
From: Aaron Dodson <gonfunko@gmail.com>
Date: Mon, 12 Jul 2021 13:37:25 -0700
Subject: [PATCH 166/833] Added script and workflow to automatically update
 build artifact sizes in check_metadata.sh

---
 .github/workflows/update_metadata.yml | 39 +++++++++++++++++++++++++++
 tests/scripts/update_metadata.sh      | 31 +++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 .github/workflows/update_metadata.yml
 create mode 100755 tests/scripts/update_metadata.sh

diff --git a/.github/workflows/update_metadata.yml b/.github/workflows/update_metadata.yml
new file mode 100644
index 000000000..5b5e401fa
--- /dev/null
+++ b/.github/workflows/update_metadata.yml
@@ -0,0 +1,39 @@
+# This workflow updates the check_metadata.sh script, which compares the current
+# size of build artifacts against their size in the previous version of Blockly.
+
+name: Update Metadata
+
+on: [workflow_dispatch]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        node-version: [16.x]        
+
+    steps:
+    - name: Check Out Blockly
+      uses: actions/checkout@v2
+      with:
+        ref: 'develop'
+
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}        
+
+    - name: Update Metadata
+      run: source ./tests/scripts/update_metadata.sh
+
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@9825ae65b1cb54b543b938503728b432a0176d29
+      with:
+        commit-message: Updated build artifact sizes in check_metadata.sh
+        delete-branch: true
+        title: Updated build artifact sizes in check_metadata.sh
+
+    - name: View Pull Request
+      run: echo "View Pull Request - ${{ steps.cpr.outputs.pull-request-url }}"
\ No newline at end of file
diff --git a/tests/scripts/update_metadata.sh b/tests/scripts/update_metadata.sh
new file mode 100755
index 000000000..cfd2f43d0
--- /dev/null
+++ b/tests/scripts/update_metadata.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# Determines the size of generated files and updates check_metadata.sh to
+# reflect the new values.
+
+blockly_size=$(wc -c < "blockly_compressed.js")
+blocks_size=$(wc -c < "blocks_compressed.js")
+blockly_gz_size=$(wc -c < "blockly_compressed.js.gz")
+blocks_gz_size=$(wc -c < "blocks_compressed.js.gz")
+quarter=$(date "+Q%q %Y")
+version=$(npx -c 'echo "$npm_package_version"')
+
+replacement="# ${quarter}\t${version}\t${blockly_size}\n"
+replacement+="readonly BLOCKLY_SIZE_EXPECTED=${blockly_size}"
+sed -ri "s/readonly BLOCKLY_SIZE_EXPECTED=[0-9]+/${replacement}/g" \
+  tests/scripts/check_metadata.sh
+
+replacement="# ${quarter}\t${version}\t${blocks_size}\n"
+replacement+="readonly BLOCKS_SIZE_EXPECTED=${blocks_size}"
+sed -ri "s/readonly BLOCKS_SIZE_EXPECTED=[0-9]+/${replacement}/g" \
+  tests/scripts/check_metadata.sh
+
+replacement="# ${quarter}\t${version}\t${blockly_gz_size}\n"
+replacement+="readonly BLOCKLY_GZ_SIZE_EXPECTED=${blockly_gz_size}"
+sed -ri "s/readonly BLOCKLY_GZ_SIZE_EXPECTED=[0-9]+/${replacement}/g" \
+  tests/scripts/check_metadata.sh
+
+replacement="# ${quarter}\t${version}\t${blocks_gz_size}\n"
+replacement+="readonly BLOCKS_GZ_SIZE_EXPECTED=${blocks_gz_size}"
+sed -ri "s/readonly BLOCKS_GZ_SIZE_EXPECTED=[0-9]+/${replacement}/g" \
+  tests/scripts/check_metadata.sh
\ No newline at end of file

From eddc5f676b2901277d5227fa21ed927f2fb08aa3 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <gonfunko@gmail.com>
Date: Tue, 13 Jul 2021 08:43:52 -0700
Subject: [PATCH 167/833] Calculate metadata size from freshly-built and
 gzipped Blockly.

---
 .github/workflows/update_metadata.yml | 29 +++++++++++++++++----------
 tests/scripts/update_metadata.sh      |  8 ++++----
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/update_metadata.yml b/.github/workflows/update_metadata.yml
index 5b5e401fa..7b83b5a03 100644
--- a/.github/workflows/update_metadata.yml
+++ b/.github/workflows/update_metadata.yml
@@ -6,13 +6,8 @@ name: Update Metadata
 on: [workflow_dispatch]
 
 jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        node-version: [16.x]        
+  update-metadata:
+    runs-on: ubuntu-latest        
 
     steps:
     - name: Check Out Blockly
@@ -20,10 +15,22 @@ jobs:
       with:
         ref: 'develop'
 
-    - name: Use Node.js ${{ matrix.node-version }}
+    - name: Use Node.js 16.x
       uses: actions/setup-node@v1
       with:
-        node-version: ${{ matrix.node-version }}        
+        node-version: 16.x
+
+    - name: Build Blockly
+      run: npm run build:compressed
+
+    - name: Build Blockly blocks
+      run: npm run build:blocks
+
+    - name: Gzip Blockly
+      run: gzip -k build/blockly_compressed.js
+
+    - name: Gzip Blockly blocks
+      run: gzip -k build/blocks_compressed.js
 
     - name: Update Metadata
       run: source ./tests/scripts/update_metadata.sh
@@ -31,9 +38,9 @@ jobs:
     - name: Create Pull Request
       uses: peter-evans/create-pull-request@9825ae65b1cb54b543b938503728b432a0176d29
       with:
-        commit-message: Updated build artifact sizes in check_metadata.sh
+        commit-message: Update build artifact sizes in check_metadata.sh
         delete-branch: true
-        title: Updated build artifact sizes in check_metadata.sh
+        title: Update build artifact sizes in check_metadata.sh
 
     - name: View Pull Request
       run: echo "View Pull Request - ${{ steps.cpr.outputs.pull-request-url }}"
\ No newline at end of file
diff --git a/tests/scripts/update_metadata.sh b/tests/scripts/update_metadata.sh
index cfd2f43d0..d0dac71e7 100755
--- a/tests/scripts/update_metadata.sh
+++ b/tests/scripts/update_metadata.sh
@@ -3,10 +3,10 @@
 # Determines the size of generated files and updates check_metadata.sh to
 # reflect the new values.
 
-blockly_size=$(wc -c < "blockly_compressed.js")
-blocks_size=$(wc -c < "blocks_compressed.js")
-blockly_gz_size=$(wc -c < "blockly_compressed.js.gz")
-blocks_gz_size=$(wc -c < "blocks_compressed.js.gz")
+blockly_size=$(wc -c < "build/blockly_compressed.js")
+blocks_size=$(wc -c < "build/blocks_compressed.js")
+blockly_gz_size=$(wc -c < "build/blockly_compressed.js.gz")
+blocks_gz_size=$(wc -c < "build/blocks_compressed.js.gz")
 quarter=$(date "+Q%q %Y")
 version=$(npx -c 'echo "$npm_package_version"')
 

From 78a5d98c20bf64876295c1b5ac6d4f849219569c Mon Sep 17 00:00:00 2001
From: Aaron Dodson <gonfunko@gmail.com>
Date: Wed, 14 Jul 2021 10:58:08 -0700
Subject: [PATCH 168/833] Gzip build output files in update_metadata.sh instead
 of update_metadata.yml.

---
 .github/workflows/update_metadata.yml | 6 ------
 tests/scripts/update_metadata.sh      | 3 +++
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/update_metadata.yml b/.github/workflows/update_metadata.yml
index 7b83b5a03..82a36230f 100644
--- a/.github/workflows/update_metadata.yml
+++ b/.github/workflows/update_metadata.yml
@@ -26,12 +26,6 @@ jobs:
     - name: Build Blockly blocks
       run: npm run build:blocks
 
-    - name: Gzip Blockly
-      run: gzip -k build/blockly_compressed.js
-
-    - name: Gzip Blockly blocks
-      run: gzip -k build/blocks_compressed.js
-
     - name: Update Metadata
       run: source ./tests/scripts/update_metadata.sh
 
diff --git a/tests/scripts/update_metadata.sh b/tests/scripts/update_metadata.sh
index d0dac71e7..d3b97f3ab 100755
--- a/tests/scripts/update_metadata.sh
+++ b/tests/scripts/update_metadata.sh
@@ -3,6 +3,9 @@
 # Determines the size of generated files and updates check_metadata.sh to
 # reflect the new values.
 
+gzip -k build/blockly_compressed.js
+gzip -k build/blocks_compressed.js
+
 blockly_size=$(wc -c < "build/blockly_compressed.js")
 blocks_size=$(wc -c < "build/blocks_compressed.js")
 blockly_gz_size=$(wc -c < "build/blockly_compressed.js.gz")

From 926b14b15ee53f185959f5867a0811e110236a19 Mon Sep 17 00:00:00 2001
From: hpnrep6 <hpnrep6@gmail.com>
Date: Fri, 16 Jul 2021 13:42:09 -0400
Subject: [PATCH 169/833] Fix code in code demo executing twice on mobile
 (#5037)

* Prevent code from executing twice on touchscreens
---
 demos/code/code.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/demos/code/code.js b/demos/code/code.js
index 0c2765325..2377203a2 100644
--- a/demos/code/code.js
+++ b/demos/code/code.js
@@ -549,8 +549,14 @@ Code.initLanguage = function() {
 /**
  * Execute the user's code.
  * Just a quick and dirty eval.  Catch infinite loops.
+ * @param {Event} event Event created from listener bound to the function.
  */
-Code.runJS = function() {
+Code.runJS = function(event) {
+  // Prevent code from being executed twice on touchscreens.
+  if (event.type == 'touchend') {
+    event.preventDefault();
+  }
+
   Blockly.JavaScript.INFINITE_LOOP_TRAP = 'checkTimeout();\n';
   var timeouts = 0;
   var checkTimeout = function() {

From 3aa6b476aafc790c583dfd23826ff446119e2fcb Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Mon, 19 Jul 2021 15:59:27 +0100
Subject: [PATCH 170/833] Ignore public/ directory; always serve repository
 root

By default http-server will serve ./public if it exists.  We
want it to always serve the repository root, so configure the
start script to specify that explicitly, so that the existence of
a public/ directory will not break things.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 969a07cba..6026bc4ec 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "publish:beta": "gulp publishBeta",
     "recompile": "gulp recompile",
     "release": "gulp gitCreateRC",
-    "start": "http-server -o /tests/playground.html",
+    "start": "http-server ./ -o /tests/playground.html",
     "test": "tests/run_all_tests.sh",
     "test:generators": "tests/scripts/run_generators.sh",
     "test:compile:advanced": "gulp buildAdvancedCompilationTest",

From 50a66c024d6b0107e620ea6ed78e56c07cce4bfd Mon Sep 17 00:00:00 2001
From: jschanker <jschanker@molloy.edu>
Date: Mon, 19 Jul 2021 21:02:20 -0400
Subject: [PATCH 171/833] Permit single field disabling (#4932) (#4941)

* Permit single field disabling (https://github.com/google/blockly/issues/4932)

* Permit single field disabling (#4932)

* Fixed lint error (moved && to end of line and adjusted line breaks accordingly)

* Added XML Field (De)Serialization

* Call parent method in FieldDropdown's fromXml
* Added protected helper methods to handle serialization/deserialization of enabled property/attribute of fields
* Minor changes to annotations to account for field disabling and 4 spaces per line break per style guide

* Revert "Added XML Field (De)Serialization"

This reverts commit 1964e866b6ab5c1615522f0a7a634a7ea9a9004b.

* Comment style changes

* Comment reversions

* Indentation fix

* Indentation reversion
---
 core/field.js | 45 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/core/field.js b/core/field.js
index c343359da..f5f027c45 100644
--- a/core/field.js
+++ b/core/field.js
@@ -203,6 +203,13 @@ Blockly.Field.prototype.isDirty_ = true;
  */
 Blockly.Field.prototype.visible_ = true;
 
+/**
+ * Can the field value be changed using the editor on an editable block?
+ * @type {boolean}
+ * @protected
+ */
+Blockly.Field.prototype.enabled_ = true;
+
 /**
  * The element the click handler is bound to.
  * @type {Element}
@@ -393,8 +400,8 @@ Blockly.Field.prototype.bindEvents_ = function() {
 };
 
 /**
- * Sets the field's value based on the given XML element. Should only be
- * called by Blockly.Xml.
+ * Sets the field's value based on the given XML element. Should only be called
+ *     by Blockly.Xml.
  * @param {!Element} fieldElement The element containing info about the
  *    field's state.
  * @package
@@ -441,7 +448,7 @@ Blockly.Field.prototype.updateEditable = function() {
   if (!this.EDITABLE || !group) {
     return;
   }
-  if (this.sourceBlock_.isEditable()) {
+  if (this.enabled_ && this.sourceBlock_.isEditable()) {
     Blockly.utils.dom.addClass(group, 'blocklyEditableText');
     Blockly.utils.dom.removeClass(group, 'blocklyNonEditableText');
     group.style.cursor = this.CURSOR;
@@ -452,23 +459,45 @@ Blockly.Field.prototype.updateEditable = function() {
   }
 };
 
+/**
+ * Set whether this field's value can be changed using the editor when the
+ *     source block is editable.
+ * @param {boolean} enabled True if enabled.
+ */
+Blockly.Field.prototype.setEnabled = function(enabled) {
+  this.enabled_ = enabled;
+  this.updateEditable();
+};
+
+/**
+ * Check whether this field's value can be changed using the editor when the
+ *     source block is editable.
+ * @return {boolean} Whether this field is enabled.
+ */
+Blockly.Field.prototype.isEnabled = function() {
+  return this.enabled_;
+};
+
 /**
  * Check whether this field defines the showEditor_ function.
  * @return {boolean} Whether this field is clickable.
  */
 Blockly.Field.prototype.isClickable = function() {
-  return !!this.sourceBlock_ && this.sourceBlock_.isEditable() &&
-      !!this.showEditor_ && (typeof this.showEditor_ === 'function');
+  return this.enabled_ && !!this.sourceBlock_ &&
+      this.sourceBlock_.isEditable() && !!this.showEditor_ &&
+      (typeof this.showEditor_ === 'function');
 };
 
 /**
  * Check whether this field is currently editable.  Some fields are never
  * EDITABLE (e.g. text labels). Other fields may be EDITABLE but may exist on
- * non-editable blocks.
- * @return {boolean} Whether this field is editable and on an editable block
+ * non-editable blocks or be currently disabled.
+ * @return {boolean} Whether this field is currently enabled, editable and on
+ * an editable block.
  */
 Blockly.Field.prototype.isCurrentlyEditable = function() {
-  return this.EDITABLE && !!this.sourceBlock_ && this.sourceBlock_.isEditable();
+  return this.enabled_ && this.EDITABLE && !!this.sourceBlock_ &&
+      this.sourceBlock_.isEditable();
 };
 
 /**

From e9a16684455c790e98ae99c5321d71ca745c92d5 Mon Sep 17 00:00:00 2001
From: Maribeth Bottorff <maribethb@google.com>
Date: Mon, 19 Jul 2021 18:14:23 -0700
Subject: [PATCH 172/833] Only lint once in CI (#5128)

---
 .github/workflows/build.yml | 16 ++++++++++++++++
 tests/run_all_tests.sh      |  5 ++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f00730990..9a7d2b859 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -41,3 +41,19 @@ jobs:
 
       env:
         CI: true
+
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Use Node.js 16.x
+      uses: actions/setup-node@v1
+      with:
+        node-version: 16.x
+
+    - name: Npm Install
+      run: npm install
+
+    - name: Lint
+      run: npm run lint
diff --git a/tests/run_all_tests.sh b/tests/run_all_tests.sh
index f6c7c0f8c..ccb18cf9c 100755
--- a/tests/run_all_tests.sh
+++ b/tests/run_all_tests.sh
@@ -49,7 +49,10 @@ run_test_command () {
 }
 
 # Lint the codebase.
-run_test_command "eslint" "eslint ."
+# Skip for CI environments, because linting is run separately.
+if [ -z $CI ]; then
+  run_test_command "eslint" "eslint ."
+fi
 
 # Run the full usual build process.
 run_test_command "build" "npm run build"

From 6b10f9545c7e18d806bc8926a7d612e61e0e8712 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 16 Jul 2021 15:11:14 -0700
Subject: [PATCH 173/833] Migrate core/interfaces/i_registrable.js to
 goog.module

---
 core/interfaces/i_registrable.js | 7 +++++--
 tests/deps.js                    | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/interfaces/i_registrable.js b/core/interfaces/i_registrable.js
index f7b8ca719..5698ad313 100644
--- a/core/interfaces/i_registrable.js
+++ b/core/interfaces/i_registrable.js
@@ -12,11 +12,14 @@
 
 'use strict';
 
-goog.provide('Blockly.IRegistrable');
+goog.module('Blockly.IRegistrable');
+goog.module.declareLegacyNamespace();
 
 
 /**
  * The interface for a Blockly component that can be registered.
  * @interface
  */
-Blockly.IRegistrable = function() {};
+const IRegistrable = function() {};
+
+exports = IRegistrable;
diff --git a/tests/deps.js b/tests/deps.js
index 95ce972c7..aa7cf5039 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -93,7 +93,7 @@ goog.addDependency('../../core/interfaces/i_keyboard_accessible.js', ['Blockly.I
 goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], []);
 goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], []);
+goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], []);
 goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});

From 599385891a896e9f6f4b18442076f5ba8ce3db5f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 19 Jul 2021 11:08:27 -0700
Subject: [PATCH 174/833] Break up interfaces in core/i_toolbox_item.js into
 separate files

---
 core/interfaces/i_collapsible_toolbox_item.js | 45 +++++++++++
 core/interfaces/i_selectable_toolbox_item.js  | 65 ++++++++++++++++
 core/interfaces/i_toolbox_item.js             | 76 -------------------
 3 files changed, 110 insertions(+), 76 deletions(-)
 create mode 100644 core/interfaces/i_collapsible_toolbox_item.js
 create mode 100644 core/interfaces/i_selectable_toolbox_item.js

diff --git a/core/interfaces/i_collapsible_toolbox_item.js b/core/interfaces/i_collapsible_toolbox_item.js
new file mode 100644
index 000000000..c92008358
--- /dev/null
+++ b/core/interfaces/i_collapsible_toolbox_item.js
@@ -0,0 +1,45 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview The interface for a collapsible toolbox item.
+ * @author kozbial@google.com (Monica Kozbial)
+ */
+
+'use strict';
+
+goog.provide('Blockly.ICollapsibleToolboxItem');
+
+goog.require('Blockly.IToolboxItem');
+goog.requireType('Blockly.utils.toolbox');
+
+
+/**
+ * Interface for an item in the toolbox that can be collapsed.
+ * @extends {Blockly.ISelectableToolboxItem}
+ * @interface
+ */
+Blockly.ICollapsibleToolboxItem = function() {};
+
+/**
+ * Gets any children toolbox items. (ex. Gets the subcategories)
+ * @return {!Array<!Blockly.IToolboxItem>} The child toolbox items.
+ */
+Blockly.ICollapsibleToolboxItem.prototype.getChildToolboxItems;
+
+/**
+ * Whether the toolbox item is expanded to show its child subcategories.
+ * @return {boolean} True if the toolbox item shows its children, false if it
+ *     is collapsed.
+ * @public
+ */
+Blockly.ICollapsibleToolboxItem.prototype.isExpanded;
+
+/**
+ * Toggles whether or not the toolbox item is expanded.
+ * @public
+ */
+Blockly.ICollapsibleToolboxItem.prototype.toggleExpanded;
diff --git a/core/interfaces/i_selectable_toolbox_item.js b/core/interfaces/i_selectable_toolbox_item.js
new file mode 100644
index 000000000..fb7b8558f
--- /dev/null
+++ b/core/interfaces/i_selectable_toolbox_item.js
@@ -0,0 +1,65 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview The interface for a selectable toolbox item.
+ * @author aschmiedt@google.com (Abby Schmiedt)
+ */
+
+'use strict';
+
+goog.provide('Blockly.ISelectableToolboxItem');
+
+goog.require('Blockly.IToolboxItem');
+goog.requireType('Blockly.utils.toolbox');
+
+
+/**
+ * Interface for an item in the toolbox that can be selected.
+ * @extends {Blockly.IToolboxItem}
+ * @interface
+ */
+Blockly.ISelectableToolboxItem = function() {};
+
+/**
+ * Gets the name of the toolbox item. Used for emitting events.
+ * @return {string} The name of the toolbox item.
+ * @public
+ */
+Blockly.ISelectableToolboxItem.prototype.getName;
+
+/**
+ * Gets the contents of the toolbox item. These are items that are meant to be
+ * displayed in the flyout.
+ * @return {!Blockly.utils.toolbox.FlyoutItemInfoArray|string} The definition
+ *     of items to be displayed in the flyout.
+ * @public
+ */
+Blockly.ISelectableToolboxItem.prototype.getContents;
+
+/**
+ * Sets the current toolbox item as selected.
+ * @param {boolean} _isSelected True if this category is selected, false
+ *     otherwise.
+ * @public
+ */
+Blockly.ISelectableToolboxItem.prototype.setSelected;
+
+/**
+ * Gets the HTML element that is clickable.
+ * The parent toolbox element receives clicks. The parent toolbox will add an ID
+ * to this element so it can pass the onClick event to the correct toolboxItem.
+ * @return {!Element} The HTML element that receives clicks.
+ * @public
+ */
+Blockly.ISelectableToolboxItem.prototype.getClickTarget;
+
+/**
+ * Handles when the toolbox item is clicked.
+ * @param {!Event} _e Click event to handle.
+ * @public
+ */
+Blockly.ISelectableToolboxItem.prototype.onClick;
diff --git a/core/interfaces/i_toolbox_item.js b/core/interfaces/i_toolbox_item.js
index afd6191f7..ce646d376 100644
--- a/core/interfaces/i_toolbox_item.js
+++ b/core/interfaces/i_toolbox_item.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-goog.provide('Blockly.ICollapsibleToolboxItem');
-goog.provide('Blockly.ISelectableToolboxItem');
 goog.provide('Blockly.IToolboxItem');
 
 goog.requireType('Blockly.utils.toolbox');
@@ -81,77 +79,3 @@ Blockly.IToolboxItem.prototype.isCollapsible;
  * @public
  */
 Blockly.IToolboxItem.prototype.dispose;
-
-/**
- * Interface for an item in the toolbox that can be selected.
- * @extends {Blockly.IToolboxItem}
- * @interface
- */
-Blockly.ISelectableToolboxItem = function() {};
-
-/**
- * Gets the name of the toolbox item. Used for emitting events.
- * @return {string} The name of the toolbox item.
- * @public
- */
-Blockly.ISelectableToolboxItem.prototype.getName;
-
-/**
- * Gets the contents of the toolbox item. These are items that are meant to be
- * displayed in the flyout.
- * @return {!Blockly.utils.toolbox.FlyoutItemInfoArray|string} The definition
- *     of items to be displayed in the flyout.
- * @public
- */
-Blockly.ISelectableToolboxItem.prototype.getContents;
-
-/**
- * Sets the current toolbox item as selected.
- * @param {boolean} _isSelected True if this category is selected, false
- *     otherwise.
- * @public
- */
-Blockly.ISelectableToolboxItem.prototype.setSelected;
-
-/**
- * Gets the HTML element that is clickable.
- * The parent toolbox element receives clicks. The parent toolbox will add an ID
- * to this element so it can pass the onClick event to the correct toolboxItem.
- * @return {!Element} The HTML element that receives clicks.
- * @public
- */
-Blockly.ISelectableToolboxItem.prototype.getClickTarget;
-
-/**
- * Handles when the toolbox item is clicked.
- * @param {!Event} _e Click event to handle.
- * @public
- */
-Blockly.ISelectableToolboxItem.prototype.onClick;
-
-/**
- * Interface for an item in the toolbox that can be collapsed.
- * @extends {Blockly.ISelectableToolboxItem}
- * @interface
- */
-Blockly.ICollapsibleToolboxItem = function() {};
-
-/**
- * Gets any children toolbox items. (ex. Gets the subcategories)
- * @return {!Array<!Blockly.IToolboxItem>} The child toolbox items.
- */
-Blockly.ICollapsibleToolboxItem.prototype.getChildToolboxItems;
-
-/**
- * Whether the toolbox item is expanded to show its child subcategories.
- * @return {boolean} True if the toolbox item shows its children, false if it
- *     is collapsed.
- * @public
- */
-Blockly.ICollapsibleToolboxItem.prototype.isExpanded;
-
-/**
- * Toggles whether or not the toolbox item is expanded.
- * @public
- */
-Blockly.ICollapsibleToolboxItem.prototype.toggleExpanded;

From 1b09c8d8b736257d5829c9629c3dcc7e771f0290 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 19 Jul 2021 11:09:51 -0700
Subject: [PATCH 175/833] Migrate
 core/interfaces/i_collapsible_toolbox_item.js,
 core/interfaces/i_selectable_toolbox_item.js, and
 core/interfaces/i_toolbox_item.js to goog.module

---
 core/interfaces/i_collapsible_toolbox_item.js | 17 +++++++------
 core/interfaces/i_selectable_toolbox_item.js  | 17 +++++++------
 core/interfaces/i_toolbox_item.js             | 25 ++++++++++---------
 tests/deps.js                                 |  4 ++-
 4 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/core/interfaces/i_collapsible_toolbox_item.js b/core/interfaces/i_collapsible_toolbox_item.js
index c92008358..3af4d2692 100644
--- a/core/interfaces/i_collapsible_toolbox_item.js
+++ b/core/interfaces/i_collapsible_toolbox_item.js
@@ -11,10 +11,11 @@
 
 'use strict';
 
-goog.provide('Blockly.ICollapsibleToolboxItem');
+goog.module('Blockly.ICollapsibleToolboxItem');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.IToolboxItem');
-goog.requireType('Blockly.utils.toolbox');
+goog.require('Blockly.ISelectableToolboxItem');
+goog.requireType('Blockly.IToolboxItem');
 
 
 /**
@@ -22,13 +23,13 @@ goog.requireType('Blockly.utils.toolbox');
  * @extends {Blockly.ISelectableToolboxItem}
  * @interface
  */
-Blockly.ICollapsibleToolboxItem = function() {};
+const ICollapsibleToolboxItem = function() {};
 
 /**
  * Gets any children toolbox items. (ex. Gets the subcategories)
  * @return {!Array<!Blockly.IToolboxItem>} The child toolbox items.
  */
-Blockly.ICollapsibleToolboxItem.prototype.getChildToolboxItems;
+ICollapsibleToolboxItem.prototype.getChildToolboxItems;
 
 /**
  * Whether the toolbox item is expanded to show its child subcategories.
@@ -36,10 +37,12 @@ Blockly.ICollapsibleToolboxItem.prototype.getChildToolboxItems;
  *     is collapsed.
  * @public
  */
-Blockly.ICollapsibleToolboxItem.prototype.isExpanded;
+ICollapsibleToolboxItem.prototype.isExpanded;
 
 /**
  * Toggles whether or not the toolbox item is expanded.
  * @public
  */
-Blockly.ICollapsibleToolboxItem.prototype.toggleExpanded;
+ICollapsibleToolboxItem.prototype.toggleExpanded;
+
+exports = ICollapsibleToolboxItem;
diff --git a/core/interfaces/i_selectable_toolbox_item.js b/core/interfaces/i_selectable_toolbox_item.js
index fb7b8558f..535f65401 100644
--- a/core/interfaces/i_selectable_toolbox_item.js
+++ b/core/interfaces/i_selectable_toolbox_item.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-goog.provide('Blockly.ISelectableToolboxItem');
+goog.module('Blockly.ISelectableToolboxItem');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.IToolboxItem');
 goog.requireType('Blockly.utils.toolbox');
@@ -22,14 +23,14 @@ goog.requireType('Blockly.utils.toolbox');
  * @extends {Blockly.IToolboxItem}
  * @interface
  */
-Blockly.ISelectableToolboxItem = function() {};
+const ISelectableToolboxItem = function() {};
 
 /**
  * Gets the name of the toolbox item. Used for emitting events.
  * @return {string} The name of the toolbox item.
  * @public
  */
-Blockly.ISelectableToolboxItem.prototype.getName;
+ISelectableToolboxItem.prototype.getName;
 
 /**
  * Gets the contents of the toolbox item. These are items that are meant to be
@@ -38,7 +39,7 @@ Blockly.ISelectableToolboxItem.prototype.getName;
  *     of items to be displayed in the flyout.
  * @public
  */
-Blockly.ISelectableToolboxItem.prototype.getContents;
+ISelectableToolboxItem.prototype.getContents;
 
 /**
  * Sets the current toolbox item as selected.
@@ -46,7 +47,7 @@ Blockly.ISelectableToolboxItem.prototype.getContents;
  *     otherwise.
  * @public
  */
-Blockly.ISelectableToolboxItem.prototype.setSelected;
+ISelectableToolboxItem.prototype.setSelected;
 
 /**
  * Gets the HTML element that is clickable.
@@ -55,11 +56,13 @@ Blockly.ISelectableToolboxItem.prototype.setSelected;
  * @return {!Element} The HTML element that receives clicks.
  * @public
  */
-Blockly.ISelectableToolboxItem.prototype.getClickTarget;
+ISelectableToolboxItem.prototype.getClickTarget;
 
 /**
  * Handles when the toolbox item is clicked.
  * @param {!Event} _e Click event to handle.
  * @public
  */
-Blockly.ISelectableToolboxItem.prototype.onClick;
+ISelectableToolboxItem.prototype.onClick;
+
+exports = ISelectableToolboxItem;
diff --git a/core/interfaces/i_toolbox_item.js b/core/interfaces/i_toolbox_item.js
index ce646d376..061b7ae27 100644
--- a/core/interfaces/i_toolbox_item.js
+++ b/core/interfaces/i_toolbox_item.js
@@ -11,16 +11,15 @@
 
 'use strict';
 
-goog.provide('Blockly.IToolboxItem');
-
-goog.requireType('Blockly.utils.toolbox');
+goog.module('Blockly.IToolboxItem');
+goog.module.declareLegacyNamespace();
 
 
 /**
  * Interface for an item in the toolbox.
  * @interface
  */
-Blockly.IToolboxItem = function() {};
+const IToolboxItem = function() {};
 
 /**
  * Initializes the toolbox item.
@@ -29,21 +28,21 @@ Blockly.IToolboxItem = function() {};
  * @return {void}
  * @public
  */
-Blockly.IToolboxItem.prototype.init;
+IToolboxItem.prototype.init;
 
 /**
  * Gets the div for the toolbox item.
  * @return {?Element} The div for the toolbox item.
  * @public
  */
-Blockly.IToolboxItem.prototype.getDiv;
+IToolboxItem.prototype.getDiv;
 
 /**
  * Gets a unique identifier for this toolbox item.
  * @return {string} The ID for the toolbox item.
  * @public
  */
-Blockly.IToolboxItem.prototype.getId;
+IToolboxItem.prototype.getId;
 
 /**
  * Gets the parent if the toolbox item is nested.
@@ -51,31 +50,33 @@ Blockly.IToolboxItem.prototype.getId;
  *     this toolbox item is not nested.
  * @public
  */
-Blockly.IToolboxItem.prototype.getParent;
+IToolboxItem.prototype.getParent;
 
 /**
  * Gets the nested level of the category.
  * @return {number} The nested level of the category.
  * @package
  */
-Blockly.IToolboxItem.prototype.getLevel;
+IToolboxItem.prototype.getLevel;
 
 /**
  * Whether the toolbox item is selectable.
  * @return {boolean} True if the toolbox item can be selected.
  * @public
  */
-Blockly.IToolboxItem.prototype.isSelectable;
+IToolboxItem.prototype.isSelectable;
 
 /**
  * Whether the toolbox item is collapsible.
  * @return {boolean} True if the toolbox item is collapsible.
  * @public
  */
-Blockly.IToolboxItem.prototype.isCollapsible;
+IToolboxItem.prototype.isCollapsible;
 
 /**
  * Dispose of this toolbox item. No-op by default.
  * @public
  */
-Blockly.IToolboxItem.prototype.dispose;
+IToolboxItem.prototype.dispose;
+
+exports = IToolboxItem;
diff --git a/tests/deps.js b/tests/deps.js
index aa7cf5039..979c58c74 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -80,6 +80,7 @@ goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHid
 goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], ['Blockly.IContextMenu', 'Blockly.IDraggable'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_collapsible_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem'], ['Blockly.ISelectableToolboxItem'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], [], {'lang': 'es6', 'module': 'goog'});
@@ -96,9 +97,10 @@ goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositio
 goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], []);
 goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_selectable_toolbox_item.js', ['Blockly.ISelectableToolboxItem'], ['Blockly.IToolboxItem'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], ['Blockly.IRegistrable'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem', 'Blockly.ISelectableToolboxItem', 'Blockly.IToolboxItem'], []);
+goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.IToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Coordinate'], {'lang': 'es5'});
 goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 3c77ff1fb2d6096a00d21f99fe71a5df48b2e750 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 19 Jul 2021 11:19:08 -0700
Subject: [PATCH 176/833] Migrate
 core/interfaces/i_collapsible_toolbox_item.js,
 core/interfaces/i_selectable_toolbox_item.js, and
 core/interfaces/i_toolbox_item.js named requires

---
 core/interfaces/i_collapsible_toolbox_item.js | 8 ++++----
 core/interfaces/i_selectable_toolbox_item.js  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/interfaces/i_collapsible_toolbox_item.js b/core/interfaces/i_collapsible_toolbox_item.js
index 3af4d2692..732c7aab7 100644
--- a/core/interfaces/i_collapsible_toolbox_item.js
+++ b/core/interfaces/i_collapsible_toolbox_item.js
@@ -14,20 +14,20 @@
 goog.module('Blockly.ICollapsibleToolboxItem');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.ISelectableToolboxItem');
-goog.requireType('Blockly.IToolboxItem');
+const ISelectableToolboxItem = goog.require('Blockly.ISelectableToolboxItem');
+const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 
 
 /**
  * Interface for an item in the toolbox that can be collapsed.
- * @extends {Blockly.ISelectableToolboxItem}
+ * @extends {ISelectableToolboxItem}
  * @interface
  */
 const ICollapsibleToolboxItem = function() {};
 
 /**
  * Gets any children toolbox items. (ex. Gets the subcategories)
- * @return {!Array<!Blockly.IToolboxItem>} The child toolbox items.
+ * @return {!Array<!IToolboxItem>} The child toolbox items.
  */
 ICollapsibleToolboxItem.prototype.getChildToolboxItems;
 
diff --git a/core/interfaces/i_selectable_toolbox_item.js b/core/interfaces/i_selectable_toolbox_item.js
index 535f65401..2addc7b9e 100644
--- a/core/interfaces/i_selectable_toolbox_item.js
+++ b/core/interfaces/i_selectable_toolbox_item.js
@@ -14,13 +14,13 @@
 goog.module('Blockly.ISelectableToolboxItem');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.IToolboxItem');
-goog.requireType('Blockly.utils.toolbox');
+const IToolboxItem = goog.require('Blockly.IToolboxItem');
+const {FlyoutItemInfoArray} = goog.requireType('Blockly.utils.toolbox');
 
 
 /**
  * Interface for an item in the toolbox that can be selected.
- * @extends {Blockly.IToolboxItem}
+ * @extends {IToolboxItem}
  * @interface
  */
 const ISelectableToolboxItem = function() {};
@@ -35,7 +35,7 @@ ISelectableToolboxItem.prototype.getName;
 /**
  * Gets the contents of the toolbox item. These are items that are meant to be
  * displayed in the flyout.
- * @return {!Blockly.utils.toolbox.FlyoutItemInfoArray|string} The definition
+ * @return {!FlyoutItemInfoArray|string} The definition
  *     of items to be displayed in the flyout.
  * @public
  */

From b2ed132ebb1f5d3bd118c4085472ad1d9f14f06b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 20 Jul 2021 16:52:52 -0700
Subject: [PATCH 177/833] Fix bug where script was incorrectly reporting
 missing requires

---
 scripts/goog_module/convert-file.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index 9b62892b5..35d3f3377 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -201,12 +201,12 @@ step3() {
   done
 
   local missing_requires=$(perl -nle'print $& while m{(?<!'\'')Blockly(\.\w+)+}g' "${filepath}")
-  local missing_require_lines=$(echo "${missing_requires}" | wc -l)
-  if [[ "${missing_require_lines}" -gt "0" ]]; then
+  if [[ ! -z "${missing_require_lines}" ]]; then
+    err $missing_require_lines
     err "Missing requires for: ${missing_requires} Please manually fix."
   fi
 
-  inf "Add missing nullability modifier..."
+  inf "Add missing nullability modifiers..."
   perl -pi -e 's/@(param|return) \{([A-Z])/@\1 \{?\2/g' "${filepath}"
 
   success "Completed automation for step 3. Please manually review and reorder requires."

From 972f9bc386439428943723c7e3905b8a92f2b03e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 20 Jul 2021 17:54:09 -0700
Subject: [PATCH 178/833] Fix bugs caused by Blockly being a require

---
 scripts/goog_module/convert-file.sh | 31 +++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index 35d3f3377..5fc37fe19 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -155,6 +155,14 @@ step3() {
     return 1
   fi
 
+  inf "Extracting module name..."
+  local module_name=$(perl -nle'print $& while m{(?<=^goog\.module\('\'')([^'\'')]+)}g' "${filepath}")
+  if [[ -z "${module_name}" ]]; then
+    err "Could not extract module name"
+    return 1
+  fi
+  inf "Extracted module name \"${module_name}\""
+
   local requires=$(perl -nle'print $& while m{^goog.require(|Type)\('\''(.*)'\''\)}g' "${filepath}" | perl -pe 's/goog.require(|Type)\('\''(.*)'\''\)/\2/g')
 
   # Process each require
@@ -169,14 +177,21 @@ step3() {
 
     local direct_access_count=$(perl -nle'print $& while m{'"${require}"'[^\.'\'']}g' "${filepath}" | wc -l)
     local properties_accessed=$(perl -nle'print $& while m{(?<='"${require}"'\.)(?!prototype)\w+}g' "${filepath}" | tr ' ' '\n' | sort -u)
-    # Detect overlap (ex: Blockly.utils and Blockly.utils.dom)
-    local overlap=$(echo "${requires}"| perl -nle'print $& while m{(?<='"${require}"'\.)\w+}g')
-    if [[ ! -z "${overlap}" ]]; then
-      while read -r overlap_prop ; do
-        properties_accessed=$(echo "$properties_accessed" | perl -pe 's/'"${overlap_prop}"'//g')
-      done <<<"${overlap}"
-      properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/\s+/ /g' | xargs)
+    # Detect requires overlap
+    # (ex: Blockly.utils require and Blockly.utils.dom also in requires)
+    local requires_overlap=$(echo "${requires}" | perl -nle'print $& while m{(?<='"${require}"'\.)\w+}g')
+    if [[ ! -z "${requires_overlap}" ]]; then
+      while read -r requires_overlap_prop ; do
+        properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/'"${requires_overlap_prop}"'//g')
+      done <<<"${requires_overlap}"
     fi
+    # Detect module name overlap
+    # (ex: Blockly require and Blockly.ContextMenuItems module being converted)
+    local module_overlap=$(echo "${module_name}" | perl -nle'print $& while m{(?<='"${require}"'\.)\w+}g')
+    if [[ ! -z "${module_overlap}" ]]; then
+      properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/'"${module_overlap}"'//g')
+    fi
+    properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/\s+/ /g' | xargs)
 
     if [[ "${direct_access_count}" -eq "0" && ! -z "${properties_accessed}" ]]; then
       local deconstructed_comma=$(echo "${properties_accessed}" | perl -pe 's/\s+/, /g' | perl -pe 's/, $//')
@@ -185,7 +200,7 @@ step3() {
       inf "Updating require declaration for ${require}..."
       perl -pi -e 's/^(goog\.(require|requireType)\('\'"${require}"\''\);)/const \{'"${deconstructed_comma}"'\} = \1/' "${filepath}"
 
-      echo "${properties_accessed}" | while read -r require_prop ; do
+      for require_prop in $(echo "${properties_accessed}"); do
         inf "Updating references of ${require}.${require_prop} to ${require_prop}..."
         perl -pi -e 's/'"${require}"'\.'"${require_prop}"'([^'\''\w])/'"${require_prop}"'\1/g' "${filepath}"
       done

From 5e3209b6f5dfccc2ca5ee076a50c045ec225a9fc Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 20 Jul 2021 17:57:37 -0700
Subject: [PATCH 179/833] Remove extra logging line

---
 scripts/goog_module/convert-file.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index 5fc37fe19..7a440b8b9 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -217,7 +217,6 @@ step3() {
 
   local missing_requires=$(perl -nle'print $& while m{(?<!'\'')Blockly(\.\w+)+}g' "${filepath}")
   if [[ ! -z "${missing_require_lines}" ]]; then
-    err $missing_require_lines
     err "Missing requires for: ${missing_requires} Please manually fix."
   fi
 

From e6817778dbceb1b4fe88499953338e8c15aff9eb Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 20 Jul 2021 18:16:37 -0700
Subject: [PATCH 180/833] fix formatting and help

---
 scripts/goog_module/convert-file.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index 7a440b8b9..79ceeed42 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -141,7 +141,6 @@ step2 () {
 
   npm run build:deps
   success "Completed automation for step 3. Please manually review and add exports for non-private top-level functions."
-
 }
 #######################################
 # Runs step 3 of the automated conversion.
@@ -285,7 +284,7 @@ function help {
   echo " 3. Rewrite goog.requires statements and add missing requires (often skipped for simple files)"
   echo " 4. Run clang-format on the whole file"
   echo ""
-  echo "Usage: $0 [-h|-c <number>|-s <number>|-f] <filepath>"
+  echo "Usage: $0 [-h|-c <number>|-s <number>] <filepath>"
   echo "  -h                      Display help"
   echo "  -c <step> <filepath>    Create a commit for the specified step [2-4]"
   echo "  -s <step> <filepath>    Run the specified step [1-4]"

From 8d6f2626cda8703c1b4a01139cc721f76e854bae Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 20 Jul 2021 19:01:01 -0700
Subject: [PATCH 181/833] Remove command to add missing nullability modifiers

---
 scripts/goog_module/convert-file.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index 79ceeed42..1861ad7f3 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -219,9 +219,6 @@ step3() {
     err "Missing requires for: ${missing_requires} Please manually fix."
   fi
 
-  inf "Add missing nullability modifiers..."
-  perl -pi -e 's/@(param|return) \{([A-Z])/@\1 \{?\2/g' "${filepath}"
-
   success "Completed automation for step 3. Please manually review and reorder requires."
 }
 #######################################

From 0e6258ca1a78f384944977c29e5c3e3bcf0ba748 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 08:17:13 -0700
Subject: [PATCH 182/833] Migrated to inline exports

---
 core/block_animations.js                      | 31 +++++-----
 core/block_drag_surface.js                    |  2 +-
 core/bubble_dragger.js                        | 11 +++-
 core/comment.js                               |  6 ++
 core/component_manager.js                     |  5 ++
 core/connection.js                            |  8 ++-
 core/connection_checker.js                    |  2 +
 core/connection_db.js                         |  3 +
 core/css.js                                   |  9 +--
 core/extensions.js                            | 20 +++---
 core/interfaces/i_ast_node_location_svg.js    |  1 +
 .../i_ast_node_location_with_block.js         |  2 +
 core/interfaces/i_autohideable.js             |  1 +
 core/interfaces/i_block_dragger.js            |  2 +
 core/interfaces/i_bounded_element.js          |  1 +
 core/interfaces/i_bubble.js                   |  4 ++
 core/interfaces/i_connection_checker.js       |  2 +
 core/interfaces/i_copyable.js                 |  2 +
 core/interfaces/i_delete_area.js              |  2 +
 core/interfaces/i_drag_target.js              |  3 +
 core/interfaces/i_draggable.js                |  1 +
 core/interfaces/i_flyout.js                   |  6 ++
 core/interfaces/i_keyboard_accessible.js      |  1 +
 core/interfaces/i_positionable.js             |  3 +
 core/interfaces/i_toolbox.js                  |  5 ++
 core/renderers/common/drawer.js               |  9 ++-
 core/utils/colour.js                          | 15 ++---
 core/utils/deprecation.js                     |  5 +-
 core/utils/idgenerator.js                     |  4 +-
 core/utils/math.js                            |  9 +--
 core/utils/object.js                          | 11 ++--
 core/utils/style.js                           | 48 +++++++--------
 core/utils/svg_paths.js                       | 27 +++-----
 core/utils/toolbox.js                         | 61 ++++++++-----------
 34 files changed, 178 insertions(+), 144 deletions(-)

diff --git a/core/block_animations.js b/core/block_animations.js
index 86b4b44b5..27926002e 100644
--- a/core/block_animations.js
+++ b/core/block_animations.js
@@ -13,9 +13,10 @@
 goog.module('Blockly.blockAnimations');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
-const dom = goog.require('Blockly.utils.dom');
 const Svg = goog.require('Blockly.utils.Svg');
+const dom = goog.require('Blockly.utils.dom');
 
 
 /**
@@ -34,7 +35,7 @@ let disconnectGroup = null;
  * Play some UI effects (sound, animation) when disposing of a block.
  * @param {!BlockSvg} block The block being disposed of.
  */
-function disposeUiEffect(block) {
+const disposeUiEffect = function(block) {
   const workspace = block.workspace;
   const svgGroup = block.getSvgRoot();
   workspace.getAudioManager().play('delete');
@@ -49,7 +50,7 @@ function disposeUiEffect(block) {
   clone.bBox_ = clone.getBBox();
   // Start the animation.
   disposeUiStep(clone, workspace.RTL, new Date, workspace.scale);
-}
+};
 /** @package */
 exports.disposeUiEffect = disposeUiEffect;
 
@@ -62,7 +63,7 @@ exports.disposeUiEffect = disposeUiEffect;
  * @param {!Date} start Date of animation's start.
  * @param {number} workspaceScale Scale of workspace.
  */
-function disposeUiStep(clone, rtl, start, workspaceScale) {
+const disposeUiStep = function(clone, rtl, start, workspaceScale) {
   const ms = new Date - start;
   const percent = ms / 150;
   if (percent > 1) {
@@ -78,13 +79,13 @@ function disposeUiStep(clone, rtl, start, workspaceScale) {
             ' scale(' + scale + ')');
     setTimeout(disposeUiStep, 10, clone, rtl, start, workspaceScale);
   }
-}
+};
 
 /**
  * Play some UI effects (sound, ripple) after a connection has been established.
  * @param {!BlockSvg} block The block being connected.
  */
-function connectionUiEffect(block) {
+const connectionUiEffect = function(block) {
   const workspace = block.workspace;
   const scale = workspace.scale;
   workspace.getAudioManager().play('click');
@@ -113,7 +114,7 @@ function connectionUiEffect(block) {
       workspace.getParentSvg());
   // Start the animation.
   connectionUiStep(ripple, new Date, scale);
-}
+};
 /** @package */
 exports.connectionUiEffect = connectionUiEffect;
 
@@ -123,7 +124,7 @@ exports.connectionUiEffect = connectionUiEffect;
  * @param {!Date} start Date of animation's start.
  * @param {number} scale Scale of workspace.
  */
-function connectionUiStep(ripple, start, scale) {
+const connectionUiStep = function(ripple, start, scale) {
   const ms = new Date - start;
   const percent = ms / 150;
   if (percent > 1) {
@@ -133,13 +134,13 @@ function connectionUiStep(ripple, start, scale) {
     ripple.style.opacity = 1 - percent;
     disconnectPid = setTimeout(connectionUiStep, 10, ripple, start, scale);
   }
-}
+};
 
 /**
  * Play some UI effects (sound, animation) when disconnecting a block.
  * @param {!BlockSvg} block The block being disconnected.
  */
-function disconnectUiEffect(block) {
+const disconnectUiEffect = function(block) {
   block.workspace.getAudioManager().play('disconnect');
   if (block.workspace.scale < 1) {
     return;  // Too small to care about visual effects.
@@ -154,7 +155,7 @@ function disconnectUiEffect(block) {
   }
   // Start the animation.
   disconnectUiStep(block.getSvgRoot(), magnitude, new Date);
-}
+};
 /** @package */
 exports.disconnectUiEffect = disconnectUiEffect;
 
@@ -164,7 +165,7 @@ exports.disconnectUiEffect = disconnectUiEffect;
  * @param {number} magnitude Maximum degrees skew (reversed for RTL).
  * @param {!Date} start Date of animation's start.
  */
-function disconnectUiStep(group, magnitude, start) {
+const disconnectUiStep = function(group, magnitude, start) {
   const DURATION = 200;  // Milliseconds.
   const WIGGLES = 3;     // Half oscillations.
 
@@ -181,12 +182,12 @@ function disconnectUiStep(group, magnitude, start) {
     disconnectPid = setTimeout(disconnectUiStep, 10, group, magnitude, start);
   }
   group.setAttribute('transform', group.translate_ + group.skew_);
-}
+};
 
 /**
  * Stop the disconnect UI animation immediately.
  */
-function disconnectUiStop() {
+const disconnectUiStop = function() {
   if (disconnectGroup) {
     clearTimeout(disconnectPid);
     const group = disconnectGroup;
@@ -194,6 +195,6 @@ function disconnectUiStop() {
     group.setAttribute('transform', group.translate_);
     disconnectGroup = null;
   }
-}
+};
 /** @package */
 exports.disconnectUiStop = disconnectUiStop;
diff --git a/core/block_drag_surface.js b/core/block_drag_surface.js
index 69b7a5ca5..2b911ef09 100644
--- a/core/block_drag_surface.js
+++ b/core/block_drag_surface.js
@@ -20,8 +20,8 @@ goog.module.declareLegacyNamespace();
 
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const {G, SVG} = goog.require('Blockly.utils.Svg');
-const {getRelativeXY} = goog.require('Blockly.utils');
 const {createSvgElement, HTML_NS, setCssTransform, SVG_NS, XLINK_NS} = goog.require('Blockly.utils.dom');
+const {getRelativeXY} = goog.require('Blockly.utils');
 
 
 /**
diff --git a/core/bubble_dragger.js b/core/bubble_dragger.js
index 3a6d36331..d06c2fdc0 100644
--- a/core/bubble_dragger.js
+++ b/core/bubble_dragger.js
@@ -13,21 +13,26 @@
 goog.module('Blockly.BubbleDragger');
 goog.module.declareLegacyNamespace();
 
+/* 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');
 const Events = goog.require('Blockly.Events');
+/* 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');
-const utils = goog.require('Blockly.utils');
+/* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Bubble');
 /** @suppress {extraRequire} */
-goog.require('Blockly.constants');
-/** @suppress {extraRequire} */
 goog.require('Blockly.Events.CommentMove');
+/** @suppress {extraRequire} */
+goog.require('Blockly.constants');
 
 
 /**
diff --git a/core/comment.js b/core/comment.js
index 7f4085faf..99d81e89c 100644
--- a/core/comment.js
+++ b/core/comment.js
@@ -13,16 +13,22 @@
 goog.module('Blockly.Comment');
 goog.module.declareLegacyNamespace();
 
+/* 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 Bubble = goog.require('Blockly.Bubble');
+/* eslint-disable-next-line no-unused-vars */
 const Coordinate = goog.requireType('Blockly.utils.Coordinate');
 const Events = goog.require('Blockly.Events');
 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 userAgent = goog.require('Blockly.utils.userAgent');
+/* eslint-disable-next-line no-unused-vars */
 const {conditionalBind, Data, unbind} = goog.require('Blockly.browserEvents');
 const {createSvgElement, HTML_NS} = goog.require('Blockly.utils.dom');
 const {inherits} = goog.require('Blockly.utils.object');
diff --git a/core/component_manager.js b/core/component_manager.js
index 31b661e8a..ad2370bd6 100644
--- a/core/component_manager.js
+++ b/core/component_manager.js
@@ -14,10 +14,15 @@
 goog.module('Blockly.ComponentManager');
 goog.module.declareLegacyNamespace();
 
+/* 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');
 
 
diff --git a/core/connection.js b/core/connection.js
index 553938825..f272b59e0 100644
--- a/core/connection.js
+++ b/core/connection.js
@@ -13,14 +13,18 @@
 goog.module('Blockly.Connection');
 goog.module.declareLegacyNamespace();
 
-const connectionTypes = goog.require('Blockly.connectionTypes');
+/* eslint-disable-next-line no-unused-vars */
 const Block = goog.requireType('Blockly.Block');
-const deprecation = goog.require('Blockly.utils.deprecation');
 const Events = goog.require('Blockly.Events');
+/* 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 connectionTypes = goog.require('Blockly.connectionTypes');
+const deprecation = goog.require('Blockly.utils.deprecation');
 /** @suppress {extraRequire} */
 goog.require('Blockly.constants');
 /** @suppress {extraRequire} */
diff --git a/core/connection_checker.js b/core/connection_checker.js
index 4bd7bd4e2..12c6418db 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -15,7 +15,9 @@ goog.module('Blockly.ConnectionChecker');
 goog.module.declareLegacyNamespace();
 
 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 connectionTypes = goog.require('Blockly.connectionTypes');
 const registry = goog.require('Blockly.registry');
diff --git a/core/connection_db.js b/core/connection_db.js
index 49bccb504..d3bc0507d 100644
--- a/core/connection_db.js
+++ b/core/connection_db.js
@@ -15,8 +15,11 @@
 goog.module('Blockly.ConnectionDB');
 goog.module.declareLegacyNamespace();
 
+/* 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.require('Blockly.RenderedConnection');
 const connectionTypes = goog.require('Blockly.connectionTypes');
 /** @suppress {extraRequire} */
diff --git a/core/css.js b/core/css.js
index 52228b4fb..6f34e6c0d 100644
--- a/core/css.js
+++ b/core/css.js
@@ -39,6 +39,7 @@ const register = function(cssArray) {
   Array.prototype.push.apply(CONTENT, cssArray);
   cssArray.length = 0;  // Garbage collect provided CSS content.
 };
+exports.register = register;
 
 /**
  * Inject the CSS into the DOM.  This is preferable over using a regular CSS
@@ -72,6 +73,7 @@ const inject = function(hasCss, pathToMedia) {
   cssNode.appendChild(cssTextNode);
   document.head.insertBefore(cssNode, document.head.firstChild);
 };
+exports.inject = inject;
 
 /**
  * Array making up the CSS content for Blockly.
@@ -553,9 +555,4 @@ const CONTENT = [
   margin-right: -24px;
 }`,
 ];
-
-exports = {
-  register,
-  inject,
-  CONTENT
-};
+exports.CONTENT = CONTENT;
diff --git a/core/extensions.js b/core/extensions.js
index c73737c43..3f20777aa 100644
--- a/core/extensions.js
+++ b/core/extensions.js
@@ -20,6 +20,7 @@
 goog.module('Blockly.Extensions');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const Block = goog.requireType('Blockly.Block');
 const {checkMessageReferences, replaceMessageReferences, runAfterPageLoad} = goog.require('Blockly.utils');
 
@@ -29,6 +30,7 @@ const {checkMessageReferences, replaceMessageReferences, runAfterPageLoad} = goo
  * @private
  */
 const allExtensions = Object.create(null);
+exports.ALL_ = allExtensions;
 
 /**
  * Registers a new extension function. Extensions are functions that help
@@ -52,6 +54,7 @@ const register = function(name, initFn) {
   }
   allExtensions[name] = initFn;
 };
+exports.register = register;
 
 /**
  * Registers a new extension function that adds all key/value of mixinObj.
@@ -68,6 +71,7 @@ const registerMixin = function(name, mixinObj) {
     this.mixin(mixinObj);
   });
 };
+exports.registerMixin = registerMixin;
 
 /**
  * Registers a new extension function that adds a mutator to the block.
@@ -111,6 +115,7 @@ const registerMutator = function(name, mixinObj, opt_helperFn, opt_blockList) {
     }
   });
 };
+exports.registerMutator = registerMutator;
 
 /**
  * Unregisters the extension registered with the given name.
@@ -124,6 +129,7 @@ const unregister = function(name) {
         'No extension mapping for name "' + name + '" found to unregister');
   }
 };
+exports.unregister = unregister;
 
 /**
  * Applies an extension method to a block. This should only be called during
@@ -161,6 +167,7 @@ const apply = function(name, block, isMutator) {
     }
   }
 };
+exports.apply = apply;
 
 /**
  * Check that the given value is a function.
@@ -366,6 +373,7 @@ const buildTooltipForDropdown = function(dropdownName, lookupTable) {
   };
   return extensionFn;
 };
+exports.buildTooltipForDropdown = buildTooltipForDropdown;
 
 /**
  * Checks all options keys are present in the provided string lookup table.
@@ -425,6 +433,7 @@ const buildTooltipWithFieldText = function(msgTemplate, fieldName) {
   };
   return extensionFn;
 };
+exports.buildTooltipWithFieldText = buildTooltipWithFieldText;
 
 /**
  * Configures the tooltip to mimic the parent block when connected. Otherwise,
@@ -443,14 +452,3 @@ const extensionParentTooltip = function() {
   }.bind(this));
 };
 register('parent_tooltip_when_inline', extensionParentTooltip);
-
-exports = {
-  ALL_: allExtensions,
-  register,
-  registerMixin,
-  registerMutator,
-  unregister,
-  apply,
-  buildTooltipForDropdown,
-  buildTooltipWithFieldText
-};
diff --git a/core/interfaces/i_ast_node_location_svg.js b/core/interfaces/i_ast_node_location_svg.js
index 5b58d4abc..526fbffa3 100644
--- a/core/interfaces/i_ast_node_location_svg.js
+++ b/core/interfaces/i_ast_node_location_svg.js
@@ -14,6 +14,7 @@
 goog.module('Blockly.IASTNodeLocationSvg');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation');
 
 
diff --git a/core/interfaces/i_ast_node_location_with_block.js b/core/interfaces/i_ast_node_location_with_block.js
index 58da7a902..002db0ad8 100644
--- a/core/interfaces/i_ast_node_location_with_block.js
+++ b/core/interfaces/i_ast_node_location_with_block.js
@@ -15,7 +15,9 @@
 goog.module('Blockly.IASTNodeLocationWithBlock');
 goog.module.declareLegacyNamespace();
 
+/* 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');
 
 
diff --git a/core/interfaces/i_autohideable.js b/core/interfaces/i_autohideable.js
index bf11adc01..0ccbf310a 100644
--- a/core/interfaces/i_autohideable.js
+++ b/core/interfaces/i_autohideable.js
@@ -15,6 +15,7 @@
 goog.module('Blockly.IAutoHideable');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const IComponent = goog.require('Blockly.IComponent');
 
 
diff --git a/core/interfaces/i_block_dragger.js b/core/interfaces/i_block_dragger.js
index ebfc820ba..b87cd9865 100644
--- a/core/interfaces/i_block_dragger.js
+++ b/core/interfaces/i_block_dragger.js
@@ -14,7 +14,9 @@
 goog.module('Blockly.IBlockDragger');
 goog.module.declareLegacyNamespace();
 
+/* 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');
 
 
diff --git a/core/interfaces/i_bounded_element.js b/core/interfaces/i_bounded_element.js
index 461d52ca1..f2c84633e 100644
--- a/core/interfaces/i_bounded_element.js
+++ b/core/interfaces/i_bounded_element.js
@@ -14,6 +14,7 @@
 goog.module('Blockly.IBoundedElement');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const Rect = goog.requireType('Blockly.utils.Rect');
 
 
diff --git a/core/interfaces/i_bubble.js b/core/interfaces/i_bubble.js
index e41a1bf25..b6e9736d7 100644
--- a/core/interfaces/i_bubble.js
+++ b/core/interfaces/i_bubble.js
@@ -14,9 +14,13 @@
 goog.module('Blockly.IBubble');
 goog.module.declareLegacyNamespace();
 
+/* 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');
 
 
diff --git a/core/interfaces/i_connection_checker.js b/core/interfaces/i_connection_checker.js
index 03693604c..d0eb21e24 100644
--- a/core/interfaces/i_connection_checker.js
+++ b/core/interfaces/i_connection_checker.js
@@ -14,7 +14,9 @@
 goog.module('Blockly.IConnectionChecker');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const Connection = goog.requireType('Blockly.Connection');
+/* eslint-disable-next-line no-unused-vars */
 const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 
 
diff --git a/core/interfaces/i_copyable.js b/core/interfaces/i_copyable.js
index 07556eb23..87b776600 100644
--- a/core/interfaces/i_copyable.js
+++ b/core/interfaces/i_copyable.js
@@ -14,7 +14,9 @@
 goog.module('Blockly.ICopyable');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const ISelectable = goog.requireType('Blockly.ISelectable');
+/* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 
 
diff --git a/core/interfaces/i_delete_area.js b/core/interfaces/i_delete_area.js
index 5c5cbd380..845d7dddb 100644
--- a/core/interfaces/i_delete_area.js
+++ b/core/interfaces/i_delete_area.js
@@ -15,7 +15,9 @@
 goog.module('Blockly.IDeleteArea');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const IDraggable = goog.requireType('Blockly.IDraggable');
+/* eslint-disable-next-line no-unused-vars */
 const IDragTarget = goog.require('Blockly.IDragTarget');
 
 
diff --git a/core/interfaces/i_drag_target.js b/core/interfaces/i_drag_target.js
index 803bcbc74..6b777781d 100644
--- a/core/interfaces/i_drag_target.js
+++ b/core/interfaces/i_drag_target.js
@@ -15,8 +15,11 @@
 goog.module('Blockly.IDragTarget');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const IComponent = goog.require('Blockly.IComponent');
+/* eslint-disable-next-line no-unused-vars */
 const IDraggable = goog.requireType('Blockly.IDraggable');
+/* eslint-disable-next-line no-unused-vars */
 const Rect = goog.requireType('Blockly.utils.Rect');
 
 
diff --git a/core/interfaces/i_draggable.js b/core/interfaces/i_draggable.js
index 81303a24b..5d7e17d53 100644
--- a/core/interfaces/i_draggable.js
+++ b/core/interfaces/i_draggable.js
@@ -14,6 +14,7 @@
 goog.module('Blockly.IDraggable');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const IDeletable = goog.require('Blockly.IDeletable');
 
 
diff --git a/core/interfaces/i_flyout.js b/core/interfaces/i_flyout.js
index b9b1c8e15..23c76dd0b 100644
--- a/core/interfaces/i_flyout.js
+++ b/core/interfaces/i_flyout.js
@@ -14,11 +14,17 @@
 goog.module('Blockly.IFlyout');
 goog.module.declareLegacyNamespace();
 
+/* 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');
+/* eslint-disable-next-line no-unused-vars */
 const {FlyoutDefinition} = goog.requireType('Blockly.utils.toolbox');
 
 
diff --git a/core/interfaces/i_keyboard_accessible.js b/core/interfaces/i_keyboard_accessible.js
index 8f21153da..8243e67d1 100644
--- a/core/interfaces/i_keyboard_accessible.js
+++ b/core/interfaces/i_keyboard_accessible.js
@@ -14,6 +14,7 @@
 goog.module('Blockly.IKeyboardAccessible');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const {KeyboardShortcut} = goog.requireType('Blockly.ShortcutRegistry');
 
 
diff --git a/core/interfaces/i_positionable.js b/core/interfaces/i_positionable.js
index ed324196b..1fe773add 100644
--- a/core/interfaces/i_positionable.js
+++ b/core/interfaces/i_positionable.js
@@ -14,8 +14,11 @@
 goog.module('Blockly.IPositionable');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const IComponent = goog.require('Blockly.IComponent');
+/* eslint-disable-next-line no-unused-vars */
 const Rect = goog.requireType('Blockly.utils.Rect');
+/* eslint-disable-next-line no-unused-vars */
 const {UiMetrics} = goog.requireType('Blockly.MetricsManager');
 
 
diff --git a/core/interfaces/i_toolbox.js b/core/interfaces/i_toolbox.js
index 5ecd0a69f..0c7e7deb3 100644
--- a/core/interfaces/i_toolbox.js
+++ b/core/interfaces/i_toolbox.js
@@ -14,10 +14,15 @@
 goog.module('Blockly.IToolbox');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const IFlyout = goog.requireType('Blockly.IFlyout');
+/* eslint-disable-next-line no-unused-vars */
 const IRegistrable = goog.require('Blockly.IRegistrable');
+/* eslint-disable-next-line no-unused-vars */
 const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
+/* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+/* eslint-disable-next-line no-unused-vars */
 const {ToolboxInfo} = goog.requireType('Blockly.utils.toolbox');
 
 
diff --git a/core/renderers/common/drawer.js b/core/renderers/common/drawer.js
index 9504695a2..2dde92d3f 100644
--- a/core/renderers/common/drawer.js
+++ b/core/renderers/common/drawer.js
@@ -13,15 +13,22 @@
 goog.module('Blockly.blockRendering.Drawer');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.blockRendering.Field');
+/* eslint-disable-next-line no-unused-vars */
 const Icon = goog.requireType('Blockly.blockRendering.Icon');
+/* eslint-disable-next-line no-unused-vars */
 const InlineInput = goog.requireType('Blockly.blockRendering.InlineInput');
+/* eslint-disable-next-line no-unused-vars */
 const RenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
+/* eslint-disable-next-line no-unused-vars */
 const Row = goog.require('Blockly.blockRendering.Row');
-const svgPaths = goog.require('Blockly.utils.svgPaths');
 const Types = goog.require('Blockly.blockRendering.Types');
+const svgPaths = goog.require('Blockly.utils.svgPaths');
 
 
 /**
diff --git a/core/utils/colour.js b/core/utils/colour.js
index 7b2c978f4..29ba0187c 100644
--- a/core/utils/colour.js
+++ b/core/utils/colour.js
@@ -60,6 +60,7 @@ const parse = function(str) {
   }
   return null;
 };
+exports.parse = parse;
 
 /**
  * Converts a colour from RGB to hex representation.
@@ -75,6 +76,7 @@ const rgbToHex = function(r, g, b) {
   }
   return '#' + rgb.toString(16);
 };
+exports.rgbToHex = rgbToHex;
 
 /**
  * Converts a colour to RGB.
@@ -95,6 +97,7 @@ const hexToRgb = function(colour) {
 
   return [r, g, b];
 };
+exports.hexToRgb = hexToRgb;
 
 /**
  * Converts an HSV triplet to hex representation.
@@ -153,6 +156,7 @@ const hsvToHex = function(h, s, v) {
   }
   return rgbToHex(Math.floor(red), Math.floor(green), Math.floor(blue));
 };
+exports.hsvToHex = hsvToHex;
 
 /**
  * Blend two colours together, using the specified factor to indicate the
@@ -179,6 +183,7 @@ const blend = function(colour1, colour2, factor) {
   const b = Math.round(rgb2[2] + factor * (rgb1[2] - rgb2[2]));
   return rgbToHex(r, g, b);
 };
+exports.blend = blend;
 
 /**
  * A map that contains the 16 basic colour keywords as defined by W3C:
@@ -206,12 +211,4 @@ const names = {
   'white': '#ffffff',
   'yellow': '#ffff00'
 };
-
-exports = {
-  parse,
-  rgbToHex,
-  hexToRgb,
-  hsvToHex,
-  blend,
-  names
-};
+exports.names = names;
diff --git a/core/utils/deprecation.js b/core/utils/deprecation.js
index ad798b1ab..870294172 100644
--- a/core/utils/deprecation.js
+++ b/core/utils/deprecation.js
@@ -28,7 +28,6 @@ goog.module.declareLegacyNamespace();
  *     deprecation date.
  * @param {string=} opt_use The name of a function or property to use instead,
  *     if any.
- * @package
  */
 const warn = function(name, deprecationDate, deletionDate, opt_use) {
   let msg = name + ' was deprecated on ' + deprecationDate +
@@ -38,5 +37,5 @@ const warn = function(name, deprecationDate, deletionDate, opt_use) {
   }
   console.warn(msg);
 };
-
-exports = {warn};
+/** @package */
+exports.warn = warn;
diff --git a/core/utils/idgenerator.js b/core/utils/idgenerator.js
index 6ad7bcf55..537dfde2b 100644
--- a/core/utils/idgenerator.js
+++ b/core/utils/idgenerator.js
@@ -23,7 +23,6 @@ goog.module.declareLegacyNamespace();
 /**
  * Next unique ID to use.
  * @type {number}
- * @private
  */
 let nextId = 0;
 
@@ -36,5 +35,4 @@ let nextId = 0;
 const getNextUniqueId = function() {
   return 'blockly-' + (nextId++).toString(36);
 };
-
-exports = {getNextUniqueId};
+exports.getNextUniqueId = getNextUniqueId;
diff --git a/core/utils/math.js b/core/utils/math.js
index dade91c21..9b717d065 100644
--- a/core/utils/math.js
+++ b/core/utils/math.js
@@ -29,6 +29,7 @@ goog.module.declareLegacyNamespace();
 const toRadians = function(angleDegrees) {
   return angleDegrees * Math.PI / 180;
 };
+exports.toRadians = toRadians;
 
 /**
  * Converts radians to degrees.
@@ -39,6 +40,7 @@ const toRadians = function(angleDegrees) {
 const toDegrees = function(angleRadians) {
   return angleRadians * 180 / Math.PI;
 };
+exports.toDegrees = toDegrees;
 
 /**
  * Clamp the provided number between the lower bound and the upper bound.
@@ -55,9 +57,4 @@ const clamp = function(lowerBound, number, upperBound) {
   }
   return Math.max(lowerBound, Math.min(number, upperBound));
 };
-
-exports = {
-  toRadians,
-  toDegrees,
-  clamp
-};
+exports.clamp = clamp;
diff --git a/core/utils/object.js b/core/utils/object.js
index dae55ec51..3507d33ab 100644
--- a/core/utils/object.js
+++ b/core/utils/object.js
@@ -40,6 +40,7 @@ const inherits = function(childCtor, parentCtor) {
   // Alternatively, one could use this instead:
   // Object.setPrototypeOf(childCtor.prototype, parentCtor.prototype);
 };
+exports.inherits = inherits;
 
 /**
  * Copies all the members of a source object to a target object.
@@ -51,6 +52,7 @@ const mixin = function(target, source) {
     target[x] = source[x];
   }
 };
+exports.mixin = mixin;
 
 /**
  * Complete a deep merge of all members of a source object with a target object.
@@ -68,6 +70,7 @@ const deepMerge = function(target, source) {
   }
   return target;
 };
+exports.deepMerge = deepMerge;
 
 /**
  * Returns an array of a given object's own enumerable property values.
@@ -83,10 +86,4 @@ const values = function(obj) {
     return obj[e];
   });
 };
-
-exports = {
-  inherits,
-  mixin,
-  deepMerge,
-  values,
-};
+exports.values = values;
diff --git a/core/utils/style.js b/core/utils/style.js
index 1fcfbdd62..0fbd22093 100644
--- a/core/utils/style.js
+++ b/core/utils/style.js
@@ -29,7 +29,7 @@ const Size = goog.require('Blockly.utils.Size');
  * @param {!Element} element Element to get size of.
  * @return {!Size} Object with width/height properties.
  */
-function getSize(element) {
+const getSize = function(element) {
   if (getStyle(element, 'display') != 'none') {
     return getSizeWithDisplay(element);
   }
@@ -52,7 +52,7 @@ function getSize(element) {
   style.visibility = originalVisibility;
 
   return new Size(offsetWidth, offsetHeight);
-}
+};
 exports.getSize = getSize;
 
 /**
@@ -60,11 +60,11 @@ exports.getSize = getSize;
  * @param {!Element} element Element to get size of.
  * @return {!Size} Object with width/height properties.
  */
-function getSizeWithDisplay(element) {
+const getSizeWithDisplay = function(element) {
   const offsetWidth = /** @type {!HTMLElement} */ (element).offsetWidth;
   const offsetHeight = /** @type {!HTMLElement} */ (element).offsetHeight;
   return new Size(offsetWidth, offsetHeight);
-}
+};
 
 /**
  * Cross-browser pseudo get computed style. It returns the computed style where
@@ -79,10 +79,10 @@ function getSizeWithDisplay(element) {
  * @param {string} style Property to get (must be camelCase, not CSS-style).
  * @return {string} Style value.
  */
-function getStyle(element, style) {
+const getStyle = function(element, style) {
   return getComputedStyle(element, style) || getCascadedStyle(element, style) ||
       (element.style && element.style[style]);
-}
+};
 
 /**
  * Retrieves a computed style value of a node. It returns empty string if the
@@ -96,7 +96,7 @@ function getStyle(element, style) {
  * @param {string} property Property to get (camel-case).
  * @return {string} Style value.
  */
-function getComputedStyle(element, property) {
+const getComputedStyle = function(element, property) {
   if (document.defaultView && document.defaultView.getComputedStyle) {
     const styles = document.defaultView.getComputedStyle(element, null);
     if (styles) {
@@ -107,7 +107,7 @@ function getComputedStyle(element, property) {
   }
 
   return '';
-}
+};
 exports.getComputedStyle = getComputedStyle;
 
 /**
@@ -120,10 +120,10 @@ exports.getComputedStyle = getComputedStyle;
  * @param {string} style Property to get (camel-case).
  * @return {string} Style value.
  */
-function getCascadedStyle(element, style) {
+const getCascadedStyle = function(element, style) {
   return /** @type {string} */ (
       element.currentStyle ? element.currentStyle[style] : null);
-}
+};
 exports.getCascadedStyle = getCascadedStyle;
 
 /**
@@ -132,7 +132,7 @@ exports.getCascadedStyle = getCascadedStyle;
  * @param {!Element} el Element to get the page offset for.
  * @return {!Coordinate} The page offset.
  */
-function getPageOffset(el) {
+const getPageOffset = function(el) {
   const pos = new Coordinate(0, 0);
   const box = el.getBoundingClientRect();
   const documentElement = document.documentElement;
@@ -146,7 +146,7 @@ function getPageOffset(el) {
   pos.y = box.top + scrollCoord.y;
 
   return pos;
-}
+};
 exports.getPageOffset = getPageOffset;
 
 /**
@@ -154,13 +154,13 @@ exports.getPageOffset = getPageOffset;
  * Similar to Closure's goog.style.getViewportPageOffset
  * @return {!Coordinate} The page offset of the viewport.
  */
-function getViewportPageOffset() {
+const getViewportPageOffset = function() {
   const body = document.body;
   const documentElement = document.documentElement;
   const scrollLeft = body.scrollLeft || documentElement.scrollLeft;
   const scrollTop = body.scrollTop || documentElement.scrollTop;
   return new Coordinate(scrollLeft, scrollTop);
-}
+};
 exports.getViewportPageOffset = getViewportPageOffset;
 
 /**
@@ -175,9 +175,9 @@ exports.getViewportPageOffset = getViewportPageOffset;
  * @param {*} isShown True to render the element in its default style,
  *     false to disable rendering the element.
  */
-function setElementShown(el, isShown) {
+const setElementShown = function(el, isShown) {
   el.style.display = isShown ? '' : 'none';
-}
+};
 exports.setElementShown = setElementShown;
 
 /**
@@ -187,9 +187,9 @@ exports.setElementShown = setElementShown;
  * @param {!Element} el The element to test.
  * @return {boolean} True for right to left, false for left to right.
  */
-function isRightToLeft(el) {
+const isRightToLeft = function(el) {
   return 'rtl' == getStyle(el, 'direction');
-}
+};
 exports.isRightToLeft = isRightToLeft;
 
 /**
@@ -198,7 +198,7 @@ exports.isRightToLeft = isRightToLeft;
  * @param {!Element} element  The element to get the border widths for.
  * @return {!Object} The computed border widths.
  */
-function getBorderBox(element) {
+const getBorderBox = function(element) {
   const left = getComputedStyle(element, 'borderLeftWidth');
   const right = getComputedStyle(element, 'borderRightWidth');
   const top = getComputedStyle(element, 'borderTopWidth');
@@ -210,7 +210,7 @@ function getBorderBox(element) {
     bottom: parseFloat(bottom),
     left: parseFloat(left)
   };
-}
+};
 exports.getBorderBox = getBorderBox;
 
 /**
@@ -226,11 +226,11 @@ exports.getBorderBox = getBorderBox;
  * @param {boolean=} opt_center Whether to center the element in the container.
  *     Defaults to false.
  */
-function scrollIntoContainerView(element, container, opt_center) {
+const scrollIntoContainerView = function(element, container, opt_center) {
   const offset = getContainerOffsetToScrollInto(element, container, opt_center);
   container.scrollLeft = offset.x;
   container.scrollTop = offset.y;
-}
+};
 exports.scrollIntoContainerView = scrollIntoContainerView;
 
 /**
@@ -248,7 +248,7 @@ exports.scrollIntoContainerView = scrollIntoContainerView;
  * @return {!Coordinate} The new scroll position of the container,
  *     in form of goog.math.Coordinate(scrollLeft, scrollTop).
  */
-function getContainerOffsetToScrollInto(element, container, opt_center) {
+const getContainerOffsetToScrollInto = function(element, container, opt_center) {
   // Absolute position of the element's border's top left corner.
   const elementPos = getPageOffset(element);
   // Absolute position of the container's border's top left corner.
@@ -281,5 +281,5 @@ function getContainerOffsetToScrollInto(element, container, opt_center) {
     scrollTop += Math.min(relY, Math.max(relY - spaceY, 0));
   }
   return new Coordinate(scrollLeft, scrollTop);
-}
+};
 exports.getContainerOffsetToScrollInto = getContainerOffsetToScrollInto;
diff --git a/core/utils/svg_paths.js b/core/utils/svg_paths.js
index 02602e4ac..7286e8bc6 100644
--- a/core/utils/svg_paths.js
+++ b/core/utils/svg_paths.js
@@ -27,11 +27,11 @@ goog.module.declareLegacyNamespace();
  * @param {number} x The x coordinate.
  * @param {number} y The y coordinate.
  * @return {string} A string of the format ' x,y '
- * @public
  */
 const point = function(x, y) {
   return ' ' + x + ',' + y + ' ';
 };
+exports.point = point;
 
 /**
  * Draw a cubic or quadratic curve.  See
@@ -44,11 +44,11 @@ const point = function(x, y) {
  *     the format ' x, y '.
  * @return {string} A string defining one or more Bezier curves.  See the MDN
  *     documentation for exact format.
- * @public
  */
 const curve = function(command, points) {
   return ' ' + command + points.join('');
 };
+exports.curve = curve;
 
 /**
  * Move the cursor to the given position without drawing a line.
@@ -58,11 +58,11 @@ const curve = function(command, points) {
  * @param {number} x The absolute x coordinate.
  * @param {number} y The absolute y coordinate.
  * @return {string} A string of the format ' M x,y '
- * @public
  */
 const moveTo = function(x, y) {
   return ' M ' + x + ',' + y + ' ';
 };
+exports.moveTo = moveTo;
 
 /**
  * Move the cursor to the given position without drawing a line.
@@ -72,11 +72,11 @@ const moveTo = function(x, y) {
  * @param {number} dx The relative x coordinate.
  * @param {number} dy The relative y coordinate.
  * @return {string} A string of the format ' m dx,dy '
- * @public
  */
 const moveBy = function(dx, dy) {
   return ' m ' + dx + ',' + dy + ' ';
 };
+exports.moveBy = moveBy;
 
 /**
  * Draw a line from the current point to the end point, which is the current
@@ -86,11 +86,11 @@ const moveBy = function(dx, dy) {
  * @param {number} dx The relative x coordinate.
  * @param {number} dy The relative y coordinate.
  * @return {string} A string of the format ' l dx,dy '
- * @public
  */
 const lineTo = function(dx, dy) {
   return ' l ' + dx + ',' + dy + ' ';
 };
+exports.lineTo = lineTo;
 
 /**
  * Draw multiple lines connecting all of the given points in order.  This is
@@ -101,11 +101,11 @@ const lineTo = function(dx, dy) {
  *     draw lines to, in order.  The points are represented as strings of the
  *     format ' dx,dy '.
  * @return {string} A string of the format ' l (dx,dy)+ '
- * @public
  */
 const line = function(points) {
   return ' l' + points.join('');
 };
+exports.line = line;
 
 /**
  * Draw a horizontal or vertical line.
@@ -118,11 +118,11 @@ const line = function(points) {
  * @param {number} val The coordinate to pass to the command.  It may be
  *     absolute or relative.
  * @return {string} A string of the format ' command val '
- * @public
  */
 const lineOnAxis = function(command, val) {
   return ' ' + command + ' ' + val + ' ';
 };
+exports.lineOnAxis = lineOnAxis;
 
 /**
  * Draw an elliptical arc curve.
@@ -136,19 +136,8 @@ const lineOnAxis = function(command, val) {
  *     specified either in absolute or relative coordinates depending on the
  *     command.
  * @return {string} A string of the format 'command radius radius flags point'
- * @public
  */
 const arc = function(command, flags, radius, point) {
   return command + ' ' + radius + ' ' + radius + ' ' + flags + point;
 };
-
-exports = {
-  point,
-  curve,
-  moveTo,
-  moveBy,
-  lineTo,
-  line,
-  lineOnAxis,
-  arc,
-};
+exports.arc = arc;
diff --git a/core/utils/toolbox.js b/core/utils/toolbox.js
index aab51d826..6dabc1fd5 100644
--- a/core/utils/toolbox.js
+++ b/core/utils/toolbox.js
@@ -18,11 +18,11 @@ goog.module('Blockly.utils.toolbox');
 goog.module.declareLegacyNamespace();
 
 const userAgent = goog.require('Blockly.utils.userAgent');
-const {textToDom} = goog.require('Blockly.Xml');
-
+/* eslint-disable-next-line no-unused-vars */
 const {CssConfig: CategoryCssConfig} = goog.requireType('Blockly.ToolboxCategory');
+/* eslint-disable-next-line no-unused-vars */
 const {CssConfig: SeparatorCssConfig} = goog.requireType('Blockly.ToolboxSeparator');
-
+const {textToDom} = goog.require('Blockly.Xml');
 
 /**
  * The information needed to create a block in the toolbox.
@@ -35,6 +35,7 @@ const {CssConfig: SeparatorCssConfig} = goog.requireType('Blockly.ToolboxSeparat
  *          }}
  */
 let BlockInfo;
+exports.BlockInfo = BlockInfo;
 
 /**
  * The information needed to create a separator in the toolbox.
@@ -46,6 +47,7 @@ let BlockInfo;
  *          }}
  */
 let SeparatorInfo;
+exports.SeparatorInfo = SeparatorInfo;
 
 /**
  * The information needed to create a button in the toolbox.
@@ -56,6 +58,7 @@ let SeparatorInfo;
  *          }}
  */
 let ButtonInfo;
+exports.ButtonInfo = ButtonInfo;
 
 /**
  * The information needed to create a label in the toolbox.
@@ -66,6 +69,7 @@ let ButtonInfo;
  *          }}
  */
 let LabelInfo;
+exports.LabelInfo = LabelInfo;
 
 /**
  * The information needed to create either a button or a label in the flyout.
@@ -73,6 +77,7 @@ let LabelInfo;
  *           LabelInfo}
  */
 let ButtonOrLabelInfo;
+exports.ButtonOrLabelInfo = ButtonOrLabelInfo;
 
 /**
  * The information needed to create a category in the toolbox.
@@ -88,6 +93,7 @@ let ButtonOrLabelInfo;
  *          }}
  */
 let StaticCategoryInfo;
+exports.StaticCategoryInfo = StaticCategoryInfo;
 
 /**
  * The information needed to create a custom category.
@@ -102,6 +108,7 @@ let StaticCategoryInfo;
  *          }}
  */
 let DynamicCategoryInfo;
+exports.DynamicCategoryInfo = DynamicCategoryInfo;
 
 /**
  * The information needed to create either a dynamic or static category.
@@ -109,6 +116,7 @@ let DynamicCategoryInfo;
  *           DynamicCategoryInfo}
  */
 let CategoryInfo;
+exports.CategoryInfo = CategoryInfo;
 
 /**
  * Any information that can be used to create an item in the toolbox.
@@ -116,6 +124,7 @@ let CategoryInfo;
  *           StaticCategoryInfo}
  */
 let ToolboxItemInfo;
+exports.ToolboxItemInfo = ToolboxItemInfo;
 
 /**
  * All the different types that can be displayed in a flyout.
@@ -126,6 +135,7 @@ let ToolboxItemInfo;
  *           DynamicCategoryInfo}
  */
 let FlyoutItemInfo;
+exports.FlyoutItemInfo = FlyoutItemInfo;
 
 /**
  * The JSON definition of a toolbox.
@@ -135,6 +145,7 @@ let FlyoutItemInfo;
  *          }}
  */
 let ToolboxInfo;
+exports.ToolboxInfo = ToolboxInfo;
 
 /**
  * An array holding flyout items.
@@ -143,6 +154,7 @@ let ToolboxInfo;
  *          }
  */
 let FlyoutItemInfoArray;
+exports.FlyoutItemInfoArray = FlyoutItemInfoArray;
 
 /**
  * All of the different types that can create a toolbox.
@@ -151,6 +163,7 @@ let FlyoutItemInfoArray;
  *           string}
  */
 let ToolboxDefinition;
+exports.ToolboxDefinition = ToolboxDefinition;
 
 /**
  * All of the different types that can be used to show items in a flyout.
@@ -160,6 +173,7 @@ let ToolboxDefinition;
  *           Array<!Node>}
  */
 let FlyoutDefinition;
+exports.FlyoutDefinition = FlyoutDefinition;
 
 /**
  * The name used to identify a toolbox that has category like items.
@@ -187,6 +201,7 @@ const Position = {
   LEFT: 2,
   RIGHT: 3
 };
+exports.Position = Position;
 
 /**
  * Converts the toolbox definition into toolbox JSON.
@@ -194,7 +209,6 @@ const Position = {
  *     of the toolbox in one of its many forms.
  * @return {?ToolboxInfo} Object holding information
  *     for creating a toolbox.
- * @package
  */
 const convertToolboxDefToJson = function(toolboxDef) {
   if (!toolboxDef) {
@@ -210,13 +224,14 @@ const convertToolboxDefToJson = function(toolboxDef) {
   validateToolbox(toolboxJson);
   return toolboxJson;
 };
+/** @package */
+exports.convertToolboxDefToJson = convertToolboxDefToJson;
 
 /**
  * Validates the toolbox JSON fields have been set correctly.
  * @param {!ToolboxInfo} toolboxJson Object holding
  *     information for creating a toolbox.
  * @throws {Error} if the toolbox is not the correct format.
- * @private
  */
 const validateToolbox = function(toolboxJson) {
   const toolboxKind = toolboxJson['kind'];
@@ -241,7 +256,6 @@ const validateToolbox = function(toolboxJson) {
  * @param {?FlyoutDefinition} flyoutDef The definition of
  *    the flyout in one of its many forms.
  * @return {!FlyoutItemInfoArray} A list of flyout items.
- * @package
  */
 const convertFlyoutDefToJsonArray = function(flyoutDef) {
   if (!flyoutDef) {
@@ -260,13 +274,14 @@ const convertFlyoutDefToJsonArray = function(flyoutDef) {
 
   return xmlToJsonArray(/** @type {!Array<Node>|!NodeList} */ (flyoutDef));
 };
+/** @package */
+exports.convertFlyoutDefToJsonArray = convertFlyoutDefToJsonArray;
 
 /**
  * Whether or not the toolbox definition has categories.
  * @param {?ToolboxInfo} toolboxJson Object holding
  *     information for creating a toolbox.
  * @return {boolean} True if the toolbox has categories.
- * @package
  */
 const hasCategories = function(toolboxJson) {
   if (!toolboxJson) {
@@ -283,13 +298,14 @@ const hasCategories = function(toolboxJson) {
   });
   return !!categories.length;
 };
+/** @package */
+exports.hasCategories = hasCategories;
 
 /**
  * Whether or not the category is collapsible.
  * @param {!CategoryInfo} categoryInfo Object holing
  *    information for creating a category.
  * @return {boolean} True if the category has subcategories.
- * @package
  */
 const isCategoryCollapsible = function(categoryInfo) {
   if (!categoryInfo || !categoryInfo['contents']) {
@@ -301,6 +317,8 @@ const isCategoryCollapsible = function(categoryInfo) {
   });
   return !!categories.length;
 };
+/** @package */
+exports.isCategoryCollapsible = isCategoryCollapsible;
 
 /**
  * Parses the provided toolbox definition into a consistent format.
@@ -308,7 +326,6 @@ const isCategoryCollapsible = function(categoryInfo) {
  *     forms.
  * @return {!ToolboxInfo} Object holding information
  *     for creating a toolbox.
- * @private
  */
 const convertToToolboxJson = function(toolboxDef) {
   const contents = xmlToJsonArray(
@@ -327,7 +344,6 @@ const convertToToolboxJson = function(toolboxDef) {
  * @return {!FlyoutItemInfoArray|
  *          !Array<ToolboxItemInfo>} A list of objects in
  *          the toolbox.
- * @private
  */
 const xmlToJsonArray = function(toolboxDef) {
   const arr = [];
@@ -364,7 +380,6 @@ const xmlToJsonArray = function(toolboxDef) {
  * Adds the attributes on the node to the given object.
  * @param {!Node} node The node to copy the attributes from.
  * @param {!Object} obj The object to copy the attributes to.
- * @private
  */
 const addAttributes = function(node, obj) {
   for (let j = 0; j < node.attributes.length; j++) {
@@ -408,26 +423,4 @@ const parseToolboxTree = function(toolboxDef) {
   }
   return toolboxDef;
 };
-
-exports = {
-  BlockInfo,
-  SeparatorInfo,
-  ButtonInfo,
-  LabelInfo,
-  ButtonOrLabelInfo,
-  StaticCategoryInfo,
-  DynamicCategoryInfo,
-  CategoryInfo,
-  ToolboxItemInfo,
-  FlyoutItemInfo,
-  ToolboxInfo,
-  FlyoutItemInfoArray,
-  ToolboxDefinition,
-  FlyoutDefinition,
-  Position,
-  convertToolboxDefToJson,
-  convertFlyoutDefToJsonArray,
-  hasCategories,
-  isCategoryCollapsible,
-  parseToolboxTree
-};
+exports.parseToolboxTree = parseToolboxTree;

From 94bdd1850582ef4332c76f3f9c486fba9c48367b Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 08:23:17 -0700
Subject: [PATCH 183/833] Migrate core/field_number.js to ES6 const/let

---
 core/field_number.js | 10 +++++-----
 tests/deps.js        |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/field_number.js b/core/field_number.js
index 369a161f8..d45c790cd 100644
--- a/core/field_number.js
+++ b/core/field_number.js
@@ -225,14 +225,14 @@ Blockly.FieldNumber.prototype.setPrecision = function(precision) {
  */
 Blockly.FieldNumber.prototype.setPrecisionInternal_ = function(precision) {
   this.precision_ = Number(precision) || 0;
-  var precisionString = String(this.precision_);
+  let precisionString = String(this.precision_);
   if (precisionString.indexOf('e') != -1) {
     // String() is fast.  But it turns .0000001 into '1e-7'.
     // Use the much slower toLocaleString to access all the digits.
     precisionString =
         this.precision_.toLocaleString('en-US', {maximumFractionDigits: 20});
   }
-  var decimalIndex = precisionString.indexOf('.');
+  const decimalIndex = precisionString.indexOf('.');
   if (decimalIndex == -1) {
     // If the precision is 0 (float) allow any number of decimals,
     // otherwise allow none.
@@ -265,7 +265,7 @@ Blockly.FieldNumber.prototype.doClassValidation_ = function(opt_newValue) {
     return null;
   }
   // Clean up text.
-  var newValue = String(opt_newValue);
+  let newValue = String(opt_newValue);
   // TODO: Handle cases like 'ten', '1.203,14', etc.
   // 'O' is sometimes mistaken for '0' by inexperienced users.
   newValue = newValue.replace(/O/ig, '0');
@@ -275,7 +275,7 @@ Blockly.FieldNumber.prototype.doClassValidation_ = function(opt_newValue) {
   newValue = newValue.replace(/infinity/i, 'Infinity');
 
   // Clean up number.
-  var n = Number(newValue || 0);
+  let n = Number(newValue || 0);
   if (isNaN(n)) {
     // Invalid number.
     return null;
@@ -300,7 +300,7 @@ Blockly.FieldNumber.prototype.doClassValidation_ = function(opt_newValue) {
  * @override
  */
 Blockly.FieldNumber.prototype.widgetCreate_ = function() {
-  var htmlInput = Blockly.FieldNumber.superClass_.widgetCreate_.call(this);
+  const htmlInput = Blockly.FieldNumber.superClass_.widgetCreate_.call(this);
 
   // Set the accessibility state
   if (this.min_ > -Infinity) {
diff --git a/tests/deps.js b/tests/deps.js
index 979c58c74..5485014dd 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -57,7 +57,7 @@ goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockl
 goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabelSerializable'], ['Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.object']);
 goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es5'});
-goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object']);
+goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object'], {'lang': 'es6'});
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry']);
 goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object']);

From 0a1311c9b5002d8edd568eb24f8e203743b699f2 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 08:26:41 -0700
Subject: [PATCH 184/833] Migrate core/field_number.js to goog.module

---
 core/field_number.js | 51 +++++++++++++++++++++++---------------------
 tests/deps.js        |  2 +-
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/core/field_number.js b/core/field_number.js
index d45c790cd..67900f344 100644
--- a/core/field_number.js
+++ b/core/field_number.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.FieldNumber');
+goog.module('Blockly.FieldNumber');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.fieldRegistry');
 goog.require('Blockly.FieldTextInput');
@@ -34,7 +35,7 @@ goog.require('Blockly.utils.object');
  * @extends {Blockly.FieldTextInput}
  * @constructor
  */
-Blockly.FieldNumber = function(opt_value, opt_min, opt_max, opt_precision,
+const FieldNumber = function(opt_value, opt_min, opt_max, opt_precision,
     opt_validator, opt_config) {
 
   /**
@@ -66,31 +67,31 @@ Blockly.FieldNumber = function(opt_value, opt_min, opt_max, opt_precision,
    */
   this.decimalPlaces_ = null;
 
-  Blockly.FieldNumber.superClass_.constructor.call(
+  FieldNumber.superClass_.constructor.call(
       this, opt_value, opt_validator, opt_config);
 
   if (!opt_config) {  // Only do one kind of configuration or the other.
     this.setConstraints(opt_min, opt_max, opt_precision);
   }
 };
-Blockly.utils.object.inherits(Blockly.FieldNumber, Blockly.FieldTextInput);
+Blockly.utils.object.inherits(FieldNumber, Blockly.FieldTextInput);
 
 /**
  * The default value for this field.
  * @type {*}
  * @protected
  */
-Blockly.FieldNumber.prototype.DEFAULT_VALUE = 0;
+FieldNumber.prototype.DEFAULT_VALUE = 0;
 
 /**
  * Construct a FieldNumber from a JSON arg object.
  * @param {!Object} options A JSON object with options (value, min, max, and
  *                          precision).
- * @return {!Blockly.FieldNumber} The new field instance.
+ * @return {!FieldNumber} The new field instance.
  * @package
  * @nocollapse
  */
-Blockly.FieldNumber.fromJson = function(options) {
+FieldNumber.fromJson = function(options) {
   // `this` might be a subclass of FieldNumber if that class doesn't override
   // the static fromJson method.
   return new this(options['value'],
@@ -102,7 +103,7 @@ Blockly.FieldNumber.fromJson = function(options) {
  * are not. Editable fields should also be serializable.
  * @type {boolean}
  */
-Blockly.FieldNumber.prototype.SERIALIZABLE = true;
+FieldNumber.prototype.SERIALIZABLE = true;
 
 /**
  * Configure the field based on the given map of options.
@@ -110,8 +111,8 @@ Blockly.FieldNumber.prototype.SERIALIZABLE = true;
  * @protected
  * @override
  */
-Blockly.FieldNumber.prototype.configure_ = function(config) {
-  Blockly.FieldNumber.superClass_.configure_.call(this, config);
+FieldNumber.prototype.configure_ = function(config) {
+  FieldNumber.superClass_.configure_.call(this, config);
   this.setMinInternal_(config['min']);
   this.setMaxInternal_(config['max']);
   this.setPrecisionInternal_(config['precision']);
@@ -128,7 +129,7 @@ Blockly.FieldNumber.prototype.configure_ = function(config) {
  * @param {?(number|string|undefined)} max Maximum value.
  * @param {?(number|string|undefined)} precision Precision for value.
  */
-Blockly.FieldNumber.prototype.setConstraints = function(min, max, precision) {
+FieldNumber.prototype.setConstraints = function(min, max, precision) {
   this.setMinInternal_(min);
   this.setMaxInternal_(max);
   this.setPrecisionInternal_(precision);
@@ -139,7 +140,7 @@ Blockly.FieldNumber.prototype.setConstraints = function(min, max, precision) {
  * Sets the minimum value this field can contain. Updates the value to reflect.
  * @param {?(number|string|undefined)} min Minimum value.
  */
-Blockly.FieldNumber.prototype.setMin = function(min) {
+FieldNumber.prototype.setMin = function(min) {
   this.setMinInternal_(min);
   this.setValue(this.getValue());
 };
@@ -150,7 +151,7 @@ Blockly.FieldNumber.prototype.setMin = function(min) {
  * @param {?(number|string|undefined)} min Minimum value.
  * @private
  */
-Blockly.FieldNumber.prototype.setMinInternal_ = function(min) {
+FieldNumber.prototype.setMinInternal_ = function(min) {
   if (min == null) {
     this.min_ = -Infinity;
   } else {
@@ -166,7 +167,7 @@ Blockly.FieldNumber.prototype.setMinInternal_ = function(min) {
  * -Infinity.
  * @return {number} The current minimum value this field can contain.
  */
-Blockly.FieldNumber.prototype.getMin = function() {
+FieldNumber.prototype.getMin = function() {
   return this.min_;
 };
 
@@ -174,7 +175,7 @@ Blockly.FieldNumber.prototype.getMin = function() {
  * Sets the maximum value this field can contain. Updates the value to reflect.
  * @param {?(number|string|undefined)} max Maximum value.
  */
-Blockly.FieldNumber.prototype.setMax = function(max) {
+FieldNumber.prototype.setMax = function(max) {
   this.setMaxInternal_(max);
   this.setValue(this.getValue());
 };
@@ -185,7 +186,7 @@ Blockly.FieldNumber.prototype.setMax = function(max) {
  * @param {?(number|string|undefined)} max Maximum value.
  * @private
  */
-Blockly.FieldNumber.prototype.setMaxInternal_ = function(max) {
+FieldNumber.prototype.setMaxInternal_ = function(max) {
   if (max == null) {
     this.max_ = Infinity;
   } else {
@@ -201,7 +202,7 @@ Blockly.FieldNumber.prototype.setMaxInternal_ = function(max) {
  * Infinity.
  * @return {number} The current maximum value this field can contain.
  */
-Blockly.FieldNumber.prototype.getMax = function() {
+FieldNumber.prototype.getMax = function() {
   return this.max_;
 };
 
@@ -211,7 +212,7 @@ Blockly.FieldNumber.prototype.getMax = function() {
  * @param {?(number|string|undefined)} precision The number to which the
  *    field's value is rounded.
  */
-Blockly.FieldNumber.prototype.setPrecision = function(precision) {
+FieldNumber.prototype.setPrecision = function(precision) {
   this.setPrecisionInternal_(precision);
   this.setValue(this.getValue());
 };
@@ -223,7 +224,7 @@ Blockly.FieldNumber.prototype.setPrecision = function(precision) {
  *    field's value is rounded.
  * @private
  */
-Blockly.FieldNumber.prototype.setPrecisionInternal_ = function(precision) {
+FieldNumber.prototype.setPrecisionInternal_ = function(precision) {
   this.precision_ = Number(precision) || 0;
   let precisionString = String(this.precision_);
   if (precisionString.indexOf('e') != -1) {
@@ -248,7 +249,7 @@ Blockly.FieldNumber.prototype.setPrecisionInternal_ = function(precision) {
  * the value is not rounded.
  * @return {number} The number to which this field's value is rounded.
  */
-Blockly.FieldNumber.prototype.getPrecision = function() {
+FieldNumber.prototype.getPrecision = function() {
   return this.precision_;
 };
 
@@ -260,7 +261,7 @@ Blockly.FieldNumber.prototype.getPrecision = function() {
  * @protected
  * @override
  */
-Blockly.FieldNumber.prototype.doClassValidation_ = function(opt_newValue) {
+FieldNumber.prototype.doClassValidation_ = function(opt_newValue) {
   if (opt_newValue === null) {
     return null;
   }
@@ -299,8 +300,8 @@ Blockly.FieldNumber.prototype.doClassValidation_ = function(opt_newValue) {
  * @protected
  * @override
  */
-Blockly.FieldNumber.prototype.widgetCreate_ = function() {
-  const htmlInput = Blockly.FieldNumber.superClass_.widgetCreate_.call(this);
+FieldNumber.prototype.widgetCreate_ = function() {
+  const htmlInput = FieldNumber.superClass_.widgetCreate_.call(this);
 
   // Set the accessibility state
   if (this.min_ > -Infinity) {
@@ -314,4 +315,6 @@ Blockly.FieldNumber.prototype.widgetCreate_ = function() {
   return htmlInput;
 };
 
-Blockly.fieldRegistry.register('field_number', Blockly.FieldNumber);
+Blockly.fieldRegistry.register('field_number', FieldNumber);
+
+exports = FieldNumber;
diff --git a/tests/deps.js b/tests/deps.js
index 5485014dd..80ddf87c8 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -57,7 +57,7 @@ goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockl
 goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabelSerializable'], ['Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.object']);
 goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es5'});
-goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object'], {'lang': 'es6'});
+goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry']);
 goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object']);

From 25fc34925f194c3c703cb9b4c7945e34950f1b34 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 08:31:39 -0700
Subject: [PATCH 185/833] Migrate core/field_number.js to named requires

---
 core/field_number.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/field_number.js b/core/field_number.js
index 67900f344..e8d628572 100644
--- a/core/field_number.js
+++ b/core/field_number.js
@@ -13,10 +13,10 @@
 goog.module('Blockly.FieldNumber');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.fieldRegistry');
-goog.require('Blockly.FieldTextInput');
-goog.require('Blockly.utils.aria');
-goog.require('Blockly.utils.object');
+const FieldTextInput = goog.require('Blockly.FieldTextInput');
+const aria = goog.require('Blockly.utils.aria');
+const {inherits} = goog.require('Blockly.utils.object');
+const {register} = goog.require('Blockly.fieldRegistry');
 
 
 /**
@@ -32,7 +32,7 @@ goog.require('Blockly.utils.object');
  * @param {Object=} opt_config A map of options used to configure the field.
  *    See the [field creation documentation]{@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/number#creation}
  *    for a list of properties this parameter supports.
- * @extends {Blockly.FieldTextInput}
+ * @extends {FieldTextInput}
  * @constructor
  */
 const FieldNumber = function(opt_value, opt_min, opt_max, opt_precision,
@@ -74,7 +74,7 @@ const FieldNumber = function(opt_value, opt_min, opt_max, opt_precision,
     this.setConstraints(opt_min, opt_max, opt_precision);
   }
 };
-Blockly.utils.object.inherits(FieldNumber, Blockly.FieldTextInput);
+inherits(FieldNumber, FieldTextInput);
 
 /**
  * The default value for this field.
@@ -305,16 +305,16 @@ FieldNumber.prototype.widgetCreate_ = function() {
 
   // Set the accessibility state
   if (this.min_ > -Infinity) {
-    Blockly.utils.aria.setState(htmlInput,
-        Blockly.utils.aria.State.VALUEMIN, this.min_);
+    aria.setState(htmlInput,
+        aria.State.VALUEMIN, this.min_);
   }
   if (this.max_ < Infinity) {
-    Blockly.utils.aria.setState(htmlInput,
-        Blockly.utils.aria.State.VALUEMAX, this.max_);
+    aria.setState(htmlInput,
+        aria.State.VALUEMAX, this.max_);
   }
   return htmlInput;
 };
 
-Blockly.fieldRegistry.register('field_number', FieldNumber);
+register('field_number', FieldNumber);
 
 exports = FieldNumber;

From e15470bbd0f7ca74e0452dba8606fe2344e1539b Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 08:32:09 -0700
Subject: [PATCH 186/833] clang-format core/field_number.js

---
 core/field_number.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/core/field_number.js b/core/field_number.js
index e8d628572..8389f477f 100644
--- a/core/field_number.js
+++ b/core/field_number.js
@@ -30,14 +30,14 @@ const {register} = goog.require('Blockly.fieldRegistry');
  *    changes to the field's value. Takes in a number & returns a validated
  *    number, or null to abort the change.
  * @param {Object=} opt_config A map of options used to configure the field.
- *    See the [field creation documentation]{@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/number#creation}
+ *    See the [field creation documentation]{@link
+ * https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/number#creation}
  *    for a list of properties this parameter supports.
  * @extends {FieldTextInput}
  * @constructor
  */
-const FieldNumber = function(opt_value, opt_min, opt_max, opt_precision,
-    opt_validator, opt_config) {
-
+const FieldNumber = function(
+    opt_value, opt_min, opt_max, opt_precision, opt_validator, opt_config) {
   /**
    * The minimum value this number field can contain.
    * @type {number}
@@ -94,8 +94,8 @@ FieldNumber.prototype.DEFAULT_VALUE = 0;
 FieldNumber.fromJson = function(options) {
   // `this` might be a subclass of FieldNumber if that class doesn't override
   // the static fromJson method.
-  return new this(options['value'],
-      undefined, undefined, undefined, undefined, options);
+  return new this(
+      options['value'], undefined, undefined, undefined, undefined, options);
 };
 
 /**
@@ -305,12 +305,10 @@ FieldNumber.prototype.widgetCreate_ = function() {
 
   // Set the accessibility state
   if (this.min_ > -Infinity) {
-    aria.setState(htmlInput,
-        aria.State.VALUEMIN, this.min_);
+    aria.setState(htmlInput, aria.State.VALUEMIN, this.min_);
   }
   if (this.max_ < Infinity) {
-    aria.setState(htmlInput,
-        aria.State.VALUEMAX, this.max_);
+    aria.setState(htmlInput, aria.State.VALUEMAX, this.max_);
   }
   return htmlInput;
 };

From 7a050d021db8d56f2c64a139678c7659ff739e23 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 08:43:46 -0700
Subject: [PATCH 187/833] Migrate core/field_checkbox.js to goog.module

---
 core/field_checkbox.js | 55 ++++++++++++++++++++++--------------------
 tests/deps.js          |  2 +-
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/core/field_checkbox.js b/core/field_checkbox.js
index 207b29f7f..df3509239 100644
--- a/core/field_checkbox.js
+++ b/core/field_checkbox.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.FieldCheckbox');
+goog.module('Blockly.FieldCheckbox');
+goog.module.declareLegacyNamespace();
 
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
@@ -34,7 +35,7 @@ goog.require('Blockly.utils.object');
  * @extends {Blockly.Field}
  * @constructor
  */
-Blockly.FieldCheckbox = function(opt_value, opt_validator, opt_config) {
+const FieldCheckbox = function(opt_value, opt_validator, opt_config) {
   /**
    * Character for the check mark. Used to apply a different check mark
    * character to individual fields.
@@ -43,26 +44,26 @@ Blockly.FieldCheckbox = function(opt_value, opt_validator, opt_config) {
    */
   this.checkChar_ = null;
 
-  Blockly.FieldCheckbox.superClass_.constructor.call(
+  FieldCheckbox.superClass_.constructor.call(
       this, opt_value, opt_validator, opt_config);
 };
-Blockly.utils.object.inherits(Blockly.FieldCheckbox, Blockly.Field);
+Blockly.utils.object.inherits(FieldCheckbox, Blockly.Field);
 
 /**
  * The default value for this field.
  * @type {*}
  * @protected
  */
-Blockly.FieldCheckbox.prototype.DEFAULT_VALUE = false;
+FieldCheckbox.prototype.DEFAULT_VALUE = false;
 
 /**
  * Construct a FieldCheckbox from a JSON arg object.
  * @param {!Object} options A JSON object with options (checked).
- * @return {!Blockly.FieldCheckbox} The new field instance.
+ * @return {!FieldCheckbox} The new field instance.
  * @package
  * @nocollapse
  */
-Blockly.FieldCheckbox.fromJson = function(options) {
+FieldCheckbox.fromJson = function(options) {
   // `this` might be a subclass of FieldCheckbox if that class doesn't override
   // the static fromJson method.
   return new this(options['checked'], undefined, options);
@@ -73,19 +74,19 @@ Blockly.FieldCheckbox.fromJson = function(options) {
  * @type {string}
  * @const
  */
-Blockly.FieldCheckbox.CHECK_CHAR = '\u2713';
+FieldCheckbox.CHECK_CHAR = '\u2713';
 
 /**
  * Serializable fields are saved by the XML renderer, non-serializable fields
  * are not. Editable fields should also be serializable.
  * @type {boolean}
  */
-Blockly.FieldCheckbox.prototype.SERIALIZABLE = true;
+FieldCheckbox.prototype.SERIALIZABLE = true;
 
 /**
  * Mouse cursor style when over the hotspot that initiates editability.
  */
-Blockly.FieldCheckbox.prototype.CURSOR = 'default';
+FieldCheckbox.prototype.CURSOR = 'default';
 
 /**
  * Configure the field based on the given map of options.
@@ -93,8 +94,8 @@ Blockly.FieldCheckbox.prototype.CURSOR = 'default';
  * @protected
  * @override
  */
-Blockly.FieldCheckbox.prototype.configure_ = function(config) {
-  Blockly.FieldCheckbox.superClass_.configure_.call(this, config);
+FieldCheckbox.prototype.configure_ = function(config) {
+  FieldCheckbox.superClass_.configure_.call(this, config);
   if (config['checkCharacter']) {
     this.checkChar_ = config['checkCharacter'];
   }
@@ -104,8 +105,8 @@ Blockly.FieldCheckbox.prototype.configure_ = function(config) {
  * Create the block UI for this checkbox.
  * @package
  */
-Blockly.FieldCheckbox.prototype.initView = function() {
-  Blockly.FieldCheckbox.superClass_.initView.call(this);
+FieldCheckbox.prototype.initView = function() {
+  FieldCheckbox.superClass_.initView.call(this);
 
   Blockly.utils.dom.addClass(
       /** @type {!SVGTextElement} **/ (this.textElement_), 'blocklyCheckbox');
@@ -115,7 +116,7 @@ Blockly.FieldCheckbox.prototype.initView = function() {
 /**
  * @override
  */
-Blockly.FieldCheckbox.prototype.render_ = function() {
+FieldCheckbox.prototype.render_ = function() {
   if (this.textContent_) {
     this.textContent_.nodeValue = this.getDisplayText_();
   }
@@ -125,8 +126,8 @@ Blockly.FieldCheckbox.prototype.render_ = function() {
 /**
  * @override
  */
-Blockly.FieldCheckbox.prototype.getDisplayText_ = function() {
-  return this.checkChar_ || Blockly.FieldCheckbox.CHECK_CHAR;
+FieldCheckbox.prototype.getDisplayText_ = function() {
+  return this.checkChar_ || FieldCheckbox.CHECK_CHAR;
 };
 
 /**
@@ -134,7 +135,7 @@ Blockly.FieldCheckbox.prototype.getDisplayText_ = function() {
  * @param {?string} character The character to use for the check mark, or
  *    null to use the default.
  */
-Blockly.FieldCheckbox.prototype.setCheckCharacter = function(character) {
+FieldCheckbox.prototype.setCheckCharacter = function(character) {
   this.checkChar_ = character;
   this.forceRerender();
 };
@@ -143,7 +144,7 @@ Blockly.FieldCheckbox.prototype.setCheckCharacter = function(character) {
  * Toggle the state of the checkbox on click.
  * @protected
  */
-Blockly.FieldCheckbox.prototype.showEditor_ = function() {
+FieldCheckbox.prototype.showEditor_ = function() {
   this.setValue(!this.value_);
 };
 
@@ -153,7 +154,7 @@ Blockly.FieldCheckbox.prototype.showEditor_ = function() {
  * @return {?string} A valid value ('TRUE' or 'FALSE), or null if invalid.
  * @protected
  */
-Blockly.FieldCheckbox.prototype.doClassValidation_ = function(opt_newValue) {
+FieldCheckbox.prototype.doClassValidation_ = function(opt_newValue) {
   if (opt_newValue === true || opt_newValue === 'TRUE') {
     return 'TRUE';
   }
@@ -169,7 +170,7 @@ Blockly.FieldCheckbox.prototype.doClassValidation_ = function(opt_newValue) {
  * that this is a either 'TRUE' or 'FALSE'.
  * @protected
  */
-Blockly.FieldCheckbox.prototype.doValueUpdate_ = function(newValue) {
+FieldCheckbox.prototype.doValueUpdate_ = function(newValue) {
   this.value_ = this.convertValueToBool_(newValue);
   // Update visual.
   if (this.textElement_) {
@@ -181,7 +182,7 @@ Blockly.FieldCheckbox.prototype.doValueUpdate_ = function(newValue) {
  * Get the value of this field, either 'TRUE' or 'FALSE'.
  * @return {string} The value of this field.
  */
-Blockly.FieldCheckbox.prototype.getValue = function() {
+FieldCheckbox.prototype.getValue = function() {
   return this.value_ ? 'TRUE' : 'FALSE';
 };
 
@@ -189,7 +190,7 @@ Blockly.FieldCheckbox.prototype.getValue = function() {
  * Get the boolean value of this field.
  * @return {boolean} The boolean value of this field.
  */
-Blockly.FieldCheckbox.prototype.getValueBoolean = function() {
+FieldCheckbox.prototype.getValueBoolean = function() {
   return /** @type {boolean} */ (this.value_);
 };
 
@@ -198,7 +199,7 @@ Blockly.FieldCheckbox.prototype.getValueBoolean = function() {
  * @return {string} Text representing the value of this field
  *    ('true' or 'false').
  */
-Blockly.FieldCheckbox.prototype.getText = function() {
+FieldCheckbox.prototype.getText = function() {
   return String(this.convertValueToBool_(this.value_));
 };
 
@@ -211,7 +212,7 @@ Blockly.FieldCheckbox.prototype.getText = function() {
  * @return {boolean} The converted value.
  * @private
  */
-Blockly.FieldCheckbox.prototype.convertValueToBool_ = function(value) {
+FieldCheckbox.prototype.convertValueToBool_ = function(value) {
   if (typeof value == 'string') {
     return value == 'TRUE';
   } else {
@@ -219,4 +220,6 @@ Blockly.FieldCheckbox.prototype.convertValueToBool_ = function(value) {
   }
 };
 
-Blockly.fieldRegistry.register('field_checkbox', Blockly.FieldCheckbox);
+Blockly.fieldRegistry.register('field_checkbox', FieldCheckbox);
+
+exports = FieldCheckbox;
diff --git a/tests/deps.js b/tests/deps.js
index 979c58c74..d6e6163f8 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -50,7 +50,7 @@ goog.addDependency('../../core/events/ws_comment_events.js', ['Blockly.Events.Co
 goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible', 'Blockly.IRegistrable', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es5'});
 goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.IdGenerator', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['Blockly.DropDownDiv', 'Blockly.Field', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);

From 29135ec920d974b1eb170b44f59b19a6194de19d Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 08:47:44 -0700
Subject: [PATCH 188/833] Migrate core/field_checkbox.js to named requires

---
 core/field_checkbox.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/field_checkbox.js b/core/field_checkbox.js
index df3509239..9100aa8d3 100644
--- a/core/field_checkbox.js
+++ b/core/field_checkbox.js
@@ -13,12 +13,12 @@
 goog.module('Blockly.FieldCheckbox');
 goog.module.declareLegacyNamespace();
 
+const Field = goog.require('Blockly.Field');
+const {addClass} = goog.require('Blockly.utils.dom');
+const {inherits} = goog.require('Blockly.utils.object');
+const {register} = goog.require('Blockly.fieldRegistry');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
-goog.require('Blockly.Field');
-goog.require('Blockly.fieldRegistry');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
 
 
 /**
@@ -32,7 +32,7 @@ goog.require('Blockly.utils.object');
  * @param {Object=} opt_config A map of options used to configure the field.
  *    See the [field creation documentation]{@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/checkbox#creation}
  *    for a list of properties this parameter supports.
- * @extends {Blockly.Field}
+ * @extends {Field}
  * @constructor
  */
 const FieldCheckbox = function(opt_value, opt_validator, opt_config) {
@@ -47,7 +47,7 @@ const FieldCheckbox = function(opt_value, opt_validator, opt_config) {
   FieldCheckbox.superClass_.constructor.call(
       this, opt_value, opt_validator, opt_config);
 };
-Blockly.utils.object.inherits(FieldCheckbox, Blockly.Field);
+inherits(FieldCheckbox, Field);
 
 /**
  * The default value for this field.
@@ -108,7 +108,7 @@ FieldCheckbox.prototype.configure_ = function(config) {
 FieldCheckbox.prototype.initView = function() {
   FieldCheckbox.superClass_.initView.call(this);
 
-  Blockly.utils.dom.addClass(
+  addClass(
       /** @type {!SVGTextElement} **/ (this.textElement_), 'blocklyCheckbox');
   this.textElement_.style.display = this.value_ ? 'block' : 'none';
 };
@@ -220,6 +220,6 @@ FieldCheckbox.prototype.convertValueToBool_ = function(value) {
   }
 };
 
-Blockly.fieldRegistry.register('field_checkbox', FieldCheckbox);
+register('field_checkbox', FieldCheckbox);
 
 exports = FieldCheckbox;

From 5bc41ac960588334e0af831754f58a92ae264ab4 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 08:48:43 -0700
Subject: [PATCH 189/833] clang-format core/field_checkbox.js

---
 core/field_checkbox.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/field_checkbox.js b/core/field_checkbox.js
index 9100aa8d3..3cbe8d07f 100644
--- a/core/field_checkbox.js
+++ b/core/field_checkbox.js
@@ -30,7 +30,8 @@ goog.require('Blockly.Events.BlockChange');
  *    returns a validated value ('TRUE' or 'FALSE'), or null to abort the
  *    change.
  * @param {Object=} opt_config A map of options used to configure the field.
- *    See the [field creation documentation]{@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/checkbox#creation}
+ *    See the [field creation documentation]{@link
+ *    https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/checkbox#creation}
  *    for a list of properties this parameter supports.
  * @extends {Field}
  * @constructor

From 9d6cbe96d3df420984b23f2fb02ea57722691962 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 20 Jul 2021 16:45:30 -0700
Subject: [PATCH 190/833] Migrate core/keyboard_nav/tab_navigate_cursor.js to
 ES6 const/let

---
 core/keyboard_nav/tab_navigate_cursor.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/keyboard_nav/tab_navigate_cursor.js b/core/keyboard_nav/tab_navigate_cursor.js
index 7d43a79f8..b339520c0 100644
--- a/core/keyboard_nav/tab_navigate_cursor.js
+++ b/core/keyboard_nav/tab_navigate_cursor.js
@@ -37,10 +37,10 @@ Blockly.utils.object.inherits(Blockly.TabNavigateCursor, Blockly.BasicCursor);
  * @override
  */
 Blockly.TabNavigateCursor.prototype.validNode_ = function(node) {
-  var isValid = false;
-  var type = node && node.getType();
+  let isValid = false;
+  const type = node && node.getType();
   if (node) {
-    var location = /** @type {Blockly.Field} */ (node.getLocation());
+    const location = /** @type {Blockly.Field} */ (node.getLocation());
     if (type == Blockly.ASTNode.types.FIELD &&
         location && location.isTabNavigable() && location.isClickable()) {
       isValid = true;

From f282c573239970143e4d92eb6933cff82086e914 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 20 Jul 2021 16:45:55 -0700
Subject: [PATCH 191/833] Migrate core/keyboard_nav/tab_navigate_cursor.js to
 goog.module

---
 core/keyboard_nav/tab_navigate_cursor.js | 13 ++++++++-----
 tests/deps.js                            |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/core/keyboard_nav/tab_navigate_cursor.js b/core/keyboard_nav/tab_navigate_cursor.js
index b339520c0..ad2bb45ba 100644
--- a/core/keyboard_nav/tab_navigate_cursor.js
+++ b/core/keyboard_nav/tab_navigate_cursor.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.TabNavigateCursor');
+goog.module('Blockly.TabNavigateCursor');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.ASTNode');
 goog.require('Blockly.BasicCursor');
@@ -25,10 +26,10 @@ goog.requireType('Blockly.Field');
  * @constructor
  * @extends {Blockly.BasicCursor}
  */
-Blockly.TabNavigateCursor = function() {
-  Blockly.TabNavigateCursor.superClass_.constructor.call(this);
+const TabNavigateCursor = function() {
+  TabNavigateCursor.superClass_.constructor.call(this);
 };
-Blockly.utils.object.inherits(Blockly.TabNavigateCursor, Blockly.BasicCursor);
+Blockly.utils.object.inherits(TabNavigateCursor, Blockly.BasicCursor);
 
 /**
  * Skip all nodes except for tab navigable fields.
@@ -36,7 +37,7 @@ Blockly.utils.object.inherits(Blockly.TabNavigateCursor, Blockly.BasicCursor);
  * @return {boolean} True if the node should be visited, false otherwise.
  * @override
  */
-Blockly.TabNavigateCursor.prototype.validNode_ = function(node) {
+TabNavigateCursor.prototype.validNode_ = function(node) {
   let isValid = false;
   const type = node && node.getType();
   if (node) {
@@ -48,3 +49,5 @@ Blockly.TabNavigateCursor.prototype.validNode_ = function(node) {
   }
   return isValid;
 };
+
+exports = TabNavigateCursor;
diff --git a/tests/deps.js b/tests/deps.js
index 979c58c74..0c03cecf3 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -105,7 +105,7 @@ goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], [
 goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], ['Blockly.ASTNode']);
-goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object']);
+goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], ['Blockly.Cursor', 'Blockly.Marker']);
 goog.addDependency('../../core/menu.js', ['Blockly.Menu'], ['Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.style']);
 goog.addDependency('../../core/menuitem.js', ['Blockly.MenuItem'], ['Blockly.utils.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom']);

From 9a6a92bf52d748bd36c82250e9c023a0084e550e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 20 Jul 2021 16:47:25 -0700
Subject: [PATCH 192/833] Migrate core/keyboard_nav/tab_navigate_cursor.js
 named requires

---
 core/keyboard_nav/tab_navigate_cursor.js | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/core/keyboard_nav/tab_navigate_cursor.js b/core/keyboard_nav/tab_navigate_cursor.js
index ad2bb45ba..37f90fe37 100644
--- a/core/keyboard_nav/tab_navigate_cursor.js
+++ b/core/keyboard_nav/tab_navigate_cursor.js
@@ -14,26 +14,25 @@
 goog.module('Blockly.TabNavigateCursor');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.ASTNode');
-goog.require('Blockly.BasicCursor');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.Field');
+const ASTNode = goog.require('Blockly.ASTNode');
+const BasicCursor = goog.require('Blockly.BasicCursor');
+const Field = goog.requireType('Blockly.Field');
+const {inherits} = goog.require('Blockly.utils.object');
 
 
 /**
  * A cursor for navigating between tab navigable fields.
  * @constructor
- * @extends {Blockly.BasicCursor}
+ * @extends {BasicCursor}
  */
 const TabNavigateCursor = function() {
   TabNavigateCursor.superClass_.constructor.call(this);
 };
-Blockly.utils.object.inherits(TabNavigateCursor, Blockly.BasicCursor);
+inherits(TabNavigateCursor, BasicCursor);
 
 /**
  * Skip all nodes except for tab navigable fields.
- * @param {Blockly.ASTNode} node The AST node to check whether it is valid.
+ * @param {?ASTNode} node The AST node to check whether it is valid.
  * @return {boolean} True if the node should be visited, false otherwise.
  * @override
  */
@@ -41,8 +40,8 @@ TabNavigateCursor.prototype.validNode_ = function(node) {
   let isValid = false;
   const type = node && node.getType();
   if (node) {
-    const location = /** @type {Blockly.Field} */ (node.getLocation());
-    if (type == Blockly.ASTNode.types.FIELD &&
+    const location = /** @type {Field} */ (node.getLocation());
+    if (type == ASTNode.types.FIELD &&
         location && location.isTabNavigable() && location.isClickable()) {
       isValid = true;
     }

From ecec6daf80e9b7910393e371223b3824855f180b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 20 Jul 2021 16:47:41 -0700
Subject: [PATCH 193/833] clang-format core/keyboard_nav/tab_navigate_cursor.js

---
 core/keyboard_nav/tab_navigate_cursor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/keyboard_nav/tab_navigate_cursor.js b/core/keyboard_nav/tab_navigate_cursor.js
index 37f90fe37..3b82267a1 100644
--- a/core/keyboard_nav/tab_navigate_cursor.js
+++ b/core/keyboard_nav/tab_navigate_cursor.js
@@ -41,8 +41,8 @@ TabNavigateCursor.prototype.validNode_ = function(node) {
   const type = node && node.getType();
   if (node) {
     const location = /** @type {Field} */ (node.getLocation());
-    if (type == ASTNode.types.FIELD &&
-        location && location.isTabNavigable() && location.isClickable()) {
+    if (type == ASTNode.types.FIELD && location && location.isTabNavigable() &&
+        location.isClickable()) {
       isValid = true;
     }
   }

From b2a68532d2870fe75ce0198c1c66913ca32391ba Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 10:48:56 -0700
Subject: [PATCH 194/833] Migrate core/delete_area.js to ES6 const/let

---
 core/delete_area.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/delete_area.js b/core/delete_area.js
index 384136a05..8a9f4ec6d 100644
--- a/core/delete_area.js
+++ b/core/delete_area.js
@@ -55,8 +55,8 @@ Blockly.utils.object.inherits(Blockly.DeleteArea, Blockly.DragTarget);
  */
 Blockly.DeleteArea.prototype.wouldDelete = function(element, couldConnect) {
   if (element instanceof Blockly.BlockSvg) {
-    var block = /** @type {Blockly.BlockSvg} */ (element);
-    var couldDeleteBlock = !block.getParent() && block.isDeletable();
+    const block = /** @type {Blockly.BlockSvg} */ (element);
+    const couldDeleteBlock = !block.getParent() && block.isDeletable();
     this.updateWouldDelete_(couldDeleteBlock && !couldConnect);
   } else {
     this.updateWouldDelete_(element.isDeletable());

From 7219b83093311b52366226142cc6f5d9866e1033 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 10:52:35 -0700
Subject: [PATCH 195/833] Migrate core/delete_area.js to goog.module

---
 core/delete_area.js | 15 +++++++++------
 tests/deps.js       |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/delete_area.js b/core/delete_area.js
index 8a9f4ec6d..64605dee0 100644
--- a/core/delete_area.js
+++ b/core/delete_area.js
@@ -12,7 +12,8 @@
 
 'use strict';
 
-goog.provide('Blockly.DeleteArea');
+goog.module('Blockly.DeleteArea');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.BlockSvg');
 goog.require('Blockly.DragTarget');
@@ -27,8 +28,8 @@ goog.requireType('Blockly.IDraggable');
  * @implements {Blockly.IDeleteArea}
  * @constructor
  */
-Blockly.DeleteArea = function() {
-  Blockly.DeleteArea.superClass_.constructor.call(this);
+const DeleteArea = function() {
+  DeleteArea.superClass_.constructor.call(this);
 
   /**
    * Whether the last block or bubble dragged over this delete area would be
@@ -39,7 +40,7 @@ Blockly.DeleteArea = function() {
    */
   this.wouldDelete_ = false;
 };
-Blockly.utils.object.inherits(Blockly.DeleteArea, Blockly.DragTarget);
+Blockly.utils.object.inherits(DeleteArea, Blockly.DragTarget);
 
 /**
  * Returns whether the provided block or bubble would be deleted if dropped on
@@ -53,7 +54,7 @@ Blockly.utils.object.inherits(Blockly.DeleteArea, Blockly.DragTarget);
  * @return {boolean} Whether the element provided would be deleted if dropped on
  *     this area.
  */
-Blockly.DeleteArea.prototype.wouldDelete = function(element, couldConnect) {
+DeleteArea.prototype.wouldDelete = function(element, couldConnect) {
   if (element instanceof Blockly.BlockSvg) {
     const block = /** @type {Blockly.BlockSvg} */ (element);
     const couldDeleteBlock = !block.getParent() && block.isDeletable();
@@ -69,6 +70,8 @@ Blockly.DeleteArea.prototype.wouldDelete = function(element, couldConnect) {
  * @param {boolean} wouldDelete The new value for the wouldDelete state.
  * @protected
  */
-Blockly.DeleteArea.prototype.updateWouldDelete_ = function(wouldDelete) {
+DeleteArea.prototype.updateWouldDelete_ = function(wouldDelete) {
   this.wouldDelete_ = wouldDelete;
 };
+
+exports = DeleteArea;
diff --git a/tests/deps.js b/tests/deps.js
index 979c58c74..3486a6137 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -28,7 +28,7 @@ goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Block
 goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es5'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es5'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea']);
+goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockly.IDragTarget']);
 goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style']);
 goog.addDependency('../../core/events/block_events.js', ['Blockly.Events.BlockBase', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Events.Change', 'Blockly.Events.Create', 'Blockly.Events.Delete', 'Blockly.Events.Move'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);

From ff34d8c37e414c5c029db760920760b5e4e8db88 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 10:57:20 -0700
Subject: [PATCH 196/833] Migrate core/delete_area.js to named requires

---
 core/delete_area.js | 24 +++++++++++++-----------
 tests/deps.js       |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/core/delete_area.js b/core/delete_area.js
index 64605dee0..55eb61a34 100644
--- a/core/delete_area.js
+++ b/core/delete_area.js
@@ -15,17 +15,19 @@
 goog.module('Blockly.DeleteArea');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.BlockSvg');
-goog.require('Blockly.DragTarget');
-goog.require('Blockly.IDeleteArea');
-
-goog.requireType('Blockly.IDraggable');
+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');
+const {inherits} = goog.require('Blockly.utils.object');
 
 /**
  * Abstract class for a component that can delete a block or bubble that is
  * dropped on top of it.
- * @extends {Blockly.DragTarget}
- * @implements {Blockly.IDeleteArea}
+ * @extends {DragTarget}
+ * @implements {IDeleteArea}
  * @constructor
  */
 const DeleteArea = function() {
@@ -40,14 +42,14 @@ const DeleteArea = function() {
    */
   this.wouldDelete_ = false;
 };
-Blockly.utils.object.inherits(DeleteArea, Blockly.DragTarget);
+inherits(DeleteArea, DragTarget);
 
 /**
  * Returns whether the provided block or bubble would be deleted if dropped on
  * this area.
  * This method should check if the element is deletable and is always called
  * before onDragEnter/onDragOver/onDragExit.
- * @param {!Blockly.IDraggable} element The block or bubble currently being
+ * @param {!IDraggable} element The block or bubble currently being
  *   dragged.
  * @param {boolean} couldConnect Whether the element could could connect to
  *     another.
@@ -55,8 +57,8 @@ Blockly.utils.object.inherits(DeleteArea, Blockly.DragTarget);
  *     this area.
  */
 DeleteArea.prototype.wouldDelete = function(element, couldConnect) {
-  if (element instanceof Blockly.BlockSvg) {
-    const block = /** @type {Blockly.BlockSvg} */ (element);
+  if (element instanceof BlockSvg) {
+    const block = /** @type {BlockSvg} */ (element);
     const couldDeleteBlock = !block.getParent() && block.isDeletable();
     this.updateWouldDelete_(couldDeleteBlock && !couldConnect);
   } else {
diff --git a/tests/deps.js b/tests/deps.js
index 3486a6137..aabe7c944 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -28,7 +28,7 @@ goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Block
 goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es5'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es5'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockly.IDragTarget']);
 goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style']);
 goog.addDependency('../../core/events/block_events.js', ['Blockly.Events.BlockBase', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Events.Change', 'Blockly.Events.Create', 'Blockly.Events.Delete', 'Blockly.Events.Move'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);

From 0dc01b16188564b949b90512133d59c4eabb7c40 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 11:02:32 -0700
Subject: [PATCH 197/833] Migrate core/drag_target.js to goog.module

---
 core/drag_target.js | 19 +++++++++++--------
 tests/deps.js       |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/core/drag_target.js b/core/drag_target.js
index 438bf6a31..91d46c5ca 100644
--- a/core/drag_target.js
+++ b/core/drag_target.js
@@ -12,7 +12,8 @@
 
 'use strict';
 
-goog.provide('Blockly.DragTarget');
+goog.module('Blockly.DragTarget');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.IDragTarget');
 
@@ -26,7 +27,7 @@ goog.requireType('Blockly.utils.Rect');
  * @implements {Blockly.IDragTarget}
  * @constructor
  */
-Blockly.DragTarget = function() {};
+const DragTarget = function() {};
 
 /**
  * Returns the bounding rectangle of the drag target area in pixel units
@@ -34,14 +35,14 @@ Blockly.DragTarget = function() {};
  * @return {?Blockly.utils.Rect} The component's bounding box. Null if drag
  *   target area should be ignored.
  */
-Blockly.DragTarget.prototype.getClientRect;
+DragTarget.prototype.getClientRect;
 
 /**
  * Handles when a cursor with a block or bubble enters this drag target.
  * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  */
-Blockly.DragTarget.prototype.onDragEnter = function(_dragElement) {
+DragTarget.prototype.onDragEnter = function(_dragElement) {
   // no-op
 };
 
@@ -51,7 +52,7 @@ Blockly.DragTarget.prototype.onDragEnter = function(_dragElement) {
  * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  */
-Blockly.DragTarget.prototype.onDragOver = function(_dragElement) {
+DragTarget.prototype.onDragOver = function(_dragElement) {
   // no-op
 };
 
@@ -60,7 +61,7 @@ Blockly.DragTarget.prototype.onDragOver = function(_dragElement) {
  * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  */
-Blockly.DragTarget.prototype.onDragExit = function(_dragElement) {
+DragTarget.prototype.onDragExit = function(_dragElement) {
   // no-op
 };
 
@@ -70,7 +71,7 @@ Blockly.DragTarget.prototype.onDragExit = function(_dragElement) {
  * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  */
-Blockly.DragTarget.prototype.onDrop = function(_dragElement) {
+DragTarget.prototype.onDrop = function(_dragElement) {
   // no-op
 };
 
@@ -83,6 +84,8 @@ Blockly.DragTarget.prototype.onDrop = function(_dragElement) {
  * @return {boolean} Whether the block or bubble provided should be returned to
  *     drag start.
  */
-Blockly.DragTarget.prototype.shouldPreventMove = function(_dragElement) {
+DragTarget.prototype.shouldPreventMove = function(_dragElement) {
   return false;
 };
+
+exports = DragTarget;
diff --git a/tests/deps.js b/tests/deps.js
index 979c58c74..74b561fe4 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -29,7 +29,7 @@ goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es5'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea']);
-goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockly.IDragTarget']);
+goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style']);
 goog.addDependency('../../core/events/block_events.js', ['Blockly.Events.BlockBase', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Events.Change', 'Blockly.Events.Create', 'Blockly.Events.Delete', 'Blockly.Events.Move'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils']);

From b1b5358b678041ac0603fc59f93c4829e0554735 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 11:06:53 -0700
Subject: [PATCH 198/833] Migrate core/drag_target.js to named requires

---
 core/drag_target.js | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/core/drag_target.js b/core/drag_target.js
index 91d46c5ca..18e29b40a 100644
--- a/core/drag_target.js
+++ b/core/drag_target.js
@@ -15,16 +15,18 @@
 goog.module('Blockly.DragTarget');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.IDragTarget');
-
-goog.requireType('Blockly.IDraggable');
-goog.requireType('Blockly.utils.Rect');
+/* eslint-disable-next-line no-unused-vars */
+const IDragTarget = goog.require('Blockly.IDragTarget');
+/* eslint-disable-next-line no-unused-vars */
+const IDraggable = goog.requireType('Blockly.IDraggable');
+/* eslint-disable-next-line no-unused-vars */
+const Rect = goog.requireType('Blockly.utils.Rect');
 
 
 /**
  * Abstract class for a component with custom behaviour when a block or bubble
  * is dragged over or dropped on top of it.
- * @implements {Blockly.IDragTarget}
+ * @implements {IDragTarget}
  * @constructor
  */
 const DragTarget = function() {};
@@ -32,14 +34,14 @@ const DragTarget = function() {};
 /**
  * Returns the bounding rectangle of the drag target area in pixel units
  * relative to the Blockly injection div.
- * @return {?Blockly.utils.Rect} The component's bounding box. Null if drag
+ * @return {?Rect} The component's bounding box. Null if drag
  *   target area should be ignored.
  */
 DragTarget.prototype.getClientRect;
 
 /**
  * Handles when a cursor with a block or bubble enters this drag target.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  */
 DragTarget.prototype.onDragEnter = function(_dragElement) {
@@ -49,7 +51,7 @@ DragTarget.prototype.onDragEnter = function(_dragElement) {
 /**
  * Handles when a cursor with a block or bubble is dragged over this drag
  * target.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  */
 DragTarget.prototype.onDragOver = function(_dragElement) {
@@ -58,7 +60,7 @@ DragTarget.prototype.onDragOver = function(_dragElement) {
 
 /**
  * Handles when a cursor with a block or bubble exits this drag target.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  */
 DragTarget.prototype.onDragExit = function(_dragElement) {
@@ -68,7 +70,7 @@ DragTarget.prototype.onDragExit = function(_dragElement) {
 /**
  * Handles when a block or bubble is dropped on this component.
  * Should not handle delete here.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  */
 DragTarget.prototype.onDrop = function(_dragElement) {
@@ -79,7 +81,7 @@ DragTarget.prototype.onDrop = function(_dragElement) {
  * Returns whether the provided block or bubble should not be moved after being
  * dropped on this component. If true, the element will return to where it was
  * when the drag started.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  * @return {boolean} Whether the block or bubble provided should be returned to
  *     drag start.

From a57399704f5be6af807040bc12190f8e00f576f0 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 11:15:25 -0700
Subject: [PATCH 199/833] Migrate core/field.js to ES6 const/let

---
 core/field.js | 79 ++++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/core/field.js b/core/field.js
index f5f027c45..ed15cd494 100644
--- a/core/field.js
+++ b/core/field.js
@@ -267,7 +267,7 @@ Blockly.Field.prototype.SERIALIZABLE = false;
  * @protected
  */
 Blockly.Field.prototype.configure_ = function(config) {
-  var tooltip = config['tooltip'];
+  let tooltip = config['tooltip'];
   if (typeof tooltip == 'string') {
     tooltip = Blockly.utils.replaceMessageReferences(
         config['tooltip']);
@@ -325,7 +325,7 @@ Blockly.Field.prototype.init = function() {
   if (!this.isVisible()) {
     this.fieldGroup_.style.display = 'none';
   }
-  var sourceBlockSvg = /** @type {!Blockly.BlockSvg} **/ (this.sourceBlock_);
+  const sourceBlockSvg = /** @type {!Blockly.BlockSvg} **/ (this.sourceBlock_);
   sourceBlockSvg.getSvgRoot().appendChild(this.fieldGroup_);
   this.initView();
   this.updateEditable();
@@ -444,7 +444,7 @@ Blockly.Field.prototype.dispose = function() {
  * Add or remove the UI indicating if this field is editable or not.
  */
 Blockly.Field.prototype.updateEditable = function() {
-  var group = this.fieldGroup_;
+  const group = this.fieldGroup_;
   if (!this.EDITABLE || !group) {
     return;
   }
@@ -506,7 +506,7 @@ Blockly.Field.prototype.isCurrentlyEditable = function() {
  * @return {boolean} Whether this field should be serialized or not.
  */
 Blockly.Field.prototype.isSerializable = function() {
-  var isSerializable = false;
+  let isSerializable = false;
   if (this.name) {
     if (this.SERIALIZABLE) {
       isSerializable = true;
@@ -539,7 +539,7 @@ Blockly.Field.prototype.setVisible = function(visible) {
     return;
   }
   this.visible_ = visible;
-  var root = this.getSvgRoot();
+  const root = this.getSvgRoot();
   if (root) {
     root.style.display = visible ? 'block' : 'none';
   }
@@ -622,13 +622,13 @@ Blockly.Field.prototype.showEditor = function(opt_e) {
  * @protected
  */
 Blockly.Field.prototype.updateSize_ = function(opt_margin) {
-  var constants = this.getConstants();
-  var xOffset = opt_margin != undefined ? opt_margin :
+  const constants = this.getConstants();
+  const xOffset = opt_margin != undefined ? opt_margin :
       (this.borderRect_ ? this.getConstants().FIELD_BORDER_RECT_X_PADDING : 0);
-  var totalWidth = xOffset * 2;
-  var totalHeight = constants.FIELD_TEXT_HEIGHT;
+  let totalWidth = xOffset * 2;
+  let totalHeight = constants.FIELD_TEXT_HEIGHT;
 
-  var contentWidth = 0;
+  let contentWidth = 0;
   if (this.textElement_) {
     contentWidth = Blockly.utils.dom.getFastTextWidth(this.textElement_,
         constants.FIELD_TEXT_FONTSIZE,
@@ -658,8 +658,8 @@ Blockly.Field.prototype.positionTextElement_ = function(xOffset, contentWidth) {
   if (!this.textElement_) {
     return;
   }
-  var constants = this.getConstants();
-  var halfHeight = this.size_.height / 2;
+  const constants = this.getConstants();
+  const halfHeight = this.size_.height / 2;
 
   this.textElement_.setAttribute('x', this.sourceBlock_.RTL ?
       this.size_.width - contentWidth - xOffset : xOffset);
@@ -717,15 +717,16 @@ Blockly.Field.prototype.getSize = function() {
  * @package
  */
 Blockly.Field.prototype.getScaledBBox = function() {
+  let scaledWidth, scaledHeight, xy;
   if (!this.borderRect_) {
     // Browsers are inconsistent in what they return for a bounding box.
     // - Webkit / Blink: fill-box / object bounding box
     // - Gecko / Triden / EdgeHTML: stroke-box
-    var bBox = this.sourceBlock_.getHeightWidth();
-    var scale = this.sourceBlock_.workspace.scale;
-    var xy = this.getAbsoluteXY_();
-    var scaledWidth = bBox.width * scale;
-    var scaledHeight = bBox.height * scale;
+    const bBox = this.sourceBlock_.getHeightWidth();
+    const scale = this.sourceBlock_.workspace.scale;
+    xy = this.getAbsoluteXY_();
+    scaledWidth = bBox.width * scale;
+    scaledHeight = bBox.height * scale;
 
     if (Blockly.utils.userAgent.GECKO) {
       xy.x += 1.5 * scale;
@@ -741,10 +742,10 @@ Blockly.Field.prototype.getScaledBBox = function() {
       scaledHeight += 1 * scale;
     }
   } else {
-    var bBox = this.borderRect_.getBoundingClientRect();
-    var xy = Blockly.utils.style.getPageOffset(this.borderRect_);
-    var scaledWidth = bBox.width;
-    var scaledHeight = bBox.height;
+    const bBox = this.borderRect_.getBoundingClientRect();
+    xy = Blockly.utils.style.getPageOffset(this.borderRect_);
+    scaledWidth = bBox.width;
+    scaledHeight = bBox.height;
   }
   return new Blockly.utils.Rect(
       xy.y,
@@ -761,7 +762,7 @@ Blockly.Field.prototype.getScaledBBox = function() {
  * @protected
  */
 Blockly.Field.prototype.getDisplayText_ = function() {
-  var text = this.getText();
+  let text = this.getText();
   if (!text) {
     // Prevent the field from disappearing if empty.
     return Blockly.Field.NBSP;
@@ -785,7 +786,7 @@ Blockly.Field.prototype.getDisplayText_ = function() {
  */
 Blockly.Field.prototype.getText = function() {
   if (this.getText_) {
-    var text = this.getText_.call(this);
+    const text = this.getText_.call(this);
     if (text !== null) {
       return String(text);
     }
@@ -828,14 +829,14 @@ Blockly.Field.prototype.forceRerender = function() {
  * @param {*} newValue New value.
  */
 Blockly.Field.prototype.setValue = function(newValue) {
-  var doLogging = false;
+  const doLogging = false;
   if (newValue === null) {
     doLogging && console.log('null, return');
     // Not a valid value to check.
     return;
   }
 
-  var validatedValue = this.doClassValidation_(newValue);
+  let validatedValue = this.doClassValidation_(newValue);
   // Class validators might accidentally forget to return, we'll ignore that.
   newValue = this.processValidation_(newValue, validatedValue);
   if (newValue instanceof Error) {
@@ -843,7 +844,7 @@ Blockly.Field.prototype.setValue = function(newValue) {
     return;
   }
 
-  var localValidator = this.getValidator();
+  const localValidator = this.getValidator();
   if (localValidator) {
     validatedValue = localValidator.call(this, newValue);
     // Local validators might accidentally forget to return, we'll ignore that.
@@ -853,12 +854,12 @@ Blockly.Field.prototype.setValue = function(newValue) {
       return;
     }
   }
-  var source = this.sourceBlock_;
+  const source = this.sourceBlock_;
   if (source && source.disposed) {
     doLogging && console.log('source disposed, return');
     return;
   }
-  var oldValue = this.getValue();
+  const oldValue = this.getValue();
   if (oldValue === newValue) {
     doLogging && console.log('same, doValueUpdate_, return');
     this.doValueUpdate_(newValue);
@@ -951,7 +952,7 @@ Blockly.Field.prototype.onMouseDown_ = function(e) {
   if (!this.sourceBlock_ || !this.sourceBlock_.workspace) {
     return;
   }
-  var gesture = this.sourceBlock_.workspace.getGesture(e);
+  const gesture = this.sourceBlock_.workspace.getGesture(e);
   if (gesture) {
     gesture.setStartField(this);
   }
@@ -968,7 +969,7 @@ Blockly.Field.prototype.setTooltip = function(newTip) {
   if (!newTip && newTip !== '') {  // If null or undefined.
     newTip = this.sourceBlock_;
   }
-  var clickTarget = this.getClickTarget_();
+  const clickTarget = this.getClickTarget_();
   if (clickTarget) {
     clickTarget.tooltip = newTip;
   } else {
@@ -982,7 +983,7 @@ Blockly.Field.prototype.setTooltip = function(newTip) {
  * @return {string} The tooltip text for this field.
  */
 Blockly.Field.prototype.getTooltip = function() {
-  var clickTarget = this.getClickTarget_();
+  const clickTarget = this.getClickTarget_();
   if (clickTarget) {
     return Blockly.Tooltip.getTooltipOfObject(clickTarget);
   }
@@ -1030,14 +1031,14 @@ Blockly.Field.prototype.referencesVariables = function() {
  * @package
  */
 Blockly.Field.prototype.getParentInput = function() {
-  var parentInput = null;
-  var block = this.sourceBlock_;
-  var inputs = block.inputList;
+  let parentInput = null;
+  const block = this.sourceBlock_;
+  const inputs = block.inputList;
 
-  for (var idx = 0; idx < block.inputList.length; idx++) {
-    var input = inputs[idx];
-    var fieldRows = input.fieldRow;
-    for (var j = 0; j < fieldRows.length; j++) {
+  for (let idx = 0; idx < block.inputList.length; idx++) {
+    const input = inputs[idx];
+    const fieldRows = input.fieldRow;
+    for (let j = 0; j < fieldRows.length; j++) {
       if (fieldRows[j] === this) {
         parentInput = input;
         break;
@@ -1110,7 +1111,7 @@ Blockly.Field.prototype.setMarkerSvg = function(markerSvg) {
  * @protected
  */
 Blockly.Field.prototype.updateMarkers_ = function() {
-  var workspace =
+  const workspace =
     /** @type {!Blockly.WorkspaceSvg} */ (this.sourceBlock_.workspace);
   if (workspace.keyboardAccessibilityMode && this.cursorSvg_) {
     workspace.getCursor().draw();

From 91721f7d163092940d6cb8941889d8a6045acee2 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 11:18:41 -0700
Subject: [PATCH 200/833] Migrate core/field.js to goog.module

---
 core/field.js | 151 +++++++++++++++++++++++++-------------------------
 tests/deps.js |   2 +-
 2 files changed, 78 insertions(+), 75 deletions(-)

diff --git a/core/field.js b/core/field.js
index ed15cd494..d9db11cbd 100644
--- a/core/field.js
+++ b/core/field.js
@@ -7,12 +7,13 @@
 /**
  * @fileoverview Field.  Used for editable titles, variables, etc.
  * This is an abstract class that defines the UI on the block.  Actual
- * instances would be Blockly.FieldTextInput, Blockly.FieldDropdown, etc.
+ * instances would be FieldTextInput, FieldDropdown, etc.
  * @author fraser@google.com (Neil Fraser)
  */
 'use strict';
 
-goog.provide('Blockly.Field');
+goog.module('Blockly.Field');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.DropDownDiv');
@@ -61,7 +62,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @implements {Blockly.IKeyboardAccessible}
  * @implements {Blockly.IRegistrable}
  */
-Blockly.Field = function(value, opt_validator, opt_config) {
+const Field = function(value, opt_validator, opt_config) {
   /**
    * A generic value possessed by the field.
    * Should generally be non-null, only null when the field is created.
@@ -160,62 +161,62 @@ Blockly.Field = function(value, opt_validator, opt_config) {
  * @type {*}
  * @protected
  */
-Blockly.Field.prototype.DEFAULT_VALUE = null;
+Field.prototype.DEFAULT_VALUE = null;
 
 /**
  * Name of field.  Unique within each block.
  * Static labels are usually unnamed.
  * @type {string|undefined}
  */
-Blockly.Field.prototype.name = undefined;
+Field.prototype.name = undefined;
 
 /**
  * Has this field been disposed of?
  * @type {boolean}
  * @package
  */
-Blockly.Field.prototype.disposed = false;
+Field.prototype.disposed = false;
 
 /**
  * Maximum characters of text to display before adding an ellipsis.
  * @type {number}
  */
-Blockly.Field.prototype.maxDisplayLength = 50;
+Field.prototype.maxDisplayLength = 50;
 
 /**
  * Block this field is attached to.  Starts as null, then set in init.
  * @type {Blockly.Block}
  * @protected
  */
-Blockly.Field.prototype.sourceBlock_ = null;
+Field.prototype.sourceBlock_ = null;
 
 /**
  * Does this block need to be re-rendered?
  * @type {boolean}
  * @protected
  */
-Blockly.Field.prototype.isDirty_ = true;
+Field.prototype.isDirty_ = true;
 
 /**
  * Is the field visible, or hidden due to the block being collapsed?
  * @type {boolean}
  * @protected
  */
-Blockly.Field.prototype.visible_ = true;
+Field.prototype.visible_ = true;
 
 /**
  * Can the field value be changed using the editor on an editable block?
  * @type {boolean}
  * @protected
  */
-Blockly.Field.prototype.enabled_ = true;
+Field.prototype.enabled_ = true;
 
 /**
  * The element the click handler is bound to.
  * @type {Element}
  * @protected
  */
-Blockly.Field.prototype.clickTarget_ = null;
+Field.prototype.clickTarget_ = null;
 
 /**
  * A developer hook to override the returned text of this field.
@@ -225,7 +226,7 @@ Blockly.Field.prototype.clickTarget_ = null;
  * @return {?string} Current text. Return null to resort to a string cast.
  * @protected
  */
-Blockly.Field.prototype.getText_;
+Field.prototype.getText_;
 
 /**
  * An optional method that can be defined to show an editor when the field is
@@ -236,20 +237,20 @@ Blockly.Field.prototype.getText_;
  * @return {void}
  * @protected
  */
-Blockly.Field.prototype.showEditor_;
+Field.prototype.showEditor_;
 
 /**
  * Non-breaking space.
  * @const
  */
-Blockly.Field.NBSP = '\u00A0';
+Field.NBSP = '\u00A0';
 
 /**
  * Editable fields usually show some sort of UI indicating they are editable.
  * They will also be saved by the XML renderer.
  * @type {boolean}
  */
-Blockly.Field.prototype.EDITABLE = true;
+Field.prototype.EDITABLE = true;
 
 /**
  * Serializable fields are saved by the XML renderer, non-serializable fields
@@ -257,7 +258,7 @@ Blockly.Field.prototype.EDITABLE = true;
  * case by default so that SERIALIZABLE is backwards compatible.
  * @type {boolean}
  */
-Blockly.Field.prototype.SERIALIZABLE = false;
+Field.prototype.SERIALIZABLE = false;
 
 /**
  * Process the configuration map passed to the field.
@@ -266,7 +267,7 @@ Blockly.Field.prototype.SERIALIZABLE = false;
  *    parameter supports.
  * @protected
  */
-Blockly.Field.prototype.configure_ = function(config) {
+Field.prototype.configure_ = function(config) {
   let tooltip = config['tooltip'];
   if (typeof tooltip == 'string') {
     tooltip = Blockly.utils.replaceMessageReferences(
@@ -282,7 +283,7 @@ Blockly.Field.prototype.configure_ = function(config) {
  * Attach this field to a block.
  * @param {!Blockly.Block} block The block containing this field.
  */
-Blockly.Field.prototype.setSourceBlock = function(block) {
+Field.prototype.setSourceBlock = function(block) {
   if (this.sourceBlock_) {
     throw Error('Field already bound to a block');
   }
@@ -294,7 +295,7 @@ Blockly.Field.prototype.setSourceBlock = function(block) {
  * @return {?Blockly.blockRendering.ConstantProvider} The renderer constant
  *     provider.
  */
-Blockly.Field.prototype.getConstants = function() {
+Field.prototype.getConstants = function() {
   if (!this.constants_ && this.sourceBlock_ && this.sourceBlock_.workspace &&
       this.sourceBlock_.workspace.rendered) {
     this.constants_ = this.sourceBlock_.workspace.getRenderer().getConstants();
@@ -306,7 +307,7 @@ Blockly.Field.prototype.getConstants = function() {
  * Get the block this field is attached to.
  * @return {Blockly.Block} The block containing this field.
  */
-Blockly.Field.prototype.getSourceBlock = function() {
+Field.prototype.getSourceBlock = function() {
   return this.sourceBlock_;
 };
 
@@ -315,7 +316,7 @@ Blockly.Field.prototype.getSourceBlock = function() {
  * methods initModel and initView rather than this method.
  * @package
  */
-Blockly.Field.prototype.init = function() {
+Field.prototype.init = function() {
   if (this.fieldGroup_) {
     // Field has already been initialized once.
     return;
@@ -338,7 +339,7 @@ Blockly.Field.prototype.init = function() {
  * Create the block UI for this field.
  * @package
  */
-Blockly.Field.prototype.initView = function() {
+Field.prototype.initView = function() {
   this.createBorderRect_();
   this.createTextElement_();
 };
@@ -348,7 +349,7 @@ Blockly.Field.prototype.initView = function() {
  * No-op by default.
  * @package
  */
-Blockly.Field.prototype.initModel = function() {
+Field.prototype.initModel = function() {
 };
 
 /**
@@ -357,7 +358,7 @@ Blockly.Field.prototype.initModel = function() {
  * separate function to call.
  * @protected
  */
-Blockly.Field.prototype.createBorderRect_ = function() {
+Field.prototype.createBorderRect_ = function() {
   this.borderRect_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.RECT, {
         'rx': this.getConstants().FIELD_BORDER_RECT_RADIUS,
@@ -376,7 +377,7 @@ Blockly.Field.prototype.createBorderRect_ = function() {
  * function to call.
  * @protected
  */
-Blockly.Field.prototype.createTextElement_ = function() {
+Field.prototype.createTextElement_ = function() {
   this.textElement_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.TEXT, {
         'class': 'blocklyText',
@@ -393,7 +394,7 @@ Blockly.Field.prototype.createTextElement_ = function() {
  * custom input handling.
  * @protected
  */
-Blockly.Field.prototype.bindEvents_ = function() {
+Field.prototype.bindEvents_ = function() {
   Blockly.Tooltip.bindMouseEvents(this.getClickTarget_());
   this.mouseDownWrapper_ = Blockly.browserEvents.conditionalBind(
       this.getClickTarget_(), 'mousedown', this, this.onMouseDown_);
@@ -406,7 +407,7 @@ Blockly.Field.prototype.bindEvents_ = function() {
  *    field's state.
  * @package
  */
-Blockly.Field.prototype.fromXml = function(fieldElement) {
+Field.prototype.fromXml = function(fieldElement) {
   this.setValue(fieldElement.textContent);
 };
 
@@ -417,7 +418,7 @@ Blockly.Field.prototype.fromXml = function(fieldElement) {
  * @return {!Element} The element containing info about the field's state.
  * @package
  */
-Blockly.Field.prototype.toXml = function(fieldElement) {
+Field.prototype.toXml = function(fieldElement) {
   fieldElement.textContent = this.getValue();
   return fieldElement;
 };
@@ -426,7 +427,7 @@ Blockly.Field.prototype.toXml = function(fieldElement) {
  * Dispose of all DOM objects and events belonging to this editable field.
  * @package
  */
-Blockly.Field.prototype.dispose = function() {
+Field.prototype.dispose = function() {
   Blockly.DropDownDiv.hideIfOwner(this);
   Blockly.WidgetDiv.hideIfOwner(this);
   Blockly.Tooltip.unbindMouseEvents(this.getClickTarget_());
@@ -443,7 +444,7 @@ Blockly.Field.prototype.dispose = function() {
 /**
  * Add or remove the UI indicating if this field is editable or not.
  */
-Blockly.Field.prototype.updateEditable = function() {
+Field.prototype.updateEditable = function() {
   const group = this.fieldGroup_;
   if (!this.EDITABLE || !group) {
     return;
@@ -464,7 +465,7 @@ Blockly.Field.prototype.updateEditable = function() {
  *     source block is editable.
  * @param {boolean} enabled True if enabled.
  */
-Blockly.Field.prototype.setEnabled = function(enabled) {
+Field.prototype.setEnabled = function(enabled) {
   this.enabled_ = enabled;
   this.updateEditable();
 };
@@ -474,7 +475,7 @@ Blockly.Field.prototype.setEnabled = function(enabled) {
  *     source block is editable.
  * @return {boolean} Whether this field is enabled.
  */
-Blockly.Field.prototype.isEnabled = function() {
+Field.prototype.isEnabled = function() {
   return this.enabled_;
 };
 
@@ -482,7 +483,7 @@ Blockly.Field.prototype.isEnabled = function() {
  * Check whether this field defines the showEditor_ function.
  * @return {boolean} Whether this field is clickable.
  */
-Blockly.Field.prototype.isClickable = function() {
+Field.prototype.isClickable = function() {
   return this.enabled_ && !!this.sourceBlock_ &&
       this.sourceBlock_.isEditable() && !!this.showEditor_ &&
       (typeof this.showEditor_ === 'function');
@@ -495,7 +496,7 @@ Blockly.Field.prototype.isClickable = function() {
  * @return {boolean} Whether this field is currently enabled, editable and on
  * an editable block.
  */
-Blockly.Field.prototype.isCurrentlyEditable = function() {
+Field.prototype.isCurrentlyEditable = function() {
   return this.enabled_ && this.EDITABLE && !!this.sourceBlock_ &&
       this.sourceBlock_.isEditable();
 };
@@ -505,7 +506,7 @@ Blockly.Field.prototype.isCurrentlyEditable = function() {
  * Handles the logic for backwards compatibility and incongruous states.
  * @return {boolean} Whether this field should be serialized or not.
  */
-Blockly.Field.prototype.isSerializable = function() {
+Field.prototype.isSerializable = function() {
   let isSerializable = false;
   if (this.name) {
     if (this.SERIALIZABLE) {
@@ -524,7 +525,7 @@ Blockly.Field.prototype.isSerializable = function() {
  * Gets whether this editable field is visible or not.
  * @return {boolean} True if visible.
  */
-Blockly.Field.prototype.isVisible = function() {
+Field.prototype.isVisible = function() {
   return this.visible_;
 };
 
@@ -534,7 +535,7 @@ Blockly.Field.prototype.isVisible = function() {
  * @param {boolean} visible True if visible.
  * @package
  */
-Blockly.Field.prototype.setVisible = function(visible) {
+Field.prototype.setVisible = function(visible) {
   if (this.visible_ == visible) {
     return;
   }
@@ -560,7 +561,7 @@ Blockly.Field.prototype.setVisible = function(visible) {
  * @param {Function} handler The validator function
  *     or null to clear a previous validator.
  */
-Blockly.Field.prototype.setValidator = function(handler) {
+Field.prototype.setValidator = function(handler) {
   this.validator_ = handler;
 };
 
@@ -568,7 +569,7 @@ Blockly.Field.prototype.setValidator = function(handler) {
  * Gets the validation function for editable fields, or null if not set.
  * @return {?Function} Validation function, or null.
  */
-Blockly.Field.prototype.getValidator = function() {
+Field.prototype.getValidator = function() {
   return this.validator_;
 };
 
@@ -577,7 +578,7 @@ Blockly.Field.prototype.getValidator = function() {
  * Used for measuring the size and for positioning.
  * @return {!SVGGElement} The group element.
  */
-Blockly.Field.prototype.getSvgRoot = function() {
+Field.prototype.getSvgRoot = function() {
   return /** @type {!SVGGElement} */ (this.fieldGroup_);
 };
 
@@ -586,7 +587,7 @@ Blockly.Field.prototype.getSvgRoot = function() {
  * called by BlockSvg.applyColour().
  * @package
  */
-Blockly.Field.prototype.applyColour = function() {
+Field.prototype.applyColour = function() {
   // Non-abstract sub-classes may wish to implement this. See FieldDropdown.
 };
 
@@ -597,7 +598,7 @@ Blockly.Field.prototype.applyColour = function() {
  * done here, and should be triggered by getSize().
  * @protected
  */
-Blockly.Field.prototype.render_ = function() {
+Field.prototype.render_ = function() {
   if (this.textContent_) {
     this.textContent_.nodeValue = this.getDisplayText_();
   }
@@ -610,7 +611,7 @@ Blockly.Field.prototype.render_ = function() {
  *     or undefined if triggered programmatically.
  * @package
  */
-Blockly.Field.prototype.showEditor = function(opt_e) {
+Field.prototype.showEditor = function(opt_e) {
   if (this.isClickable()) {
     this.showEditor_(opt_e);
   }
@@ -621,7 +622,7 @@ Blockly.Field.prototype.showEditor = function(opt_e) {
  * @param {number=} opt_margin margin to use when positioning the text element.
  * @protected
  */
-Blockly.Field.prototype.updateSize_ = function(opt_margin) {
+Field.prototype.updateSize_ = function(opt_margin) {
   const constants = this.getConstants();
   const xOffset = opt_margin != undefined ? opt_margin :
       (this.borderRect_ ? this.getConstants().FIELD_BORDER_RECT_X_PADDING : 0);
@@ -654,7 +655,7 @@ Blockly.Field.prototype.updateSize_ = function(opt_margin) {
  * @param {number} contentWidth The content width.
  * @protected
  */
-Blockly.Field.prototype.positionTextElement_ = function(xOffset, contentWidth) {
+Field.prototype.positionTextElement_ = function(xOffset, contentWidth) {
   if (!this.textElement_) {
     return;
   }
@@ -672,7 +673,7 @@ Blockly.Field.prototype.positionTextElement_ = function(xOffset, contentWidth) {
  * Position a field's border rect after a size change.
  * @protected
  */
-Blockly.Field.prototype.positionBorderRect_ = function() {
+Field.prototype.positionBorderRect_ = function() {
   if (!this.borderRect_) {
     return;
   }
@@ -691,7 +692,7 @@ Blockly.Field.prototype.positionBorderRect_ = function() {
  * This should *in general* be the only place render_ gets called from.
  * @return {!Blockly.utils.Size} Height and width.
  */
-Blockly.Field.prototype.getSize = function() {
+Field.prototype.getSize = function() {
   if (!this.isVisible()) {
     return new Blockly.utils.Size(0, 0);
   }
@@ -716,7 +717,7 @@ Blockly.Field.prototype.getSize = function() {
  *     pixels relative to the top left corner of the page (window coordinates).
  * @package
  */
-Blockly.Field.prototype.getScaledBBox = function() {
+Field.prototype.getScaledBBox = function() {
   let scaledWidth, scaledHeight, xy;
   if (!this.borderRect_) {
     // Browsers are inconsistent in what they return for a bounding box.
@@ -761,18 +762,18 @@ Blockly.Field.prototype.getScaledBBox = function() {
  * @return {string} Text to display.
  * @protected
  */
-Blockly.Field.prototype.getDisplayText_ = function() {
+Field.prototype.getDisplayText_ = function() {
   let text = this.getText();
   if (!text) {
     // Prevent the field from disappearing if empty.
-    return Blockly.Field.NBSP;
+    return Field.NBSP;
   }
   if (text.length > this.maxDisplayLength) {
     // Truncate displayed string and add an ellipsis ('...').
     text = text.substring(0, this.maxDisplayLength - 2) + '\u2026';
   }
   // Replace whitespace with non-breaking spaces so the text doesn't collapse.
-  text = text.replace(/\s/g, Blockly.Field.NBSP);
+  text = text.replace(/\s/g, Field.NBSP);
   if (this.sourceBlock_ && this.sourceBlock_.RTL) {
     // The SVG is LTR, force text to be RTL.
     text += '\u200F';
@@ -784,7 +785,7 @@ Blockly.Field.prototype.getDisplayText_ = function() {
  * Get the text from this field.
  * @return {string} Current text.
  */
-Blockly.Field.prototype.getText = function() {
+Field.prototype.getText = function() {
   if (this.getText_) {
     const text = this.getText_.call(this);
     if (text !== null) {
@@ -801,7 +802,7 @@ Blockly.Field.prototype.getText = function() {
  * already been recorded.
  * @package
  */
-Blockly.Field.prototype.markDirty = function() {
+Field.prototype.markDirty = function() {
   this.isDirty_ = true;
   this.constants_ = null;
 };
@@ -813,7 +814,7 @@ Blockly.Field.prototype.markDirty = function() {
  * already been recorded.
  * @package
  */
-Blockly.Field.prototype.forceRerender = function() {
+Field.prototype.forceRerender = function() {
   this.isDirty_ = true;
   if (this.sourceBlock_ && this.sourceBlock_.rendered) {
     this.sourceBlock_.render();
@@ -828,7 +829,7 @@ Blockly.Field.prototype.forceRerender = function() {
  * than this method.
  * @param {*} newValue New value.
  */
-Blockly.Field.prototype.setValue = function(newValue) {
+Field.prototype.setValue = function(newValue) {
   const doLogging = false;
   if (newValue === null) {
     doLogging && console.log('null, return');
@@ -884,7 +885,7 @@ Blockly.Field.prototype.setValue = function(newValue) {
  * @return {*} New value, or an Error object.
  * @private
  */
-Blockly.Field.prototype.processValidation_ = function(newValue,
+Field.prototype.processValidation_ = function(newValue,
     validatedValue) {
   if (validatedValue === null) {
     this.doValueInvalid_(newValue);
@@ -903,7 +904,7 @@ Blockly.Field.prototype.processValidation_ = function(newValue,
  * Get the current value of the field.
  * @return {*} Current value.
  */
-Blockly.Field.prototype.getValue = function() {
+Field.prototype.getValue = function() {
   return this.value_;
 };
 
@@ -914,7 +915,7 @@ Blockly.Field.prototype.getValue = function() {
  * @return {*} The validated value, same as input by default.
  * @protected
  */
-Blockly.Field.prototype.doClassValidation_ = function(opt_newValue) {
+Field.prototype.doClassValidation_ = function(opt_newValue) {
   if (opt_newValue === null || opt_newValue === undefined) {
     return null;
   }
@@ -927,7 +928,7 @@ Blockly.Field.prototype.doClassValidation_ = function(opt_newValue) {
  * @param {*} newValue The value to be saved.
  * @protected
  */
-Blockly.Field.prototype.doValueUpdate_ = function(newValue) {
+Field.prototype.doValueUpdate_ = function(newValue) {
   this.value_ = newValue;
   this.isDirty_ = true;
 };
@@ -939,7 +940,7 @@ Blockly.Field.prototype.doValueUpdate_ = function(newValue) {
  * @param {*} _invalidValue The input value that was determined to be invalid.
  * @protected
  */
-Blockly.Field.prototype.doValueInvalid_ = function(_invalidValue) {
+Field.prototype.doValueInvalid_ = function(_invalidValue) {
   // NOP
 };
 
@@ -948,7 +949,7 @@ Blockly.Field.prototype.doValueInvalid_ = function(_invalidValue) {
  * @param {!Event} e Mouse down event.
  * @protected
  */
-Blockly.Field.prototype.onMouseDown_ = function(e) {
+Field.prototype.onMouseDown_ = function(e) {
   if (!this.sourceBlock_ || !this.sourceBlock_.workspace) {
     return;
   }
@@ -965,7 +966,7 @@ Blockly.Field.prototype.onMouseDown_ = function(e) {
  *     parent object whose tooltip will be used, or null to display the tooltip
  *     of the parent block. To not display a tooltip pass the empty string.
  */
-Blockly.Field.prototype.setTooltip = function(newTip) {
+Field.prototype.setTooltip = function(newTip) {
   if (!newTip && newTip !== '') {  // If null or undefined.
     newTip = this.sourceBlock_;
   }
@@ -982,7 +983,7 @@ Blockly.Field.prototype.setTooltip = function(newTip) {
  * Returns the tooltip text for this field.
  * @return {string} The tooltip text for this field.
  */
-Blockly.Field.prototype.getTooltip = function() {
+Field.prototype.getTooltip = function() {
   const clickTarget = this.getClickTarget_();
   if (clickTarget) {
     return Blockly.Tooltip.getTooltipOfObject(clickTarget);
@@ -998,7 +999,7 @@ Blockly.Field.prototype.getTooltip = function() {
  * @return {!Element} Element to bind click handler to.
  * @protected
  */
-Blockly.Field.prototype.getClickTarget_ = function() {
+Field.prototype.getClickTarget_ = function() {
   return this.clickTarget_ || this.getSvgRoot();
 };
 
@@ -1008,7 +1009,7 @@ Blockly.Field.prototype.getClickTarget_ = function() {
  * @return {!Blockly.utils.Coordinate} Object with .x and .y properties.
  * @protected
  */
-Blockly.Field.prototype.getAbsoluteXY_ = function() {
+Field.prototype.getAbsoluteXY_ = function() {
   return Blockly.utils.style.getPageOffset(
       /** @type {!SVGRectElement} */ (this.getClickTarget_()));
 };
@@ -1020,7 +1021,7 @@ Blockly.Field.prototype.getAbsoluteXY_ = function() {
  * @return {boolean} True if this field has any variable references.
  * @package
  */
-Blockly.Field.prototype.referencesVariables = function() {
+Field.prototype.referencesVariables = function() {
   return false;
 };
 
@@ -1030,7 +1031,7 @@ Blockly.Field.prototype.referencesVariables = function() {
  * @return {Blockly.Input} The input that the field belongs to.
  * @package
  */
-Blockly.Field.prototype.getParentInput = function() {
+Field.prototype.getParentInput = function() {
   let parentInput = null;
   const block = this.sourceBlock_;
   const inputs = block.inputList;
@@ -1052,7 +1053,7 @@ Blockly.Field.prototype.getParentInput = function() {
  * Returns whether or not we should flip the field in RTL.
  * @return {boolean} True if we should flip in RTL.
  */
-Blockly.Field.prototype.getFlipRtl = function() {
+Field.prototype.getFlipRtl = function() {
   return false;
 };
 
@@ -1060,7 +1061,7 @@ Blockly.Field.prototype.getFlipRtl = function() {
  * Returns whether or not the field is tab navigable.
  * @return {boolean} True if the field is tab navigable.
  */
-Blockly.Field.prototype.isTabNavigable = function() {
+Field.prototype.isTabNavigable = function() {
   return false;
 };
 
@@ -1070,7 +1071,7 @@ Blockly.Field.prototype.isTabNavigable = function() {
  * @return {boolean} True if the shortcut has been handled, false otherwise.
  * @public
  */
-Blockly.Field.prototype.onShortcut = function(_shortcut) {
+Field.prototype.onShortcut = function(_shortcut) {
   return false;
 };
 
@@ -1080,7 +1081,7 @@ Blockly.Field.prototype.onShortcut = function(_shortcut) {
  *     field group.
  * @package
  */
-Blockly.Field.prototype.setCursorSvg = function(cursorSvg) {
+Field.prototype.setCursorSvg = function(cursorSvg) {
   if (!cursorSvg) {
     this.cursorSvg_ = null;
     return;
@@ -1096,7 +1097,7 @@ Blockly.Field.prototype.setCursorSvg = function(cursorSvg) {
  *     field group.
  * @package
  */
-Blockly.Field.prototype.setMarkerSvg = function(markerSvg) {
+Field.prototype.setMarkerSvg = function(markerSvg) {
   if (!markerSvg) {
     this.markerSvg_ = null;
     return;
@@ -1110,7 +1111,7 @@ Blockly.Field.prototype.setMarkerSvg = function(markerSvg) {
  * Redraw any attached marker or cursor svgs if needed.
  * @protected
  */
-Blockly.Field.prototype.updateMarkers_ = function() {
+Field.prototype.updateMarkers_ = function() {
   const workspace =
     /** @type {!Blockly.WorkspaceSvg} */ (this.sourceBlock_.workspace);
   if (workspace.keyboardAccessibilityMode && this.cursorSvg_) {
@@ -1121,3 +1122,5 @@ Blockly.Field.prototype.updateMarkers_ = function() {
     workspace.getMarker(Blockly.MarkerManager.LOCAL_MARKER).draw();
   }
 };
+
+exports = Field;
diff --git a/tests/deps.js b/tests/deps.js
index 979c58c74..8d3cef438 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -48,7 +48,7 @@ goog.addDependency('../../core/events/variable_events.js', ['Blockly.Events.VarB
 goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es5'});
 goog.addDependency('../../core/events/ws_comment_events.js', ['Blockly.Events.CommentBase', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible', 'Blockly.IRegistrable', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es5'});
+goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible', 'Blockly.IRegistrable', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.IdGenerator', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object']);

From 00a74e9d37dbc74dd6b479714b8c7a9ca655320c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 19 Jul 2021 12:26:28 -0700
Subject: [PATCH 201/833] Migrate core/interfaces/i_registrable_field.js to
 goog.module

---
 core/interfaces/i_registrable_field.js | 12 ++++++++----
 tests/deps.js                          |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/interfaces/i_registrable_field.js b/core/interfaces/i_registrable_field.js
index 1d49edad2..180599bdb 100644
--- a/core/interfaces/i_registrable_field.js
+++ b/core/interfaces/i_registrable_field.js
@@ -11,21 +11,25 @@
 
 'use strict';
 
-goog.provide('Blockly.IRegistrableField');
+goog.module('Blockly.IRegistrableField');
+goog.module.declareLegacyNamespace();
 
 goog.requireType('Blockly.Field');
 
+
 /**
  * A registrable field.
  * Note: We are not using an interface here as we are interested in defining the
  * static methods of a field rather than the instance methods.
  * @typedef {{
- *     fromJson:Blockly.IRegistrableField.fromJson
+ *     fromJson:IRegistrableField.fromJson
  * }}
  */
-Blockly.IRegistrableField;
+let IRegistrableField;
 
 /**
  * @typedef {function(!Object): Blockly.Field}
  */
-Blockly.IRegistrableField.fromJson;
+IRegistrableField.fromJson;
+
+exports = IRegistrableField;
diff --git a/tests/deps.js b/tests/deps.js
index 9a0ae6896..fb0b9793c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -95,7 +95,7 @@ goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetr
 goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], []);
+goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_selectable_toolbox_item.js', ['Blockly.ISelectableToolboxItem'], ['Blockly.IToolboxItem'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});

From 7d946afb4ea7f00f8111444dd828b6c3400122f7 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 19 Jul 2021 12:26:43 -0700
Subject: [PATCH 202/833] Migrate core/interfaces/i_registrable_field.js named
 requires

---
 core/interfaces/i_registrable_field.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/interfaces/i_registrable_field.js b/core/interfaces/i_registrable_field.js
index 180599bdb..2c8c005bd 100644
--- a/core/interfaces/i_registrable_field.js
+++ b/core/interfaces/i_registrable_field.js
@@ -14,7 +14,7 @@
 goog.module('Blockly.IRegistrableField');
 goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.Field');
+const Field = goog.requireType('Blockly.Field');
 
 
 /**
@@ -28,7 +28,7 @@ goog.requireType('Blockly.Field');
 let IRegistrableField;
 
 /**
- * @typedef {function(!Object): Blockly.Field}
+ * @typedef {function(!Object): Field}
  */
 IRegistrableField.fromJson;
 

From a3ae4f30162f500619325c44f211179a9369cdee Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 11:41:48 -0700
Subject: [PATCH 203/833] Migrate core/field.js to named requires

---
 core/field.js | 163 +++++++++++++++++++++++++++-----------------------
 1 file changed, 87 insertions(+), 76 deletions(-)

diff --git a/core/field.js b/core/field.js
index d9db11cbd..37352c64e 100644
--- a/core/field.js
+++ b/core/field.js
@@ -15,35 +15,46 @@
 goog.module('Blockly.Field');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.DropDownDiv');
-goog.require('Blockly.Events');
+/* 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 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');
+const Events = goog.require('Blockly.Events');
+/* 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');
+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 userAgent = goog.require('Blockly.utils.userAgent');
+const {addClass, createSvgElement, getFastTextWidth, removeClass, removeNode} = goog.require('Blockly.utils.dom');
+/* eslint-disable-next-line no-unused-vars */
+const {conditionalBind, unbind, Data} = goog.require('Blockly.browserEvents');
+const {getPageOffset} = goog.require('Blockly.utils.style');
+const {replaceMessageReferences} = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Gesture');
-goog.require('Blockly.IASTNodeLocationSvg');
-goog.require('Blockly.IASTNodeLocationWithBlock');
-goog.require('Blockly.IKeyboardAccessible');
-goog.require('Blockly.IRegistrable');
-goog.require('Blockly.MarkerManager');
-goog.require('Blockly.Tooltip');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Rect');
-goog.require('Blockly.utils.Size');
-goog.require('Blockly.utils.style');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.userAgent');
-goog.require('Blockly.WidgetDiv');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.Input');
-goog.requireType('Blockly.ShortcutRegistry');
-goog.requireType('Blockly.utils.Coordinate');
-goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
@@ -57,10 +68,10 @@ goog.requireType('Blockly.WorkspaceSvg');
  *    parameter supports.
  * @constructor
  * @abstract
- * @implements {Blockly.IASTNodeLocationSvg}
- * @implements {Blockly.IASTNodeLocationWithBlock}
- * @implements {Blockly.IKeyboardAccessible}
- * @implements {Blockly.IRegistrable}
+ * @implements {IASTNodeLocationSvg}
+ * @implements {IASTNodeLocationWithBlock}
+ * @implements {IKeyboardAccessible}
+ * @implements {IRegistrable}
  */
 const Field = function(value, opt_validator, opt_config) {
   /**
@@ -81,17 +92,17 @@ const Field = function(value, opt_validator, opt_config) {
   /**
    * Used to cache the field's tooltip value if setTooltip is called when the
    * field is not yet initialized. Is *not* guaranteed to be accurate.
-   * @type {?Blockly.Tooltip.TipInfo}
+   * @type {?Tooltip.TipInfo}
    * @private
    */
   this.tooltip_ = null;
 
   /**
    * The size of the area rendered by the field.
-   * @type {!Blockly.utils.Size}
+   * @type {!Size}
    * @protected
    */
-  this.size_ = new Blockly.utils.Size(0, 0);
+  this.size_ = new Size(0, 0);
 
   /**
    * Holds the cursors svg element when the cursor is attached to the field.
@@ -139,14 +150,14 @@ const Field = function(value, opt_validator, opt_config) {
 
   /**
    * Mouse down event listener data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?Data}
    * @private
    */
   this.mouseDownWrapper_ = null;
 
   /**
    * Constants associated with the source block's renderer.
-   * @type {Blockly.blockRendering.ConstantProvider}
+   * @type {ConstantProvider}
    * @protected
    */
   this.constants_ = null;
@@ -185,7 +196,7 @@ Field.prototype.maxDisplayLength = 50;
 
 /**
  * Block this field is attached to.  Starts as null, then set in init.
- * @type {Blockly.Block}
+ * @type {Block}
  * @protected
  */
 Field.prototype.sourceBlock_ = null;
@@ -270,7 +281,7 @@ Field.prototype.SERIALIZABLE = false;
 Field.prototype.configure_ = function(config) {
   let tooltip = config['tooltip'];
   if (typeof tooltip == 'string') {
-    tooltip = Blockly.utils.replaceMessageReferences(
+    tooltip = replaceMessageReferences(
         config['tooltip']);
   }
   tooltip && this.setTooltip(tooltip);
@@ -281,7 +292,7 @@ Field.prototype.configure_ = function(config) {
 
 /**
  * Attach this field to a block.
- * @param {!Blockly.Block} block The block containing this field.
+ * @param {!Block} block The block containing this field.
  */
 Field.prototype.setSourceBlock = function(block) {
   if (this.sourceBlock_) {
@@ -292,7 +303,7 @@ Field.prototype.setSourceBlock = function(block) {
 
 /**
  * Get the renderer constant provider.
- * @return {?Blockly.blockRendering.ConstantProvider} The renderer constant
+ * @return {?ConstantProvider} The renderer constant
  *     provider.
  */
 Field.prototype.getConstants = function() {
@@ -305,7 +316,7 @@ Field.prototype.getConstants = function() {
 
 /**
  * Get the block this field is attached to.
- * @return {Blockly.Block} The block containing this field.
+ * @return {Block} The block containing this field.
  */
 Field.prototype.getSourceBlock = function() {
   return this.sourceBlock_;
@@ -321,12 +332,12 @@ Field.prototype.init = function() {
     // Field has already been initialized once.
     return;
   }
-  this.fieldGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G, {}, null);
+  this.fieldGroup_ = createSvgElement(
+      Svg.G, {}, null);
   if (!this.isVisible()) {
     this.fieldGroup_.style.display = 'none';
   }
-  const sourceBlockSvg = /** @type {!Blockly.BlockSvg} **/ (this.sourceBlock_);
+  const sourceBlockSvg = /** @type {!BlockSvg} **/ (this.sourceBlock_);
   sourceBlockSvg.getSvgRoot().appendChild(this.fieldGroup_);
   this.initView();
   this.updateEditable();
@@ -359,8 +370,8 @@ Field.prototype.initModel = function() {
  * @protected
  */
 Field.prototype.createBorderRect_ = function() {
-  this.borderRect_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT, {
+  this.borderRect_ = createSvgElement(
+      Svg.RECT, {
         'rx': this.getConstants().FIELD_BORDER_RECT_RADIUS,
         'ry': this.getConstants().FIELD_BORDER_RECT_RADIUS,
         'x': 0,
@@ -378,8 +389,8 @@ Field.prototype.createBorderRect_ = function() {
  * @protected
  */
 Field.prototype.createTextElement_ = function() {
-  this.textElement_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.TEXT, {
+  this.textElement_ = createSvgElement(
+      Svg.TEXT, {
         'class': 'blocklyText',
       }, this.fieldGroup_);
   if (this.getConstants().FIELD_TEXT_BASELINE_CENTER) {
@@ -395,8 +406,8 @@ Field.prototype.createTextElement_ = function() {
  * @protected
  */
 Field.prototype.bindEvents_ = function() {
-  Blockly.Tooltip.bindMouseEvents(this.getClickTarget_());
-  this.mouseDownWrapper_ = Blockly.browserEvents.conditionalBind(
+  Tooltip.bindMouseEvents(this.getClickTarget_());
+  this.mouseDownWrapper_ = conditionalBind(
       this.getClickTarget_(), 'mousedown', this, this.onMouseDown_);
 };
 
@@ -428,15 +439,15 @@ Field.prototype.toXml = function(fieldElement) {
  * @package
  */
 Field.prototype.dispose = function() {
-  Blockly.DropDownDiv.hideIfOwner(this);
-  Blockly.WidgetDiv.hideIfOwner(this);
-  Blockly.Tooltip.unbindMouseEvents(this.getClickTarget_());
+  DropDownDiv.hideIfOwner(this);
+  WidgetDiv.hideIfOwner(this);
+  Tooltip.unbindMouseEvents(this.getClickTarget_());
 
   if (this.mouseDownWrapper_) {
-    Blockly.browserEvents.unbind(this.mouseDownWrapper_);
+    unbind(this.mouseDownWrapper_);
   }
 
-  Blockly.utils.dom.removeNode(this.fieldGroup_);
+  removeNode(this.fieldGroup_);
 
   this.disposed = true;
 };
@@ -450,12 +461,12 @@ Field.prototype.updateEditable = function() {
     return;
   }
   if (this.enabled_ && this.sourceBlock_.isEditable()) {
-    Blockly.utils.dom.addClass(group, 'blocklyEditableText');
-    Blockly.utils.dom.removeClass(group, 'blocklyNonEditableText');
+    addClass(group, 'blocklyEditableText');
+    removeClass(group, 'blocklyNonEditableText');
     group.style.cursor = this.CURSOR;
   } else {
-    Blockly.utils.dom.addClass(group, 'blocklyNonEditableText');
-    Blockly.utils.dom.removeClass(group, 'blocklyEditableText');
+    addClass(group, 'blocklyNonEditableText');
+    removeClass(group, 'blocklyEditableText');
     group.style.cursor = '';
   }
 };
@@ -631,7 +642,7 @@ Field.prototype.updateSize_ = function(opt_margin) {
 
   let contentWidth = 0;
   if (this.textElement_) {
-    contentWidth = Blockly.utils.dom.getFastTextWidth(this.textElement_,
+    contentWidth = getFastTextWidth(this.textElement_,
         constants.FIELD_TEXT_FONTSIZE,
         constants.FIELD_TEXT_FONTWEIGHT,
         constants.FIELD_TEXT_FONTFAMILY);
@@ -690,11 +701,11 @@ Field.prototype.positionBorderRect_ = function() {
  * Returns the height and width of the field.
  *
  * This should *in general* be the only place render_ gets called from.
- * @return {!Blockly.utils.Size} Height and width.
+ * @return {!Size} Height and width.
  */
 Field.prototype.getSize = function() {
   if (!this.isVisible()) {
-    return new Blockly.utils.Size(0, 0);
+    return new Size(0, 0);
   }
 
   if (this.isDirty_) {
@@ -713,7 +724,7 @@ Field.prototype.getSize = function() {
 /**
  * Returns the bounding box of the rendered field, accounting for workspace
  * scaling.
- * @return {!Blockly.utils.Rect} An object with top, bottom, left, and right in
+ * @return {!Rect} An object with top, bottom, left, and right in
  *     pixels relative to the top left corner of the page (window coordinates).
  * @package
  */
@@ -729,13 +740,13 @@ Field.prototype.getScaledBBox = function() {
     scaledWidth = bBox.width * scale;
     scaledHeight = bBox.height * scale;
 
-    if (Blockly.utils.userAgent.GECKO) {
+    if (userAgent.GECKO) {
       xy.x += 1.5 * scale;
       xy.y += 1.5 * scale;
       scaledWidth += 1 * scale;
       scaledHeight += 1 * scale;
     } else {
-      if (!Blockly.utils.userAgent.EDGE && !Blockly.utils.userAgent.IE) {
+      if (!userAgent.EDGE && !userAgent.IE) {
         xy.x -= 0.5 * scale;
         xy.y -= 0.5 * scale;
       }
@@ -744,11 +755,11 @@ Field.prototype.getScaledBBox = function() {
     }
   } else {
     const bBox = this.borderRect_.getBoundingClientRect();
-    xy = Blockly.utils.style.getPageOffset(this.borderRect_);
+    xy = getPageOffset(this.borderRect_);
     scaledWidth = bBox.width;
     scaledHeight = bBox.height;
   }
-  return new Blockly.utils.Rect(
+  return new Rect(
       xy.y,
       xy.y + scaledHeight,
       xy.x,
@@ -867,8 +878,8 @@ Field.prototype.setValue = function(newValue) {
     return;
   }
 
-  if (source && Blockly.Events.isEnabled()) {
-    Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CHANGE))(
+  if (source && Events.isEnabled()) {
+    Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
         source, 'field', this.name || null, oldValue, newValue));
   }
   this.doValueUpdate_(newValue);
@@ -961,7 +972,7 @@ Field.prototype.onMouseDown_ = function(e) {
 
 /**
  * Sets the tooltip for this field.
- * @param {?Blockly.Tooltip.TipInfo} newTip The
+ * @param {?Tooltip.TipInfo} newTip The
  *     text for the tooltip, a function that returns the text for the tooltip, a
  *     parent object whose tooltip will be used, or null to display the tooltip
  *     of the parent block. To not display a tooltip pass the empty string.
@@ -986,10 +997,10 @@ Field.prototype.setTooltip = function(newTip) {
 Field.prototype.getTooltip = function() {
   const clickTarget = this.getClickTarget_();
   if (clickTarget) {
-    return Blockly.Tooltip.getTooltipOfObject(clickTarget);
+    return Tooltip.getTooltipOfObject(clickTarget);
   }
   // Field has not been initialized yet. Return stashed this.tooltip_ value.
-  return Blockly.Tooltip.getTooltipOfObject({tooltip: this.tooltip_});
+  return Tooltip.getTooltipOfObject({tooltip: this.tooltip_});
 };
 
 /**
@@ -1006,11 +1017,11 @@ Field.prototype.getClickTarget_ = function() {
 /**
  * Return the absolute coordinates of the top-left corner of this field.
  * The origin (0,0) is the top-left corner of the page body.
- * @return {!Blockly.utils.Coordinate} Object with .x and .y properties.
+ * @return {!Coordinate} Object with .x and .y properties.
  * @protected
  */
 Field.prototype.getAbsoluteXY_ = function() {
-  return Blockly.utils.style.getPageOffset(
+  return getPageOffset(
       /** @type {!SVGRectElement} */ (this.getClickTarget_()));
 };
 
@@ -1028,7 +1039,7 @@ Field.prototype.referencesVariables = function() {
 /**
  * Search through the list of inputs and their fields in order to find the
  * parent input of a field.
- * @return {Blockly.Input} The input that the field belongs to.
+ * @return {Input} The input that the field belongs to.
  * @package
  */
 Field.prototype.getParentInput = function() {
@@ -1067,7 +1078,7 @@ Field.prototype.isTabNavigable = function() {
 
 /**
  * Handles the given keyboard shortcut.
- * @param {!Blockly.ShortcutRegistry.KeyboardShortcut} _shortcut The shortcut to be handled.
+ * @param {!ShortcutRegistry.KeyboardShortcut} _shortcut The shortcut to be handled.
  * @return {boolean} True if the shortcut has been handled, false otherwise.
  * @public
  */
@@ -1113,13 +1124,13 @@ Field.prototype.setMarkerSvg = function(markerSvg) {
  */
 Field.prototype.updateMarkers_ = function() {
   const workspace =
-    /** @type {!Blockly.WorkspaceSvg} */ (this.sourceBlock_.workspace);
+    /** @type {!WorkspaceSvg} */ (this.sourceBlock_.workspace);
   if (workspace.keyboardAccessibilityMode && this.cursorSvg_) {
     workspace.getCursor().draw();
   }
   if (workspace.keyboardAccessibilityMode && this.markerSvg_) {
     // TODO(#4592): Update all markers on the field.
-    workspace.getMarker(Blockly.MarkerManager.LOCAL_MARKER).draw();
+    workspace.getMarker(MarkerManager.LOCAL_MARKER).draw();
   }
 };
 

From edcfc04da15db66184f8ace8f3f2ce026b7c31c2 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 11:45:32 -0700
Subject: [PATCH 204/833] clang-format core/field.js

---
 core/field.js | 74 +++++++++++++++++++++++++--------------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/core/field.js b/core/field.js
index 37352c64e..926e62008 100644
--- a/core/field.js
+++ b/core/field.js
@@ -281,8 +281,7 @@ Field.prototype.SERIALIZABLE = false;
 Field.prototype.configure_ = function(config) {
   let tooltip = config['tooltip'];
   if (typeof tooltip == 'string') {
-    tooltip = replaceMessageReferences(
-        config['tooltip']);
+    tooltip = replaceMessageReferences(config['tooltip']);
   }
   tooltip && this.setTooltip(tooltip);
 
@@ -332,8 +331,7 @@ Field.prototype.init = function() {
     // Field has already been initialized once.
     return;
   }
-  this.fieldGroup_ = createSvgElement(
-      Svg.G, {}, null);
+  this.fieldGroup_ = createSvgElement(Svg.G, {}, null);
   if (!this.isVisible()) {
     this.fieldGroup_.style.display = 'none';
   }
@@ -360,8 +358,7 @@ Field.prototype.initView = function() {
  * No-op by default.
  * @package
  */
-Field.prototype.initModel = function() {
-};
+Field.prototype.initModel = function() {};
 
 /**
  * Create a field border rect element. Not to be overridden by subclasses.
@@ -379,7 +376,8 @@ Field.prototype.createBorderRect_ = function() {
         'height': this.size_.height,
         'width': this.size_.width,
         'class': 'blocklyFieldRect'
-      }, this.fieldGroup_);
+      },
+      this.fieldGroup_);
 };
 
 /**
@@ -392,7 +390,8 @@ Field.prototype.createTextElement_ = function() {
   this.textElement_ = createSvgElement(
       Svg.TEXT, {
         'class': 'blocklyText',
-      }, this.fieldGroup_);
+      },
+      this.fieldGroup_);
   if (this.getConstants().FIELD_TEXT_BASELINE_CENTER) {
     this.textElement_.setAttribute('dominant-baseline', 'central');
   }
@@ -523,9 +522,10 @@ Field.prototype.isSerializable = function() {
     if (this.SERIALIZABLE) {
       isSerializable = true;
     } else if (this.EDITABLE) {
-      console.warn('Detected an editable field that was not serializable.' +
-        ' Please define SERIALIZABLE property as true on all editable custom' +
-        ' fields. Proceeding with serialization.');
+      console.warn(
+          'Detected an editable field that was not serializable.' +
+          ' Please define SERIALIZABLE property as true on all editable custom' +
+          ' fields. Proceeding with serialization.');
       isSerializable = true;
     }
   }
@@ -635,17 +635,17 @@ Field.prototype.showEditor = function(opt_e) {
  */
 Field.prototype.updateSize_ = function(opt_margin) {
   const constants = this.getConstants();
-  const xOffset = opt_margin != undefined ? opt_margin :
+  const xOffset = opt_margin != undefined ?
+      opt_margin :
       (this.borderRect_ ? this.getConstants().FIELD_BORDER_RECT_X_PADDING : 0);
   let totalWidth = xOffset * 2;
   let totalHeight = constants.FIELD_TEXT_HEIGHT;
 
   let contentWidth = 0;
   if (this.textElement_) {
-    contentWidth = getFastTextWidth(this.textElement_,
-        constants.FIELD_TEXT_FONTSIZE,
-        constants.FIELD_TEXT_FONTWEIGHT,
-        constants.FIELD_TEXT_FONTFAMILY);
+    contentWidth = getFastTextWidth(
+        this.textElement_, constants.FIELD_TEXT_FONTSIZE,
+        constants.FIELD_TEXT_FONTWEIGHT, constants.FIELD_TEXT_FONTFAMILY);
     totalWidth += contentWidth;
   }
   if (this.borderRect_) {
@@ -673,11 +673,15 @@ Field.prototype.positionTextElement_ = function(xOffset, contentWidth) {
   const constants = this.getConstants();
   const halfHeight = this.size_.height / 2;
 
-  this.textElement_.setAttribute('x', this.sourceBlock_.RTL ?
-      this.size_.width - contentWidth - xOffset : xOffset);
-  this.textElement_.setAttribute('y', constants.FIELD_TEXT_BASELINE_CENTER ?
-      halfHeight : halfHeight - constants.FIELD_TEXT_HEIGHT / 2 +
-      constants.FIELD_TEXT_BASELINE);
+  this.textElement_.setAttribute(
+      'x',
+      this.sourceBlock_.RTL ? this.size_.width - contentWidth - xOffset :
+                              xOffset);
+  this.textElement_.setAttribute(
+      'y',
+      constants.FIELD_TEXT_BASELINE_CENTER ? halfHeight :
+                                             halfHeight -
+              constants.FIELD_TEXT_HEIGHT / 2 + constants.FIELD_TEXT_BASELINE);
 };
 
 /**
@@ -690,10 +694,10 @@ Field.prototype.positionBorderRect_ = function() {
   }
   this.borderRect_.setAttribute('width', this.size_.width);
   this.borderRect_.setAttribute('height', this.size_.height);
-  this.borderRect_.setAttribute('rx',
-      this.getConstants().FIELD_BORDER_RECT_RADIUS);
-  this.borderRect_.setAttribute('ry',
-      this.getConstants().FIELD_BORDER_RECT_RADIUS);
+  this.borderRect_.setAttribute(
+      'rx', this.getConstants().FIELD_BORDER_RECT_RADIUS);
+  this.borderRect_.setAttribute(
+      'ry', this.getConstants().FIELD_BORDER_RECT_RADIUS);
 };
 
 
@@ -714,8 +718,9 @@ Field.prototype.getSize = function() {
   } else if (this.visible_ && this.size_.width == 0) {
     // If the field is not visible the width will be 0 as well, one of the
     // problems with the old system.
-    console.warn('Deprecated use of setting size_.width to 0 to rerender a' +
-      ' field. Set field.isDirty_ to true instead.');
+    console.warn(
+        'Deprecated use of setting size_.width to 0 to rerender a' +
+        ' field. Set field.isDirty_ to true instead.');
     this.render_();
   }
   return this.size_;
@@ -759,12 +764,7 @@ Field.prototype.getScaledBBox = function() {
     scaledWidth = bBox.width;
     scaledHeight = bBox.height;
   }
-  return new Rect(
-      xy.y,
-      xy.y + scaledHeight,
-      xy.x,
-      xy.x + scaledWidth
-  );
+  return new Rect(xy.y, xy.y + scaledHeight, xy.x, xy.x + scaledWidth);
 };
 
 /**
@@ -896,8 +896,7 @@ Field.prototype.setValue = function(newValue) {
  * @return {*} New value, or an Error object.
  * @private
  */
-Field.prototype.processValidation_ = function(newValue,
-    validatedValue) {
+Field.prototype.processValidation_ = function(newValue, validatedValue) {
   if (validatedValue === null) {
     this.doValueInvalid_(newValue);
     if (this.isDirty_) {
@@ -1078,7 +1077,8 @@ Field.prototype.isTabNavigable = function() {
 
 /**
  * Handles the given keyboard shortcut.
- * @param {!ShortcutRegistry.KeyboardShortcut} _shortcut The shortcut to be handled.
+ * @param {!ShortcutRegistry.KeyboardShortcut} _shortcut The shortcut to be
+ *     handled.
  * @return {boolean} True if the shortcut has been handled, false otherwise.
  * @public
  */
@@ -1124,7 +1124,7 @@ Field.prototype.setMarkerSvg = function(markerSvg) {
  */
 Field.prototype.updateMarkers_ = function() {
   const workspace =
-    /** @type {!WorkspaceSvg} */ (this.sourceBlock_.workspace);
+      /** @type {!WorkspaceSvg} */ (this.sourceBlock_.workspace);
   if (workspace.keyboardAccessibilityMode && this.cursorSvg_) {
     workspace.getCursor().draw();
   }

From 5f305041a9de4108a00535060cb1df3b54a8aa34 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 12:57:19 -0700
Subject: [PATCH 205/833] Migrate core/field_colour.js to ES6 const/let

---
 core/field_colour.js | 58 ++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/core/field_colour.js b/core/field_colour.js
index 17d593f0e..632bf6965 100644
--- a/core/field_colour.js
+++ b/core/field_colour.js
@@ -233,7 +233,7 @@ Blockly.FieldColour.prototype.doValueUpdate_ = function(newValue) {
  * @return {string} Text representing the value of this field.
  */
 Blockly.FieldColour.prototype.getText = function() {
-  var colour = /** @type {string} */ (this.value_);
+  let colour = /** @type {string} */ (this.value_);
   // Try to use #rgb format if possible, rather than #rrggbb.
   if (/^#(.)\1(.)\2(.)\3$/.test(colour)) {
     colour = '#' + colour[1] + colour[3] + colour[5];
@@ -339,8 +339,8 @@ Blockly.FieldColour.prototype.showEditor_ = function() {
  * @private
  */
 Blockly.FieldColour.prototype.onClick_ = function(e) {
-  var cell = /** @type {!Element} */ (e.target);
-  var colour = cell && cell.label;
+  const cell = /** @type {!Element} */ (e.target);
+  const colour = cell && cell.label;
   if (colour !== null) {
     this.setValue(colour);
     Blockly.DropDownDiv.hideIfOwner(this);
@@ -354,7 +354,7 @@ Blockly.FieldColour.prototype.onClick_ = function(e) {
  * @private
  */
 Blockly.FieldColour.prototype.onKeyDown_ = function(e) {
-  var handled = false;
+  let handled = false;
   if (e.keyCode === Blockly.utils.KeyCodes.UP) {
     this.moveHighlightBy_(0, -1);
     handled = true;
@@ -369,9 +369,9 @@ Blockly.FieldColour.prototype.onKeyDown_ = function(e) {
     handled = true;
   } else if (e.keyCode === Blockly.utils.KeyCodes.ENTER) {
     // Select the highlighted colour.
-    var highlighted = this.getHighlighted_();
+    const highlighted = this.getHighlighted_();
     if (highlighted) {
-      var colour = highlighted && highlighted.label;
+      const colour = highlighted && highlighted.label;
       if (colour !== null) {
         this.setValue(colour);
       }
@@ -391,12 +391,12 @@ Blockly.FieldColour.prototype.onKeyDown_ = function(e) {
  * @private
  */
 Blockly.FieldColour.prototype.moveHighlightBy_ = function(dx, dy) {
-  var colours = this.colours_ || Blockly.FieldColour.COLOURS;
-  var columns = this.columns_ || Blockly.FieldColour.COLUMNS;
+  const colours = this.colours_ || Blockly.FieldColour.COLOURS;
+  const columns = this.columns_ || Blockly.FieldColour.COLUMNS;
 
   // Get the current x and y coordinates
-  var x = this.highlightedIndex_ % columns;
-  var y = Math.floor(this.highlightedIndex_ / columns);
+  let x = this.highlightedIndex_ % columns;
+  let y = Math.floor(this.highlightedIndex_ / columns);
 
   // Add the offset
   x += dx;
@@ -434,8 +434,8 @@ Blockly.FieldColour.prototype.moveHighlightBy_ = function(dx, dy) {
   }
 
   // Move the highlight to the new coordinates.
-  var cell = /** @type {!Element} */ (this.picker_.childNodes[y].childNodes[x]);
-  var index = (y * columns) + x;
+  const cell = /** @type {!Element} */ (this.picker_.childNodes[y].childNodes[x]);
+  const index = (y * columns) + x;
   this.setHighlightedCell_(cell, index);
 };
 
@@ -445,8 +445,8 @@ Blockly.FieldColour.prototype.moveHighlightBy_ = function(dx, dy) {
  * @private
  */
 Blockly.FieldColour.prototype.onMouseMove_ = function(e) {
-  var cell = /** @type {!Element} */ (e.target);
-  var index = cell && Number(cell.getAttribute('data-index'));
+  const cell = /** @type {!Element} */ (e.target);
+  const index = cell && Number(cell.getAttribute('data-index'));
   if (index !== null && index !== this.highlightedIndex_) {
     this.setHighlightedCell_(cell, index);
   }
@@ -467,7 +467,7 @@ Blockly.FieldColour.prototype.onMouseEnter_ = function() {
  */
 Blockly.FieldColour.prototype.onMouseLeave_ = function() {
   this.picker_.blur();
-  var highlighted = this.getHighlighted_();
+  const highlighted = this.getHighlighted_();
   if (highlighted) {
     Blockly.utils.dom.removeClass(highlighted, 'blocklyColourHighlighted');
   }
@@ -479,14 +479,14 @@ Blockly.FieldColour.prototype.onMouseLeave_ = function() {
  * @private
  */
 Blockly.FieldColour.prototype.getHighlighted_ = function() {
-  var columns = this.columns_ || Blockly.FieldColour.COLUMNS;
-  var x = this.highlightedIndex_ % columns;
-  var y = Math.floor(this.highlightedIndex_ / columns);
-  var row = this.picker_.childNodes[y];
+  const columns = this.columns_ || Blockly.FieldColour.COLUMNS;
+  const x = this.highlightedIndex_ % columns;
+  const y = Math.floor(this.highlightedIndex_ / columns);
+  const row = this.picker_.childNodes[y];
   if (!row) {
     return null;
   }
-  var col = /** @type {HTMLElement} */ (row.childNodes[x]);
+  const col = /** @type {HTMLElement} */ (row.childNodes[x]);
   return col;
 };
 
@@ -498,7 +498,7 @@ Blockly.FieldColour.prototype.getHighlighted_ = function() {
  */
 Blockly.FieldColour.prototype.setHighlightedCell_ = function(cell, index) {
   // Unhighlight the current item.
-  var highlighted = this.getHighlighted_();
+  const highlighted = this.getHighlighted_();
   if (highlighted) {
     Blockly.utils.dom.removeClass(highlighted, 'blocklyColourHighlighted');
   }
@@ -517,12 +517,12 @@ Blockly.FieldColour.prototype.setHighlightedCell_ = function(cell, index) {
  * @private
  */
 Blockly.FieldColour.prototype.dropdownCreate_ = function() {
-  var columns = this.columns_ || Blockly.FieldColour.COLUMNS;
-  var colours = this.colours_ || Blockly.FieldColour.COLOURS;
-  var titles = this.titles_ || Blockly.FieldColour.TITLES;
-  var selectedColour = this.getValue();
+  const columns = this.columns_ || Blockly.FieldColour.COLUMNS;
+  const colours = this.colours_ || Blockly.FieldColour.COLOURS;
+  const titles = this.titles_ || Blockly.FieldColour.TITLES;
+  const selectedColour = this.getValue();
   // Create the palette.
-  var table = document.createElement('table');
+  const table = document.createElement('table');
   table.className = 'blocklyColourTable';
   table.tabIndex = 0;
   table.dir = 'ltr';
@@ -532,14 +532,14 @@ Blockly.FieldColour.prototype.dropdownCreate_ = function() {
       Math.floor(colours.length / columns));
   Blockly.utils.aria.setState(table, Blockly.utils.aria.State.COLCOUNT,
       columns);
-  var row;
-  for (var i = 0; i < colours.length; i++) {
+  let row;
+  for (let i = 0; i < colours.length; i++) {
     if (i % columns == 0) {
       row = document.createElement('tr');
       Blockly.utils.aria.setRole(row, Blockly.utils.aria.Role.ROW);
       table.appendChild(row);
     }
-    var cell = document.createElement('td');
+    const cell = document.createElement('td');
     row.appendChild(cell);
     cell.label = colours[i];  // This becomes the value, if clicked.
     cell.title = titles[i] || colours[i];

From 03e1725f3244bfbedc9934b2ca339f73cbfcb646 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 13:00:05 -0700
Subject: [PATCH 206/833] Migrate core/field_colour.js to goog.module

---
 core/field_colour.js | 99 +++++++++++++++++++++++---------------------
 tests/deps.js        |  2 +-
 2 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/core/field_colour.js b/core/field_colour.js
index 632bf6965..9d342150c 100644
--- a/core/field_colour.js
+++ b/core/field_colour.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.FieldColour');
+goog.module('Blockly.FieldColour');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.Css');
@@ -41,8 +42,8 @@ goog.require('Blockly.utils.Size');
  * @extends {Blockly.Field}
  * @constructor
  */
-Blockly.FieldColour = function(opt_value, opt_validator, opt_config) {
-  Blockly.FieldColour.superClass_.constructor.call(
+const FieldColour = function(opt_value, opt_validator, opt_config) {
+  FieldColour.superClass_.constructor.call(
       this, opt_value, opt_validator, opt_config);
 
   /**
@@ -94,16 +95,16 @@ Blockly.FieldColour = function(opt_value, opt_validator, opt_config) {
    */
   this.onKeyDownWrapper_ = null;
 };
-Blockly.utils.object.inherits(Blockly.FieldColour, Blockly.Field);
+Blockly.utils.object.inherits(FieldColour, Blockly.Field);
 
 /**
  * Construct a FieldColour from a JSON arg object.
  * @param {!Object} options A JSON object with options (colour).
- * @return {!Blockly.FieldColour} The new field instance.
+ * @return {!FieldColour} The new field instance.
  * @package
  * @nocollapse
  */
-Blockly.FieldColour.fromJson = function(options) {
+FieldColour.fromJson = function(options) {
   // `this` might be a subclass of FieldColour if that class doesn't override
   // the static fromJson method.
   return new this(options['colour'], undefined, options);
@@ -114,12 +115,12 @@ Blockly.FieldColour.fromJson = function(options) {
  * are not. Editable fields should also be serializable.
  * @type {boolean}
  */
-Blockly.FieldColour.prototype.SERIALIZABLE = true;
+FieldColour.prototype.SERIALIZABLE = true;
 
 /**
  * Mouse cursor style when over the hotspot that initiates the editor.
  */
-Blockly.FieldColour.prototype.CURSOR = 'default';
+FieldColour.prototype.CURSOR = 'default';
 
 /**
  * Used to tell if the field needs to be rendered the next time the block is
@@ -128,21 +129,21 @@ Blockly.FieldColour.prototype.CURSOR = 'default';
  * @type {boolean}
  * @protected
  */
-Blockly.FieldColour.prototype.isDirty_ = false;
+FieldColour.prototype.isDirty_ = false;
 
 /**
  * Array of colours used by this field.  If null, use the global list.
  * @type {Array<string>}
  * @private
  */
-Blockly.FieldColour.prototype.colours_ = null;
+FieldColour.prototype.colours_ = null;
 
 /**
  * Array of colour tooltips used by this field.  If null, use the global list.
  * @type {Array<string>}
  * @private
  */
-Blockly.FieldColour.prototype.titles_ = null;
+FieldColour.prototype.titles_ = null;
 
 /**
  * Number of colour columns used by this field.  If 0, use the global setting.
@@ -150,7 +151,7 @@ Blockly.FieldColour.prototype.titles_ = null;
  * @type {number}
  * @private
  */
-Blockly.FieldColour.prototype.columns_ = 0;
+FieldColour.prototype.columns_ = 0;
 
 /**
  * Configure the field based on the given map of options.
@@ -158,8 +159,8 @@ Blockly.FieldColour.prototype.columns_ = 0;
  * @protected
  * @override
  */
-Blockly.FieldColour.prototype.configure_ = function(config) {
-  Blockly.FieldColour.superClass_.configure_.call(this, config);
+FieldColour.prototype.configure_ = function(config) {
+  FieldColour.superClass_.configure_.call(this, config);
   if (config['colourOptions']) {
     this.colours_ = config['colourOptions'];
     this.titles_ = config['colourTitles'];
@@ -173,7 +174,7 @@ Blockly.FieldColour.prototype.configure_ = function(config) {
  * Create the block UI for this colour field.
  * @package
  */
-Blockly.FieldColour.prototype.initView = function() {
+FieldColour.prototype.initView = function() {
   this.size_ = new Blockly.utils.Size(
       this.getConstants().FIELD_COLOUR_DEFAULT_WIDTH,
       this.getConstants().FIELD_COLOUR_DEFAULT_HEIGHT);
@@ -188,7 +189,7 @@ Blockly.FieldColour.prototype.initView = function() {
 /**
  * @override
  */
-Blockly.FieldColour.prototype.applyColour = function() {
+FieldColour.prototype.applyColour = function() {
   if (!this.getConstants().FIELD_COLOUR_FULL_BLOCK) {
     if (this.borderRect_) {
       this.borderRect_.style.fill = /** @type {string} */ (this.getValue());
@@ -205,7 +206,7 @@ Blockly.FieldColour.prototype.applyColour = function() {
  * @return {?string} A valid colour, or null if invalid.
  * @protected
  */
-Blockly.FieldColour.prototype.doClassValidation_ = function(opt_newValue) {
+FieldColour.prototype.doClassValidation_ = function(opt_newValue) {
   if (typeof opt_newValue != 'string') {
     return null;
   }
@@ -218,7 +219,7 @@ Blockly.FieldColour.prototype.doClassValidation_ = function(opt_newValue) {
  * that this is a colour in '#rrggbb' format.
  * @protected
  */
-Blockly.FieldColour.prototype.doValueUpdate_ = function(newValue) {
+FieldColour.prototype.doValueUpdate_ = function(newValue) {
   this.value_ = newValue;
   if (this.borderRect_) {
     this.borderRect_.style.fill = /** @type {string} */ (newValue);
@@ -232,7 +233,7 @@ Blockly.FieldColour.prototype.doValueUpdate_ = function(newValue) {
  * Get the text for this field.  Used when the block is collapsed.
  * @return {string} Text representing the value of this field.
  */
-Blockly.FieldColour.prototype.getText = function() {
+FieldColour.prototype.getText = function() {
   let colour = /** @type {string} */ (this.value_);
   // Try to use #rgb format if possible, rather than #rrggbb.
   if (/^#(.)\1(.)\2(.)\3$/.test(colour)) {
@@ -247,7 +248,7 @@ Blockly.FieldColour.prototype.getText = function() {
  * All colour pickers use this unless overridden with setColours.
  * @type {!Array<string>}
  */
-Blockly.FieldColour.COLOURS = [
+FieldColour.COLOURS = [
   // grays
   '#ffffff', '#cccccc', '#c0c0c0', '#999999', '#666666', '#333333', '#000000',
   // reds
@@ -275,7 +276,7 @@ Blockly.FieldColour.COLOURS = [
  * @type {*}
  * @protected
  */
-Blockly.FieldColour.prototype.DEFAULT_VALUE = Blockly.FieldColour.COLOURS[0];
+FieldColour.prototype.DEFAULT_VALUE = FieldColour.COLOURS[0];
 
 /**
  * An array of tooltip strings for the palette.  If not the same length as
@@ -283,23 +284,23 @@ Blockly.FieldColour.prototype.DEFAULT_VALUE = Blockly.FieldColour.COLOURS[0];
  * All colour pickers use this unless overridden with setColours.
  * @type {!Array<string>}
  */
-Blockly.FieldColour.TITLES = [];
+FieldColour.TITLES = [];
 
 /**
  * Number of columns in the palette.
  * All colour pickers use this unless overridden with setColumns.
  */
-Blockly.FieldColour.COLUMNS = 7;
+FieldColour.COLUMNS = 7;
 
 /**
  * Set a custom colour grid for this field.
  * @param {Array<string>} colours Array of colours for this block,
- *     or null to use default (Blockly.FieldColour.COLOURS).
+ *     or null to use default (FieldColour.COLOURS).
  * @param {Array<string>=} opt_titles Optional array of colour tooltips,
- *     or null to use default (Blockly.FieldColour.TITLES).
- * @return {!Blockly.FieldColour} Returns itself (for method chaining).
+ *     or null to use default (FieldColour.TITLES).
+ * @return {!FieldColour} Returns itself (for method chaining).
  */
-Blockly.FieldColour.prototype.setColours = function(colours, opt_titles) {
+FieldColour.prototype.setColours = function(colours, opt_titles) {
   this.colours_ = colours;
   if (opt_titles) {
     this.titles_ = opt_titles;
@@ -310,10 +311,10 @@ Blockly.FieldColour.prototype.setColours = function(colours, opt_titles) {
 /**
  * Set a custom grid size for this field.
  * @param {number} columns Number of columns for this block,
- *     or 0 to use default (Blockly.FieldColour.COLUMNS).
- * @return {!Blockly.FieldColour} Returns itself (for method chaining).
+ *     or 0 to use default (FieldColour.COLUMNS).
+ * @return {!FieldColour} Returns itself (for method chaining).
  */
-Blockly.FieldColour.prototype.setColumns = function(columns) {
+FieldColour.prototype.setColumns = function(columns) {
   this.columns_ = columns;
   return this;
 };
@@ -322,7 +323,7 @@ Blockly.FieldColour.prototype.setColumns = function(columns) {
  * Create and show the colour field's editor.
  * @protected
  */
-Blockly.FieldColour.prototype.showEditor_ = function() {
+FieldColour.prototype.showEditor_ = function() {
   this.dropdownCreate_();
   Blockly.DropDownDiv.getContentDiv().appendChild(this.picker_);
 
@@ -338,7 +339,7 @@ Blockly.FieldColour.prototype.showEditor_ = function() {
  * @param {!MouseEvent} e Mouse event.
  * @private
  */
-Blockly.FieldColour.prototype.onClick_ = function(e) {
+FieldColour.prototype.onClick_ = function(e) {
   const cell = /** @type {!Element} */ (e.target);
   const colour = cell && cell.label;
   if (colour !== null) {
@@ -353,7 +354,7 @@ Blockly.FieldColour.prototype.onClick_ = function(e) {
  * @param {!KeyboardEvent} e Keyboard event.
  * @private
  */
-Blockly.FieldColour.prototype.onKeyDown_ = function(e) {
+FieldColour.prototype.onKeyDown_ = function(e) {
   let handled = false;
   if (e.keyCode === Blockly.utils.KeyCodes.UP) {
     this.moveHighlightBy_(0, -1);
@@ -390,9 +391,9 @@ Blockly.FieldColour.prototype.onKeyDown_ = function(e) {
  * @param {number} dy Change of y
  * @private
  */
-Blockly.FieldColour.prototype.moveHighlightBy_ = function(dx, dy) {
-  const colours = this.colours_ || Blockly.FieldColour.COLOURS;
-  const columns = this.columns_ || Blockly.FieldColour.COLUMNS;
+FieldColour.prototype.moveHighlightBy_ = function(dx, dy) {
+  const colours = this.colours_ || FieldColour.COLOURS;
+  const columns = this.columns_ || FieldColour.COLUMNS;
 
   // Get the current x and y coordinates
   let x = this.highlightedIndex_ % columns;
@@ -444,7 +445,7 @@ Blockly.FieldColour.prototype.moveHighlightBy_ = function(dx, dy) {
  * @param {!MouseEvent} e Mouse event.
  * @private
  */
-Blockly.FieldColour.prototype.onMouseMove_ = function(e) {
+FieldColour.prototype.onMouseMove_ = function(e) {
   const cell = /** @type {!Element} */ (e.target);
   const index = cell && Number(cell.getAttribute('data-index'));
   if (index !== null && index !== this.highlightedIndex_) {
@@ -456,7 +457,7 @@ Blockly.FieldColour.prototype.onMouseMove_ = function(e) {
  * Handle a mouse enter event. Focus the picker.
  * @private
  */
-Blockly.FieldColour.prototype.onMouseEnter_ = function() {
+FieldColour.prototype.onMouseEnter_ = function() {
   this.picker_.focus({preventScroll:true});
 };
 
@@ -465,7 +466,7 @@ Blockly.FieldColour.prototype.onMouseEnter_ = function() {
  * the currently highlighted colour.
  * @private
  */
-Blockly.FieldColour.prototype.onMouseLeave_ = function() {
+FieldColour.prototype.onMouseLeave_ = function() {
   this.picker_.blur();
   const highlighted = this.getHighlighted_();
   if (highlighted) {
@@ -478,8 +479,8 @@ Blockly.FieldColour.prototype.onMouseLeave_ = function() {
  * @return {?HTMLElement} Highlighted item (null if none).
  * @private
  */
-Blockly.FieldColour.prototype.getHighlighted_ = function() {
-  const columns = this.columns_ || Blockly.FieldColour.COLUMNS;
+FieldColour.prototype.getHighlighted_ = function() {
+  const columns = this.columns_ || FieldColour.COLUMNS;
   const x = this.highlightedIndex_ % columns;
   const y = Math.floor(this.highlightedIndex_ / columns);
   const row = this.picker_.childNodes[y];
@@ -496,7 +497,7 @@ Blockly.FieldColour.prototype.getHighlighted_ = function() {
  * @param {number} index the index of the new cell
  * @private
  */
-Blockly.FieldColour.prototype.setHighlightedCell_ = function(cell, index) {
+FieldColour.prototype.setHighlightedCell_ = function(cell, index) {
   // Unhighlight the current item.
   const highlighted = this.getHighlighted_();
   if (highlighted) {
@@ -516,10 +517,10 @@ Blockly.FieldColour.prototype.setHighlightedCell_ = function(cell, index) {
  * Create a colour picker dropdown editor.
  * @private
  */
-Blockly.FieldColour.prototype.dropdownCreate_ = function() {
-  const columns = this.columns_ || Blockly.FieldColour.COLUMNS;
-  const colours = this.colours_ || Blockly.FieldColour.COLOURS;
-  const titles = this.titles_ || Blockly.FieldColour.TITLES;
+FieldColour.prototype.dropdownCreate_ = function() {
+  const columns = this.columns_ || FieldColour.COLUMNS;
+  const colours = this.colours_ || FieldColour.COLOURS;
+  const titles = this.titles_ || FieldColour.TITLES;
   const selectedColour = this.getValue();
   // Create the palette.
   const table = document.createElement('table');
@@ -576,7 +577,7 @@ Blockly.FieldColour.prototype.dropdownCreate_ = function() {
  * Disposes of events and DOM-references belonging to the colour editor.
  * @private
  */
-Blockly.FieldColour.prototype.dropdownDispose_ = function() {
+FieldColour.prototype.dropdownDispose_ = function() {
   if (this.onClickWrapper_) {
     Blockly.browserEvents.unbind(this.onClickWrapper_);
     this.onClickWrapper_ = null;
@@ -637,4 +638,6 @@ Blockly.Css.register([
   /* eslint-enable indent */
 ]);
 
-Blockly.fieldRegistry.register('field_colour', Blockly.FieldColour);
+Blockly.fieldRegistry.register('field_colour', FieldColour);
+
+exports = FieldColour;
diff --git a/tests/deps.js b/tests/deps.js
index 979c58c74..0e33cec9b 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -51,7 +51,7 @@ goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly
 goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible', 'Blockly.IRegistrable', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es5'});
 goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object']);
-goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.IdGenerator', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.IdGenerator', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['Blockly.DropDownDiv', 'Blockly.Field', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.object']);

From ba30031d366e2b7f9af77f1be01c433487d76842 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 13:13:31 -0700
Subject: [PATCH 207/833] Migrate core/field_colour.js to named requires

---
 core/field_colour.js | 119 ++++++++++++++++++++++---------------------
 1 file changed, 60 insertions(+), 59 deletions(-)

diff --git a/core/field_colour.js b/core/field_colour.js
index 9d342150c..879c340bc 100644
--- a/core/field_colour.js
+++ b/core/field_colour.js
@@ -13,20 +13,21 @@
 goog.module('Blockly.FieldColour');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.Css');
-goog.require('Blockly.DropDownDiv');
+const Css = goog.require('Blockly.Css');
+const DropDownDiv = goog.require('Blockly.DropDownDiv');
+const Field = goog.require('Blockly.Field');
+const IdGenerator = goog.require('Blockly.utils.IdGenerator');
+const KeyCodes = goog.require('Blockly.utils.KeyCodes');
+const Size = goog.require('Blockly.utils.Size');
+const aria = goog.require('Blockly.utils.aria');
+const colour = goog.require('Blockly.utils.colour');
+const fieldRegistry = goog.require('Blockly.fieldRegistry');
+const {addClass, removeClass} = goog.require('Blockly.utils.dom');
+/* eslint-disable-next-line no-unused-vars */
+const {conditionalBind, unbind, Data} = goog.require('Blockly.browserEvents');
+const {inherits} = goog.require('Blockly.utils.object');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
-goog.require('Blockly.Field');
-goog.require('Blockly.fieldRegistry');
-goog.require('Blockly.utils.aria');
-goog.require('Blockly.utils.colour');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.IdGenerator');
-goog.require('Blockly.utils.KeyCodes');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Size');
 
 
 /**
@@ -35,11 +36,11 @@ goog.require('Blockly.utils.Size');
  *    '#rrggbb' format. Defaults to the first value in the default colour array.
  * @param {Function=} opt_validator A function that is called to validate
  *    changes to the field's value. Takes in a colour string & returns a
- *    validated colour string ('#rrggbb' format), or null to abort the change.
+ *    validated colour string ('#rrggbb' format), or null to abort the change.Blockly.
  * @param {Object=} opt_config A map of options used to configure the field.
  *    See the [field creation documentation]{@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/colour}
  *    for a list of properties this parameter supports.
- * @extends {Blockly.Field}
+ * @extends {Field}
  * @constructor
  */
 const FieldColour = function(opt_value, opt_validator, opt_config) {
@@ -62,40 +63,40 @@ const FieldColour = function(opt_value, opt_validator, opt_config) {
 
   /**
    * Mouse click event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?Data}
    * @private
    */
   this.onClickWrapper_ = null;
 
   /**
    * Mouse move event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?Data}
    * @private
    */
   this.onMouseMoveWrapper_ = null;
 
   /**
    * Mouse enter event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?Data}
    * @private
    */
   this.onMouseEnterWrapper_ = null;
 
   /**
    * Mouse leave event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?Data}
    * @private
    */
   this.onMouseLeaveWrapper_ = null;
 
   /**
    * Key down event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?Data}
    * @private
    */
   this.onKeyDownWrapper_ = null;
 };
-Blockly.utils.object.inherits(FieldColour, Blockly.Field);
+inherits(FieldColour, Field);
 
 /**
  * Construct a FieldColour from a JSON arg object.
@@ -175,7 +176,7 @@ FieldColour.prototype.configure_ = function(config) {
  * @package
  */
 FieldColour.prototype.initView = function() {
-  this.size_ = new Blockly.utils.Size(
+  this.size_ = new Size(
       this.getConstants().FIELD_COLOUR_DEFAULT_WIDTH,
       this.getConstants().FIELD_COLOUR_DEFAULT_HEIGHT);
   if (!this.getConstants().FIELD_COLOUR_FULL_BLOCK) {
@@ -210,7 +211,7 @@ FieldColour.prototype.doClassValidation_ = function(opt_newValue) {
   if (typeof opt_newValue != 'string') {
     return null;
   }
-  return Blockly.utils.colour.parse(opt_newValue);
+  return colour.parse(opt_newValue);
 };
 
 /**
@@ -325,9 +326,9 @@ FieldColour.prototype.setColumns = function(columns) {
  */
 FieldColour.prototype.showEditor_ = function() {
   this.dropdownCreate_();
-  Blockly.DropDownDiv.getContentDiv().appendChild(this.picker_);
+  DropDownDiv.getContentDiv().appendChild(this.picker_);
 
-  Blockly.DropDownDiv.showPositionedByField(
+  DropDownDiv.showPositionedByField(
       this, this.dropdownDispose_.bind(this));
 
   // Focus so we can start receiving keyboard events.
@@ -344,7 +345,7 @@ FieldColour.prototype.onClick_ = function(e) {
   const colour = cell && cell.label;
   if (colour !== null) {
     this.setValue(colour);
-    Blockly.DropDownDiv.hideIfOwner(this);
+    DropDownDiv.hideIfOwner(this);
   }
 };
 
@@ -356,19 +357,19 @@ FieldColour.prototype.onClick_ = function(e) {
  */
 FieldColour.prototype.onKeyDown_ = function(e) {
   let handled = false;
-  if (e.keyCode === Blockly.utils.KeyCodes.UP) {
+  if (e.keyCode === KeyCodes.UP) {
     this.moveHighlightBy_(0, -1);
     handled = true;
-  } else if (e.keyCode === Blockly.utils.KeyCodes.DOWN) {
+  } else if (e.keyCode === KeyCodes.DOWN) {
     this.moveHighlightBy_(0, 1);
     handled = true;
-  } else if (e.keyCode === Blockly.utils.KeyCodes.LEFT) {
+  } else if (e.keyCode === KeyCodes.LEFT) {
     this.moveHighlightBy_(-1, 0);
     handled = true;
-  } else if (e.keyCode === Blockly.utils.KeyCodes.RIGHT) {
+  } else if (e.keyCode === KeyCodes.RIGHT) {
     this.moveHighlightBy_(1, 0);
     handled = true;
-  } else if (e.keyCode === Blockly.utils.KeyCodes.ENTER) {
+  } else if (e.keyCode === KeyCodes.ENTER) {
     // Select the highlighted colour.
     const highlighted = this.getHighlighted_();
     if (highlighted) {
@@ -377,7 +378,7 @@ FieldColour.prototype.onKeyDown_ = function(e) {
         this.setValue(colour);
       }
     }
-    Blockly.DropDownDiv.hideWithoutAnimation();
+    DropDownDiv.hideWithoutAnimation();
     handled = true;
   }
   if (handled) {
@@ -470,7 +471,7 @@ FieldColour.prototype.onMouseLeave_ = function() {
   this.picker_.blur();
   const highlighted = this.getHighlighted_();
   if (highlighted) {
-    Blockly.utils.dom.removeClass(highlighted, 'blocklyColourHighlighted');
+    removeClass(highlighted, 'blocklyColourHighlighted');
   }
 };
 
@@ -501,16 +502,16 @@ FieldColour.prototype.setHighlightedCell_ = function(cell, index) {
   // Unhighlight the current item.
   const highlighted = this.getHighlighted_();
   if (highlighted) {
-    Blockly.utils.dom.removeClass(highlighted, 'blocklyColourHighlighted');
+    removeClass(highlighted, 'blocklyColourHighlighted');
   }
   // Highlight new item.
-  Blockly.utils.dom.addClass(cell, 'blocklyColourHighlighted');
+  addClass(cell, 'blocklyColourHighlighted');
   // Set new highlighted index.
   this.highlightedIndex_ = index;
 
   // Update accessibility roles.
-  Blockly.utils.aria.setState(/** @type {!Element} */ (this.picker_),
-      Blockly.utils.aria.State.ACTIVEDESCENDANT, cell.getAttribute('id'));
+  aria.setState(/** @type {!Element} */ (this.picker_),
+      aria.State.ACTIVEDESCENDANT, cell.getAttribute('id'));
 };
 
 /**
@@ -527,30 +528,30 @@ FieldColour.prototype.dropdownCreate_ = function() {
   table.className = 'blocklyColourTable';
   table.tabIndex = 0;
   table.dir = 'ltr';
-  Blockly.utils.aria.setRole(table, Blockly.utils.aria.Role.GRID);
-  Blockly.utils.aria.setState(table, Blockly.utils.aria.State.EXPANDED, true);
-  Blockly.utils.aria.setState(table, Blockly.utils.aria.State.ROWCOUNT,
+  aria.setRole(table, aria.Role.GRID);
+  aria.setState(table, aria.State.EXPANDED, true);
+  aria.setState(table, aria.State.ROWCOUNT,
       Math.floor(colours.length / columns));
-  Blockly.utils.aria.setState(table, Blockly.utils.aria.State.COLCOUNT,
+  aria.setState(table, aria.State.COLCOUNT,
       columns);
   let row;
   for (let i = 0; i < colours.length; i++) {
     if (i % columns == 0) {
       row = document.createElement('tr');
-      Blockly.utils.aria.setRole(row, Blockly.utils.aria.Role.ROW);
+      aria.setRole(row, aria.Role.ROW);
       table.appendChild(row);
     }
     const cell = document.createElement('td');
     row.appendChild(cell);
     cell.label = colours[i];  // This becomes the value, if clicked.
     cell.title = titles[i] || colours[i];
-    cell.id = Blockly.utils.IdGenerator.getNextUniqueId();
+    cell.id = IdGenerator.getNextUniqueId();
     cell.setAttribute('data-index', i);
-    Blockly.utils.aria.setRole(cell, Blockly.utils.aria.Role.GRIDCELL);
-    Blockly.utils.aria.setState(cell,
-        Blockly.utils.aria.State.LABEL, colours[i]);
-    Blockly.utils.aria.setState(cell,
-        Blockly.utils.aria.State.SELECTED, colours[i] == selectedColour);
+    aria.setRole(cell, aria.Role.GRIDCELL);
+    aria.setState(cell,
+        aria.State.LABEL, colours[i]);
+    aria.setState(cell,
+        aria.State.SELECTED, colours[i] == selectedColour);
     cell.style.backgroundColor = colours[i];
     if (colours[i] == selectedColour) {
       cell.className = 'blocklyColourSelected';
@@ -559,15 +560,15 @@ FieldColour.prototype.dropdownCreate_ = function() {
   }
 
   // Configure event handler on the table to listen for any event in a cell.
-  this.onClickWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onClickWrapper_ = conditionalBind(
       table, 'click', this, this.onClick_, true);
-  this.onMouseMoveWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onMouseMoveWrapper_ = conditionalBind(
       table, 'mousemove', this, this.onMouseMove_, true);
-  this.onMouseEnterWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onMouseEnterWrapper_ = conditionalBind(
       table, 'mouseenter', this, this.onMouseEnter_, true);
-  this.onMouseLeaveWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onMouseLeaveWrapper_ = conditionalBind(
       table, 'mouseleave', this, this.onMouseLeave_, true);
-  this.onKeyDownWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onKeyDownWrapper_ = conditionalBind(
       table, 'keydown', this, this.onKeyDown_);
 
   this.picker_ = table;
@@ -579,23 +580,23 @@ FieldColour.prototype.dropdownCreate_ = function() {
  */
 FieldColour.prototype.dropdownDispose_ = function() {
   if (this.onClickWrapper_) {
-    Blockly.browserEvents.unbind(this.onClickWrapper_);
+    unbind(this.onClickWrapper_);
     this.onClickWrapper_ = null;
   }
   if (this.onMouseMoveWrapper_) {
-    Blockly.browserEvents.unbind(this.onMouseMoveWrapper_);
+    unbind(this.onMouseMoveWrapper_);
     this.onMouseMoveWrapper_ = null;
   }
   if (this.onMouseEnterWrapper_) {
-    Blockly.browserEvents.unbind(this.onMouseEnterWrapper_);
+    unbind(this.onMouseEnterWrapper_);
     this.onMouseEnterWrapper_ = null;
   }
   if (this.onMouseLeaveWrapper_) {
-    Blockly.browserEvents.unbind(this.onMouseLeaveWrapper_);
+    unbind(this.onMouseLeaveWrapper_);
     this.onMouseLeaveWrapper_ = null;
   }
   if (this.onKeyDownWrapper_) {
-    Blockly.browserEvents.unbind(this.onKeyDownWrapper_);
+    unbind(this.onKeyDownWrapper_);
     this.onKeyDownWrapper_ = null;
   }
   this.picker_ = null;
@@ -605,7 +606,7 @@ FieldColour.prototype.dropdownDispose_ = function() {
 /**
  * CSS for colour picker.  See css.js for use.
  */
-Blockly.Css.register([
+Css.register([
   /* eslint-disable indent */
   '.blocklyColourTable {',
     'border-collapse: collapse;',
@@ -638,6 +639,6 @@ Blockly.Css.register([
   /* eslint-enable indent */
 ]);
 
-Blockly.fieldRegistry.register('field_colour', FieldColour);
+fieldRegistry.register('field_colour', FieldColour);
 
 exports = FieldColour;

From 595f3c0802ce404b8d8987c747278acc1c1c339d Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 13:17:10 -0700
Subject: [PATCH 208/833] clang-format core/field_colour.js

---
 core/field_colour.js | 57 ++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/core/field_colour.js b/core/field_colour.js
index 879c340bc..a3dc0bf72 100644
--- a/core/field_colour.js
+++ b/core/field_colour.js
@@ -36,9 +36,11 @@ goog.require('Blockly.Events.BlockChange');
  *    '#rrggbb' format. Defaults to the first value in the default colour array.
  * @param {Function=} opt_validator A function that is called to validate
  *    changes to the field's value. Takes in a colour string & returns a
- *    validated colour string ('#rrggbb' format), or null to abort the change.Blockly.
+ *    validated colour string ('#rrggbb' format), or null to abort the
+ *    change.Blockly.
  * @param {Object=} opt_config A map of options used to configure the field.
- *    See the [field creation documentation]{@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/colour}
+ *    See the [field creation documentation]{@link
+ *    https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/colour}
  *    for a list of properties this parameter supports.
  * @extends {Field}
  * @constructor
@@ -328,11 +330,10 @@ FieldColour.prototype.showEditor_ = function() {
   this.dropdownCreate_();
   DropDownDiv.getContentDiv().appendChild(this.picker_);
 
-  DropDownDiv.showPositionedByField(
-      this, this.dropdownDispose_.bind(this));
+  DropDownDiv.showPositionedByField(this, this.dropdownDispose_.bind(this));
 
   // Focus so we can start receiving keyboard events.
-  this.picker_.focus({preventScroll:true});
+  this.picker_.focus({preventScroll: true});
 };
 
 /**
@@ -416,8 +417,7 @@ FieldColour.prototype.moveHighlightBy_ = function(dx, dy) {
   } else if (dx > 0) {
     // Move right one grid cell, even in RTL.
     // Loop to the start of the next row, if there's room.
-    if (x > columns - 1 &&
-      y < Math.floor(colours.length / columns) - 1) {
+    if (x > columns - 1 && y < Math.floor(colours.length / columns) - 1) {
       x = 0;
       y++;
     } else if (x > columns - 1) {
@@ -436,7 +436,8 @@ FieldColour.prototype.moveHighlightBy_ = function(dx, dy) {
   }
 
   // Move the highlight to the new coordinates.
-  const cell = /** @type {!Element} */ (this.picker_.childNodes[y].childNodes[x]);
+  const cell =
+      /** @type {!Element} */ (this.picker_.childNodes[y].childNodes[x]);
   const index = (y * columns) + x;
   this.setHighlightedCell_(cell, index);
 };
@@ -459,7 +460,7 @@ FieldColour.prototype.onMouseMove_ = function(e) {
  * @private
  */
 FieldColour.prototype.onMouseEnter_ = function() {
-  this.picker_.focus({preventScroll:true});
+  this.picker_.focus({preventScroll: true});
 };
 
 /**
@@ -510,8 +511,9 @@ FieldColour.prototype.setHighlightedCell_ = function(cell, index) {
   this.highlightedIndex_ = index;
 
   // Update accessibility roles.
-  aria.setState(/** @type {!Element} */ (this.picker_),
-      aria.State.ACTIVEDESCENDANT, cell.getAttribute('id'));
+  aria.setState(
+      /** @type {!Element} */ (this.picker_), aria.State.ACTIVEDESCENDANT,
+      cell.getAttribute('id'));
 };
 
 /**
@@ -530,10 +532,9 @@ FieldColour.prototype.dropdownCreate_ = function() {
   table.dir = 'ltr';
   aria.setRole(table, aria.Role.GRID);
   aria.setState(table, aria.State.EXPANDED, true);
-  aria.setState(table, aria.State.ROWCOUNT,
-      Math.floor(colours.length / columns));
-  aria.setState(table, aria.State.COLCOUNT,
-      columns);
+  aria.setState(
+      table, aria.State.ROWCOUNT, Math.floor(colours.length / columns));
+  aria.setState(table, aria.State.COLCOUNT, columns);
   let row;
   for (let i = 0; i < colours.length; i++) {
     if (i % columns == 0) {
@@ -548,10 +549,8 @@ FieldColour.prototype.dropdownCreate_ = function() {
     cell.id = IdGenerator.getNextUniqueId();
     cell.setAttribute('data-index', i);
     aria.setRole(cell, aria.Role.GRIDCELL);
-    aria.setState(cell,
-        aria.State.LABEL, colours[i]);
-    aria.setState(cell,
-        aria.State.SELECTED, colours[i] == selectedColour);
+    aria.setState(cell, aria.State.LABEL, colours[i]);
+    aria.setState(cell, aria.State.SELECTED, colours[i] == selectedColour);
     cell.style.backgroundColor = colours[i];
     if (colours[i] == selectedColour) {
       cell.className = 'blocklyColourSelected';
@@ -560,16 +559,16 @@ FieldColour.prototype.dropdownCreate_ = function() {
   }
 
   // Configure event handler on the table to listen for any event in a cell.
-  this.onClickWrapper_ = conditionalBind(
-      table, 'click', this, this.onClick_, true);
-  this.onMouseMoveWrapper_ = conditionalBind(
-      table, 'mousemove', this, this.onMouseMove_, true);
-  this.onMouseEnterWrapper_ = conditionalBind(
-      table, 'mouseenter', this, this.onMouseEnter_, true);
-  this.onMouseLeaveWrapper_ = conditionalBind(
-      table, 'mouseleave', this, this.onMouseLeave_, true);
-  this.onKeyDownWrapper_ = conditionalBind(
-      table, 'keydown', this, this.onKeyDown_);
+  this.onClickWrapper_ =
+      conditionalBind(table, 'click', this, this.onClick_, true);
+  this.onMouseMoveWrapper_ =
+      conditionalBind(table, 'mousemove', this, this.onMouseMove_, true);
+  this.onMouseEnterWrapper_ =
+      conditionalBind(table, 'mouseenter', this, this.onMouseEnter_, true);
+  this.onMouseLeaveWrapper_ =
+      conditionalBind(table, 'mouseleave', this, this.onMouseLeave_, true);
+  this.onKeyDownWrapper_ =
+      conditionalBind(table, 'keydown', this, this.onKeyDown_);
 
   this.picker_ = table;
 };

From 0d248583c8e542cf979a1e4e14117a4b94113bb1 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 13:26:52 -0700
Subject: [PATCH 209/833] Migrate core/field_dropdown.js to ES6 const/let

---
 core/field_dropdown.js | 102 ++++++++++++++++++++---------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/core/field_dropdown.js b/core/field_dropdown.js
index 5dad752d8..c1554928d 100644
--- a/core/field_dropdown.js
+++ b/core/field_dropdown.js
@@ -299,14 +299,14 @@ Blockly.FieldDropdown.prototype.showEditor_ = function(opt_e) {
   }
   // Element gets created in render.
   this.menu_.render(Blockly.DropDownDiv.getContentDiv());
-  var menuElement = /** @type {!Element} */ (this.menu_.getElement());
+  const menuElement = /** @type {!Element} */ (this.menu_.getElement());
   Blockly.utils.dom.addClass(menuElement, 'blocklyDropdownMenu');
 
   if (this.getConstants().FIELD_DROPDOWN_COLOURED_DIV) {
-    var primaryColour = (this.sourceBlock_.isShadow()) ?
+    const primaryColour = (this.sourceBlock_.isShadow()) ?
         this.sourceBlock_.getParent().getColour() :
         this.sourceBlock_.getColour();
-    var borderColour = (this.sourceBlock_.isShadow()) ?
+    const borderColour = (this.sourceBlock_.isShadow()) ?
         this.sourceBlock_.getParent().style.colourTertiary :
         this.sourceBlock_.style.colourTertiary;
     Blockly.DropDownDiv.setColour(primaryColour, borderColour);
@@ -332,23 +332,23 @@ Blockly.FieldDropdown.prototype.showEditor_ = function(opt_e) {
  * @private
  */
 Blockly.FieldDropdown.prototype.dropdownCreate_ = function() {
-  var menu = new Blockly.Menu();
+  const menu = new Blockly.Menu();
   menu.setRole(Blockly.utils.aria.Role.LISTBOX);
   this.menu_ = menu;
 
-  var options = this.getOptions(false);
+  const options = this.getOptions(false);
   this.selectedMenuItem_ = null;
-  for (var i = 0; i < options.length; i++) {
-    var content = options[i][0];  // Human-readable text or image.
-    var value = options[i][1];    // Language-neutral value.
+  for (let i = 0; i < options.length; i++) {
+    let content = options[i][0];  // Human-readable text or image.
+    const value = options[i][1];    // Language-neutral value.
     if (typeof content == 'object') {
       // An image, not text.
-      var image = new Image(content['width'], content['height']);
+      const image = new Image(content['width'], content['height']);
       image.src = content['src'];
       image.alt = content['alt'] || '';
       content = image;
     }
-    var menuItem = new Blockly.MenuItem(content, value);
+    const menuItem = new Blockly.MenuItem(content, value);
     menuItem.setRole(Blockly.utils.aria.Role.OPTION);
     menuItem.setRightToLeft(this.sourceBlock_.RTL);
     menuItem.setCheckable(true);
@@ -400,15 +400,15 @@ Blockly.FieldDropdown.prototype.onItemSelected_ = function(menu, menuItem) {
  * @private
  */
 Blockly.FieldDropdown.prototype.trimOptions_ = function() {
-  var options = this.menuGenerator_;
+  const options = this.menuGenerator_;
   if (!Array.isArray(options)) {
     return;
   }
-  var hasImages = false;
+  let hasImages = false;
 
   // Localize label text and image alt text.
-  for (var i = 0; i < options.length; i++) {
-    var label = options[i][0];
+  for (let i = 0; i < options.length; i++) {
+    const label = options[i][0];
     if (typeof label == 'string') {
       options[i][0] = Blockly.utils.replaceMessageReferences(label);
     } else {
@@ -421,13 +421,13 @@ Blockly.FieldDropdown.prototype.trimOptions_ = function() {
   if (hasImages || options.length < 2) {
     return;  // Do nothing if too few items or at least one label is an image.
   }
-  var strings = [];
-  for (var i = 0; i < options.length; i++) {
+  const strings = [];
+  for (let i = 0; i < options.length; i++) {
     strings.push(options[i][0]);
   }
-  var shortest = Blockly.utils.string.shortestStringLength(strings);
-  var prefixLength = Blockly.utils.string.commonWordPrefix(strings, shortest);
-  var suffixLength = Blockly.utils.string.commonWordSuffix(strings, shortest);
+  const shortest = Blockly.utils.string.shortestStringLength(strings);
+  const prefixLength = Blockly.utils.string.commonWordPrefix(strings, shortest);
+  const suffixLength = Blockly.utils.string.commonWordSuffix(strings, shortest);
   if (!prefixLength && !suffixLength) {
     return;
   }
@@ -457,11 +457,11 @@ Blockly.FieldDropdown.prototype.trimOptions_ = function() {
  */
 Blockly.FieldDropdown.applyTrim_ = function(options,
     prefixLength, suffixLength) {
-  var newOptions = [];
+  const newOptions = [];
   // Remove the prefix and suffix from the options.
-  for (var i = 0; i < options.length; i++) {
-    var text = options[i][0];
-    var value = options[i][1];
+  for (let i = 0; i < options.length; i++) {
+    let text = options[i][0];
+    const value = options[i][1];
     text = text.substring(prefixLength, text.length - suffixLength);
     newOptions[i] = [text, value];
   }
@@ -502,9 +502,9 @@ Blockly.FieldDropdown.prototype.getOptions = function(opt_useCache) {
  * @protected
  */
 Blockly.FieldDropdown.prototype.doClassValidation_ = function(opt_newValue) {
-  var isValueValid = false;
-  var options = this.getOptions(true);
-  for (var i = 0, option; (option = options[i]); i++) {
+  let isValueValid = false;
+  const options = this.getOptions(true);
+  for (let i = 0, option; (option = options[i]); i++) {
     // Options are tuples of human-readable text and language-neutral values.
     if (option[1] == opt_newValue) {
       isValueValid = true;
@@ -530,8 +530,8 @@ Blockly.FieldDropdown.prototype.doClassValidation_ = function(opt_newValue) {
  */
 Blockly.FieldDropdown.prototype.doValueUpdate_ = function(newValue) {
   Blockly.FieldDropdown.superClass_.doValueUpdate_.call(this, newValue);
-  var options = this.getOptions(true);
-  for (var i = 0, option; (option = options[i]); i++) {
+  const options = this.getOptions(true);
+  for (let i = 0, option; (option = options[i]); i++) {
     if (option[1] == this.value_) {
       this.selectedOption_ = option;
     }
@@ -573,7 +573,7 @@ Blockly.FieldDropdown.prototype.render_ = function() {
   this.imageElement_.style.display = 'none';
 
   // Show correct element.
-  var option = this.selectedOption_ && this.selectedOption_[0];
+  const option = this.selectedOption_ && this.selectedOption_[0];
   if (option && typeof option == 'object') {
     this.renderSelectedImage_(
         /** @type {!Blockly.FieldDropdown.ImageProperties} */ (option));
@@ -597,16 +597,16 @@ Blockly.FieldDropdown.prototype.renderSelectedImage_ = function(imageJson) {
   this.imageElement_.setAttribute('height', imageJson.height);
   this.imageElement_.setAttribute('width', imageJson.width);
 
-  var imageHeight = Number(imageJson.height);
-  var imageWidth = Number(imageJson.width);
+  const imageHeight = Number(imageJson.height);
+  const imageWidth = Number(imageJson.width);
 
   // Height and width include the border rect.
-  var hasBorder = !!this.borderRect_;
-  var height = Math.max(
+  const hasBorder = !!this.borderRect_;
+  const height = Math.max(
       hasBorder ? this.getConstants().FIELD_DROPDOWN_BORDER_RECT_HEIGHT : 0,
       imageHeight + Blockly.FieldDropdown.IMAGE_Y_PADDING);
-  var xPadding = hasBorder ? this.getConstants().FIELD_BORDER_RECT_X_PADDING : 0;
-  var arrowWidth = 0;
+  const xPadding = hasBorder ? this.getConstants().FIELD_BORDER_RECT_X_PADDING : 0;
+  let arrowWidth = 0;
   if (this.svgArrow_) {
     arrowWidth = this.positionSVGArrow_(imageWidth + xPadding, height / 2 -
       this.getConstants().FIELD_DROPDOWN_SVG_ARROW_SIZE / 2);
@@ -620,9 +620,9 @@ Blockly.FieldDropdown.prototype.renderSelectedImage_ = function(imageJson) {
   this.size_.width = imageWidth + arrowWidth + xPadding * 2;
   this.size_.height = height;
 
-  var arrowX = 0;
+  let arrowX = 0;
   if (this.sourceBlock_.RTL) {
-    var imageX = xPadding + arrowWidth;
+    const imageX = xPadding + arrowWidth;
     this.imageElement_.setAttribute('x', imageX);
   } else {
     arrowX = imageWidth + arrowWidth;
@@ -646,16 +646,16 @@ Blockly.FieldDropdown.prototype.renderSelectedText_ = function() {
   this.textElement_.setAttribute('text-anchor', 'start');
 
   // Height and width include the border rect.
-  var hasBorder = !!this.borderRect_;
-  var height = Math.max(
+  const hasBorder = !!this.borderRect_;
+  const height = Math.max(
       hasBorder ? this.getConstants().FIELD_DROPDOWN_BORDER_RECT_HEIGHT : 0,
       this.getConstants().FIELD_TEXT_HEIGHT);
-  var textWidth = Blockly.utils.dom.getFastTextWidth(this.textElement_,
+  const textWidth = Blockly.utils.dom.getFastTextWidth(this.textElement_,
       this.getConstants().FIELD_TEXT_FONTSIZE,
       this.getConstants().FIELD_TEXT_FONTWEIGHT,
       this.getConstants().FIELD_TEXT_FONTFAMILY);
-  var xPadding = hasBorder ? this.getConstants().FIELD_BORDER_RECT_X_PADDING : 0;
-  var arrowWidth = 0;
+  const xPadding = hasBorder ? this.getConstants().FIELD_BORDER_RECT_X_PADDING : 0;
+  let arrowWidth = 0;
   if (this.svgArrow_) {
     arrowWidth = this.positionSVGArrow_(textWidth + xPadding, height / 2 -
         this.getConstants().FIELD_DROPDOWN_SVG_ARROW_SIZE / 2);
@@ -677,11 +677,11 @@ Blockly.FieldDropdown.prototype.positionSVGArrow_ = function(x, y) {
   if (!this.svgArrow_) {
     return 0;
   }
-  var hasBorder = !!this.borderRect_;
-  var xPadding = hasBorder ? this.getConstants().FIELD_BORDER_RECT_X_PADDING : 0;
-  var textPadding = this.getConstants().FIELD_DROPDOWN_SVG_ARROW_PADDING;
-  var svgArrowSize = this.getConstants().FIELD_DROPDOWN_SVG_ARROW_SIZE;
-  var arrowX = this.sourceBlock_.RTL ? xPadding : x + textPadding;
+  const hasBorder = !!this.borderRect_;
+  const xPadding = hasBorder ? this.getConstants().FIELD_BORDER_RECT_X_PADDING : 0;
+  const textPadding = this.getConstants().FIELD_DROPDOWN_SVG_ARROW_PADDING;
+  const svgArrowSize = this.getConstants().FIELD_DROPDOWN_SVG_ARROW_SIZE;
+  const arrowX = this.sourceBlock_.RTL ? xPadding : x + textPadding;
   this.svgArrow_.setAttribute('transform',
       'translate(' + arrowX + ',' + y + ')');
   return svgArrowSize + textPadding;
@@ -699,7 +699,7 @@ Blockly.FieldDropdown.prototype.getText_ = function() {
   if (!this.selectedOption_) {
     return null;
   }
-  var option = this.selectedOption_[0];
+  const option = this.selectedOption_[0];
   if (typeof option == 'object') {
     return option['alt'];
   }
@@ -719,9 +719,9 @@ Blockly.FieldDropdown.validateOptions_ = function(options) {
   if (!options.length) {
     throw TypeError('FieldDropdown options must not be an empty array.');
   }
-  var foundError = false;
-  for (var i = 0; i < options.length; ++i) {
-    var tuple = options[i];
+  let foundError = false;
+  for (let i = 0; i < options.length; ++i) {
+    const tuple = options[i];
     if (!Array.isArray(tuple)) {
       foundError = true;
       console.error(

From 5f213b48a691992489b6de9df8560637aad2a712 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 13:30:06 -0700
Subject: [PATCH 210/833] Migrate core/field_dropdown.js to goog.module

---
 core/field_dropdown.js | 101 +++++++++++++++++++++--------------------
 tests/deps.js          |   2 +-
 2 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/core/field_dropdown.js b/core/field_dropdown.js
index c1554928d..be6c38e98 100644
--- a/core/field_dropdown.js
+++ b/core/field_dropdown.js
@@ -12,7 +12,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.FieldDropdown');
+goog.module('Blockly.FieldDropdown');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.DropDownDiv');
 goog.require('Blockly.Field');
@@ -44,16 +45,16 @@ goog.require('Blockly.utils.userAgent');
  * @constructor
  * @throws {TypeError} If `menuGenerator` options are incorrectly structured.
  */
-Blockly.FieldDropdown = function(menuGenerator, opt_validator, opt_config) {
+const FieldDropdown = function(menuGenerator, opt_validator, opt_config) {
   if (typeof menuGenerator != 'function') {
-    Blockly.FieldDropdown.validateOptions_(menuGenerator);
+    FieldDropdown.validateOptions_(menuGenerator);
   }
 
   /**
    * An array of options for a dropdown list,
    * or a function which generates these options.
    * @type {(!Array<!Array>|
-   *    !function(this:Blockly.FieldDropdown): !Array<!Array>)}
+   *    !function(this:FieldDropdown): !Array<!Array>)}
    * @protected
    */
   this.menuGenerator_ = menuGenerator;
@@ -90,7 +91,7 @@ Blockly.FieldDropdown = function(menuGenerator, opt_validator, opt_config) {
   this.selectedOption_ = this.getOptions(false)[0];
 
   // Call parent's constructor.
-  Blockly.FieldDropdown.superClass_.constructor.call(
+  FieldDropdown.superClass_.constructor.call(
       this, this.selectedOption_[1], opt_validator, opt_config);
 
   /**
@@ -128,7 +129,7 @@ Blockly.FieldDropdown = function(menuGenerator, opt_validator, opt_config) {
    */
   this.svgArrow_ = null;
 };
-Blockly.utils.object.inherits(Blockly.FieldDropdown, Blockly.Field);
+Blockly.utils.object.inherits(FieldDropdown, Blockly.Field);
 
 /**
  * Dropdown image properties.
@@ -139,16 +140,16 @@ Blockly.utils.object.inherits(Blockly.FieldDropdown, Blockly.Field);
   *            height:number
   *          }}
   */
-Blockly.FieldDropdown.ImageProperties;
+FieldDropdown.ImageProperties;
 
 /**
  * Construct a FieldDropdown from a JSON arg object.
  * @param {!Object} options A JSON object with options (options).
- * @return {!Blockly.FieldDropdown} The new field instance.
+ * @return {!FieldDropdown} The new field instance.
  * @package
  * @nocollapse
  */
-Blockly.FieldDropdown.fromJson = function(options) {
+FieldDropdown.fromJson = function(options) {
   // `this` might be a subclass of FieldDropdown if that class doesn't override
   // the static fromJson method.
   return new this(options['options'], undefined, options);
@@ -161,7 +162,7 @@ Blockly.FieldDropdown.fromJson = function(options) {
  *    field's state.
  * @package
  */
-Blockly.FieldDropdown.prototype.fromXml = function(fieldElement) {
+FieldDropdown.prototype.fromXml = function(fieldElement) {
   if (this.isOptionListDynamic()) {
     this.getOptions(false);
   }
@@ -173,17 +174,17 @@ Blockly.FieldDropdown.prototype.fromXml = function(fieldElement) {
  * are not. Editable fields should also be serializable.
  * @type {boolean}
  */
-Blockly.FieldDropdown.prototype.SERIALIZABLE = true;
+FieldDropdown.prototype.SERIALIZABLE = true;
 
 /**
  * Horizontal distance that a checkmark overhangs the dropdown.
  */
-Blockly.FieldDropdown.CHECKMARK_OVERHANG = 25;
+FieldDropdown.CHECKMARK_OVERHANG = 25;
 
 /**
  * Maximum height of the dropdown menu, as a percentage of the viewport height.
  */
-Blockly.FieldDropdown.MAX_MENU_HEIGHT_VH = 0.45;
+FieldDropdown.MAX_MENU_HEIGHT_VH = 0.45;
 
 /**
  * The y offset from the top of the field to the top of the image, if an image
@@ -192,7 +193,7 @@ Blockly.FieldDropdown.MAX_MENU_HEIGHT_VH = 0.45;
  * @const
  * @private
  */
-Blockly.FieldDropdown.IMAGE_Y_OFFSET = 5;
+FieldDropdown.IMAGE_Y_OFFSET = 5;
 
 /**
  * The total vertical padding above and below an image.
@@ -200,25 +201,25 @@ Blockly.FieldDropdown.IMAGE_Y_OFFSET = 5;
  * @const
  * @private
  */
-Blockly.FieldDropdown.IMAGE_Y_PADDING =
-    Blockly.FieldDropdown.IMAGE_Y_OFFSET * 2;
+FieldDropdown.IMAGE_Y_PADDING =
+    FieldDropdown.IMAGE_Y_OFFSET * 2;
 
 /**
  * Android can't (in 2014) display "▾", so use "▼" instead.
  */
-Blockly.FieldDropdown.ARROW_CHAR =
+FieldDropdown.ARROW_CHAR =
     Blockly.utils.userAgent.ANDROID ? '\u25BC' : '\u25BE';
 
 /**
  * Mouse cursor style when over the hotspot that initiates the editor.
  */
-Blockly.FieldDropdown.prototype.CURSOR = 'default';
+FieldDropdown.prototype.CURSOR = 'default';
 
 /**
  * Create the block UI for this dropdown.
  * @package
  */
-Blockly.FieldDropdown.prototype.initView = function() {
+FieldDropdown.prototype.initView = function() {
   if (this.shouldAddBorderRect_()) {
     this.createBorderRect_();
   } else {
@@ -245,7 +246,7 @@ Blockly.FieldDropdown.prototype.initView = function() {
  * @return {boolean} True if the dropdown field should add a border rect.
  * @protected
  */
-Blockly.FieldDropdown.prototype.shouldAddBorderRect_ = function() {
+FieldDropdown.prototype.shouldAddBorderRect_ = function() {
   return !this.getConstants().FIELD_DROPDOWN_NO_BORDER_RECT_SHADOW ||
       (this.getConstants().FIELD_DROPDOWN_NO_BORDER_RECT_SHADOW &&
           !this.sourceBlock_.isShadow());
@@ -255,13 +256,13 @@ Blockly.FieldDropdown.prototype.shouldAddBorderRect_ = function() {
  * Create a tspan based arrow.
  * @protected
  */
-Blockly.FieldDropdown.prototype.createTextArrow_ = function() {
+FieldDropdown.prototype.createTextArrow_ = function() {
   this.arrow_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.TSPAN, {}, this.textElement_);
   this.arrow_.appendChild(document.createTextNode(
       this.sourceBlock_.RTL ?
-      Blockly.FieldDropdown.ARROW_CHAR + ' ' :
-      ' ' + Blockly.FieldDropdown.ARROW_CHAR));
+      FieldDropdown.ARROW_CHAR + ' ' :
+      ' ' + FieldDropdown.ARROW_CHAR));
   if (this.sourceBlock_.RTL) {
     this.textElement_.insertBefore(this.arrow_, this.textContent_);
   } else {
@@ -273,7 +274,7 @@ Blockly.FieldDropdown.prototype.createTextArrow_ = function() {
  * Create an SVG based arrow.
  * @protected
  */
-Blockly.FieldDropdown.prototype.createSVGArrow_ = function() {
+FieldDropdown.prototype.createSVGArrow_ = function() {
   this.svgArrow_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.IMAGE, {
         'height': this.getConstants().FIELD_DROPDOWN_SVG_ARROW_SIZE + 'px',
@@ -289,7 +290,7 @@ Blockly.FieldDropdown.prototype.createSVGArrow_ = function() {
  *     or undefined if triggered programmatically.
  * @protected
  */
-Blockly.FieldDropdown.prototype.showEditor_ = function(opt_e) {
+FieldDropdown.prototype.showEditor_ = function(opt_e) {
   this.dropdownCreate_();
   if (opt_e && typeof opt_e.clientX === 'number') {
     this.menu_.openingCoords =
@@ -331,7 +332,7 @@ Blockly.FieldDropdown.prototype.showEditor_ = function(opt_e) {
  * Create the dropdown editor.
  * @private
  */
-Blockly.FieldDropdown.prototype.dropdownCreate_ = function() {
+FieldDropdown.prototype.dropdownCreate_ = function() {
   const menu = new Blockly.Menu();
   menu.setRole(Blockly.utils.aria.Role.LISTBOX);
   this.menu_ = menu;
@@ -365,7 +366,7 @@ Blockly.FieldDropdown.prototype.dropdownCreate_ = function() {
  * Disposes of events and DOM-references belonging to the dropdown editor.
  * @private
  */
-Blockly.FieldDropdown.prototype.dropdownDispose_ = function() {
+FieldDropdown.prototype.dropdownDispose_ = function() {
   if (this.menu_) {
     this.menu_.dispose();
   }
@@ -379,7 +380,7 @@ Blockly.FieldDropdown.prototype.dropdownDispose_ = function() {
  * @param {!Blockly.MenuItem} menuItem The MenuItem selected within menu.
  * @private
  */
-Blockly.FieldDropdown.prototype.handleMenuActionEvent_ = function(menuItem) {
+FieldDropdown.prototype.handleMenuActionEvent_ = function(menuItem) {
   Blockly.DropDownDiv.hideIfOwner(this, true);
   this.onItemSelected_(/** @type {!Blockly.Menu} */ (this.menu_), menuItem);
 };
@@ -390,7 +391,7 @@ Blockly.FieldDropdown.prototype.handleMenuActionEvent_ = function(menuItem) {
  * @param {!Blockly.MenuItem} menuItem The MenuItem selected within menu.
  * @protected
  */
-Blockly.FieldDropdown.prototype.onItemSelected_ = function(menu, menuItem) {
+FieldDropdown.prototype.onItemSelected_ = function(menu, menuItem) {
   this.setValue(menuItem.getValue());
 };
 
@@ -399,7 +400,7 @@ Blockly.FieldDropdown.prototype.onItemSelected_ = function(menu, menuItem) {
  * Create prefix and/or suffix labels.
  * @private
  */
-Blockly.FieldDropdown.prototype.trimOptions_ = function() {
+FieldDropdown.prototype.trimOptions_ = function() {
   const options = this.menuGenerator_;
   if (!Array.isArray(options)) {
     return;
@@ -442,7 +443,7 @@ Blockly.FieldDropdown.prototype.trimOptions_ = function() {
     this.suffixField = strings[0].substr(1 - suffixLength);
   }
 
-  this.menuGenerator_ = Blockly.FieldDropdown.applyTrim_(options, prefixLength,
+  this.menuGenerator_ = FieldDropdown.applyTrim_(options, prefixLength,
       suffixLength);
 };
 
@@ -455,7 +456,7 @@ Blockly.FieldDropdown.prototype.trimOptions_ = function() {
  * @param {number} suffixLength The length of the common suffix
  * @return {!Array<!Array>} A new array with all of the option text trimmed.
  */
-Blockly.FieldDropdown.applyTrim_ = function(options,
+FieldDropdown.applyTrim_ = function(options,
     prefixLength, suffixLength) {
   const newOptions = [];
   // Remove the prefix and suffix from the options.
@@ -472,7 +473,7 @@ Blockly.FieldDropdown.applyTrim_ = function(options,
  * @return {boolean} True if the option list is generated by a function.
  *     Otherwise false.
  */
-Blockly.FieldDropdown.prototype.isOptionListDynamic = function() {
+FieldDropdown.prototype.isOptionListDynamic = function() {
   return typeof this.menuGenerator_ == 'function';
 };
 
@@ -484,11 +485,11 @@ Blockly.FieldDropdown.prototype.isOptionListDynamic = function() {
  *     (human-readable text or image, language-neutral name).
  * @throws {TypeError} If generated options are incorrectly structured.
  */
-Blockly.FieldDropdown.prototype.getOptions = function(opt_useCache) {
+FieldDropdown.prototype.getOptions = function(opt_useCache) {
   if (this.isOptionListDynamic()) {
     if (!this.generatedOptions_ || !opt_useCache) {
       this.generatedOptions_ = this.menuGenerator_.call(this);
-      Blockly.FieldDropdown.validateOptions_(this.generatedOptions_);
+      FieldDropdown.validateOptions_(this.generatedOptions_);
     }
     return this.generatedOptions_;
   }
@@ -501,7 +502,7 @@ Blockly.FieldDropdown.prototype.getOptions = function(opt_useCache) {
  * @return {?string} A valid language-neutral option, or null if invalid.
  * @protected
  */
-Blockly.FieldDropdown.prototype.doClassValidation_ = function(opt_newValue) {
+FieldDropdown.prototype.doClassValidation_ = function(opt_newValue) {
   let isValueValid = false;
   const options = this.getOptions(true);
   for (let i = 0, option; (option = options[i]); i++) {
@@ -528,8 +529,8 @@ Blockly.FieldDropdown.prototype.doClassValidation_ = function(opt_newValue) {
  * that this is one of the valid dropdown options.
  * @protected
  */
-Blockly.FieldDropdown.prototype.doValueUpdate_ = function(newValue) {
-  Blockly.FieldDropdown.superClass_.doValueUpdate_.call(this, newValue);
+FieldDropdown.prototype.doValueUpdate_ = function(newValue) {
+  FieldDropdown.superClass_.doValueUpdate_.call(this, newValue);
   const options = this.getOptions(true);
   for (let i = 0, option; (option = options[i]); i++) {
     if (option[1] == this.value_) {
@@ -542,7 +543,7 @@ Blockly.FieldDropdown.prototype.doValueUpdate_ = function(newValue) {
  * Updates the dropdown arrow to match the colour/style of the block.
  * @package
  */
-Blockly.FieldDropdown.prototype.applyColour = function() {
+FieldDropdown.prototype.applyColour = function() {
   if (this.borderRect_) {
     this.borderRect_.setAttribute('stroke',
         this.sourceBlock_.style.colourTertiary);
@@ -567,7 +568,7 @@ Blockly.FieldDropdown.prototype.applyColour = function() {
  * Draws the border with the correct width.
  * @protected
  */
-Blockly.FieldDropdown.prototype.render_ = function() {
+FieldDropdown.prototype.render_ = function() {
   // Hide both elements.
   this.textContent_.nodeValue = '';
   this.imageElement_.style.display = 'none';
@@ -576,7 +577,7 @@ Blockly.FieldDropdown.prototype.render_ = function() {
   const option = this.selectedOption_ && this.selectedOption_[0];
   if (option && typeof option == 'object') {
     this.renderSelectedImage_(
-        /** @type {!Blockly.FieldDropdown.ImageProperties} */ (option));
+        /** @type {!FieldDropdown.ImageProperties} */ (option));
   } else {
     this.renderSelectedText_();
   }
@@ -586,11 +587,11 @@ Blockly.FieldDropdown.prototype.render_ = function() {
 
 /**
  * Renders the selected option, which must be an image.
- * @param {!Blockly.FieldDropdown.ImageProperties} imageJson Selected
+ * @param {!FieldDropdown.ImageProperties} imageJson Selected
  *   option that must be an image.
  * @private
  */
-Blockly.FieldDropdown.prototype.renderSelectedImage_ = function(imageJson) {
+FieldDropdown.prototype.renderSelectedImage_ = function(imageJson) {
   this.imageElement_.style.display = '';
   this.imageElement_.setAttributeNS(
       Blockly.utils.dom.XLINK_NS, 'xlink:href', imageJson.src);
@@ -604,7 +605,7 @@ Blockly.FieldDropdown.prototype.renderSelectedImage_ = function(imageJson) {
   const hasBorder = !!this.borderRect_;
   const height = Math.max(
       hasBorder ? this.getConstants().FIELD_DROPDOWN_BORDER_RECT_HEIGHT : 0,
-      imageHeight + Blockly.FieldDropdown.IMAGE_Y_PADDING);
+      imageHeight + FieldDropdown.IMAGE_Y_PADDING);
   const xPadding = hasBorder ? this.getConstants().FIELD_BORDER_RECT_X_PADDING : 0;
   let arrowWidth = 0;
   if (this.svgArrow_) {
@@ -638,7 +639,7 @@ Blockly.FieldDropdown.prototype.renderSelectedImage_ = function(imageJson) {
  * Renders the selected option, which must be text.
  * @private
  */
-Blockly.FieldDropdown.prototype.renderSelectedText_ = function() {
+FieldDropdown.prototype.renderSelectedText_ = function() {
   // Retrieves the selected option to display through getText_.
   this.textContent_.nodeValue = this.getDisplayText_();
   Blockly.utils.dom.addClass(/** @type {!Element} */ (this.textElement_),
@@ -673,7 +674,7 @@ Blockly.FieldDropdown.prototype.renderSelectedText_ = function() {
  * @return {number} Amount of space the arrow is taking up, in px.
  * @private
  */
-Blockly.FieldDropdown.prototype.positionSVGArrow_ = function(x, y) {
+FieldDropdown.prototype.positionSVGArrow_ = function(x, y) {
   if (!this.svgArrow_) {
     return 0;
   }
@@ -695,7 +696,7 @@ Blockly.FieldDropdown.prototype.positionSVGArrow_ = function(x, y) {
  * @protected
  * @override
  */
-Blockly.FieldDropdown.prototype.getText_ = function() {
+FieldDropdown.prototype.getText_ = function() {
   if (!this.selectedOption_) {
     return null;
   }
@@ -712,7 +713,7 @@ Blockly.FieldDropdown.prototype.getText_ = function() {
  * @throws {TypeError} If proposed options are incorrectly structured.
  * @private
  */
-Blockly.FieldDropdown.validateOptions_ = function(options) {
+FieldDropdown.validateOptions_ = function(options) {
   if (!Array.isArray(options)) {
     throw TypeError('FieldDropdown options must be an array.');
   }
@@ -747,4 +748,6 @@ Blockly.FieldDropdown.validateOptions_ = function(options) {
   }
 };
 
-Blockly.fieldRegistry.register('field_dropdown', Blockly.FieldDropdown);
+Blockly.fieldRegistry.register('field_dropdown', FieldDropdown);
+
+exports = FieldDropdown;
diff --git a/tests/deps.js b/tests/deps.js
index 979c58c74..65e09fda9 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -52,7 +52,7 @@ goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownD
 goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.IdGenerator', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object']);
-goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['Blockly.DropDownDiv', 'Blockly.Field', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['Blockly.DropDownDiv', 'Blockly.Field', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabelSerializable'], ['Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.object']);

From 393cdf1fa4d5a94a083755b4037e5beac28f2f6a Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 14:18:05 -0700
Subject: [PATCH 211/833] Switch from destructuring to normal imports in
 core/field_checkbox.js

---
 core/field_checkbox.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/field_checkbox.js b/core/field_checkbox.js
index 3cbe8d07f..d2ce60eaa 100644
--- a/core/field_checkbox.js
+++ b/core/field_checkbox.js
@@ -14,9 +14,9 @@ goog.module('Blockly.FieldCheckbox');
 goog.module.declareLegacyNamespace();
 
 const Field = goog.require('Blockly.Field');
-const {addClass} = goog.require('Blockly.utils.dom');
+const dom = goog.require('Blockly.utils.dom');
+const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const {inherits} = goog.require('Blockly.utils.object');
-const {register} = goog.require('Blockly.fieldRegistry');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 
@@ -109,7 +109,7 @@ FieldCheckbox.prototype.configure_ = function(config) {
 FieldCheckbox.prototype.initView = function() {
   FieldCheckbox.superClass_.initView.call(this);
 
-  addClass(
+  dom.addClass(
       /** @type {!SVGTextElement} **/ (this.textElement_), 'blocklyCheckbox');
   this.textElement_.style.display = this.value_ ? 'block' : 'none';
 };
@@ -221,6 +221,6 @@ FieldCheckbox.prototype.convertValueToBool_ = function(value) {
   }
 };
 
-register('field_checkbox', FieldCheckbox);
+fieldRegistry.register('field_checkbox', FieldCheckbox);
 
 exports = FieldCheckbox;

From 36bb605bbc9f362a2bbf435048c420bf763ef397 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 14:53:44 -0700
Subject: [PATCH 212/833] Migrate core/field_dropdown.js to named requires

---
 core/field_dropdown.js | 100 ++++++++++++++++++++---------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/core/field_dropdown.js b/core/field_dropdown.js
index be6c38e98..5a5234c90 100644
--- a/core/field_dropdown.js
+++ b/core/field_dropdown.js
@@ -15,19 +15,19 @@
 goog.module('Blockly.FieldDropdown');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.DropDownDiv');
-goog.require('Blockly.Field');
-goog.require('Blockly.fieldRegistry');
-goog.require('Blockly.Menu');
-goog.require('Blockly.MenuItem');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.aria');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.string');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.userAgent');
+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');
+const userAgent = goog.require('Blockly.utils.userAgent');
+const {commonWordPrefix, commonWordSuffix, shortestStringLength} = goog.require('Blockly.utils.string');
+const {inherits} = goog.require('Blockly.utils.object');
+const {replaceMessageReferences} = goog.require('Blockly.utils');
 
 
 /**
@@ -41,7 +41,7 @@ goog.require('Blockly.utils.userAgent');
  * @param {Object=} opt_config A map of options used to configure the field.
  *    See the [field creation documentation]{@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/dropdown#creation}
  *    for a list of properties this parameter supports.
- * @extends {Blockly.Field}
+ * @extends {Field}
  * @constructor
  * @throws {TypeError} If `menuGenerator` options are incorrectly structured.
  */
@@ -96,14 +96,14 @@ const FieldDropdown = function(menuGenerator, opt_validator, opt_config) {
 
   /**
    * A reference to the currently selected menu item.
-   * @type {?Blockly.MenuItem}
+   * @type {?MenuItem}
    * @private
    */
   this.selectedMenuItem_ = null;
 
   /**
    * The dropdown menu.
-   * @type {?Blockly.Menu}
+   * @type {?Menu}
    * @protected
    */
   this.menu_ = null;
@@ -129,7 +129,7 @@ const FieldDropdown = function(menuGenerator, opt_validator, opt_config) {
    */
   this.svgArrow_ = null;
 };
-Blockly.utils.object.inherits(FieldDropdown, Blockly.Field);
+inherits(FieldDropdown, Field);
 
 /**
  * Dropdown image properties.
@@ -208,7 +208,7 @@ FieldDropdown.IMAGE_Y_PADDING =
  * Android can't (in 2014) display "▾", so use "▼" instead.
  */
 FieldDropdown.ARROW_CHAR =
-    Blockly.utils.userAgent.ANDROID ? '\u25BC' : '\u25BE';
+    userAgent.ANDROID ? '\u25BC' : '\u25BE';
 
 /**
  * Mouse cursor style when over the hotspot that initiates the editor.
@@ -227,8 +227,8 @@ FieldDropdown.prototype.initView = function() {
   }
   this.createTextElement_();
 
-  this.imageElement_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.IMAGE, {}, this.fieldGroup_);
+  this.imageElement_ = dom.createSvgElement(
+      Svg.IMAGE, {}, this.fieldGroup_);
 
   if (this.getConstants().FIELD_DROPDOWN_SVG_ARROW) {
     this.createSVGArrow_();
@@ -237,7 +237,7 @@ FieldDropdown.prototype.initView = function() {
   }
 
   if (this.borderRect_) {
-    Blockly.utils.dom.addClass(this.borderRect_, 'blocklyDropdownRect');
+    dom.addClass(this.borderRect_, 'blocklyDropdownRect');
   }
 };
 
@@ -257,8 +257,8 @@ FieldDropdown.prototype.shouldAddBorderRect_ = function() {
  * @protected
  */
 FieldDropdown.prototype.createTextArrow_ = function() {
-  this.arrow_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.TSPAN, {}, this.textElement_);
+  this.arrow_ = dom.createSvgElement(
+      Svg.TSPAN, {}, this.textElement_);
   this.arrow_.appendChild(document.createTextNode(
       this.sourceBlock_.RTL ?
       FieldDropdown.ARROW_CHAR + ' ' :
@@ -275,12 +275,12 @@ FieldDropdown.prototype.createTextArrow_ = function() {
  * @protected
  */
 FieldDropdown.prototype.createSVGArrow_ = function() {
-  this.svgArrow_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.IMAGE, {
+  this.svgArrow_ = dom.createSvgElement(
+      Svg.IMAGE, {
         'height': this.getConstants().FIELD_DROPDOWN_SVG_ARROW_SIZE + 'px',
         'width': this.getConstants().FIELD_DROPDOWN_SVG_ARROW_SIZE + 'px'
       }, this.fieldGroup_);
-  this.svgArrow_.setAttributeNS(Blockly.utils.dom.XLINK_NS, 'xlink:href',
+  this.svgArrow_.setAttributeNS(dom.XLINK_NS, 'xlink:href',
       this.getConstants().FIELD_DROPDOWN_SVG_ARROW_DATAURI);
 };
 
@@ -294,14 +294,14 @@ FieldDropdown.prototype.showEditor_ = function(opt_e) {
   this.dropdownCreate_();
   if (opt_e && typeof opt_e.clientX === 'number') {
     this.menu_.openingCoords =
-        new Blockly.utils.Coordinate(opt_e.clientX, opt_e.clientY);
+        new Coordinate(opt_e.clientX, opt_e.clientY);
   } else {
     this.menu_.openingCoords = null;
   }
   // Element gets created in render.
-  this.menu_.render(Blockly.DropDownDiv.getContentDiv());
+  this.menu_.render(DropDownDiv.getContentDiv());
   const menuElement = /** @type {!Element} */ (this.menu_.getElement());
-  Blockly.utils.dom.addClass(menuElement, 'blocklyDropdownMenu');
+  dom.addClass(menuElement, 'blocklyDropdownMenu');
 
   if (this.getConstants().FIELD_DROPDOWN_COLOURED_DIV) {
     const primaryColour = (this.sourceBlock_.isShadow()) ?
@@ -310,10 +310,10 @@ FieldDropdown.prototype.showEditor_ = function(opt_e) {
     const borderColour = (this.sourceBlock_.isShadow()) ?
         this.sourceBlock_.getParent().style.colourTertiary :
         this.sourceBlock_.style.colourTertiary;
-    Blockly.DropDownDiv.setColour(primaryColour, borderColour);
+    DropDownDiv.setColour(primaryColour, borderColour);
   }
 
-  Blockly.DropDownDiv.showPositionedByField(
+  DropDownDiv.showPositionedByField(
       this, this.dropdownDispose_.bind(this));
 
   // Focusing needs to be handled after the menu is rendered and positioned.
@@ -333,8 +333,8 @@ FieldDropdown.prototype.showEditor_ = function(opt_e) {
  * @private
  */
 FieldDropdown.prototype.dropdownCreate_ = function() {
-  const menu = new Blockly.Menu();
-  menu.setRole(Blockly.utils.aria.Role.LISTBOX);
+  const menu = new Menu();
+  menu.setRole(aria.Role.LISTBOX);
   this.menu_ = menu;
 
   const options = this.getOptions(false);
@@ -349,8 +349,8 @@ FieldDropdown.prototype.dropdownCreate_ = function() {
       image.alt = content['alt'] || '';
       content = image;
     }
-    const menuItem = new Blockly.MenuItem(content, value);
-    menuItem.setRole(Blockly.utils.aria.Role.OPTION);
+    const menuItem = new MenuItem(content, value);
+    menuItem.setRole(aria.Role.OPTION);
     menuItem.setRightToLeft(this.sourceBlock_.RTL);
     menuItem.setCheckable(true);
     menu.addChild(menuItem);
@@ -377,18 +377,18 @@ FieldDropdown.prototype.dropdownDispose_ = function() {
 
 /**
  * Handle an action in the dropdown menu.
- * @param {!Blockly.MenuItem} menuItem The MenuItem selected within menu.
+ * @param {!MenuItem} menuItem The MenuItem selected within menu.
  * @private
  */
 FieldDropdown.prototype.handleMenuActionEvent_ = function(menuItem) {
-  Blockly.DropDownDiv.hideIfOwner(this, true);
-  this.onItemSelected_(/** @type {!Blockly.Menu} */ (this.menu_), menuItem);
+  DropDownDiv.hideIfOwner(this, true);
+  this.onItemSelected_(/** @type {!Menu} */ (this.menu_), menuItem);
 };
 
 /**
  * Handle the selection of an item in the dropdown menu.
- * @param {!Blockly.Menu} menu The Menu component clicked.
- * @param {!Blockly.MenuItem} menuItem The MenuItem selected within menu.
+ * @param {!Menu} menu The Menu component clicked.
+ * @param {!MenuItem} menuItem The MenuItem selected within menu.
  * @protected
  */
 FieldDropdown.prototype.onItemSelected_ = function(menu, menuItem) {
@@ -411,10 +411,10 @@ FieldDropdown.prototype.trimOptions_ = function() {
   for (let i = 0; i < options.length; i++) {
     const label = options[i][0];
     if (typeof label == 'string') {
-      options[i][0] = Blockly.utils.replaceMessageReferences(label);
+      options[i][0] = replaceMessageReferences(label);
     } else {
       if (label.alt != null) {
-        options[i][0].alt = Blockly.utils.replaceMessageReferences(label.alt);
+        options[i][0].alt = replaceMessageReferences(label.alt);
       }
       hasImages = true;
     }
@@ -426,9 +426,9 @@ FieldDropdown.prototype.trimOptions_ = function() {
   for (let i = 0; i < options.length; i++) {
     strings.push(options[i][0]);
   }
-  const shortest = Blockly.utils.string.shortestStringLength(strings);
-  const prefixLength = Blockly.utils.string.commonWordPrefix(strings, shortest);
-  const suffixLength = Blockly.utils.string.commonWordSuffix(strings, shortest);
+  const shortest = shortestStringLength(strings);
+  const prefixLength = commonWordPrefix(strings, shortest);
+  const suffixLength = commonWordSuffix(strings, shortest);
   if (!prefixLength && !suffixLength) {
     return;
   }
@@ -594,7 +594,7 @@ FieldDropdown.prototype.render_ = function() {
 FieldDropdown.prototype.renderSelectedImage_ = function(imageJson) {
   this.imageElement_.style.display = '';
   this.imageElement_.setAttributeNS(
-      Blockly.utils.dom.XLINK_NS, 'xlink:href', imageJson.src);
+      dom.XLINK_NS, 'xlink:href', imageJson.src);
   this.imageElement_.setAttribute('height', imageJson.height);
   this.imageElement_.setAttribute('width', imageJson.width);
 
@@ -612,7 +612,7 @@ FieldDropdown.prototype.renderSelectedImage_ = function(imageJson) {
     arrowWidth = this.positionSVGArrow_(imageWidth + xPadding, height / 2 -
       this.getConstants().FIELD_DROPDOWN_SVG_ARROW_SIZE / 2);
   } else {
-    arrowWidth = Blockly.utils.dom.getFastTextWidth(
+    arrowWidth = dom.getFastTextWidth(
         /** @type {!SVGTSpanElement} */ (this.arrow_),
         this.getConstants().FIELD_TEXT_FONTSIZE,
         this.getConstants().FIELD_TEXT_FONTWEIGHT,
@@ -642,7 +642,7 @@ FieldDropdown.prototype.renderSelectedImage_ = function(imageJson) {
 FieldDropdown.prototype.renderSelectedText_ = function() {
   // Retrieves the selected option to display through getText_.
   this.textContent_.nodeValue = this.getDisplayText_();
-  Blockly.utils.dom.addClass(/** @type {!Element} */ (this.textElement_),
+  dom.addClass(/** @type {!Element} */ (this.textElement_),
       'blocklyDropdownText');
   this.textElement_.setAttribute('text-anchor', 'start');
 
@@ -651,7 +651,7 @@ FieldDropdown.prototype.renderSelectedText_ = function() {
   const height = Math.max(
       hasBorder ? this.getConstants().FIELD_DROPDOWN_BORDER_RECT_HEIGHT : 0,
       this.getConstants().FIELD_TEXT_HEIGHT);
-  const textWidth = Blockly.utils.dom.getFastTextWidth(this.textElement_,
+  const textWidth = dom.getFastTextWidth(this.textElement_,
       this.getConstants().FIELD_TEXT_FONTSIZE,
       this.getConstants().FIELD_TEXT_FONTWEIGHT,
       this.getConstants().FIELD_TEXT_FONTFAMILY);
@@ -748,6 +748,6 @@ FieldDropdown.validateOptions_ = function(options) {
   }
 };
 
-Blockly.fieldRegistry.register('field_dropdown', FieldDropdown);
+fieldRegistry.register('field_dropdown', FieldDropdown);
 
 exports = FieldDropdown;

From 740e4651b178dfbcbe6ab07930896ee3ccf10834 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 14:56:32 -0700
Subject: [PATCH 213/833] clang-format core/field_dropdown.js

---
 core/field_dropdown.js | 118 +++++++++++++++++++++--------------------
 1 file changed, 60 insertions(+), 58 deletions(-)

diff --git a/core/field_dropdown.js b/core/field_dropdown.js
index 5a5234c90..79b6ea404 100644
--- a/core/field_dropdown.js
+++ b/core/field_dropdown.js
@@ -39,7 +39,8 @@ const {replaceMessageReferences} = goog.require('Blockly.utils');
  *    option & returns a validated language-neutral dropdown option, or null to
  *    abort the change.
  * @param {Object=} opt_config A map of options used to configure the field.
- *    See the [field creation documentation]{@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/dropdown#creation}
+ *    See the [field creation documentation]{@link
+ *    https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/dropdown#creation}
  *    for a list of properties this parameter supports.
  * @extends {Field}
  * @constructor
@@ -134,12 +135,12 @@ inherits(FieldDropdown, Field);
 /**
  * Dropdown image properties.
  * @typedef {{
-  *            src:string,
-  *            alt:string,
-  *            width:number,
-  *            height:number
-  *          }}
-  */
+ *            src:string,
+ *            alt:string,
+ *            width:number,
+ *            height:number
+ *          }}
+ */
 FieldDropdown.ImageProperties;
 
 /**
@@ -201,14 +202,12 @@ FieldDropdown.IMAGE_Y_OFFSET = 5;
  * @const
  * @private
  */
-FieldDropdown.IMAGE_Y_PADDING =
-    FieldDropdown.IMAGE_Y_OFFSET * 2;
+FieldDropdown.IMAGE_Y_PADDING = FieldDropdown.IMAGE_Y_OFFSET * 2;
 
 /**
  * Android can't (in 2014) display "▾", so use "▼" instead.
  */
-FieldDropdown.ARROW_CHAR =
-    userAgent.ANDROID ? '\u25BC' : '\u25BE';
+FieldDropdown.ARROW_CHAR = userAgent.ANDROID ? '\u25BC' : '\u25BE';
 
 /**
  * Mouse cursor style when over the hotspot that initiates the editor.
@@ -227,8 +226,7 @@ FieldDropdown.prototype.initView = function() {
   }
   this.createTextElement_();
 
-  this.imageElement_ = dom.createSvgElement(
-      Svg.IMAGE, {}, this.fieldGroup_);
+  this.imageElement_ = dom.createSvgElement(Svg.IMAGE, {}, this.fieldGroup_);
 
   if (this.getConstants().FIELD_DROPDOWN_SVG_ARROW) {
     this.createSVGArrow_();
@@ -249,7 +247,7 @@ FieldDropdown.prototype.initView = function() {
 FieldDropdown.prototype.shouldAddBorderRect_ = function() {
   return !this.getConstants().FIELD_DROPDOWN_NO_BORDER_RECT_SHADOW ||
       (this.getConstants().FIELD_DROPDOWN_NO_BORDER_RECT_SHADOW &&
-          !this.sourceBlock_.isShadow());
+       !this.sourceBlock_.isShadow());
 };
 
 /**
@@ -257,12 +255,10 @@ FieldDropdown.prototype.shouldAddBorderRect_ = function() {
  * @protected
  */
 FieldDropdown.prototype.createTextArrow_ = function() {
-  this.arrow_ = dom.createSvgElement(
-      Svg.TSPAN, {}, this.textElement_);
+  this.arrow_ = dom.createSvgElement(Svg.TSPAN, {}, this.textElement_);
   this.arrow_.appendChild(document.createTextNode(
-      this.sourceBlock_.RTL ?
-      FieldDropdown.ARROW_CHAR + ' ' :
-      ' ' + FieldDropdown.ARROW_CHAR));
+      this.sourceBlock_.RTL ? FieldDropdown.ARROW_CHAR + ' ' :
+                              ' ' + FieldDropdown.ARROW_CHAR));
   if (this.sourceBlock_.RTL) {
     this.textElement_.insertBefore(this.arrow_, this.textContent_);
   } else {
@@ -279,8 +275,10 @@ FieldDropdown.prototype.createSVGArrow_ = function() {
       Svg.IMAGE, {
         'height': this.getConstants().FIELD_DROPDOWN_SVG_ARROW_SIZE + 'px',
         'width': this.getConstants().FIELD_DROPDOWN_SVG_ARROW_SIZE + 'px'
-      }, this.fieldGroup_);
-  this.svgArrow_.setAttributeNS(dom.XLINK_NS, 'xlink:href',
+      },
+      this.fieldGroup_);
+  this.svgArrow_.setAttributeNS(
+      dom.XLINK_NS, 'xlink:href',
       this.getConstants().FIELD_DROPDOWN_SVG_ARROW_DATAURI);
 };
 
@@ -293,8 +291,7 @@ FieldDropdown.prototype.createSVGArrow_ = function() {
 FieldDropdown.prototype.showEditor_ = function(opt_e) {
   this.dropdownCreate_();
   if (opt_e && typeof opt_e.clientX === 'number') {
-    this.menu_.openingCoords =
-        new Coordinate(opt_e.clientX, opt_e.clientY);
+    this.menu_.openingCoords = new Coordinate(opt_e.clientX, opt_e.clientY);
   } else {
     this.menu_.openingCoords = null;
   }
@@ -313,8 +310,7 @@ FieldDropdown.prototype.showEditor_ = function(opt_e) {
     DropDownDiv.setColour(primaryColour, borderColour);
   }
 
-  DropDownDiv.showPositionedByField(
-      this, this.dropdownDispose_.bind(this));
+  DropDownDiv.showPositionedByField(this, this.dropdownDispose_.bind(this));
 
   // Focusing needs to be handled after the menu is rendered and positioned.
   // Otherwise it will cause a page scroll to get the misplaced menu in
@@ -341,7 +337,7 @@ FieldDropdown.prototype.dropdownCreate_ = function() {
   this.selectedMenuItem_ = null;
   for (let i = 0; i < options.length; i++) {
     let content = options[i][0];  // Human-readable text or image.
-    const value = options[i][1];    // Language-neutral value.
+    const value = options[i][1];  // Language-neutral value.
     if (typeof content == 'object') {
       // An image, not text.
       const image = new Image(content['width'], content['height']);
@@ -443,8 +439,8 @@ FieldDropdown.prototype.trimOptions_ = function() {
     this.suffixField = strings[0].substr(1 - suffixLength);
   }
 
-  this.menuGenerator_ = FieldDropdown.applyTrim_(options, prefixLength,
-      suffixLength);
+  this.menuGenerator_ =
+      FieldDropdown.applyTrim_(options, prefixLength, suffixLength);
 };
 
 /**
@@ -456,8 +452,7 @@ FieldDropdown.prototype.trimOptions_ = function() {
  * @param {number} suffixLength The length of the common suffix
  * @return {!Array<!Array>} A new array with all of the option text trimmed.
  */
-FieldDropdown.applyTrim_ = function(options,
-    prefixLength, suffixLength) {
+FieldDropdown.applyTrim_ = function(options, prefixLength, suffixLength) {
   const newOptions = [];
   // Remove the prefix and suffix from the options.
   for (let i = 0; i < options.length; i++) {
@@ -514,9 +509,10 @@ FieldDropdown.prototype.doClassValidation_ = function(opt_newValue) {
   }
   if (!isValueValid) {
     if (this.sourceBlock_) {
-      console.warn('Cannot set the dropdown\'s value to an unavailable option.' +
-        ' Block type: ' + this.sourceBlock_.type + ', Field name: ' + this.name +
-        ', Value: ' + opt_newValue);
+      console.warn(
+          'Cannot set the dropdown\'s value to an unavailable option.' +
+          ' Block type: ' + this.sourceBlock_.type +
+          ', Field name: ' + this.name + ', Value: ' + opt_newValue);
     }
     return null;
   }
@@ -545,11 +541,11 @@ FieldDropdown.prototype.doValueUpdate_ = function(newValue) {
  */
 FieldDropdown.prototype.applyColour = function() {
   if (this.borderRect_) {
-    this.borderRect_.setAttribute('stroke',
-        this.sourceBlock_.style.colourTertiary);
+    this.borderRect_.setAttribute(
+        'stroke', this.sourceBlock_.style.colourTertiary);
     if (this.menu_) {
-      this.borderRect_.setAttribute('fill',
-          this.sourceBlock_.style.colourTertiary);
+      this.borderRect_.setAttribute(
+          'fill', this.sourceBlock_.style.colourTertiary);
     } else {
       this.borderRect_.setAttribute('fill', 'transparent');
     }
@@ -593,8 +589,7 @@ FieldDropdown.prototype.render_ = function() {
  */
 FieldDropdown.prototype.renderSelectedImage_ = function(imageJson) {
   this.imageElement_.style.display = '';
-  this.imageElement_.setAttributeNS(
-      dom.XLINK_NS, 'xlink:href', imageJson.src);
+  this.imageElement_.setAttributeNS(dom.XLINK_NS, 'xlink:href', imageJson.src);
   this.imageElement_.setAttribute('height', imageJson.height);
   this.imageElement_.setAttribute('width', imageJson.width);
 
@@ -606,11 +601,13 @@ FieldDropdown.prototype.renderSelectedImage_ = function(imageJson) {
   const height = Math.max(
       hasBorder ? this.getConstants().FIELD_DROPDOWN_BORDER_RECT_HEIGHT : 0,
       imageHeight + FieldDropdown.IMAGE_Y_PADDING);
-  const xPadding = hasBorder ? this.getConstants().FIELD_BORDER_RECT_X_PADDING : 0;
+  const xPadding =
+      hasBorder ? this.getConstants().FIELD_BORDER_RECT_X_PADDING : 0;
   let arrowWidth = 0;
   if (this.svgArrow_) {
-    arrowWidth = this.positionSVGArrow_(imageWidth + xPadding, height / 2 -
-      this.getConstants().FIELD_DROPDOWN_SVG_ARROW_SIZE / 2);
+    arrowWidth = this.positionSVGArrow_(
+        imageWidth + xPadding,
+        height / 2 - this.getConstants().FIELD_DROPDOWN_SVG_ARROW_SIZE / 2);
   } else {
     arrowWidth = dom.getFastTextWidth(
         /** @type {!SVGTSpanElement} */ (this.arrow_),
@@ -642,8 +639,8 @@ FieldDropdown.prototype.renderSelectedImage_ = function(imageJson) {
 FieldDropdown.prototype.renderSelectedText_ = function() {
   // Retrieves the selected option to display through getText_.
   this.textContent_.nodeValue = this.getDisplayText_();
-  dom.addClass(/** @type {!Element} */ (this.textElement_),
-      'blocklyDropdownText');
+  dom.addClass(
+      /** @type {!Element} */ (this.textElement_), 'blocklyDropdownText');
   this.textElement_.setAttribute('text-anchor', 'start');
 
   // Height and width include the border rect.
@@ -651,15 +648,17 @@ FieldDropdown.prototype.renderSelectedText_ = function() {
   const height = Math.max(
       hasBorder ? this.getConstants().FIELD_DROPDOWN_BORDER_RECT_HEIGHT : 0,
       this.getConstants().FIELD_TEXT_HEIGHT);
-  const textWidth = dom.getFastTextWidth(this.textElement_,
-      this.getConstants().FIELD_TEXT_FONTSIZE,
+  const textWidth = dom.getFastTextWidth(
+      this.textElement_, this.getConstants().FIELD_TEXT_FONTSIZE,
       this.getConstants().FIELD_TEXT_FONTWEIGHT,
       this.getConstants().FIELD_TEXT_FONTFAMILY);
-  const xPadding = hasBorder ? this.getConstants().FIELD_BORDER_RECT_X_PADDING : 0;
+  const xPadding =
+      hasBorder ? this.getConstants().FIELD_BORDER_RECT_X_PADDING : 0;
   let arrowWidth = 0;
   if (this.svgArrow_) {
-    arrowWidth = this.positionSVGArrow_(textWidth + xPadding, height / 2 -
-        this.getConstants().FIELD_DROPDOWN_SVG_ARROW_SIZE / 2);
+    arrowWidth = this.positionSVGArrow_(
+        textWidth + xPadding,
+        height / 2 - this.getConstants().FIELD_DROPDOWN_SVG_ARROW_SIZE / 2);
   }
   this.size_.width = textWidth + arrowWidth + xPadding * 2;
   this.size_.height = height;
@@ -679,12 +678,13 @@ FieldDropdown.prototype.positionSVGArrow_ = function(x, y) {
     return 0;
   }
   const hasBorder = !!this.borderRect_;
-  const xPadding = hasBorder ? this.getConstants().FIELD_BORDER_RECT_X_PADDING : 0;
+  const xPadding =
+      hasBorder ? this.getConstants().FIELD_BORDER_RECT_X_PADDING : 0;
   const textPadding = this.getConstants().FIELD_DROPDOWN_SVG_ARROW_PADDING;
   const svgArrowSize = this.getConstants().FIELD_DROPDOWN_SVG_ARROW_SIZE;
   const arrowX = this.sourceBlock_.RTL ? xPadding : x + textPadding;
-  this.svgArrow_.setAttribute('transform',
-      'translate(' + arrowX + ',' + y + ')');
+  this.svgArrow_.setAttribute(
+      'transform', 'translate(' + arrowX + ',' + y + ')');
   return svgArrowSize + textPadding;
 };
 
@@ -727,19 +727,21 @@ FieldDropdown.validateOptions_ = function(options) {
       foundError = true;
       console.error(
           'Invalid option[' + i + ']: Each FieldDropdown option must be an ' +
-          'array. Found: ', tuple);
+              'array. Found: ',
+          tuple);
     } else if (typeof tuple[1] != 'string') {
       foundError = true;
       console.error(
           'Invalid option[' + i + ']: Each FieldDropdown option id must be ' +
-          'a string. Found ' + tuple[1] + ' in: ', tuple);
-    } else if (tuple[0] &&
-              (typeof tuple[0] != 'string') &&
-              (typeof tuple[0].src != 'string')) {
+              'a string. Found ' + tuple[1] + ' in: ',
+          tuple);
+    } else if (
+        tuple[0] && (typeof tuple[0] != 'string') &&
+        (typeof tuple[0].src != 'string')) {
       foundError = true;
       console.error(
           'Invalid option[' + i + ']: Each FieldDropdown option must have a ' +
-          'string label or image description. Found' + tuple[0] + ' in: ',
+              'string label or image description. Found' + tuple[0] + ' in: ',
           tuple);
     }
   }

From 5e3940195f8c718d812a4c5b7d0b64a8f7fd6a7c Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 21 Jul 2021 15:02:35 -0700
Subject: [PATCH 214/833] Migrate private static fields/functions in
 core/field_dropdown.js to module-internal

---
 core/field_dropdown.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/core/field_dropdown.js b/core/field_dropdown.js
index 79b6ea404..ddb5a4e18 100644
--- a/core/field_dropdown.js
+++ b/core/field_dropdown.js
@@ -48,7 +48,7 @@ const {replaceMessageReferences} = goog.require('Blockly.utils');
  */
 const FieldDropdown = function(menuGenerator, opt_validator, opt_config) {
   if (typeof menuGenerator != 'function') {
-    FieldDropdown.validateOptions_(menuGenerator);
+    validateOptions(menuGenerator);
   }
 
   /**
@@ -192,17 +192,15 @@ FieldDropdown.MAX_MENU_HEIGHT_VH = 0.45;
  * is selected.
  * @type {number}
  * @const
- * @private
  */
-FieldDropdown.IMAGE_Y_OFFSET = 5;
+const IMAGE_Y_OFFSET = 5;
 
 /**
  * The total vertical padding above and below an image.
  * @type {number}
  * @const
- * @private
  */
-FieldDropdown.IMAGE_Y_PADDING = FieldDropdown.IMAGE_Y_OFFSET * 2;
+const IMAGE_Y_PADDING = IMAGE_Y_OFFSET * 2;
 
 /**
  * Android can't (in 2014) display "▾", so use "▼" instead.
@@ -484,7 +482,7 @@ FieldDropdown.prototype.getOptions = function(opt_useCache) {
   if (this.isOptionListDynamic()) {
     if (!this.generatedOptions_ || !opt_useCache) {
       this.generatedOptions_ = this.menuGenerator_.call(this);
-      FieldDropdown.validateOptions_(this.generatedOptions_);
+      validateOptions(this.generatedOptions_);
     }
     return this.generatedOptions_;
   }
@@ -600,7 +598,7 @@ FieldDropdown.prototype.renderSelectedImage_ = function(imageJson) {
   const hasBorder = !!this.borderRect_;
   const height = Math.max(
       hasBorder ? this.getConstants().FIELD_DROPDOWN_BORDER_RECT_HEIGHT : 0,
-      imageHeight + FieldDropdown.IMAGE_Y_PADDING);
+      imageHeight + IMAGE_Y_PADDING);
   const xPadding =
       hasBorder ? this.getConstants().FIELD_BORDER_RECT_X_PADDING : 0;
   let arrowWidth = 0;
@@ -711,9 +709,8 @@ FieldDropdown.prototype.getText_ = function() {
  * Validates the data structure to be processed as an options list.
  * @param {?} options The proposed dropdown options.
  * @throws {TypeError} If proposed options are incorrectly structured.
- * @private
  */
-FieldDropdown.validateOptions_ = function(options) {
+const validateOptions = function(options) {
   if (!Array.isArray(options)) {
     throw TypeError('FieldDropdown options must be an array.');
   }

From c15f1e4767798f1b8230fc07f9ae7d89e669e634 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 20 Jul 2021 13:17:00 -0700
Subject: [PATCH 215/833] Move constants to internal_constants.js and add
 aliases

---
 core/blockly.js            |  36 ++++++
 core/constants.js          | 189 ++------------------------------
 core/internal_constants.js | 217 +++++++++++++++++++++++++++++++++++++
 3 files changed, 261 insertions(+), 181 deletions(-)
 create mode 100644 core/internal_constants.js

diff --git a/core/blockly.js b/core/blockly.js
index 92716e4d1..554e02c8d 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -35,6 +35,7 @@ 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');
 goog.require('Blockly.ShortcutRegistry');
@@ -596,3 +597,38 @@ Blockly.TOOLBOX_AT_LEFT = Blockly.utils.toolbox.Position.LEFT;
  * @see Blockly.utils.toolbox.Position.RIGHT
  */
 Blockly.TOOLBOX_AT_RIGHT = Blockly.utils.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;
diff --git a/core/constants.js b/core/constants.js
index 1d19fb8d5..727e42a1f 100644
--- a/core/constants.js
+++ b/core/constants.js
@@ -10,204 +10,31 @@
  */
 'use strict';
 
-goog.provide('Blockly.constants');
+goog.module('Blockly.constants');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.connectionTypes');
-
-
-/**
- * The multiplier for scroll wheel deltas using the line delta mode.
- * @type {number}
- */
-Blockly.LINE_MODE_MULTIPLIER = 40;
-
-/**
- * The multiplier for scroll wheel deltas using the page delta mode.
- * @type {number}
- */
-Blockly.PAGE_MODE_MULTIPLIER = 125;
-
-/**
- * Number of pixels the mouse must move before a drag starts.
- */
-Blockly.DRAG_RADIUS = 5;
-
-/**
- * Number of pixels the mouse must move before a drag/scroll starts from the
- * flyout.  Because the drag-intention is determined when this is reached, it is
- * larger than Blockly.DRAG_RADIUS so that the drag-direction is clearer.
- */
-Blockly.FLYOUT_DRAG_RADIUS = 10;
-
-/**
- * Maximum misalignment between connections for them to snap together.
- */
-Blockly.SNAP_RADIUS = 28;
-
-/**
- * Maximum misalignment between connections for them to snap together,
- * when a connection is already highlighted.
- */
-Blockly.CONNECTING_SNAP_RADIUS = Blockly.SNAP_RADIUS;
-
-/**
- * How much to prefer staying connected to the current connection over moving to
- * a new connection.  The current previewed connection is considered to be this
- * much closer to the matching connection on the block than it actually is.
- */
-Blockly.CURRENT_CONNECTION_PREFERENCE = 8;
-
-/**
- * Delay in ms between trigger and bumping unconnected block out of alignment.
- */
-Blockly.BUMP_DELAY = 250;
-
-/**
- * Maximum randomness in workspace units for bumping a block.
- */
-Blockly.BUMP_RANDOMNESS = 10;
-
-/**
- * Number of characters to truncate a collapsed block to.
- */
-Blockly.COLLAPSE_CHARS = 30;
-
-/**
- * Length in ms for a touch to become a long press.
- */
-Blockly.LONGPRESS = 750;
-
-/**
- * Prevent a sound from playing if another sound preceded it within this many
- * milliseconds.
- */
-Blockly.SOUND_LIMIT = 100;
-
-/**
- * When dragging a block out of a stack, split the stack in two (true), or drag
- * out the block healing the stack (false).
- */
-Blockly.DRAG_STACK = true;
-
-/**
- * The richness of block colours, regardless of the hue.
- * Must be in the range of 0 (inclusive) to 1 (exclusive).
- */
-Blockly.HSV_SATURATION = 0.45;
-
-/**
- * The intensity of block colours, regardless of the hue.
- * Must be in the range of 0 (inclusive) to 1 (exclusive).
- */
-Blockly.HSV_VALUE = 0.65;
-
-/**
- * Sprited icons and images.
- */
-Blockly.SPRITE = {
-  width: 96,
-  height: 124,
-  url: 'sprites.png'
-};
-
-// Constants below this point are not intended to be changed.
 
 /**
  * Enum for alignment of inputs.
  * @enum {number}
  */
-Blockly.constants.ALIGN = {
+const ALIGN = {
   LEFT: -1,
   CENTRE: 0,
   RIGHT: 1
 };
-
-/**
- * ENUM for no drag operation.
- * @const
- */
-Blockly.DRAG_NONE = 0;
-
-/**
- * ENUM for inside the sticky DRAG_RADIUS.
- * @const
- */
-Blockly.DRAG_STICKY = 1;
-
-/**
- * ENUM for inside the non-sticky DRAG_RADIUS, for differentiating between
- * clicks and drags.
- * @const
- */
-Blockly.DRAG_BEGIN = 1;
-
-/**
- * ENUM for freely draggable (outside the DRAG_RADIUS, if one applies).
- * @const
- */
-Blockly.DRAG_FREE = 2;
-
-/**
- * Lookup table for determining the opposite type of a connection.
- * @const
- */
-Blockly.OPPOSITE_TYPE = [];
-Blockly.OPPOSITE_TYPE[Blockly.connectionTypes.INPUT_VALUE] =
-    Blockly.connectionTypes.OUTPUT_VALUE;
-Blockly.OPPOSITE_TYPE[Blockly.connectionTypes.OUTPUT_VALUE] =
-    Blockly.connectionTypes.INPUT_VALUE;
-Blockly.OPPOSITE_TYPE[Blockly.connectionTypes.NEXT_STATEMENT] =
-    Blockly.connectionTypes.PREVIOUS_STATEMENT;
-Blockly.OPPOSITE_TYPE[Blockly.connectionTypes.PREVIOUS_STATEMENT] =
-    Blockly.connectionTypes.NEXT_STATEMENT;
-
-/**
- * String for use in the "custom" attribute of a category in toolbox XML.
- * This string indicates that the category should be dynamically populated with
- * variable blocks.
- * @const {string}
- */
-Blockly.VARIABLE_CATEGORY_NAME = 'VARIABLE';
-/**
- * String for use in the "custom" attribute of a category in toolbox XML.
- * This string indicates that the category should be dynamically populated with
- * variable blocks.
- * @const {string}
- */
-Blockly.VARIABLE_DYNAMIC_CATEGORY_NAME = 'VARIABLE_DYNAMIC';
-
-/**
- * String for use in the "custom" attribute of a category in toolbox XML.
- * This string indicates that the category should be dynamically populated with
- * procedure blocks.
- * @const {string}
- */
-Blockly.PROCEDURE_CATEGORY_NAME = 'PROCEDURE';
-
-/**
- * String for use in the dropdown created in field_variable.
- * This string indicates that this option in the dropdown is 'Rename
- * variable...' and if selected, should trigger the prompt to rename a variable.
- * @const {string}
- */
-Blockly.RENAME_VARIABLE_ID = 'RENAME_VARIABLE_ID';
-
-/**
- * String for use in the dropdown created in field_variable.
- * This string indicates that this option in the dropdown is 'Delete the "%1"
- * variable' and if selected, should trigger the prompt to delete a variable.
- * @const {string}
- */
-Blockly.DELETE_VARIABLE_ID = 'DELETE_VARIABLE_ID';
+exports.ALIGN = ALIGN;
 
 /**
  * The language-neutral ID given to the collapsed input.
  * @const {string}
  */
-Blockly.constants.COLLAPSED_INPUT_NAME = '_TEMP_COLLAPSED_INPUT';
+const COLLAPSED_INPUT_NAME = '_TEMP_COLLAPSED_INPUT';
+exports.COLLAPSED_INPUT_NAME = COLLAPSED_INPUT_NAME;
 
 /**
  * The language-neutral ID given to the collapsed field.
  * @const {string}
  */
-Blockly.constants.COLLAPSED_FIELD_NAME = '_TEMP_COLLAPSED_FIELD';
+const COLLAPSED_FIELD_NAME = '_TEMP_COLLAPSED_FIELD';
+exports.COLLAPSED_FIELD_NAME = COLLAPSED_FIELD_NAME;
diff --git a/core/internal_constants.js b/core/internal_constants.js
new file mode 100644
index 000000000..b5a8cd568
--- /dev/null
+++ b/core/internal_constants.js
@@ -0,0 +1,217 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Module that provides constants for use inside Blockly. Do not
+ * use these constants outside of the core library.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.module('Blockly.internalConstants');
+goog.module.declareLegacyNamespace();
+
+const connectionTypes = goog.require('Blockly.connectionTypes');
+
+
+/**
+ * The multiplier for scroll wheel deltas using the line delta mode.
+ * @type {number}
+ */
+const LINE_MODE_MULTIPLIER = 40;
+exports.LINE_MODE_MULTIPLIER = LINE_MODE_MULTIPLIER;
+
+/**
+ * The multiplier for scroll wheel deltas using the page delta mode.
+ * @type {number}
+ */
+const PAGE_MODE_MULTIPLIER = 125;
+exports.PAGE_MODE_MULTIPLIER = PAGE_MODE_MULTIPLIER;
+
+/**
+ * Number of pixels the mouse must move before a drag starts.
+ */
+const DRAG_RADIUS = 5;
+exports.DRAG_RADIUS = DRAG_RADIUS;
+
+/**
+ * Number of pixels the mouse must move before a drag/scroll starts from the
+ * flyout.  Because the drag-intention is determined when this is reached, it is
+ * larger than DRAG_RADIUS so that the drag-direction is clearer.
+ */
+const FLYOUT_DRAG_RADIUS = 10;
+exports.FLYOUT_DRAG_RADIUS = FLYOUT_DRAG_RADIUS;
+
+/**
+ * Maximum misalignment between connections for them to snap together.
+ */
+const SNAP_RADIUS = 28;
+exports.SNAP_RADIUS = SNAP_RADIUS;
+
+/**
+ * Maximum misalignment between connections for them to snap together,
+ * when a connection is already highlighted.
+ */
+const CONNECTING_SNAP_RADIUS = SNAP_RADIUS;
+exports.CONNECTING_SNAP_RADIUS = CONNECTING_SNAP_RADIUS;
+
+/**
+ * How much to prefer staying connected to the current connection over moving to
+ * a new connection.  The current previewed connection is considered to be this
+ * much closer to the matching connection on the block than it actually is.
+ */
+const CURRENT_CONNECTION_PREFERENCE = 8;
+exports.CURRENT_CONNECTION_PREFERENCE = CURRENT_CONNECTION_PREFERENCE;
+
+/**
+ * Delay in ms between trigger and bumping unconnected block out of alignment.
+ */
+const BUMP_DELAY = 250;
+exports.BUMP_DELAY = BUMP_DELAY;
+
+/**
+ * Maximum randomness in workspace units for bumping a block.
+ */
+const BUMP_RANDOMNESS = 10;
+exports.BUMP_RANDOMNESS = BUMP_RANDOMNESS;
+
+/**
+ * Number of characters to truncate a collapsed block to.
+ */
+const COLLAPSE_CHARS = 30;
+exports.COLLAPSE_CHARS = COLLAPSE_CHARS;
+
+/**
+ * Length in ms for a touch to become a long press.
+ */
+const LONGPRESS = 750;
+exports.LONGPRESS = LONGPRESS;
+
+/**
+ * Prevent a sound from playing if another sound preceded it within this many
+ * milliseconds.
+ */
+const SOUND_LIMIT = 100;
+exports.SOUND_LIMIT = SOUND_LIMIT;
+
+/**
+ * When dragging a block out of a stack, split the stack in two (true), or drag
+ * out the block healing the stack (false).
+ */
+const DRAG_STACK = true;
+exports.DRAG_STACK = DRAG_STACK;
+
+/**
+ * The richness of block colours, regardless of the hue.
+ * Must be in the range of 0 (inclusive) to 1 (exclusive).
+ */
+const HSV_SATURATION = 0.45;
+exports.HSV_SATURATION = HSV_SATURATION;
+
+/**
+ * The intensity of block colours, regardless of the hue.
+ * Must be in the range of 0 (inclusive) to 1 (exclusive).
+ */
+const HSV_VALUE = 0.65;
+exports.HSV_VALUE = HSV_VALUE;
+
+/**
+ * Sprited icons and images.
+ */
+const SPRITE = {
+  width: 96,
+  height: 124,
+  url: 'sprites.png'
+};
+exports.SPRITE = SPRITE;
+
+/**
+ * ENUM for no drag operation.
+ * @const
+ */
+const DRAG_NONE = 0;
+exports.DRAG_NONE = DRAG_NONE;
+
+/**
+ * ENUM for inside the sticky DRAG_RADIUS.
+ * @const
+ */
+const DRAG_STICKY = 1;
+exports.DRAG_STICKY = DRAG_STICKY;
+
+/**
+ * ENUM for inside the non-sticky DRAG_RADIUS, for differentiating between
+ * clicks and drags.
+ * @const
+ */
+const DRAG_BEGIN = 1;
+exports.DRAG_BEGIN = DRAG_BEGIN;
+
+/**
+ * ENUM for freely draggable (outside the DRAG_RADIUS, if one applies).
+ * @const
+ */
+const DRAG_FREE = 2;
+exports.DRAG_FREE = DRAG_FREE;
+
+/**
+ * Lookup table for determining the opposite type of a connection.
+ * @const
+ */
+const OPPOSITE_TYPE = [];
+OPPOSITE_TYPE[connectionTypes.INPUT_VALUE] = connectionTypes.OUTPUT_VALUE;
+OPPOSITE_TYPE[connectionTypes.OUTPUT_VALUE] = connectionTypes.INPUT_VALUE;
+OPPOSITE_TYPE[connectionTypes.NEXT_STATEMENT] =
+    connectionTypes.PREVIOUS_STATEMENT;
+OPPOSITE_TYPE[connectionTypes.PREVIOUS_STATEMENT] =
+    connectionTypes.NEXT_STATEMENT;
+
+exports.OPPOSITE_TYPE = OPPOSITE_TYPE;
+
+/**
+ * String for use in the "custom" attribute of a category in toolbox XML.
+ * This string indicates that the category should be dynamically populated with
+ * variable blocks.
+ * @const {string}
+ */
+const VARIABLE_CATEGORY_NAME = 'VARIABLE';
+exports.VARIABLE_CATEGORY_NAME = VARIABLE_CATEGORY_NAME;
+
+/**
+ * String for use in the "custom" attribute of a category in toolbox XML.
+ * This string indicates that the category should be dynamically populated with
+ * variable blocks.
+ * @const {string}
+ */
+const VARIABLE_DYNAMIC_CATEGORY_NAME = 'VARIABLE_DYNAMIC';
+exports.VARIABLE_DYNAMIC_CATEGORY_NAME = VARIABLE_DYNAMIC_CATEGORY_NAME;
+
+/**
+ * String for use in the "custom" attribute of a category in toolbox XML.
+ * This string indicates that the category should be dynamically populated with
+ * procedure blocks.
+ * @const {string}
+ */
+const PROCEDURE_CATEGORY_NAME = 'PROCEDURE';
+exports.PROCEDURE_CATEGORY_NAME = PROCEDURE_CATEGORY_NAME;
+
+/**
+ * String for use in the dropdown created in field_variable.
+ * This string indicates that this option in the dropdown is 'Rename
+ * variable...' and if selected, should trigger the prompt to rename a variable.
+ * @const {string}
+ */
+const RENAME_VARIABLE_ID = 'RENAME_VARIABLE_ID';
+exports.RENAME_VARIABLE_ID = RENAME_VARIABLE_ID;
+
+/**
+ * String for use in the dropdown created in field_variable.
+ * This string indicates that this option in the dropdown is 'Delete the "%1"
+ * variable' and if selected, should trigger the prompt to delete a variable.
+ * @const {string}
+ */
+const DELETE_VARIABLE_ID = 'DELETE_VARIABLE_ID';
+exports.DELETE_VARIABLE_ID = DELETE_VARIABLE_ID;

From 324c3c038f81dad7ce7c321c97cc4b4b3a8ab12e Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 20 Jul 2021 13:17:19 -0700
Subject: [PATCH 216/833] Rebuild

---
 tests/deps.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/deps.js b/tests/deps.js
index 52ca3e4f3..d7e7ec201 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.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom']);
 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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global']);
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
@@ -23,7 +23,7 @@ goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly
 goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.RenderedConnection', 'Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/constants.js', ['Blockly.constants'], ['Blockly.connectionTypes']);
+goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es5'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es5'});
@@ -100,7 +100,12 @@ goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectabl
 goog.addDependency('../../core/interfaces/i_selectable_toolbox_item.js', ['Blockly.ISelectableToolboxItem'], ['Blockly.IToolboxItem'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], ['Blockly.IRegistrable'], {'lang': 'es6', 'module': 'goog'});
+<<<<<<< HEAD
 goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.IToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
+=======
+goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem', 'Blockly.ISelectableToolboxItem', 'Blockly.IToolboxItem'], []);
+goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstants'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
+>>>>>>> 3a5ddf4d (Rebuild)
 goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Coordinate'], {'lang': 'es5'});
 goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From cc7a263fb3842ca6a2bc800288eca2d4474bfba0 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 20 Jul 2021 13:48:56 -0700
Subject: [PATCH 217/833] Replace references to SPRITE and SOUND_LIMIT with
 internalConstants versions

---
 core/trashcan.js        | 29 +++++++++++++++--------------
 core/workspace_audio.js |  5 ++---
 core/zoom_controls.js   | 40 ++++++++++++++++++++++------------------
 tests/deps.js           |  6 +++---
 4 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/core/trashcan.js b/core/trashcan.js
index 831a26ba4..619299b21 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -14,13 +14,12 @@ goog.provide('Blockly.Trashcan');
 
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.ComponentManager');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.DeleteArea');
 goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.TrashcanOpen');
 goog.require('Blockly.IAutoHideable');
+goog.require('Blockly.internalConstants');
 goog.require('Blockly.IPositionable');
 goog.require('Blockly.Options');
 goog.require('Blockly.registry');
@@ -316,17 +315,18 @@ Blockly.Trashcan.prototype.createDom = function() {
       },
       clip);
   var body = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.IMAGE,
-      {
-        'width': Blockly.SPRITE.width,
+      Blockly.utils.Svg.IMAGE, {
+        'width': Blockly.internalConstants.SPRITE.width,
         'x': -this.SPRITE_LEFT_,
-        'height': Blockly.SPRITE.height,
+        'height': Blockly.internalConstants.SPRITE.height,
         'y': -this.SPRITE_TOP_,
         'clip-path': 'url(#blocklyTrashBodyClipPath' + rnd + ')'
       },
       this.svgGroup_);
-  body.setAttributeNS(Blockly.utils.dom.XLINK_NS, 'xlink:href',
-      this.workspace_.options.pathToMedia + Blockly.SPRITE.url);
+  body.setAttributeNS(
+      Blockly.utils.dom.XLINK_NS, 'xlink:href',
+      this.workspace_.options.pathToMedia +
+          Blockly.internalConstants.SPRITE.url);
 
   clip = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.CLIPPATH,
@@ -336,17 +336,18 @@ Blockly.Trashcan.prototype.createDom = function() {
       Blockly.utils.Svg.RECT,
       {'width': this.WIDTH_, 'height': this.LID_HEIGHT_}, clip);
   this.svgLid_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.IMAGE,
-      {
-        'width': Blockly.SPRITE.width,
+      Blockly.utils.Svg.IMAGE, {
+        'width': Blockly.internalConstants.SPRITE.width,
         'x': -this.SPRITE_LEFT_,
-        'height': Blockly.SPRITE.height,
+        'height': Blockly.internalConstants.SPRITE.height,
         'y': -this.SPRITE_TOP_,
         'clip-path': 'url(#blocklyTrashLidClipPath' + rnd + ')'
       },
       this.svgGroup_);
-  this.svgLid_.setAttributeNS(Blockly.utils.dom.XLINK_NS, 'xlink:href',
-      this.workspace_.options.pathToMedia + Blockly.SPRITE.url);
+  this.svgLid_.setAttributeNS(
+      Blockly.utils.dom.XLINK_NS, 'xlink:href',
+      this.workspace_.options.pathToMedia +
+          Blockly.internalConstants.SPRITE.url);
 
   // bindEventWithChecks_ quashes events too aggressively. See:
   // https://groups.google.com/forum/#!topic/blockly/QF4yB9Wx00s
diff --git a/core/workspace_audio.js b/core/workspace_audio.js
index 954b8f892..378c19287 100644
--- a/core/workspace_audio.js
+++ b/core/workspace_audio.js
@@ -13,8 +13,7 @@
 
 goog.provide('Blockly.WorkspaceAudio');
 
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
+goog.require('Blockly.internalConstants');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.global');
 goog.require('Blockly.utils.userAgent');
@@ -135,7 +134,7 @@ Blockly.WorkspaceAudio.prototype.play = function(name, opt_volume) {
     // Don't play one sound on top of another.
     var now = new Date;
     if (this.lastSound_ != null &&
-        now - this.lastSound_ < Blockly.SOUND_LIMIT) {
+        now - this.lastSound_ < Blockly.internalConstants.SOUND_LIMIT) {
       return;
     }
     this.lastSound_ = now;
diff --git a/core/zoom_controls.js b/core/zoom_controls.js
index 96ff41ac4..6ecf8b041 100644
--- a/core/zoom_controls.js
+++ b/core/zoom_controls.js
@@ -21,6 +21,7 @@ goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.Click');
 goog.require('Blockly.IPositionable');
+goog.require('Blockly.internalConstants');
 goog.require('Blockly.Touch');
 goog.require('Blockly.uiPosition');
 goog.require('Blockly.utils');
@@ -337,17 +338,18 @@ Blockly.ZoomControls.prototype.createZoomOutSvg_ = function(rnd) {
       },
       clip);
   var zoomoutSvg = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.IMAGE,
-      {
-        'width': Blockly.SPRITE.width,
-        'height': Blockly.SPRITE.height,
+      Blockly.utils.Svg.IMAGE, {
+        'width': Blockly.internalConstants.SPRITE.width,
+        'height': Blockly.internalConstants.SPRITE.height,
         'x': -64,
         'y': -92,
         'clip-path': 'url(#blocklyZoomoutClipPath' + rnd + ')'
       },
       this.zoomOutGroup_);
-  zoomoutSvg.setAttributeNS(Blockly.utils.dom.XLINK_NS, 'xlink:href',
-      this.workspace_.options.pathToMedia + Blockly.SPRITE.url);
+  zoomoutSvg.setAttributeNS(
+      Blockly.utils.dom.XLINK_NS, 'xlink:href',
+      this.workspace_.options.pathToMedia +
+          Blockly.internalConstants.SPRITE.url);
 
   // Attach listener.
   this.onZoomOutWrapper_ = Blockly.browserEvents.conditionalBind(
@@ -388,17 +390,18 @@ Blockly.ZoomControls.prototype.createZoomInSvg_ = function(rnd) {
       },
       clip);
   var zoominSvg = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.IMAGE,
-      {
-        'width': Blockly.SPRITE.width,
-        'height': Blockly.SPRITE.height,
+      Blockly.utils.Svg.IMAGE, {
+        'width': Blockly.internalConstants.SPRITE.width,
+        'height': Blockly.internalConstants.SPRITE.height,
         'x': -32,
         'y': -92,
         'clip-path': 'url(#blocklyZoominClipPath' + rnd + ')'
       },
       this.zoomInGroup_);
-  zoominSvg.setAttributeNS(Blockly.utils.dom.XLINK_NS, 'xlink:href',
-      this.workspace_.options.pathToMedia + Blockly.SPRITE.url);
+  zoominSvg.setAttributeNS(
+      Blockly.utils.dom.XLINK_NS, 'xlink:href',
+      this.workspace_.options.pathToMedia +
+          Blockly.internalConstants.SPRITE.url);
 
   // Attach listener.
   this.onZoomInWrapper_ = Blockly.browserEvents.conditionalBind(
@@ -456,16 +459,17 @@ Blockly.ZoomControls.prototype.createZoomResetSvg_ = function(rnd) {
       },
       clip);
   var zoomresetSvg = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.IMAGE,
-      {
-        'width': Blockly.SPRITE.width,
-        'height': Blockly.SPRITE.height,
+      Blockly.utils.Svg.IMAGE, {
+        'width': Blockly.internalConstants.SPRITE.width,
+        'height': Blockly.internalConstants.SPRITE.height,
         'y': -92,
         'clip-path': 'url(#blocklyZoomresetClipPath' + rnd + ')'
       },
       this.zoomResetGroup_);
-  zoomresetSvg.setAttributeNS(Blockly.utils.dom.XLINK_NS, 'xlink:href',
-      this.workspace_.options.pathToMedia + Blockly.SPRITE.url);
+  zoomresetSvg.setAttributeNS(
+      Blockly.utils.dom.XLINK_NS, 'xlink:href',
+      this.workspace_.options.pathToMedia +
+          Blockly.internalConstants.SPRITE.url);
 
   // Attach event listeners.
   this.onZoomResetWrapper_ = Blockly.browserEvents.conditionalBind(
diff --git a/tests/deps.js b/tests/deps.js
index d7e7ec201..abbcce849 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -177,7 +177,7 @@ goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem']
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.constants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
-goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.constants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], [], {'lang': 'es6', 'module': 'goog'});
@@ -206,7 +206,7 @@ goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic
 goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.utils.dom']);
 goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);
-goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.constants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es5'});
+goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es5'});
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml']);
 goog.addDependency('../../core/workspace_comment_render_svg.js', ['Blockly.WorkspaceCommentSvg.render'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.WorkspaceComment', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
@@ -214,6 +214,6 @@ goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.Workspa
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate']);
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
-goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
+goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
 goog.addDependency('base.js', [], []);
 

From ad5836b26d73e153cc0f8499abdfa2534f3a94bd Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 20 Jul 2021 13:57:48 -0700
Subject: [PATCH 218/833] Convert more names to use internalConstants

---
 blocks/procedures.js             |  6 ++++--
 core/block_svg.js                |  3 ++-
 core/contextmenu.js              |  9 ++++-----
 core/gesture.js                  |  8 ++++----
 core/insertion_marker_manager.js |  7 +++----
 core/rendered_connection.js      | 21 +++++++++++++--------
 core/utils.js                    | 16 ++++++++--------
 core/workspace_svg.js            | 12 ++++++------
 tests/deps.js                    | 14 +++++++-------
 9 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/blocks/procedures.js b/blocks/procedures.js
index 644d7a751..328bc89e0 100644
--- a/blocks/procedures.js
+++ b/blocks/procedures.js
@@ -18,6 +18,7 @@ goog.require('Blockly.Comment');
 goog.require('Blockly.FieldCheckbox');
 goog.require('Blockly.FieldLabel');
 goog.require('Blockly.FieldTextInput');
+goog.require('Blockly.internalConstants');
 goog.require('Blockly.Mutator');
 goog.require('Blockly.Warning');
 
@@ -867,8 +868,9 @@ Blockly.Blocks['procedures_callnoreturn'] = {
         var block = Blockly.utils.xml.createElement('block');
         block.setAttribute('type', this.defType_);
         var xy = this.getRelativeToSurfaceXY();
-        var x = xy.x + Blockly.SNAP_RADIUS * (this.RTL ? -1 : 1);
-        var y = xy.y + Blockly.SNAP_RADIUS * 2;
+        var x =
+            xy.x + Blockly.internalConstants.SNAP_RADIUS * (this.RTL ? -1 : 1);
+        var y = xy.y + Blockly.internalConstants.SNAP_RADIUS * 2;
         block.setAttribute('x', x);
         block.setAttribute('y', y);
         var mutation = this.mutationToDom();
diff --git a/core/block_svg.js b/core/block_svg.js
index 08e5addcb..f7da81fe3 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -1550,7 +1550,8 @@ Blockly.BlockSvg.prototype.bumpNeighbours = function() {
       connection.targetBlock().bumpNeighbours();
     }
 
-    var neighbours = connection.neighbours(Blockly.SNAP_RADIUS);
+    var neighbours =
+        connection.neighbours(Blockly.internalConstants.SNAP_RADIUS);
     for (var j = 0, otherConnection; (otherConnection = neighbours[j]); j++) {
 
       // If both connections are connected, that's probably fine.  But if
diff --git a/core/contextmenu.js b/core/contextmenu.js
index e070207b7..3bfcda167 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -17,11 +17,10 @@
 goog.provide('Blockly.ContextMenu');
 
 goog.require('Blockly.browserEvents');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
+goog.require('Blockly.internalConstants');
 goog.require('Blockly.Menu');
 goog.require('Blockly.MenuItem');
 goog.require('Blockly.Msg');
@@ -195,11 +194,11 @@ Blockly.ContextMenu.callbackFactory = function(block, xml) {
       // Move the new block next to the old block.
       var xy = block.getRelativeToSurfaceXY();
       if (block.RTL) {
-        xy.x -= Blockly.SNAP_RADIUS;
+        xy.x -= Blockly.internalConstants.SNAP_RADIUS;
       } else {
-        xy.x += Blockly.SNAP_RADIUS;
+        xy.x += Blockly.internalConstants.SNAP_RADIUS;
       }
-      xy.y += Blockly.SNAP_RADIUS * 2;
+      xy.y += Blockly.internalConstants.SNAP_RADIUS * 2;
       newBlock.moveBy(xy.x, xy.y);
     } finally {
       Blockly.Events.enable();
diff --git a/core/gesture.js b/core/gesture.js
index 55378930b..77a720527 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -18,11 +18,10 @@ goog.require('Blockly.blockAnimations');
 goog.require('Blockly.BlockDragger');
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.BubbleDragger');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.Click');
+goog.require('Blockly.internalConstants');
 goog.require('Blockly.Tooltip');
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
@@ -295,8 +294,9 @@ Blockly.Gesture.prototype.updateDragDelta_ = function(currentXY) {
         Blockly.utils.Coordinate.magnitude(this.currentDragDeltaXY_);
 
     // The flyout has a different drag radius from the rest of Blockly.
-    var limitRadius =
-        this.flyout_ ? Blockly.FLYOUT_DRAG_RADIUS : Blockly.DRAG_RADIUS;
+    var limitRadius = this.flyout_ ?
+        Blockly.internalConstants.FLYOUT_DRAG_RADIUS :
+        Blockly.internalConstants.DRAG_RADIUS;
 
     this.hasExceededDragRadius_ = currentDragDelta > limitRadius;
     return this.hasExceededDragRadius_;
diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js
index d0fea4502..bad4f28bc 100644
--- a/core/insertion_marker_manager.js
+++ b/core/insertion_marker_manager.js
@@ -15,9 +15,8 @@ goog.provide('Blockly.InsertionMarkerManager');
 goog.require('Blockly.blockAnimations');
 goog.require('Blockly.ComponentManager');
 goog.require('Blockly.connectionTypes');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.Events');
+goog.require('Blockly.internalConstants');
 
 goog.requireType('Blockly.BlockSvg');
 goog.requireType('Blockly.RenderedConnection');
@@ -439,9 +438,9 @@ Blockly.InsertionMarkerManager.prototype.getStartRadius_ = function() {
   // By increasing radiusConnection when a connection already exists,
   // we never "lose" the connection from the offset.
   if (this.closestConnection_ && this.localConnection_) {
-    return Blockly.CONNECTING_SNAP_RADIUS;
+    return Blockly.internalConstants.CONNECTING_SNAP_RADIUS;
   }
-  return Blockly.SNAP_RADIUS;
+  return Blockly.internalConstants.SNAP_RADIUS;
 };
 
 /**
diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index f9d3864e3..f229a2fac 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -14,8 +14,7 @@ goog.provide('Blockly.RenderedConnection');
 
 goog.require('Blockly.Connection');
 goog.require('Blockly.connectionTypes');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
+goog.require('Blockly.internalConstants');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.deprecation');
@@ -173,17 +172,23 @@ Blockly.RenderedConnection.prototype.bumpAwayFrom = function(staticConnection) {
   // Raise it to the top for extra visibility.
   var selected = Blockly.selected == rootBlock;
   selected || rootBlock.addSelect();
-  var dx = (staticConnection.x + Blockly.SNAP_RADIUS +
-      Math.floor(Math.random() * Blockly.BUMP_RANDOMNESS)) - this.x;
-  var dy = (staticConnection.y + Blockly.SNAP_RADIUS +
-      Math.floor(Math.random() * Blockly.BUMP_RANDOMNESS)) - this.y;
+  var dx =
+      (staticConnection.x + Blockly.internalConstants.SNAP_RADIUS +
+       Math.floor(Math.random() * Blockly.internalConstants.BUMP_RANDOMNESS)) -
+      this.x;
+  var dy =
+      (staticConnection.y + Blockly.internalConstants.SNAP_RADIUS +
+       Math.floor(Math.random() * Blockly.internalConstants.BUMP_RANDOMNESS)) -
+      this.y;
   if (reverse) {
     // When reversing a bump due to an uneditable block, bump up.
     dy = -dy;
   }
   if (rootBlock.RTL) {
-    dx = (staticConnection.x - Blockly.SNAP_RADIUS -
-      Math.floor(Math.random() * Blockly.BUMP_RANDOMNESS)) - this.x;
+    dx = (staticConnection.x - Blockly.internalConstants.SNAP_RADIUS -
+          Math.floor(
+              Math.random() * Blockly.internalConstants.BUMP_RANDOMNESS)) -
+        this.x;
   }
   rootBlock.moveBy(dx, dy);
   selected || rootBlock.removeSelect();
diff --git a/core/utils.js b/core/utils.js
index 171e83422..8213d38d9 100644
--- a/core/utils.js
+++ b/core/utils.js
@@ -18,8 +18,7 @@
  */
 goog.provide('Blockly.utils');
 
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
+goog.require('Blockly.internalConstants');
 goog.require('Blockly.Msg');
 goog.require('Blockly.utils.colour');
 goog.require('Blockly.utils.Coordinate');
@@ -194,13 +193,13 @@ Blockly.utils.getScrollDeltaPixels = function(e) {
       };
     case 0x01:  // Line mode.
       return {
-        x: e.deltaX * Blockly.LINE_MODE_MULTIPLIER,
-        y: e.deltaY * Blockly.LINE_MODE_MULTIPLIER
+        x: e.deltaX * Blockly.internalConstants.LINE_MODE_MULTIPLIER,
+        y: e.deltaY * Blockly.internalConstants.LINE_MODE_MULTIPLIER
       };
     case 0x02:  // Page mode.
       return {
-        x: e.deltaX * Blockly.PAGE_MODE_MULTIPLIER,
-        y: e.deltaY * Blockly.PAGE_MODE_MULTIPLIER
+        x: e.deltaX * Blockly.internalConstants.PAGE_MODE_MULTIPLIER,
+        y: e.deltaY * Blockly.internalConstants.PAGE_MODE_MULTIPLIER
       };
   }
 };
@@ -634,8 +633,9 @@ Blockly.utils.parseBlockColour = function(colour) {
   if (!isNaN(hue) && 0 <= hue && hue <= 360) {
     return {
       hue: hue,
-      hex: Blockly.utils.colour.hsvToHex(hue, Blockly.HSV_SATURATION,
-          Blockly.HSV_VALUE * 255)
+      hex: Blockly.utils.colour.hsvToHex(
+          hue, Blockly.internalConstants.HSV_SATURATION,
+          Blockly.internalConstants.HSV_VALUE * 255)
     };
   } else {
     var hex = Blockly.utils.colour.parse(dereferenced);
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 21ee217ae..f62107e4f 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -17,8 +17,6 @@ goog.require('Blockly.BlockSvg');
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.ComponentManager');
 goog.require('Blockly.ConnectionDB');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.ContextMenu');
 goog.require('Blockly.ContextMenuRegistry');
 goog.require('Blockly.Events');
@@ -31,6 +29,7 @@ goog.require('Blockly.Events.ViewportChange');
 goog.require('Blockly.Gesture');
 goog.require('Blockly.Grid');
 goog.require('Blockly.IASTNodeLocationSvg');
+goog.require('Blockly.internalConstants');
 goog.require('Blockly.MarkerManager');
 /** @suppress {extraRequire} */
 goog.require('Blockly.MetricsManager');
@@ -1521,7 +1520,8 @@ Blockly.WorkspaceSvg.prototype.pasteBlock_ = function(xmlBlock) {
           // Check for blocks in snap range to any of its connections.
           var connections = block.getConnections_(false);
           for (var i = 0, connection; (connection = connections[i]); i++) {
-            var neighbour = connection.closest(Blockly.SNAP_RADIUS,
+            var neighbour = connection.closest(
+                Blockly.internalConstants.SNAP_RADIUS,
                 new Blockly.utils.Coordinate(blockX, blockY));
             if (neighbour.connection) {
               collide = true;
@@ -1531,11 +1531,11 @@ Blockly.WorkspaceSvg.prototype.pasteBlock_ = function(xmlBlock) {
         }
         if (collide) {
           if (this.RTL) {
-            blockX -= Blockly.SNAP_RADIUS;
+            blockX -= Blockly.internalConstants.SNAP_RADIUS;
           } else {
-            blockX += Blockly.SNAP_RADIUS;
+            blockX += Blockly.internalConstants.SNAP_RADIUS;
           }
-          blockY += Blockly.SNAP_RADIUS * 2;
+          blockY += Blockly.internalConstants.SNAP_RADIUS * 2;
         }
       } while (collide);
       block.moveBy(blockX, blockY);
diff --git a/tests/deps.js b/tests/deps.js
index abbcce849..a41eba2bb 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -3,7 +3,7 @@ goog.addDependency('../../blocks/lists.js', ['Blockly.Constants.Lists'], ['Block
 goog.addDependency('../../blocks/logic.js', ['Blockly.Blocks.logic', 'Blockly.Constants.Logic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator']);
 goog.addDependency('../../blocks/loops.js', ['Blockly.Blocks.loops', 'Blockly.Constants.Loops'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable', 'Blockly.Warning']);
 goog.addDependency('../../blocks/math.js', ['Blockly.Blocks.math', 'Blockly.Constants.Math'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable']);
-goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'], ['Blockly', 'Blockly.Blocks', 'Blockly.Comment', 'Blockly.FieldCheckbox', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.Mutator', 'Blockly.Warning'], {'lang': 'es5'});
+goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'], ['Blockly', 'Blockly.Blocks', 'Blockly.Comment', 'Blockly.FieldCheckbox', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.Mutator', 'Blockly.Warning', 'Blockly.internalConstants'], {'lang': 'es5'});
 goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator']);
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
@@ -24,7 +24,7 @@ goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionCheck
 goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.RenderedConnection', 'Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es5'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es5'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
@@ -66,13 +66,13 @@ goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Bl
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.Block', 'Blockly.constants', 'Blockly.utils.deprecation']);
-goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
+goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.Connection', 'Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es5'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes']);
-goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es5'});
+goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.internalConstants'], {'lang': 'es5'});
 goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], ['Blockly.IASTNodeLocation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], ['Blockly.IASTNodeLocation'], {'lang': 'es6', 'module': 'goog'});
@@ -122,7 +122,7 @@ goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.constants', 'Blockly.utils.xml']);
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], []);
-goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry']);
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
@@ -178,7 +178,7 @@ goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.brows
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.constants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
-goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.constants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
@@ -212,7 +212,7 @@ goog.addDependency('../../core/workspace_comment_render_svg.js', ['Blockly.Works
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.WorkspaceComment', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate']);
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
 goog.addDependency('base.js', [], []);

From 8b5f5f72d632ecbcaa55277a08c56b825ef6cf82 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 20 Jul 2021 14:10:34 -0700
Subject: [PATCH 219/833] Refer to more constants through internalConstants

---
 blocks/procedures.js             | 6 ++----
 core/block_svg.js                | 8 ++++----
 core/blockly.js                  | 5 +++--
 core/gesture.js                  | 2 +-
 core/insertion_marker_manager.js | 6 ++++--
 core/mutator.js                  | 3 ++-
 core/rendered_connection.js      | 2 +-
 core/touch.js                    | 6 ++----
 tests/deps.js                    | 8 ++++----
 9 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/blocks/procedures.js b/blocks/procedures.js
index 328bc89e0..644d7a751 100644
--- a/blocks/procedures.js
+++ b/blocks/procedures.js
@@ -18,7 +18,6 @@ goog.require('Blockly.Comment');
 goog.require('Blockly.FieldCheckbox');
 goog.require('Blockly.FieldLabel');
 goog.require('Blockly.FieldTextInput');
-goog.require('Blockly.internalConstants');
 goog.require('Blockly.Mutator');
 goog.require('Blockly.Warning');
 
@@ -868,9 +867,8 @@ Blockly.Blocks['procedures_callnoreturn'] = {
         var block = Blockly.utils.xml.createElement('block');
         block.setAttribute('type', this.defType_);
         var xy = this.getRelativeToSurfaceXY();
-        var x =
-            xy.x + Blockly.internalConstants.SNAP_RADIUS * (this.RTL ? -1 : 1);
-        var y = xy.y + Blockly.internalConstants.SNAP_RADIUS * 2;
+        var x = xy.x + Blockly.SNAP_RADIUS * (this.RTL ? -1 : 1);
+        var y = xy.y + Blockly.SNAP_RADIUS * 2;
         block.setAttribute('x', x);
         block.setAttribute('y', y);
         var mutation = this.mutationToDom();
diff --git a/core/block_svg.js b/core/block_svg.js
index f7da81fe3..fd5be3212 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -18,7 +18,6 @@ goog.require('Blockly.blockAnimations');
 goog.require('Blockly.blockRendering.IPathObject');
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.connectionTypes');
-/** @suppress {extraRequire} */
 goog.require('Blockly.constants');
 goog.require('Blockly.ContextMenu');
 goog.require('Blockly.ContextMenuRegistry');
@@ -31,6 +30,7 @@ goog.require('Blockly.IASTNodeLocationSvg');
 goog.require('Blockly.IBoundedElement');
 goog.require('Blockly.ICopyable');
 goog.require('Blockly.IDraggable');
+goog.require('Blockly.internalConstants');
 goog.require('Blockly.Msg');
 goog.require('Blockly.RenderedConnection');
 goog.require('Blockly.TabNavigateCursor');
@@ -688,7 +688,7 @@ Blockly.BlockSvg.prototype.updateCollapsed_ = function() {
     icon.setVisible(false);
   }
 
-  var text = this.toString(Blockly.COLLAPSE_CHARS);
+  var text = this.toString(Blockly.internalConstants.COLLAPSE_CHARS);
   var field = this.getField(collapsedFieldName);
   if (field) {
     field.setValue(text);
@@ -1586,13 +1586,13 @@ Blockly.BlockSvg.prototype.scheduleSnapAndBump = function() {
     Blockly.Events.setGroup(group);
     block.snapToGrid();
     Blockly.Events.setGroup(false);
-  }, Blockly.BUMP_DELAY / 2);
+  }, Blockly.internalConstants.BUMP_DELAY / 2);
 
   setTimeout(function() {
     Blockly.Events.setGroup(group);
     block.bumpNeighbours();
     Blockly.Events.setGroup(false);
-  }, Blockly.BUMP_DELAY);
+  }, Blockly.internalConstants.BUMP_DELAY);
 };
 
 /**
diff --git a/core/blockly.js b/core/blockly.js
index 554e02c8d..94f485c99 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -425,8 +425,9 @@ Blockly.isNumber = function(str) {
  * @return {string} RGB code, e.g. '#5ba65b'.
  */
 Blockly.hueToHex = function(hue) {
-  return Blockly.utils.colour.hsvToHex(hue, Blockly.HSV_SATURATION,
-      Blockly.HSV_VALUE * 255);
+  return Blockly.utils.colour.hsvToHex(
+      hue, Blockly.internalConstants.HSV_SATURATION,
+      Blockly.internalConstants.HSV_VALUE * 255);
 };
 
 /**
diff --git a/core/gesture.js b/core/gesture.js
index 77a720527..483d73a25 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -229,7 +229,7 @@ Blockly.Gesture = function(e, creatorWorkspace) {
    * @type {boolean}
    * @private
    */
-  this.healStack_ = !Blockly.DRAG_STACK;
+  this.healStack_ = !Blockly.internalConstants.DRAG_STACK;
 };
 
 /**
diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js
index bad4f28bc..614f7e70b 100644
--- a/core/insertion_marker_manager.js
+++ b/core/insertion_marker_manager.js
@@ -377,8 +377,10 @@ Blockly.InsertionMarkerManager.prototype.shouldUpdatePreviews_ = function(
       var yDiff = this.localConnection_.y + dxy.y - this.closestConnection_.y;
       var curDistance = Math.sqrt(xDiff * xDiff + yDiff * yDiff);
       // Slightly prefer the existing preview over a new preview.
-      return !(candidateClosest && radius > curDistance -
-          Blockly.CURRENT_CONNECTION_PREFERENCE);
+      return !(
+          candidateClosest &&
+          radius > curDistance -
+                  Blockly.internalConstants.CURRENT_CONNECTION_PREFERENCE);
     } else if (!this.localConnection_ && !this.closestConnection_) {
     // We weren't showing a preview before, but we should now.
       return true;
diff --git a/core/mutator.js b/core/mutator.js
index 1bd6d0988..2733964c7 100644
--- a/core/mutator.js
+++ b/core/mutator.js
@@ -20,6 +20,7 @@ goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BubbleOpen');
 goog.require('Blockly.Icon');
+goog.require('Blockly.internalConstants');
 goog.require('Blockly.Options');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.dom');
@@ -444,7 +445,7 @@ Blockly.Mutator.prototype.workspaceChanged_ = function(e) {
         Blockly.Events.setGroup(group);
         block.bumpNeighbours();
         Blockly.Events.setGroup(false);
-      }, Blockly.BUMP_DELAY);
+      }, Blockly.internalConstants.BUMP_DELAY);
     }
 
     // Don't update the bubble until the drag has ended, to avoid moving blocks
diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index f229a2fac..14795c181 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -471,7 +471,7 @@ Blockly.RenderedConnection.prototype.onFailedConnect =
             this.bumpAwayFrom(otherConnection);
             Blockly.Events.setGroup(false);
           }
-        }.bind(this), Blockly.BUMP_DELAY);
+        }.bind(this), Blockly.internalConstants.BUMP_DELAY);
       }
     };
 
diff --git a/core/touch.js b/core/touch.js
index b6668c398..7dc578663 100644
--- a/core/touch.js
+++ b/core/touch.js
@@ -16,8 +16,7 @@
  */
 goog.provide('Blockly.Touch');
 
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
+goog.require('Blockly.internalConstants');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.global');
 goog.require('Blockly.utils.string');
@@ -107,8 +106,7 @@ Blockly.longStart = function(e, gesture) {
     if (gesture) {
       gesture.handleRightClick(e);
     }
-
-  }, Blockly.LONGPRESS);
+  }, Blockly.internalConstants.LONGPRESS);
 };
 
 /**
diff --git a/tests/deps.js b/tests/deps.js
index a41eba2bb..39f55df61 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -3,7 +3,7 @@ goog.addDependency('../../blocks/lists.js', ['Blockly.Constants.Lists'], ['Block
 goog.addDependency('../../blocks/logic.js', ['Blockly.Blocks.logic', 'Blockly.Constants.Logic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator']);
 goog.addDependency('../../blocks/loops.js', ['Blockly.Blocks.loops', 'Blockly.Constants.Loops'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable', 'Blockly.Warning']);
 goog.addDependency('../../blocks/math.js', ['Blockly.Blocks.math', 'Blockly.Constants.Math'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable']);
-goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'], ['Blockly', 'Blockly.Blocks', 'Blockly.Comment', 'Blockly.FieldCheckbox', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.Mutator', 'Blockly.Warning', 'Blockly.internalConstants'], {'lang': 'es5'});
+goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'], ['Blockly', 'Blockly.Blocks', 'Blockly.Comment', 'Blockly.FieldCheckbox', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.Mutator', 'Blockly.Warning'], {'lang': 'es5'});
 goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator']);
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
@@ -11,7 +11,7 @@ goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode',
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom']);
-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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
+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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', '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']);
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global']);
@@ -116,7 +116,7 @@ goog.addDependency('../../core/menu.js', ['Blockly.Menu'], ['Blockly.browserEven
 goog.addDependency('../../core/menuitem.js', ['Blockly.MenuItem'], ['Blockly.utils.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom']);
 goog.addDependency('../../core/metrics_manager.js', ['Blockly.FlyoutMetricsManager', 'Blockly.MetricsManager'], ['Blockly.IMetricsManager', 'Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global']);
-goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
+goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
 goog.addDependency('../../core/names.js', ['Blockly.Names'], ['Blockly.Msg', 'Blockly.constants']);
 goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.Metrics', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox']);
@@ -175,7 +175,7 @@ goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem']);
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.utils.string']);
-goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.constants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.string']);
+goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);

From b3f837a8d2d9152bad0dff2b54278de32f750733 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 20 Jul 2021 14:24:59 -0700
Subject: [PATCH 220/833] Replace references to constants with
 internalConstants

---
 core/connection_checker.js  |  5 ++---
 core/field_variable.js      | 22 ++++++++++------------
 core/generator.js           |  7 +++----
 core/names.js               | 17 +++++++++--------
 core/procedures.js          |  8 ++++----
 core/rendered_connection.js |  5 +++--
 core/variables.js           |  7 +++----
 core/workspace_svg.js       |  9 ++++++---
 tests/deps.js               | 12 ++++++------
 9 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/core/connection_checker.js b/core/connection_checker.js
index 4bd7bd4e2..5dcaef376 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -16,11 +16,10 @@ goog.module.declareLegacyNamespace();
 
 const Connection = goog.require('Blockly.Connection');
 const IConnectionChecker = goog.require('Blockly.IConnectionChecker');
+const {OPPOSITE_TYPE} = goog.require('Blockly.internalConstants');
 const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 const connectionTypes = goog.require('Blockly.connectionTypes');
 const registry = goog.require('Blockly.registry');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 
 
 /**
@@ -144,7 +143,7 @@ ConnectionChecker.prototype.doSafetyChecks = function(a, b) {
   }
   if (blockA == blockB) {
     return Connection.REASON_SELF_CONNECTION;
-  } else if (b.type != Blockly.OPPOSITE_TYPE[a.type]) {
+  } else if (b.type != OPPOSITE_TYPE[a.type]) {
     return Connection.REASON_WRONG_TYPE;
   } else if (blockA.workspace !== blockB.workspace) {
     return Connection.REASON_DIFFERENT_WORKSPACES;
diff --git a/core/field_variable.js b/core/field_variable.js
index 18f2d20b4..e5e379c13 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -12,13 +12,11 @@
 
 goog.provide('Blockly.FieldVariable');
 
-/** @suppress {extraRequire} */
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.FieldDropdown');
 goog.require('Blockly.fieldRegistry');
+goog.require('Blockly.internalConstants');
 goog.require('Blockly.Msg');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.object');
@@ -417,14 +415,14 @@ Blockly.FieldVariable.dropdownCreate = function() {
     // Set the UUID as the internal representation of the variable.
     options[i] = [variableModelList[i].name, variableModelList[i].getId()];
   }
-  options.push([Blockly.Msg['RENAME_VARIABLE'], Blockly.RENAME_VARIABLE_ID]);
+  options.push([
+    Blockly.Msg['RENAME_VARIABLE'], Blockly.internalConstants.RENAME_VARIABLE_ID
+  ]);
   if (Blockly.Msg['DELETE_VARIABLE']) {
-    options.push(
-        [
-          Blockly.Msg['DELETE_VARIABLE'].replace('%1', name),
-          Blockly.DELETE_VARIABLE_ID
-        ]
-    );
+    options.push([
+      Blockly.Msg['DELETE_VARIABLE'].replace('%1', name),
+      Blockly.internalConstants.DELETE_VARIABLE_ID
+    ]);
   }
 
   return options;
@@ -442,12 +440,12 @@ Blockly.FieldVariable.prototype.onItemSelected_ = function(menu, menuItem) {
   var id = menuItem.getValue();
   // Handle special cases.
   if (this.sourceBlock_ && this.sourceBlock_.workspace) {
-    if (id == Blockly.RENAME_VARIABLE_ID) {
+    if (id == Blockly.internalConstants.RENAME_VARIABLE_ID) {
       // Rename variable.
       Blockly.Variables.renameVariable(
           this.sourceBlock_.workspace, this.variable_);
       return;
-    } else if (id == Blockly.DELETE_VARIABLE_ID) {
+    } else if (id == Blockly.internalConstants.DELETE_VARIABLE_ID) {
       // Delete variable.
       this.sourceBlock_.workspace.deleteVariableById(this.variable_.getId());
       return;
diff --git a/core/generator.js b/core/generator.js
index d2af08852..e365c69ba 100644
--- a/core/generator.js
+++ b/core/generator.js
@@ -14,8 +14,7 @@
 goog.provide('Blockly.Generator');
 
 goog.require('Blockly.Block');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
+goog.require('Blockly.internalConstants');
 goog.require('Blockly.utils.deprecation');
 
 goog.requireType('Blockly.Names');
@@ -451,8 +450,8 @@ Object.defineProperty(Blockly.Generator.prototype, 'variableDB_', {
  */
 Blockly.Generator.prototype.provideFunction_ = function(desiredName, code) {
   if (!this.definitions_[desiredName]) {
-    var functionName = this.nameDB_.getDistinctName(desiredName,
-        Blockly.PROCEDURE_CATEGORY_NAME);
+    var functionName = this.nameDB_.getDistinctName(
+        desiredName, Blockly.internalConstants.PROCEDURE_CATEGORY_NAME);
     this.functionNames_[desiredName] = functionName;
     var codeText = code.join('\n').replace(
         this.FUNCTION_NAME_PLACEHOLDER_REGEXP_, functionName);
diff --git a/core/names.js b/core/names.js
index 3abd27f9e..a559321cf 100644
--- a/core/names.js
+++ b/core/names.js
@@ -12,8 +12,7 @@
 
 goog.provide('Blockly.Names');
 
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
+goog.require('Blockly.internalConstants');
 goog.require('Blockly.Msg');
 
 goog.requireType('Blockly.VariableMap');
@@ -77,7 +76,7 @@ Blockly.Names.prototype.setVariableMap = function(map) {
 /**
  * Get the name for a user-defined variable, based on its ID.
  * This should only be used for variables of realm
- * Blockly.VARIABLE_CATEGORY_NAME.
+ * Blockly.internalConstants.VARIABLE_CATEGORY_NAME.
  * @param {string} id The ID to look up in the variable map.
  * @return {?string} The name of the referenced variable, or null if there was
  *     no variable map or the variable was not found in the map.
@@ -106,7 +105,8 @@ Blockly.Names.prototype.getNameForUserVariable_ = function(id) {
 Blockly.Names.prototype.populateVariables = function(workspace) {
   var variables = Blockly.Variables.allUsedVarModels(workspace);
   for (var i = 0; i < variables.length; i++) {
-    this.getName(variables[i].getId(), Blockly.VARIABLE_CATEGORY_NAME);
+    this.getName(
+        variables[i].getId(), Blockly.internalConstants.VARIABLE_CATEGORY_NAME);
   }
 };
 
@@ -119,7 +119,8 @@ Blockly.Names.prototype.populateProcedures = function(workspace) {
   // Flatten the return vs no-return procedure lists.
   procedures = procedures[0].concat(procedures[1]);
   for (var i = 0; i < procedures.length; i++) {
-    this.getName(procedures[i][0], Blockly.PROCEDURE_CATEGORY_NAME);
+    this.getName(
+        procedures[i][0], Blockly.internalConstants.PROCEDURE_CATEGORY_NAME);
   }
 };
 
@@ -133,7 +134,7 @@ Blockly.Names.prototype.populateProcedures = function(workspace) {
  */
 Blockly.Names.prototype.getName = function(nameOrId, realm) {
   var name = nameOrId;
-  if (realm == Blockly.VARIABLE_CATEGORY_NAME) {
+  if (realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME) {
     var varName = this.getNameForUserVariable_(nameOrId);
     if (varName) {
       // Successful ID lookup.
@@ -142,7 +143,7 @@ Blockly.Names.prototype.getName = function(nameOrId, realm) {
   }
   var normalizedName = name.toLowerCase();
 
-  var isVar = realm == Blockly.VARIABLE_CATEGORY_NAME ||
+  var isVar = realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME ||
       realm == Blockly.Names.DEVELOPER_VARIABLE_TYPE;
 
   var prefix = isVar ? this.variablePrefix_ : '';
@@ -189,7 +190,7 @@ Blockly.Names.prototype.getDistinctName = function(name, realm) {
   }
   safeName += i;
   this.dbReverse_[safeName] = true;
-  var isVar = realm == Blockly.VARIABLE_CATEGORY_NAME ||
+  var isVar = realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME ||
       realm == Blockly.Names.DEVELOPER_VARIABLE_TYPE;
   var prefix = isVar ? this.variablePrefix_ : '';
   return prefix + safeName;
diff --git a/core/procedures.js b/core/procedures.js
index 984ef03fa..3323bb130 100644
--- a/core/procedures.js
+++ b/core/procedures.js
@@ -17,12 +17,11 @@
 goog.provide('Blockly.Procedures');
 
 goog.require('Blockly.Blocks');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Field');
+goog.require('Blockly.internalConstants');
 goog.require('Blockly.Msg');
 goog.require('Blockly.Names');
 goog.require('Blockly.utils.xml');
@@ -37,9 +36,10 @@ goog.requireType('Blockly.WorkspaceSvg');
 /**
  * Constant to separate procedure names from variables and generated functions
  * when running generators.
- * @deprecated Use Blockly.PROCEDURE_CATEGORY_NAME
+ * @deprecated Use Blockly.internalConstants.PROCEDURE_CATEGORY_NAME
  */
-Blockly.Procedures.NAME_TYPE = Blockly.PROCEDURE_CATEGORY_NAME;
+Blockly.Procedures.NAME_TYPE =
+    Blockly.internalConstants.PROCEDURE_CATEGORY_NAME;
 
 /**
  * The default argument for a procedures_mutatorarg block.
diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index 14795c181..cddda9200 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -50,8 +50,9 @@ Blockly.RenderedConnection = function(source, type) {
    * @const {!Blockly.ConnectionDB}
    * @private
    */
-  this.dbOpposite_ = source.workspace
-      .connectionDBList[Blockly.OPPOSITE_TYPE[type]];
+  this.dbOpposite_ =
+      source.workspace
+          .connectionDBList[Blockly.internalConstants.OPPOSITE_TYPE[type]];
 
   /**
    * Workspace units, (0, 0) is top left of block.
diff --git a/core/variables.js b/core/variables.js
index 1c091898e..223838a2b 100644
--- a/core/variables.js
+++ b/core/variables.js
@@ -17,8 +17,7 @@
 goog.provide('Blockly.Variables');
 
 goog.require('Blockly.Blocks');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
+goog.require('Blockly.internalConstants');
 goog.require('Blockly.Msg');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.xml');
@@ -31,9 +30,9 @@ goog.requireType('Blockly.Workspace');
 /**
  * Constant to separate variable names from procedures and generated functions
  * when running generators.
- * @deprecated Use Blockly.VARIABLE_CATEGORY_NAME
+ * @deprecated Use Blockly.internalConstants.VARIABLE_CATEGORY_NAME
  */
-Blockly.Variables.NAME_TYPE = Blockly.VARIABLE_CATEGORY_NAME;
+Blockly.Variables.NAME_TYPE = Blockly.internalConstants.VARIABLE_CATEGORY_NAME;
 
 /**
  * Find all user-created variables that are in use in the workspace.
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index f62107e4f..1c3cee44f 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -180,15 +180,18 @@ Blockly.WorkspaceSvg = function(
   this.flyoutButtonCallbacks_ = Object.create(null);
 
   if (Blockly.Variables && Blockly.Variables.flyoutCategory) {
-    this.registerToolboxCategoryCallback(Blockly.VARIABLE_CATEGORY_NAME,
+    this.registerToolboxCategoryCallback(
+        Blockly.internalConstants.VARIABLE_CATEGORY_NAME,
         Blockly.Variables.flyoutCategory);
   }
   if (Blockly.VariablesDynamic && Blockly.VariablesDynamic.flyoutCategory) {
-    this.registerToolboxCategoryCallback(Blockly.VARIABLE_DYNAMIC_CATEGORY_NAME,
+    this.registerToolboxCategoryCallback(
+        Blockly.internalConstants.VARIABLE_DYNAMIC_CATEGORY_NAME,
         Blockly.VariablesDynamic.flyoutCategory);
   }
   if (Blockly.Procedures && Blockly.Procedures.flyoutCategory) {
-    this.registerToolboxCategoryCallback(Blockly.PROCEDURE_CATEGORY_NAME,
+    this.registerToolboxCategoryCallback(
+        Blockly.internalConstants.PROCEDURE_CATEGORY_NAME,
         Blockly.Procedures.flyoutCategory);
     this.addChangeListener(Blockly.Procedures.mutatorOpenListener);
   }
diff --git a/tests/deps.js b/tests/deps.js
index 39f55df61..8570bfd1c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -20,7 +20,7 @@ goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['
 goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.RenderedConnection', 'Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
@@ -60,12 +60,12 @@ goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilin
 goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object']);
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry']);
 goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object']);
+goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object']);
 goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es5'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.Block', 'Blockly.constants', 'Blockly.utils.deprecation']);
+goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.Block', 'Blockly.internalConstants', 'Blockly.utils.deprecation']);
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
@@ -117,10 +117,10 @@ goog.addDependency('../../core/menuitem.js', ['Blockly.MenuItem'], ['Blockly.uti
 goog.addDependency('../../core/metrics_manager.js', ['Blockly.FlyoutMetricsManager', 'Blockly.MetricsManager'], ['Blockly.IMetricsManager', 'Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global']);
 goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
-goog.addDependency('../../core/names.js', ['Blockly.Names'], ['Blockly.Msg', 'Blockly.constants']);
+goog.addDependency('../../core/names.js', ['Blockly.Names'], ['Blockly.Msg', 'Blockly.internalConstants']);
 goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.Metrics', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.constants', 'Blockly.utils.xml']);
+goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.xml']);
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], []);
 goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry']);
@@ -201,7 +201,7 @@ goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'],
 goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
 goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.utils', 'Blockly.utils.object']);
 goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils']);
-goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.xml']);
+goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.xml']);
 goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml']);
 goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.utils.dom']);

From cf7a8b95b847be2f6136f121601bc81c5c8674df Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 20 Jul 2021 14:51:58 -0700
Subject: [PATCH 221/833] Remove extra requires of Blockly.constants

---
 core/flyout_horizontal.js           |  2 --
 core/input.js                       |  2 --
 core/keyboard_nav/ast_node.js       |  2 --
 core/renderers/common/constants.js  |  2 --
 core/renderers/common/debugger.js   |  2 --
 core/renderers/common/marker_svg.js |  2 --
 core/renderers/common/renderer.js   |  2 --
 core/renderers/geras/info.js        |  2 --
 core/renderers/zelos/constants.js   |  2 --
 core/renderers/zelos/info.js        |  2 --
 core/renderers/zelos/renderer.js    |  2 --
 core/xml.js                         |  3 --
 core/zoom_controls.js               |  2 --
 tests/deps.js                       | 48 +++++++++++++----------------
 14 files changed, 21 insertions(+), 54 deletions(-)

diff --git a/core/flyout_horizontal.js b/core/flyout_horizontal.js
index 485d29617..66e9ff18e 100644
--- a/core/flyout_horizontal.js
+++ b/core/flyout_horizontal.js
@@ -14,8 +14,6 @@ goog.provide('Blockly.HorizontalFlyout');
 
 /** @suppress {extraRequire} */
 goog.require('Blockly.Block');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.DropDownDiv');
 goog.require('Blockly.Flyout');
 goog.require('Blockly.registry');
diff --git a/core/input.js b/core/input.js
index 57189c278..443bfc83f 100644
--- a/core/input.js
+++ b/core/input.js
@@ -13,8 +13,6 @@
 goog.provide('Blockly.Input');
 
 goog.require('Blockly.Connection');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.fieldRegistry');
 /** @suppress {extraRequire} */
 goog.require('Blockly.FieldLabel');
diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index 37145a090..332e9af8c 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -13,8 +13,6 @@
 goog.provide('Blockly.ASTNode');
 
 goog.require('Blockly.connectionTypes');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.utils.Coordinate');
 
 goog.requireType('Blockly.Block');
diff --git a/core/renderers/common/constants.js b/core/renderers/common/constants.js
index a21ef85aa..5c73d0510 100644
--- a/core/renderers/common/constants.js
+++ b/core/renderers/common/constants.js
@@ -13,8 +13,6 @@
 goog.provide('Blockly.blockRendering.ConstantProvider');
 
 goog.require('Blockly.connectionTypes');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.colour');
 goog.require('Blockly.utils.dom');
diff --git a/core/renderers/common/debugger.js b/core/renderers/common/debugger.js
index 0e99fc613..a6ab9d387 100644
--- a/core/renderers/common/debugger.js
+++ b/core/renderers/common/debugger.js
@@ -17,8 +17,6 @@ goog.require('Blockly.blockRendering.RenderInfo');
 goog.require('Blockly.blockRendering.Row');
 goog.require('Blockly.blockRendering.Types');
 goog.require('Blockly.connectionTypes');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.Svg');
 
diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js
index f9559e071..36d12b119 100644
--- a/core/renderers/common/marker_svg.js
+++ b/core/renderers/common/marker_svg.js
@@ -15,8 +15,6 @@ goog.provide('Blockly.blockRendering.MarkerSvg');
 
 goog.require('Blockly.ASTNode');
 goog.require('Blockly.connectionTypes');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.MarkerMove');
diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js
index 77df5e518..37e4a883a 100644
--- a/core/renderers/common/renderer.js
+++ b/core/renderers/common/renderer.js
@@ -20,8 +20,6 @@ goog.require('Blockly.blockRendering.MarkerSvg');
 goog.require('Blockly.blockRendering.PathObject');
 goog.require('Blockly.blockRendering.RenderInfo');
 goog.require('Blockly.connectionTypes');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.InsertionMarkerManager');
 goog.require('Blockly.IRegistrable');
 
diff --git a/core/renderers/geras/info.js b/core/renderers/geras/info.js
index ffc515a17..121e3b353 100644
--- a/core/renderers/geras/info.js
+++ b/core/renderers/geras/info.js
@@ -19,8 +19,6 @@ goog.require('Blockly.blockRendering.InputRow');
 goog.require('Blockly.blockRendering.InRowSpacer');
 goog.require('Blockly.blockRendering.RenderInfo');
 goog.require('Blockly.blockRendering.Types');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.geras.InlineInput');
 goog.require('Blockly.geras.StatementInput');
 goog.require('Blockly.inputTypes');
diff --git a/core/renderers/zelos/constants.js b/core/renderers/zelos/constants.js
index bb039250a..2070197cf 100644
--- a/core/renderers/zelos/constants.js
+++ b/core/renderers/zelos/constants.js
@@ -15,8 +15,6 @@ goog.provide('Blockly.zelos.ConstantProvider');
 
 goog.require('Blockly.blockRendering.ConstantProvider');
 goog.require('Blockly.connectionTypes');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.utils.colour');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.object');
diff --git a/core/renderers/zelos/info.js b/core/renderers/zelos/info.js
index b7dc3d972..078031756 100644
--- a/core/renderers/zelos/info.js
+++ b/core/renderers/zelos/info.js
@@ -18,8 +18,6 @@ goog.require('Blockly.blockRendering.InRowSpacer');
 goog.require('Blockly.blockRendering.Measurable');
 goog.require('Blockly.blockRendering.RenderInfo');
 goog.require('Blockly.blockRendering.Types');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.FieldImage');
 goog.require('Blockly.FieldLabel');
 goog.require('Blockly.FieldTextInput');
diff --git a/core/renderers/zelos/renderer.js b/core/renderers/zelos/renderer.js
index d192fa178..3c5287bbb 100644
--- a/core/renderers/zelos/renderer.js
+++ b/core/renderers/zelos/renderer.js
@@ -15,8 +15,6 @@ goog.provide('Blockly.zelos.Renderer');
 goog.require('Blockly.blockRendering');
 goog.require('Blockly.blockRendering.Renderer');
 goog.require('Blockly.connectionTypes');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.InsertionMarkerManager');
 goog.require('Blockly.utils.object');
 goog.require('Blockly.zelos.ConstantProvider');
diff --git a/core/xml.js b/core/xml.js
index 4140d6528..e581bfd01 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -15,9 +15,6 @@
  * @namespace
  */
 goog.provide('Blockly.Xml');
-
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.Events');
 goog.require('Blockly.inputTypes');
 goog.require('Blockly.utils');
diff --git a/core/zoom_controls.js b/core/zoom_controls.js
index 6ecf8b041..7d0d7e6ce 100644
--- a/core/zoom_controls.js
+++ b/core/zoom_controls.js
@@ -14,8 +14,6 @@ goog.provide('Blockly.ZoomControls');
 
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.ComponentManager');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.Css');
 goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
diff --git a/tests/deps.js b/tests/deps.js
index 8570bfd1c..2d1386395 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -29,7 +29,7 @@ goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es5'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea']);
-goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockly.IDragTarget']);
 goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style']);
 goog.addDependency('../../core/events/block_events.js', ['Blockly.Events.BlockBase', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Events.Change', 'Blockly.Events.Create', 'Blockly.Events.Delete', 'Blockly.Events.Move'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils']);
@@ -48,9 +48,9 @@ goog.addDependency('../../core/events/variable_events.js', ['Blockly.Events.VarB
 goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es5'});
 goog.addDependency('../../core/events/ws_comment_events.js', ['Blockly.Events.CommentBase', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible', 'Blockly.IRegistrable', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible', 'Blockly.IRegistrable', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es5'});
 goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.IdGenerator', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['Blockly.DropDownDiv', 'Blockly.Field', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
@@ -63,14 +63,14 @@ goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'],
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object']);
 goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es5'});
-goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.Block', 'Blockly.internalConstants', 'Blockly.utils.deprecation']);
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.Connection', 'Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es5'});
+goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.Connection', 'Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es5'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes']);
 goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.internalConstants'], {'lang': 'es5'});
 goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
@@ -80,7 +80,6 @@ goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHid
 goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], ['Blockly.IContextMenu', 'Blockly.IDraggable'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_collapsible_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem'], ['Blockly.ISelectableToolboxItem'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], [], {'lang': 'es6', 'module': 'goog'});
@@ -94,23 +93,18 @@ goog.addDependency('../../core/interfaces/i_keyboard_accessible.js', ['Blockly.I
 goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], []);
 goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], []);
+goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], []);
 goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_selectable_toolbox_item.js', ['Blockly.ISelectableToolboxItem'], ['Blockly.IToolboxItem'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], ['Blockly.IRegistrable'], {'lang': 'es6', 'module': 'goog'});
-<<<<<<< HEAD
-goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.IToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
-=======
 goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem', 'Blockly.ISelectableToolboxItem', 'Blockly.IToolboxItem'], []);
 goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstants'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
->>>>>>> 3a5ddf4d (Rebuild)
-goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Coordinate'], {'lang': 'es5'});
+goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.utils.Coordinate'], {'lang': 'es5'});
 goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], ['Blockly.ASTNode']);
-goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object']);
 goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], ['Blockly.Cursor', 'Blockly.Marker']);
 goog.addDependency('../../core/menu.js', ['Blockly.Menu'], ['Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.style']);
 goog.addDependency('../../core/menuitem.js', ['Blockly.MenuItem'], ['Blockly.utils.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom']);
@@ -124,19 +118,19 @@ goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], []);
 goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry']);
-goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es5'});
-goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
+goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es5'});
+goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], []);
-goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.inputTypes']);
+goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes', 'Blockly.constants']);
+goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.geras.RenderInfo', 'Blockly.utils.object', 'Blockly.utils.svgPaths']);
 goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.svgPaths'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths']);
-goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras', 'Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras', 'Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/geras/measurables/inputs.js', ['Blockly.geras.InlineInput', 'Blockly.geras.StatementInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.PathObject', 'Blockly.geras.ConstantProvider', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object']);
@@ -152,15 +146,15 @@ goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimali
 goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos', 'Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es5'});
+goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.zelos.RenderInfo']);
-goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos', 'Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow']);
+goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos', 'Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow']);
 goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/zelos/measurables/rows.js', ['Blockly.zelos.BottomRow', 'Blockly.zelos.TopRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.TopRow', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider']);
-goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo']);
+goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo']);
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar', 'Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.utils.KeyCodes']);
@@ -196,7 +190,7 @@ goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], []);
 goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Blockly.utils.Coordinate', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], []);
 goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.constants']);
 goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global']);
 goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
 goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.utils', 'Blockly.utils.object']);
@@ -213,7 +207,7 @@ goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCom
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate']);
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
-goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
-goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
+goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
+goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
 goog.addDependency('base.js', [], []);
 

From 12636da1824cce1eb429d61ca974556e2b1208cb Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Wed, 21 Jul 2021 15:47:55 -0700
Subject: [PATCH 222/833] Reorder some requires and rebuild

---
 core/connection_checker.js |  2 +-
 core/internal_constants.js |  1 +
 tests/deps.js              | 20 +++++++++++---------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/core/connection_checker.js b/core/connection_checker.js
index 5dcaef376..8b2abfaab 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -16,10 +16,10 @@ goog.module.declareLegacyNamespace();
 
 const Connection = goog.require('Blockly.Connection');
 const IConnectionChecker = goog.require('Blockly.IConnectionChecker');
-const {OPPOSITE_TYPE} = goog.require('Blockly.internalConstants');
 const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 const connectionTypes = goog.require('Blockly.connectionTypes');
 const registry = goog.require('Blockly.registry');
+const {OPPOSITE_TYPE} = goog.require('Blockly.internalConstants');
 
 
 /**
diff --git a/core/internal_constants.js b/core/internal_constants.js
index b5a8cd568..b97c723b4 100644
--- a/core/internal_constants.js
+++ b/core/internal_constants.js
@@ -8,6 +8,7 @@
  * @fileoverview Module that provides constants for use inside Blockly. Do not
  * use these constants outside of the core library.
  * @author fenichel@google.com (Rachel Fenichel)
+ * @package
  */
 'use strict';
 
diff --git a/tests/deps.js b/tests/deps.js
index 2d1386395..74d330e51 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -29,7 +29,7 @@ goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es5'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea']);
-goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockly.IDragTarget']);
+goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style']);
 goog.addDependency('../../core/events/block_events.js', ['Blockly.Events.BlockBase', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Events.Change', 'Blockly.Events.Create', 'Blockly.Events.Delete', 'Blockly.Events.Move'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils']);
@@ -48,9 +48,9 @@ goog.addDependency('../../core/events/variable_events.js', ['Blockly.Events.VarB
 goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es5'});
 goog.addDependency('../../core/events/ws_comment_events.js', ['Blockly.Events.CommentBase', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible', 'Blockly.IRegistrable', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es5'});
+goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible', 'Blockly.IRegistrable', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.IdGenerator', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['Blockly.DropDownDiv', 'Blockly.Field', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
@@ -80,6 +80,7 @@ goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHid
 goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], ['Blockly.IContextMenu', 'Blockly.IDraggable'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_collapsible_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem'], ['Blockly.ISelectableToolboxItem'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], [], {'lang': 'es6', 'module': 'goog'});
@@ -93,18 +94,19 @@ goog.addDependency('../../core/interfaces/i_keyboard_accessible.js', ['Blockly.I
 goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], []);
 goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], []);
-goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], []);
+goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_selectable_toolbox_item.js', ['Blockly.ISelectableToolboxItem'], ['Blockly.IToolboxItem'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], ['Blockly.IRegistrable'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem', 'Blockly.ISelectableToolboxItem', 'Blockly.IToolboxItem'], []);
+goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.IToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstants'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.utils.Coordinate'], {'lang': 'es5'});
 goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], ['Blockly.ASTNode']);
-goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object']);
+goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], ['Blockly.Cursor', 'Blockly.Marker']);
 goog.addDependency('../../core/menu.js', ['Blockly.Menu'], ['Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.style']);
 goog.addDependency('../../core/menuitem.js', ['Blockly.MenuItem'], ['Blockly.utils.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom']);
@@ -122,7 +124,7 @@ goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRe
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], []);
-goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.inputTypes']);
+goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
@@ -190,7 +192,7 @@ goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], []);
 goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Blockly.utils.Coordinate', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], []);
 goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.constants']);
+goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global']);
 goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
 goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.utils', 'Blockly.utils.object']);

From c6650f0b8313b9ab93cf8ce3a2badd7a03e8c997 Mon Sep 17 00:00:00 2001
From: Monica Kozbial <6621618+moniika@users.noreply.github.com>
Date: Wed, 21 Jul 2021 16:53:08 -0700
Subject: [PATCH 223/833] Remove need for require instead of requireType for
 Block in ASTNode (#5157)

---
 core/keyboard_nav/ast_node.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index 332e9af8c..d86a22a4c 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -418,7 +418,7 @@ Blockly.ASTNode.prototype.findPrevForField_ = function() {
  */
 Blockly.ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
   var curLocation = this.getLocation();
-  if (!(curLocation instanceof Blockly.Block)) {
+  if (curLocation.getSourceBlock) {
     curLocation = /** @type {!Blockly.IASTNodeLocationWithBlock} */ (
       curLocation).getSourceBlock();
   }

From f1a41023d9a21ccd121c10aea22eb897a9a95925 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 08:27:35 -0700
Subject: [PATCH 224/833] Migrate core/field_registry.js to ES6 const/let

---
 core/field_registry.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/field_registry.js b/core/field_registry.js
index 7f431ff7d..463308d3e 100644
--- a/core/field_registry.js
+++ b/core/field_registry.js
@@ -54,7 +54,7 @@ Blockly.fieldRegistry.unregister = function(type) {
  * @package
  */
 Blockly.fieldRegistry.fromJson = function(options) {
-  var fieldObject = /** @type {?Blockly.IRegistrableField} */ (
+  const fieldObject = /** @type {?Blockly.IRegistrableField} */ (
     Blockly.registry.getObject(Blockly.registry.Type.FIELD, options['type']));
   if (!fieldObject) {
     console.warn('Blockly could not create a field of type ' + options['type'] +

From 063dc8b804af6caa117afbe361b5cfde7ec6fd22 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 08:30:54 -0700
Subject: [PATCH 225/833] Migrate core/field_registry.js to goog.module

---
 core/field_registry.js | 14 +++++++++-----
 tests/deps.js          |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/core/field_registry.js b/core/field_registry.js
index 463308d3e..f1c342579 100644
--- a/core/field_registry.js
+++ b/core/field_registry.js
@@ -12,7 +12,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.fieldRegistry');
+goog.module('Blockly.fieldRegistry');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.registry');
 
@@ -31,17 +32,19 @@ goog.requireType('Blockly.IRegistrableField');
  *     registered, or the fieldClass is not an object containing a fromJson
  *     function.
  */
-Blockly.fieldRegistry.register = function(type, fieldClass) {
+const register = function(type, fieldClass) {
   Blockly.registry.register(Blockly.registry.Type.FIELD, type, fieldClass);
 };
+exports.register = register;
 
 /**
  * Unregisters the field registered with the given type.
  * @param {string} type The field type name as used in the JSON definition.
  */
-Blockly.fieldRegistry.unregister = function(type) {
+const unregister = function(type) {
   Blockly.registry.unregister(Blockly.registry.Type.FIELD, type);
 };
+exports.unregister = unregister;
 
 /**
  * Construct a Field from a JSON arg object.
@@ -51,9 +54,8 @@ Blockly.fieldRegistry.unregister = function(type) {
  *     to the field type.
  * @return {?Blockly.Field} The new field instance or null if a field wasn't
  *     found with the given type name
- * @package
  */
-Blockly.fieldRegistry.fromJson = function(options) {
+const fromJson = function(options) {
   const fieldObject = /** @type {?Blockly.IRegistrableField} */ (
     Blockly.registry.getObject(Blockly.registry.Type.FIELD, options['type']));
   if (!fieldObject) {
@@ -65,3 +67,5 @@ Blockly.fieldRegistry.fromJson = function(options) {
   }
   return fieldObject.fromJson(options);
 };
+/** @package */
+exports.fromJson = fromJson;
diff --git a/tests/deps.js b/tests/deps.js
index da56c39f2..2cb4d384f 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -58,7 +58,7 @@ goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockl
 goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabelSerializable'], ['Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.object']);
 goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es5'});
 goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry']);
+goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object']);
 goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);

From 222b23480253e7a35e0b426baa2a9fa07b966ed2 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 08:34:55 -0700
Subject: [PATCH 226/833] Migrate core/field_registry.js to named requires

---
 core/field_registry.js | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/core/field_registry.js b/core/field_registry.js
index f1c342579..1ae36d903 100644
--- a/core/field_registry.js
+++ b/core/field_registry.js
@@ -15,25 +15,26 @@
 goog.module('Blockly.fieldRegistry');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.registry');
-
-goog.requireType('Blockly.Field');
-goog.requireType('Blockly.IRegistrableField');
+/* 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');
 
 
 /**
  * Registers a field type.
- * Blockly.fieldRegistry.fromJson uses this registry to
+ * fieldRegistry.fromJson uses this registry to
  * find the appropriate field type.
  * @param {string} type The field type name as used in the JSON definition.
- * @param {!Blockly.IRegistrableField} fieldClass The field class containing a
+ * @param {!IRegistrableField} fieldClass The field class containing a
  *     fromJson function that can construct an instance of the field.
  * @throws {Error} if the type name is empty, the field is already
  *     registered, or the fieldClass is not an object containing a fromJson
  *     function.
  */
 const register = function(type, fieldClass) {
-  Blockly.registry.register(Blockly.registry.Type.FIELD, type, fieldClass);
+  registry.register(registry.Type.FIELD, type, fieldClass);
 };
 exports.register = register;
 
@@ -42,22 +43,22 @@ exports.register = register;
  * @param {string} type The field type name as used in the JSON definition.
  */
 const unregister = function(type) {
-  Blockly.registry.unregister(Blockly.registry.Type.FIELD, type);
+  registry.unregister(registry.Type.FIELD, type);
 };
 exports.unregister = unregister;
 
 /**
  * Construct a Field from a JSON arg object.
  * Finds the appropriate registered field by the type name as registered using
- * Blockly.fieldRegistry.register.
+ * fieldRegistry.register.
  * @param {!Object} options A JSON object with a type and options specific
  *     to the field type.
- * @return {?Blockly.Field} The new field instance or null if a field wasn't
+ * @return {?Field} The new field instance or null if a field wasn't
  *     found with the given type name
  */
 const fromJson = function(options) {
-  const fieldObject = /** @type {?Blockly.IRegistrableField} */ (
-    Blockly.registry.getObject(Blockly.registry.Type.FIELD, options['type']));
+  const fieldObject = /** @type {?IRegistrableField} */ (
+    registry.getObject(registry.Type.FIELD, options['type']));
   if (!fieldObject) {
     console.warn('Blockly could not create a field of type ' + options['type'] +
       '. The field is probably not being registered. This could be because' +

From 223ec1dd6c717dc12ccf1e9d78f6a4eb783f93e9 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 08:35:25 -0700
Subject: [PATCH 227/833] clang-format core/field_registry.js

---
 core/field_registry.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/field_registry.js b/core/field_registry.js
index 1ae36d903..97c149346 100644
--- a/core/field_registry.js
+++ b/core/field_registry.js
@@ -58,12 +58,13 @@ exports.unregister = unregister;
  */
 const fromJson = function(options) {
   const fieldObject = /** @type {?IRegistrableField} */ (
-    registry.getObject(registry.Type.FIELD, options['type']));
+      registry.getObject(registry.Type.FIELD, options['type']));
   if (!fieldObject) {
-    console.warn('Blockly could not create a field of type ' + options['type'] +
-      '. The field is probably not being registered. This could be because' +
-      ' the file is not loaded, the field does not register itself (Issue' +
-      ' #1584), or the registration is not being reached.');
+    console.warn(
+        'Blockly could not create a field of type ' + options['type'] +
+        '. The field is probably not being registered. This could be because' +
+        ' the file is not loaded, the field does not register itself (Issue' +
+        ' #1584), or the registration is not being reached.');
     return null;
   }
   return fieldObject.fromJson(options);

From c3eaf1afc5061f8d20665355b070724e2acfd584 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 08:44:28 -0700
Subject: [PATCH 228/833] Migrate core/field_textinput.js to ES6 const/let

---
 core/field_textinput.js | 44 ++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/core/field_textinput.js b/core/field_textinput.js
index b2153b65e..c4c55dfcf 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -109,7 +109,7 @@ Blockly.FieldTextInput.prototype.DEFAULT_VALUE = '';
  * @nocollapse
  */
 Blockly.FieldTextInput.fromJson = function(options) {
-  var text = Blockly.utils.replaceMessageReferences(options['text']);
+  const text = Blockly.utils.replaceMessageReferences(options['text']);
   // `this` might be a subclass of FieldTextInput if that class doesn't override
   // the static fromJson method.
   return new this(text, undefined, options);
@@ -150,12 +150,12 @@ Blockly.FieldTextInput.prototype.initView = function() {
   if (this.getConstants().FULL_BLOCK_FIELDS) {
     // Step one: figure out if this is the only field on this block.
     // Rendering is quite different in that case.
-    var nFields = 0;
-    var nConnections = 0;
+    let nFields = 0;
+    let nConnections = 0;
 
     // Count the number of fields, excluding text fields
-    for (var i = 0, input; (input = this.sourceBlock_.inputList[i]); i++) {
-      for (var j = 0; (input.fieldRow[j]); j++) {
+    for (let i = 0, input; (input = this.sourceBlock_.inputList[i]); i++) {
+      for (let j = 0; (input.fieldRow[j]); j++) {
         nFields ++;
       }
       if (input.connection) {
@@ -203,7 +203,7 @@ Blockly.FieldTextInput.prototype.doClassValidation_ = function(opt_newValue) {
 Blockly.FieldTextInput.prototype.doValueInvalid_ = function(_invalidValue) {
   if (this.isBeingEdited_) {
     this.isTextValid_ = false;
-    var oldValue = this.value_;
+    const oldValue = this.value_;
     // Revert value when the text becomes invalid.
     this.value_ = this.htmlInput_.untypedDefaultValue_;
     if (this.sourceBlock_ && Blockly.Events.isEnabled()) {
@@ -257,7 +257,7 @@ Blockly.FieldTextInput.prototype.render_ = function() {
   // doValueUpdate_ so that the code is more centralized.
   if (this.isBeingEdited_) {
     this.resizeEditor_();
-    var htmlInput = /** @type {!HTMLElement} */(this.htmlInput_);
+    const htmlInput = /** @type {!HTMLElement} */(this.htmlInput_);
     if (!this.isTextValid_) {
       Blockly.utils.dom.addClass(htmlInput, 'blocklyInvalidInput');
       Blockly.utils.aria.setState(htmlInput,
@@ -296,7 +296,7 @@ Blockly.FieldTextInput.prototype.showEditor_ = function(_opt_e,
     opt_quietInput) {
   this.workspace_ =
     (/** @type {!Blockly.BlockSvg} */ (this.sourceBlock_)).workspace;
-  var quietInput = opt_quietInput || false;
+  const quietInput = opt_quietInput || false;
   if (!quietInput && (Blockly.utils.userAgent.MOBILE ||
                       Blockly.utils.userAgent.ANDROID ||
                       Blockly.utils.userAgent.IPAD)) {
@@ -343,28 +343,28 @@ Blockly.FieldTextInput.prototype.showInlineEditor_ = function(quietInput) {
  */
 Blockly.FieldTextInput.prototype.widgetCreate_ = function() {
   Blockly.Events.setGroup(true);
-  var div = Blockly.WidgetDiv.DIV;
+  const div = Blockly.WidgetDiv.DIV;
 
   Blockly.utils.dom.addClass(this.getClickTarget_(), 'editing');
 
-  var htmlInput = /** @type {HTMLInputElement} */ (document.createElement('input'));
+  const htmlInput = /** @type {HTMLInputElement} */ (document.createElement('input'));
   htmlInput.className = 'blocklyHtmlInput';
   htmlInput.setAttribute('spellcheck', this.spellcheck_);
-  var scale = this.workspace_.getScale();
-  var fontSize =
+  const scale = this.workspace_.getScale();
+  const fontSize =
       (this.getConstants().FIELD_TEXT_FONTSIZE * scale) + 'pt';
   div.style.fontSize = fontSize;
   htmlInput.style.fontSize = fontSize;
-  var borderRadius =
+  let borderRadius =
       (Blockly.FieldTextInput.BORDERRADIUS * scale) + 'px';
 
   if (this.fullBlockClickTarget_) {
-    var bBox = this.getScaledBBox();
+    const bBox = this.getScaledBBox();
 
     // Override border radius.
     borderRadius = (bBox.bottom - bBox.top) / 2 + 'px';
     // Pull stroke colour from the existing shadow block
-    var strokeColour = this.sourceBlock_.getParent() ?
+    const strokeColour = this.sourceBlock_.getParent() ?
       this.sourceBlock_.getParent().style.colourTertiary :
       this.sourceBlock_.style.colourTertiary;
     htmlInput.style.border = (1 * scale) + 'px solid ' + strokeColour;
@@ -409,7 +409,7 @@ Blockly.FieldTextInput.prototype.widgetDispose_ = function() {
 
   // Actual disposal.
   this.unbindInputEvents_();
-  var style = Blockly.WidgetDiv.DIV.style;
+  const style = Blockly.WidgetDiv.DIV.style;
   style.width = 'auto';
   style.height = 'auto';
   style.fontSize = '';
@@ -477,11 +477,11 @@ Blockly.FieldTextInput.prototype.onHtmlInputKeyDown_ = function(e) {
  * @private
  */
 Blockly.FieldTextInput.prototype.onHtmlInputChange_ = function(_e) {
-  var text = this.htmlInput_.value;
+  const text = this.htmlInput_.value;
   if (text !== this.htmlInput_.oldValue_) {
     this.htmlInput_.oldValue_ = text;
 
-    var value = this.getValueFromEditorText_(text);
+    const value = this.getValueFromEditorText_(text);
     this.setValue(value);
     this.forceRerender();
     this.resizeEditor_();
@@ -512,15 +512,15 @@ Blockly.FieldTextInput.prototype.setEditorValue_ = function(newValue) {
  * @protected
  */
 Blockly.FieldTextInput.prototype.resizeEditor_ = function() {
-  var div = Blockly.WidgetDiv.DIV;
-  var bBox = this.getScaledBBox();
+  const div = Blockly.WidgetDiv.DIV;
+  const bBox = this.getScaledBBox();
   div.style.width = bBox.right - bBox.left + 'px';
   div.style.height = bBox.bottom - bBox.top + 'px';
 
   // In RTL mode block fields and LTR input fields the left edge moves,
   // whereas the right edge is fixed.  Reposition the editor.
-  var x = this.sourceBlock_.RTL ? bBox.right - div.offsetWidth : bBox.left;
-  var xy = new Blockly.utils.Coordinate(x, bBox.top);
+  const x = this.sourceBlock_.RTL ? bBox.right - div.offsetWidth : bBox.left;
+  const xy = new Blockly.utils.Coordinate(x, bBox.top);
 
   div.style.left = xy.x + 'px';
   div.style.top = xy.y + 'px';

From d2a43460d0de014ee671de42f123a6f4ae1bc523 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 08:49:08 -0700
Subject: [PATCH 229/833] Migrate core/field_textinput.js to goog.module

---
 core/field_textinput.js | 77 +++++++++++++++++++++--------------------
 tests/deps.js           |  2 +-
 2 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/core/field_textinput.js b/core/field_textinput.js
index c4c55dfcf..4585ba382 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.FieldTextInput');
+goog.module('Blockly.FieldTextInput');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.DropDownDiv');
@@ -46,7 +47,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @extends {Blockly.Field}
  * @constructor
  */
-Blockly.FieldTextInput = function(opt_value, opt_validator, opt_config) {
+const FieldTextInput = function(opt_value, opt_validator, opt_config) {
   /**
    * Allow browser to spellcheck this field.
    * @type {boolean}
@@ -54,7 +55,7 @@ Blockly.FieldTextInput = function(opt_value, opt_validator, opt_config) {
    */
   this.spellcheck_ = true;
 
-  Blockly.FieldTextInput.superClass_.constructor.call(this,
+  FieldTextInput.superClass_.constructor.call(this,
       opt_value, opt_validator, opt_config);
 
   /**
@@ -91,24 +92,24 @@ Blockly.FieldTextInput = function(opt_value, opt_validator, opt_config) {
    */
   this.workspace_ = null;
 };
-Blockly.utils.object.inherits(Blockly.FieldTextInput, Blockly.Field);
+Blockly.utils.object.inherits(FieldTextInput, Blockly.Field);
 
 /**
  * The default value for this field.
  * @type {*}
  * @protected
  */
-Blockly.FieldTextInput.prototype.DEFAULT_VALUE = '';
+FieldTextInput.prototype.DEFAULT_VALUE = '';
 
 /**
  * Construct a FieldTextInput from a JSON arg object,
  * dereferencing any string table references.
  * @param {!Object} options A JSON object with options (text, and spellcheck).
- * @return {!Blockly.FieldTextInput} The new field instance.
+ * @return {!FieldTextInput} The new field instance.
  * @package
  * @nocollapse
  */
-Blockly.FieldTextInput.fromJson = function(options) {
+FieldTextInput.fromJson = function(options) {
   const text = Blockly.utils.replaceMessageReferences(options['text']);
   // `this` might be a subclass of FieldTextInput if that class doesn't override
   // the static fromJson method.
@@ -120,24 +121,24 @@ Blockly.FieldTextInput.fromJson = function(options) {
  * are not. Editable fields should also be serializable.
  * @type {boolean}
  */
-Blockly.FieldTextInput.prototype.SERIALIZABLE = true;
+FieldTextInput.prototype.SERIALIZABLE = true;
 
 /**
  * Pixel size of input border radius.
  * Should match blocklyText's border-radius in CSS.
  */
-Blockly.FieldTextInput.BORDERRADIUS = 4;
+FieldTextInput.BORDERRADIUS = 4;
 
 /**
  * Mouse cursor style when over the hotspot that initiates the editor.
  */
-Blockly.FieldTextInput.prototype.CURSOR = 'text';
+FieldTextInput.prototype.CURSOR = 'text';
 
 /**
  * @override
  */
-Blockly.FieldTextInput.prototype.configure_ = function(config) {
-  Blockly.FieldTextInput.superClass_.configure_.call(this, config);
+FieldTextInput.prototype.configure_ = function(config) {
+  FieldTextInput.superClass_.configure_.call(this, config);
   if (typeof config['spellcheck'] == 'boolean') {
     this.spellcheck_ = config['spellcheck'];
   }
@@ -146,7 +147,7 @@ Blockly.FieldTextInput.prototype.configure_ = function(config) {
 /**
  * @override
  */
-Blockly.FieldTextInput.prototype.initView = function() {
+FieldTextInput.prototype.initView = function() {
   if (this.getConstants().FULL_BLOCK_FIELDS) {
     // Step one: figure out if this is the only field on this block.
     // Rendering is quite different in that case.
@@ -184,7 +185,7 @@ Blockly.FieldTextInput.prototype.initView = function() {
  * @return {*} A valid string, or null if invalid.
  * @protected
  */
-Blockly.FieldTextInput.prototype.doClassValidation_ = function(opt_newValue) {
+FieldTextInput.prototype.doClassValidation_ = function(opt_newValue) {
   if (opt_newValue === null || opt_newValue === undefined) {
     return null;
   }
@@ -200,7 +201,7 @@ Blockly.FieldTextInput.prototype.doClassValidation_ = function(opt_newValue) {
  *    the htmlInput_.
  * @protected
  */
-Blockly.FieldTextInput.prototype.doValueInvalid_ = function(_invalidValue) {
+FieldTextInput.prototype.doValueInvalid_ = function(_invalidValue) {
   if (this.isBeingEdited_) {
     this.isTextValid_ = false;
     const oldValue = this.value_;
@@ -221,7 +222,7 @@ Blockly.FieldTextInput.prototype.doValueInvalid_ = function(_invalidValue) {
  * that this is a string.
  * @protected
  */
-Blockly.FieldTextInput.prototype.doValueUpdate_ = function(newValue) {
+FieldTextInput.prototype.doValueUpdate_ = function(newValue) {
   this.isTextValid_ = true;
   this.value_ = newValue;
   if (!this.isBeingEdited_) {
@@ -234,7 +235,7 @@ Blockly.FieldTextInput.prototype.doValueUpdate_ = function(newValue) {
  * Updates text field to match the colour/style of the block.
  * @package
  */
-Blockly.FieldTextInput.prototype.applyColour = function() {
+FieldTextInput.prototype.applyColour = function() {
   if (this.sourceBlock_ && this.getConstants().FULL_BLOCK_FIELDS) {
     if (this.borderRect_) {
       this.borderRect_.setAttribute('stroke',
@@ -251,8 +252,8 @@ Blockly.FieldTextInput.prototype.applyColour = function() {
  * field's value.
  * @protected
  */
-Blockly.FieldTextInput.prototype.render_ = function() {
-  Blockly.FieldTextInput.superClass_.render_.call(this);
+FieldTextInput.prototype.render_ = function() {
+  FieldTextInput.superClass_.render_.call(this);
   // This logic is done in render_ rather than doValueInvalid_ or
   // doValueUpdate_ so that the code is more centralized.
   if (this.isBeingEdited_) {
@@ -274,7 +275,7 @@ Blockly.FieldTextInput.prototype.render_ = function() {
  * Set whether this field is spellchecked by the browser.
  * @param {boolean} check True if checked.
  */
-Blockly.FieldTextInput.prototype.setSpellcheck = function(check) {
+FieldTextInput.prototype.setSpellcheck = function(check) {
   if (check == this.spellcheck_) {
     return;
   }
@@ -292,7 +293,7 @@ Blockly.FieldTextInput.prototype.setSpellcheck = function(check) {
  *     focus.  Defaults to false.
  * @protected
  */
-Blockly.FieldTextInput.prototype.showEditor_ = function(_opt_e,
+FieldTextInput.prototype.showEditor_ = function(_opt_e,
     opt_quietInput) {
   this.workspace_ =
     (/** @type {!Blockly.BlockSvg} */ (this.sourceBlock_)).workspace;
@@ -311,7 +312,7 @@ Blockly.FieldTextInput.prototype.showEditor_ = function(_opt_e,
  * Mobile browsers have issues with in-line textareas (focus and keyboards).
  * @private
  */
-Blockly.FieldTextInput.prototype.showPromptEditor_ = function() {
+FieldTextInput.prototype.showPromptEditor_ = function() {
   Blockly.prompt(Blockly.Msg['CHANGE_VALUE_TITLE'], this.getText(),
       function(text) {
         this.setValue(this.getValueFromEditorText_(text));
@@ -324,7 +325,7 @@ Blockly.FieldTextInput.prototype.showPromptEditor_ = function() {
  *     focus.
  * @private
  */
-Blockly.FieldTextInput.prototype.showInlineEditor_ = function(quietInput) {
+FieldTextInput.prototype.showInlineEditor_ = function(quietInput) {
   Blockly.WidgetDiv.show(
       this, this.sourceBlock_.RTL, this.widgetDispose_.bind(this));
   this.htmlInput_ = this.widgetCreate_();
@@ -341,7 +342,7 @@ Blockly.FieldTextInput.prototype.showInlineEditor_ = function(quietInput) {
  * @return {!HTMLElement} The newly created text input editor.
  * @protected
  */
-Blockly.FieldTextInput.prototype.widgetCreate_ = function() {
+FieldTextInput.prototype.widgetCreate_ = function() {
   Blockly.Events.setGroup(true);
   const div = Blockly.WidgetDiv.DIV;
 
@@ -356,7 +357,7 @@ Blockly.FieldTextInput.prototype.widgetCreate_ = function() {
   div.style.fontSize = fontSize;
   htmlInput.style.fontSize = fontSize;
   let borderRadius =
-      (Blockly.FieldTextInput.BORDERRADIUS * scale) + 'px';
+      (FieldTextInput.BORDERRADIUS * scale) + 'px';
 
   if (this.fullBlockClickTarget_) {
     const bBox = this.getScaledBBox();
@@ -395,7 +396,7 @@ Blockly.FieldTextInput.prototype.widgetCreate_ = function() {
  * DOM-references belonging to the editor.
  * @protected
  */
-Blockly.FieldTextInput.prototype.widgetDispose_ = function() {
+FieldTextInput.prototype.widgetDispose_ = function() {
   // Non-disposal related things that we do when the editor closes.
   this.isBeingEdited_ = false;
   this.isTextValid_ = true;
@@ -426,7 +427,7 @@ Blockly.FieldTextInput.prototype.widgetDispose_ = function() {
  *    handlers will be bound.
  * @protected
  */
-Blockly.FieldTextInput.prototype.bindInputEvents_ = function(htmlInput) {
+FieldTextInput.prototype.bindInputEvents_ = function(htmlInput) {
   // Trap Enter without IME and Esc to hide.
   this.onKeyDownWrapper_ = Blockly.browserEvents.conditionalBind(
       htmlInput, 'keydown', this, this.onHtmlInputKeyDown_);
@@ -439,7 +440,7 @@ Blockly.FieldTextInput.prototype.bindInputEvents_ = function(htmlInput) {
  * Unbind handlers for user input and workspace size changes.
  * @protected
  */
-Blockly.FieldTextInput.prototype.unbindInputEvents_ = function() {
+FieldTextInput.prototype.unbindInputEvents_ = function() {
   if (this.onKeyDownWrapper_) {
     Blockly.browserEvents.unbind(this.onKeyDownWrapper_);
     this.onKeyDownWrapper_ = null;
@@ -455,7 +456,7 @@ Blockly.FieldTextInput.prototype.unbindInputEvents_ = function() {
  * @param {!Event} e Keyboard event.
  * @protected
  */
-Blockly.FieldTextInput.prototype.onHtmlInputKeyDown_ = function(e) {
+FieldTextInput.prototype.onHtmlInputKeyDown_ = function(e) {
   if (e.keyCode == Blockly.utils.KeyCodes.ENTER) {
     Blockly.WidgetDiv.hide();
     Blockly.DropDownDiv.hideWithoutAnimation();
@@ -476,7 +477,7 @@ Blockly.FieldTextInput.prototype.onHtmlInputKeyDown_ = function(e) {
  * @param {!Event} _e Keyboard event.
  * @private
  */
-Blockly.FieldTextInput.prototype.onHtmlInputChange_ = function(_e) {
+FieldTextInput.prototype.onHtmlInputChange_ = function(_e) {
   const text = this.htmlInput_.value;
   if (text !== this.htmlInput_.oldValue_) {
     this.htmlInput_.oldValue_ = text;
@@ -495,7 +496,7 @@ Blockly.FieldTextInput.prototype.onHtmlInputChange_ = function(_e) {
  * @param {*} newValue New value.
  * @protected
  */
-Blockly.FieldTextInput.prototype.setEditorValue_ = function(newValue) {
+FieldTextInput.prototype.setEditorValue_ = function(newValue) {
   this.isDirty_ = true;
   if (this.isBeingEdited_) {
     // In the case this method is passed an invalid value, we still
@@ -511,7 +512,7 @@ Blockly.FieldTextInput.prototype.setEditorValue_ = function(newValue) {
  * Resize the editor to fit the text.
  * @protected
  */
-Blockly.FieldTextInput.prototype.resizeEditor_ = function() {
+FieldTextInput.prototype.resizeEditor_ = function() {
   const div = Blockly.WidgetDiv.DIV;
   const bBox = this.getScaledBBox();
   div.style.width = bBox.right - bBox.left + 'px';
@@ -531,7 +532,7 @@ Blockly.FieldTextInput.prototype.resizeEditor_ = function() {
  * @return {boolean} True if the field is tab navigable.
  * @override
  */
-Blockly.FieldTextInput.prototype.isTabNavigable = function() {
+FieldTextInput.prototype.isTabNavigable = function() {
   return true;
 };
 
@@ -544,7 +545,7 @@ Blockly.FieldTextInput.prototype.isTabNavigable = function() {
  * @protected
  * @override
  */
-Blockly.FieldTextInput.prototype.getText_ = function() {
+FieldTextInput.prototype.getText_ = function() {
   if (this.isBeingEdited_ && this.htmlInput_) {
     // We are currently editing, return the HTML input value instead.
     return this.htmlInput_.value;
@@ -561,7 +562,7 @@ Blockly.FieldTextInput.prototype.getText_ = function() {
  * @return {string} The text to show on the HTML input.
  * @protected
  */
-Blockly.FieldTextInput.prototype.getEditorText_ = function(value) {
+FieldTextInput.prototype.getEditorText_ = function(value) {
   return String(value);
 };
 
@@ -575,8 +576,10 @@ Blockly.FieldTextInput.prototype.getEditorText_ = function(value) {
  * @return {*} The value to store.
  * @protected
  */
-Blockly.FieldTextInput.prototype.getValueFromEditorText_ = function(text) {
+FieldTextInput.prototype.getValueFromEditorText_ = function(text) {
   return text;
 };
 
-Blockly.fieldRegistry.register('field_input', Blockly.FieldTextInput);
+Blockly.fieldRegistry.register('field_input', FieldTextInput);
+
+exports = FieldTextInput;
diff --git a/tests/deps.js b/tests/deps.js
index da56c39f2..0e96aa2c3 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -59,7 +59,7 @@ goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabe
 goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es5'});
 goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry']);
-goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object']);
 goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es5'});

From 9134d45d94e3d3506e7b1b9d3bb2bac18d8b45b8 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 22 Jul 2021 08:35:59 -0700
Subject: [PATCH 230/833] Migrate core/menu.js to ES6 const/let

---
 core/menu.js | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/core/menu.js b/core/menu.js
index 97f47248a..011199252 100644
--- a/core/menu.js
+++ b/core/menu.js
@@ -118,7 +118,8 @@ Blockly.Menu.prototype.addChild = function(menuItem) {
  * @param {!Element} container Element upon which to append this menu.
  */
 Blockly.Menu.prototype.render = function(container) {
-  var element = /** @type {!HTMLDivElement} */ (document.createElement('div'));
+  const element = /** @type {!HTMLDivElement} */ (document.createElement(
+      'div'));
   // goog-menu is deprecated, use blocklyMenu.  May 2020.
   element.className = 'blocklyMenu goog-menu blocklyNonSelectable';
   element.tabIndex = 0;
@@ -128,7 +129,7 @@ Blockly.Menu.prototype.render = function(container) {
   this.element_ = element;
 
   // Add menu items.
-  for (var i = 0, menuItem; (menuItem = this.menuItems_[i]); i++) {
+  for (let i = 0, menuItem; (menuItem = this.menuItems_[i]); i++) {
     element.appendChild(menuItem.createDom());
   }
 
@@ -161,7 +162,7 @@ Blockly.Menu.prototype.getElement = function() {
  * @package
  */
 Blockly.Menu.prototype.focus = function() {
-  var el = this.getElement();
+  const el = this.getElement();
   if (el) {
     el.focus({preventScroll:true});
     Blockly.utils.dom.addClass(el, 'blocklyFocused');
@@ -173,7 +174,7 @@ Blockly.Menu.prototype.focus = function() {
  * @private
  */
 Blockly.Menu.prototype.blur_ = function() {
-  var el = this.getElement();
+  const el = this.getElement();
   if (el) {
     el.blur();
     Blockly.utils.dom.removeClass(el, 'blocklyFocused');
@@ -216,7 +217,7 @@ Blockly.Menu.prototype.dispose = function() {
   }
 
   // Remove menu items.
-  for (var i = 0, menuItem; (menuItem = this.menuItems_[i]); i++) {
+  for (let i = 0, menuItem; (menuItem = this.menuItems_[i]); i++) {
     menuItem.dispose();
   }
   this.element_ = null;
@@ -232,7 +233,7 @@ Blockly.Menu.prototype.dispose = function() {
  * @private
  */
 Blockly.Menu.prototype.getMenuItem_ = function(elem) {
-  var menuElem = this.getElement();
+  const menuElem = this.getElement();
   // Node might be the menu border (resulting in no associated menu item), or
   // a menu item's div, or some element within the menu item.
   // Walk up parents until one meets either the menu's root element, or
@@ -240,7 +241,7 @@ Blockly.Menu.prototype.getMenuItem_ = function(elem) {
   while (elem && elem != menuElem) {
     if (Blockly.utils.dom.hasClass(elem, 'blocklyMenuItem')) {
       // Having found a menu item's div, locate that menu item in this menu.
-      for (var i = 0, menuItem; (menuItem = this.menuItems_[i]); i++) {
+      for (let i = 0, menuItem; (menuItem = this.menuItems_[i]); i++) {
         if (menuItem.getElement() == elem) {
           return menuItem;
         }
@@ -259,7 +260,7 @@ Blockly.Menu.prototype.getMenuItem_ = function(elem) {
  * @package
  */
 Blockly.Menu.prototype.setHighlighted = function(item) {
-  var currentHighlighted = this.highlightedItem_;
+  const currentHighlighted = this.highlightedItem_;
   if (currentHighlighted) {
     currentHighlighted.setHighlighted(false);
     this.highlightedItem_ = null;
@@ -269,7 +270,7 @@ Blockly.Menu.prototype.setHighlighted = function(item) {
     this.highlightedItem_ = item;
     // Bring the highlighted item into view. This has no effect if the menu is
     // not scrollable.
-    var el = /** @type {!Element} */ (this.getElement());
+    const el = /** @type {!Element} */ (this.getElement());
     Blockly.utils.style.scrollIntoContainerView(
         /** @type {!Element} */ (item.getElement()), el);
 
@@ -284,7 +285,7 @@ Blockly.Menu.prototype.setHighlighted = function(item) {
  * @package
  */
 Blockly.Menu.prototype.highlightNext = function() {
-  var index = this.menuItems_.indexOf(this.highlightedItem_);
+  const index = this.menuItems_.indexOf(this.highlightedItem_);
   this.highlightHelper_(index, 1);
 };
 
@@ -294,7 +295,7 @@ Blockly.Menu.prototype.highlightNext = function() {
  * @package
  */
 Blockly.Menu.prototype.highlightPrevious = function() {
-  var index = this.menuItems_.indexOf(this.highlightedItem_);
+  const index = this.menuItems_.indexOf(this.highlightedItem_);
   this.highlightHelper_(index < 0 ? this.menuItems_.length : index, -1);
 };
 
@@ -322,8 +323,8 @@ Blockly.Menu.prototype.highlightLast_ = function() {
  * @private
  */
 Blockly.Menu.prototype.highlightHelper_ = function(startIndex, delta) {
-  var index = startIndex + delta;
-  var menuItem;
+  let index = startIndex + delta;
+  let menuItem;
   while ((menuItem = this.menuItems_[index])) {
     if (menuItem.isEnabled()) {
       this.setHighlighted(menuItem);
@@ -341,7 +342,7 @@ Blockly.Menu.prototype.highlightHelper_ = function(startIndex, delta) {
  * @private
  */
 Blockly.Menu.prototype.handleMouseOver_ = function(e) {
-  var menuItem = this.getMenuItem_(/** @type {Element} */ (e.target));
+  const menuItem = this.getMenuItem_(/** @type {Element} */ (e.target));
 
   if (menuItem) {
     if (menuItem.isEnabled()) {
@@ -360,11 +361,11 @@ Blockly.Menu.prototype.handleMouseOver_ = function(e) {
  * @private
  */
 Blockly.Menu.prototype.handleClick_ = function(e) {
-  var oldCoords = this.openingCoords;
+  const oldCoords = this.openingCoords;
   // Clear out the saved opening coords immediately so they're not used twice.
   this.openingCoords = null;
   if (oldCoords && typeof e.clientX == 'number') {
-    var newCoords = new Blockly.utils.Coordinate(e.clientX, e.clientY);
+    const newCoords = new Blockly.utils.Coordinate(e.clientX, e.clientY);
     if (Blockly.utils.Coordinate.distance(oldCoords, newCoords) < 1) {
       // This menu was opened by a mousedown and we're handling the consequent
       // click event. The coords haven't changed, meaning this was the same
@@ -374,7 +375,7 @@ Blockly.Menu.prototype.handleClick_ = function(e) {
     }
   }
 
-  var menuItem = this.getMenuItem_(/** @type {Element} */ (e.target));
+  const menuItem = this.getMenuItem_(/** @type {Element} */ (e.target));
   if (menuItem) {
     menuItem.performAction();
   }
@@ -419,7 +420,7 @@ Blockly.Menu.prototype.handleKeyEvent_ = function(e) {
     return;
   }
 
-  var highlighted = this.highlightedItem_;
+  const highlighted = this.highlightedItem_;
   switch (e.keyCode) {
     case Blockly.utils.KeyCodes.ENTER:
     case Blockly.utils.KeyCodes.SPACE:
@@ -461,8 +462,9 @@ Blockly.Menu.prototype.handleKeyEvent_ = function(e) {
  * @package
  */
 Blockly.Menu.prototype.getSize = function() {
-  var menuDom = this.getElement();
-  var menuSize = Blockly.utils.style.getSize(/** @type {!Element} */ (menuDom));
+  const menuDom = this.getElement();
+  const menuSize = Blockly.utils.style.getSize(/** @type {!Element} */
+      (menuDom));
   // Recalculate height for the total content, not only box height.
   menuSize.height = menuDom.scrollHeight;
   return menuSize;

From 4b19c7ecb5bc873009ba7621dff90054b1b141c3 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 22 Jul 2021 08:41:32 -0700
Subject: [PATCH 231/833] Migrate core/menu.js to goog.module

---
 core/menu.js  | 47 +++++++++++++++++++++++++----------------------
 tests/deps.js |  2 +-
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/core/menu.js b/core/menu.js
index 011199252..d1faf4415 100644
--- a/core/menu.js
+++ b/core/menu.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Menu');
+goog.module('Blockly.Menu');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.utils.aria');
@@ -27,7 +28,7 @@ goog.requireType('Blockly.utils.Size');
  * A basic menu class.
  * @constructor
  */
-Blockly.Menu = function() {
+const Menu = function() {
   /**
    * Array of menu items.
    * (Nulls are never in the array, but typing the array as nullable prevents
@@ -109,7 +110,7 @@ Blockly.Menu = function() {
  * Add a new menu item to the bottom of this menu.
  * @param {!Blockly.MenuItem} menuItem Menu item to append.
  */
-Blockly.Menu.prototype.addChild = function(menuItem) {
+Menu.prototype.addChild = function(menuItem) {
   this.menuItems_.push(menuItem);
 };
 
@@ -117,7 +118,7 @@ Blockly.Menu.prototype.addChild = function(menuItem) {
  * Creates the menu DOM.
  * @param {!Element} container Element upon which to append this menu.
  */
-Blockly.Menu.prototype.render = function(container) {
+Menu.prototype.render = function(container) {
   const element = /** @type {!HTMLDivElement} */ (document.createElement(
       'div'));
   // goog-menu is deprecated, use blocklyMenu.  May 2020.
@@ -153,7 +154,7 @@ Blockly.Menu.prototype.render = function(container) {
  * @return {?Element} The DOM element.
  * @package
  */
-Blockly.Menu.prototype.getElement = function() {
+Menu.prototype.getElement = function() {
   return this.element_;
 };
 
@@ -161,7 +162,7 @@ Blockly.Menu.prototype.getElement = function() {
  * Focus the menu element.
  * @package
  */
-Blockly.Menu.prototype.focus = function() {
+Menu.prototype.focus = function() {
   const el = this.getElement();
   if (el) {
     el.focus({preventScroll:true});
@@ -173,7 +174,7 @@ Blockly.Menu.prototype.focus = function() {
  * Blur the menu element.
  * @private
  */
-Blockly.Menu.prototype.blur_ = function() {
+Menu.prototype.blur_ = function() {
   const el = this.getElement();
   if (el) {
     el.blur();
@@ -186,14 +187,14 @@ Blockly.Menu.prototype.blur_ = function() {
  * @param {!Blockly.utils.aria.Role} roleName role name.
  * @package
  */
-Blockly.Menu.prototype.setRole = function(roleName) {
+Menu.prototype.setRole = function(roleName) {
   this.roleName_ = roleName;
 };
 
 /**
  * Dispose of this menu.
  */
-Blockly.Menu.prototype.dispose = function() {
+Menu.prototype.dispose = function() {
   // Remove event handlers.
   if (this.mouseOverHandler_) {
     Blockly.browserEvents.unbind(this.mouseOverHandler_);
@@ -232,7 +233,7 @@ Blockly.Menu.prototype.dispose = function() {
  * @return {?Blockly.MenuItem} Menu item for which the DOM element belongs to.
  * @private
  */
-Blockly.Menu.prototype.getMenuItem_ = function(elem) {
+Menu.prototype.getMenuItem_ = function(elem) {
   const menuElem = this.getElement();
   // Node might be the menu border (resulting in no associated menu item), or
   // a menu item's div, or some element within the menu item.
@@ -259,7 +260,7 @@ Blockly.Menu.prototype.getMenuItem_ = function(elem) {
  * @param {?Blockly.MenuItem} item Item to highlight, or null.
  * @package
  */
-Blockly.Menu.prototype.setHighlighted = function(item) {
+Menu.prototype.setHighlighted = function(item) {
   const currentHighlighted = this.highlightedItem_;
   if (currentHighlighted) {
     currentHighlighted.setHighlighted(false);
@@ -284,7 +285,7 @@ Blockly.Menu.prototype.setHighlighted = function(item) {
  * highlighted).
  * @package
  */
-Blockly.Menu.prototype.highlightNext = function() {
+Menu.prototype.highlightNext = function() {
   const index = this.menuItems_.indexOf(this.highlightedItem_);
   this.highlightHelper_(index, 1);
 };
@@ -294,7 +295,7 @@ Blockly.Menu.prototype.highlightNext = function() {
  * currently highlighted).
  * @package
  */
-Blockly.Menu.prototype.highlightPrevious = function() {
+Menu.prototype.highlightPrevious = function() {
   const index = this.menuItems_.indexOf(this.highlightedItem_);
   this.highlightHelper_(index < 0 ? this.menuItems_.length : index, -1);
 };
@@ -303,7 +304,7 @@ Blockly.Menu.prototype.highlightPrevious = function() {
  * Highlights the first highlightable item.
  * @private
  */
-Blockly.Menu.prototype.highlightFirst_ = function() {
+Menu.prototype.highlightFirst_ = function() {
   this.highlightHelper_(-1, 1);
 };
 
@@ -311,7 +312,7 @@ Blockly.Menu.prototype.highlightFirst_ = function() {
  * Highlights the last highlightable item.
  * @private
  */
-Blockly.Menu.prototype.highlightLast_ = function() {
+Menu.prototype.highlightLast_ = function() {
   this.highlightHelper_(this.menuItems_.length, -1);
 };
 
@@ -322,7 +323,7 @@ Blockly.Menu.prototype.highlightLast_ = function() {
  * @param {number} delta Step direction: 1 to go down, -1 to go up.
  * @private
  */
-Blockly.Menu.prototype.highlightHelper_ = function(startIndex, delta) {
+Menu.prototype.highlightHelper_ = function(startIndex, delta) {
   let index = startIndex + delta;
   let menuItem;
   while ((menuItem = this.menuItems_[index])) {
@@ -341,7 +342,7 @@ Blockly.Menu.prototype.highlightHelper_ = function(startIndex, delta) {
  * @param {!Event} e Mouse event to handle.
  * @private
  */
-Blockly.Menu.prototype.handleMouseOver_ = function(e) {
+Menu.prototype.handleMouseOver_ = function(e) {
   const menuItem = this.getMenuItem_(/** @type {Element} */ (e.target));
 
   if (menuItem) {
@@ -360,7 +361,7 @@ Blockly.Menu.prototype.handleMouseOver_ = function(e) {
  * @param {!Event} e Click event to handle.
  * @private
  */
-Blockly.Menu.prototype.handleClick_ = function(e) {
+Menu.prototype.handleClick_ = function(e) {
   const oldCoords = this.openingCoords;
   // Clear out the saved opening coords immediately so they're not used twice.
   this.openingCoords = null;
@@ -386,7 +387,7 @@ Blockly.Menu.prototype.handleClick_ = function(e) {
  * @param {!Event} _e Mouse event to handle.
  * @private
  */
-Blockly.Menu.prototype.handleMouseEnter_ = function(_e) {
+Menu.prototype.handleMouseEnter_ = function(_e) {
   this.focus();
 };
 
@@ -395,7 +396,7 @@ Blockly.Menu.prototype.handleMouseEnter_ = function(_e) {
  * @param {!Event} _e Mouse event to handle.
  * @private
  */
-Blockly.Menu.prototype.handleMouseLeave_ = function(_e) {
+Menu.prototype.handleMouseLeave_ = function(_e) {
   if (this.getElement()) {
     this.blur_();
     this.setHighlighted(null);
@@ -410,7 +411,7 @@ Blockly.Menu.prototype.handleMouseLeave_ = function(_e) {
  * @param {!Event} e Key event to handle.
  * @private
  */
-Blockly.Menu.prototype.handleKeyEvent_ = function(e) {
+Menu.prototype.handleKeyEvent_ = function(e) {
   if (!this.menuItems_.length) {
     // Empty menu.
     return;
@@ -461,7 +462,7 @@ Blockly.Menu.prototype.handleKeyEvent_ = function(e) {
  * @return {!Blockly.utils.Size} Object with width and height properties.
  * @package
  */
-Blockly.Menu.prototype.getSize = function() {
+Menu.prototype.getSize = function() {
   const menuDom = this.getElement();
   const menuSize = Blockly.utils.style.getSize(/** @type {!Element} */
       (menuDom));
@@ -469,3 +470,5 @@ Blockly.Menu.prototype.getSize = function() {
   menuSize.height = menuDom.scrollHeight;
   return menuSize;
 };
+
+exports = Menu;
diff --git a/tests/deps.js b/tests/deps.js
index da56c39f2..477087f5c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -108,7 +108,7 @@ goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Bl
 goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], ['Blockly.ASTNode']);
 goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], ['Blockly.Cursor', 'Blockly.Marker']);
-goog.addDependency('../../core/menu.js', ['Blockly.Menu'], ['Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.style']);
+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.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom']);
 goog.addDependency('../../core/metrics_manager.js', ['Blockly.FlyoutMetricsManager', 'Blockly.MetricsManager'], ['Blockly.IMetricsManager', 'Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global']);

From 6dd36c3432c499d862f18096861b9aa35efa7bf6 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 22 Jul 2021 08:47:09 -0700
Subject: [PATCH 232/833] Migrate core/menu.js named requires

---
 core/menu.js | 99 ++++++++++++++++++++++++++--------------------------
 1 file changed, 49 insertions(+), 50 deletions(-)

diff --git a/core/menu.js b/core/menu.js
index d1faf4415..df7f8058d 100644
--- a/core/menu.js
+++ b/core/menu.js
@@ -13,15 +13,14 @@
 goog.module('Blockly.Menu');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.utils.aria');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.KeyCodes');
-goog.require('Blockly.utils.style');
-
-goog.requireType('Blockly.MenuItem');
-goog.requireType('Blockly.utils.Size');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const MenuItem = goog.requireType('Blockly.MenuItem');
+const Size = goog.requireType('Blockly.utils.Size');
+const {addClass, hasClass, removeClass} = goog.require('Blockly.utils.dom');
+const {Data, conditionalBind, unbind} = goog.require('Blockly.browserEvents');
+const {DOWN, END, ENTER, HOME, PAGE_DOWN, PAGE_UP, SPACE, UP} = goog.require('Blockly.utils.KeyCodes');
+const {getSize, scrollIntoContainerView} = goog.require('Blockly.utils.style');
+const {Role, State, setRole, setState} = goog.require('Blockly.utils.aria');
 
 
 /**
@@ -33,7 +32,7 @@ const Menu = function() {
    * Array of menu items.
    * (Nulls are never in the array, but typing the array as nullable prevents
    * the compiler from objecting to .indexOf(null))
-   * @type {!Array<Blockly.MenuItem>}
+   * @type {!Array<MenuItem>}
    * @private
    */
   this.menuItems_ = [];
@@ -42,7 +41,7 @@ const Menu = function() {
    * Coordinates of the mousedown event that caused this menu to open. Used to
    * prevent the consequent mouseup event due to a simple click from activating
    * a menu item immediately.
-   * @type {?Blockly.utils.Coordinate}
+   * @type {?Coordinate}
    * @package
    */
   this.openingCoords = null;
@@ -50,42 +49,42 @@ const Menu = function() {
   /**
    * This is the element that we will listen to the real focus events on.
    * A value of null means no menu item is highlighted.
-   * @type {?Blockly.MenuItem}
+   * @type {?MenuItem}
    * @private
    */
   this.highlightedItem_ = null;
 
   /**
    * Mouse over event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?Data}
    * @private
    */
   this.mouseOverHandler_ = null;
 
   /**
    * Click event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?Data}
    * @private
    */
   this.clickHandler_ = null;
 
   /**
    * Mouse enter event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?Data}
    * @private
    */
   this.mouseEnterHandler_ = null;
 
   /**
    * Mouse leave event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?Data}
    * @private
    */
   this.mouseLeaveHandler_ = null;
 
   /**
    * Key down event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?Data}
    * @private
    */
   this.onKeyDownHandler_ = null;
@@ -99,7 +98,7 @@ const Menu = function() {
 
   /**
    * ARIA name for this menu.
-   * @type {?Blockly.utils.aria.Role}
+   * @type {?Role}
    * @private
    */
   this.roleName_ = null;
@@ -108,7 +107,7 @@ const Menu = function() {
 
 /**
  * Add a new menu item to the bottom of this menu.
- * @param {!Blockly.MenuItem} menuItem Menu item to append.
+ * @param {!MenuItem} menuItem Menu item to append.
  */
 Menu.prototype.addChild = function(menuItem) {
   this.menuItems_.push(menuItem);
@@ -125,7 +124,7 @@ Menu.prototype.render = function(container) {
   element.className = 'blocklyMenu goog-menu blocklyNonSelectable';
   element.tabIndex = 0;
   if (this.roleName_) {
-    Blockly.utils.aria.setRole(element, this.roleName_);
+    setRole(element, this.roleName_);
   }
   this.element_ = element;
 
@@ -135,15 +134,15 @@ Menu.prototype.render = function(container) {
   }
 
   // Add event handlers.
-  this.mouseOverHandler_ = Blockly.browserEvents.conditionalBind(
+  this.mouseOverHandler_ = conditionalBind(
       element, 'mouseover', this, this.handleMouseOver_, true);
-  this.clickHandler_ = Blockly.browserEvents.conditionalBind(
+  this.clickHandler_ = conditionalBind(
       element, 'click', this, this.handleClick_, true);
-  this.mouseEnterHandler_ = Blockly.browserEvents.conditionalBind(
+  this.mouseEnterHandler_ = conditionalBind(
       element, 'mouseenter', this, this.handleMouseEnter_, true);
-  this.mouseLeaveHandler_ = Blockly.browserEvents.conditionalBind(
+  this.mouseLeaveHandler_ = conditionalBind(
       element, 'mouseleave', this, this.handleMouseLeave_, true);
-  this.onKeyDownHandler_ = Blockly.browserEvents.conditionalBind(
+  this.onKeyDownHandler_ = conditionalBind(
       element, 'keydown', this, this.handleKeyEvent_);
 
   container.appendChild(element);
@@ -166,7 +165,7 @@ Menu.prototype.focus = function() {
   const el = this.getElement();
   if (el) {
     el.focus({preventScroll:true});
-    Blockly.utils.dom.addClass(el, 'blocklyFocused');
+    addClass(el, 'blocklyFocused');
   }
 };
 
@@ -178,13 +177,13 @@ Menu.prototype.blur_ = function() {
   const el = this.getElement();
   if (el) {
     el.blur();
-    Blockly.utils.dom.removeClass(el, 'blocklyFocused');
+    removeClass(el, 'blocklyFocused');
   }
 };
 
 /**
  * Set the menu accessibility role.
- * @param {!Blockly.utils.aria.Role} roleName role name.
+ * @param {!Role} roleName role name.
  * @package
  */
 Menu.prototype.setRole = function(roleName) {
@@ -197,23 +196,23 @@ Menu.prototype.setRole = function(roleName) {
 Menu.prototype.dispose = function() {
   // Remove event handlers.
   if (this.mouseOverHandler_) {
-    Blockly.browserEvents.unbind(this.mouseOverHandler_);
+    unbind(this.mouseOverHandler_);
     this.mouseOverHandler_ = null;
   }
   if (this.clickHandler_) {
-    Blockly.browserEvents.unbind(this.clickHandler_);
+    unbind(this.clickHandler_);
     this.clickHandler_ = null;
   }
   if (this.mouseEnterHandler_) {
-    Blockly.browserEvents.unbind(this.mouseEnterHandler_);
+    unbind(this.mouseEnterHandler_);
     this.mouseEnterHandler_ = null;
   }
   if (this.mouseLeaveHandler_) {
-    Blockly.browserEvents.unbind(this.mouseLeaveHandler_);
+    unbind(this.mouseLeaveHandler_);
     this.mouseLeaveHandler_ = null;
   }
   if (this.onKeyDownHandler_) {
-    Blockly.browserEvents.unbind(this.onKeyDownHandler_);
+    unbind(this.onKeyDownHandler_);
     this.onKeyDownHandler_ = null;
   }
 
@@ -230,7 +229,7 @@ Menu.prototype.dispose = function() {
  * Returns the child menu item that owns the given DOM element,
  * or null if no such menu item is found.
  * @param {Element} elem DOM element whose owner is to be returned.
- * @return {?Blockly.MenuItem} Menu item for which the DOM element belongs to.
+ * @return {?MenuItem} Menu item for which the DOM element belongs to.
  * @private
  */
 Menu.prototype.getMenuItem_ = function(elem) {
@@ -240,7 +239,7 @@ Menu.prototype.getMenuItem_ = function(elem) {
   // Walk up parents until one meets either the menu's root element, or
   // a menu item's div.
   while (elem && elem != menuElem) {
-    if (Blockly.utils.dom.hasClass(elem, 'blocklyMenuItem')) {
+    if (hasClass(elem, 'blocklyMenuItem')) {
       // Having found a menu item's div, locate that menu item in this menu.
       for (let i = 0, menuItem; (menuItem = this.menuItems_[i]); i++) {
         if (menuItem.getElement() == elem) {
@@ -257,7 +256,7 @@ Menu.prototype.getMenuItem_ = function(elem) {
 
 /**
  * Highlights the given menu item, or clears highlighting if null.
- * @param {?Blockly.MenuItem} item Item to highlight, or null.
+ * @param {?MenuItem} item Item to highlight, or null.
  * @package
  */
 Menu.prototype.setHighlighted = function(item) {
@@ -272,10 +271,10 @@ Menu.prototype.setHighlighted = function(item) {
     // Bring the highlighted item into view. This has no effect if the menu is
     // not scrollable.
     const el = /** @type {!Element} */ (this.getElement());
-    Blockly.utils.style.scrollIntoContainerView(
+    scrollIntoContainerView(
         /** @type {!Element} */ (item.getElement()), el);
 
-    Blockly.utils.aria.setState(el, Blockly.utils.aria.State.ACTIVEDESCENDANT,
+    setState(el, State.ACTIVEDESCENDANT,
         item.getId());
   }
 };
@@ -366,8 +365,8 @@ Menu.prototype.handleClick_ = function(e) {
   // Clear out the saved opening coords immediately so they're not used twice.
   this.openingCoords = null;
   if (oldCoords && typeof e.clientX == 'number') {
-    const newCoords = new Blockly.utils.Coordinate(e.clientX, e.clientY);
-    if (Blockly.utils.Coordinate.distance(oldCoords, newCoords) < 1) {
+    const newCoords = new Coordinate(e.clientX, e.clientY);
+    if (Coordinate.distance(oldCoords, newCoords) < 1) {
       // This menu was opened by a mousedown and we're handling the consequent
       // click event. The coords haven't changed, meaning this was the same
       // opening event. Don't do the usual behavior because the menu just popped
@@ -423,28 +422,28 @@ Menu.prototype.handleKeyEvent_ = function(e) {
 
   const highlighted = this.highlightedItem_;
   switch (e.keyCode) {
-    case Blockly.utils.KeyCodes.ENTER:
-    case Blockly.utils.KeyCodes.SPACE:
+    case ENTER:
+    case SPACE:
       if (highlighted) {
         highlighted.performAction();
       }
       break;
 
-    case Blockly.utils.KeyCodes.UP:
+    case UP:
       this.highlightPrevious();
       break;
 
-    case Blockly.utils.KeyCodes.DOWN:
+    case DOWN:
       this.highlightNext();
       break;
 
-    case Blockly.utils.KeyCodes.PAGE_UP:
-    case Blockly.utils.KeyCodes.HOME:
+    case PAGE_UP:
+    case HOME:
       this.highlightFirst_();
       break;
 
-    case Blockly.utils.KeyCodes.PAGE_DOWN:
-    case Blockly.utils.KeyCodes.END:
+    case PAGE_DOWN:
+    case END:
       this.highlightLast_();
       break;
 
@@ -459,12 +458,12 @@ Menu.prototype.handleKeyEvent_ = function(e) {
 
 /**
  * Get the size of a rendered menu.
- * @return {!Blockly.utils.Size} Object with width and height properties.
+ * @return {!Size} Object with width and height properties.
  * @package
  */
 Menu.prototype.getSize = function() {
   const menuDom = this.getElement();
-  const menuSize = Blockly.utils.style.getSize(/** @type {!Element} */
+  const menuSize = getSize(/** @type {!Element} */
       (menuDom));
   // Recalculate height for the total content, not only box height.
   menuSize.height = menuDom.scrollHeight;

From e5468a50b4e5cca373e72281a482d532ac855172 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 22 Jul 2021 08:47:58 -0700
Subject: [PATCH 233/833] clang-format core/menu.js

---
 core/menu.js | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/core/menu.js b/core/menu.js
index df7f8058d..85672f717 100644
--- a/core/menu.js
+++ b/core/menu.js
@@ -118,8 +118,8 @@ Menu.prototype.addChild = function(menuItem) {
  * @param {!Element} container Element upon which to append this menu.
  */
 Menu.prototype.render = function(container) {
-  const element = /** @type {!HTMLDivElement} */ (document.createElement(
-      'div'));
+  const element =
+      /** @type {!HTMLDivElement} */ (document.createElement('div'));
   // goog-menu is deprecated, use blocklyMenu.  May 2020.
   element.className = 'blocklyMenu goog-menu blocklyNonSelectable';
   element.tabIndex = 0;
@@ -134,16 +134,16 @@ Menu.prototype.render = function(container) {
   }
 
   // Add event handlers.
-  this.mouseOverHandler_ = conditionalBind(
-      element, 'mouseover', this, this.handleMouseOver_, true);
-  this.clickHandler_ = conditionalBind(
-      element, 'click', this, this.handleClick_, true);
+  this.mouseOverHandler_ =
+      conditionalBind(element, 'mouseover', this, this.handleMouseOver_, true);
+  this.clickHandler_ =
+      conditionalBind(element, 'click', this, this.handleClick_, true);
   this.mouseEnterHandler_ = conditionalBind(
       element, 'mouseenter', this, this.handleMouseEnter_, true);
   this.mouseLeaveHandler_ = conditionalBind(
       element, 'mouseleave', this, this.handleMouseLeave_, true);
-  this.onKeyDownHandler_ = conditionalBind(
-      element, 'keydown', this, this.handleKeyEvent_);
+  this.onKeyDownHandler_ =
+      conditionalBind(element, 'keydown', this, this.handleKeyEvent_);
 
   container.appendChild(element);
 };
@@ -164,7 +164,7 @@ Menu.prototype.getElement = function() {
 Menu.prototype.focus = function() {
   const el = this.getElement();
   if (el) {
-    el.focus({preventScroll:true});
+    el.focus({preventScroll: true});
     addClass(el, 'blocklyFocused');
   }
 };
@@ -274,8 +274,7 @@ Menu.prototype.setHighlighted = function(item) {
     scrollIntoContainerView(
         /** @type {!Element} */ (item.getElement()), el);
 
-    setState(el, State.ACTIVEDESCENDANT,
-        item.getId());
+    setState(el, State.ACTIVEDESCENDANT, item.getId());
   }
 };
 
@@ -464,7 +463,7 @@ Menu.prototype.handleKeyEvent_ = function(e) {
 Menu.prototype.getSize = function() {
   const menuDom = this.getElement();
   const menuSize = getSize(/** @type {!Element} */
-      (menuDom));
+                           (menuDom));
   // Recalculate height for the total content, not only box height.
   menuSize.height = menuDom.scrollHeight;
   return menuSize;

From 296eed06fbd64d7e6b554665a3332806da495b0b Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 22 Jul 2021 09:01:59 -0700
Subject: [PATCH 234/833] Fix build

---
 core/menu.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/menu.js b/core/menu.js
index 85672f717..ac79922cf 100644
--- a/core/menu.js
+++ b/core/menu.js
@@ -18,7 +18,7 @@ const MenuItem = goog.requireType('Blockly.MenuItem');
 const Size = goog.requireType('Blockly.utils.Size');
 const {addClass, hasClass, removeClass} = goog.require('Blockly.utils.dom');
 const {Data, conditionalBind, unbind} = goog.require('Blockly.browserEvents');
-const {DOWN, END, ENTER, HOME, PAGE_DOWN, PAGE_UP, SPACE, UP} = goog.require('Blockly.utils.KeyCodes');
+const KeyCodes = goog.require('Blockly.utils.KeyCodes');
 const {getSize, scrollIntoContainerView} = goog.require('Blockly.utils.style');
 const {Role, State, setRole, setState} = goog.require('Blockly.utils.aria');
 
@@ -421,28 +421,28 @@ Menu.prototype.handleKeyEvent_ = function(e) {
 
   const highlighted = this.highlightedItem_;
   switch (e.keyCode) {
-    case ENTER:
-    case SPACE:
+    case KeyCodes.ENTER:
+    case KeyCodes.SPACE:
       if (highlighted) {
         highlighted.performAction();
       }
       break;
 
-    case UP:
+    case KeyCodes.UP:
       this.highlightPrevious();
       break;
 
-    case DOWN:
+    case KeyCodes.DOWN:
       this.highlightNext();
       break;
 
-    case PAGE_UP:
-    case HOME:
+    case KeyCodes.PAGE_UP:
+    case KeyCodes.HOME:
       this.highlightFirst_();
       break;
 
-    case PAGE_DOWN:
-    case END:
+    case KeyCodes.PAGE_DOWN:
+    case KeyCodes.END:
       this.highlightLast_();
       break;
 

From efdc9e3afab6993d69c80799d263492913310d4a Mon Sep 17 00:00:00 2001
From: Monica Kozbial <6621618+moniika@users.noreply.github.com>
Date: Thu, 22 Jul 2021 09:11:54 -0700
Subject: [PATCH 235/833] Support filepath as first argument and cleanup
 (#5168)

---
 scripts/goog_module/convert-file.sh | 125 ++++++++++++++--------------
 1 file changed, 61 insertions(+), 64 deletions(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index 1861ad7f3..fa66fe0f9 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #######################################
-# Logging functions
+# Logging functions.
 #######################################
 COLOR_NONE="\033[0m"
 GREEN="\033[0;32m"
@@ -20,17 +20,24 @@ warn() {
 err() {
   echo -e  "${RED}[ERROR]:${COLOR_NONE} $*" >&2
 }
+
 #######################################
 # Checks whether the provided filepath exists.
 # Arguments:
 #   The filepath to check for existence.
+#   Optional: Whether to log an error.
 #######################################
 verify-filepath() {
-  if [[ ! -f "$1" ]]; then
-    err "File $1 does not exist"
+  local filepath="$1"
+  local no_log="$2"
+  if [[ ! -f "${filepath}" ]]; then
+    if [[ -z "${no_log}" || "${no_log}" == 'true' ]]; then
+      err "File ${filepath} does not exist"
+    fi
     return 1
   fi
 }
+
 #######################################
 # Creates a commit with a message based on the specified step and file.
 # Arguments:
@@ -40,11 +47,11 @@ verify-filepath() {
 commit-step() {
   local step="$1"
   local filepath="$2"
-  if [ -z "${step}" ]; then
+  if [[ -z "${step}" ]]; then
     err "Missing argument (1-4)"
     return 1
   fi
-  if [ -z "${filepath}" ]; then
+  if [[ -z "${filepath}" ]]; then
     err "Missing argument filepath"
     return 1
   fi
@@ -78,6 +85,7 @@ commit-step() {
   git commit -m "${message}"
   success "created commit with message: \"${message}\""
 }
+
 #######################################
 # Runs step 2 of the automated conversion.
 # Arguments:
@@ -85,25 +93,10 @@ commit-step() {
 #######################################
 step2 () {
   local filepath="$1"
-  if [ -z "${filepath}" ]; then
-    err "Missing argument filepath"
-    return 1
-  fi
-
-  inf "Verifying single goog.provide declarations..."
-  local provide_count=$(grep -o 'goog.provide' ${filepath} | wc -l)
-  if [[ "${provide_count}" -gt "1" ]]; then
-    err "Cannot convert file with multiple provides. Please split the file first."
-    return 1
-  elif [[ "${provide_count}" -eq "0" ]]; then
-    err "Cannot convert file without a provide."
-    return 1
-  fi
 
   inf "Updating goog.provide declaration..."
   perl -pi -e 's/^goog\.provide(\([^\)]+\)\;)/goog\.module\1\ngoog.module.declareLegacyNamespace\(\)\;/g' "${filepath}"
 
-
   inf "Extracting module name..."
   local module_name=$(perl -nle'print $& while m{(?<=^goog\.module\('\'')([^'\'')]+)}g' "${filepath}")
   if [[ -z "${module_name}" ]]; then
@@ -117,11 +110,9 @@ step2 () {
     inf "Found class \"${class_name}\" in file."
     inf "Updating class declaration..."
     perl -pi -e 's/^('"${module_name}"') =/const '"${class_name}"' =/g' "${filepath}"
-    inf 'Updating class properties...'
-    perl -pi -e 's/^'"${module_name}"'((\.\w+)+) =/'"${class_name}"'\1 =/g' "${filepath}"
 
     inf "Updating local references to class..."
-    perl -pi -e 's/'"${module_name}"'([^'\''])/'"${class_name}"'\1/g' "${filepath}"
+    perl -pi -e 's/'"${module_name}"'(?!['\''\w])/'"${class_name}"'/g' "${filepath}"
 
     inf "Appending class export to end of file..."
     echo "" >> "${filepath}"
@@ -140,20 +131,15 @@ step2 () {
   perl -pi -e 's/'"${module_name}"'\.([^ ]+)/\1/g' "${filepath}"
 
   npm run build:deps
-  success "Completed automation for step 3. Please manually review and add exports for non-private top-level functions."
+  success "Completed automation for step 2. Please manually review and add exports for non-private top-level functions."
 }
+
 #######################################
 # Runs step 3 of the automated conversion.
 # Arguments:
 #   The filepath of the file being converted.
 #######################################
 step3() {
-  local filepath="$1"
-  if [ -z "${filepath}" ]; then
-    err "Missing argument filepath"
-    return 1
-  fi
-
   inf "Extracting module name..."
   local module_name=$(perl -nle'print $& while m{(?<=^goog\.module\('\'')([^'\'')]+)}g' "${filepath}")
   if [[ -z "${module_name}" ]]; then
@@ -162,10 +148,10 @@ step3() {
   fi
   inf "Extracted module name \"${module_name}\""
 
-  local requires=$(perl -nle'print $& while m{^goog.require(|Type)\('\''(.*)'\''\)}g' "${filepath}" | perl -pe 's/goog.require(|Type)\('\''(.*)'\''\)/\2/g')
+  local requires=$(perl -nle'print $& while m{(?:(?<=^goog.require\('\'')|(?<=^goog.requireType\('\''))[^'\'']+}g' "${filepath}")
 
   # Process each require
-  echo "${requires}" | while read -r require ; do
+  echo "${requires}" | while read -r require; do
     inf "Processing require \"${require}\""
     local usages=$(perl -nle'print $& while m{'"${require}"'(?!'\'')}g' "${filepath}" | wc -l)
 
@@ -179,27 +165,25 @@ step3() {
     # Detect requires overlap
     # (ex: Blockly.utils require and Blockly.utils.dom also in requires)
     local requires_overlap=$(echo "${requires}" | perl -nle'print $& while m{(?<='"${require}"'\.)\w+}g')
-    if [[ ! -z "${requires_overlap}" ]]; then
-      while read -r requires_overlap_prop ; do
+    if [[ -n "${requires_overlap}" ]]; then
+      while read -r requires_overlap_prop; do
         properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/'"${requires_overlap_prop}"'//g')
       done <<<"${requires_overlap}"
     fi
     # Detect module name overlap
     # (ex: Blockly require and Blockly.ContextMenuItems module being converted)
     local module_overlap=$(echo "${module_name}" | perl -nle'print $& while m{(?<='"${require}"'\.)\w+}g')
-    if [[ ! -z "${module_overlap}" ]]; then
+    if [[ -n "${module_overlap}" ]]; then
       properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/'"${module_overlap}"'//g')
     fi
     properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/\s+/ /g' | xargs)
 
-    if [[ "${direct_access_count}" -eq "0" && ! -z "${properties_accessed}" ]]; then
+    if [[ "${direct_access_count}" -eq "0" && -n "${properties_accessed}" ]]; then
       local deconstructed_comma=$(echo "${properties_accessed}" | perl -pe 's/\s+/, /g' | perl -pe 's/, $//')
-      inf "Deconstructing ${require} into \"{${deconstructed_comma}}\""
-
-      inf "Updating require declaration for ${require}..."
+      inf "Deconstructing ${require} into \"{${deconstructed_comma}}\"..."
       perl -pi -e 's/^(goog\.(require|requireType)\('\'"${require}"\''\);)/const \{'"${deconstructed_comma}"'\} = \1/' "${filepath}"
 
-      for require_prop in $(echo "${properties_accessed}"); do
+      for require_prop in echo "${properties_accessed}"; do
         inf "Updating references of ${require}.${require_prop} to ${require_prop}..."
         perl -pi -e 's/'"${require}"'\.'"${require_prop}"'([^'\''\w])/'"${require_prop}"'\1/g' "${filepath}"
       done
@@ -215,26 +199,24 @@ step3() {
   done
 
   local missing_requires=$(perl -nle'print $& while m{(?<!'\'')Blockly(\.\w+)+}g' "${filepath}")
-  if [[ ! -z "${missing_require_lines}" ]]; then
-    err "Missing requires for: ${missing_requires} Please manually fix."
+  missing_requires=$(echo "${missing_requires}" | tr ' ' '\n' | sort -u)
+  if [[ -n "${missing_requires}" ]]; then
+    err "Missing requires for:\n${missing_requires}\nPlease manually fix."
   fi
 
   success "Completed automation for step 3. Please manually review and reorder requires."
 }
+
 #######################################
 # Runs step 4 of the automated conversion.
 # Arguments:
 #   The filepath of the file being converted.
 #######################################
 step4() {
-  local filepath="$1"
-  if [ -z ${filepath} ]; then
-    err "filepath is unset"
-    return 1
-  fi
   inf "Running clang-format"
   npx clang-format -i "${filepath}"
 }
+
 #######################################
 # Runs the specified step.
 # Arguments:
@@ -244,11 +226,11 @@ step4() {
 run-step() {
   local step="$1"
   local filepath="$2"
-  if [ -z "${step}" ]; then
+  if [[ -z "${step}" ]]; then
     err "Missing argument (1-4)"
     return 1
   fi
-  if [ -z "${filepath}" ]; then
+  if [[ -z "${filepath}" ]]; then
     err "Missing argument filepath"
     return 1
   fi
@@ -257,45 +239,60 @@ run-step() {
 
   case "${step}" in
     2)
-      step2 ${filepath}
+      step2 "${filepath}"
       ;;
     3)
-      step3 ${filepath}
+      step3 "${filepath}"
       ;;
     4)
-      step4 ${filepath}
+      step4 "${filepath}"
       ;;
     *)
-      err 'INVALID ARGUMENT'
+      err "INVALID ARGUMENT ${step}"
       return 1
       ;;
   esac
 }
+
 #######################################
 # Prints usage information.
 #######################################
-function help {
+help {
   echo "Conversion steps:"
   echo " 1. Use IDE to convert var to let/const"
   echo " 2. Rewrite the goog.provide statement as goog.module and explicitly enumerate exports"
   echo " 3. Rewrite goog.requires statements and add missing requires (often skipped for simple files)"
   echo " 4. Run clang-format on the whole file"
   echo ""
-  echo "Usage: $0 [-h|-c <number>|-s <number>] <filepath>"
-  echo "  -h                      Display help"
-  echo "  -c <step> <filepath>    Create a commit for the specified step [2-4]"
-  echo "  -s <step> <filepath>    Run the specified step [1-4]"
+  echo "Usage: $0 [-h] [-c <step> <filepath>|-s <step> <filepath>]"
+  echo "  -h                    Display help and exit"
+  echo "  -c <step> <filepath>  Create a commit for the specified step [2-4]"
+  echo "  -s <step> <filepath>  Run the specified step [1-4]"
 }
 
-if [ "$1" = "" ]; then
+#######################################
+# Main entry point.
+#######################################
+main {
+  if [ "$1" = "" ]; then
   help
 else
-  command="$1"
+  local filepath=""
+  # Support filepath as first argument.
+  verify-filepath "${filepath}" "false"
+  if [[ $? -eq 0 ]]; then
+    filepath="$1"
+    shift
+  fi
+
+  local command="$1"
   shift
   case $command in
-    -h)         help $@;;
-    -c)         commit-step $@;;
-    -s)         run-step $@;;
-    *)          help;;
+    -c) commit-step "$@" "${filepath}" ;;
+    -s) run-step "$@" "${filepath}" ;;
+    *) err "INVALID ARGUMENT ${command}";;
   esac
 fi
+}
+
+main "$@"

From 720059e502394ebc44e4d01686d2b67f652a32f5 Mon Sep 17 00:00:00 2001
From: Monica Kozbial <6621618+moniika@users.noreply.github.com>
Date: Thu, 22 Jul 2021 09:59:02 -0700
Subject: [PATCH 236/833] Fix bugs (#5175)

---
 scripts/goog_module/convert-file.sh | 38 ++++++++++++++---------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index fa66fe0f9..24529dab1 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -257,7 +257,7 @@ run-step() {
 #######################################
 # Prints usage information.
 #######################################
-help {
+help() {
   echo "Conversion steps:"
   echo " 1. Use IDE to convert var to let/const"
   echo " 2. Rewrite the goog.provide statement as goog.module and explicitly enumerate exports"
@@ -273,26 +273,26 @@ help {
 #######################################
 # Main entry point.
 #######################################
-main {
+main() {
   if [ "$1" = "" ]; then
-  help
-else
-  local filepath=""
-  # Support filepath as first argument.
-  verify-filepath "${filepath}" "false"
-  if [[ $? -eq 0 ]]; then
-    filepath="$1"
-    shift
-  fi
+    help
+  else
+    local filepath=""
+    # Support filepath as first argument.
+    verify-filepath "$1" "false"
+    if [[ $? -eq 0 ]]; then
+      filepath="$1"
+      shift
+    fi
 
-  local command="$1"
-  shift
-  case $command in
-    -c) commit-step "$@" "${filepath}" ;;
-    -s) run-step "$@" "${filepath}" ;;
-    *) err "INVALID ARGUMENT ${command}";;
-  esac
-fi
+    local command="$1"
+    shift
+    case $command in
+      -c) commit-step "$@" "${filepath}" ;;
+      -s) run-step "$@" "${filepath}" ;;
+      *) err "INVALID ARGUMENT ${command}";;
+    esac
+  fi
 }
 
 main "$@"

From 9d29bff7138b954351c6ed9bee23504ae40cf795 Mon Sep 17 00:00:00 2001
From: Monica Kozbial <6621618+moniika@users.noreply.github.com>
Date: Thu, 22 Jul 2021 10:01:41 -0700
Subject: [PATCH 237/833] Ask before deconstructing properties for a require
 (#5169)

---
 scripts/goog_module/convert-file.sh | 35 +++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index 24529dab1..8b6bdfc6f 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -20,6 +20,9 @@ warn() {
 err() {
   echo -e  "${RED}[ERROR]:${COLOR_NONE} $*" >&2
 }
+reenter_instructions() {
+  echo -e  "${ORANGE}$*${COLOR_NONE}" >&2
+}
 
 #######################################
 # Checks whether the provided filepath exists.
@@ -180,14 +183,32 @@ step3() {
 
     if [[ "${direct_access_count}" -eq "0" && -n "${properties_accessed}" ]]; then
       local deconstructed_comma=$(echo "${properties_accessed}" | perl -pe 's/\s+/, /g' | perl -pe 's/, $//')
-      inf "Deconstructing ${require} into \"{${deconstructed_comma}}\"..."
-      perl -pi -e 's/^(goog\.(require|requireType)\('\'"${require}"\''\);)/const \{'"${deconstructed_comma}"'\} = \1/' "${filepath}"
-
-      for require_prop in echo "${properties_accessed}"; do
-        inf "Updating references of ${require}.${require_prop} to ${require_prop}..."
-        perl -pi -e 's/'"${require}"'\.'"${require_prop}"'([^'\''\w])/'"${require_prop}"'\1/g' "${filepath}"
+      local confirm=''
+      while true; do
+        read -p "Would you like to deconstruct ${require} into \"{${deconstructed_comma}}\"? (y/n): " yn </dev/tty
+        case $yn in
+          [Yy]* )
+            confirm='true'
+            break
+            ;;
+          [Nn]* )
+            confirm='false'
+            break
+            ;;
+          * ) reenter_instructions "Please type y or n \"${yn}\"";;
+        esac
       done
-      continue
+
+      if [[ "${confirm}" == 'true' ]]; then
+        inf "Deconstructing ${require} into \"{${deconstructed_comma}}\"..."
+        perl -pi -e 's/^(goog\.(require|requireType)\('\'"${require}"\''\);)/const \{'"${deconstructed_comma}"'\} = \1/' "${filepath}"
+
+        for require_prop in $(echo "${properties_accessed}"); do
+          inf "Updating references of ${require}.${require_prop} to ${require_prop}..."
+          perl -pi -e 's/'"${require}"'\.'"${require_prop}"'([^'\''\w])/'"${require_prop}"'\1/g' "${filepath}"
+        done
+        continue
+      fi
     fi
 
     local require_name=$(echo "${require}" | perl -pe 's/(\w+\.)+(\w+)/\2/g')

From 9573f2b7ec102a0621e40ddbda6da9b1238795a7 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 10:21:57 -0700
Subject: [PATCH 238/833] Migrate core/field_textinput.js to named requires

---
 core/field_textinput.js | 120 ++++++++++++++++++++--------------------
 tests/deps.js           |   2 +-
 2 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/core/field_textinput.js b/core/field_textinput.js
index 4585ba382..07c0e3282 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -13,25 +13,27 @@
 goog.module('Blockly.FieldTextInput');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.DropDownDiv');
-goog.require('Blockly.Events');
+/* 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 Events = goog.require('Blockly.Events');
+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 dom = goog.require('Blockly.utils.dom');
+const fieldRegistry = goog.require('Blockly.fieldRegistry');
+const userAgent = goog.require('Blockly.utils.userAgent');
+const {inherits} = goog.require('Blockly.utils.object');
+const {prompt: blocklyPrompt} = goog.require('Blockly');
+const {replaceMessageReferences} = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
-goog.require('Blockly.Field');
-goog.require('Blockly.fieldRegistry');
-goog.require('Blockly.Msg');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.aria');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.KeyCodes');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.userAgent');
-goog.require('Blockly.WidgetDiv');
-
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
@@ -44,7 +46,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @param {Object=} opt_config A map of options used to configure the field.
  *    See the [field creation documentation]{@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/text-input#creation}
  *    for a list of properties this parameter supports.
- * @extends {Blockly.Field}
+ * @extends {Field}
  * @constructor
  */
 const FieldTextInput = function(opt_value, opt_validator, opt_config) {
@@ -66,14 +68,14 @@ const FieldTextInput = function(opt_value, opt_validator, opt_config) {
 
   /**
    * Key down event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onKeyDownWrapper_ = null;
 
   /**
    * Key input event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onKeyInputWrapper_ = null;
@@ -87,12 +89,12 @@ const FieldTextInput = function(opt_value, opt_validator, opt_config) {
 
   /**
    * The workspace that this field belongs to.
-   * @type {?Blockly.WorkspaceSvg}
+   * @type {?WorkspaceSvg}
    * @protected
    */
   this.workspace_ = null;
 };
-Blockly.utils.object.inherits(FieldTextInput, Blockly.Field);
+inherits(FieldTextInput, Field);
 
 /**
  * The default value for this field.
@@ -110,7 +112,7 @@ FieldTextInput.prototype.DEFAULT_VALUE = '';
  * @nocollapse
  */
 FieldTextInput.fromJson = function(options) {
-  const text = Blockly.utils.replaceMessageReferences(options['text']);
+  const text = replaceMessageReferences(options['text']);
   // `this` might be a subclass of FieldTextInput if that class doesn't override
   // the static fromJson method.
   return new this(text, undefined, options);
@@ -207,8 +209,8 @@ FieldTextInput.prototype.doValueInvalid_ = function(_invalidValue) {
     const oldValue = this.value_;
     // Revert value when the text becomes invalid.
     this.value_ = this.htmlInput_.untypedDefaultValue_;
-    if (this.sourceBlock_ && Blockly.Events.isEnabled()) {
-      Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CHANGE))(
+    if (this.sourceBlock_ && Events.isEnabled()) {
+      Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
           this.sourceBlock_, 'field', this.name || null, oldValue, this.value_));
     }
   }
@@ -260,13 +262,13 @@ FieldTextInput.prototype.render_ = function() {
     this.resizeEditor_();
     const htmlInput = /** @type {!HTMLElement} */(this.htmlInput_);
     if (!this.isTextValid_) {
-      Blockly.utils.dom.addClass(htmlInput, 'blocklyInvalidInput');
-      Blockly.utils.aria.setState(htmlInput,
-          Blockly.utils.aria.State.INVALID, true);
+      dom.addClass(htmlInput, 'blocklyInvalidInput');
+      aria.setState(htmlInput,
+          aria.State.INVALID, true);
     } else {
-      Blockly.utils.dom.removeClass(htmlInput, 'blocklyInvalidInput');
-      Blockly.utils.aria.setState(htmlInput,
-          Blockly.utils.aria.State.INVALID, false);
+      dom.removeClass(htmlInput, 'blocklyInvalidInput');
+      aria.setState(htmlInput,
+          aria.State.INVALID, false);
     }
   }
 };
@@ -296,11 +298,11 @@ FieldTextInput.prototype.setSpellcheck = function(check) {
 FieldTextInput.prototype.showEditor_ = function(_opt_e,
     opt_quietInput) {
   this.workspace_ =
-    (/** @type {!Blockly.BlockSvg} */ (this.sourceBlock_)).workspace;
+    (/** @type {!BlockSvg} */ (this.sourceBlock_)).workspace;
   const quietInput = opt_quietInput || false;
-  if (!quietInput && (Blockly.utils.userAgent.MOBILE ||
-                      Blockly.utils.userAgent.ANDROID ||
-                      Blockly.utils.userAgent.IPAD)) {
+  if (!quietInput && (userAgent.MOBILE ||
+                      userAgent.ANDROID ||
+                      userAgent.IPAD)) {
     this.showPromptEditor_();
   } else {
     this.showInlineEditor_(quietInput);
@@ -313,7 +315,7 @@ FieldTextInput.prototype.showEditor_ = function(_opt_e,
  * @private
  */
 FieldTextInput.prototype.showPromptEditor_ = function() {
-  Blockly.prompt(Blockly.Msg['CHANGE_VALUE_TITLE'], this.getText(),
+  blocklyPrompt(Msg['CHANGE_VALUE_TITLE'], this.getText(),
       function(text) {
         this.setValue(this.getValueFromEditorText_(text));
       }.bind(this));
@@ -326,7 +328,7 @@ FieldTextInput.prototype.showPromptEditor_ = function() {
  * @private
  */
 FieldTextInput.prototype.showInlineEditor_ = function(quietInput) {
-  Blockly.WidgetDiv.show(
+  WidgetDiv.show(
       this, this.sourceBlock_.RTL, this.widgetDispose_.bind(this));
   this.htmlInput_ = this.widgetCreate_();
   this.isBeingEdited_ = true;
@@ -343,10 +345,10 @@ FieldTextInput.prototype.showInlineEditor_ = function(quietInput) {
  * @protected
  */
 FieldTextInput.prototype.widgetCreate_ = function() {
-  Blockly.Events.setGroup(true);
-  const div = Blockly.WidgetDiv.DIV;
+  Events.setGroup(true);
+  const div = WidgetDiv.DIV;
 
-  Blockly.utils.dom.addClass(this.getClickTarget_(), 'editing');
+  dom.addClass(this.getClickTarget_(), 'editing');
 
   const htmlInput = /** @type {HTMLInputElement} */ (document.createElement('input'));
   htmlInput.className = 'blocklyHtmlInput';
@@ -406,11 +408,11 @@ FieldTextInput.prototype.widgetDispose_ = function() {
   if (this.onFinishEditing_) {
     this.onFinishEditing_(this.value_);
   }
-  Blockly.Events.setGroup(false);
+  Events.setGroup(false);
 
   // Actual disposal.
   this.unbindInputEvents_();
-  const style = Blockly.WidgetDiv.DIV.style;
+  const style = WidgetDiv.DIV.style;
   style.width = 'auto';
   style.height = 'auto';
   style.fontSize = '';
@@ -418,7 +420,7 @@ FieldTextInput.prototype.widgetDispose_ = function() {
   style.boxShadow = '';
   this.htmlInput_ = null;
 
-  Blockly.utils.dom.removeClass(this.getClickTarget_(), 'editing');
+  dom.removeClass(this.getClickTarget_(), 'editing');
 };
 
 /**
@@ -429,10 +431,10 @@ FieldTextInput.prototype.widgetDispose_ = function() {
  */
 FieldTextInput.prototype.bindInputEvents_ = function(htmlInput) {
   // Trap Enter without IME and Esc to hide.
-  this.onKeyDownWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onKeyDownWrapper_ = browserEvents.conditionalBind(
       htmlInput, 'keydown', this, this.onHtmlInputKeyDown_);
   // Resize after every input change.
-  this.onKeyInputWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onKeyInputWrapper_ = browserEvents.conditionalBind(
       htmlInput, 'input', this, this.onHtmlInputChange_);
 };
 
@@ -442,11 +444,11 @@ FieldTextInput.prototype.bindInputEvents_ = function(htmlInput) {
  */
 FieldTextInput.prototype.unbindInputEvents_ = function() {
   if (this.onKeyDownWrapper_) {
-    Blockly.browserEvents.unbind(this.onKeyDownWrapper_);
+    browserEvents.unbind(this.onKeyDownWrapper_);
     this.onKeyDownWrapper_ = null;
   }
   if (this.onKeyInputWrapper_) {
-    Blockly.browserEvents.unbind(this.onKeyInputWrapper_);
+    browserEvents.unbind(this.onKeyInputWrapper_);
     this.onKeyInputWrapper_ = null;
   }
 };
@@ -457,16 +459,16 @@ FieldTextInput.prototype.unbindInputEvents_ = function() {
  * @protected
  */
 FieldTextInput.prototype.onHtmlInputKeyDown_ = function(e) {
-  if (e.keyCode == Blockly.utils.KeyCodes.ENTER) {
-    Blockly.WidgetDiv.hide();
-    Blockly.DropDownDiv.hideWithoutAnimation();
-  } else if (e.keyCode == Blockly.utils.KeyCodes.ESC) {
+  if (e.keyCode == KeyCodes.ENTER) {
+    WidgetDiv.hide();
+    DropDownDiv.hideWithoutAnimation();
+  } else if (e.keyCode == KeyCodes.ESC) {
     this.setValue(this.htmlInput_.untypedDefaultValue_);
-    Blockly.WidgetDiv.hide();
-    Blockly.DropDownDiv.hideWithoutAnimation();
-  } else if (e.keyCode == Blockly.utils.KeyCodes.TAB) {
-    Blockly.WidgetDiv.hide();
-    Blockly.DropDownDiv.hideWithoutAnimation();
+    WidgetDiv.hide();
+    DropDownDiv.hideWithoutAnimation();
+  } else if (e.keyCode == KeyCodes.TAB) {
+    WidgetDiv.hide();
+    DropDownDiv.hideWithoutAnimation();
     this.sourceBlock_.tab(this, !e.shiftKey);
     e.preventDefault();
   }
@@ -513,7 +515,7 @@ FieldTextInput.prototype.setEditorValue_ = function(newValue) {
  * @protected
  */
 FieldTextInput.prototype.resizeEditor_ = function() {
-  const div = Blockly.WidgetDiv.DIV;
+  const div = WidgetDiv.DIV;
   const bBox = this.getScaledBBox();
   div.style.width = bBox.right - bBox.left + 'px';
   div.style.height = bBox.bottom - bBox.top + 'px';
@@ -521,7 +523,7 @@ FieldTextInput.prototype.resizeEditor_ = function() {
   // In RTL mode block fields and LTR input fields the left edge moves,
   // whereas the right edge is fixed.  Reposition the editor.
   const x = this.sourceBlock_.RTL ? bBox.right - div.offsetWidth : bBox.left;
-  const xy = new Blockly.utils.Coordinate(x, bBox.top);
+  const xy = new Coordinate(x, bBox.top);
 
   div.style.left = xy.x + 'px';
   div.style.top = xy.y + 'px';
@@ -580,6 +582,6 @@ FieldTextInput.prototype.getValueFromEditorText_ = function(text) {
   return text;
 };
 
-Blockly.fieldRegistry.register('field_input', FieldTextInput);
+fieldRegistry.register('field_input', FieldTextInput);
 
 exports = FieldTextInput;
diff --git a/tests/deps.js b/tests/deps.js
index 0e96aa2c3..c68a0441f 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -59,7 +59,7 @@ goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabe
 goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es5'});
 goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry']);
-goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object']);
 goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es5'});

From 13272c37136992a91639e6c27ed0fcd100f9cabb Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 10:23:06 -0700
Subject: [PATCH 239/833] clang-format core/field_textinput.js

---
 core/field_textinput.js | 76 +++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 41 deletions(-)

diff --git a/core/field_textinput.js b/core/field_textinput.js
index 07c0e3282..cfa891e34 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -44,7 +44,8 @@ goog.require('Blockly.Events.BlockChange');
  *    changes to the field's value. Takes in a string & returns a validated
  *    string, or null to abort the change.
  * @param {Object=} opt_config A map of options used to configure the field.
- *    See the [field creation documentation]{@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/text-input#creation}
+ *    See the [field creation documentation]{@link
+ * https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/text-input#creation}
  *    for a list of properties this parameter supports.
  * @extends {Field}
  * @constructor
@@ -57,8 +58,8 @@ const FieldTextInput = function(opt_value, opt_validator, opt_config) {
    */
   this.spellcheck_ = true;
 
-  FieldTextInput.superClass_.constructor.call(this,
-      opt_value, opt_validator, opt_config);
+  FieldTextInput.superClass_.constructor.call(
+      this, opt_value, opt_validator, opt_config);
 
   /**
    * The HTML input element.
@@ -159,7 +160,7 @@ FieldTextInput.prototype.initView = function() {
     // Count the number of fields, excluding text fields
     for (let i = 0, input; (input = this.sourceBlock_.inputList[i]); i++) {
       for (let j = 0; (input.fieldRow[j]); j++) {
-        nFields ++;
+        nFields++;
       }
       if (input.connection) {
         nConnections++;
@@ -211,7 +212,8 @@ FieldTextInput.prototype.doValueInvalid_ = function(_invalidValue) {
     this.value_ = this.htmlInput_.untypedDefaultValue_;
     if (this.sourceBlock_ && Events.isEnabled()) {
       Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
-          this.sourceBlock_, 'field', this.name || null, oldValue, this.value_));
+          this.sourceBlock_, 'field', this.name || null, oldValue,
+          this.value_));
     }
   }
 };
@@ -240,11 +242,11 @@ FieldTextInput.prototype.doValueUpdate_ = function(newValue) {
 FieldTextInput.prototype.applyColour = function() {
   if (this.sourceBlock_ && this.getConstants().FULL_BLOCK_FIELDS) {
     if (this.borderRect_) {
-      this.borderRect_.setAttribute('stroke',
-          this.sourceBlock_.style.colourTertiary);
+      this.borderRect_.setAttribute(
+          'stroke', this.sourceBlock_.style.colourTertiary);
     } else {
-      this.sourceBlock_.pathObject.svgPath.setAttribute('fill',
-          this.getConstants().FIELD_BORDER_RECT_COLOUR);
+      this.sourceBlock_.pathObject.svgPath.setAttribute(
+          'fill', this.getConstants().FIELD_BORDER_RECT_COLOUR);
     }
   }
 };
@@ -260,15 +262,13 @@ FieldTextInput.prototype.render_ = function() {
   // doValueUpdate_ so that the code is more centralized.
   if (this.isBeingEdited_) {
     this.resizeEditor_();
-    const htmlInput = /** @type {!HTMLElement} */(this.htmlInput_);
+    const htmlInput = /** @type {!HTMLElement} */ (this.htmlInput_);
     if (!this.isTextValid_) {
       dom.addClass(htmlInput, 'blocklyInvalidInput');
-      aria.setState(htmlInput,
-          aria.State.INVALID, true);
+      aria.setState(htmlInput, aria.State.INVALID, true);
     } else {
       dom.removeClass(htmlInput, 'blocklyInvalidInput');
-      aria.setState(htmlInput,
-          aria.State.INVALID, false);
+      aria.setState(htmlInput, aria.State.INVALID, false);
     }
   }
 };
@@ -295,14 +295,11 @@ FieldTextInput.prototype.setSpellcheck = function(check) {
  *     focus.  Defaults to false.
  * @protected
  */
-FieldTextInput.prototype.showEditor_ = function(_opt_e,
-    opt_quietInput) {
-  this.workspace_ =
-    (/** @type {!BlockSvg} */ (this.sourceBlock_)).workspace;
+FieldTextInput.prototype.showEditor_ = function(_opt_e, opt_quietInput) {
+  this.workspace_ = (/** @type {!BlockSvg} */ (this.sourceBlock_)).workspace;
   const quietInput = opt_quietInput || false;
-  if (!quietInput && (userAgent.MOBILE ||
-                      userAgent.ANDROID ||
-                      userAgent.IPAD)) {
+  if (!quietInput &&
+      (userAgent.MOBILE || userAgent.ANDROID || userAgent.IPAD)) {
     this.showPromptEditor_();
   } else {
     this.showInlineEditor_(quietInput);
@@ -315,10 +312,9 @@ FieldTextInput.prototype.showEditor_ = function(_opt_e,
  * @private
  */
 FieldTextInput.prototype.showPromptEditor_ = function() {
-  blocklyPrompt(Msg['CHANGE_VALUE_TITLE'], this.getText(),
-      function(text) {
-        this.setValue(this.getValueFromEditorText_(text));
-      }.bind(this));
+  blocklyPrompt(Msg['CHANGE_VALUE_TITLE'], this.getText(), function(text) {
+    this.setValue(this.getValueFromEditorText_(text));
+  }.bind(this));
 };
 
 /**
@@ -328,13 +324,12 @@ FieldTextInput.prototype.showPromptEditor_ = function() {
  * @private
  */
 FieldTextInput.prototype.showInlineEditor_ = function(quietInput) {
-  WidgetDiv.show(
-      this, this.sourceBlock_.RTL, this.widgetDispose_.bind(this));
+  WidgetDiv.show(this, this.sourceBlock_.RTL, this.widgetDispose_.bind(this));
   this.htmlInput_ = this.widgetCreate_();
   this.isBeingEdited_ = true;
 
   if (!quietInput) {
-    this.htmlInput_.focus({preventScroll:true});
+    this.htmlInput_.focus({preventScroll: true});
     this.htmlInput_.select();
   }
 };
@@ -350,16 +345,15 @@ FieldTextInput.prototype.widgetCreate_ = function() {
 
   dom.addClass(this.getClickTarget_(), 'editing');
 
-  const htmlInput = /** @type {HTMLInputElement} */ (document.createElement('input'));
+  const htmlInput =
+      /** @type {HTMLInputElement} */ (document.createElement('input'));
   htmlInput.className = 'blocklyHtmlInput';
   htmlInput.setAttribute('spellcheck', this.spellcheck_);
   const scale = this.workspace_.getScale();
-  const fontSize =
-      (this.getConstants().FIELD_TEXT_FONTSIZE * scale) + 'pt';
+  const fontSize = (this.getConstants().FIELD_TEXT_FONTSIZE * scale) + 'pt';
   div.style.fontSize = fontSize;
   htmlInput.style.fontSize = fontSize;
-  let borderRadius =
-      (FieldTextInput.BORDERRADIUS * scale) + 'px';
+  let borderRadius = (FieldTextInput.BORDERRADIUS * scale) + 'px';
 
   if (this.fullBlockClickTarget_) {
     const bBox = this.getScaledBBox();
@@ -368,14 +362,14 @@ FieldTextInput.prototype.widgetCreate_ = function() {
     borderRadius = (bBox.bottom - bBox.top) / 2 + 'px';
     // Pull stroke colour from the existing shadow block
     const strokeColour = this.sourceBlock_.getParent() ?
-      this.sourceBlock_.getParent().style.colourTertiary :
-      this.sourceBlock_.style.colourTertiary;
+        this.sourceBlock_.getParent().style.colourTertiary :
+        this.sourceBlock_.style.colourTertiary;
     htmlInput.style.border = (1 * scale) + 'px solid ' + strokeColour;
     div.style.borderRadius = borderRadius;
     div.style.transition = 'box-shadow 0.25s ease 0s';
     if (this.getConstants().FIELD_TEXTINPUT_BOX_SHADOW) {
-      div.style.boxShadow = 'rgba(255, 255, 255, 0.3) 0 0 0 ' +
-          (4 * scale) + 'px';
+      div.style.boxShadow =
+          'rgba(255, 255, 255, 0.3) 0 0 0 ' + (4 * scale) + 'px';
     }
   }
   htmlInput.style.borderRadius = borderRadius;
@@ -539,10 +533,10 @@ FieldTextInput.prototype.isTabNavigable = function() {
 };
 
 /**
- * Use the `getText_` developer hook to override the field's text representation.
- * When we're currently editing, return the current HTML value instead.
- * Otherwise, return null which tells the field to use the default behaviour
- * (which is a string cast of the field's value).
+ * Use the `getText_` developer hook to override the field's text
+ * representation. When we're currently editing, return the current HTML value
+ * instead. Otherwise, return null which tells the field to use the default
+ * behaviour (which is a string cast of the field's value).
  * @return {?string} The HTML value if we're editing, otherwise null.
  * @protected
  * @override

From f92968b3023759af5e78a887332cf6e5c7d75abd Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 10:29:34 -0700
Subject: [PATCH 240/833] Migrate core/field_variable.js to ES6 const/let

---
 core/field_variable.js | 55 +++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/core/field_variable.js b/core/field_variable.js
index e5e379c13..e481c728a 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -97,7 +97,7 @@ Blockly.utils.object.inherits(Blockly.FieldVariable, Blockly.FieldDropdown);
  * @nocollapse
  */
 Blockly.FieldVariable.fromJson = function(options) {
-  var varName = Blockly.utils.replaceMessageReferences(options['variable']);
+  const varName = Blockly.utils.replaceMessageReferences(options['variable']);
   // `this` might be a subclass of FieldVariable if that class doesn't override
   // the static fromJson method.
   return new this(varName, undefined, undefined, undefined, options);
@@ -130,7 +130,7 @@ Blockly.FieldVariable.prototype.initModel = function() {
   if (this.variable_) {
     return;  // Initialization already happened.
   }
-  var variable = Blockly.Variables.getOrCreateVariablePackage(
+  const variable = Blockly.Variables.getOrCreateVariablePackage(
       this.sourceBlock_.workspace, null,
       this.defaultVariableName, this.defaultType_);
 
@@ -153,14 +153,14 @@ Blockly.FieldVariable.prototype.shouldAddBorderRect_ = function() {
  *    variable field's state.
  */
 Blockly.FieldVariable.prototype.fromXml = function(fieldElement) {
-  var id = fieldElement.getAttribute('id');
-  var variableName = fieldElement.textContent;
+  const id = fieldElement.getAttribute('id');
+  const variableName = fieldElement.textContent;
   // 'variabletype' should be lowercase, but until July 2019 it was sometimes
   // recorded as 'variableType'.  Thus we need to check for both.
-  var variableType = fieldElement.getAttribute('variabletype') ||
+  const variableType = fieldElement.getAttribute('variabletype') ||
       fieldElement.getAttribute('variableType') || '';
 
-  var variable = Blockly.Variables.getOrCreateVariablePackage(
+  const variable = Blockly.Variables.getOrCreateVariablePackage(
       this.sourceBlock_.workspace, id, variableName, variableType);
 
   // This should never happen :)
@@ -259,8 +259,8 @@ Blockly.FieldVariable.prototype.doClassValidation_ = function(opt_newValue) {
   if (opt_newValue === null) {
     return null;
   }
-  var newId = /** @type {string} */ (opt_newValue);
-  var variable = Blockly.Variables.getVariable(
+  const newId = /** @type {string} */ (opt_newValue);
+  const variable = Blockly.Variables.getVariable(
       this.sourceBlock_.workspace, newId);
   if (!variable) {
     console.warn('Variable id doesn\'t point to a real variable! ' +
@@ -268,7 +268,7 @@ Blockly.FieldVariable.prototype.doClassValidation_ = function(opt_newValue) {
     return null;
   }
   // Type Checks.
-  var type = variable.type;
+  const type = variable.type;
   if (!this.typeIsAllowed_(type)) {
     console.warn('Variable type doesn\'t match this field!  Type was ' + type);
     return null;
@@ -297,11 +297,11 @@ Blockly.FieldVariable.prototype.doValueUpdate_ = function(newId) {
  * @private
  */
 Blockly.FieldVariable.prototype.typeIsAllowed_ = function(type) {
-  var typeList = this.getVariableTypes_();
+  const typeList = this.getVariableTypes_();
   if (!typeList) {
     return true;  // If it's null, all types are valid.
   }
-  for (var i = 0; i < typeList.length; i++) {
+  for (let i = 0; i < typeList.length; i++) {
     if (type == typeList[i]) {
       return true;
     }
@@ -317,7 +317,7 @@ Blockly.FieldVariable.prototype.typeIsAllowed_ = function(type) {
  */
 Blockly.FieldVariable.prototype.getVariableTypes_ = function() {
   // TODO (#1513): Try to avoid calling this every time the field is edited.
-  var variableTypes = this.variableTypes;
+  let variableTypes = this.variableTypes;
   if (variableTypes === null) {
     // If variableTypes is null, return all variable types.
     if (this.sourceBlock_ && this.sourceBlock_.workspace) {
@@ -327,7 +327,7 @@ Blockly.FieldVariable.prototype.getVariableTypes_ = function() {
   variableTypes = variableTypes || [''];
   if (variableTypes.length == 0) {
     // Throw an error if variableTypes is an empty list.
-    var name = this.getText();
+    const name = this.getText();
     throw Error('\'variableTypes\' of field variable ' +
       name + ' was an empty list');
   }
@@ -348,15 +348,16 @@ Blockly.FieldVariable.prototype.setTypes_ = function(opt_variableTypes,
     opt_defaultType) {
   // If you expected that the default type would be the same as the only entry
   // in the variable types array, tell the Blockly team by commenting on #1499.
-  var defaultType = opt_defaultType || '';
+  const defaultType = opt_defaultType || '';
+  let variableTypes;
   // Set the allowable variable types.  Null means all types on the workspace.
   if (opt_variableTypes == null || opt_variableTypes == undefined) {
-    var variableTypes = null;
+    variableTypes = null;
   } else if (Array.isArray(opt_variableTypes)) {
-    var variableTypes = opt_variableTypes;
+    variableTypes = opt_variableTypes;
     // Make sure the default type is valid.
-    var isInArray = false;
-    for (var i = 0; i < variableTypes.length; i++) {
+    let isInArray = false;
+    for (let i = 0; i < variableTypes.length; i++) {
       if (variableTypes[i] == defaultType) {
         isInArray = true;
       }
@@ -395,23 +396,23 @@ Blockly.FieldVariable.dropdownCreate = function() {
     throw Error('Tried to call dropdownCreate on a variable field with no' +
         ' variable selected.');
   }
-  var name = this.getText();
-  var variableModelList = [];
+  const name = this.getText();
+  let variableModelList = [];
   if (this.sourceBlock_ && this.sourceBlock_.workspace) {
-    var variableTypes = this.getVariableTypes_();
+    const variableTypes = this.getVariableTypes_();
     // Get a copy of the list, so that adding rename and new variable options
     // doesn't modify the workspace's list.
-    for (var i = 0; i < variableTypes.length; i++) {
-      var variableType = variableTypes[i];
-      var variables =
+    for (let i = 0; i < variableTypes.length; i++) {
+      const variableType = variableTypes[i];
+      const variables =
         this.sourceBlock_.workspace.getVariablesOfType(variableType);
       variableModelList = variableModelList.concat(variables);
     }
   }
   variableModelList.sort(Blockly.VariableModel.compareByName);
 
-  var options = [];
-  for (var i = 0; i < variableModelList.length; i++) {
+  const options = [];
+  for (let i = 0; i < variableModelList.length; i++) {
     // Set the UUID as the internal representation of the variable.
     options[i] = [variableModelList[i].name, variableModelList[i].getId()];
   }
@@ -437,7 +438,7 @@ Blockly.FieldVariable.dropdownCreate = function() {
  * @protected
  */
 Blockly.FieldVariable.prototype.onItemSelected_ = function(menu, menuItem) {
-  var id = menuItem.getValue();
+  const id = menuItem.getValue();
   // Handle special cases.
   if (this.sourceBlock_ && this.sourceBlock_.workspace) {
     if (id == Blockly.internalConstants.RENAME_VARIABLE_ID) {

From f5de84486f8d10bfa55737f816c7fc3b25690ee7 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 10:32:47 -0700
Subject: [PATCH 241/833] Migrate core/field_variable.js to goog.module

---
 core/field_variable.js | 67 ++++++++++++++++++++++--------------------
 tests/deps.js          |  2 +-
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/core/field_variable.js b/core/field_variable.js
index e481c728a..11d16532e 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.FieldVariable');
+goog.module('Blockly.FieldVariable');
+goog.module.declareLegacyNamespace();
 
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
@@ -47,7 +48,7 @@ goog.requireType('Blockly.MenuItem');
  * @extends {Blockly.FieldDropdown}
  * @constructor
  */
-Blockly.FieldVariable = function(varName, opt_validator, opt_variableTypes,
+const FieldVariable = function(varName, opt_validator, opt_variableTypes,
     opt_defaultType, opt_config) {
   // The FieldDropdown constructor expects the field's initial value to be
   // the first entry in the menu generator, which it may or may not be.
@@ -60,7 +61,7 @@ Blockly.FieldVariable = function(varName, opt_validator, opt_variableTypes,
    *    !function(this:Blockly.FieldDropdown): !Array<!Array>)}
    * @protected
    */
-  this.menuGenerator_ = Blockly.FieldVariable.dropdownCreate;
+  this.menuGenerator_ = FieldVariable.dropdownCreate;
 
   /**
    * The initial variable name passed to this field's constructor, or an
@@ -85,18 +86,18 @@ Blockly.FieldVariable = function(varName, opt_validator, opt_variableTypes,
     this.setTypes_(opt_variableTypes, opt_defaultType);
   }
 };
-Blockly.utils.object.inherits(Blockly.FieldVariable, Blockly.FieldDropdown);
+Blockly.utils.object.inherits(FieldVariable, Blockly.FieldDropdown);
 
 /**
  * Construct a FieldVariable from a JSON arg object,
  * dereferencing any string table references.
  * @param {!Object} options A JSON object with options (variable,
  *                          variableTypes, and defaultType).
- * @return {!Blockly.FieldVariable} The new field instance.
+ * @return {!FieldVariable} The new field instance.
  * @package
  * @nocollapse
  */
-Blockly.FieldVariable.fromJson = function(options) {
+FieldVariable.fromJson = function(options) {
   const varName = Blockly.utils.replaceMessageReferences(options['variable']);
   // `this` might be a subclass of FieldVariable if that class doesn't override
   // the static fromJson method.
@@ -108,15 +109,15 @@ Blockly.FieldVariable.fromJson = function(options) {
  * are not. Editable fields should also be serializable.
  * @type {boolean}
  */
-Blockly.FieldVariable.prototype.SERIALIZABLE = true;
+FieldVariable.prototype.SERIALIZABLE = true;
 
 /**
  * Configure the field based on the given map of options.
  * @param {!Object} config A map of options to configure the field based on.
  * @protected
  */
-Blockly.FieldVariable.prototype.configure_ = function(config) {
-  Blockly.FieldVariable.superClass_.configure_.call(this, config);
+FieldVariable.prototype.configure_ = function(config) {
+  FieldVariable.superClass_.configure_.call(this, config);
   this.setTypes_(config['variableTypes'], config['defaultType']);
 };
 
@@ -126,7 +127,7 @@ Blockly.FieldVariable.prototype.configure_ = function(config) {
  * variable rather than let the value be invalid.
  * @package
  */
-Blockly.FieldVariable.prototype.initModel = function() {
+FieldVariable.prototype.initModel = function() {
   if (this.variable_) {
     return;  // Initialization already happened.
   }
@@ -141,8 +142,8 @@ Blockly.FieldVariable.prototype.initModel = function() {
 /**
  * @override
  */
-Blockly.FieldVariable.prototype.shouldAddBorderRect_ = function() {
-  return Blockly.FieldVariable.superClass_.shouldAddBorderRect_.call(this) &&
+FieldVariable.prototype.shouldAddBorderRect_ = function() {
+  return FieldVariable.superClass_.shouldAddBorderRect_.call(this) &&
     (!this.getConstants().FIELD_DROPDOWN_NO_BORDER_RECT_SHADOW ||
         this.sourceBlock_.type != 'variables_get');
 };
@@ -152,7 +153,7 @@ Blockly.FieldVariable.prototype.shouldAddBorderRect_ = function() {
  * @param {!Element} fieldElement The element containing information about the
  *    variable field's state.
  */
-Blockly.FieldVariable.prototype.fromXml = function(fieldElement) {
+FieldVariable.prototype.fromXml = function(fieldElement) {
   const id = fieldElement.getAttribute('id');
   const variableName = fieldElement.textContent;
   // 'variabletype' should be lowercase, but until July 2019 it was sometimes
@@ -180,7 +181,7 @@ Blockly.FieldVariable.prototype.fromXml = function(fieldElement) {
  *    field's state.
  * @return {!Element} The element containing info about the field's state.
  */
-Blockly.FieldVariable.prototype.toXml = function(fieldElement) {
+FieldVariable.prototype.toXml = function(fieldElement) {
   // Make sure the variable is initialized.
   this.initModel();
 
@@ -196,18 +197,18 @@ Blockly.FieldVariable.prototype.toXml = function(fieldElement) {
  * Attach this field to a block.
  * @param {!Blockly.Block} block The block containing this field.
  */
-Blockly.FieldVariable.prototype.setSourceBlock = function(block) {
+FieldVariable.prototype.setSourceBlock = function(block) {
   if (block.isShadow()) {
     throw Error('Variable fields are not allowed to exist on shadow blocks.');
   }
-  Blockly.FieldVariable.superClass_.setSourceBlock.call(this, block);
+  FieldVariable.superClass_.setSourceBlock.call(this, block);
 };
 
 /**
  * Get the variable's ID.
  * @return {string} Current variable's ID.
  */
-Blockly.FieldVariable.prototype.getValue = function() {
+FieldVariable.prototype.getValue = function() {
   return this.variable_ ? this.variable_.getId() : null;
 };
 
@@ -216,7 +217,7 @@ Blockly.FieldVariable.prototype.getValue = function() {
  * @return {string} The selected variable's name, or the empty string if no
  *     variable is selected.
  */
-Blockly.FieldVariable.prototype.getText = function() {
+FieldVariable.prototype.getText = function() {
   return this.variable_ ? this.variable_.name : '';
 };
 
@@ -228,7 +229,7 @@ Blockly.FieldVariable.prototype.getText = function() {
  *     selected.
  * @package
  */
-Blockly.FieldVariable.prototype.getVariable = function() {
+FieldVariable.prototype.getVariable = function() {
   return this.variable_;
 };
 
@@ -239,7 +240,7 @@ Blockly.FieldVariable.prototype.getVariable = function() {
  * a block and workspace at that point.
  * @return {?Function} Validation function, or null.
  */
-Blockly.FieldVariable.prototype.getValidator = function() {
+FieldVariable.prototype.getValidator = function() {
   // Validators shouldn't operate on the initial setValue call.
   // Normally this is achieved by calling setValidator after setValue, but
   // this is not a possibility with variable fields.
@@ -255,7 +256,7 @@ Blockly.FieldVariable.prototype.getValidator = function() {
  * @return {?string} The validated ID, or null if invalid.
  * @protected
  */
-Blockly.FieldVariable.prototype.doClassValidation_ = function(opt_newValue) {
+FieldVariable.prototype.doClassValidation_ = function(opt_newValue) {
   if (opt_newValue === null) {
     return null;
   }
@@ -284,10 +285,10 @@ Blockly.FieldVariable.prototype.doClassValidation_ = function(opt_newValue) {
  * @param {*} newId The value to be saved.
  * @protected
  */
-Blockly.FieldVariable.prototype.doValueUpdate_ = function(newId) {
+FieldVariable.prototype.doValueUpdate_ = function(newId) {
   this.variable_ = Blockly.Variables.getVariable(
       this.sourceBlock_.workspace, /** @type {string} */ (newId));
-  Blockly.FieldVariable.superClass_.doValueUpdate_.call(this, newId);
+  FieldVariable.superClass_.doValueUpdate_.call(this, newId);
 };
 
 /**
@@ -296,7 +297,7 @@ Blockly.FieldVariable.prototype.doValueUpdate_ = function(newId) {
  * @return {boolean} True if the type is in the list of allowed types.
  * @private
  */
-Blockly.FieldVariable.prototype.typeIsAllowed_ = function(type) {
+FieldVariable.prototype.typeIsAllowed_ = function(type) {
   const typeList = this.getVariableTypes_();
   if (!typeList) {
     return true;  // If it's null, all types are valid.
@@ -315,7 +316,7 @@ Blockly.FieldVariable.prototype.typeIsAllowed_ = function(type) {
  * @throws {Error} if variableTypes is an empty array.
  * @private
  */
-Blockly.FieldVariable.prototype.getVariableTypes_ = function() {
+FieldVariable.prototype.getVariableTypes_ = function() {
   // TODO (#1513): Try to avoid calling this every time the field is edited.
   let variableTypes = this.variableTypes;
   if (variableTypes === null) {
@@ -344,7 +345,7 @@ Blockly.FieldVariable.prototype.getVariableTypes_ = function() {
  *     field's value is not explicitly set.  Defaults to ''.
  * @private
  */
-Blockly.FieldVariable.prototype.setTypes_ = function(opt_variableTypes,
+FieldVariable.prototype.setTypes_ = function(opt_variableTypes,
     opt_defaultType) {
   // If you expected that the default type would be the same as the only entry
   // in the variable types array, tell the Blockly team by commenting on #1499.
@@ -381,7 +382,7 @@ Blockly.FieldVariable.prototype.setTypes_ = function(opt_variableTypes,
  * be called by the block.
  * @package
  */
-Blockly.FieldVariable.prototype.refreshVariableName = function() {
+FieldVariable.prototype.refreshVariableName = function() {
   this.forceRerender();
 };
 
@@ -389,9 +390,9 @@ Blockly.FieldVariable.prototype.refreshVariableName = function() {
  * Return a sorted list of variable names for variable dropdown menus.
  * Include a special option at the end for creating a new variable name.
  * @return {!Array<!Array>} Array of variable names/id tuples.
- * @this {Blockly.FieldVariable}
+ * @this {FieldVariable}
  */
-Blockly.FieldVariable.dropdownCreate = function() {
+FieldVariable.dropdownCreate = function() {
   if (!this.variable_) {
     throw Error('Tried to call dropdownCreate on a variable field with no' +
         ' variable selected.');
@@ -437,7 +438,7 @@ Blockly.FieldVariable.dropdownCreate = function() {
  * @param {!Blockly.MenuItem} menuItem The MenuItem selected within menu.
  * @protected
  */
-Blockly.FieldVariable.prototype.onItemSelected_ = function(menu, menuItem) {
+FieldVariable.prototype.onItemSelected_ = function(menu, menuItem) {
   const id = menuItem.getValue();
   // Handle special cases.
   if (this.sourceBlock_ && this.sourceBlock_.workspace) {
@@ -462,8 +463,10 @@ Blockly.FieldVariable.prototype.onItemSelected_ = function(menu, menuItem) {
  * @package
  * @override
  */
-Blockly.FieldVariable.prototype.referencesVariables = function() {
+FieldVariable.prototype.referencesVariables = function() {
   return true;
 };
 
-Blockly.fieldRegistry.register('field_variable', Blockly.FieldVariable);
+Blockly.fieldRegistry.register('field_variable', FieldVariable);
+
+exports = FieldVariable;
diff --git a/tests/deps.js b/tests/deps.js
index da56c39f2..5b085e8e6 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -60,7 +60,7 @@ goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilin
 goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry']);
 goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object']);
+goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es5'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);

From bd5fd3bb088af2127d717dea81825ba178e86f1e Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 10:37:24 -0700
Subject: [PATCH 242/833] Migrate core/field_variable.js named requires

---
 core/field_variable.js | 75 +++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/core/field_variable.js b/core/field_variable.js
index 11d16532e..1a50f8c88 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -13,22 +13,21 @@
 goog.module('Blockly.FieldVariable');
 goog.module.declareLegacyNamespace();
 
+const Block = goog.requireType('Blockly.Block');
+const FieldDropdown = goog.require('Blockly.FieldDropdown');
+const Menu = goog.requireType('Blockly.Menu');
+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');
+const internalConstants = goog.require('Blockly.internalConstants');
+const {inherits} = goog.require('Blockly.utils.object');
+const {replaceMessageReferences} = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
-goog.require('Blockly.FieldDropdown');
-goog.require('Blockly.fieldRegistry');
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.Msg');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Size');
-goog.require('Blockly.VariableModel');
-goog.require('Blockly.Variables');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.Menu');
-goog.requireType('Blockly.MenuItem');
 
 
 /**
@@ -45,7 +44,7 @@ goog.requireType('Blockly.MenuItem');
  * @param {Object=} opt_config A map of options used to configure the field.
  *    See the [field creation documentation]{@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/variable#creation}
  *    for a list of properties this parameter supports.
- * @extends {Blockly.FieldDropdown}
+ * @extends {FieldDropdown}
  * @constructor
  */
 const FieldVariable = function(varName, opt_validator, opt_variableTypes,
@@ -58,7 +57,7 @@ const FieldVariable = function(varName, opt_validator, opt_variableTypes,
    * An array of options for a dropdown list,
    * or a function which generates these options.
    * @type {(!Array<!Array>|
-   *    !function(this:Blockly.FieldDropdown): !Array<!Array>)}
+   *    !function(this:FieldDropdown): !Array<!Array>)}
    * @protected
    */
   this.menuGenerator_ = FieldVariable.dropdownCreate;
@@ -73,11 +72,11 @@ const FieldVariable = function(varName, opt_validator, opt_variableTypes,
 
   /**
    * The size of the area rendered by the field.
-   * @type {Blockly.utils.Size}
+   * @type {Size}
    * @protected
    * @override
    */
-  this.size_ = new Blockly.utils.Size(0, 0);
+  this.size_ = new Size(0, 0);
 
   opt_config && this.configure_(opt_config);
   opt_validator && this.setValidator(opt_validator);
@@ -86,7 +85,7 @@ const FieldVariable = function(varName, opt_validator, opt_variableTypes,
     this.setTypes_(opt_variableTypes, opt_defaultType);
   }
 };
-Blockly.utils.object.inherits(FieldVariable, Blockly.FieldDropdown);
+inherits(FieldVariable, FieldDropdown);
 
 /**
  * Construct a FieldVariable from a JSON arg object,
@@ -98,7 +97,7 @@ Blockly.utils.object.inherits(FieldVariable, Blockly.FieldDropdown);
  * @nocollapse
  */
 FieldVariable.fromJson = function(options) {
-  const varName = Blockly.utils.replaceMessageReferences(options['variable']);
+  const varName = replaceMessageReferences(options['variable']);
   // `this` might be a subclass of FieldVariable if that class doesn't override
   // the static fromJson method.
   return new this(varName, undefined, undefined, undefined, options);
@@ -131,7 +130,7 @@ FieldVariable.prototype.initModel = function() {
   if (this.variable_) {
     return;  // Initialization already happened.
   }
-  const variable = Blockly.Variables.getOrCreateVariablePackage(
+  const variable = Variables.getOrCreateVariablePackage(
       this.sourceBlock_.workspace, null,
       this.defaultVariableName, this.defaultType_);
 
@@ -161,7 +160,7 @@ FieldVariable.prototype.fromXml = function(fieldElement) {
   const variableType = fieldElement.getAttribute('variabletype') ||
       fieldElement.getAttribute('variableType') || '';
 
-  const variable = Blockly.Variables.getOrCreateVariablePackage(
+  const variable = Variables.getOrCreateVariablePackage(
       this.sourceBlock_.workspace, id, variableName, variableType);
 
   // This should never happen :)
@@ -169,7 +168,7 @@ FieldVariable.prototype.fromXml = function(fieldElement) {
     throw Error('Serialized variable type with id \'' +
       variable.getId() + '\' had type ' + variable.type + ', and ' +
       'does not match variable field that references it: ' +
-      Blockly.Xml.domToText(fieldElement) + '.');
+      Xml.domToText(fieldElement) + '.');
   }
 
   this.setValue(variable.getId());
@@ -195,7 +194,7 @@ FieldVariable.prototype.toXml = function(fieldElement) {
 
 /**
  * Attach this field to a block.
- * @param {!Blockly.Block} block The block containing this field.
+ * @param {!Block} block The block containing this field.
  */
 FieldVariable.prototype.setSourceBlock = function(block) {
   if (block.isShadow()) {
@@ -225,7 +224,7 @@ FieldVariable.prototype.getText = function() {
  * Get the variable model for the selected variable.
  * Not guaranteed to be in the variable map on the workspace (e.g. if accessed
  * after the variable has been deleted).
- * @return {?Blockly.VariableModel} The selected variable, or null if none was
+ * @return {?VariableModel} The selected variable, or null if none was
  *     selected.
  * @package
  */
@@ -261,7 +260,7 @@ FieldVariable.prototype.doClassValidation_ = function(opt_newValue) {
     return null;
   }
   const newId = /** @type {string} */ (opt_newValue);
-  const variable = Blockly.Variables.getVariable(
+  const variable = Variables.getVariable(
       this.sourceBlock_.workspace, newId);
   if (!variable) {
     console.warn('Variable id doesn\'t point to a real variable! ' +
@@ -286,7 +285,7 @@ FieldVariable.prototype.doClassValidation_ = function(opt_newValue) {
  * @protected
  */
 FieldVariable.prototype.doValueUpdate_ = function(newId) {
-  this.variable_ = Blockly.Variables.getVariable(
+  this.variable_ = Variables.getVariable(
       this.sourceBlock_.workspace, /** @type {string} */ (newId));
   FieldVariable.superClass_.doValueUpdate_.call(this, newId);
 };
@@ -410,7 +409,7 @@ FieldVariable.dropdownCreate = function() {
       variableModelList = variableModelList.concat(variables);
     }
   }
-  variableModelList.sort(Blockly.VariableModel.compareByName);
+  variableModelList.sort(VariableModel.compareByName);
 
   const options = [];
   for (let i = 0; i < variableModelList.length; i++) {
@@ -418,12 +417,12 @@ FieldVariable.dropdownCreate = function() {
     options[i] = [variableModelList[i].name, variableModelList[i].getId()];
   }
   options.push([
-    Blockly.Msg['RENAME_VARIABLE'], Blockly.internalConstants.RENAME_VARIABLE_ID
+    Msg['RENAME_VARIABLE'], internalConstants.RENAME_VARIABLE_ID
   ]);
-  if (Blockly.Msg['DELETE_VARIABLE']) {
+  if (Msg['DELETE_VARIABLE']) {
     options.push([
-      Blockly.Msg['DELETE_VARIABLE'].replace('%1', name),
-      Blockly.internalConstants.DELETE_VARIABLE_ID
+      Msg['DELETE_VARIABLE'].replace('%1', name),
+      internalConstants.DELETE_VARIABLE_ID
     ]);
   }
 
@@ -434,20 +433,20 @@ FieldVariable.dropdownCreate = function() {
  * Handle the selection of an item in the variable dropdown menu.
  * Special case the 'Rename variable...' and 'Delete variable...' options.
  * In the rename case, prompt the user for a new name.
- * @param {!Blockly.Menu} menu The Menu component clicked.
- * @param {!Blockly.MenuItem} menuItem The MenuItem selected within menu.
+ * @param {!Menu} menu The Menu component clicked.
+ * @param {!MenuItem} menuItem The MenuItem selected within menu.
  * @protected
  */
 FieldVariable.prototype.onItemSelected_ = function(menu, menuItem) {
   const id = menuItem.getValue();
   // Handle special cases.
   if (this.sourceBlock_ && this.sourceBlock_.workspace) {
-    if (id == Blockly.internalConstants.RENAME_VARIABLE_ID) {
+    if (id == internalConstants.RENAME_VARIABLE_ID) {
       // Rename variable.
-      Blockly.Variables.renameVariable(
+      Variables.renameVariable(
           this.sourceBlock_.workspace, this.variable_);
       return;
-    } else if (id == Blockly.internalConstants.DELETE_VARIABLE_ID) {
+    } else if (id == internalConstants.DELETE_VARIABLE_ID) {
       // Delete variable.
       this.sourceBlock_.workspace.deleteVariableById(this.variable_.getId());
       return;
@@ -467,6 +466,6 @@ FieldVariable.prototype.referencesVariables = function() {
   return true;
 };
 
-Blockly.fieldRegistry.register('field_variable', FieldVariable);
+fieldRegistry.register('field_variable', FieldVariable);
 
 exports = FieldVariable;

From 88aa32510c8549a68d0e234146535710a8689b83 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 10:38:10 -0700
Subject: [PATCH 243/833] clang-format core/field_variable.js

---
 core/field_variable.js | 56 ++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/core/field_variable.js b/core/field_variable.js
index 1a50f8c88..f700d4a99 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -42,13 +42,14 @@ goog.require('Blockly.Events.BlockChange');
  * @param {string=} opt_defaultType The type of variable to create if this
  *     field's value is not explicitly set.  Defaults to ''.
  * @param {Object=} opt_config A map of options used to configure the field.
- *    See the [field creation documentation]{@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/variable#creation}
+ *    See the [field creation documentation]{@link
+ *    https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/variable#creation}
  *    for a list of properties this parameter supports.
  * @extends {FieldDropdown}
  * @constructor
  */
-const FieldVariable = function(varName, opt_validator, opt_variableTypes,
-    opt_defaultType, opt_config) {
+const FieldVariable = function(
+    varName, opt_validator, opt_variableTypes, opt_defaultType, opt_config) {
   // The FieldDropdown constructor expects the field's initial value to be
   // the first entry in the menu generator, which it may or may not be.
   // Just do the relevant parts of the constructor.
@@ -131,8 +132,8 @@ FieldVariable.prototype.initModel = function() {
     return;  // Initialization already happened.
   }
   const variable = Variables.getOrCreateVariablePackage(
-      this.sourceBlock_.workspace, null,
-      this.defaultVariableName, this.defaultType_);
+      this.sourceBlock_.workspace, null, this.defaultVariableName,
+      this.defaultType_);
 
   // Don't call setValue because we don't want to cause a rerender.
   this.doValueUpdate_(variable.getId());
@@ -143,8 +144,8 @@ FieldVariable.prototype.initModel = function() {
  */
 FieldVariable.prototype.shouldAddBorderRect_ = function() {
   return FieldVariable.superClass_.shouldAddBorderRect_.call(this) &&
-    (!this.getConstants().FIELD_DROPDOWN_NO_BORDER_RECT_SHADOW ||
-        this.sourceBlock_.type != 'variables_get');
+      (!this.getConstants().FIELD_DROPDOWN_NO_BORDER_RECT_SHADOW ||
+       this.sourceBlock_.type != 'variables_get');
 };
 
 /**
@@ -165,10 +166,11 @@ FieldVariable.prototype.fromXml = function(fieldElement) {
 
   // This should never happen :)
   if (variableType != null && variableType !== variable.type) {
-    throw Error('Serialized variable type with id \'' +
-      variable.getId() + '\' had type ' + variable.type + ', and ' +
-      'does not match variable field that references it: ' +
-      Xml.domToText(fieldElement) + '.');
+    throw Error(
+        'Serialized variable type with id \'' + variable.getId() +
+        '\' had type ' + variable.type + ', and ' +
+        'does not match variable field that references it: ' +
+        Xml.domToText(fieldElement) + '.');
   }
 
   this.setValue(variable.getId());
@@ -260,10 +262,10 @@ FieldVariable.prototype.doClassValidation_ = function(opt_newValue) {
     return null;
   }
   const newId = /** @type {string} */ (opt_newValue);
-  const variable = Variables.getVariable(
-      this.sourceBlock_.workspace, newId);
+  const variable = Variables.getVariable(this.sourceBlock_.workspace, newId);
   if (!variable) {
-    console.warn('Variable id doesn\'t point to a real variable! ' +
+    console.warn(
+        'Variable id doesn\'t point to a real variable! ' +
         'ID was ' + newId);
     return null;
   }
@@ -328,8 +330,8 @@ FieldVariable.prototype.getVariableTypes_ = function() {
   if (variableTypes.length == 0) {
     // Throw an error if variableTypes is an empty list.
     const name = this.getText();
-    throw Error('\'variableTypes\' of field variable ' +
-      name + ' was an empty list');
+    throw Error(
+        '\'variableTypes\' of field variable ' + name + ' was an empty list');
   }
   return variableTypes;
 };
@@ -344,8 +346,8 @@ FieldVariable.prototype.getVariableTypes_ = function() {
  *     field's value is not explicitly set.  Defaults to ''.
  * @private
  */
-FieldVariable.prototype.setTypes_ = function(opt_variableTypes,
-    opt_defaultType) {
+FieldVariable.prototype.setTypes_ = function(
+    opt_variableTypes, opt_defaultType) {
   // If you expected that the default type would be the same as the only entry
   // in the variable types array, tell the Blockly team by commenting on #1499.
   const defaultType = opt_defaultType || '';
@@ -363,11 +365,13 @@ FieldVariable.prototype.setTypes_ = function(opt_variableTypes,
       }
     }
     if (!isInArray) {
-      throw Error('Invalid default type \'' + defaultType + '\' in ' +
+      throw Error(
+          'Invalid default type \'' + defaultType + '\' in ' +
           'the definition of a FieldVariable');
     }
   } else {
-    throw Error('\'variableTypes\' was not an array in the definition of ' +
+    throw Error(
+        '\'variableTypes\' was not an array in the definition of ' +
         'a FieldVariable');
   }
   // Only update the field once all checks pass.
@@ -393,7 +397,8 @@ FieldVariable.prototype.refreshVariableName = function() {
  */
 FieldVariable.dropdownCreate = function() {
   if (!this.variable_) {
-    throw Error('Tried to call dropdownCreate on a variable field with no' +
+    throw Error(
+        'Tried to call dropdownCreate on a variable field with no' +
         ' variable selected.');
   }
   const name = this.getText();
@@ -405,7 +410,7 @@ FieldVariable.dropdownCreate = function() {
     for (let i = 0; i < variableTypes.length; i++) {
       const variableType = variableTypes[i];
       const variables =
-        this.sourceBlock_.workspace.getVariablesOfType(variableType);
+          this.sourceBlock_.workspace.getVariablesOfType(variableType);
       variableModelList = variableModelList.concat(variables);
     }
   }
@@ -416,9 +421,7 @@ FieldVariable.dropdownCreate = function() {
     // Set the UUID as the internal representation of the variable.
     options[i] = [variableModelList[i].name, variableModelList[i].getId()];
   }
-  options.push([
-    Msg['RENAME_VARIABLE'], internalConstants.RENAME_VARIABLE_ID
-  ]);
+  options.push([Msg['RENAME_VARIABLE'], internalConstants.RENAME_VARIABLE_ID]);
   if (Msg['DELETE_VARIABLE']) {
     options.push([
       Msg['DELETE_VARIABLE'].replace('%1', name),
@@ -443,8 +446,7 @@ FieldVariable.prototype.onItemSelected_ = function(menu, menuItem) {
   if (this.sourceBlock_ && this.sourceBlock_.workspace) {
     if (id == internalConstants.RENAME_VARIABLE_ID) {
       // Rename variable.
-      Variables.renameVariable(
-          this.sourceBlock_.workspace, this.variable_);
+      Variables.renameVariable(this.sourceBlock_.workspace, this.variable_);
       return;
     } else if (id == internalConstants.DELETE_VARIABLE_ID) {
       // Delete variable.

From ee565f16d6899cbe857529194a4d7852d0effdf2 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 10:41:55 -0700
Subject: [PATCH 244/833] Silence unused variable warnings for requires used in
 JSDoc

---
 core/interfaces/i_collapsible_toolbox_item.js | 2 ++
 core/interfaces/i_registrable_field.js        | 1 +
 core/interfaces/i_selectable_toolbox_item.js  | 2 ++
 core/keyboard_nav/tab_navigate_cursor.js      | 1 +
 core/renderers/common/info.js                 | 8 ++++++++
 5 files changed, 14 insertions(+)

diff --git a/core/interfaces/i_collapsible_toolbox_item.js b/core/interfaces/i_collapsible_toolbox_item.js
index 732c7aab7..45bd3ae3e 100644
--- a/core/interfaces/i_collapsible_toolbox_item.js
+++ b/core/interfaces/i_collapsible_toolbox_item.js
@@ -14,7 +14,9 @@
 goog.module('Blockly.ICollapsibleToolboxItem');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const ISelectableToolboxItem = goog.require('Blockly.ISelectableToolboxItem');
+/* eslint-disable-next-line no-unused-vars */
 const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 
 
diff --git a/core/interfaces/i_registrable_field.js b/core/interfaces/i_registrable_field.js
index 2c8c005bd..c9d04325d 100644
--- a/core/interfaces/i_registrable_field.js
+++ b/core/interfaces/i_registrable_field.js
@@ -14,6 +14,7 @@
 goog.module('Blockly.IRegistrableField');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.Field');
 
 
diff --git a/core/interfaces/i_selectable_toolbox_item.js b/core/interfaces/i_selectable_toolbox_item.js
index 2addc7b9e..cefe35740 100644
--- a/core/interfaces/i_selectable_toolbox_item.js
+++ b/core/interfaces/i_selectable_toolbox_item.js
@@ -14,7 +14,9 @@
 goog.module('Blockly.ISelectableToolboxItem');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const IToolboxItem = goog.require('Blockly.IToolboxItem');
+/* eslint-disable-next-line no-unused-vars */
 const {FlyoutItemInfoArray} = goog.requireType('Blockly.utils.toolbox');
 
 
diff --git a/core/keyboard_nav/tab_navigate_cursor.js b/core/keyboard_nav/tab_navigate_cursor.js
index 3b82267a1..77fc5a2a2 100644
--- a/core/keyboard_nav/tab_navigate_cursor.js
+++ b/core/keyboard_nav/tab_navigate_cursor.js
@@ -16,6 +16,7 @@ goog.module.declareLegacyNamespace();
 
 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 {inherits} = goog.require('Blockly.utils.object');
 
diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js
index 73e02dfff..0f8548192 100644
--- a/core/renderers/common/info.js
+++ b/core/renderers/common/info.js
@@ -13,25 +13,33 @@
 goog.module('Blockly.blockRendering.RenderInfo');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const BottomRow = goog.require('Blockly.blockRendering.BottomRow');
+/* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
 const ExternalValueInput = goog.require('Blockly.blockRendering.ExternalValueInput');
 const Field = goog.require('Blockly.blockRendering.Field');
 const Hat = goog.require('Blockly.blockRendering.Hat');
 const Icon = goog.require('Blockly.blockRendering.Icon');
 const InlineInput = goog.require('Blockly.blockRendering.InlineInput');
+/* eslint-disable-next-line no-unused-vars */
 const Input = goog.requireType('Blockly.Input');
 const InputRow = goog.require('Blockly.blockRendering.InputRow');
 const InRowSpacer = goog.require('Blockly.blockRendering.InRowSpacer');
 const JaggedEdge = goog.require('Blockly.blockRendering.JaggedEdge');
+/* eslint-disable-next-line no-unused-vars */
 const Measurable = goog.require('Blockly.blockRendering.Measurable');
 const NextConnection = goog.require('Blockly.blockRendering.NextConnection');
 const OutputConnection = goog.require('Blockly.blockRendering.OutputConnection');
 const PreviousConnection = goog.require('Blockly.blockRendering.PreviousConnection');
+/* eslint-disable-next-line no-unused-vars */
 const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
+/* eslint-disable-next-line no-unused-vars */
 const Renderer = goog.requireType('Blockly.blockRendering.Renderer');
+/* eslint-disable-next-line no-unused-vars */
 const RoundCorner = goog.require('Blockly.blockRendering.RoundCorner');
+/* eslint-disable-next-line no-unused-vars */
 const Row = goog.require('Blockly.blockRendering.Row');
 const SpacerRow = goog.require('Blockly.blockRendering.SpacerRow');
 const SquareCorner = goog.require('Blockly.blockRendering.SquareCorner');

From 48ccc38cbb2c45ea34b796cacf338319d6a721c3 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 22 Jul 2021 10:42:56 -0700
Subject: [PATCH 245/833] Fix destructuring

---
 core/menu.js | 58 ++++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/core/menu.js b/core/menu.js
index ac79922cf..083d76e06 100644
--- a/core/menu.js
+++ b/core/menu.js
@@ -15,12 +15,12 @@ goog.module.declareLegacyNamespace();
 
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const MenuItem = goog.requireType('Blockly.MenuItem');
-const Size = goog.requireType('Blockly.utils.Size');
-const {addClass, hasClass, removeClass} = goog.require('Blockly.utils.dom');
-const {Data, conditionalBind, unbind} = goog.require('Blockly.browserEvents');
 const KeyCodes = goog.require('Blockly.utils.KeyCodes');
-const {getSize, scrollIntoContainerView} = goog.require('Blockly.utils.style');
-const {Role, State, setRole, setState} = goog.require('Blockly.utils.aria');
+const Size = goog.requireType('Blockly.utils.Size');
+const aria = goog.require('Blockly.utils.aria');
+const browserEvents = goog.require('Blockly.browserEvents');
+const dom = goog.require('Blockly.utils.dom');
+const style = goog.require('Blockly.utils.style');
 
 
 /**
@@ -56,35 +56,35 @@ const Menu = function() {
 
   /**
    * Mouse over event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.mouseOverHandler_ = null;
 
   /**
    * Click event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.clickHandler_ = null;
 
   /**
    * Mouse enter event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.mouseEnterHandler_ = null;
 
   /**
    * Mouse leave event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.mouseLeaveHandler_ = null;
 
   /**
    * Key down event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onKeyDownHandler_ = null;
@@ -98,7 +98,7 @@ const Menu = function() {
 
   /**
    * ARIA name for this menu.
-   * @type {?Role}
+   * @type {?aria.Role}
    * @private
    */
   this.roleName_ = null;
@@ -124,7 +124,7 @@ Menu.prototype.render = function(container) {
   element.className = 'blocklyMenu goog-menu blocklyNonSelectable';
   element.tabIndex = 0;
   if (this.roleName_) {
-    setRole(element, this.roleName_);
+    aria.setRole(element, this.roleName_);
   }
   this.element_ = element;
 
@@ -135,15 +135,15 @@ Menu.prototype.render = function(container) {
 
   // Add event handlers.
   this.mouseOverHandler_ =
-      conditionalBind(element, 'mouseover', this, this.handleMouseOver_, true);
+      browserEvents.conditionalBind(element, 'mouseover', this, this.handleMouseOver_, true);
   this.clickHandler_ =
-      conditionalBind(element, 'click', this, this.handleClick_, true);
-  this.mouseEnterHandler_ = conditionalBind(
+      browserEvents.conditionalBind(element, 'click', this, this.handleClick_, true);
+  this.mouseEnterHandler_ = browserEvents.conditionalBind(
       element, 'mouseenter', this, this.handleMouseEnter_, true);
-  this.mouseLeaveHandler_ = conditionalBind(
+  this.mouseLeaveHandler_ = browserEvents.conditionalBind(
       element, 'mouseleave', this, this.handleMouseLeave_, true);
   this.onKeyDownHandler_ =
-      conditionalBind(element, 'keydown', this, this.handleKeyEvent_);
+      browserEvents.conditionalBind(element, 'keydown', this, this.handleKeyEvent_);
 
   container.appendChild(element);
 };
@@ -165,7 +165,7 @@ Menu.prototype.focus = function() {
   const el = this.getElement();
   if (el) {
     el.focus({preventScroll: true});
-    addClass(el, 'blocklyFocused');
+    dom.addClass(el, 'blocklyFocused');
   }
 };
 
@@ -177,13 +177,13 @@ Menu.prototype.blur_ = function() {
   const el = this.getElement();
   if (el) {
     el.blur();
-    removeClass(el, 'blocklyFocused');
+    dom.removeClass(el, 'blocklyFocused');
   }
 };
 
 /**
  * Set the menu accessibility role.
- * @param {!Role} roleName role name.
+ * @param {!aria.Role} roleName role name.
  * @package
  */
 Menu.prototype.setRole = function(roleName) {
@@ -196,23 +196,23 @@ Menu.prototype.setRole = function(roleName) {
 Menu.prototype.dispose = function() {
   // Remove event handlers.
   if (this.mouseOverHandler_) {
-    unbind(this.mouseOverHandler_);
+    browserEvents.unbind(this.mouseOverHandler_);
     this.mouseOverHandler_ = null;
   }
   if (this.clickHandler_) {
-    unbind(this.clickHandler_);
+    browserEvents.unbind(this.clickHandler_);
     this.clickHandler_ = null;
   }
   if (this.mouseEnterHandler_) {
-    unbind(this.mouseEnterHandler_);
+    browserEvents.unbind(this.mouseEnterHandler_);
     this.mouseEnterHandler_ = null;
   }
   if (this.mouseLeaveHandler_) {
-    unbind(this.mouseLeaveHandler_);
+    browserEvents.unbind(this.mouseLeaveHandler_);
     this.mouseLeaveHandler_ = null;
   }
   if (this.onKeyDownHandler_) {
-    unbind(this.onKeyDownHandler_);
+    browserEvents.unbind(this.onKeyDownHandler_);
     this.onKeyDownHandler_ = null;
   }
 
@@ -239,7 +239,7 @@ Menu.prototype.getMenuItem_ = function(elem) {
   // Walk up parents until one meets either the menu's root element, or
   // a menu item's div.
   while (elem && elem != menuElem) {
-    if (hasClass(elem, 'blocklyMenuItem')) {
+    if (dom.hasClass(elem, 'blocklyMenuItem')) {
       // Having found a menu item's div, locate that menu item in this menu.
       for (let i = 0, menuItem; (menuItem = this.menuItems_[i]); i++) {
         if (menuItem.getElement() == elem) {
@@ -271,10 +271,10 @@ Menu.prototype.setHighlighted = function(item) {
     // Bring the highlighted item into view. This has no effect if the menu is
     // not scrollable.
     const el = /** @type {!Element} */ (this.getElement());
-    scrollIntoContainerView(
+    style.scrollIntoContainerView(
         /** @type {!Element} */ (item.getElement()), el);
 
-    setState(el, State.ACTIVEDESCENDANT, item.getId());
+    aria.setState(el, aria.State.ACTIVEDESCENDANT, item.getId());
   }
 };
 
@@ -462,7 +462,7 @@ Menu.prototype.handleKeyEvent_ = function(e) {
  */
 Menu.prototype.getSize = function() {
   const menuDom = this.getElement();
-  const menuSize = getSize(/** @type {!Element} */
+  const menuSize = style.getSize(/** @type {!Element} */
                            (menuDom));
   // Recalculate height for the total content, not only box height.
   menuSize.height = menuDom.scrollHeight;

From 380cfd5963d3a2e2e235fcccee3ebd02718e1573 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 11:08:58 -0700
Subject: [PATCH 246/833] Migrate core/flyout_base.js to ES6 const/let

---
 core/flyout_base.js | 144 +++++++++++++++++++++++---------------------
 1 file changed, 74 insertions(+), 70 deletions(-)

diff --git a/core/flyout_base.js b/core/flyout_base.js
index 84d6d3870..3c62ebe51 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -396,7 +396,7 @@ Blockly.Flyout.prototype.isVisible = function() {
  * @param {boolean} visible True if visible.
  */
 Blockly.Flyout.prototype.setVisible = function(visible) {
-  var visibilityChanged = (visible != this.isVisible());
+  const visibilityChanged = (visible != this.isVisible());
 
   this.isVisible_ = visible;
   if (visibilityChanged) {
@@ -414,7 +414,7 @@ Blockly.Flyout.prototype.setVisible = function(visible) {
  * @param {boolean} visible Whether the container is visible.
  */
 Blockly.Flyout.prototype.setContainerVisible = function(visible) {
-  var visibilityChanged = (visible != this.containerVisible_);
+  const visibilityChanged = (visible != this.containerVisible_);
   this.containerVisible_ = visible;
   if (visibilityChanged) {
     this.updateDisplay_();
@@ -427,7 +427,7 @@ Blockly.Flyout.prototype.setContainerVisible = function(visible) {
  * @private
  */
 Blockly.Flyout.prototype.updateDisplay_ = function() {
-  var show = true;
+  let show = true;
   if (!this.containerVisible_) {
     show = false;
   } else {
@@ -453,17 +453,17 @@ Blockly.Flyout.prototype.positionAt_ = function(width, height, x, y) {
   this.workspace_.setCachedParentSvgSize(width, height);
 
   if (this.svgGroup_.tagName == 'svg') {
-    var transform = 'translate(' + x + 'px,' + y + 'px)';
+    const transform = 'translate(' + x + 'px,' + y + 'px)';
     Blockly.utils.dom.setCssTransform(this.svgGroup_, transform);
   } else {
     // IE and Edge don't support CSS transforms on SVG elements so
     // it's important to set the transform on the SVG element itself
-    var transform = 'translate(' + x + ',' + y + ')';
+    const transform = 'translate(' + x + ',' + y + ')';
     this.svgGroup_.setAttribute("transform", transform);
   }
 
   // Update the scrollbar (if one exists).
-  var scrollbar = this.workspace_.scrollbar;
+  const scrollbar = this.workspace_.scrollbar;
   if (scrollbar) {
     // Set the scrollbars origin to be the top left of the flyout.
     scrollbar.setOrigin(x, y);
@@ -491,7 +491,7 @@ Blockly.Flyout.prototype.hide = function() {
   }
   this.setVisible(false);
   // Delete all the event listeners.
-  for (var i = 0, listen; (listen = this.listeners_[i]); i++) {
+  for (let i = 0, listen; (listen = this.listeners_[i]); i++) {
     Blockly.browserEvents.unbind(listen);
   }
   this.listeners_.length = 0;
@@ -521,8 +521,8 @@ Blockly.Flyout.prototype.show = function(flyoutDef) {
   this.setVisible(true);
 
   // Parse the Array, Node or NodeList into a a list of flyout items.
-  var parsedContent = Blockly.utils.toolbox.convertFlyoutDefToJsonArray(flyoutDef);
-  var flyoutInfo =
+  const parsedContent = Blockly.utils.toolbox.convertFlyoutDefToJsonArray(flyoutDef);
+  const flyoutInfo =
     /** @type {{contents:!Array<!Object>, gaps:!Array<number>}} */ (
       this.createFlyoutInfo_(parsedContent));
 
@@ -530,9 +530,9 @@ Blockly.Flyout.prototype.show = function(flyoutDef) {
 
   // IE 11 is an incompetent browser that fails to fire mouseout events.
   // When the mouse is over the background, deselect all blocks.
-  var deselectAll = function() {
-    var topBlocks = this.workspace_.getTopBlocks(false);
-    for (var i = 0, block; (block = topBlocks[i]); i++) {
+  const deselectAll = function() {
+    const topBlocks = this.workspace_.getTopBlocks(false);
+    for (let i = 0, block; (block = topBlocks[i]); i++) {
       block.removeSelect();
     }
   };
@@ -567,50 +567,54 @@ Blockly.Flyout.prototype.show = function(flyoutDef) {
  * @private
  */
 Blockly.Flyout.prototype.createFlyoutInfo_ = function(parsedContent) {
-  var contents = [];
-  var gaps = [];
+  const contents = [];
+  const gaps = [];
   this.permanentlyDisabled_.length = 0;
-  var defaultGap = this.horizontalLayout ? this.GAP_X : this.GAP_Y;
-  for (var i = 0, contentInfo; (contentInfo = parsedContent[i]); i++) {
+  const defaultGap = this.horizontalLayout ? this.GAP_X : this.GAP_Y;
+  for (let i = 0, contentInfo; (contentInfo = parsedContent[i]); i++) {
 
     if (contentInfo['custom']) {
-      var customInfo = /** @type {!Blockly.utils.toolbox.DynamicCategoryInfo} */ (contentInfo);
-      var categoryName = customInfo['custom'];
-      var flyoutDef = this.getDynamicCategoryContents_(categoryName);
-      var parsedDynamicContent = /** @type {!Blockly.utils.toolbox.FlyoutItemInfoArray} */
+      const customInfo = /** @type {!Blockly.utils.toolbox.DynamicCategoryInfo} */ (contentInfo);
+      const categoryName = customInfo['custom'];
+      const flyoutDef = this.getDynamicCategoryContents_(categoryName);
+      const parsedDynamicContent = /** @type {!Blockly.utils.toolbox.FlyoutItemInfoArray} */
         (Blockly.utils.toolbox.convertFlyoutDefToJsonArray(flyoutDef));
       parsedContent.splice.apply(parsedContent, [i, 1].concat(parsedDynamicContent));
       contentInfo = parsedContent[i];
     }
 
     switch (contentInfo['kind'].toUpperCase()) {
-      case 'BLOCK':
-        var blockInfo = /** @type {!Blockly.utils.toolbox.BlockInfo} */ (contentInfo);
-        var blockXml = this.getBlockXml_(blockInfo);
-        var block = this.createBlock_(blockXml);
+      case 'BLOCK': {
+        const blockInfo = /** @type {!Blockly.utils.toolbox.BlockInfo} */ (contentInfo);
+        const blockXml = this.getBlockXml_(blockInfo);
+        const block = this.createBlock_(blockXml);
         // This is a deprecated method for adding gap to a block.
         // <block type="math_arithmetic" gap="8"></block>
-        var gap = parseInt(blockInfo['gap'] || blockXml.getAttribute('gap'), 10);
+        const gap = parseInt(blockInfo['gap'] || blockXml.getAttribute('gap'), 10);
         gaps.push(isNaN(gap) ? defaultGap : gap);
         contents.push({type: 'block', block: block});
         break;
-      case 'SEP':
-        var sepInfo = /** @type {!Blockly.utils.toolbox.SeparatorInfo} */ (contentInfo);
+      }
+      case 'SEP': {
+        const sepInfo = /** @type {!Blockly.utils.toolbox.SeparatorInfo} */ (contentInfo);
         this.addSeparatorGap_(sepInfo, gaps, defaultGap);
         break;
-      case 'LABEL':
-        var labelInfo = /** @type {!Blockly.utils.toolbox.LabelInfo} */ (contentInfo);
+      }
+      case 'LABEL': {
+        const labelInfo = /** @type {!Blockly.utils.toolbox.LabelInfo} */ (contentInfo);
         // A label is a button with different styling.
-        var label = this.createButton_(labelInfo, /** isLabel */ true);
+        const label = this.createButton_(labelInfo, /** isLabel */ true);
         contents.push({type: 'button', button: label});
         gaps.push(defaultGap);
         break;
-      case 'BUTTON':
-        var buttonInfo = /** @type {!Blockly.utils.toolbox.ButtonInfo} */ (contentInfo);
-        var button = this.createButton_(buttonInfo, /** isLabel */ false);
+      }
+      case 'BUTTON': {
+        const buttonInfo = /** @type {!Blockly.utils.toolbox.ButtonInfo} */ (contentInfo);
+        const button = this.createButton_(buttonInfo, /** isLabel */ false);
         contents.push({type: 'button', button: button});
         gaps.push(defaultGap);
         break;
+      }
     }
   }
   return {contents: contents, gaps: gaps};
@@ -625,13 +629,13 @@ Blockly.Flyout.prototype.createFlyoutInfo_ = function(parsedContent) {
 Blockly.Flyout.prototype.getDynamicCategoryContents_ = function(categoryName) {
   // Look up the correct category generation function and call that to get a
   // valid XML list.
-  var fnToApply = this.workspace_.targetWorkspace.getToolboxCategoryCallback(
+  const fnToApply = this.workspace_.targetWorkspace.getToolboxCategoryCallback(
       categoryName);
   if (typeof fnToApply != 'function') {
     throw TypeError('Couldn\'t find a callback function when opening' +
         ' a toolbox category.');
   }
-  var flyoutDef = fnToApply(this.workspace_.targetWorkspace);
+  const flyoutDef = fnToApply(this.workspace_.targetWorkspace);
   if (!Array.isArray(flyoutDef)) {
     throw new TypeError('Result of toolbox category callback must be an array.');
   }
@@ -651,7 +655,7 @@ Blockly.Flyout.prototype.createButton_ = function(btnInfo, isLabel) {
   if (!Blockly.FlyoutButton) {
     throw Error('Missing require for Blockly.FlyoutButton');
   }
-  var curButton = new Blockly.FlyoutButton(this.workspace_,
+  const curButton = new Blockly.FlyoutButton(this.workspace_,
       /** @type {!Blockly.WorkspaceSvg} */ (this.targetWorkspace), btnInfo,
       isLabel);
   return curButton;
@@ -665,7 +669,7 @@ Blockly.Flyout.prototype.createButton_ = function(btnInfo, isLabel) {
  * @protected
  */
 Blockly.Flyout.prototype.createBlock_ = function(blockXml) {
-  var curBlock = /** @type {!Blockly.BlockSvg} */ (
+  const curBlock = /** @type {!Blockly.BlockSvg} */ (
     Blockly.Xml.domToBlock(blockXml, this.workspace_));
   if (!curBlock.isEnabled()) {
     // Record blocks that were initially disabled.
@@ -684,8 +688,8 @@ Blockly.Flyout.prototype.createBlock_ = function(blockXml) {
  * @private
  */
 Blockly.Flyout.prototype.getBlockXml_ = function(blockInfo) {
-  var blockElement = null;
-  var blockXml = blockInfo['blockxml'];
+  let blockElement = null;
+  const blockXml = blockInfo['blockxml'];
 
   if (blockXml && typeof blockXml != 'string') {
     blockElement = blockXml;
@@ -718,7 +722,7 @@ Blockly.Flyout.prototype.addSeparatorGap_ = function(sepInfo, gaps, defaultGap)
   // <sep gap="36"></sep>
   // The default gap is 24, can be set larger or smaller.
   // This overwrites the gap attribute on the previous element.
-  var newGap = parseInt(sepInfo['gap'], 10);
+  const newGap = parseInt(sepInfo['gap'], 10);
   // Ignore gaps before the first block.
   if (!isNaN(newGap) && gaps.length > 0) {
     gaps[gaps.length - 1] = newGap;
@@ -733,15 +737,15 @@ Blockly.Flyout.prototype.addSeparatorGap_ = function(sepInfo, gaps, defaultGap)
  */
 Blockly.Flyout.prototype.clearOldBlocks_ = function() {
   // Delete any blocks from a previous showing.
-  var oldBlocks = this.workspace_.getTopBlocks(false);
-  for (var i = 0, block; (block = oldBlocks[i]); i++) {
+  const oldBlocks = this.workspace_.getTopBlocks(false);
+  for (let i = 0, block; (block = oldBlocks[i]); i++) {
     if (block.workspace == this.workspace_) {
       block.dispose(false, false);
     }
   }
   // Delete any mats from a previous showing.
-  for (var j = 0; j < this.mats_.length; j++) {
-    var rect = this.mats_[j];
+  for (let j = 0; j < this.mats_.length; j++) {
+    const rect = this.mats_[j];
     if (rect) {
       Blockly.Tooltip.unbindMouseEvents(rect);
       Blockly.utils.dom.removeNode(rect);
@@ -749,7 +753,7 @@ Blockly.Flyout.prototype.clearOldBlocks_ = function() {
   }
   this.mats_.length = 0;
   // Delete any buttons from a previous showing.
-  for (var i = 0, button; (button = this.buttons_[i]); i++) {
+  for (let i = 0, button; (button = this.buttons_[i]); i++) {
     button.dispose();
   }
   this.buttons_.length = 0;
@@ -788,9 +792,9 @@ Blockly.Flyout.prototype.addBlockListeners_ = function(root, block, rect) {
  * @private
  */
 Blockly.Flyout.prototype.blockMouseDown_ = function(block) {
-  var flyout = this;
+  const flyout = this;
   return function(e) {
-    var gesture = flyout.targetWorkspace.getGesture(e);
+    const gesture = flyout.targetWorkspace.getGesture(e);
     if (gesture) {
       gesture.setStartBlock(block);
       gesture.handleFlyoutStart(e, flyout);
@@ -804,7 +808,7 @@ Blockly.Flyout.prototype.blockMouseDown_ = function(block) {
  * @private
  */
 Blockly.Flyout.prototype.onMouseDown_ = function(e) {
-  var gesture = this.targetWorkspace.getGesture(e);
+  const gesture = this.targetWorkspace.getGesture(e);
   if (gesture) {
     gesture.handleFlyoutStart(e, this);
   }
@@ -830,9 +834,9 @@ Blockly.Flyout.prototype.isBlockCreatable_ = function(block) {
  * @package
  */
 Blockly.Flyout.prototype.createBlock = function(originalBlock) {
-  var newBlock = null;
+  let newBlock = null;
   Blockly.Events.disable();
-  var variablesBeforeCreation = this.targetWorkspace.getAllVariables();
+  const variablesBeforeCreation = this.targetWorkspace.getAllVariables();
   this.targetWorkspace.setResizesEnabled(false);
   try {
     newBlock = this.placeNewBlock_(originalBlock);
@@ -843,14 +847,14 @@ Blockly.Flyout.prototype.createBlock = function(originalBlock) {
   // Close the flyout.
   Blockly.hideChaff();
 
-  var newVariables = Blockly.Variables.getAddedVariables(this.targetWorkspace,
+  const newVariables = Blockly.Variables.getAddedVariables(this.targetWorkspace,
       variablesBeforeCreation);
 
   if (Blockly.Events.isEnabled()) {
     Blockly.Events.setGroup(true);
     // Fire a VarCreate event for each (if any) new variable created.
-    for (var i = 0; i < newVariables.length; i++) {
-      var thisVariable = newVariables[i];
+    for (let i = 0; i < newVariables.length; i++) {
+      const thisVariable = newVariables[i];
       Blockly.Events.fire(
           new (Blockly.Events.get(Blockly.Events.VAR_CREATE))(thisVariable));
     }
@@ -877,7 +881,7 @@ Blockly.Flyout.prototype.createBlock = function(originalBlock) {
  * @protected
  */
 Blockly.Flyout.prototype.initFlyoutButton_ = function(button, x, y) {
-  var buttonSvg = button.createDom();
+  const buttonSvg = button.createDom();
   button.moveTo(x, y);
   button.show();
   // Clicking on a flyout button or label is a lot like clicking on the
@@ -904,7 +908,7 @@ Blockly.Flyout.prototype.initFlyoutButton_ = function(button, x, y) {
 Blockly.Flyout.prototype.createRect_ = function(block, x, y, blockHW, index) {
   // Create an invisible rectangle under the block to act as a button.  Just
   // using the block as a button is poor, since blocks have holes in them.
-  var rect = Blockly.utils.dom.createSvgElement(
+  const rect = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.RECT,
       {
         'fill-opacity': 0,
@@ -931,11 +935,11 @@ Blockly.Flyout.prototype.createRect_ = function(block, x, y, blockHW, index) {
  * @protected
  */
 Blockly.Flyout.prototype.moveRectToBlock_ = function(rect, block) {
-  var blockHW = block.getHeightWidth();
+  const blockHW = block.getHeightWidth();
   rect.setAttribute('width', blockHW.width);
   rect.setAttribute('height', blockHW.height);
 
-  var blockXY = block.getRelativeToSurfaceXY();
+  const blockXY = block.getRelativeToSurfaceXY();
   rect.setAttribute('y', blockXY.y);
   rect.setAttribute('x', this.RTL ? blockXY.x - blockHW.width : blockXY.x);
 };
@@ -947,10 +951,10 @@ Blockly.Flyout.prototype.moveRectToBlock_ = function(rect, block) {
  * @private
  */
 Blockly.Flyout.prototype.filterForCapacity_ = function() {
-  var blocks = this.workspace_.getTopBlocks(false);
-  for (var i = 0, block; (block = blocks[i]); i++) {
+  const blocks = this.workspace_.getTopBlocks(false);
+  for (let i = 0, block; (block = blocks[i]); i++) {
     if (this.permanentlyDisabled_.indexOf(block) == -1) {
-      var enable = this.targetWorkspace
+      const enable = this.targetWorkspace
           .isCapacityAvailable(Blockly.utils.getBlockTypeCounts(block));
       while (block) {
         block.setEnabled(enable);
@@ -990,50 +994,50 @@ Blockly.Flyout.prototype.isScrollable = function() {
  * @private
  */
 Blockly.Flyout.prototype.placeNewBlock_ = function(oldBlock) {
-  var targetWorkspace = this.targetWorkspace;
-  var svgRootOld = oldBlock.getSvgRoot();
+  const targetWorkspace = this.targetWorkspace;
+  const svgRootOld = oldBlock.getSvgRoot();
   if (!svgRootOld) {
     throw Error('oldBlock is not rendered.');
   }
 
   // Create the new block by cloning the block in the flyout (via XML).
   // This cast assumes that the oldBlock can not be an insertion marker.
-  var xml = /** @type {!Element} */ (Blockly.Xml.blockToDom(oldBlock, true));
+  const xml = /** @type {!Element} */ (Blockly.Xml.blockToDom(oldBlock, true));
   // The target workspace would normally resize during domToBlock, which will
   // lead to weird jumps.  Save it for terminateDrag.
   targetWorkspace.setResizesEnabled(false);
 
   // Using domToBlock instead of domToWorkspace means that the new block will be
   // placed at position (0, 0) in main workspace units.
-  var block = /** @type {!Blockly.BlockSvg} */
+  const block = /** @type {!Blockly.BlockSvg} */
       (Blockly.Xml.domToBlock(xml, targetWorkspace));
-  var svgRootNew = block.getSvgRoot();
+  const svgRootNew = block.getSvgRoot();
   if (!svgRootNew) {
     throw Error('block is not rendered.');
   }
 
   // The offset in pixels between the main workspace's origin and the upper left
   // corner of the injection div.
-  var mainOffsetPixels = targetWorkspace.getOriginOffsetInPixels();
+  const mainOffsetPixels = targetWorkspace.getOriginOffsetInPixels();
 
   // The offset in pixels between the flyout workspace's origin and the upper
   // left corner of the injection div.
-  var flyoutOffsetPixels = this.workspace_.getOriginOffsetInPixels();
+  const flyoutOffsetPixels = this.workspace_.getOriginOffsetInPixels();
 
   // The position of the old block in flyout workspace coordinates.
-  var oldBlockPos = oldBlock.getRelativeToSurfaceXY();
+  const oldBlockPos = oldBlock.getRelativeToSurfaceXY();
   // The position of the old block in pixels relative to the flyout
   // workspace's origin.
   oldBlockPos.scale(this.workspace_.scale);
 
   // The position of the old block in pixels relative to the upper left corner
   // of the injection div.
-  var oldBlockOffsetPixels = Blockly.utils.Coordinate.sum(flyoutOffsetPixels,
+  const oldBlockOffsetPixels = Blockly.utils.Coordinate.sum(flyoutOffsetPixels,
       oldBlockPos);
 
   // The position of the old block in pixels relative to the origin of the
   // main workspace.
-  var finalOffset = Blockly.utils.Coordinate.difference(oldBlockOffsetPixels,
+  const finalOffset = Blockly.utils.Coordinate.difference(oldBlockOffsetPixels,
       mainOffsetPixels);
   // The position of the old block in main workspace coordinates.
   finalOffset.scale(1 / targetWorkspace.scale);

From 3df8c32594b6583a3f692f16952ea4dc254a83ce Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 11:11:27 -0700
Subject: [PATCH 247/833] Migrate core/flyout_base.js to goog.module

---
 core/flyout_base.js | 117 +++++++++++++++++++++++---------------------
 tests/deps.js       |   2 +-
 2 files changed, 61 insertions(+), 58 deletions(-)

diff --git a/core/flyout_base.js b/core/flyout_base.js
index 3c62ebe51..18a3ab909 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Flyout');
+goog.module('Blockly.Flyout');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Block');
 /** @suppress {extraRequire} */
@@ -55,8 +56,8 @@ goog.requireType('Blockly.utils.Rect');
  * @implements {Blockly.IFlyout}
  * @extends {Blockly.DeleteArea}
  */
-Blockly.Flyout = function(workspaceOptions) {
-  Blockly.Flyout.superClass_.constructor.call(this);
+const Flyout = function(workspaceOptions) {
+  Flyout.superClass_.constructor.call(this);
   workspaceOptions.setMetrics = this.setMetrics_.bind(this);
 
   /**
@@ -149,41 +150,41 @@ Blockly.Flyout = function(workspaceOptions) {
    */
   this.targetWorkspace = null;
 };
-Blockly.utils.object.inherits(Blockly.Flyout, Blockly.DeleteArea);
+Blockly.utils.object.inherits(Flyout, Blockly.DeleteArea);
 
 /**
  * Does the flyout automatically close when a block is created?
  * @type {boolean}
  */
-Blockly.Flyout.prototype.autoClose = true;
+Flyout.prototype.autoClose = true;
 
 /**
  * Whether the flyout is visible.
  * @type {boolean}
  * @private
  */
-Blockly.Flyout.prototype.isVisible_ = false;
+Flyout.prototype.isVisible_ = false;
 
 /**
  * Whether the workspace containing this flyout is visible.
  * @type {boolean}
  * @private
  */
-Blockly.Flyout.prototype.containerVisible_ = true;
+Flyout.prototype.containerVisible_ = true;
 
 /**
  * Corner radius of the flyout background.
  * @type {number}
  * @const
  */
-Blockly.Flyout.prototype.CORNER_RADIUS = 8;
+Flyout.prototype.CORNER_RADIUS = 8;
 
 /**
  * Margin around the edges of the blocks in the flyout.
  * @type {number}
  * @const
  */
-Blockly.Flyout.prototype.MARGIN = Blockly.Flyout.prototype.CORNER_RADIUS;
+Flyout.prototype.MARGIN = Flyout.prototype.CORNER_RADIUS;
 
 // TODO: Move GAP_X and GAP_Y to their appropriate files.
 
@@ -192,35 +193,35 @@ Blockly.Flyout.prototype.MARGIN = Blockly.Flyout.prototype.CORNER_RADIUS;
  * element.
  * @const {number}
  */
-Blockly.Flyout.prototype.GAP_X = Blockly.Flyout.prototype.MARGIN * 3;
+Flyout.prototype.GAP_X = Flyout.prototype.MARGIN * 3;
 
 /**
  * Gap between items in vertical flyouts. Can be overridden with the "sep"
  * element.
  * @const {number}
  */
-Blockly.Flyout.prototype.GAP_Y = Blockly.Flyout.prototype.MARGIN * 3;
+Flyout.prototype.GAP_Y = Flyout.prototype.MARGIN * 3;
 
 /**
  * Top/bottom padding between scrollbar and edge of flyout background.
  * @type {number}
  * @const
  */
-Blockly.Flyout.prototype.SCROLLBAR_MARGIN = 2.5;
+Flyout.prototype.SCROLLBAR_MARGIN = 2.5;
 
 /**
  * Width of flyout.
  * @type {number}
  * @protected
  */
-Blockly.Flyout.prototype.width_ = 0;
+Flyout.prototype.width_ = 0;
 
 /**
  * Height of flyout.
  * @type {number}
  * @protected
  */
-Blockly.Flyout.prototype.height_ = 0;
+Flyout.prototype.height_ = 0;
 
 /**
  * Range of a drag angle from a flyout considered "dragging toward workspace".
@@ -238,7 +239,7 @@ Blockly.Flyout.prototype.height_ = 0;
  * @type {number}
  * @protected
 */
-Blockly.Flyout.prototype.dragAngleRange_ = 70;
+Flyout.prototype.dragAngleRange_ = 70;
 
 /**
  * Creates the flyout's DOM.  Only needs to be called once.  The flyout can
@@ -250,7 +251,7 @@ Blockly.Flyout.prototype.dragAngleRange_ = 70;
  *     put the flyout in. This should be <svg> or <g>.
  * @return {!SVGElement} The flyout's SVG group.
  */
-Blockly.Flyout.prototype.createDom = function(tagName) {
+Flyout.prototype.createDom = function(tagName) {
   /*
   <svg | g>
     <path class="blocklyFlyoutBackground"/>
@@ -277,7 +278,7 @@ Blockly.Flyout.prototype.createDom = function(tagName) {
  * @param {!Blockly.WorkspaceSvg} targetWorkspace The workspace in which to
  *     create new blocks.
  */
-Blockly.Flyout.prototype.init = function(targetWorkspace) {
+Flyout.prototype.init = function(targetWorkspace) {
   this.targetWorkspace = targetWorkspace;
   this.workspace_.targetWorkspace = targetWorkspace;
 
@@ -326,7 +327,7 @@ Blockly.Flyout.prototype.init = function(targetWorkspace) {
  * Unlink from all DOM elements to prevent memory leaks.
  * @suppress {checkTypes}
  */
-Blockly.Flyout.prototype.dispose = function() {
+Flyout.prototype.dispose = function() {
   this.hide();
   this.workspace_.getComponentManager().removeComponent(this.id);
   Blockly.browserEvents.unbind(this.eventWrappers_);
@@ -352,7 +353,7 @@ Blockly.Flyout.prototype.dispose = function() {
  * Get the width of the flyout.
  * @return {number} The width of the flyout.
  */
-Blockly.Flyout.prototype.getWidth = function() {
+Flyout.prototype.getWidth = function() {
   return this.width_;
 };
 
@@ -360,7 +361,7 @@ Blockly.Flyout.prototype.getWidth = function() {
  * Get the height of the flyout.
  * @return {number} The width of the flyout.
  */
-Blockly.Flyout.prototype.getHeight = function() {
+Flyout.prototype.getHeight = function() {
   return this.height_;
 };
 
@@ -369,7 +370,7 @@ Blockly.Flyout.prototype.getHeight = function() {
  * this matches the target workspace scale, but this can be overridden.
  * @return {number} Flyout workspace scale.
  */
-Blockly.Flyout.prototype.getFlyoutScale = function() {
+Flyout.prototype.getFlyoutScale = function() {
   return this.targetWorkspace.scale;
 };
 
@@ -378,7 +379,7 @@ Blockly.Flyout.prototype.getFlyoutScale = function() {
  * @return {!Blockly.WorkspaceSvg} The workspace inside the flyout.
  * @package
  */
-Blockly.Flyout.prototype.getWorkspace = function() {
+Flyout.prototype.getWorkspace = function() {
   return this.workspace_;
 };
 
@@ -386,7 +387,7 @@ Blockly.Flyout.prototype.getWorkspace = function() {
  * Is the flyout visible?
  * @return {boolean} True if visible.
  */
-Blockly.Flyout.prototype.isVisible = function() {
+Flyout.prototype.isVisible = function() {
   return this.isVisible_;
 };
 
@@ -395,7 +396,7 @@ Blockly.Flyout.prototype.isVisible = function() {
  * that the flyout is shown. It could be hidden because its container is hidden.
  * @param {boolean} visible True if visible.
  */
-Blockly.Flyout.prototype.setVisible = function(visible) {
+Flyout.prototype.setVisible = function(visible) {
   const visibilityChanged = (visible != this.isVisible());
 
   this.isVisible_ = visible;
@@ -413,7 +414,7 @@ Blockly.Flyout.prototype.setVisible = function(visible) {
  * Set whether this flyout's container is visible.
  * @param {boolean} visible Whether the container is visible.
  */
-Blockly.Flyout.prototype.setContainerVisible = function(visible) {
+Flyout.prototype.setContainerVisible = function(visible) {
   const visibilityChanged = (visible != this.containerVisible_);
   this.containerVisible_ = visible;
   if (visibilityChanged) {
@@ -426,7 +427,7 @@ Blockly.Flyout.prototype.setContainerVisible = function(visible) {
  * be visible and whether its containing workspace is visible.
  * @private
  */
-Blockly.Flyout.prototype.updateDisplay_ = function() {
+Flyout.prototype.updateDisplay_ = function() {
   let show = true;
   if (!this.containerVisible_) {
     show = false;
@@ -447,7 +448,7 @@ Blockly.Flyout.prototype.updateDisplay_ = function() {
  * @param {number} y The computed y origin of the flyout's SVG group.
  * @protected
  */
-Blockly.Flyout.prototype.positionAt_ = function(width, height, x, y) {
+Flyout.prototype.positionAt_ = function(width, height, x, y) {
   this.svgGroup_.setAttribute("width", width);
   this.svgGroup_.setAttribute("height", height);
   this.workspace_.setCachedParentSvgSize(width, height);
@@ -485,7 +486,7 @@ Blockly.Flyout.prototype.positionAt_ = function(width, height, x, y) {
 /**
  * Hide and empty the flyout.
  */
-Blockly.Flyout.prototype.hide = function() {
+Flyout.prototype.hide = function() {
   if (!this.isVisible()) {
     return;
   }
@@ -509,7 +510,7 @@ Blockly.Flyout.prototype.hide = function() {
  *     in the flyout. This is either an array of Nodes, a NodeList, a
  *     toolbox definition, or a string with the name of the dynamic category.
  */
-Blockly.Flyout.prototype.show = function(flyoutDef) {
+Flyout.prototype.show = function(flyoutDef) {
   this.workspace_.setResizesEnabled(false);
   this.hide();
   this.clearOldBlocks_();
@@ -566,7 +567,7 @@ Blockly.Flyout.prototype.show = function(flyoutDef) {
  *     and gaps needed to lay out the flyout.
  * @private
  */
-Blockly.Flyout.prototype.createFlyoutInfo_ = function(parsedContent) {
+Flyout.prototype.createFlyoutInfo_ = function(parsedContent) {
   const contents = [];
   const gaps = [];
   this.permanentlyDisabled_.length = 0;
@@ -626,7 +627,7 @@ Blockly.Flyout.prototype.createFlyoutInfo_ = function(parsedContent) {
  * @return {!Array<!Element>} The array of flyout items.
  * @private
  */
-Blockly.Flyout.prototype.getDynamicCategoryContents_ = function(categoryName) {
+Flyout.prototype.getDynamicCategoryContents_ = function(categoryName) {
   // Look up the correct category generation function and call that to get a
   // valid XML list.
   const fnToApply = this.workspace_.targetWorkspace.getToolboxCategoryCallback(
@@ -651,7 +652,7 @@ Blockly.Flyout.prototype.getDynamicCategoryContents_ = function(categoryName) {
  *    flyout.
  * @private
  */
-Blockly.Flyout.prototype.createButton_ = function(btnInfo, isLabel) {
+Flyout.prototype.createButton_ = function(btnInfo, isLabel) {
   if (!Blockly.FlyoutButton) {
     throw Error('Missing require for Blockly.FlyoutButton');
   }
@@ -668,7 +669,7 @@ Blockly.Flyout.prototype.createButton_ = function(btnInfo, isLabel) {
  * @return {!Blockly.BlockSvg} The block created from the blockXml.
  * @protected
  */
-Blockly.Flyout.prototype.createBlock_ = function(blockXml) {
+Flyout.prototype.createBlock_ = function(blockXml) {
   const curBlock = /** @type {!Blockly.BlockSvg} */ (
     Blockly.Xml.domToBlock(blockXml, this.workspace_));
   if (!curBlock.isEnabled()) {
@@ -687,7 +688,7 @@ Blockly.Flyout.prototype.createBlock_ = function(blockXml) {
  * @throws {Error} if the xml is not a valid block definition.
  * @private
  */
-Blockly.Flyout.prototype.getBlockXml_ = function(blockInfo) {
+Flyout.prototype.getBlockXml_ = function(blockInfo) {
   let blockElement = null;
   const blockXml = blockInfo['blockxml'];
 
@@ -717,7 +718,7 @@ Blockly.Flyout.prototype.getBlockXml_ = function(blockInfo) {
  * @param {number} defaultGap The default gap between the button and next element.
  * @private
  */
-Blockly.Flyout.prototype.addSeparatorGap_ = function(sepInfo, gaps, defaultGap) {
+Flyout.prototype.addSeparatorGap_ = function(sepInfo, gaps, defaultGap) {
   // Change the gap between two toolbox elements.
   // <sep gap="36"></sep>
   // The default gap is 24, can be set larger or smaller.
@@ -735,7 +736,7 @@ Blockly.Flyout.prototype.addSeparatorGap_ = function(sepInfo, gaps, defaultGap)
  * Delete blocks, mats and buttons from a previous showing of the flyout.
  * @protected
  */
-Blockly.Flyout.prototype.clearOldBlocks_ = function() {
+Flyout.prototype.clearOldBlocks_ = function() {
   // Delete any blocks from a previous showing.
   const oldBlocks = this.workspace_.getTopBlocks(false);
   for (let i = 0, block; (block = oldBlocks[i]); i++) {
@@ -770,7 +771,7 @@ Blockly.Flyout.prototype.clearOldBlocks_ = function() {
  *     as a mat for that block.
  * @protected
  */
-Blockly.Flyout.prototype.addBlockListeners_ = function(root, block, rect) {
+Flyout.prototype.addBlockListeners_ = function(root, block, rect) {
   this.listeners_.push(Blockly.browserEvents.conditionalBind(
       root, 'mousedown', null, this.blockMouseDown_(block)));
   this.listeners_.push(Blockly.browserEvents.conditionalBind(
@@ -791,7 +792,7 @@ Blockly.Flyout.prototype.addBlockListeners_ = function(root, block, rect) {
  * @return {!Function} Function to call when block is clicked.
  * @private
  */
-Blockly.Flyout.prototype.blockMouseDown_ = function(block) {
+Flyout.prototype.blockMouseDown_ = function(block) {
   const flyout = this;
   return function(e) {
     const gesture = flyout.targetWorkspace.getGesture(e);
@@ -807,7 +808,7 @@ Blockly.Flyout.prototype.blockMouseDown_ = function(block) {
  * @param {!Event} e Mouse down event.
  * @private
  */
-Blockly.Flyout.prototype.onMouseDown_ = function(e) {
+Flyout.prototype.onMouseDown_ = function(e) {
   const gesture = this.targetWorkspace.getGesture(e);
   if (gesture) {
     gesture.handleFlyoutStart(e, this);
@@ -822,7 +823,7 @@ Blockly.Flyout.prototype.onMouseDown_ = function(e) {
  *    otherwise.
  * @package
  */
-Blockly.Flyout.prototype.isBlockCreatable_ = function(block) {
+Flyout.prototype.isBlockCreatable_ = function(block) {
   return block.isEnabled();
 };
 
@@ -833,7 +834,7 @@ Blockly.Flyout.prototype.isBlockCreatable_ = function(block) {
  * @throws {Error} if something went wrong with deserialization.
  * @package
  */
-Blockly.Flyout.prototype.createBlock = function(originalBlock) {
+Flyout.prototype.createBlock = function(originalBlock) {
   let newBlock = null;
   Blockly.Events.disable();
   const variablesBeforeCreation = this.targetWorkspace.getAllVariables();
@@ -880,7 +881,7 @@ Blockly.Flyout.prototype.createBlock = function(originalBlock) {
  * @param {number} y The y position of the cursor during this layout pass.
  * @protected
  */
-Blockly.Flyout.prototype.initFlyoutButton_ = function(button, x, y) {
+Flyout.prototype.initFlyoutButton_ = function(button, x, y) {
   const buttonSvg = button.createDom();
   button.moveTo(x, y);
   button.show();
@@ -905,7 +906,7 @@ Blockly.Flyout.prototype.initFlyoutButton_ = function(button, x, y) {
  *     block.
  * @protected
  */
-Blockly.Flyout.prototype.createRect_ = function(block, x, y, blockHW, index) {
+Flyout.prototype.createRect_ = function(block, x, y, blockHW, index) {
   // Create an invisible rectangle under the block to act as a button.  Just
   // using the block as a button is poor, since blocks have holes in them.
   const rect = Blockly.utils.dom.createSvgElement(
@@ -934,7 +935,7 @@ Blockly.Flyout.prototype.createRect_ = function(block, x, y, blockHW, index) {
  * @param {!Blockly.BlockSvg} block The block the rectangle should be behind.
  * @protected
  */
-Blockly.Flyout.prototype.moveRectToBlock_ = function(rect, block) {
+Flyout.prototype.moveRectToBlock_ = function(rect, block) {
   const blockHW = block.getHeightWidth();
   rect.setAttribute('width', blockHW.width);
   rect.setAttribute('height', blockHW.height);
@@ -950,7 +951,7 @@ Blockly.Flyout.prototype.moveRectToBlock_ = function(rect, block) {
  * the workspace, an "a + b" block that has two shadow blocks would be disabled.
  * @private
  */
-Blockly.Flyout.prototype.filterForCapacity_ = function() {
+Flyout.prototype.filterForCapacity_ = function() {
   const blocks = this.workspace_.getTopBlocks(false);
   for (let i = 0, block; (block = blocks[i]); i++) {
     if (this.permanentlyDisabled_.indexOf(block) == -1) {
@@ -967,7 +968,7 @@ Blockly.Flyout.prototype.filterForCapacity_ = function() {
 /**
  * Reflow blocks and their mats.
  */
-Blockly.Flyout.prototype.reflow = function() {
+Flyout.prototype.reflow = function() {
   if (this.reflowWrapper_) {
     this.workspace_.removeChangeListener(this.reflowWrapper_);
   }
@@ -982,7 +983,7 @@ Blockly.Flyout.prototype.reflow = function() {
  *     dragging.
  * @package
  */
-Blockly.Flyout.prototype.isScrollable = function() {
+Flyout.prototype.isScrollable = function() {
   return this.workspace_.scrollbar ?
       this.workspace_.scrollbar.isVisible() : false;
 };
@@ -993,7 +994,7 @@ Blockly.Flyout.prototype.isScrollable = function() {
  * @return {!Blockly.BlockSvg} The new block in the main workspace.
  * @private
  */
-Blockly.Flyout.prototype.placeNewBlock_ = function(oldBlock) {
+Flyout.prototype.placeNewBlock_ = function(oldBlock) {
   const targetWorkspace = this.targetWorkspace;
   const svgRootOld = oldBlock.getSvgRoot();
   if (!svgRootOld) {
@@ -1051,13 +1052,13 @@ Blockly.Flyout.prototype.placeNewBlock_ = function(oldBlock) {
  * relative to viewport.
  * @return {Blockly.utils.Rect} The component's bounding box.
  */
-Blockly.Flyout.prototype.getClientRect;
+Flyout.prototype.getClientRect;
 
 /**
  * Position the flyout.
  * @return {void}
  */
-Blockly.Flyout.prototype.position;
+Flyout.prototype.position;
 
 /**
  * Determine if a drag delta is toward the workspace, based on the position
@@ -1068,7 +1069,7 @@ Blockly.Flyout.prototype.position;
  * @return {boolean} True if the drag is toward the workspace.
  * @package
  */
-Blockly.Flyout.prototype.isDragTowardWorkspace;
+Flyout.prototype.isDragTowardWorkspace;
 
 /**
  * Sets the translation of the flyout to match the scrollbars.
@@ -1077,7 +1078,7 @@ Blockly.Flyout.prototype.isDragTowardWorkspace;
  *     similar x property.
  * @protected
  */
-Blockly.Flyout.prototype.setMetrics_;
+Flyout.prototype.setMetrics_;
 
 /**
  * Lay out the blocks in the flyout.
@@ -1085,14 +1086,14 @@ Blockly.Flyout.prototype.setMetrics_;
  * @param {!Array<number>} gaps The visible gaps between blocks.
  * @protected
  */
-Blockly.Flyout.prototype.layout_;
+Flyout.prototype.layout_;
 
 /**
  * Scroll the flyout.
  * @param {!Event} e Mouse wheel scroll event.
  * @protected
  */
-Blockly.Flyout.prototype.wheel_;
+Flyout.prototype.wheel_;
 
 /**
  * Compute height of flyout.  Position mat under each block.
@@ -1100,16 +1101,18 @@ Blockly.Flyout.prototype.wheel_;
  * @return {void}
  * @protected
  */
-Blockly.Flyout.prototype.reflowInternal_;
+Flyout.prototype.reflowInternal_;
 
 /**
  * Calculates the x coordinate for the flyout position.
  * @return {number} X coordinate.
  */
-Blockly.Flyout.prototype.getX;
+Flyout.prototype.getX;
 
 /**
  * Calculates the y coordinate for the flyout position.
  * @return {number} Y coordinate.
  */
-Blockly.Flyout.prototype.getY;
+Flyout.prototype.getY;
+
+exports = Flyout;
diff --git a/tests/deps.js b/tests/deps.js
index da56c39f2..f9a77b67a 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -61,7 +61,7 @@ goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Bloc
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry']);
 goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object']);
-goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
+goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es5'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);

From c5694ba711ba14e43a7bf9906d9bcde94b05c99b Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 11:26:32 -0700
Subject: [PATCH 248/833] Migrate core/flyout_base.js named requires

---
 core/flyout_base.js | 228 ++++++++++++++++++++++----------------------
 tests/deps.js       |   2 +-
 2 files changed, 117 insertions(+), 113 deletions(-)

diff --git a/core/flyout_base.js b/core/flyout_base.js
index 18a3ab909..42e4d0966 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -13,60 +13,64 @@
 goog.module('Blockly.Flyout');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.require('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const ComponentManager = goog.require('Blockly.ComponentManager');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const DeleteArea = goog.require('Blockly.DeleteArea');
+const Events = goog.require('Blockly.Events');
+const FlyoutButton = goog.require('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 browserEvents = goog.require('Blockly.browserEvents');
+const dom = goog.require('Blockly.utils.dom');
+const toolbox = goog.require('Blockly.utils.toolbox');
+const utils = goog.require('Blockly.utils');
+const utilsXml = goog.require('Blockly.utils.xml');
+const {hideChaff} = goog.require('Blockly');
 /** @suppress {extraRequire} */
 goog.require('Blockly.blockRendering');
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.ComponentManager');
-goog.require('Blockly.DeleteArea');
-goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.VarCreate');
-goog.require('Blockly.FlyoutMetricsManager');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Gesture');
-goog.require('Blockly.IFlyout');
-goog.require('Blockly.ScrollbarPair');
-goog.require('Blockly.Tooltip');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Touch');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.toolbox');
-goog.require('Blockly.utils.xml');
-goog.require('Blockly.WorkspaceSvg');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.FlyoutButton');
-goog.requireType('Blockly.Options');
-goog.requireType('Blockly.utils.Rect');
 
 
 /**
  * Class for a flyout.
- * @param {!Blockly.Options} workspaceOptions Dictionary of options for the
+ * @param {!Options} workspaceOptions Dictionary of options for the
  *     workspace.
  * @constructor
  * @abstract
- * @implements {Blockly.IFlyout}
- * @extends {Blockly.DeleteArea}
+ * @implements {IFlyout}
+ * @extends {DeleteArea}
  */
 const Flyout = function(workspaceOptions) {
   Flyout.superClass_.constructor.call(this);
   workspaceOptions.setMetrics = this.setMetrics_.bind(this);
 
   /**
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @protected
    */
-  this.workspace_ = new Blockly.WorkspaceSvg(workspaceOptions);
+  this.workspace_ = new WorkspaceSvg(workspaceOptions);
   this.workspace_.setMetricsManager(
-      new Blockly.FlyoutMetricsManager(this.workspace_, this));
+      new FlyoutMetricsManager(this.workspace_, this));
 
   this.workspace_.isFlyout = true;
   // Keep the workspace visibility consistent with the flyout's visibility.
@@ -77,7 +81,7 @@ const Flyout = function(workspaceOptions) {
    * ComponentManager.
    * @type {string}
    */
-  this.id = Blockly.utils.genUid();
+  this.id = utils.genUid();
 
   /**
    * Is RTL vs LTR.
@@ -116,7 +120,7 @@ const Flyout = function(workspaceOptions) {
 
   /**
    * List of visible buttons.
-   * @type {!Array<!Blockly.FlyoutButton>}
+   * @type {!Array<!FlyoutButton>}
    * @protected
    */
   this.buttons_ = [];
@@ -130,7 +134,7 @@ const Flyout = function(workspaceOptions) {
 
   /**
    * List of blocks that should always be disabled.
-   * @type {!Array<!Blockly.Block>}
+   * @type {!Array<!Block>}
    * @private
    */
   this.permanentlyDisabled_ = [];
@@ -145,12 +149,12 @@ const Flyout = function(workspaceOptions) {
 
   /**
    * The target workspace
-   * @type {?Blockly.WorkspaceSvg}
+   * @type {?WorkspaceSvg}
    * @package
    */
   this.targetWorkspace = null;
 };
-Blockly.utils.object.inherits(Flyout, Blockly.DeleteArea);
+utils.object.inherits(Flyout, DeleteArea);
 
 /**
  * Does the flyout automatically close when a block is created?
@@ -246,8 +250,8 @@ Flyout.prototype.dragAngleRange_ = 70;
  * either exist as its own SVG element or be a g element nested inside a
  * separate SVG element.
  * @param {string|
- * !Blockly.utils.Svg<!SVGSVGElement>|
- * !Blockly.utils.Svg<!SVGGElement>} tagName The type of tag to
+ * !Svg<!SVGSVGElement>|
+ * !Svg<!SVGGElement>} tagName The type of tag to
  *     put the flyout in. This should be <svg> or <g>.
  * @return {!SVGElement} The flyout's SVG group.
  */
@@ -260,10 +264,10 @@ Flyout.prototype.createDom = function(tagName) {
   */
   // Setting style to display:none to start. The toolbox and flyout
   // hide/show code will set up proper visibility and size later.
-  this.svgGroup_ = Blockly.utils.dom.createSvgElement(tagName,
+  this.svgGroup_ = dom.createSvgElement(tagName,
       {'class': 'blocklyFlyout', 'style': 'display: none'}, null);
-  this.svgBackground_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
+  this.svgBackground_ = dom.createSvgElement(
+      Svg.PATH,
       {'class': 'blocklyFlyoutBackground'}, this.svgGroup_);
   this.svgGroup_.appendChild(this.workspace_.createDom());
   this.workspace_.getThemeManager().subscribe(
@@ -275,14 +279,14 @@ Flyout.prototype.createDom = function(tagName) {
 
 /**
  * Initializes the flyout.
- * @param {!Blockly.WorkspaceSvg} targetWorkspace The workspace in which to
+ * @param {!WorkspaceSvg} targetWorkspace The workspace in which to
  *     create new blocks.
  */
 Flyout.prototype.init = function(targetWorkspace) {
   this.targetWorkspace = targetWorkspace;
   this.workspace_.targetWorkspace = targetWorkspace;
 
-  this.workspace_.scrollbar = new Blockly.ScrollbarPair(
+  this.workspace_.scrollbar = new ScrollbarPair(
       this.workspace_, this.horizontalLayout, !this.horizontalLayout,
       'blocklyFlyoutScrollbar', this.SCROLLBAR_MARGIN);
 
@@ -290,7 +294,7 @@ Flyout.prototype.init = function(targetWorkspace) {
 
   Array.prototype.push.apply(
       this.eventWrappers_,
-      Blockly.browserEvents.conditionalBind(
+      browserEvents.conditionalBind(
           this.svgGroup_, 'wheel', this, this.wheel_));
   if (!this.autoClose) {
     this.filterWrapper_ = this.filterForCapacity_.bind(this);
@@ -300,7 +304,7 @@ Flyout.prototype.init = function(targetWorkspace) {
   // Dragging the flyout up and down.
   Array.prototype.push.apply(
       this.eventWrappers_,
-      Blockly.browserEvents.conditionalBind(
+      browserEvents.conditionalBind(
           this.svgBackground_, 'mousedown', this, this.onMouseDown_));
 
   // A flyout connected to a workspace doesn't have its own current gesture.
@@ -316,8 +320,8 @@ Flyout.prototype.init = function(targetWorkspace) {
     component: this,
     weight: 1,
     capabilities: [
-      Blockly.ComponentManager.Capability.DELETE_AREA,
-      Blockly.ComponentManager.Capability.DRAG_TARGET
+      ComponentManager.Capability.DELETE_AREA,
+      ComponentManager.Capability.DRAG_TARGET
     ]
   });
 };
@@ -330,7 +334,7 @@ Flyout.prototype.init = function(targetWorkspace) {
 Flyout.prototype.dispose = function() {
   this.hide();
   this.workspace_.getComponentManager().removeComponent(this.id);
-  Blockly.browserEvents.unbind(this.eventWrappers_);
+  browserEvents.unbind(this.eventWrappers_);
   if (this.filterWrapper_) {
     this.targetWorkspace.removeChangeListener(this.filterWrapper_);
     this.filterWrapper_ = null;
@@ -342,7 +346,7 @@ Flyout.prototype.dispose = function() {
     this.workspace_ = null;
   }
   if (this.svgGroup_) {
-    Blockly.utils.dom.removeNode(this.svgGroup_);
+    dom.removeNode(this.svgGroup_);
     this.svgGroup_ = null;
   }
   this.svgBackground_ = null;
@@ -376,7 +380,7 @@ Flyout.prototype.getFlyoutScale = function() {
 
 /**
  * Get the workspace inside the flyout.
- * @return {!Blockly.WorkspaceSvg} The workspace inside the flyout.
+ * @return {!WorkspaceSvg} The workspace inside the flyout.
  * @package
  */
 Flyout.prototype.getWorkspace = function() {
@@ -455,7 +459,7 @@ Flyout.prototype.positionAt_ = function(width, height, x, y) {
 
   if (this.svgGroup_.tagName == 'svg') {
     const transform = 'translate(' + x + 'px,' + y + 'px)';
-    Blockly.utils.dom.setCssTransform(this.svgGroup_, transform);
+    dom.setCssTransform(this.svgGroup_, transform);
   } else {
     // IE and Edge don't support CSS transforms on SVG elements so
     // it's important to set the transform on the SVG element itself
@@ -493,7 +497,7 @@ Flyout.prototype.hide = function() {
   this.setVisible(false);
   // Delete all the event listeners.
   for (let i = 0, listen; (listen = this.listeners_[i]); i++) {
-    Blockly.browserEvents.unbind(listen);
+    browserEvents.unbind(listen);
   }
   this.listeners_.length = 0;
   if (this.reflowWrapper_) {
@@ -506,7 +510,7 @@ Flyout.prototype.hide = function() {
 
 /**
  * Show and populate the flyout.
- * @param {!Blockly.utils.toolbox.FlyoutDefinition|string} flyoutDef Contents to display
+ * @param {!toolbox.FlyoutDefinition|string} flyoutDef Contents to display
  *     in the flyout. This is either an array of Nodes, a NodeList, a
  *     toolbox definition, or a string with the name of the dynamic category.
  */
@@ -522,7 +526,7 @@ Flyout.prototype.show = function(flyoutDef) {
   this.setVisible(true);
 
   // Parse the Array, Node or NodeList into a a list of flyout items.
-  const parsedContent = Blockly.utils.toolbox.convertFlyoutDefToJsonArray(flyoutDef);
+  const parsedContent = toolbox.convertFlyoutDefToJsonArray(flyoutDef);
   const flyoutInfo =
     /** @type {{contents:!Array<!Object>, gaps:!Array<number>}} */ (
       this.createFlyoutInfo_(parsedContent));
@@ -538,7 +542,7 @@ Flyout.prototype.show = function(flyoutDef) {
     }
   };
 
-  this.listeners_.push(Blockly.browserEvents.conditionalBind(
+  this.listeners_.push(browserEvents.conditionalBind(
       this.svgBackground_, 'mouseover', this, deselectAll));
 
   if (this.horizontalLayout) {
@@ -561,7 +565,7 @@ Flyout.prototype.show = function(flyoutDef) {
 /**
  * Create the contents array and gaps array necessary to create the layout for
  * the flyout.
- * @param {!Blockly.utils.toolbox.FlyoutItemInfoArray} parsedContent The array
+ * @param {!toolbox.FlyoutItemInfoArray} parsedContent The array
  *     of objects to show in the flyout.
  * @return {{contents:Array<Object>, gaps:Array<number>}} The list of contents
  *     and gaps needed to lay out the flyout.
@@ -575,18 +579,18 @@ Flyout.prototype.createFlyoutInfo_ = function(parsedContent) {
   for (let i = 0, contentInfo; (contentInfo = parsedContent[i]); i++) {
 
     if (contentInfo['custom']) {
-      const customInfo = /** @type {!Blockly.utils.toolbox.DynamicCategoryInfo} */ (contentInfo);
+      const customInfo = /** @type {!toolbox.DynamicCategoryInfo} */ (contentInfo);
       const categoryName = customInfo['custom'];
       const flyoutDef = this.getDynamicCategoryContents_(categoryName);
-      const parsedDynamicContent = /** @type {!Blockly.utils.toolbox.FlyoutItemInfoArray} */
-        (Blockly.utils.toolbox.convertFlyoutDefToJsonArray(flyoutDef));
+      const parsedDynamicContent = /** @type {!toolbox.FlyoutItemInfoArray} */
+        (toolbox.convertFlyoutDefToJsonArray(flyoutDef));
       parsedContent.splice.apply(parsedContent, [i, 1].concat(parsedDynamicContent));
       contentInfo = parsedContent[i];
     }
 
     switch (contentInfo['kind'].toUpperCase()) {
       case 'BLOCK': {
-        const blockInfo = /** @type {!Blockly.utils.toolbox.BlockInfo} */ (contentInfo);
+        const blockInfo = /** @type {!toolbox.BlockInfo} */ (contentInfo);
         const blockXml = this.getBlockXml_(blockInfo);
         const block = this.createBlock_(blockXml);
         // This is a deprecated method for adding gap to a block.
@@ -597,12 +601,12 @@ Flyout.prototype.createFlyoutInfo_ = function(parsedContent) {
         break;
       }
       case 'SEP': {
-        const sepInfo = /** @type {!Blockly.utils.toolbox.SeparatorInfo} */ (contentInfo);
+        const sepInfo = /** @type {!toolbox.SeparatorInfo} */ (contentInfo);
         this.addSeparatorGap_(sepInfo, gaps, defaultGap);
         break;
       }
       case 'LABEL': {
-        const labelInfo = /** @type {!Blockly.utils.toolbox.LabelInfo} */ (contentInfo);
+        const labelInfo = /** @type {!toolbox.LabelInfo} */ (contentInfo);
         // A label is a button with different styling.
         const label = this.createButton_(labelInfo, /** isLabel */ true);
         contents.push({type: 'button', button: label});
@@ -610,7 +614,7 @@ Flyout.prototype.createFlyoutInfo_ = function(parsedContent) {
         break;
       }
       case 'BUTTON': {
-        const buttonInfo = /** @type {!Blockly.utils.toolbox.ButtonInfo} */ (contentInfo);
+        const buttonInfo = /** @type {!toolbox.ButtonInfo} */ (contentInfo);
         const button = this.createButton_(buttonInfo, /** isLabel */ false);
         contents.push({type: 'button', button: button});
         gaps.push(defaultGap);
@@ -645,19 +649,19 @@ Flyout.prototype.getDynamicCategoryContents_ = function(categoryName) {
 
 /**
  * Creates a flyout button or a flyout label.
- * @param {!Blockly.utils.toolbox.ButtonOrLabelInfo} btnInfo
+ * @param {!toolbox.ButtonOrLabelInfo} btnInfo
  *    The object holding information about a button or a label.
  * @param {boolean} isLabel True if the button is a label, false otherwise.
- * @return {!Blockly.FlyoutButton} The object used to display the button in the
+ * @return {!FlyoutButton} The object used to display the button in the
  *    flyout.
  * @private
  */
 Flyout.prototype.createButton_ = function(btnInfo, isLabel) {
-  if (!Blockly.FlyoutButton) {
+  if (!FlyoutButton) {
     throw Error('Missing require for Blockly.FlyoutButton');
   }
-  const curButton = new Blockly.FlyoutButton(this.workspace_,
-      /** @type {!Blockly.WorkspaceSvg} */ (this.targetWorkspace), btnInfo,
+  const curButton = new FlyoutButton(this.workspace_,
+      /** @type {!WorkspaceSvg} */ (this.targetWorkspace), btnInfo,
       isLabel);
   return curButton;
 };
@@ -666,12 +670,12 @@ Flyout.prototype.createButton_ = function(btnInfo, isLabel) {
  * Create a block from the xml and permanently disable any blocks that were
  * defined as disabled.
  * @param {!Element} blockXml The xml of the block.
- * @return {!Blockly.BlockSvg} The block created from the blockXml.
+ * @return {!BlockSvg} The block created from the blockXml.
  * @protected
  */
 Flyout.prototype.createBlock_ = function(blockXml) {
-  const curBlock = /** @type {!Blockly.BlockSvg} */ (
-    Blockly.Xml.domToBlock(blockXml, this.workspace_));
+  const curBlock = /** @type {!BlockSvg} */ (
+    Xml.domToBlock(blockXml, this.workspace_));
   if (!curBlock.isEnabled()) {
     // Record blocks that were initially disabled.
     // Do not enable these blocks as a result of capacity filtering.
@@ -682,7 +686,7 @@ Flyout.prototype.createBlock_ = function(blockXml) {
 
 /**
  * Get the xml from the block info object.
- * @param {!Blockly.utils.toolbox.BlockInfo}  blockInfo The object holding
+ * @param {!toolbox.BlockInfo}  blockInfo The object holding
  *    information about a block.
  * @return {!Element} The xml for the block.
  * @throws {Error} if the xml is not a valid block definition.
@@ -695,10 +699,10 @@ Flyout.prototype.getBlockXml_ = function(blockInfo) {
   if (blockXml && typeof blockXml != 'string') {
     blockElement = blockXml;
   } else if (blockXml && typeof blockXml == 'string') {
-    blockElement = Blockly.Xml.textToDom(blockXml);
+    blockElement = Xml.textToDom(blockXml);
     blockInfo['blockxml'] = blockElement;
   } else if (blockInfo['type']) {
-    blockElement = Blockly.utils.xml.createElement('xml');
+    blockElement = utilsXml.createElement('xml');
     blockElement.setAttribute('type', blockInfo['type']);
     blockElement.setAttribute('disabled', blockInfo['disabled']);
     blockInfo['blockxml'] = blockElement;
@@ -712,7 +716,7 @@ Flyout.prototype.getBlockXml_ = function(blockInfo) {
 
 /**
  * Add the necessary gap in the flyout for a separator.
- * @param {!Blockly.utils.toolbox.SeparatorInfo} sepInfo The object holding
+ * @param {!toolbox.SeparatorInfo} sepInfo The object holding
  *    information about a separator.
  * @param {!Array<number>} gaps The list gaps between items in the flyout.
  * @param {number} defaultGap The default gap between the button and next element.
@@ -748,8 +752,8 @@ Flyout.prototype.clearOldBlocks_ = function() {
   for (let j = 0; j < this.mats_.length; j++) {
     const rect = this.mats_[j];
     if (rect) {
-      Blockly.Tooltip.unbindMouseEvents(rect);
-      Blockly.utils.dom.removeNode(rect);
+      Tooltip.unbindMouseEvents(rect);
+      dom.removeNode(rect);
     }
   }
   this.mats_.length = 0;
@@ -766,29 +770,29 @@ Flyout.prototype.clearOldBlocks_ = function() {
 /**
  * Add listeners to a block that has been added to the flyout.
  * @param {!SVGElement} root The root node of the SVG group the block is in.
- * @param {!Blockly.BlockSvg} block The block to add listeners for.
+ * @param {!BlockSvg} block The block to add listeners for.
  * @param {!SVGElement} rect The invisible rectangle under the block that acts
  *     as a mat for that block.
  * @protected
  */
 Flyout.prototype.addBlockListeners_ = function(root, block, rect) {
-  this.listeners_.push(Blockly.browserEvents.conditionalBind(
+  this.listeners_.push(browserEvents.conditionalBind(
       root, 'mousedown', null, this.blockMouseDown_(block)));
-  this.listeners_.push(Blockly.browserEvents.conditionalBind(
+  this.listeners_.push(browserEvents.conditionalBind(
       rect, 'mousedown', null, this.blockMouseDown_(block)));
   this.listeners_.push(
-      Blockly.browserEvents.bind(root, 'mouseenter', block, block.addSelect));
-  this.listeners_.push(Blockly.browserEvents.bind(
+      browserEvents.bind(root, 'mouseenter', block, block.addSelect));
+  this.listeners_.push(browserEvents.bind(
       root, 'mouseleave', block, block.removeSelect));
   this.listeners_.push(
-      Blockly.browserEvents.bind(rect, 'mouseenter', block, block.addSelect));
-  this.listeners_.push(Blockly.browserEvents.bind(
+      browserEvents.bind(rect, 'mouseenter', block, block.addSelect));
+  this.listeners_.push(browserEvents.bind(
       rect, 'mouseleave', block, block.removeSelect));
 };
 
 /**
  * Handle a mouse-down on an SVG block in a non-closing flyout.
- * @param {!Blockly.BlockSvg} block The flyout block to copy.
+ * @param {!BlockSvg} block The flyout block to copy.
  * @return {!Function} Function to call when block is clicked.
  * @private
  */
@@ -818,7 +822,7 @@ Flyout.prototype.onMouseDown_ = function(e) {
 /**
  * Does this flyout allow you to create a new instance of the given block?
  * Used for deciding if a block can be "dragged out of" the flyout.
- * @param {!Blockly.BlockSvg} block The block to copy from the flyout.
+ * @param {!BlockSvg} block The block to copy from the flyout.
  * @return {boolean} True if you can create a new instance of the block, false
  *    otherwise.
  * @package
@@ -829,41 +833,41 @@ Flyout.prototype.isBlockCreatable_ = function(block) {
 
 /**
  * Create a copy of this block on the workspace.
- * @param {!Blockly.BlockSvg} originalBlock The block to copy from the flyout.
- * @return {!Blockly.BlockSvg} The newly created block.
+ * @param {!BlockSvg} originalBlock The block to copy from the flyout.
+ * @return {!BlockSvg} The newly created block.
  * @throws {Error} if something went wrong with deserialization.
  * @package
  */
 Flyout.prototype.createBlock = function(originalBlock) {
   let newBlock = null;
-  Blockly.Events.disable();
+  Events.disable();
   const variablesBeforeCreation = this.targetWorkspace.getAllVariables();
   this.targetWorkspace.setResizesEnabled(false);
   try {
     newBlock = this.placeNewBlock_(originalBlock);
   } finally {
-    Blockly.Events.enable();
+    Events.enable();
   }
 
   // Close the flyout.
-  Blockly.hideChaff();
+  hideChaff();
 
-  const newVariables = Blockly.Variables.getAddedVariables(this.targetWorkspace,
+  const newVariables = Variables.getAddedVariables(this.targetWorkspace,
       variablesBeforeCreation);
 
-  if (Blockly.Events.isEnabled()) {
-    Blockly.Events.setGroup(true);
+  if (Events.isEnabled()) {
+    Events.setGroup(true);
     // Fire a VarCreate event for each (if any) new variable created.
     for (let i = 0; i < newVariables.length; i++) {
       const thisVariable = newVariables[i];
-      Blockly.Events.fire(
-          new (Blockly.Events.get(Blockly.Events.VAR_CREATE))(thisVariable));
+      Events.fire(
+          new (Events.get(Events.VAR_CREATE))(thisVariable));
     }
 
     // Block events come after var events, in case they refer to newly created
     // variables.
-    Blockly.Events.fire(
-        new (Blockly.Events.get(Blockly.Events.BLOCK_CREATE))(newBlock));
+    Events.fire(
+        new (Events.get(Events.BLOCK_CREATE))(newBlock));
   }
   if (this.autoClose) {
     this.hide();
@@ -876,7 +880,7 @@ Flyout.prototype.createBlock = function(originalBlock) {
 /**
  * Initialize the given button: move it to the correct location,
  * add listeners, etc.
- * @param {!Blockly.FlyoutButton} button The button to initialize and place.
+ * @param {!FlyoutButton} button The button to initialize and place.
  * @param {number} x The x position of the cursor during this layout pass.
  * @param {number} y The y position of the cursor during this layout pass.
  * @protected
@@ -887,7 +891,7 @@ Flyout.prototype.initFlyoutButton_ = function(button, x, y) {
   button.show();
   // Clicking on a flyout button or label is a lot like clicking on the
   // flyout background.
-  this.listeners_.push(Blockly.browserEvents.conditionalBind(
+  this.listeners_.push(browserEvents.conditionalBind(
       buttonSvg, 'mousedown', this, this.onMouseDown_));
 
   this.buttons_.push(button);
@@ -895,7 +899,7 @@ Flyout.prototype.initFlyoutButton_ = function(button, x, y) {
 
 /**
  * Create and place a rectangle corresponding to the given block.
- * @param {!Blockly.BlockSvg} block The block to associate the rect to.
+ * @param {!BlockSvg} block The block to associate the rect to.
  * @param {number} x The x position of the cursor during this layout pass.
  * @param {number} y The y position of the cursor during this layout pass.
  * @param {!{height: number, width: number}} blockHW The height and width of the
@@ -909,8 +913,8 @@ Flyout.prototype.initFlyoutButton_ = function(button, x, y) {
 Flyout.prototype.createRect_ = function(block, x, y, blockHW, index) {
   // Create an invisible rectangle under the block to act as a button.  Just
   // using the block as a button is poor, since blocks have holes in them.
-  const rect = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  const rect = dom.createSvgElement(
+      Svg.RECT,
       {
         'fill-opacity': 0,
         'x': x,
@@ -919,7 +923,7 @@ Flyout.prototype.createRect_ = function(block, x, y, blockHW, index) {
         'width': blockHW.width
       }, null);
   rect.tooltip = block;
-  Blockly.Tooltip.bindMouseEvents(rect);
+  Tooltip.bindMouseEvents(rect);
   // Add the rectangles under the blocks, so that the blocks' tooltips work.
   this.workspace_.getCanvas().insertBefore(rect, block.getSvgRoot());
 
@@ -932,7 +936,7 @@ Flyout.prototype.createRect_ = function(block, x, y, blockHW, index) {
  * Move a rectangle to sit exactly behind a block, taking into account tabs,
  * hats, and any other protrusions we invent.
  * @param {!SVGElement} rect The rectangle to move directly behind the block.
- * @param {!Blockly.BlockSvg} block The block the rectangle should be behind.
+ * @param {!BlockSvg} block The block the rectangle should be behind.
  * @protected
  */
 Flyout.prototype.moveRectToBlock_ = function(rect, block) {
@@ -956,7 +960,7 @@ Flyout.prototype.filterForCapacity_ = function() {
   for (let i = 0, block; (block = blocks[i]); i++) {
     if (this.permanentlyDisabled_.indexOf(block) == -1) {
       const enable = this.targetWorkspace
-          .isCapacityAvailable(Blockly.utils.getBlockTypeCounts(block));
+          .isCapacityAvailable(utils.getBlockTypeCounts(block));
       while (block) {
         block.setEnabled(enable);
         block = block.getNextBlock();
@@ -990,8 +994,8 @@ Flyout.prototype.isScrollable = function() {
 
 /**
  * Copy a block from the flyout to the workspace and position it correctly.
- * @param {!Blockly.BlockSvg} oldBlock The flyout block to copy.
- * @return {!Blockly.BlockSvg} The new block in the main workspace.
+ * @param {!BlockSvg} oldBlock The flyout block to copy.
+ * @return {!BlockSvg} The new block in the main workspace.
  * @private
  */
 Flyout.prototype.placeNewBlock_ = function(oldBlock) {
@@ -1003,15 +1007,15 @@ Flyout.prototype.placeNewBlock_ = function(oldBlock) {
 
   // Create the new block by cloning the block in the flyout (via XML).
   // This cast assumes that the oldBlock can not be an insertion marker.
-  const xml = /** @type {!Element} */ (Blockly.Xml.blockToDom(oldBlock, true));
+  const xml = /** @type {!Element} */ (Xml.blockToDom(oldBlock, true));
   // The target workspace would normally resize during domToBlock, which will
   // lead to weird jumps.  Save it for terminateDrag.
   targetWorkspace.setResizesEnabled(false);
 
   // Using domToBlock instead of domToWorkspace means that the new block will be
   // placed at position (0, 0) in main workspace units.
-  const block = /** @type {!Blockly.BlockSvg} */
-      (Blockly.Xml.domToBlock(xml, targetWorkspace));
+  const block = /** @type {!BlockSvg} */
+      (Xml.domToBlock(xml, targetWorkspace));
   const svgRootNew = block.getSvgRoot();
   if (!svgRootNew) {
     throw Error('block is not rendered.');
@@ -1033,12 +1037,12 @@ Flyout.prototype.placeNewBlock_ = function(oldBlock) {
 
   // The position of the old block in pixels relative to the upper left corner
   // of the injection div.
-  const oldBlockOffsetPixels = Blockly.utils.Coordinate.sum(flyoutOffsetPixels,
+  const oldBlockOffsetPixels = Coordinate.sum(flyoutOffsetPixels,
       oldBlockPos);
 
   // The position of the old block in pixels relative to the origin of the
   // main workspace.
-  const finalOffset = Blockly.utils.Coordinate.difference(oldBlockOffsetPixels,
+  const finalOffset = Coordinate.difference(oldBlockOffsetPixels,
       mainOffsetPixels);
   // The position of the old block in main workspace coordinates.
   finalOffset.scale(1 / targetWorkspace.scale);
@@ -1050,7 +1054,7 @@ Flyout.prototype.placeNewBlock_ = function(oldBlock) {
 /**
  * Returns the bounding rectangle of the drag target area in pixel units
  * relative to viewport.
- * @return {Blockly.utils.Rect} The component's bounding box.
+ * @return {utils.Rect} The component's bounding box.
  */
 Flyout.prototype.getClientRect;
 
@@ -1064,7 +1068,7 @@ Flyout.prototype.position;
  * Determine if a drag delta is toward the workspace, based on the position
  * and orientation of the flyout. This is used in determineDragIntention_ to
  * determine if a new block should be created or if the flyout should scroll.
- * @param {!Blockly.utils.Coordinate} currentDragDeltaXY How far the pointer has
+ * @param {!Coordinate} currentDragDeltaXY How far the pointer has
  *     moved from the position at mouse down, in pixel units.
  * @return {boolean} True if the drag is toward the workspace.
  * @package
diff --git a/tests/deps.js b/tests/deps.js
index f9a77b67a..54c8af48e 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -61,7 +61,7 @@ goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Bloc
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry']);
 goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object']);
-goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly', 'Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutButton', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es5'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);

From 47314fd0b921a0d315f6aadc4cd6837a039613b8 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 11:27:36 -0700
Subject: [PATCH 249/833] clang-format core/flyout_base.js

---
 core/flyout_base.js | 97 +++++++++++++++++++++++----------------------
 1 file changed, 49 insertions(+), 48 deletions(-)

diff --git a/core/flyout_base.js b/core/flyout_base.js
index 42e4d0966..594d83a9f 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -242,7 +242,7 @@ Flyout.prototype.height_ = 0;
  * flyout. Setting it to 360 means that all drags create a new block.
  * @type {number}
  * @protected
-*/
+ */
 Flyout.prototype.dragAngleRange_ = 70;
 
 /**
@@ -264,11 +264,10 @@ Flyout.prototype.createDom = function(tagName) {
   */
   // Setting style to display:none to start. The toolbox and flyout
   // hide/show code will set up proper visibility and size later.
-  this.svgGroup_ = dom.createSvgElement(tagName,
-      {'class': 'blocklyFlyout', 'style': 'display: none'}, null);
+  this.svgGroup_ = dom.createSvgElement(
+      tagName, {'class': 'blocklyFlyout', 'style': 'display: none'}, null);
   this.svgBackground_ = dom.createSvgElement(
-      Svg.PATH,
-      {'class': 'blocklyFlyoutBackground'}, this.svgGroup_);
+      Svg.PATH, {'class': 'blocklyFlyoutBackground'}, this.svgGroup_);
   this.svgGroup_.appendChild(this.workspace_.createDom());
   this.workspace_.getThemeManager().subscribe(
       this.svgBackground_, 'flyoutBackgroundColour', 'fill');
@@ -453,8 +452,8 @@ Flyout.prototype.updateDisplay_ = function() {
  * @protected
  */
 Flyout.prototype.positionAt_ = function(width, height, x, y) {
-  this.svgGroup_.setAttribute("width", width);
-  this.svgGroup_.setAttribute("height", height);
+  this.svgGroup_.setAttribute('width', width);
+  this.svgGroup_.setAttribute('height', height);
   this.workspace_.setCachedParentSvgSize(width, height);
 
   if (this.svgGroup_.tagName == 'svg') {
@@ -464,7 +463,7 @@ Flyout.prototype.positionAt_ = function(width, height, x, y) {
     // IE and Edge don't support CSS transforms on SVG elements so
     // it's important to set the transform on the SVG element itself
     const transform = 'translate(' + x + ',' + y + ')';
-    this.svgGroup_.setAttribute("transform", transform);
+    this.svgGroup_.setAttribute('transform', transform);
   }
 
   // Update the scrollbar (if one exists).
@@ -482,7 +481,6 @@ Flyout.prototype.positionAt_ = function(width, height, x, y) {
     if (scrollbar.vScroll) {
       scrollbar.vScroll.setPosition(
           scrollbar.vScroll.position.x, scrollbar.vScroll.position.y);
-
     }
   }
 };
@@ -528,8 +526,8 @@ Flyout.prototype.show = function(flyoutDef) {
   // Parse the Array, Node or NodeList into a a list of flyout items.
   const parsedContent = toolbox.convertFlyoutDefToJsonArray(flyoutDef);
   const flyoutInfo =
-    /** @type {{contents:!Array<!Object>, gaps:!Array<number>}} */ (
-      this.createFlyoutInfo_(parsedContent));
+      /** @type {{contents:!Array<!Object>, gaps:!Array<number>}} */ (
+          this.createFlyoutInfo_(parsedContent));
 
   this.layout_(flyoutInfo.contents, flyoutInfo.gaps);
 
@@ -577,14 +575,15 @@ Flyout.prototype.createFlyoutInfo_ = function(parsedContent) {
   this.permanentlyDisabled_.length = 0;
   const defaultGap = this.horizontalLayout ? this.GAP_X : this.GAP_Y;
   for (let i = 0, contentInfo; (contentInfo = parsedContent[i]); i++) {
-
     if (contentInfo['custom']) {
-      const customInfo = /** @type {!toolbox.DynamicCategoryInfo} */ (contentInfo);
+      const customInfo =
+          /** @type {!toolbox.DynamicCategoryInfo} */ (contentInfo);
       const categoryName = customInfo['custom'];
       const flyoutDef = this.getDynamicCategoryContents_(categoryName);
       const parsedDynamicContent = /** @type {!toolbox.FlyoutItemInfoArray} */
-        (toolbox.convertFlyoutDefToJsonArray(flyoutDef));
-      parsedContent.splice.apply(parsedContent, [i, 1].concat(parsedDynamicContent));
+          (toolbox.convertFlyoutDefToJsonArray(flyoutDef));
+      parsedContent.splice.apply(
+          parsedContent, [i, 1].concat(parsedDynamicContent));
       contentInfo = parsedContent[i];
     }
 
@@ -595,7 +594,8 @@ Flyout.prototype.createFlyoutInfo_ = function(parsedContent) {
         const block = this.createBlock_(blockXml);
         // This is a deprecated method for adding gap to a block.
         // <block type="math_arithmetic" gap="8"></block>
-        const gap = parseInt(blockInfo['gap'] || blockXml.getAttribute('gap'), 10);
+        const gap =
+            parseInt(blockInfo['gap'] || blockXml.getAttribute('gap'), 10);
         gaps.push(isNaN(gap) ? defaultGap : gap);
         contents.push({type: 'block', block: block});
         break;
@@ -634,15 +634,17 @@ Flyout.prototype.createFlyoutInfo_ = function(parsedContent) {
 Flyout.prototype.getDynamicCategoryContents_ = function(categoryName) {
   // Look up the correct category generation function and call that to get a
   // valid XML list.
-  const fnToApply = this.workspace_.targetWorkspace.getToolboxCategoryCallback(
-      categoryName);
+  const fnToApply =
+      this.workspace_.targetWorkspace.getToolboxCategoryCallback(categoryName);
   if (typeof fnToApply != 'function') {
-    throw TypeError('Couldn\'t find a callback function when opening' +
+    throw TypeError(
+        'Couldn\'t find a callback function when opening' +
         ' a toolbox category.');
   }
   const flyoutDef = fnToApply(this.workspace_.targetWorkspace);
   if (!Array.isArray(flyoutDef)) {
-    throw new TypeError('Result of toolbox category callback must be an array.');
+    throw new TypeError(
+        'Result of toolbox category callback must be an array.');
   }
   return flyoutDef;
 };
@@ -660,9 +662,9 @@ Flyout.prototype.createButton_ = function(btnInfo, isLabel) {
   if (!FlyoutButton) {
     throw Error('Missing require for Blockly.FlyoutButton');
   }
-  const curButton = new FlyoutButton(this.workspace_,
-      /** @type {!WorkspaceSvg} */ (this.targetWorkspace), btnInfo,
-      isLabel);
+  const curButton = new FlyoutButton(
+      this.workspace_,
+      /** @type {!WorkspaceSvg} */ (this.targetWorkspace), btnInfo, isLabel);
   return curButton;
 };
 
@@ -674,8 +676,8 @@ Flyout.prototype.createButton_ = function(btnInfo, isLabel) {
  * @protected
  */
 Flyout.prototype.createBlock_ = function(blockXml) {
-  const curBlock = /** @type {!BlockSvg} */ (
-    Xml.domToBlock(blockXml, this.workspace_));
+  const curBlock =
+      /** @type {!BlockSvg} */ (Xml.domToBlock(blockXml, this.workspace_));
   if (!curBlock.isEnabled()) {
     // Record blocks that were initially disabled.
     // Do not enable these blocks as a result of capacity filtering.
@@ -709,7 +711,8 @@ Flyout.prototype.getBlockXml_ = function(blockInfo) {
   }
 
   if (!blockElement) {
-    throw Error('Error: Invalid block definition. Block definition must have blockxml or type.');
+    throw Error(
+        'Error: Invalid block definition. Block definition must have blockxml or type.');
   }
   return blockElement;
 };
@@ -719,7 +722,8 @@ Flyout.prototype.getBlockXml_ = function(blockInfo) {
  * @param {!toolbox.SeparatorInfo} sepInfo The object holding
  *    information about a separator.
  * @param {!Array<number>} gaps The list gaps between items in the flyout.
- * @param {number} defaultGap The default gap between the button and next element.
+ * @param {number} defaultGap The default gap between the button and next
+ *     element.
  * @private
  */
 Flyout.prototype.addSeparatorGap_ = function(sepInfo, gaps, defaultGap) {
@@ -782,12 +786,12 @@ Flyout.prototype.addBlockListeners_ = function(root, block, rect) {
       rect, 'mousedown', null, this.blockMouseDown_(block)));
   this.listeners_.push(
       browserEvents.bind(root, 'mouseenter', block, block.addSelect));
-  this.listeners_.push(browserEvents.bind(
-      root, 'mouseleave', block, block.removeSelect));
+  this.listeners_.push(
+      browserEvents.bind(root, 'mouseleave', block, block.removeSelect));
   this.listeners_.push(
       browserEvents.bind(rect, 'mouseenter', block, block.addSelect));
-  this.listeners_.push(browserEvents.bind(
-      rect, 'mouseleave', block, block.removeSelect));
+  this.listeners_.push(
+      browserEvents.bind(rect, 'mouseleave', block, block.removeSelect));
 };
 
 /**
@@ -852,22 +856,20 @@ Flyout.prototype.createBlock = function(originalBlock) {
   // Close the flyout.
   hideChaff();
 
-  const newVariables = Variables.getAddedVariables(this.targetWorkspace,
-      variablesBeforeCreation);
+  const newVariables = Variables.getAddedVariables(
+      this.targetWorkspace, variablesBeforeCreation);
 
   if (Events.isEnabled()) {
     Events.setGroup(true);
     // Fire a VarCreate event for each (if any) new variable created.
     for (let i = 0; i < newVariables.length; i++) {
       const thisVariable = newVariables[i];
-      Events.fire(
-          new (Events.get(Events.VAR_CREATE))(thisVariable));
+      Events.fire(new (Events.get(Events.VAR_CREATE))(thisVariable));
     }
 
     // Block events come after var events, in case they refer to newly created
     // variables.
-    Events.fire(
-        new (Events.get(Events.BLOCK_CREATE))(newBlock));
+    Events.fire(new (Events.get(Events.BLOCK_CREATE))(newBlock));
   }
   if (this.autoClose) {
     this.hide();
@@ -914,14 +916,14 @@ Flyout.prototype.createRect_ = function(block, x, y, blockHW, index) {
   // Create an invisible rectangle under the block to act as a button.  Just
   // using the block as a button is poor, since blocks have holes in them.
   const rect = dom.createSvgElement(
-      Svg.RECT,
-      {
+      Svg.RECT, {
         'fill-opacity': 0,
         'x': x,
         'y': y,
         'height': blockHW.height,
         'width': blockHW.width
-      }, null);
+      },
+      null);
   rect.tooltip = block;
   Tooltip.bindMouseEvents(rect);
   // Add the rectangles under the blocks, so that the blocks' tooltips work.
@@ -959,8 +961,8 @@ Flyout.prototype.filterForCapacity_ = function() {
   const blocks = this.workspace_.getTopBlocks(false);
   for (let i = 0, block; (block = blocks[i]); i++) {
     if (this.permanentlyDisabled_.indexOf(block) == -1) {
-      const enable = this.targetWorkspace
-          .isCapacityAvailable(utils.getBlockTypeCounts(block));
+      const enable = this.targetWorkspace.isCapacityAvailable(
+          utils.getBlockTypeCounts(block));
       while (block) {
         block.setEnabled(enable);
         block = block.getNextBlock();
@@ -988,8 +990,8 @@ Flyout.prototype.reflow = function() {
  * @package
  */
 Flyout.prototype.isScrollable = function() {
-  return this.workspace_.scrollbar ?
-      this.workspace_.scrollbar.isVisible() : false;
+  return this.workspace_.scrollbar ? this.workspace_.scrollbar.isVisible() :
+                                     false;
 };
 
 /**
@@ -1037,13 +1039,12 @@ Flyout.prototype.placeNewBlock_ = function(oldBlock) {
 
   // The position of the old block in pixels relative to the upper left corner
   // of the injection div.
-  const oldBlockOffsetPixels = Coordinate.sum(flyoutOffsetPixels,
-      oldBlockPos);
+  const oldBlockOffsetPixels = Coordinate.sum(flyoutOffsetPixels, oldBlockPos);
 
   // The position of the old block in pixels relative to the origin of the
   // main workspace.
-  const finalOffset = Coordinate.difference(oldBlockOffsetPixels,
-      mainOffsetPixels);
+  const finalOffset =
+      Coordinate.difference(oldBlockOffsetPixels, mainOffsetPixels);
   // The position of the old block in main workspace coordinates.
   finalOffset.scale(1 / targetWorkspace.scale);
 

From c3d14479932c33aca47fdbdd54d9de766290fede Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 14:47:23 -0700
Subject: [PATCH 250/833] Migrate core/flyout_button.js to ES6 const/let

---
 core/flyout_button.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/core/flyout_button.js b/core/flyout_button.js
index 643790d9f..793699e6a 100644
--- a/core/flyout_button.js
+++ b/core/flyout_button.js
@@ -126,7 +126,7 @@ Blockly.FlyoutButton.prototype.height = 0;
  * @return {!SVGElement} The button's SVG group.
  */
 Blockly.FlyoutButton.prototype.createDom = function() {
-  var cssClass = this.isLabel_ ? 'blocklyFlyoutLabel' : 'blocklyFlyoutButton';
+  let cssClass = this.isLabel_ ? 'blocklyFlyoutLabel' : 'blocklyFlyoutButton';
   if (this.cssClass_) {
     cssClass += ' ' + this.cssClass_;
   }
@@ -135,9 +135,10 @@ Blockly.FlyoutButton.prototype.createDom = function() {
       Blockly.utils.Svg.G, {'class': cssClass},
       this.workspace_.getCanvas());
 
+  let shadow;
   if (!this.isLabel_) {
     // Shadow rectangle (light source does not mirror in RTL).
-    var shadow = Blockly.utils.dom.createSvgElement(
+    shadow = Blockly.utils.dom.createSvgElement(
         Blockly.utils.Svg.RECT,
         {
           'class': 'blocklyFlyoutButtonShadow',
@@ -146,7 +147,7 @@ Blockly.FlyoutButton.prototype.createDom = function() {
         this.svgGroup_);
   }
   // Background rectangle.
-  var rect = Blockly.utils.dom.createSvgElement(
+  const rect = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.RECT,
       {
         'class': this.isLabel_ ?
@@ -155,7 +156,7 @@ Blockly.FlyoutButton.prototype.createDom = function() {
       },
       this.svgGroup_);
 
-  var svgText = Blockly.utils.dom.createSvgElement(
+  const svgText = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.TEXT,
       {
         'class': this.isLabel_ ? 'blocklyFlyoutLabelText' : 'blocklyText',
@@ -164,7 +165,7 @@ Blockly.FlyoutButton.prototype.createDom = function() {
         'text-anchor': 'middle'
       },
       this.svgGroup_);
-  var text = Blockly.utils.replaceMessageReferences(this.text_);
+  let text = Blockly.utils.replaceMessageReferences(this.text_);
   if (this.workspace_.RTL) {
     // Force text to be RTL by adding an RLM.
     text += '\u200F';
@@ -176,12 +177,12 @@ Blockly.FlyoutButton.prototype.createDom = function() {
         'flyoutForegroundColour', 'fill');
   }
 
-  var fontSize = Blockly.utils.style.getComputedStyle(svgText, 'fontSize');
-  var fontWeight = Blockly.utils.style.getComputedStyle(svgText, 'fontWeight');
-  var fontFamily = Blockly.utils.style.getComputedStyle(svgText, 'fontFamily');
+  const fontSize = Blockly.utils.style.getComputedStyle(svgText, 'fontSize');
+  const fontWeight = Blockly.utils.style.getComputedStyle(svgText, 'fontWeight');
+  const fontFamily = Blockly.utils.style.getComputedStyle(svgText, 'fontFamily');
   this.width = Blockly.utils.dom.getFastTextWidthWithSizeString(svgText,
       fontSize, fontWeight, fontFamily);
-  var fontMetrics = Blockly.utils.dom.measureFontMetrics(text, fontSize,
+  const fontMetrics = Blockly.utils.dom.measureFontMetrics(text, fontSize,
       fontWeight, fontFamily);
   this.height = fontMetrics.height;
 
@@ -286,7 +287,7 @@ Blockly.FlyoutButton.prototype.dispose = function() {
  * @private
  */
 Blockly.FlyoutButton.prototype.onMouseUp_ = function(e) {
-  var gesture = this.targetWorkspace_.getGesture(e);
+  const gesture = this.targetWorkspace_.getGesture(e);
   if (gesture) {
     gesture.cancel();
   }

From a84660000f78ef26d89c2a204f11eeac720099f4 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 14:53:15 -0700
Subject: [PATCH 251/833] Migrate core/flyout_button.js to goog.module

---
 core/flyout_button.js | 39 +++++++++++++++++++++------------------
 tests/deps.js         |  2 +-
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/core/flyout_button.js b/core/flyout_button.js
index 793699e6a..7399e3997 100644
--- a/core/flyout_button.js
+++ b/core/flyout_button.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.FlyoutButton');
+goog.module('Blockly.FlyoutButton');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.Css');
@@ -35,7 +36,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @constructor
  * @package
  */
-Blockly.FlyoutButton = function(workspace, targetWorkspace, json, isLabel) {
+const FlyoutButton = function(workspace, targetWorkspace, json, isLabel) {
   // Labels behave the same as buttons, but are styled differently.
 
   /**
@@ -102,30 +103,30 @@ Blockly.FlyoutButton = function(workspace, targetWorkspace, json, isLabel) {
 /**
  * The horizontal margin around the text in the button.
  */
-Blockly.FlyoutButton.MARGIN_X = 5;
+FlyoutButton.MARGIN_X = 5;
 
 /**
  * The vertical margin around the text in the button.
  */
-Blockly.FlyoutButton.MARGIN_Y = 2;
+FlyoutButton.MARGIN_Y = 2;
 
 /**
  * The width of the button's rect.
  * @type {number}
  */
-Blockly.FlyoutButton.prototype.width = 0;
+FlyoutButton.prototype.width = 0;
 
 /**
  * The height of the button's rect.
  * @type {number}
  */
-Blockly.FlyoutButton.prototype.height = 0;
+FlyoutButton.prototype.height = 0;
 
 /**
  * Create the button elements.
  * @return {!SVGElement} The button's SVG group.
  */
-Blockly.FlyoutButton.prototype.createDom = function() {
+FlyoutButton.prototype.createDom = function() {
   let cssClass = this.isLabel_ ? 'blocklyFlyoutLabel' : 'blocklyFlyoutButton';
   if (this.cssClass_) {
     cssClass += ' ' + this.cssClass_;
@@ -187,8 +188,8 @@ Blockly.FlyoutButton.prototype.createDom = function() {
   this.height = fontMetrics.height;
 
   if (!this.isLabel_) {
-    this.width += 2 * Blockly.FlyoutButton.MARGIN_X;
-    this.height += 2 * Blockly.FlyoutButton.MARGIN_Y;
+    this.width += 2 * FlyoutButton.MARGIN_X;
+    this.height += 2 * FlyoutButton.MARGIN_Y;
     shadow.setAttribute('width', this.width);
     shadow.setAttribute('height', this.height);
   }
@@ -209,7 +210,7 @@ Blockly.FlyoutButton.prototype.createDom = function() {
 /**
  * Correctly position the flyout button and make it visible.
  */
-Blockly.FlyoutButton.prototype.show = function() {
+FlyoutButton.prototype.show = function() {
   this.updateTransform_();
   this.svgGroup_.setAttribute('display', 'block');
 };
@@ -218,7 +219,7 @@ Blockly.FlyoutButton.prototype.show = function() {
  * Update SVG attributes to match internal state.
  * @private
  */
-Blockly.FlyoutButton.prototype.updateTransform_ = function() {
+FlyoutButton.prototype.updateTransform_ = function() {
   this.svgGroup_.setAttribute('transform',
       'translate(' + this.position_.x + ',' + this.position_.y + ')');
 };
@@ -228,7 +229,7 @@ Blockly.FlyoutButton.prototype.updateTransform_ = function() {
  * @param {number} x The new x coordinate.
  * @param {number} y The new y coordinate.
  */
-Blockly.FlyoutButton.prototype.moveTo = function(x, y) {
+FlyoutButton.prototype.moveTo = function(x, y) {
   this.position_.x = x;
   this.position_.y = y;
   this.updateTransform_();
@@ -237,7 +238,7 @@ Blockly.FlyoutButton.prototype.moveTo = function(x, y) {
 /**
  * @return {boolean} Whether or not the button is a label.
  */
-Blockly.FlyoutButton.prototype.isLabel = function() {
+FlyoutButton.prototype.isLabel = function() {
   return this.isLabel_;
 };
 
@@ -246,14 +247,14 @@ Blockly.FlyoutButton.prototype.isLabel = function() {
  * @return {!Blockly.utils.Coordinate} x, y coordinates.
  * @package
  */
-Blockly.FlyoutButton.prototype.getPosition = function() {
+FlyoutButton.prototype.getPosition = function() {
   return this.position_;
 };
 
 /**
  * @return {string} Text of the button.
  */
-Blockly.FlyoutButton.prototype.getButtonText = function() {
+FlyoutButton.prototype.getButtonText = function() {
   return this.text_;
 };
 
@@ -262,14 +263,14 @@ Blockly.FlyoutButton.prototype.getButtonText = function() {
  * @return {!Blockly.WorkspaceSvg} The target workspace of the flyout where this
  *     button resides.
  */
-Blockly.FlyoutButton.prototype.getTargetWorkspace = function() {
+FlyoutButton.prototype.getTargetWorkspace = function() {
   return this.targetWorkspace_;
 };
 
 /**
  * Dispose of this button.
  */
-Blockly.FlyoutButton.prototype.dispose = function() {
+FlyoutButton.prototype.dispose = function() {
   if (this.onMouseUpWrapper_) {
     Blockly.browserEvents.unbind(this.onMouseUpWrapper_);
   }
@@ -286,7 +287,7 @@ Blockly.FlyoutButton.prototype.dispose = function() {
  * @param {!Event} e Mouse up event.
  * @private
  */
-Blockly.FlyoutButton.prototype.onMouseUp_ = function(e) {
+FlyoutButton.prototype.onMouseUp_ = function(e) {
   const gesture = this.targetWorkspace_.getGesture(e);
   if (gesture) {
     gesture.cancel();
@@ -329,3 +330,5 @@ Blockly.Css.register([
   '}',
   /* eslint-enable indent */
 ]);
+
+exports = FlyoutButton;
diff --git a/tests/deps.js b/tests/deps.js
index d02bbc5ea..d0f326297 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -62,7 +62,7 @@ goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['
 goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
-goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es5'});
+goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.Block', 'Blockly.internalConstants', 'Blockly.utils.deprecation']);

From fe01fbebc211a49bdd120acaeaba695486e0a9b1 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 15:03:35 -0700
Subject: [PATCH 252/833] Migrate core/flyout_button.js named requires

---
 core/flyout_button.js | 79 ++++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/core/flyout_button.js b/core/flyout_button.js
index 7399e3997..372060237 100644
--- a/core/flyout_button.js
+++ b/core/flyout_button.js
@@ -13,24 +13,25 @@
 goog.module('Blockly.FlyoutButton');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.Css');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.style');
-goog.require('Blockly.utils.Svg');
-
-goog.requireType('Blockly.utils.toolbox');
-goog.requireType('Blockly.WorkspaceSvg');
+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 {replaceMessageReferences} = goog.require('Blockly.utils');
 
 
 /**
  * Class for a button in the flyout.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace in which to place this
+ * @param {!WorkspaceSvg} workspace The workspace in which to place this
  *     button.
- * @param {!Blockly.WorkspaceSvg} targetWorkspace The flyout's target workspace.
- * @param {!Blockly.utils.toolbox.ButtonOrLabelInfo} json
+ * @param {!WorkspaceSvg} targetWorkspace The flyout's target workspace.
+ * @param {!toolbox.ButtonOrLabelInfo} json
  *    The JSON specifying the label/button.
  * @param {boolean} isLabel Whether this button should be styled as a label.
  * @constructor
@@ -40,13 +41,13 @@ const FlyoutButton = function(workspace, targetWorkspace, json, isLabel) {
   // Labels behave the same as buttons, but are styled differently.
 
   /**
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @private
    */
   this.workspace_ = workspace;
 
   /**
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @private
    */
   this.targetWorkspace_ = targetWorkspace;
@@ -58,10 +59,10 @@ const FlyoutButton = function(workspace, targetWorkspace, json, isLabel) {
   this.text_ = json['text'];
 
   /**
-   * @type {!Blockly.utils.Coordinate}
+   * @type {!Coordinate}
    * @private
    */
-  this.position_ = new Blockly.utils.Coordinate(0, 0);
+  this.position_ = new Coordinate(0, 0);
 
   /**
    * Whether this button should be styled as a label.
@@ -88,14 +89,14 @@ const FlyoutButton = function(workspace, targetWorkspace, json, isLabel) {
 
   /**
    * Mouse up event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onMouseUpWrapper_ = null;
 
   /**
    * The JSON specifying the label / button.
-   * @type {!Blockly.utils.toolbox.ButtonOrLabelInfo}
+   * @type {!toolbox.ButtonOrLabelInfo}
    */
   this.info = json;
 };
@@ -132,15 +133,15 @@ FlyoutButton.prototype.createDom = function() {
     cssClass += ' ' + this.cssClass_;
   }
 
-  this.svgGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G, {'class': cssClass},
+  this.svgGroup_ = dom.createSvgElement(
+      Svg.G, {'class': cssClass},
       this.workspace_.getCanvas());
 
   let shadow;
   if (!this.isLabel_) {
     // Shadow rectangle (light source does not mirror in RTL).
-    shadow = Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.RECT,
+    shadow = dom.createSvgElement(
+        Svg.RECT,
         {
           'class': 'blocklyFlyoutButtonShadow',
           'rx': 4, 'ry': 4, 'x': 1, 'y': 1
@@ -148,8 +149,8 @@ FlyoutButton.prototype.createDom = function() {
         this.svgGroup_);
   }
   // Background rectangle.
-  const rect = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  const rect = dom.createSvgElement(
+      Svg.RECT,
       {
         'class': this.isLabel_ ?
             'blocklyFlyoutLabelBackground' : 'blocklyFlyoutButtonBackground',
@@ -157,8 +158,8 @@ FlyoutButton.prototype.createDom = function() {
       },
       this.svgGroup_);
 
-  const svgText = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.TEXT,
+  const svgText = dom.createSvgElement(
+      Svg.TEXT,
       {
         'class': this.isLabel_ ? 'blocklyFlyoutLabelText' : 'blocklyText',
         'x': 0,
@@ -166,7 +167,7 @@ FlyoutButton.prototype.createDom = function() {
         'text-anchor': 'middle'
       },
       this.svgGroup_);
-  let text = Blockly.utils.replaceMessageReferences(this.text_);
+  let text = replaceMessageReferences(this.text_);
   if (this.workspace_.RTL) {
     // Force text to be RTL by adding an RLM.
     text += '\u200F';
@@ -178,12 +179,12 @@ FlyoutButton.prototype.createDom = function() {
         'flyoutForegroundColour', 'fill');
   }
 
-  const fontSize = Blockly.utils.style.getComputedStyle(svgText, 'fontSize');
-  const fontWeight = Blockly.utils.style.getComputedStyle(svgText, 'fontWeight');
-  const fontFamily = Blockly.utils.style.getComputedStyle(svgText, 'fontFamily');
-  this.width = Blockly.utils.dom.getFastTextWidthWithSizeString(svgText,
+  const fontSize = style.getComputedStyle(svgText, 'fontSize');
+  const fontWeight = style.getComputedStyle(svgText, 'fontWeight');
+  const fontFamily = style.getComputedStyle(svgText, 'fontFamily');
+  this.width = dom.getFastTextWidthWithSizeString(svgText,
       fontSize, fontWeight, fontFamily);
-  const fontMetrics = Blockly.utils.dom.measureFontMetrics(text, fontSize,
+  const fontMetrics = dom.measureFontMetrics(text, fontSize,
       fontWeight, fontFamily);
   this.height = fontMetrics.height;
 
@@ -202,7 +203,7 @@ FlyoutButton.prototype.createDom = function() {
 
   this.updateTransform_();
 
-  this.onMouseUpWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onMouseUpWrapper_ = browserEvents.conditionalBind(
       this.svgGroup_, 'mouseup', this, this.onMouseUp_);
   return this.svgGroup_;
 };
@@ -244,7 +245,7 @@ FlyoutButton.prototype.isLabel = function() {
 
 /**
  * Location of the button.
- * @return {!Blockly.utils.Coordinate} x, y coordinates.
+ * @return {!Coordinate} x, y coordinates.
  * @package
  */
 FlyoutButton.prototype.getPosition = function() {
@@ -260,7 +261,7 @@ FlyoutButton.prototype.getButtonText = function() {
 
 /**
  * Get the button's target workspace.
- * @return {!Blockly.WorkspaceSvg} The target workspace of the flyout where this
+ * @return {!WorkspaceSvg} The target workspace of the flyout where this
  *     button resides.
  */
 FlyoutButton.prototype.getTargetWorkspace = function() {
@@ -272,10 +273,10 @@ FlyoutButton.prototype.getTargetWorkspace = function() {
  */
 FlyoutButton.prototype.dispose = function() {
   if (this.onMouseUpWrapper_) {
-    Blockly.browserEvents.unbind(this.onMouseUpWrapper_);
+    browserEvents.unbind(this.onMouseUpWrapper_);
   }
   if (this.svgGroup_) {
-    Blockly.utils.dom.removeNode(this.svgGroup_);
+    dom.removeNode(this.svgGroup_);
   }
   if (this.svgText_) {
     this.workspace_.getThemeManager().unsubscribe(this.svgText_);
@@ -306,7 +307,7 @@ FlyoutButton.prototype.onMouseUp_ = function(e) {
 /**
  * CSS for buttons and labels.  See css.js for use.
  */
-Blockly.Css.register([
+Css.register([
   /* eslint-disable indent */
   '.blocklyFlyoutButton {',
     'fill: #888;',

From 6a43f7c9b7f04bbc355bb0fb1a9b7313d4cabfd4 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 15:04:19 -0700
Subject: [PATCH 253/833] clang-format core/flyout_button.js

---
 core/flyout_button.js | 57 ++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/core/flyout_button.js b/core/flyout_button.js
index 372060237..db05ca4f4 100644
--- a/core/flyout_button.js
+++ b/core/flyout_button.js
@@ -77,8 +77,8 @@ const FlyoutButton = function(workspace, targetWorkspace, json, isLabel) {
    * @private
    */
   this.callbackKey_ = json['callbackKey'] ||
-  /* Check the lower case version too to satisfy IE */
-                      json['callbackkey'];
+      /* Check the lower case version too to satisfy IE */
+      json['callbackkey'];
 
   /**
    * If specified, a CSS class to add to this button.
@@ -134,33 +134,33 @@ FlyoutButton.prototype.createDom = function() {
   }
 
   this.svgGroup_ = dom.createSvgElement(
-      Svg.G, {'class': cssClass},
-      this.workspace_.getCanvas());
+      Svg.G, {'class': cssClass}, this.workspace_.getCanvas());
 
   let shadow;
   if (!this.isLabel_) {
     // Shadow rectangle (light source does not mirror in RTL).
     shadow = dom.createSvgElement(
-        Svg.RECT,
-        {
+        Svg.RECT, {
           'class': 'blocklyFlyoutButtonShadow',
-          'rx': 4, 'ry': 4, 'x': 1, 'y': 1
+          'rx': 4,
+          'ry': 4,
+          'x': 1,
+          'y': 1
         },
         this.svgGroup_);
   }
   // Background rectangle.
   const rect = dom.createSvgElement(
-      Svg.RECT,
-      {
-        'class': this.isLabel_ ?
-            'blocklyFlyoutLabelBackground' : 'blocklyFlyoutButtonBackground',
-        'rx': 4, 'ry': 4
+      Svg.RECT, {
+        'class': this.isLabel_ ? 'blocklyFlyoutLabelBackground' :
+                                 'blocklyFlyoutButtonBackground',
+        'rx': 4,
+        'ry': 4
       },
       this.svgGroup_);
 
   const svgText = dom.createSvgElement(
-      Svg.TEXT,
-      {
+      Svg.TEXT, {
         'class': this.isLabel_ ? 'blocklyFlyoutLabelText' : 'blocklyText',
         'x': 0,
         'y': 0,
@@ -175,17 +175,17 @@ FlyoutButton.prototype.createDom = function() {
   svgText.textContent = text;
   if (this.isLabel_) {
     this.svgText_ = svgText;
-    this.workspace_.getThemeManager().subscribe(this.svgText_,
-        'flyoutForegroundColour', 'fill');
+    this.workspace_.getThemeManager().subscribe(
+        this.svgText_, 'flyoutForegroundColour', 'fill');
   }
 
   const fontSize = style.getComputedStyle(svgText, 'fontSize');
   const fontWeight = style.getComputedStyle(svgText, 'fontWeight');
   const fontFamily = style.getComputedStyle(svgText, 'fontFamily');
-  this.width = dom.getFastTextWidthWithSizeString(svgText,
-      fontSize, fontWeight, fontFamily);
-  const fontMetrics = dom.measureFontMetrics(text, fontSize,
-      fontWeight, fontFamily);
+  this.width = dom.getFastTextWidthWithSizeString(
+      svgText, fontSize, fontWeight, fontFamily);
+  const fontMetrics =
+      dom.measureFontMetrics(text, fontSize, fontWeight, fontFamily);
   this.height = fontMetrics.height;
 
   if (!this.isLabel_) {
@@ -198,8 +198,8 @@ FlyoutButton.prototype.createDom = function() {
   rect.setAttribute('height', this.height);
 
   svgText.setAttribute('x', this.width / 2);
-  svgText.setAttribute('y', this.height / 2 - fontMetrics.height / 2 +
-      fontMetrics.baseline);
+  svgText.setAttribute(
+      'y', this.height / 2 - fontMetrics.height / 2 + fontMetrics.baseline);
 
   this.updateTransform_();
 
@@ -221,7 +221,8 @@ FlyoutButton.prototype.show = function() {
  * @private
  */
 FlyoutButton.prototype.updateTransform_ = function() {
-  this.svgGroup_.setAttribute('transform',
+  this.svgGroup_.setAttribute(
+      'transform',
       'translate(' + this.position_.x + ',' + this.position_.y + ')');
 };
 
@@ -296,8 +297,10 @@ FlyoutButton.prototype.onMouseUp_ = function(e) {
 
   if (this.isLabel_ && this.callbackKey_) {
     console.warn('Labels should not have callbacks. Label text: ' + this.text_);
-  } else if (!this.isLabel_ && !(this.callbackKey_ &&
-      this.targetWorkspace_.getButtonCallback(this.callbackKey_))) {
+  } else if (
+      !this.isLabel_ &&
+      !(this.callbackKey_ &&
+        this.targetWorkspace_.getButtonCallback(this.callbackKey_))) {
     console.warn('Buttons should have callbacks. Button text: ' + this.text_);
   } else if (!this.isLabel_) {
     this.targetWorkspace_.getButtonCallback(this.callbackKey_)(this);
@@ -326,9 +329,7 @@ Css.register([
     'cursor: default;',
   '}',
 
-  '.blocklyFlyoutLabelBackground {',
-    'opacity: 0;',
-  '}',
+  '.blocklyFlyoutLabelBackground {', 'opacity: 0;', '}',
   /* eslint-enable indent */
 ]);
 

From 8cb794feb5f9285476c6fdff6e7467881535afcf Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 22 Jul 2021 16:36:30 -0700
Subject: [PATCH 254/833] Suppress unused vars

---
 core/menu.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/menu.js b/core/menu.js
index 083d76e06..6a1667964 100644
--- a/core/menu.js
+++ b/core/menu.js
@@ -14,6 +14,7 @@ goog.module('Blockly.Menu');
 goog.module.declareLegacyNamespace();
 
 const Coordinate = goog.require('Blockly.utils.Coordinate');
+/* eslint-disable-next-line no-unused-vars */
 const MenuItem = goog.requireType('Blockly.MenuItem');
 const KeyCodes = goog.require('Blockly.utils.KeyCodes');
 const Size = goog.requireType('Blockly.utils.Size');

From 39f5b4c7cd606602cffa70a1b8d2f60d3f794296 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 22 Jul 2021 16:49:01 -0700
Subject: [PATCH 255/833] Fixes lint warnings

---
 core/menu.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/menu.js b/core/menu.js
index 6a1667964..91cfb4d36 100644
--- a/core/menu.js
+++ b/core/menu.js
@@ -17,6 +17,7 @@ const Coordinate = goog.require('Blockly.utils.Coordinate');
 /* eslint-disable-next-line no-unused-vars */
 const MenuItem = goog.requireType('Blockly.MenuItem');
 const KeyCodes = goog.require('Blockly.utils.KeyCodes');
+/* eslint-disable-next-line no-unused-vars */
 const Size = goog.requireType('Blockly.utils.Size');
 const aria = goog.require('Blockly.utils.aria');
 const browserEvents = goog.require('Blockly.browserEvents');

From b07c6869ba6cc42b80db3c8a9b458d04b930fc20 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 21 Jul 2021 15:45:28 -0700
Subject: [PATCH 256/833] Migrate core/field_label_serializable.js to ES6
 const/let

---
 core/field_label_serializable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/field_label_serializable.js b/core/field_label_serializable.js
index 0201db130..0d1acf52a 100644
--- a/core/field_label_serializable.js
+++ b/core/field_label_serializable.js
@@ -47,7 +47,7 @@ Blockly.utils.object.inherits(Blockly.FieldLabelSerializable,
  * @nocollapse
  */
 Blockly.FieldLabelSerializable.fromJson = function(options) {
-  var text = Blockly.utils.replaceMessageReferences(options['text']);
+  const text = Blockly.utils.replaceMessageReferences(options['text']);
   // `this` might be a subclass of FieldLabelSerializable if that class doesn't
   // override the static fromJson method.
   return new this(text, undefined, options);

From 20ef2462b5bdaf24d0e2d527ca63e8bb25e806cc Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 21 Jul 2021 15:45:40 -0700
Subject: [PATCH 257/833] Migrate core/field_label_serializable.js to
 goog.module

---
 core/field_label_serializable.js | 21 ++++++++++++---------
 tests/deps.js                    |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/core/field_label_serializable.js b/core/field_label_serializable.js
index 0d1acf52a..77784eb4c 100644
--- a/core/field_label_serializable.js
+++ b/core/field_label_serializable.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.FieldLabelSerializable');
+goog.module('Blockly.FieldLabelSerializable');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.FieldLabel');
 goog.require('Blockly.fieldRegistry');
@@ -31,22 +32,22 @@ goog.require('Blockly.utils.object');
  * @constructor
  *
  */
-Blockly.FieldLabelSerializable = function(opt_value, opt_class, opt_config) {
-  Blockly.FieldLabelSerializable.superClass_.constructor.call(
+const FieldLabelSerializable = function(opt_value, opt_class, opt_config) {
+  FieldLabelSerializable.superClass_.constructor.call(
       this, opt_value, opt_class, opt_config);
 };
-Blockly.utils.object.inherits(Blockly.FieldLabelSerializable,
+Blockly.utils.object.inherits(FieldLabelSerializable,
     Blockly.FieldLabel);
 
 /**
  * Construct a FieldLabelSerializable from a JSON arg object,
  * dereferencing any string table references.
  * @param {!Object} options A JSON object with options (text, and class).
- * @return {!Blockly.FieldLabelSerializable} The new field instance.
+ * @return {!FieldLabelSerializable} The new field instance.
  * @package
  * @nocollapse
  */
-Blockly.FieldLabelSerializable.fromJson = function(options) {
+FieldLabelSerializable.fromJson = function(options) {
   const text = Blockly.utils.replaceMessageReferences(options['text']);
   // `this` might be a subclass of FieldLabelSerializable if that class doesn't
   // override the static fromJson method.
@@ -58,14 +59,16 @@ Blockly.FieldLabelSerializable.fromJson = function(options) {
  * editable. This field should not.
  * @type {boolean}
  */
-Blockly.FieldLabelSerializable.prototype.EDITABLE = false;
+FieldLabelSerializable.prototype.EDITABLE = false;
 
 /**
  * Serializable fields are saved by the XML renderer, non-serializable fields
  * are not.  This field should be serialized, but only edited programmatically.
  * @type {boolean}
  */
-Blockly.FieldLabelSerializable.prototype.SERIALIZABLE = true;
+FieldLabelSerializable.prototype.SERIALIZABLE = true;
 
 Blockly.fieldRegistry.register(
-    'field_label_serializable', Blockly.FieldLabelSerializable);
+    'field_label_serializable', FieldLabelSerializable);
+
+exports = FieldLabelSerializable;
diff --git a/tests/deps.js b/tests/deps.js
index d02bbc5ea..226f67c0f 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -55,7 +55,7 @@ goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Bloc
 goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['Blockly.DropDownDiv', 'Blockly.Field', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.object']);
-goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabelSerializable'], ['Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.object']);
+goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabelSerializable'], ['Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es5'});
 goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});

From bcb57b7efd721878e275255ac4b09fc18064fced Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 21 Jul 2021 15:45:51 -0700
Subject: [PATCH 258/833] Migrate core/field_label_serializable.js named
 requires

---
 core/field_label_serializable.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/field_label_serializable.js b/core/field_label_serializable.js
index 77784eb4c..828a9954b 100644
--- a/core/field_label_serializable.js
+++ b/core/field_label_serializable.js
@@ -14,10 +14,10 @@
 goog.module('Blockly.FieldLabelSerializable');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.FieldLabel');
-goog.require('Blockly.fieldRegistry');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.object');
+const FieldLabel = goog.require('Blockly.FieldLabel');
+const fieldRegistry = goog.require('Blockly.fieldRegistry');
+const {inherits} = goog.require('Blockly.utils.object');
+const {replaceMessageReferences} = goog.require('Blockly.utils');
 
 
 /**
@@ -28,7 +28,7 @@ goog.require('Blockly.utils.object');
  * @param {Object=} opt_config A map of options used to configure the field.
  *    See the [field creation documentation]{@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/label-serializable#creation}
  *    for a list of properties this parameter supports.
- * @extends {Blockly.FieldLabel}
+ * @extends {FieldLabel}
  * @constructor
  *
  */
@@ -36,8 +36,8 @@ const FieldLabelSerializable = function(opt_value, opt_class, opt_config) {
   FieldLabelSerializable.superClass_.constructor.call(
       this, opt_value, opt_class, opt_config);
 };
-Blockly.utils.object.inherits(FieldLabelSerializable,
-    Blockly.FieldLabel);
+inherits(FieldLabelSerializable,
+    FieldLabel);
 
 /**
  * Construct a FieldLabelSerializable from a JSON arg object,
@@ -48,7 +48,7 @@ Blockly.utils.object.inherits(FieldLabelSerializable,
  * @nocollapse
  */
 FieldLabelSerializable.fromJson = function(options) {
-  const text = Blockly.utils.replaceMessageReferences(options['text']);
+  const text = replaceMessageReferences(options['text']);
   // `this` might be a subclass of FieldLabelSerializable if that class doesn't
   // override the static fromJson method.
   return new this(text, undefined, options);
@@ -68,7 +68,7 @@ FieldLabelSerializable.prototype.EDITABLE = false;
  */
 FieldLabelSerializable.prototype.SERIALIZABLE = true;
 
-Blockly.fieldRegistry.register(
+fieldRegistry.register(
     'field_label_serializable', FieldLabelSerializable);
 
 exports = FieldLabelSerializable;

From 569a86901ea7888678d7364e96a1d6b99284d103 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 22 Jul 2021 10:08:45 -0700
Subject: [PATCH 259/833] clang-format core/field_label_serializable.js

---
 core/field_label_serializable.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/field_label_serializable.js b/core/field_label_serializable.js
index 828a9954b..daabaa59f 100644
--- a/core/field_label_serializable.js
+++ b/core/field_label_serializable.js
@@ -26,7 +26,8 @@ const {replaceMessageReferences} = goog.require('Blockly.utils');
  *    string. Defaults to an empty string if null or undefined.
  * @param {string=} opt_class Optional CSS class for the field's text.
  * @param {Object=} opt_config A map of options used to configure the field.
- *    See the [field creation documentation]{@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/label-serializable#creation}
+ *    See the [field creation documentation]{@link
+ * https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/label-serializable#creation}
  *    for a list of properties this parameter supports.
  * @extends {FieldLabel}
  * @constructor
@@ -36,8 +37,7 @@ const FieldLabelSerializable = function(opt_value, opt_class, opt_config) {
   FieldLabelSerializable.superClass_.constructor.call(
       this, opt_value, opt_class, opt_config);
 };
-inherits(FieldLabelSerializable,
-    FieldLabel);
+inherits(FieldLabelSerializable, FieldLabel);
 
 /**
  * Construct a FieldLabelSerializable from a JSON arg object,
@@ -68,7 +68,6 @@ FieldLabelSerializable.prototype.EDITABLE = false;
  */
 FieldLabelSerializable.prototype.SERIALIZABLE = true;
 
-fieldRegistry.register(
-    'field_label_serializable', FieldLabelSerializable);
+fieldRegistry.register('field_label_serializable', FieldLabelSerializable);
 
 exports = FieldLabelSerializable;

From 60c03cef4fd495cb2a23dc25ce00d70d9e2b89bd Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 21 Jul 2021 15:23:23 -0700
Subject: [PATCH 260/833] Migrate core/field_image.js to ES6 const/let

---
 core/field_image.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/field_image.js b/core/field_image.js
index eed381b63..163941efb 100644
--- a/core/field_image.js
+++ b/core/field_image.js
@@ -44,8 +44,8 @@ Blockly.FieldImage = function(src, width, height,
     throw Error('Src value of an image field is required');
   }
   src = Blockly.utils.replaceMessageReferences(src);
-  var imageHeight = Number(Blockly.utils.replaceMessageReferences(height));
-  var imageWidth = Number(Blockly.utils.replaceMessageReferences(width));
+  const imageHeight = Number(Blockly.utils.replaceMessageReferences(height));
+  const imageWidth = Number(Blockly.utils.replaceMessageReferences(width));
   if (isNaN(imageHeight) || isNaN(imageWidth)) {
     throw Error('Height and width values of an image field must cast to' +
       ' numbers.');

From f1882fc2180949292db8f5961ffa8308ff254c26 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 21 Jul 2021 15:23:35 -0700
Subject: [PATCH 261/833] Migrate core/field_image.js to goog.module

---
 core/field_image.js | 55 ++++++++++++++++++++++++---------------------
 tests/deps.js       |  2 +-
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/core/field_image.js b/core/field_image.js
index 163941efb..68a1fb43c 100644
--- a/core/field_image.js
+++ b/core/field_image.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.FieldImage');
+goog.module('Blockly.FieldImage');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Field');
 goog.require('Blockly.fieldRegistry');
@@ -27,7 +28,7 @@ goog.require('Blockly.utils.Svg');
  * @param {!(string|number)} width Width of the image.
  * @param {!(string|number)} height Height of the image.
  * @param {string=} opt_alt Optional alt text for when block is collapsed.
- * @param {function(!Blockly.FieldImage)=} opt_onClick Optional function to be
+ * @param {function(!FieldImage)=} opt_onClick Optional function to be
  *     called when the image is clicked. If opt_onClick is defined, opt_alt must
  *     also be defined.
  * @param {boolean=} opt_flipRtl Whether to flip the icon in RTL.
@@ -37,7 +38,7 @@ goog.require('Blockly.utils.Svg');
  * @extends {Blockly.Field}
  * @constructor
  */
-Blockly.FieldImage = function(src, width, height,
+const FieldImage = function(src, width, height,
     opt_alt, opt_onClick, opt_flipRtl, opt_config) {
   // Return early.
   if (!src) {
@@ -70,7 +71,7 @@ Blockly.FieldImage = function(src, width, height,
    */
   this.altText_ = '';
 
-  Blockly.FieldImage.superClass_.constructor.call(
+  FieldImage.superClass_.constructor.call(
       this, src, null, opt_config);
 
   if (!opt_config) {  // If the config wasn't passed, do old configuration.
@@ -86,7 +87,7 @@ Blockly.FieldImage = function(src, width, height,
    * @override
    */
   this.size_ = new Blockly.utils.Size(imageWidth,
-      imageHeight + Blockly.FieldImage.Y_PADDING);
+      imageHeight + FieldImage.Y_PADDING);
 
   /**
    * Store the image height, since it is different from the field height.
@@ -97,7 +98,7 @@ Blockly.FieldImage = function(src, width, height,
 
   /**
    * The function to be called when this field is clicked.
-   * @type {?function(!Blockly.FieldImage)}
+   * @type {?function(!FieldImage)}
    * @private
    */
   this.clickHandler_ = null;
@@ -113,25 +114,25 @@ Blockly.FieldImage = function(src, width, height,
    */
   this.imageElement_ = null;
 };
-Blockly.utils.object.inherits(Blockly.FieldImage, Blockly.Field);
+Blockly.utils.object.inherits(FieldImage, Blockly.Field);
 
 /**
  * The default value for this field.
  * @type {*}
  * @protected
  */
-Blockly.FieldImage.prototype.DEFAULT_VALUE = '';
+FieldImage.prototype.DEFAULT_VALUE = '';
 
 /**
  * Construct a FieldImage from a JSON arg object,
  * dereferencing any string table references.
  * @param {!Object} options A JSON object with options (src, width, height,
  *    alt, and flipRtl).
- * @return {!Blockly.FieldImage} The new field instance.
+ * @return {!FieldImage} The new field instance.
  * @package
  * @nocollapse
  */
-Blockly.FieldImage.fromJson = function(options) {
+FieldImage.fromJson = function(options) {
   // `this` might be a subclass of FieldImage if that class doesn't override
   // the static fromJson method.
   return new this(options['src'], options['width'], options['height'],
@@ -144,14 +145,14 @@ Blockly.FieldImage.fromJson = function(options) {
  * @type {number}
  * @private
  */
-Blockly.FieldImage.Y_PADDING = 1;
+FieldImage.Y_PADDING = 1;
 
 /**
  * Editable fields usually show some sort of UI indicating they are
  * editable. This field should not.
  * @type {boolean}
  */
-Blockly.FieldImage.prototype.EDITABLE = false;
+FieldImage.prototype.EDITABLE = false;
 
 /**
  * Used to tell if the field needs to be rendered the next time the block is
@@ -160,7 +161,7 @@ Blockly.FieldImage.prototype.EDITABLE = false;
  * @type {boolean}
  * @protected
  */
-Blockly.FieldImage.prototype.isDirty_ = false;
+FieldImage.prototype.isDirty_ = false;
 
 /**
  * Configure the field based on the given map of options.
@@ -168,8 +169,8 @@ Blockly.FieldImage.prototype.isDirty_ = false;
  * @protected
  * @override
  */
-Blockly.FieldImage.prototype.configure_ = function(config) {
-  Blockly.FieldImage.superClass_.configure_.call(this, config);
+FieldImage.prototype.configure_ = function(config) {
+  FieldImage.superClass_.configure_.call(this, config);
   this.flipRtl_ = !!config['flipRtl'];
   this.altText_ = Blockly.utils.replaceMessageReferences(config['alt']) || '';
 };
@@ -178,7 +179,7 @@ Blockly.FieldImage.prototype.configure_ = function(config) {
  * Create the block UI for this image.
  * @package
  */
-Blockly.FieldImage.prototype.initView = function() {
+FieldImage.prototype.initView = function() {
   this.imageElement_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.IMAGE,
       {
@@ -198,7 +199,7 @@ Blockly.FieldImage.prototype.initView = function() {
 /**
  * @override
  */
-Blockly.FieldImage.prototype.updateSize_ = function() {
+FieldImage.prototype.updateSize_ = function() {
   // NOP
 };
 
@@ -208,7 +209,7 @@ Blockly.FieldImage.prototype.updateSize_ = function() {
  * @return {?string} A string, or null if invalid.
  * @protected
  */
-Blockly.FieldImage.prototype.doClassValidation_ = function(opt_newValue) {
+FieldImage.prototype.doClassValidation_ = function(opt_newValue) {
   if (typeof opt_newValue != 'string') {
     return null;
   }
@@ -221,7 +222,7 @@ Blockly.FieldImage.prototype.doClassValidation_ = function(opt_newValue) {
  * that this is a string.
  * @protected
  */
-Blockly.FieldImage.prototype.doValueUpdate_ = function(newValue) {
+FieldImage.prototype.doValueUpdate_ = function(newValue) {
   this.value_ = newValue;
   if (this.imageElement_) {
     this.imageElement_.setAttributeNS(Blockly.utils.dom.XLINK_NS,
@@ -234,7 +235,7 @@ Blockly.FieldImage.prototype.doValueUpdate_ = function(newValue) {
  * @return {boolean} True if we should flip in RTL.
  * @override
  */
-Blockly.FieldImage.prototype.getFlipRtl = function() {
+FieldImage.prototype.getFlipRtl = function() {
   return this.flipRtl_;
 };
 
@@ -243,7 +244,7 @@ Blockly.FieldImage.prototype.getFlipRtl = function() {
  * @param {?string} alt New alt text.
  * @public
  */
-Blockly.FieldImage.prototype.setAlt = function(alt) {
+FieldImage.prototype.setAlt = function(alt) {
   if (alt == this.altText_) {
     return;
   }
@@ -258,7 +259,7 @@ Blockly.FieldImage.prototype.setAlt = function(alt) {
  * call the handler.
  * @protected
  */
-Blockly.FieldImage.prototype.showEditor_ = function() {
+FieldImage.prototype.showEditor_ = function() {
   if (this.clickHandler_) {
     this.clickHandler_(this);
   }
@@ -266,10 +267,10 @@ Blockly.FieldImage.prototype.showEditor_ = function() {
 
 /**
  * Set the function that is called when this image  is clicked.
- * @param {?function(!Blockly.FieldImage)} func The function that is called
+ * @param {?function(!FieldImage)} func The function that is called
  *    when the image is clicked, or null to remove.
  */
-Blockly.FieldImage.prototype.setOnClickHandler = function(func) {
+FieldImage.prototype.setOnClickHandler = function(func) {
   this.clickHandler_ = func;
 };
 
@@ -281,8 +282,10 @@ Blockly.FieldImage.prototype.setOnClickHandler = function(func) {
  * @protected
  * @override
  */
-Blockly.FieldImage.prototype.getText_ = function() {
+FieldImage.prototype.getText_ = function() {
   return this.altText_;
 };
 
-Blockly.fieldRegistry.register('field_image', Blockly.FieldImage);
+Blockly.fieldRegistry.register('field_image', FieldImage);
+
+exports = FieldImage;
diff --git a/tests/deps.js b/tests/deps.js
index 226f67c0f..77f7d15a2 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -53,7 +53,7 @@ goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockl
 goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.IdGenerator', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['Blockly.DropDownDiv', 'Blockly.Field', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabelSerializable'], ['Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es5'});

From 8a934b0e9c27871561679bca3e502a51f41b16ec Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 21 Jul 2021 15:24:07 -0700
Subject: [PATCH 262/833] Migrate core/field_image.js named requires

---
 core/field_image.js | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/core/field_image.js b/core/field_image.js
index 68a1fb43c..09c814a1b 100644
--- a/core/field_image.js
+++ b/core/field_image.js
@@ -13,13 +13,13 @@
 goog.module('Blockly.FieldImage');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Field');
-goog.require('Blockly.fieldRegistry');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Size');
-goog.require('Blockly.utils.Svg');
+const Field = goog.require('Blockly.Field');
+const Size = goog.require('Blockly.utils.Size');
+const Svg = goog.require('Blockly.utils.Svg');
+const fieldRegistry = goog.require('Blockly.fieldRegistry');
+const {createSvgElement, XLINK_NS} = goog.require('Blockly.utils.dom');
+const {inherits} = goog.require('Blockly.utils.object');
+const {replaceMessageReferences} = goog.require('Blockly.utils');
 
 
 /**
@@ -35,7 +35,7 @@ goog.require('Blockly.utils.Svg');
  * @param {Object=} opt_config A map of options used to configure the field.
  *    See the [field creation documentation]{@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/image#creation}
  *    for a list of properties this parameter supports.
- * @extends {Blockly.Field}
+ * @extends {Field}
  * @constructor
  */
 const FieldImage = function(src, width, height,
@@ -44,9 +44,9 @@ const FieldImage = function(src, width, height,
   if (!src) {
     throw Error('Src value of an image field is required');
   }
-  src = Blockly.utils.replaceMessageReferences(src);
-  const imageHeight = Number(Blockly.utils.replaceMessageReferences(height));
-  const imageWidth = Number(Blockly.utils.replaceMessageReferences(width));
+  src = replaceMessageReferences(src);
+  const imageHeight = Number(replaceMessageReferences(height));
+  const imageWidth = Number(replaceMessageReferences(width));
   if (isNaN(imageHeight) || isNaN(imageWidth)) {
     throw Error('Height and width values of an image field must cast to' +
       ' numbers.');
@@ -76,17 +76,17 @@ const FieldImage = function(src, width, height,
 
   if (!opt_config) {  // If the config wasn't passed, do old configuration.
     this.flipRtl_ = !!opt_flipRtl;
-    this.altText_ = Blockly.utils.replaceMessageReferences(opt_alt) || '';
+    this.altText_ = replaceMessageReferences(opt_alt) || '';
   }
 
   // Initialize other properties.
   /**
    * The size of the area rendered by the field.
-   * @type {Blockly.utils.Size}
+   * @type {Size}
    * @protected
    * @override
    */
-  this.size_ = new Blockly.utils.Size(imageWidth,
+  this.size_ = new Size(imageWidth,
       imageHeight + FieldImage.Y_PADDING);
 
   /**
@@ -114,7 +114,7 @@ const FieldImage = function(src, width, height,
    */
   this.imageElement_ = null;
 };
-Blockly.utils.object.inherits(FieldImage, Blockly.Field);
+inherits(FieldImage, Field);
 
 /**
  * The default value for this field.
@@ -172,7 +172,7 @@ FieldImage.prototype.isDirty_ = false;
 FieldImage.prototype.configure_ = function(config) {
   FieldImage.superClass_.configure_.call(this, config);
   this.flipRtl_ = !!config['flipRtl'];
-  this.altText_ = Blockly.utils.replaceMessageReferences(config['alt']) || '';
+  this.altText_ = replaceMessageReferences(config['alt']) || '';
 };
 
 /**
@@ -180,15 +180,15 @@ FieldImage.prototype.configure_ = function(config) {
  * @package
  */
 FieldImage.prototype.initView = function() {
-  this.imageElement_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.IMAGE,
+  this.imageElement_ = createSvgElement(
+      Svg.IMAGE,
       {
         'height': this.imageHeight_ + 'px',
         'width': this.size_.width + 'px',
         'alt': this.altText_
       },
       this.fieldGroup_);
-  this.imageElement_.setAttributeNS(Blockly.utils.dom.XLINK_NS,
+  this.imageElement_.setAttributeNS(XLINK_NS,
       'xlink:href', /** @type {string} */ (this.value_));
 
   if (this.clickHandler_) {
@@ -225,7 +225,7 @@ FieldImage.prototype.doClassValidation_ = function(opt_newValue) {
 FieldImage.prototype.doValueUpdate_ = function(newValue) {
   this.value_ = newValue;
   if (this.imageElement_) {
-    this.imageElement_.setAttributeNS(Blockly.utils.dom.XLINK_NS,
+    this.imageElement_.setAttributeNS(XLINK_NS,
         'xlink:href', String(this.value_));
   }
 };
@@ -286,6 +286,6 @@ FieldImage.prototype.getText_ = function() {
   return this.altText_;
 };
 
-Blockly.fieldRegistry.register('field_image', FieldImage);
+fieldRegistry.register('field_image', FieldImage);
 
 exports = FieldImage;

From 8b815cd5b14976764b243dce5b9d625874baad5d Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 22 Jul 2021 10:41:35 -0700
Subject: [PATCH 263/833] clang-format core/field_image.js

---
 core/field_image.js | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/core/field_image.js b/core/field_image.js
index 09c814a1b..9edc92c56 100644
--- a/core/field_image.js
+++ b/core/field_image.js
@@ -33,13 +33,14 @@ const {replaceMessageReferences} = goog.require('Blockly.utils');
  *     also be defined.
  * @param {boolean=} opt_flipRtl Whether to flip the icon in RTL.
  * @param {Object=} opt_config A map of options used to configure the field.
- *    See the [field creation documentation]{@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/image#creation}
+ *    See the [field creation documentation]{@link
+ * https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/image#creation}
  *    for a list of properties this parameter supports.
  * @extends {Field}
  * @constructor
  */
-const FieldImage = function(src, width, height,
-    opt_alt, opt_onClick, opt_flipRtl, opt_config) {
+const FieldImage = function(
+    src, width, height, opt_alt, opt_onClick, opt_flipRtl, opt_config) {
   // Return early.
   if (!src) {
     throw Error('Src value of an image field is required');
@@ -48,12 +49,14 @@ const FieldImage = function(src, width, height,
   const imageHeight = Number(replaceMessageReferences(height));
   const imageWidth = Number(replaceMessageReferences(width));
   if (isNaN(imageHeight) || isNaN(imageWidth)) {
-    throw Error('Height and width values of an image field must cast to' +
-      ' numbers.');
+    throw Error(
+        'Height and width values of an image field must cast to' +
+        ' numbers.');
   }
   if (imageHeight <= 0 || imageWidth <= 0) {
-    throw Error('Height and width values of an image field must be greater' +
-      ' than 0.');
+    throw Error(
+        'Height and width values of an image field must be greater' +
+        ' than 0.');
   }
 
   // Initialize configurable properties.
@@ -71,8 +74,7 @@ const FieldImage = function(src, width, height,
    */
   this.altText_ = '';
 
-  FieldImage.superClass_.constructor.call(
-      this, src, null, opt_config);
+  FieldImage.superClass_.constructor.call(this, src, null, opt_config);
 
   if (!opt_config) {  // If the config wasn't passed, do old configuration.
     this.flipRtl_ = !!opt_flipRtl;
@@ -86,8 +88,7 @@ const FieldImage = function(src, width, height,
    * @protected
    * @override
    */
-  this.size_ = new Size(imageWidth,
-      imageHeight + FieldImage.Y_PADDING);
+  this.size_ = new Size(imageWidth, imageHeight + FieldImage.Y_PADDING);
 
   /**
    * Store the image height, since it is different from the field height.
@@ -135,8 +136,9 @@ FieldImage.prototype.DEFAULT_VALUE = '';
 FieldImage.fromJson = function(options) {
   // `this` might be a subclass of FieldImage if that class doesn't override
   // the static fromJson method.
-  return new this(options['src'], options['width'], options['height'],
-      undefined, undefined, undefined, options);
+  return new this(
+      options['src'], options['width'], options['height'], undefined, undefined,
+      undefined, options);
 };
 
 /**
@@ -181,15 +183,14 @@ FieldImage.prototype.configure_ = function(config) {
  */
 FieldImage.prototype.initView = function() {
   this.imageElement_ = createSvgElement(
-      Svg.IMAGE,
-      {
+      Svg.IMAGE, {
         'height': this.imageHeight_ + 'px',
         'width': this.size_.width + 'px',
         'alt': this.altText_
       },
       this.fieldGroup_);
-  this.imageElement_.setAttributeNS(XLINK_NS,
-      'xlink:href', /** @type {string} */ (this.value_));
+  this.imageElement_.setAttributeNS(
+      XLINK_NS, 'xlink:href', /** @type {string} */ (this.value_));
 
   if (this.clickHandler_) {
     this.imageElement_.style.cursor = 'pointer';
@@ -225,8 +226,8 @@ FieldImage.prototype.doClassValidation_ = function(opt_newValue) {
 FieldImage.prototype.doValueUpdate_ = function(newValue) {
   this.value_ = newValue;
   if (this.imageElement_) {
-    this.imageElement_.setAttributeNS(XLINK_NS,
-        'xlink:href', String(this.value_));
+    this.imageElement_.setAttributeNS(
+        XLINK_NS, 'xlink:href', String(this.value_));
   }
 };
 

From ae818c05261522af9ab105712ffb2004690a530d Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 21 Jul 2021 15:52:54 -0700
Subject: [PATCH 264/833] Migrate core/field_multilineinput.js to ES6 const/let

---
 core/field_multilineinput.js | 70 ++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 34 deletions(-)

diff --git a/core/field_multilineinput.js b/core/field_multilineinput.js
index 887d4007f..d57989b86 100644
--- a/core/field_multilineinput.js
+++ b/core/field_multilineinput.js
@@ -88,7 +88,7 @@ Blockly.FieldMultilineInput.prototype.configure_ = function(config) {
  * @nocollapse
  */
 Blockly.FieldMultilineInput.fromJson = function(options) {
-  var text = Blockly.utils.replaceMessageReferences(options['text']);
+  const text = Blockly.utils.replaceMessageReferences(options['text']);
   // `this` might be a subclass of FieldMultilineInput if that class doesn't
   // override the static fromJson method.
   return new this(text, undefined, options);
@@ -141,16 +141,17 @@ Blockly.FieldMultilineInput.prototype.initView = function() {
  * @override
  */
 Blockly.FieldMultilineInput.prototype.getDisplayText_ = function() {
-  var textLines = this.getText();
+  let textLines = this.getText();
   if (!textLines) {
     // Prevent the field from disappearing if empty.
     return Blockly.Field.NBSP;
   }
-  var lines = textLines.split('\n');
+  const lines = textLines.split('\n');
   textLines = '';
-  var displayLinesNumber = this.isOverflowedY_ ? this.maxLines_ : lines.length;
-  for (var i = 0; i < displayLinesNumber; i++) {
-    var text = lines[i];
+  const displayLinesNumber = this.isOverflowedY_ ? this.maxLines_
+      : lines.length;
+  for (let i = 0; i < displayLinesNumber; i++) {
+    let text = lines[i];
     if (text.length > this.maxDisplayLength) {
       // Truncate displayed string and add an ellipsis ('...').
       text = text.substring(0, this.maxDisplayLength - 4) + '...';
@@ -192,18 +193,18 @@ Blockly.FieldMultilineInput.prototype.doValueUpdate_ = function(newValue) {
  */
 Blockly.FieldMultilineInput.prototype.render_ = function() {
   // Remove all text group children.
-  var currentChild;
+  let currentChild;
   while ((currentChild = this.textGroup_.firstChild)) {
     this.textGroup_.removeChild(currentChild);
   }
 
   // Add in text elements into the group.
-  var lines = this.getDisplayText_().split('\n');
-  var y = 0;
-  for (var i = 0; i < lines.length; i++) {
-    var lineHeight = this.getConstants().FIELD_TEXT_HEIGHT +
+  const lines = this.getDisplayText_().split('\n');
+  let y = 0;
+  for (let i = 0; i < lines.length; i++) {
+    const lineHeight = this.getConstants().FIELD_TEXT_HEIGHT +
         this.getConstants().FIELD_BORDER_RECT_Y_PADDING;
-    var span = Blockly.utils.dom.createSvgElement(
+    const span = Blockly.utils.dom.createSvgElement(
         Blockly.utils.Svg.TEXT, {
           'class': 'blocklyText blocklyMultilineText',
           x: this.getConstants().FIELD_BORDER_RECT_X_PADDING,
@@ -252,12 +253,12 @@ Blockly.FieldMultilineInput.prototype.render_ = function() {
  * @protected
  */
 Blockly.FieldMultilineInput.prototype.updateSize_ = function() {
-  var nodes = this.textGroup_.childNodes;
-  var totalWidth = 0;
-  var totalHeight = 0;
+  const nodes = this.textGroup_.childNodes;
+  let totalWidth = 0;
+  let totalHeight = 0;
   for (var i = 0; i < nodes.length; i++) {
-    var tspan = /** @type {!Element} */ (nodes[i]);
-    var textWidth = Blockly.utils.dom.getTextWidth(tspan);
+    const tspan = /** @type {!Element} */ (nodes[i]);
+    const textWidth = Blockly.utils.dom.getTextWidth(tspan);
     if (textWidth > totalWidth) {
       totalWidth = textWidth;
     }
@@ -270,26 +271,27 @@ Blockly.FieldMultilineInput.prototype.updateSize_ = function() {
     // absolute longest line, even if it would be truncated after editing.
     // Otherwise we would get wrong editor width when there are more
     // lines than this.maxLines_.
-    var actualEditorLines = this.value_.split('\n');
-    var dummyTextElement = Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.TEXT,{'class': 'blocklyText blocklyMultilineText'});
-    var fontSize = this.getConstants().FIELD_TEXT_FONTSIZE;
-    var fontWeight = this.getConstants().FIELD_TEXT_FONTWEIGHT;
-    var fontFamily = this.getConstants().FIELD_TEXT_FONTFAMILY;
+    const actualEditorLines = this.value_.split('\n');
+    const dummyTextElement = Blockly.utils.dom.createSvgElement(
+        Blockly.utils.Svg.TEXT, {'class': 'blocklyText blocklyMultilineText'});
+    const fontSize = this.getConstants().FIELD_TEXT_FONTSIZE;
+    const fontWeight = this.getConstants().FIELD_TEXT_FONTWEIGHT;
+    const fontFamily = this.getConstants().FIELD_TEXT_FONTFAMILY;
 
     for (var i = 0; i < actualEditorLines.length; i++) {
       if (actualEditorLines[i].length > this.maxDisplayLength) {
         actualEditorLines[i] = actualEditorLines[i].substring(0, this.maxDisplayLength);
       }
       dummyTextElement.textContent = actualEditorLines[i];
-      var lineWidth = Blockly.utils.dom.getFastTextWidth(
+      const lineWidth = Blockly.utils.dom.getFastTextWidth(
           dummyTextElement, fontSize, fontWeight, fontFamily);
       if (lineWidth > totalWidth) {
         totalWidth = lineWidth;
       }
     }
 
-    var scrollbarWidth = this.htmlInput_.offsetWidth - this.htmlInput_.clientWidth;
+    const scrollbarWidth = this.htmlInput_.offsetWidth
+        - this.htmlInput_.clientWidth;
     totalWidth += scrollbarWidth;
   }
   if (this.borderRect_) {
@@ -325,23 +327,23 @@ Blockly.FieldMultilineInput.prototype.showEditor_ = function(_opt_e, opt_quietIn
  * @protected
  */
 Blockly.FieldMultilineInput.prototype.widgetCreate_ = function() {
-  var div = Blockly.WidgetDiv.DIV;
-  var scale = this.workspace_.getScale();
+  const div = Blockly.WidgetDiv.DIV;
+  const scale = this.workspace_.getScale();
 
-  var htmlInput =
-    /** @type {HTMLTextAreaElement} */ (document.createElement('textarea'));
+  const htmlInput =
+      /** @type {HTMLTextAreaElement} */ (document.createElement('textarea'));
   htmlInput.className = 'blocklyHtmlInput blocklyHtmlTextAreaInput';
   htmlInput.setAttribute('spellcheck', this.spellcheck_);
-  var fontSize = (this.getConstants().FIELD_TEXT_FONTSIZE * scale) + 'pt';
+  const fontSize = (this.getConstants().FIELD_TEXT_FONTSIZE * scale) + 'pt';
   div.style.fontSize = fontSize;
   htmlInput.style.fontSize = fontSize;
-  var borderRadius = (Blockly.FieldTextInput.BORDERRADIUS * scale) + 'px';
+  const borderRadius = (Blockly.FieldTextInput.BORDERRADIUS * scale) + 'px';
   htmlInput.style.borderRadius = borderRadius;
-  var paddingX = this.getConstants().FIELD_BORDER_RECT_X_PADDING * scale;
-  var paddingY = this.getConstants().FIELD_BORDER_RECT_Y_PADDING * scale / 2;
+  const paddingX = this.getConstants().FIELD_BORDER_RECT_X_PADDING * scale;
+  const paddingY = this.getConstants().FIELD_BORDER_RECT_Y_PADDING * scale / 2;
   htmlInput.style.padding = paddingY + 'px ' + paddingX + 'px ' + paddingY +
       'px ' + paddingX + 'px';
-  var lineHeight = this.getConstants().FIELD_TEXT_HEIGHT +
+  const lineHeight = this.getConstants().FIELD_TEXT_HEIGHT +
       this.getConstants().FIELD_BORDER_RECT_Y_PADDING;
   htmlInput.style.lineHeight = (lineHeight * scale) + 'px';
 

From 8af597761d267fde72c23794badeb35bb6c57a17 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 21 Jul 2021 15:53:18 -0700
Subject: [PATCH 265/833] Migrate core/field_multilineinput.js to goog.module

---
 core/field_multilineinput.js | 51 +++++++++++++++++++-----------------
 tests/deps.js                |  2 +-
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/core/field_multilineinput.js b/core/field_multilineinput.js
index d57989b86..ea6ed7531 100644
--- a/core/field_multilineinput.js
+++ b/core/field_multilineinput.js
@@ -12,7 +12,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.FieldMultilineInput');
+goog.module('Blockly.FieldMultilineInput');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Css');
 goog.require('Blockly.Field');
@@ -42,8 +43,8 @@ goog.require('Blockly.WidgetDiv');
  * @extends {Blockly.FieldTextInput}
  * @constructor
  */
-Blockly.FieldMultilineInput = function(opt_value, opt_validator, opt_config) {
-  Blockly.FieldMultilineInput.superClass_.constructor.call(this,
+const FieldMultilineInput = function(opt_value, opt_validator, opt_config) {
+  FieldMultilineInput.superClass_.constructor.call(this,
       opt_value, opt_validator, opt_config);
 
   /**
@@ -68,14 +69,14 @@ Blockly.FieldMultilineInput = function(opt_value, opt_validator, opt_config) {
    */
   this.isOverflowedY_ = false;
 };
-Blockly.utils.object.inherits(Blockly.FieldMultilineInput,
+Blockly.utils.object.inherits(FieldMultilineInput,
     Blockly.FieldTextInput);
 
 /**
  * @override
  */
-Blockly.FieldMultilineInput.prototype.configure_ = function(config) {
-  Blockly.FieldMultilineInput.superClass_.configure_.call(this, config);
+FieldMultilineInput.prototype.configure_ = function(config) {
+  FieldMultilineInput.superClass_.configure_.call(this, config);
   config.maxLines && this.setMaxLines(config.maxLines);
 };
 
@@ -83,11 +84,11 @@ Blockly.FieldMultilineInput.prototype.configure_ = function(config) {
  * Construct a FieldMultilineInput from a JSON arg object,
  * dereferencing any string table references.
  * @param {!Object} options A JSON object with options (text, and spellcheck).
- * @return {!Blockly.FieldMultilineInput} The new field instance.
+ * @return {!FieldMultilineInput} The new field instance.
  * @package
  * @nocollapse
  */
-Blockly.FieldMultilineInput.fromJson = function(options) {
+FieldMultilineInput.fromJson = function(options) {
   const text = Blockly.utils.replaceMessageReferences(options['text']);
   // `this` might be a subclass of FieldMultilineInput if that class doesn't
   // override the static fromJson method.
@@ -101,7 +102,7 @@ Blockly.FieldMultilineInput.fromJson = function(options) {
  * @return {!Element} The element containing info about the field's state.
  * @package
  */
-Blockly.FieldMultilineInput.prototype.toXml = function(fieldElement) {
+FieldMultilineInput.prototype.toXml = function(fieldElement) {
   // Replace '\n' characters with HTML-escaped equivalent '&#10'. This is
   // needed so the plain-text representation of the XML produced by
   // `Blockly.Xml.domToText` will appear on a single line (this is a limitation
@@ -117,7 +118,7 @@ Blockly.FieldMultilineInput.prototype.toXml = function(fieldElement) {
  *    field's state.
  * @package
  */
-Blockly.FieldMultilineInput.prototype.fromXml = function(fieldElement) {
+FieldMultilineInput.prototype.fromXml = function(fieldElement) {
   this.setValue(fieldElement.textContent.replace(/&#10;/g, '\n'));
 };
 
@@ -125,7 +126,7 @@ Blockly.FieldMultilineInput.prototype.fromXml = function(fieldElement) {
  * Create the block UI for this field.
  * @package
  */
-Blockly.FieldMultilineInput.prototype.initView = function() {
+FieldMultilineInput.prototype.initView = function() {
   this.createBorderRect_();
   this.textGroup_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.G, {
@@ -140,7 +141,7 @@ Blockly.FieldMultilineInput.prototype.initView = function() {
  * @protected
  * @override
  */
-Blockly.FieldMultilineInput.prototype.getDisplayText_ = function() {
+FieldMultilineInput.prototype.getDisplayText_ = function() {
   let textLines = this.getText();
   if (!textLines) {
     // Prevent the field from disappearing if empty.
@@ -182,8 +183,8 @@ Blockly.FieldMultilineInput.prototype.getDisplayText_ = function() {
  * that this is a string.
  * @protected
  */
-Blockly.FieldMultilineInput.prototype.doValueUpdate_ = function(newValue) {
-  Blockly.FieldMultilineInput.superClass_.doValueUpdate_.call(this, newValue);
+FieldMultilineInput.prototype.doValueUpdate_ = function(newValue) {
+  FieldMultilineInput.superClass_.doValueUpdate_.call(this, newValue);
   this.isOverflowedY_ = this.value_.split('\n').length > this.maxLines_;
 };
 
@@ -191,7 +192,7 @@ Blockly.FieldMultilineInput.prototype.doValueUpdate_ = function(newValue) {
  * Updates the text of the textElement.
  * @protected
  */
-Blockly.FieldMultilineInput.prototype.render_ = function() {
+FieldMultilineInput.prototype.render_ = function() {
   // Remove all text group children.
   let currentChild;
   while ((currentChild = this.textGroup_.firstChild)) {
@@ -252,7 +253,7 @@ Blockly.FieldMultilineInput.prototype.render_ = function() {
  * Updates the size of the field based on the text.
  * @protected
  */
-Blockly.FieldMultilineInput.prototype.updateSize_ = function() {
+FieldMultilineInput.prototype.updateSize_ = function() {
   const nodes = this.textGroup_.childNodes;
   let totalWidth = 0;
   let totalHeight = 0;
@@ -316,8 +317,8 @@ Blockly.FieldMultilineInput.prototype.updateSize_ = function() {
  *     focus.  Defaults to false.
  * @override
  */
-Blockly.FieldMultilineInput.prototype.showEditor_ = function(_opt_e, opt_quietInput) {
-  Blockly.FieldMultilineInput.superClass_.showEditor_.call(this, _opt_e, opt_quietInput);
+FieldMultilineInput.prototype.showEditor_ = function(_opt_e, opt_quietInput) {
+  FieldMultilineInput.superClass_.showEditor_.call(this, _opt_e, opt_quietInput);
   this.forceRerender();
 };
 
@@ -326,7 +327,7 @@ Blockly.FieldMultilineInput.prototype.showEditor_ = function(_opt_e, opt_quietIn
  * @return {!HTMLTextAreaElement} The newly created text input editor.
  * @protected
  */
-Blockly.FieldMultilineInput.prototype.widgetCreate_ = function() {
+FieldMultilineInput.prototype.widgetCreate_ = function() {
   const div = Blockly.WidgetDiv.DIV;
   const scale = this.workspace_.getScale();
 
@@ -369,7 +370,7 @@ Blockly.FieldMultilineInput.prototype.widgetCreate_ = function() {
  * @param {number} maxLines Defines the maximum number of lines allowed,
  *     before scrolling functionality is enabled.
  */
-Blockly.FieldMultilineInput.prototype.setMaxLines = function(maxLines) {
+FieldMultilineInput.prototype.setMaxLines = function(maxLines) {
   if (typeof maxLines === 'number' && maxLines > 0 && maxLines !== this.maxLines_) {
     this.maxLines_ = maxLines;
     this.forceRerender();
@@ -380,7 +381,7 @@ Blockly.FieldMultilineInput.prototype.setMaxLines = function(maxLines) {
  * Returns the maxLines config of this field.
  * @return {number} The maxLines config value.
  */
-Blockly.FieldMultilineInput.prototype.getMaxLines = function() {
+FieldMultilineInput.prototype.getMaxLines = function() {
   return this.maxLines_;
 };
 
@@ -390,9 +391,9 @@ Blockly.FieldMultilineInput.prototype.getMaxLines = function() {
  * @param {!Event} e Keyboard event.
  * @protected
  */
-Blockly.FieldMultilineInput.prototype.onHtmlInputKeyDown_ = function(e) {
+FieldMultilineInput.prototype.onHtmlInputKeyDown_ = function(e) {
   if (e.keyCode !== Blockly.utils.KeyCodes.ENTER) {
-    Blockly.FieldMultilineInput.superClass_.onHtmlInputKeyDown_.call(this, e);
+    FieldMultilineInput.superClass_.onHtmlInputKeyDown_.call(this, e);
   }
 };
 
@@ -415,4 +416,6 @@ Blockly.Css.register([
 ]);
 
 
-Blockly.fieldRegistry.register('field_multilinetext', Blockly.FieldMultilineInput);
+Blockly.fieldRegistry.register('field_multilinetext', FieldMultilineInput);
+
+exports = FieldMultilineInput;
diff --git a/tests/deps.js b/tests/deps.js
index 77f7d15a2..f62333982 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -56,7 +56,7 @@ goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['
 goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabelSerializable'], ['Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es5'});
+goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);

From d91f36eab9f4e9a3251d95967ffea3947166daf5 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 22 Jul 2021 10:51:10 -0700
Subject: [PATCH 266/833] Migrate core/field_multilineinput.js named requires

---
 core/field_multilineinput.js | 80 ++++++++++++++++++------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/core/field_multilineinput.js b/core/field_multilineinput.js
index ea6ed7531..f3872919a 100644
--- a/core/field_multilineinput.js
+++ b/core/field_multilineinput.js
@@ -15,18 +15,18 @@
 goog.module('Blockly.FieldMultilineInput');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Css');
-goog.require('Blockly.Field');
-goog.require('Blockly.fieldRegistry');
-goog.require('Blockly.FieldTextInput');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.aria');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.KeyCodes');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.userAgent');
-goog.require('Blockly.WidgetDiv');
+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');
+const fieldRegistry = goog.require('Blockly.fieldRegistry');
+const userAgent = goog.require('Blockly.utils.userAgent');
+const {inherits} = goog.require('Blockly.utils.object');
+const {replaceMessageReferences} = goog.require('Blockly.utils');
 
 
 /**
@@ -40,7 +40,7 @@ goog.require('Blockly.WidgetDiv');
  * @param {Object=} opt_config A map of options used to configure the field.
  *    See the [field creation documentation]{@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/multiline-text-input#creation}
  *    for a list of properties this parameter supports.
- * @extends {Blockly.FieldTextInput}
+ * @extends {FieldTextInput}
  * @constructor
  */
 const FieldMultilineInput = function(opt_value, opt_validator, opt_config) {
@@ -69,8 +69,8 @@ const FieldMultilineInput = function(opt_value, opt_validator, opt_config) {
    */
   this.isOverflowedY_ = false;
 };
-Blockly.utils.object.inherits(FieldMultilineInput,
-    Blockly.FieldTextInput);
+inherits(FieldMultilineInput,
+    FieldTextInput);
 
 /**
  * @override
@@ -89,7 +89,7 @@ FieldMultilineInput.prototype.configure_ = function(config) {
  * @nocollapse
  */
 FieldMultilineInput.fromJson = function(options) {
-  const text = Blockly.utils.replaceMessageReferences(options['text']);
+  const text = replaceMessageReferences(options['text']);
   // `this` might be a subclass of FieldMultilineInput if that class doesn't
   // override the static fromJson method.
   return new this(text, undefined, options);
@@ -128,8 +128,8 @@ FieldMultilineInput.prototype.fromXml = function(fieldElement) {
  */
 FieldMultilineInput.prototype.initView = function() {
   this.createBorderRect_();
-  this.textGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G, {
+  this.textGroup_ = dom.createSvgElement(
+      Svg.G, {
         'class': 'blocklyEditableText',
       }, this.fieldGroup_);
 };
@@ -145,7 +145,7 @@ FieldMultilineInput.prototype.getDisplayText_ = function() {
   let textLines = this.getText();
   if (!textLines) {
     // Prevent the field from disappearing if empty.
-    return Blockly.Field.NBSP;
+    return Field.NBSP;
   }
   const lines = textLines.split('\n');
   textLines = '';
@@ -160,7 +160,7 @@ FieldMultilineInput.prototype.getDisplayText_ = function() {
       text = text.substring(0, text.length - 3) + '...';
     }
     // Replace whitespace with non-breaking spaces so the text doesn't collapse.
-    text = text.replace(/\s/g, Blockly.Field.NBSP);
+    text = text.replace(/\s/g, Field.NBSP);
 
     textLines += text;
     if (i !== displayLinesNumber - 1) {
@@ -205,8 +205,8 @@ FieldMultilineInput.prototype.render_ = function() {
   for (let i = 0; i < lines.length; i++) {
     const lineHeight = this.getConstants().FIELD_TEXT_HEIGHT +
         this.getConstants().FIELD_BORDER_RECT_Y_PADDING;
-    const span = Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.TEXT, {
+    const span = dom.createSvgElement(
+        Svg.TEXT, {
           'class': 'blocklyText blocklyMultilineText',
           x: this.getConstants().FIELD_BORDER_RECT_X_PADDING,
           y: y + this.getConstants().FIELD_BORDER_RECT_Y_PADDING,
@@ -219,9 +219,9 @@ FieldMultilineInput.prototype.render_ = function() {
   if (this.isBeingEdited_) {
     var htmlInput = /** @type {!HTMLElement} */(this.htmlInput_);
     if (this.isOverflowedY_) {
-      Blockly.utils.dom.addClass(htmlInput, 'blocklyHtmlTextAreaInputOverflowedY');
+      dom.addClass(htmlInput, 'blocklyHtmlTextAreaInputOverflowedY');
     } else {
-      Blockly.utils.dom.removeClass(htmlInput, 'blocklyHtmlTextAreaInputOverflowedY');
+      dom.removeClass(htmlInput, 'blocklyHtmlTextAreaInputOverflowedY');
     }
   }
 
@@ -238,13 +238,13 @@ FieldMultilineInput.prototype.render_ = function() {
     }
     var htmlInput = /** @type {!HTMLElement} */(this.htmlInput_);
     if (!this.isTextValid_) {
-      Blockly.utils.dom.addClass(htmlInput, 'blocklyInvalidInput');
-      Blockly.utils.aria.setState(htmlInput,
-          Blockly.utils.aria.State.INVALID, true);
+      dom.addClass(htmlInput, 'blocklyInvalidInput');
+      aria.setState(htmlInput,
+          aria.State.INVALID, true);
     } else {
-      Blockly.utils.dom.removeClass(htmlInput, 'blocklyInvalidInput');
-      Blockly.utils.aria.setState(htmlInput,
-          Blockly.utils.aria.State.INVALID, false);
+      dom.removeClass(htmlInput, 'blocklyInvalidInput');
+      aria.setState(htmlInput,
+          aria.State.INVALID, false);
     }
   }
 };
@@ -259,7 +259,7 @@ FieldMultilineInput.prototype.updateSize_ = function() {
   let totalHeight = 0;
   for (var i = 0; i < nodes.length; i++) {
     const tspan = /** @type {!Element} */ (nodes[i]);
-    const textWidth = Blockly.utils.dom.getTextWidth(tspan);
+    const textWidth = dom.getTextWidth(tspan);
     if (textWidth > totalWidth) {
       totalWidth = textWidth;
     }
@@ -273,8 +273,8 @@ FieldMultilineInput.prototype.updateSize_ = function() {
     // Otherwise we would get wrong editor width when there are more
     // lines than this.maxLines_.
     const actualEditorLines = this.value_.split('\n');
-    const dummyTextElement = Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.TEXT, {'class': 'blocklyText blocklyMultilineText'});
+    const dummyTextElement = dom.createSvgElement(
+        Svg.TEXT, {'class': 'blocklyText blocklyMultilineText'});
     const fontSize = this.getConstants().FIELD_TEXT_FONTSIZE;
     const fontWeight = this.getConstants().FIELD_TEXT_FONTWEIGHT;
     const fontFamily = this.getConstants().FIELD_TEXT_FONTFAMILY;
@@ -284,7 +284,7 @@ FieldMultilineInput.prototype.updateSize_ = function() {
         actualEditorLines[i] = actualEditorLines[i].substring(0, this.maxDisplayLength);
       }
       dummyTextElement.textContent = actualEditorLines[i];
-      const lineWidth = Blockly.utils.dom.getFastTextWidth(
+      const lineWidth = dom.getFastTextWidth(
           dummyTextElement, fontSize, fontWeight, fontFamily);
       if (lineWidth > totalWidth) {
         totalWidth = lineWidth;
@@ -328,7 +328,7 @@ FieldMultilineInput.prototype.showEditor_ = function(_opt_e, opt_quietInput) {
  * @protected
  */
 FieldMultilineInput.prototype.widgetCreate_ = function() {
-  const div = Blockly.WidgetDiv.DIV;
+  const div = WidgetDiv.DIV;
   const scale = this.workspace_.getScale();
 
   const htmlInput =
@@ -338,7 +338,7 @@ FieldMultilineInput.prototype.widgetCreate_ = function() {
   const fontSize = (this.getConstants().FIELD_TEXT_FONTSIZE * scale) + 'pt';
   div.style.fontSize = fontSize;
   htmlInput.style.fontSize = fontSize;
-  const borderRadius = (Blockly.FieldTextInput.BORDERRADIUS * scale) + 'px';
+  const borderRadius = (FieldTextInput.BORDERRADIUS * scale) + 'px';
   htmlInput.style.borderRadius = borderRadius;
   const paddingX = this.getConstants().FIELD_BORDER_RECT_X_PADDING * scale;
   const paddingY = this.getConstants().FIELD_BORDER_RECT_Y_PADDING * scale / 2;
@@ -353,7 +353,7 @@ FieldMultilineInput.prototype.widgetCreate_ = function() {
   htmlInput.value = htmlInput.defaultValue = this.getEditorText_(this.value_);
   htmlInput.untypedDefaultValue_ = this.value_;
   htmlInput.oldValue_ = null;
-  if (Blockly.utils.userAgent.GECKO) {
+  if (userAgent.GECKO) {
     // In FF, ensure the browser reflows before resizing to avoid issue #2777.
     setTimeout(this.resizeEditor_.bind(this), 0);
   } else {
@@ -392,7 +392,7 @@ FieldMultilineInput.prototype.getMaxLines = function() {
  * @protected
  */
 FieldMultilineInput.prototype.onHtmlInputKeyDown_ = function(e) {
-  if (e.keyCode !== Blockly.utils.KeyCodes.ENTER) {
+  if (e.keyCode !== KeyCodes.ENTER) {
     FieldMultilineInput.superClass_.onHtmlInputKeyDown_.call(this, e);
   }
 };
@@ -400,7 +400,7 @@ FieldMultilineInput.prototype.onHtmlInputKeyDown_ = function(e) {
 /**
  * CSS for multiline field.  See css.js for use.
  */
-Blockly.Css.register([
+Css.register([
   /* eslint-disable indent */
   '.blocklyHtmlTextAreaInput {',
     'font-family: monospace;',
@@ -416,6 +416,6 @@ Blockly.Css.register([
 ]);
 
 
-Blockly.fieldRegistry.register('field_multilinetext', FieldMultilineInput);
+fieldRegistry.register('field_multilinetext', FieldMultilineInput);
 
 exports = FieldMultilineInput;

From aeac27661dacc3b01d9d6fb79ccf28b9b92681f5 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 22 Jul 2021 11:01:39 -0700
Subject: [PATCH 267/833] clang-format core/field_multilineinput.js

---
 core/field_multilineinput.js | 69 ++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/core/field_multilineinput.js b/core/field_multilineinput.js
index f3872919a..4842429a5 100644
--- a/core/field_multilineinput.js
+++ b/core/field_multilineinput.js
@@ -38,14 +38,15 @@ const {replaceMessageReferences} = goog.require('Blockly.utils');
  *     text as an argument and returns either the accepted text, a replacement
  *     text, or null to abort the change.
  * @param {Object=} opt_config A map of options used to configure the field.
- *    See the [field creation documentation]{@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/multiline-text-input#creation}
+ *    See the [field creation documentation]{@link
+ * https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/multiline-text-input#creation}
  *    for a list of properties this parameter supports.
  * @extends {FieldTextInput}
  * @constructor
  */
 const FieldMultilineInput = function(opt_value, opt_validator, opt_config) {
-  FieldMultilineInput.superClass_.constructor.call(this,
-      opt_value, opt_validator, opt_config);
+  FieldMultilineInput.superClass_.constructor.call(
+      this, opt_value, opt_validator, opt_config);
 
   /**
    * The SVG group element that will contain a text element for each text row
@@ -69,8 +70,7 @@ const FieldMultilineInput = function(opt_value, opt_validator, opt_config) {
    */
   this.isOverflowedY_ = false;
 };
-inherits(FieldMultilineInput,
-    FieldTextInput);
+inherits(FieldMultilineInput, FieldTextInput);
 
 /**
  * @override
@@ -131,7 +131,8 @@ FieldMultilineInput.prototype.initView = function() {
   this.textGroup_ = dom.createSvgElement(
       Svg.G, {
         'class': 'blocklyEditableText',
-      }, this.fieldGroup_);
+      },
+      this.fieldGroup_);
 };
 
 /**
@@ -149,8 +150,8 @@ FieldMultilineInput.prototype.getDisplayText_ = function() {
   }
   const lines = textLines.split('\n');
   textLines = '';
-  const displayLinesNumber = this.isOverflowedY_ ? this.maxLines_
-      : lines.length;
+  const displayLinesNumber =
+      this.isOverflowedY_ ? this.maxLines_ : lines.length;
   for (let i = 0; i < displayLinesNumber; i++) {
     let text = lines[i];
     if (text.length > this.maxDisplayLength) {
@@ -211,13 +212,14 @@ FieldMultilineInput.prototype.render_ = function() {
           x: this.getConstants().FIELD_BORDER_RECT_X_PADDING,
           y: y + this.getConstants().FIELD_BORDER_RECT_Y_PADDING,
           dy: this.getConstants().FIELD_TEXT_BASELINE
-        }, this.textGroup_);
+        },
+        this.textGroup_);
     span.appendChild(document.createTextNode(lines[i]));
     y += lineHeight;
   }
 
   if (this.isBeingEdited_) {
-    var htmlInput = /** @type {!HTMLElement} */(this.htmlInput_);
+    var htmlInput = /** @type {!HTMLElement} */ (this.htmlInput_);
     if (this.isOverflowedY_) {
       dom.addClass(htmlInput, 'blocklyHtmlTextAreaInputOverflowedY');
     } else {
@@ -236,15 +238,13 @@ FieldMultilineInput.prototype.render_ = function() {
     } else {
       this.resizeEditor_();
     }
-    var htmlInput = /** @type {!HTMLElement} */(this.htmlInput_);
+    var htmlInput = /** @type {!HTMLElement} */ (this.htmlInput_);
     if (!this.isTextValid_) {
       dom.addClass(htmlInput, 'blocklyInvalidInput');
-      aria.setState(htmlInput,
-          aria.State.INVALID, true);
+      aria.setState(htmlInput, aria.State.INVALID, true);
     } else {
       dom.removeClass(htmlInput, 'blocklyInvalidInput');
-      aria.setState(htmlInput,
-          aria.State.INVALID, false);
+      aria.setState(htmlInput, aria.State.INVALID, false);
     }
   }
 };
@@ -281,7 +281,8 @@ FieldMultilineInput.prototype.updateSize_ = function() {
 
     for (var i = 0; i < actualEditorLines.length; i++) {
       if (actualEditorLines[i].length > this.maxDisplayLength) {
-        actualEditorLines[i] = actualEditorLines[i].substring(0, this.maxDisplayLength);
+        actualEditorLines[i] =
+            actualEditorLines[i].substring(0, this.maxDisplayLength);
       }
       dummyTextElement.textContent = actualEditorLines[i];
       const lineWidth = dom.getFastTextWidth(
@@ -291,8 +292,8 @@ FieldMultilineInput.prototype.updateSize_ = function() {
       }
     }
 
-    const scrollbarWidth = this.htmlInput_.offsetWidth
-        - this.htmlInput_.clientWidth;
+    const scrollbarWidth =
+        this.htmlInput_.offsetWidth - this.htmlInput_.clientWidth;
     totalWidth += scrollbarWidth;
   }
   if (this.borderRect_) {
@@ -318,7 +319,8 @@ FieldMultilineInput.prototype.updateSize_ = function() {
  * @override
  */
 FieldMultilineInput.prototype.showEditor_ = function(_opt_e, opt_quietInput) {
-  FieldMultilineInput.superClass_.showEditor_.call(this, _opt_e, opt_quietInput);
+  FieldMultilineInput.superClass_.showEditor_.call(
+      this, _opt_e, opt_quietInput);
   this.forceRerender();
 };
 
@@ -342,8 +344,8 @@ FieldMultilineInput.prototype.widgetCreate_ = function() {
   htmlInput.style.borderRadius = borderRadius;
   const paddingX = this.getConstants().FIELD_BORDER_RECT_X_PADDING * scale;
   const paddingY = this.getConstants().FIELD_BORDER_RECT_Y_PADDING * scale / 2;
-  htmlInput.style.padding = paddingY + 'px ' + paddingX + 'px ' + paddingY +
-      'px ' + paddingX + 'px';
+  htmlInput.style.padding =
+      paddingY + 'px ' + paddingX + 'px ' + paddingY + 'px ' + paddingX + 'px';
   const lineHeight = this.getConstants().FIELD_TEXT_HEIGHT +
       this.getConstants().FIELD_BORDER_RECT_Y_PADDING;
   htmlInput.style.lineHeight = (lineHeight * scale) + 'px';
@@ -371,7 +373,8 @@ FieldMultilineInput.prototype.widgetCreate_ = function() {
  *     before scrolling functionality is enabled.
  */
 FieldMultilineInput.prototype.setMaxLines = function(maxLines) {
-  if (typeof maxLines === 'number' && maxLines > 0 && maxLines !== this.maxLines_) {
+  if (typeof maxLines === 'number' && maxLines > 0 &&
+      maxLines !== this.maxLines_) {
     this.maxLines_ = maxLines;
     this.forceRerender();
   }
@@ -401,18 +404,16 @@ FieldMultilineInput.prototype.onHtmlInputKeyDown_ = function(e) {
  * CSS for multiline field.  See css.js for use.
  */
 Css.register([
-  /* eslint-disable indent */
-  '.blocklyHtmlTextAreaInput {',
-    'font-family: monospace;',
-    'resize: none;',
-    'overflow: hidden;',
-    'height: 100%;',
-    'text-align: left;',
-  '}',
-  '.blocklyHtmlTextAreaInputOverflowedY {',
-    'overflow-y: scroll;',
-  '}'
-  /* eslint-enable indent */
+  `.blocklyHtmlTextAreaInput {
+  font-family: monospace;
+  resize: none;
+  overflow: hidden;
+  height: 100%;
+  text-align: left;
+}`,
+  `.blocklyHtmlTextAreaInputOverflowedY {
+  overflow-y: scroll;
+}`
 ]);
 
 

From b1f868fbafd01b8284f1e6155e71442303424b9b Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 08:02:15 -0700
Subject: [PATCH 268/833] Migrate core/flyout_horizontal.js to ES6 const/let

---
 core/flyout_horizontal.js | 103 +++++++++++++++++++-------------------
 1 file changed, 52 insertions(+), 51 deletions(-)

diff --git a/core/flyout_horizontal.js b/core/flyout_horizontal.js
index 66e9ff18e..3ec62518a 100644
--- a/core/flyout_horizontal.js
+++ b/core/flyout_horizontal.js
@@ -53,10 +53,10 @@ Blockly.HorizontalFlyout.prototype.setMetrics_ = function(xyRatio) {
     return;
   }
 
-  var metricsManager = this.workspace_.getMetricsManager();
-  var scrollMetrics = metricsManager.getScrollMetrics();
-  var viewMetrics = metricsManager.getViewMetrics();
-  var absoluteMetrics = metricsManager.getAbsoluteMetrics();
+  const metricsManager = this.workspace_.getMetricsManager();
+  const scrollMetrics = metricsManager.getScrollMetrics();
+  const viewMetrics = metricsManager.getViewMetrics();
+  const absoluteMetrics = metricsManager.getAbsoluteMetrics();
 
   if (typeof xyRatio.x == 'number') {
     this.workspace_.scrollX =
@@ -85,13 +85,13 @@ Blockly.HorizontalFlyout.prototype.getY = function() {
   if (!this.isVisible()) {
     return 0;
   }
-  var metricsManager = this.targetWorkspace.getMetricsManager();
-  var absoluteMetrics = metricsManager.getAbsoluteMetrics();
-  var viewMetrics = metricsManager.getViewMetrics();
-  var toolboxMetrics = metricsManager.getToolboxMetrics();
+  const metricsManager = this.targetWorkspace.getMetricsManager();
+  const absoluteMetrics = metricsManager.getAbsoluteMetrics();
+  const viewMetrics = metricsManager.getViewMetrics();
+  const toolboxMetrics = metricsManager.getToolboxMetrics();
 
-  var y = 0;
-  var atTop = this.toolboxPosition_ == Blockly.utils.toolbox.Position.TOP;
+  let y = 0;
+  const atTop = this.toolboxPosition_ == Blockly.utils.toolbox.Position.TOP;
   // If this flyout is not the trashcan flyout (e.g. toolbox or mutator).
   if (this.targetWorkspace.toolboxPosition == this.toolboxPosition_) {
     // If there is a category toolbox.
@@ -133,18 +133,18 @@ Blockly.HorizontalFlyout.prototype.position = function() {
   if (!this.isVisible() || !this.targetWorkspace.isVisible()) {
     return;
   }
-  var metricsManager = this.targetWorkspace.getMetricsManager();
-  var targetWorkspaceViewMetrics = metricsManager.getViewMetrics();
+  const metricsManager = this.targetWorkspace.getMetricsManager();
+  const targetWorkspaceViewMetrics = metricsManager.getViewMetrics();
 
   // Record the width for workspace metrics.
   this.width_ = targetWorkspaceViewMetrics.width;
 
-  var edgeWidth = targetWorkspaceViewMetrics.width - 2 * this.CORNER_RADIUS;
-  var edgeHeight = this.height_ - this.CORNER_RADIUS;
+  const edgeWidth = targetWorkspaceViewMetrics.width - 2 * this.CORNER_RADIUS;
+  const edgeHeight = this.height_ - this.CORNER_RADIUS;
   this.setBackgroundPath_(edgeWidth, edgeHeight);
 
-  var x = this.getX();
-  var y = this.getY();
+  const x = this.getX();
+  const y = this.getY();
 
   this.positionAt_(this.width_, this.height_, x, y);
 };
@@ -159,9 +159,9 @@ Blockly.HorizontalFlyout.prototype.position = function() {
  */
 Blockly.HorizontalFlyout.prototype.setBackgroundPath_ = function(
     width, height) {
-  var atTop = this.toolboxPosition_ == Blockly.utils.toolbox.Position.TOP;
+  const atTop = this.toolboxPosition_ == Blockly.utils.toolbox.Position.TOP;
   // Start at top left.
-  var path = ['M 0,' + (atTop ? 0 : this.CORNER_RADIUS)];
+  const path = ['M 0,' + (atTop ? 0 : this.CORNER_RADIUS)];
 
   if (atTop) {
     // Top.
@@ -206,15 +206,15 @@ Blockly.HorizontalFlyout.prototype.scrollToStart = function() {
  * @protected
  */
 Blockly.HorizontalFlyout.prototype.wheel_ = function(e) {
-  var scrollDelta = Blockly.utils.getScrollDeltaPixels(e);
-  var delta = scrollDelta.x || scrollDelta.y;
+  const scrollDelta = Blockly.utils.getScrollDeltaPixels(e);
+  const delta = scrollDelta.x || scrollDelta.y;
 
   if (delta) {
-    var metricsManager = this.workspace_.getMetricsManager();
-    var scrollMetrics = metricsManager.getScrollMetrics();
-    var viewMetrics = metricsManager.getViewMetrics();
+    const metricsManager = this.workspace_.getMetricsManager();
+    const scrollMetrics = metricsManager.getScrollMetrics();
+    const viewMetrics = metricsManager.getViewMetrics();
 
-    var pos = (viewMetrics.left - scrollMetrics.left) + delta;
+    const pos = (viewMetrics.left - scrollMetrics.left) + delta;
     this.workspace_.scrollbar.setX(pos);
     // When the flyout moves from a wheel event, hide WidgetDiv and DropDownDiv.
     Blockly.WidgetDiv.hide();
@@ -235,37 +235,38 @@ Blockly.HorizontalFlyout.prototype.wheel_ = function(e) {
  */
 Blockly.HorizontalFlyout.prototype.layout_ = function(contents, gaps) {
   this.workspace_.scale = this.targetWorkspace.scale;
-  var margin = this.MARGIN;
-  var cursorX = margin + this.tabWidth_;
-  var cursorY = margin;
+  const margin = this.MARGIN;
+  let cursorX = margin + this.tabWidth_;
+  const cursorY = margin;
   if (this.RTL) {
     contents = contents.reverse();
   }
 
-  for (var i = 0, item; (item = contents[i]); i++) {
+  for (let i = 0, item; (item = contents[i]); i++) {
     if (item.type == 'block') {
-      var block = item.block;
-      var allBlocks = block.getDescendants(false);
-      for (var j = 0, child; (child = allBlocks[j]); j++) {
+      const block = item.block;
+      const allBlocks = block.getDescendants(false);
+      for (let j = 0, child; (child = allBlocks[j]); j++) {
         // Mark blocks as being inside a flyout.  This is used to detect and
         // prevent the closure of the flyout if the user right-clicks on such a
         // block.
         child.isInFlyout = true;
       }
       block.render();
-      var root = block.getSvgRoot();
-      var blockHW = block.getHeightWidth();
+      const root = block.getSvgRoot();
+      const blockHW = block.getHeightWidth();
 
       // Figure out where to place the block.
-      var tab = block.outputConnection ? this.tabWidth_ : 0;
+      const tab = block.outputConnection ? this.tabWidth_ : 0;
+      let moveX;
       if (this.RTL) {
-        var moveX = cursorX + blockHW.width;
+        moveX = cursorX + blockHW.width;
       } else {
-        var moveX = cursorX - tab;
+        moveX = cursorX - tab;
       }
       block.moveBy(moveX, cursorY);
 
-      var rect = this.createRect_(block, moveX, cursorY, blockHW, i);
+      const rect = this.createRect_(block, moveX, cursorY, blockHW, i);
       cursorX += (blockHW.width + gaps[i]);
 
       this.addBlockListeners_(root, block, rect);
@@ -287,12 +288,12 @@ Blockly.HorizontalFlyout.prototype.layout_ = function(contents, gaps) {
  */
 Blockly.HorizontalFlyout.prototype.isDragTowardWorkspace = function(
     currentDragDeltaXY) {
-  var dx = currentDragDeltaXY.x;
-  var dy = currentDragDeltaXY.y;
+  const dx = currentDragDeltaXY.x;
+  const dy = currentDragDeltaXY.y;
   // Direction goes from -180 to 180, with 0 toward the right and 90 on top.
-  var dragDirection = Math.atan2(dy, dx) / Math.PI * 180;
+  const dragDirection = Math.atan2(dy, dx) / Math.PI * 180;
 
-  var range = this.dragAngleRange_;
+  const range = this.dragAngleRange_;
   // Check for up or down dragging.
   if ((dragDirection < 90 + range && dragDirection > 90 - range) ||
       (dragDirection > -90 - range && dragDirection < -90 + range)) {
@@ -314,15 +315,15 @@ Blockly.HorizontalFlyout.prototype.getClientRect = function() {
     return null;
   }
 
-  var flyoutRect = this.svgGroup_.getBoundingClientRect();
+  const flyoutRect = this.svgGroup_.getBoundingClientRect();
   // BIG_NUM is offscreen padding so that blocks dragged beyond the shown flyout
   // area are still deleted.  Must be larger than the largest screen size,
   // but be smaller than half Number.MAX_SAFE_INTEGER (not available on IE).
-  var BIG_NUM = 1000000000;
-  var top = flyoutRect.top;
+  const BIG_NUM = 1000000000;
+  const top = flyoutRect.top;
 
   if (this.toolboxPosition_ == Blockly.utils.toolbox.Position.TOP) {
-    var height = flyoutRect.height;
+    const height = flyoutRect.height;
     return new Blockly.utils.Rect(-BIG_NUM, top + height, -BIG_NUM, BIG_NUM);
   } else {  // Bottom.
     return new Blockly.utils.Rect(top, BIG_NUM, -BIG_NUM, BIG_NUM);
@@ -336,13 +337,13 @@ Blockly.HorizontalFlyout.prototype.getClientRect = function() {
  */
 Blockly.HorizontalFlyout.prototype.reflowInternal_ = function() {
   this.workspace_.scale = this.getFlyoutScale();
-  var flyoutHeight = 0;
-  var blocks = this.workspace_.getTopBlocks(false);
-  for (var i = 0, block; (block = blocks[i]); i++) {
+  let flyoutHeight = 0;
+  const blocks = this.workspace_.getTopBlocks(false);
+  for (let i = 0, block; (block = blocks[i]); i++) {
     flyoutHeight = Math.max(flyoutHeight, block.getHeightWidth().height);
   }
-  var buttons = this.buttons_;
-  for (var i = 0, button; (button = buttons[i]); i++) {
+  const buttons = this.buttons_;
+  for (let i = 0, button; (button = buttons[i]); i++) {
     flyoutHeight = Math.max(flyoutHeight, button.height);
   }
   flyoutHeight += this.MARGIN * 1.5;
@@ -350,7 +351,7 @@ Blockly.HorizontalFlyout.prototype.reflowInternal_ = function() {
   flyoutHeight += Blockly.Scrollbar.scrollbarThickness;
 
   if (this.height_ != flyoutHeight) {
-    for (var i = 0, block; (block = blocks[i]); i++) {
+    for (let i = 0, block; (block = blocks[i]); i++) {
       if (block.flyoutRect_) {
         this.moveRectToBlock_(block.flyoutRect_, block);
       }

From 8b0d1df173b43ae48d4d9d84e89d46ded89d2659 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 08:04:52 -0700
Subject: [PATCH 269/833] Migrate core/flyout_horizontal.js to goog.module

---
 core/flyout_horizontal.js | 35 +++++++++++++++++++----------------
 tests/deps.js             |  2 +-
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/core/flyout_horizontal.js b/core/flyout_horizontal.js
index 3ec62518a..96cad2c9f 100644
--- a/core/flyout_horizontal.js
+++ b/core/flyout_horizontal.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.HorizontalFlyout');
+goog.module('Blockly.HorizontalFlyout');
+goog.module.declareLegacyNamespace();
 
 /** @suppress {extraRequire} */
 goog.require('Blockly.Block');
@@ -35,11 +36,11 @@ goog.requireType('Blockly.utils.Coordinate');
  * @extends {Blockly.Flyout}
  * @constructor
  */
-Blockly.HorizontalFlyout = function(workspaceOptions) {
-  Blockly.HorizontalFlyout.superClass_.constructor.call(this, workspaceOptions);
+const HorizontalFlyout = function(workspaceOptions) {
+  HorizontalFlyout.superClass_.constructor.call(this, workspaceOptions);
   this.horizontalLayout = true;
 };
-Blockly.utils.object.inherits(Blockly.HorizontalFlyout, Blockly.Flyout);
+Blockly.utils.object.inherits(HorizontalFlyout, Blockly.Flyout);
 
 /**
  * Sets the translation of the flyout to match the scrollbars.
@@ -48,7 +49,7 @@ Blockly.utils.object.inherits(Blockly.HorizontalFlyout, Blockly.Flyout);
  *     similar x property.
  * @protected
  */
-Blockly.HorizontalFlyout.prototype.setMetrics_ = function(xyRatio) {
+HorizontalFlyout.prototype.setMetrics_ = function(xyRatio) {
   if (!this.isVisible()) {
     return;
   }
@@ -72,7 +73,7 @@ Blockly.HorizontalFlyout.prototype.setMetrics_ = function(xyRatio) {
  * Calculates the x coordinate for the flyout position.
  * @return {number} X coordinate.
  */
-Blockly.HorizontalFlyout.prototype.getX = function() {
+HorizontalFlyout.prototype.getX = function() {
   // X is always 0 since this is a horizontal flyout.
   return 0;
 };
@@ -81,7 +82,7 @@ Blockly.HorizontalFlyout.prototype.getX = function() {
  * Calculates the y coordinate for the flyout position.
  * @return {number} Y coordinate.
  */
-Blockly.HorizontalFlyout.prototype.getY = function() {
+HorizontalFlyout.prototype.getY = function() {
   if (!this.isVisible()) {
     return 0;
   }
@@ -129,7 +130,7 @@ Blockly.HorizontalFlyout.prototype.getY = function() {
 /**
  * Move the flyout to the edge of the workspace.
  */
-Blockly.HorizontalFlyout.prototype.position = function() {
+HorizontalFlyout.prototype.position = function() {
   if (!this.isVisible() || !this.targetWorkspace.isVisible()) {
     return;
   }
@@ -157,7 +158,7 @@ Blockly.HorizontalFlyout.prototype.position = function() {
  *     rounded corners.
  * @private
  */
-Blockly.HorizontalFlyout.prototype.setBackgroundPath_ = function(
+HorizontalFlyout.prototype.setBackgroundPath_ = function(
     width, height) {
   const atTop = this.toolboxPosition_ == Blockly.utils.toolbox.Position.TOP;
   // Start at top left.
@@ -196,7 +197,7 @@ Blockly.HorizontalFlyout.prototype.setBackgroundPath_ = function(
 /**
  * Scroll the flyout to the top.
  */
-Blockly.HorizontalFlyout.prototype.scrollToStart = function() {
+HorizontalFlyout.prototype.scrollToStart = function() {
   this.workspace_.scrollbar.setX(this.RTL ? Infinity : 0);
 };
 
@@ -205,7 +206,7 @@ Blockly.HorizontalFlyout.prototype.scrollToStart = function() {
  * @param {!Event} e Mouse wheel scroll event.
  * @protected
  */
-Blockly.HorizontalFlyout.prototype.wheel_ = function(e) {
+HorizontalFlyout.prototype.wheel_ = function(e) {
   const scrollDelta = Blockly.utils.getScrollDeltaPixels(e);
   const delta = scrollDelta.x || scrollDelta.y;
 
@@ -233,7 +234,7 @@ Blockly.HorizontalFlyout.prototype.wheel_ = function(e) {
  * @param {!Array<number>} gaps The visible gaps between blocks.
  * @protected
  */
-Blockly.HorizontalFlyout.prototype.layout_ = function(contents, gaps) {
+HorizontalFlyout.prototype.layout_ = function(contents, gaps) {
   this.workspace_.scale = this.targetWorkspace.scale;
   const margin = this.MARGIN;
   let cursorX = margin + this.tabWidth_;
@@ -286,7 +287,7 @@ Blockly.HorizontalFlyout.prototype.layout_ = function(contents, gaps) {
  * @return {boolean} True if the drag is toward the workspace.
  * @package
  */
-Blockly.HorizontalFlyout.prototype.isDragTowardWorkspace = function(
+HorizontalFlyout.prototype.isDragTowardWorkspace = function(
     currentDragDeltaXY) {
   const dx = currentDragDeltaXY.x;
   const dy = currentDragDeltaXY.y;
@@ -308,7 +309,7 @@ Blockly.HorizontalFlyout.prototype.isDragTowardWorkspace = function(
  * @return {?Blockly.utils.Rect} The component's bounding box. Null if drag
  *   target area should be ignored.
  */
-Blockly.HorizontalFlyout.prototype.getClientRect = function() {
+HorizontalFlyout.prototype.getClientRect = function() {
   if (!this.svgGroup_ || this.autoClose || !this.isVisible()) {
     // The bounding rectangle won't compute correctly if the flyout is closed
     // and auto-close flyouts aren't valid drag targets (or delete areas).
@@ -335,7 +336,7 @@ Blockly.HorizontalFlyout.prototype.getClientRect = function() {
  * For RTL: Lay out the blocks right-aligned.
  * @protected
  */
-Blockly.HorizontalFlyout.prototype.reflowInternal_ = function() {
+HorizontalFlyout.prototype.reflowInternal_ = function() {
   this.workspace_.scale = this.getFlyoutScale();
   let flyoutHeight = 0;
   const blocks = this.workspace_.getTopBlocks(false);
@@ -375,4 +376,6 @@ Blockly.HorizontalFlyout.prototype.reflowInternal_ = function() {
 };
 
 Blockly.registry.register(Blockly.registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX,
-    Blockly.registry.DEFAULT, Blockly.HorizontalFlyout);
+    Blockly.registry.DEFAULT, HorizontalFlyout);
+
+exports = HorizontalFlyout;
diff --git a/tests/deps.js b/tests/deps.js
index f62333982..87600526f 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -63,7 +63,7 @@ goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'],
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es5'});
-goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.Block', 'Blockly.internalConstants', 'Blockly.utils.deprecation']);
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate']);

From 7ee9b0a41cc286cab6ff75e163c02d92ccc0c010 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 08:11:53 -0700
Subject: [PATCH 270/833] Migrate core/flyout_horizontal.js to named requires

---
 core/flyout_horizontal.js | 59 ++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/core/flyout_horizontal.js b/core/flyout_horizontal.js
index 96cad2c9f..8f530516d 100644
--- a/core/flyout_horizontal.js
+++ b/core/flyout_horizontal.js
@@ -13,34 +13,35 @@
 goog.module('Blockly.HorizontalFlyout');
 goog.module.declareLegacyNamespace();
 
+/* 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 registry = goog.require('Blockly.registry');
+const {Position} = goog.require('Blockly.utils.toolbox');
+const {getScrollDeltaPixels} = goog.require('Blockly.utils');
+const {inherits} = goog.require('Blockly.utils.object');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Block');
-goog.require('Blockly.DropDownDiv');
-goog.require('Blockly.Flyout');
-goog.require('Blockly.registry');
-goog.require('Blockly.Scrollbar');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Rect');
-goog.require('Blockly.utils.toolbox');
-goog.require('Blockly.WidgetDiv');
-
-goog.requireType('Blockly.Options');
-goog.requireType('Blockly.utils.Coordinate');
 
 
 /**
  * Class for a flyout.
- * @param {!Blockly.Options} workspaceOptions Dictionary of options for the
+ * @param {!Options} workspaceOptions Dictionary of options for the
  *     workspace.
- * @extends {Blockly.Flyout}
+ * @extends {Flyout}
  * @constructor
  */
 const HorizontalFlyout = function(workspaceOptions) {
   HorizontalFlyout.superClass_.constructor.call(this, workspaceOptions);
   this.horizontalLayout = true;
 };
-Blockly.utils.object.inherits(HorizontalFlyout, Blockly.Flyout);
+inherits(HorizontalFlyout, Flyout);
 
 /**
  * Sets the translation of the flyout to match the scrollbars.
@@ -92,7 +93,7 @@ HorizontalFlyout.prototype.getY = function() {
   const toolboxMetrics = metricsManager.getToolboxMetrics();
 
   let y = 0;
-  const atTop = this.toolboxPosition_ == Blockly.utils.toolbox.Position.TOP;
+  const atTop = this.toolboxPosition_ == Position.TOP;
   // If this flyout is not the trashcan flyout (e.g. toolbox or mutator).
   if (this.targetWorkspace.toolboxPosition == this.toolboxPosition_) {
     // If there is a category toolbox.
@@ -160,7 +161,7 @@ HorizontalFlyout.prototype.position = function() {
  */
 HorizontalFlyout.prototype.setBackgroundPath_ = function(
     width, height) {
-  const atTop = this.toolboxPosition_ == Blockly.utils.toolbox.Position.TOP;
+  const atTop = this.toolboxPosition_ == Position.TOP;
   // Start at top left.
   const path = ['M 0,' + (atTop ? 0 : this.CORNER_RADIUS)];
 
@@ -207,7 +208,7 @@ HorizontalFlyout.prototype.scrollToStart = function() {
  * @protected
  */
 HorizontalFlyout.prototype.wheel_ = function(e) {
-  const scrollDelta = Blockly.utils.getScrollDeltaPixels(e);
+  const scrollDelta = getScrollDeltaPixels(e);
   const delta = scrollDelta.x || scrollDelta.y;
 
   if (delta) {
@@ -218,8 +219,8 @@ HorizontalFlyout.prototype.wheel_ = function(e) {
     const pos = (viewMetrics.left - scrollMetrics.left) + delta;
     this.workspace_.scrollbar.setX(pos);
     // When the flyout moves from a wheel event, hide WidgetDiv and DropDownDiv.
-    Blockly.WidgetDiv.hide();
-    Blockly.DropDownDiv.hideWithoutAnimation();
+    WidgetDiv.hide();
+    DropDownDiv.hideWithoutAnimation();
   }
 
   // Don't scroll the page.
@@ -282,7 +283,7 @@ HorizontalFlyout.prototype.layout_ = function(contents, gaps) {
  * Determine if a drag delta is toward the workspace, based on the position
  * and orientation of the flyout. This is used in determineDragIntention_ to
  * determine if a new block should be created or if the flyout should scroll.
- * @param {!Blockly.utils.Coordinate} currentDragDeltaXY How far the pointer has
+ * @param {!Coordinate} currentDragDeltaXY How far the pointer has
  *     moved from the position at mouse down, in pixel units.
  * @return {boolean} True if the drag is toward the workspace.
  * @package
@@ -306,7 +307,7 @@ HorizontalFlyout.prototype.isDragTowardWorkspace = function(
 /**
  * Returns the bounding rectangle of the drag target area in pixel units
  * relative to viewport.
- * @return {?Blockly.utils.Rect} The component's bounding box. Null if drag
+ * @return {?Rect} The component's bounding box. Null if drag
  *   target area should be ignored.
  */
 HorizontalFlyout.prototype.getClientRect = function() {
@@ -323,11 +324,11 @@ HorizontalFlyout.prototype.getClientRect = function() {
   const BIG_NUM = 1000000000;
   const top = flyoutRect.top;
 
-  if (this.toolboxPosition_ == Blockly.utils.toolbox.Position.TOP) {
+  if (this.toolboxPosition_ == Position.TOP) {
     const height = flyoutRect.height;
-    return new Blockly.utils.Rect(-BIG_NUM, top + height, -BIG_NUM, BIG_NUM);
+    return new Rect(-BIG_NUM, top + height, -BIG_NUM, BIG_NUM);
   } else {  // Bottom.
-    return new Blockly.utils.Rect(top, BIG_NUM, -BIG_NUM, BIG_NUM);
+    return new Rect(top, BIG_NUM, -BIG_NUM, BIG_NUM);
   }
 };
 
@@ -349,7 +350,7 @@ HorizontalFlyout.prototype.reflowInternal_ = function() {
   }
   flyoutHeight += this.MARGIN * 1.5;
   flyoutHeight *= this.workspace_.scale;
-  flyoutHeight += Blockly.Scrollbar.scrollbarThickness;
+  flyoutHeight += Scrollbar.scrollbarThickness;
 
   if (this.height_ != flyoutHeight) {
     for (let i = 0, block; (block = blocks[i]); i++) {
@@ -359,7 +360,7 @@ HorizontalFlyout.prototype.reflowInternal_ = function() {
     }
 
     if (this.targetWorkspace.toolboxPosition == this.toolboxPosition_ &&
-        this.toolboxPosition_ == Blockly.utils.toolbox.Position.TOP &&
+        this.toolboxPosition_ == Position.TOP &&
         !this.targetWorkspace.getToolbox()) {
       // This flyout is a simple toolbox. Reposition the workspace so that (0,0)
       // is in the correct position relative to the new absolute edge (ie
@@ -375,7 +376,7 @@ HorizontalFlyout.prototype.reflowInternal_ = function() {
   }
 };
 
-Blockly.registry.register(Blockly.registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX,
-    Blockly.registry.DEFAULT, HorizontalFlyout);
+registry.register(registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX,
+    registry.DEFAULT, HorizontalFlyout);
 
 exports = HorizontalFlyout;

From 08c18b479cc9f6d5cc9566d00dfb5a534e6ad35b Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 08:13:11 -0700
Subject: [PATCH 271/833] clang-format core/flyout_horizontal.js

---
 core/flyout_horizontal.js | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/core/flyout_horizontal.js b/core/flyout_horizontal.js
index 8f530516d..9bfc8aa91 100644
--- a/core/flyout_horizontal.js
+++ b/core/flyout_horizontal.js
@@ -63,10 +63,11 @@ HorizontalFlyout.prototype.setMetrics_ = function(xyRatio) {
   if (typeof xyRatio.x == 'number') {
     this.workspace_.scrollX =
         -(scrollMetrics.left +
-            (scrollMetrics.width - viewMetrics.width) * xyRatio.x);
+          (scrollMetrics.width - viewMetrics.width) * xyRatio.x);
   }
 
-  this.workspace_.translate(this.workspace_.scrollX + absoluteMetrics.left,
+  this.workspace_.translate(
+      this.workspace_.scrollX + absoluteMetrics.left,
       this.workspace_.scrollY + absoluteMetrics.top);
 };
 
@@ -159,8 +160,7 @@ HorizontalFlyout.prototype.position = function() {
  *     rounded corners.
  * @private
  */
-HorizontalFlyout.prototype.setBackgroundPath_ = function(
-    width, height) {
+HorizontalFlyout.prototype.setBackgroundPath_ = function(width, height) {
   const atTop = this.toolboxPosition_ == Position.TOP;
   // Start at top left.
   const path = ['M 0,' + (atTop ? 0 : this.CORNER_RADIUS)];
@@ -171,20 +171,24 @@ HorizontalFlyout.prototype.setBackgroundPath_ = function(
     // Right.
     path.push('v', height);
     // Bottom.
-    path.push('a', this.CORNER_RADIUS, this.CORNER_RADIUS, 0, 0, 1,
+    path.push(
+        'a', this.CORNER_RADIUS, this.CORNER_RADIUS, 0, 0, 1,
         -this.CORNER_RADIUS, this.CORNER_RADIUS);
     path.push('h', -width);
     // Left.
-    path.push('a', this.CORNER_RADIUS, this.CORNER_RADIUS, 0, 0, 1,
+    path.push(
+        'a', this.CORNER_RADIUS, this.CORNER_RADIUS, 0, 0, 1,
         -this.CORNER_RADIUS, -this.CORNER_RADIUS);
     path.push('z');
   } else {
     // Top.
-    path.push('a', this.CORNER_RADIUS, this.CORNER_RADIUS, 0, 0, 1,
+    path.push(
+        'a', this.CORNER_RADIUS, this.CORNER_RADIUS, 0, 0, 1,
         this.CORNER_RADIUS, -this.CORNER_RADIUS);
     path.push('h', width);
     // Right.
-    path.push('a', this.CORNER_RADIUS, this.CORNER_RADIUS, 0, 0, 1,
+    path.push(
+        'a', this.CORNER_RADIUS, this.CORNER_RADIUS, 0, 0, 1,
         this.CORNER_RADIUS, this.CORNER_RADIUS);
     path.push('v', height);
     // Bottom.
@@ -366,7 +370,8 @@ HorizontalFlyout.prototype.reflowInternal_ = function() {
       // is in the correct position relative to the new absolute edge (ie
       // toolbox edge).
       this.targetWorkspace.translate(
-          this.targetWorkspace.scrollX, this.targetWorkspace.scrollY + flyoutHeight);
+          this.targetWorkspace.scrollX,
+          this.targetWorkspace.scrollY + flyoutHeight);
     }
 
     // Record the height for workspace metrics and .position.
@@ -376,7 +381,8 @@ HorizontalFlyout.prototype.reflowInternal_ = function() {
   }
 };
 
-registry.register(registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX,
-    registry.DEFAULT, HorizontalFlyout);
+registry.register(
+    registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX, registry.DEFAULT,
+    HorizontalFlyout);
 
 exports = HorizontalFlyout;

From adc78d192c6b5852f0cfc5363777a5ac2a882465 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 08:24:09 -0700
Subject: [PATCH 272/833] Migrate core/flyout_vertical.js to ES6 const/let

---
 core/flyout_vertical.js | 106 ++++++++++++++++++++--------------------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/core/flyout_vertical.js b/core/flyout_vertical.js
index a09b3fb8e..786deff96 100644
--- a/core/flyout_vertical.js
+++ b/core/flyout_vertical.js
@@ -59,10 +59,10 @@ Blockly.VerticalFlyout.prototype.setMetrics_ = function(xyRatio) {
   if (!this.isVisible()) {
     return;
   }
-  var metricsManager = this.workspace_.getMetricsManager();
-  var scrollMetrics = metricsManager.getScrollMetrics();
-  var viewMetrics = metricsManager.getViewMetrics();
-  var absoluteMetrics = metricsManager.getAbsoluteMetrics();
+  const metricsManager = this.workspace_.getMetricsManager();
+  const scrollMetrics = metricsManager.getScrollMetrics();
+  const viewMetrics = metricsManager.getViewMetrics();
+  const absoluteMetrics = metricsManager.getAbsoluteMetrics();
 
   if (typeof xyRatio.y == 'number') {
     this.workspace_.scrollY =
@@ -81,11 +81,11 @@ Blockly.VerticalFlyout.prototype.getX = function() {
   if (!this.isVisible()) {
     return 0;
   }
-  var metricsManager = this.targetWorkspace.getMetricsManager();
-  var absoluteMetrics = metricsManager.getAbsoluteMetrics();
-  var viewMetrics = metricsManager.getViewMetrics();
-  var toolboxMetrics = metricsManager.getToolboxMetrics();
-  var x = 0;
+  const metricsManager = this.targetWorkspace.getMetricsManager();
+  const absoluteMetrics = metricsManager.getAbsoluteMetrics();
+  const viewMetrics = metricsManager.getViewMetrics();
+  const toolboxMetrics = metricsManager.getToolboxMetrics();
+  let x = 0;
 
   // If this flyout is not the trashcan flyout (e.g. toolbox or mutator).
   if (this.targetWorkspace.toolboxPosition == this.toolboxPosition_) {
@@ -137,18 +137,18 @@ Blockly.VerticalFlyout.prototype.position = function() {
   if (!this.isVisible() || !this.targetWorkspace.isVisible()) {
     return;
   }
-  var metricsManager = this.targetWorkspace.getMetricsManager();
-  var targetWorkspaceViewMetrics = metricsManager.getViewMetrics();
+  const metricsManager = this.targetWorkspace.getMetricsManager();
+  const targetWorkspaceViewMetrics = metricsManager.getViewMetrics();
 
   // Record the height for workspace metrics.
   this.height_ = targetWorkspaceViewMetrics.height;
 
-  var edgeWidth = this.width_ - this.CORNER_RADIUS;
-  var edgeHeight = targetWorkspaceViewMetrics.height - 2 * this.CORNER_RADIUS;
+  const edgeWidth = this.width_ - this.CORNER_RADIUS;
+  const edgeHeight = targetWorkspaceViewMetrics.height - 2 * this.CORNER_RADIUS;
   this.setBackgroundPath_(edgeWidth, edgeHeight);
 
-  var x = this.getX();
-  var y = this.getY();
+  const x = this.getX();
+  const y = this.getY();
 
   this.positionAt_(this.width_, this.height_, x, y);
 };
@@ -162,11 +162,11 @@ Blockly.VerticalFlyout.prototype.position = function() {
  * @private
  */
 Blockly.VerticalFlyout.prototype.setBackgroundPath_ = function(width, height) {
-  var atRight = this.toolboxPosition_ == Blockly.utils.toolbox.Position.RIGHT;
-  var totalWidth = width + this.CORNER_RADIUS;
+  const atRight = this.toolboxPosition_ == Blockly.utils.toolbox.Position.RIGHT;
+  const totalWidth = width + this.CORNER_RADIUS;
 
   // Decide whether to start on the left or right.
-  var path = ['M ' + (atRight ? totalWidth : 0) + ',0'];
+  const path = ['M ' + (atRight ? totalWidth : 0) + ',0'];
   // Top.
   path.push('h', atRight ? -width : width);
   // Rounded corner.
@@ -200,13 +200,13 @@ Blockly.VerticalFlyout.prototype.scrollToStart = function() {
  * @protected
  */
 Blockly.VerticalFlyout.prototype.wheel_ = function(e) {
-  var scrollDelta = Blockly.utils.getScrollDeltaPixels(e);
+  const scrollDelta = Blockly.utils.getScrollDeltaPixels(e);
 
   if (scrollDelta.y) {
-    var metricsManager = this.workspace_.getMetricsManager();
-    var scrollMetrics = metricsManager.getScrollMetrics();
-    var viewMetrics = metricsManager.getViewMetrics();
-    var pos = (viewMetrics.top - scrollMetrics.top) + scrollDelta.y;
+    const metricsManager = this.workspace_.getMetricsManager();
+    const scrollMetrics = metricsManager.getScrollMetrics();
+    const viewMetrics = metricsManager.getViewMetrics();
+    const pos = (viewMetrics.top - scrollMetrics.top) + scrollDelta.y;
 
     this.workspace_.scrollbar.setY(pos);
     // When the flyout moves from a wheel event, hide WidgetDiv and DropDownDiv.
@@ -228,27 +228,27 @@ Blockly.VerticalFlyout.prototype.wheel_ = function(e) {
  */
 Blockly.VerticalFlyout.prototype.layout_ = function(contents, gaps) {
   this.workspace_.scale = this.targetWorkspace.scale;
-  var margin = this.MARGIN;
-  var cursorX = this.RTL ? margin : margin + this.tabWidth_;
-  var cursorY = margin;
+  const margin = this.MARGIN;
+  const cursorX = this.RTL ? margin : margin + this.tabWidth_;
+  let cursorY = margin;
 
-  for (var i = 0, item; (item = contents[i]); i++) {
+  for (let i = 0, item; (item = contents[i]); i++) {
     if (item.type == 'block') {
-      var block = item.block;
-      var allBlocks = block.getDescendants(false);
-      for (var j = 0, child; (child = allBlocks[j]); j++) {
+      const block = item.block;
+      const allBlocks = block.getDescendants(false);
+      for (let j = 0, child; (child = allBlocks[j]); j++) {
         // Mark blocks as being inside a flyout.  This is used to detect and
         // prevent the closure of the flyout if the user right-clicks on such a
         // block.
         child.isInFlyout = true;
       }
       block.render();
-      var root = block.getSvgRoot();
-      var blockHW = block.getHeightWidth();
-      var moveX = block.outputConnection ? cursorX - this.tabWidth_ : cursorX;
+      const root = block.getSvgRoot();
+      const blockHW = block.getHeightWidth();
+      const moveX = block.outputConnection ? cursorX - this.tabWidth_ : cursorX;
       block.moveBy(moveX, cursorY);
 
-      var rect = this.createRect_(block,
+      const rect = this.createRect_(block,
           this.RTL ? moveX - blockHW.width : moveX, cursorY, blockHW, i);
 
       this.addBlockListeners_(root, block, rect);
@@ -272,12 +272,12 @@ Blockly.VerticalFlyout.prototype.layout_ = function(contents, gaps) {
  */
 Blockly.VerticalFlyout.prototype.isDragTowardWorkspace = function(
     currentDragDeltaXY) {
-  var dx = currentDragDeltaXY.x;
-  var dy = currentDragDeltaXY.y;
+  const dx = currentDragDeltaXY.x;
+  const dy = currentDragDeltaXY.y;
   // Direction goes from -180 to 180, with 0 toward the right and 90 on top.
-  var dragDirection = Math.atan2(dy, dx) / Math.PI * 180;
+  const dragDirection = Math.atan2(dy, dx) / Math.PI * 180;
 
-  var range = this.dragAngleRange_;
+  const range = this.dragAngleRange_;
   // Check for left or right dragging.
   if ((dragDirection < range && dragDirection > -range) ||
       (dragDirection < -180 + range || dragDirection > 180 - range)) {
@@ -299,15 +299,15 @@ Blockly.VerticalFlyout.prototype.getClientRect = function() {
     return null;
   }
 
-  var flyoutRect = this.svgGroup_.getBoundingClientRect();
+  const flyoutRect = this.svgGroup_.getBoundingClientRect();
   // BIG_NUM is offscreen padding so that blocks dragged beyond the shown flyout
   // area are still deleted.  Must be larger than the largest screen size,
   // but be smaller than half Number.MAX_SAFE_INTEGER (not available on IE).
-  var BIG_NUM = 1000000000;
-  var left = flyoutRect.left;
+  const BIG_NUM = 1000000000;
+  const left = flyoutRect.left;
 
   if (this.toolboxPosition_ == Blockly.utils.toolbox.Position.LEFT) {
-    var width = flyoutRect.width;
+    const width = flyoutRect.width;
     return new Blockly.utils.Rect(-BIG_NUM, BIG_NUM, -BIG_NUM, left + width);
   } else {  // Right
     return new Blockly.utils.Rect(-BIG_NUM, BIG_NUM, left, BIG_NUM);
@@ -321,16 +321,16 @@ Blockly.VerticalFlyout.prototype.getClientRect = function() {
  */
 Blockly.VerticalFlyout.prototype.reflowInternal_ = function() {
   this.workspace_.scale = this.getFlyoutScale();
-  var flyoutWidth = 0;
-  var blocks = this.workspace_.getTopBlocks(false);
-  for (var i = 0, block; (block = blocks[i]); i++) {
-    var width = block.getHeightWidth().width;
+  let flyoutWidth = 0;
+  const blocks = this.workspace_.getTopBlocks(false);
+  for (let i = 0, block; (block = blocks[i]); i++) {
+    let width = block.getHeightWidth().width;
     if (block.outputConnection) {
       width -= this.tabWidth_;
     }
     flyoutWidth = Math.max(flyoutWidth, width);
   }
-  for (var i = 0, button; (button = this.buttons_[i]); i++) {
+  for (let i = 0, button; (button = this.buttons_[i]); i++) {
     flyoutWidth = Math.max(flyoutWidth, button.width);
   }
   flyoutWidth += this.MARGIN * 1.5 + this.tabWidth_;
@@ -338,11 +338,11 @@ Blockly.VerticalFlyout.prototype.reflowInternal_ = function() {
   flyoutWidth += Blockly.Scrollbar.scrollbarThickness;
 
   if (this.width_ != flyoutWidth) {
-    for (var i = 0, block; (block = blocks[i]); i++) {
+    for (let i = 0, block; (block = blocks[i]); i++) {
       if (this.RTL) {
         // With the flyoutWidth known, right-align the blocks.
-        var oldX = block.getRelativeToSurfaceXY().x;
-        var newX = flyoutWidth / this.workspace_.scale - this.MARGIN;
+        const oldX = block.getRelativeToSurfaceXY().x;
+        let newX = flyoutWidth / this.workspace_.scale - this.MARGIN;
         if (!block.outputConnection) {
           newX -= this.tabWidth_;
         }
@@ -354,9 +354,9 @@ Blockly.VerticalFlyout.prototype.reflowInternal_ = function() {
     }
     if (this.RTL) {
       // With the flyoutWidth known, right-align the buttons.
-      for (var i = 0, button; (button = this.buttons_[i]); i++) {
-        var y = button.getPosition().y;
-        var x = flyoutWidth / this.workspace_.scale - button.width -
+      for (let i = 0, button; (button = this.buttons_[i]); i++) {
+        const y = button.getPosition().y;
+        const x = flyoutWidth / this.workspace_.scale - button.width -
             this.MARGIN - this.tabWidth_;
         button.moveTo(x, y);
       }

From cd4f0e9f8c67edcfc9f068de9a3c49526b85bdaf Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 08:27:27 -0700
Subject: [PATCH 273/833] Migrate core/flyout_vertical.js to goog.module

---
 core/flyout_vertical.js | 37 ++++++++++++++++++++-----------------
 tests/deps.js           |  2 +-
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/core/flyout_vertical.js b/core/flyout_vertical.js
index 786deff96..d937cce6e 100644
--- a/core/flyout_vertical.js
+++ b/core/flyout_vertical.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.VerticalFlyout');
+goog.module('Blockly.VerticalFlyout');
+goog.module.declareLegacyNamespace();
 
 /** @suppress {extraRequire} */
 goog.require('Blockly.Block');
@@ -37,16 +38,16 @@ goog.requireType('Blockly.utils.Coordinate');
  * @extends {Blockly.Flyout}
  * @constructor
  */
-Blockly.VerticalFlyout = function(workspaceOptions) {
-  Blockly.VerticalFlyout.superClass_.constructor.call(this, workspaceOptions);
+const VerticalFlyout = function(workspaceOptions) {
+  VerticalFlyout.superClass_.constructor.call(this, workspaceOptions);
 };
-Blockly.utils.object.inherits(Blockly.VerticalFlyout, Blockly.Flyout);
+Blockly.utils.object.inherits(VerticalFlyout, Blockly.Flyout);
 
 /**
  * The name of the vertical flyout in the registry.
  * @type {string}
  */
-Blockly.VerticalFlyout.registryName = 'verticalFlyout';
+VerticalFlyout.registryName = 'verticalFlyout';
 
 /**
  * Sets the translation of the flyout to match the scrollbars.
@@ -55,7 +56,7 @@ Blockly.VerticalFlyout.registryName = 'verticalFlyout';
  *     similar x property.
  * @protected
  */
-Blockly.VerticalFlyout.prototype.setMetrics_ = function(xyRatio) {
+VerticalFlyout.prototype.setMetrics_ = function(xyRatio) {
   if (!this.isVisible()) {
     return;
   }
@@ -77,7 +78,7 @@ Blockly.VerticalFlyout.prototype.setMetrics_ = function(xyRatio) {
  * Calculates the x coordinate for the flyout position.
  * @return {number} X coordinate.
  */
-Blockly.VerticalFlyout.prototype.getX = function() {
+VerticalFlyout.prototype.getX = function() {
   if (!this.isVisible()) {
     return 0;
   }
@@ -125,7 +126,7 @@ Blockly.VerticalFlyout.prototype.getX = function() {
  * Calculates the y coordinate for the flyout position.
  * @return {number} Y coordinate.
  */
-Blockly.VerticalFlyout.prototype.getY = function() {
+VerticalFlyout.prototype.getY = function() {
   // Y is always 0 since this is a vertical flyout.
   return 0;
 };
@@ -133,7 +134,7 @@ Blockly.VerticalFlyout.prototype.getY = function() {
 /**
  * Move the flyout to the edge of the workspace.
  */
-Blockly.VerticalFlyout.prototype.position = function() {
+VerticalFlyout.prototype.position = function() {
   if (!this.isVisible() || !this.targetWorkspace.isVisible()) {
     return;
   }
@@ -161,7 +162,7 @@ Blockly.VerticalFlyout.prototype.position = function() {
  *     rounded corners.
  * @private
  */
-Blockly.VerticalFlyout.prototype.setBackgroundPath_ = function(width, height) {
+VerticalFlyout.prototype.setBackgroundPath_ = function(width, height) {
   const atRight = this.toolboxPosition_ == Blockly.utils.toolbox.Position.RIGHT;
   const totalWidth = width + this.CORNER_RADIUS;
 
@@ -190,7 +191,7 @@ Blockly.VerticalFlyout.prototype.setBackgroundPath_ = function(width, height) {
 /**
  * Scroll the flyout to the top.
  */
-Blockly.VerticalFlyout.prototype.scrollToStart = function() {
+VerticalFlyout.prototype.scrollToStart = function() {
   this.workspace_.scrollbar.setY(0);
 };
 
@@ -199,7 +200,7 @@ Blockly.VerticalFlyout.prototype.scrollToStart = function() {
  * @param {!Event} e Mouse wheel scroll event.
  * @protected
  */
-Blockly.VerticalFlyout.prototype.wheel_ = function(e) {
+VerticalFlyout.prototype.wheel_ = function(e) {
   const scrollDelta = Blockly.utils.getScrollDeltaPixels(e);
 
   if (scrollDelta.y) {
@@ -226,7 +227,7 @@ Blockly.VerticalFlyout.prototype.wheel_ = function(e) {
  * @param {!Array<number>} gaps The visible gaps between blocks.
  * @protected
  */
-Blockly.VerticalFlyout.prototype.layout_ = function(contents, gaps) {
+VerticalFlyout.prototype.layout_ = function(contents, gaps) {
   this.workspace_.scale = this.targetWorkspace.scale;
   const margin = this.MARGIN;
   const cursorX = this.RTL ? margin : margin + this.tabWidth_;
@@ -270,7 +271,7 @@ Blockly.VerticalFlyout.prototype.layout_ = function(contents, gaps) {
  * @return {boolean} True if the drag is toward the workspace.
  * @package
  */
-Blockly.VerticalFlyout.prototype.isDragTowardWorkspace = function(
+VerticalFlyout.prototype.isDragTowardWorkspace = function(
     currentDragDeltaXY) {
   const dx = currentDragDeltaXY.x;
   const dy = currentDragDeltaXY.y;
@@ -292,7 +293,7 @@ Blockly.VerticalFlyout.prototype.isDragTowardWorkspace = function(
  * @return {?Blockly.utils.Rect} The component's bounding box. Null if drag
  *   target area should be ignored.
  */
-Blockly.VerticalFlyout.prototype.getClientRect = function() {
+VerticalFlyout.prototype.getClientRect = function() {
   if (!this.svgGroup_ || this.autoClose || !this.isVisible()) {
     // The bounding rectangle won't compute correctly if the flyout is closed
     // and auto-close flyouts aren't valid drag targets (or delete areas).
@@ -319,7 +320,7 @@ Blockly.VerticalFlyout.prototype.getClientRect = function() {
  * For RTL: Lay out the blocks and buttons to be right-aligned.
  * @protected
  */
-Blockly.VerticalFlyout.prototype.reflowInternal_ = function() {
+VerticalFlyout.prototype.reflowInternal_ = function() {
   this.workspace_.scale = this.getFlyoutScale();
   let flyoutWidth = 0;
   const blocks = this.workspace_.getTopBlocks(false);
@@ -380,4 +381,6 @@ Blockly.VerticalFlyout.prototype.reflowInternal_ = function() {
 };
 
 Blockly.registry.register(Blockly.registry.Type.FLYOUTS_VERTICAL_TOOLBOX,
-    Blockly.registry.DEFAULT, Blockly.VerticalFlyout);
+    Blockly.registry.DEFAULT, VerticalFlyout);
+
+exports = VerticalFlyout;
diff --git a/tests/deps.js b/tests/deps.js
index f62333982..de0ab070c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -64,7 +64,7 @@ goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['
 goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es5'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.Block', 'Blockly.internalConstants', 'Blockly.utils.deprecation']);
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);

From 394d71a7d97cd24653491a944c17e0c746bac810 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 08:32:27 -0700
Subject: [PATCH 274/833] Migrate core/flyout_vertical.js to named requires

---
 core/flyout_vertical.js | 63 +++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/core/flyout_vertical.js b/core/flyout_vertical.js
index d937cce6e..8c1177c30 100644
--- a/core/flyout_vertical.js
+++ b/core/flyout_vertical.js
@@ -13,35 +13,36 @@
 goog.module('Blockly.VerticalFlyout');
 goog.module.declareLegacyNamespace();
 
+/* 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 registry = goog.require('Blockly.registry');
+const {Position} = goog.require('Blockly.utils.toolbox');
+const {getScrollDeltaPixels} = goog.require('Blockly.utils');
+const {inherits} = goog.require('Blockly.utils.object');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Block');
 /** @suppress {extraRequire} */
 goog.require('Blockly.constants');
-goog.require('Blockly.DropDownDiv');
-goog.require('Blockly.Flyout');
-goog.require('Blockly.registry');
-goog.require('Blockly.Scrollbar');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Rect');
-goog.require('Blockly.utils.toolbox');
-goog.require('Blockly.WidgetDiv');
-
-goog.requireType('Blockly.Options');
-goog.requireType('Blockly.utils.Coordinate');
 
 
 /**
  * Class for a flyout.
- * @param {!Blockly.Options} workspaceOptions Dictionary of options for the
+ * @param {!Options} workspaceOptions Dictionary of options for the
  *     workspace.
- * @extends {Blockly.Flyout}
+ * @extends {Flyout}
  * @constructor
  */
 const VerticalFlyout = function(workspaceOptions) {
   VerticalFlyout.superClass_.constructor.call(this, workspaceOptions);
 };
-Blockly.utils.object.inherits(VerticalFlyout, Blockly.Flyout);
+inherits(VerticalFlyout, Flyout);
 
 /**
  * The name of the vertical flyout in the registry.
@@ -92,14 +93,14 @@ VerticalFlyout.prototype.getX = function() {
   if (this.targetWorkspace.toolboxPosition == this.toolboxPosition_) {
     // If there is a category toolbox.
     if (this.targetWorkspace.getToolbox()) {
-      if (this.toolboxPosition_ == Blockly.utils.toolbox.Position.LEFT) {
+      if (this.toolboxPosition_ == Position.LEFT) {
         x = toolboxMetrics.width;
       } else {
         x = viewMetrics.width - this.width_;
       }
       // Simple (flyout-only) toolbox.
     } else {
-      if (this.toolboxPosition_ == Blockly.utils.toolbox.Position.LEFT) {
+      if (this.toolboxPosition_ == Position.LEFT) {
         x = 0;
       } else {
         // The simple flyout does not cover the workspace.
@@ -108,7 +109,7 @@ VerticalFlyout.prototype.getX = function() {
     }
     // Trashcan flyout is opposite the main flyout.
   } else {
-    if (this.toolboxPosition_ == Blockly.utils.toolbox.Position.LEFT) {
+    if (this.toolboxPosition_ == Position.LEFT) {
       x = 0;
     } else {
       // Because the anchor point of the flyout is on the left, but we want
@@ -163,7 +164,7 @@ VerticalFlyout.prototype.position = function() {
  * @private
  */
 VerticalFlyout.prototype.setBackgroundPath_ = function(width, height) {
-  const atRight = this.toolboxPosition_ == Blockly.utils.toolbox.Position.RIGHT;
+  const atRight = this.toolboxPosition_ == Position.RIGHT;
   const totalWidth = width + this.CORNER_RADIUS;
 
   // Decide whether to start on the left or right.
@@ -201,7 +202,7 @@ VerticalFlyout.prototype.scrollToStart = function() {
  * @protected
  */
 VerticalFlyout.prototype.wheel_ = function(e) {
-  const scrollDelta = Blockly.utils.getScrollDeltaPixels(e);
+  const scrollDelta = getScrollDeltaPixels(e);
 
   if (scrollDelta.y) {
     const metricsManager = this.workspace_.getMetricsManager();
@@ -211,8 +212,8 @@ VerticalFlyout.prototype.wheel_ = function(e) {
 
     this.workspace_.scrollbar.setY(pos);
     // When the flyout moves from a wheel event, hide WidgetDiv and DropDownDiv.
-    Blockly.WidgetDiv.hide();
-    Blockly.DropDownDiv.hideWithoutAnimation();
+    WidgetDiv.hide();
+    DropDownDiv.hideWithoutAnimation();
   }
 
   // Don't scroll the page.
@@ -266,7 +267,7 @@ VerticalFlyout.prototype.layout_ = function(contents, gaps) {
  * Determine if a drag delta is toward the workspace, based on the position
  * and orientation of the flyout. This is used in determineDragIntention_ to
  * determine if a new block should be created or if the flyout should scroll.
- * @param {!Blockly.utils.Coordinate} currentDragDeltaXY How far the pointer has
+ * @param {!Coordinate} currentDragDeltaXY How far the pointer has
  *     moved from the position at mouse down, in pixel units.
  * @return {boolean} True if the drag is toward the workspace.
  * @package
@@ -290,7 +291,7 @@ VerticalFlyout.prototype.isDragTowardWorkspace = function(
 /**
  * Returns the bounding rectangle of the drag target area in pixel units
  * relative to viewport.
- * @return {?Blockly.utils.Rect} The component's bounding box. Null if drag
+ * @return {?Rect} The component's bounding box. Null if drag
  *   target area should be ignored.
  */
 VerticalFlyout.prototype.getClientRect = function() {
@@ -307,11 +308,11 @@ VerticalFlyout.prototype.getClientRect = function() {
   const BIG_NUM = 1000000000;
   const left = flyoutRect.left;
 
-  if (this.toolboxPosition_ == Blockly.utils.toolbox.Position.LEFT) {
+  if (this.toolboxPosition_ == Position.LEFT) {
     const width = flyoutRect.width;
-    return new Blockly.utils.Rect(-BIG_NUM, BIG_NUM, -BIG_NUM, left + width);
+    return new Rect(-BIG_NUM, BIG_NUM, -BIG_NUM, left + width);
   } else {  // Right
-    return new Blockly.utils.Rect(-BIG_NUM, BIG_NUM, left, BIG_NUM);
+    return new Rect(-BIG_NUM, BIG_NUM, left, BIG_NUM);
   }
 };
 
@@ -336,7 +337,7 @@ VerticalFlyout.prototype.reflowInternal_ = function() {
   }
   flyoutWidth += this.MARGIN * 1.5 + this.tabWidth_;
   flyoutWidth *= this.workspace_.scale;
-  flyoutWidth += Blockly.Scrollbar.scrollbarThickness;
+  flyoutWidth += Scrollbar.scrollbarThickness;
 
   if (this.width_ != flyoutWidth) {
     for (let i = 0, block; (block = blocks[i]); i++) {
@@ -364,7 +365,7 @@ VerticalFlyout.prototype.reflowInternal_ = function() {
     }
 
     if (this.targetWorkspace.toolboxPosition == this.toolboxPosition_ &&
-        this.toolboxPosition_ == Blockly.utils.toolbox.Position.LEFT &&
+        this.toolboxPosition_ == Position.LEFT &&
         !this.targetWorkspace.getToolbox()) {
       // This flyout is a simple toolbox. Reposition the workspace so that (0,0)
       // is in the correct position relative to the new absolute edge (ie
@@ -380,7 +381,7 @@ VerticalFlyout.prototype.reflowInternal_ = function() {
   }
 };
 
-Blockly.registry.register(Blockly.registry.Type.FLYOUTS_VERTICAL_TOOLBOX,
-    Blockly.registry.DEFAULT, VerticalFlyout);
+registry.register(registry.Type.FLYOUTS_VERTICAL_TOOLBOX,
+    registry.DEFAULT, VerticalFlyout);
 
 exports = VerticalFlyout;

From def3458a10729c15b43bd1bac35e78cd931d9951 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 08:32:59 -0700
Subject: [PATCH 275/833] clang-format core/flyout_vertical.js

---
 core/flyout_vertical.js | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/core/flyout_vertical.js b/core/flyout_vertical.js
index 8c1177c30..2091d1321 100644
--- a/core/flyout_vertical.js
+++ b/core/flyout_vertical.js
@@ -69,9 +69,10 @@ VerticalFlyout.prototype.setMetrics_ = function(xyRatio) {
   if (typeof xyRatio.y == 'number') {
     this.workspace_.scrollY =
         -(scrollMetrics.top +
-            (scrollMetrics.height - viewMetrics.height) * xyRatio.y);
+          (scrollMetrics.height - viewMetrics.height) * xyRatio.y);
   }
-  this.workspace_.translate(this.workspace_.scrollX + absoluteMetrics.left,
+  this.workspace_.translate(
+      this.workspace_.scrollX + absoluteMetrics.left,
       this.workspace_.scrollY + absoluteMetrics.top);
 };
 
@@ -172,17 +173,15 @@ VerticalFlyout.prototype.setBackgroundPath_ = function(width, height) {
   // Top.
   path.push('h', atRight ? -width : width);
   // Rounded corner.
-  path.push('a', this.CORNER_RADIUS, this.CORNER_RADIUS, 0, 0,
-      atRight ? 0 : 1,
-      atRight ? -this.CORNER_RADIUS : this.CORNER_RADIUS,
-      this.CORNER_RADIUS);
+  path.push(
+      'a', this.CORNER_RADIUS, this.CORNER_RADIUS, 0, 0, atRight ? 0 : 1,
+      atRight ? -this.CORNER_RADIUS : this.CORNER_RADIUS, this.CORNER_RADIUS);
   // Side closest to workspace.
   path.push('v', Math.max(0, height));
   // Rounded corner.
-  path.push('a', this.CORNER_RADIUS, this.CORNER_RADIUS, 0, 0,
-      atRight ? 0 : 1,
-      atRight ? this.CORNER_RADIUS : -this.CORNER_RADIUS,
-      this.CORNER_RADIUS);
+  path.push(
+      'a', this.CORNER_RADIUS, this.CORNER_RADIUS, 0, 0, atRight ? 0 : 1,
+      atRight ? this.CORNER_RADIUS : -this.CORNER_RADIUS, this.CORNER_RADIUS);
   // Bottom.
   path.push('h', atRight ? width : -width);
   path.push('z');
@@ -250,8 +249,8 @@ VerticalFlyout.prototype.layout_ = function(contents, gaps) {
       const moveX = block.outputConnection ? cursorX - this.tabWidth_ : cursorX;
       block.moveBy(moveX, cursorY);
 
-      const rect = this.createRect_(block,
-          this.RTL ? moveX - blockHW.width : moveX, cursorY, blockHW, i);
+      const rect = this.createRect_(
+          block, this.RTL ? moveX - blockHW.width : moveX, cursorY, blockHW, i);
 
       this.addBlockListeners_(root, block, rect);
 
@@ -272,8 +271,7 @@ VerticalFlyout.prototype.layout_ = function(contents, gaps) {
  * @return {boolean} True if the drag is toward the workspace.
  * @package
  */
-VerticalFlyout.prototype.isDragTowardWorkspace = function(
-    currentDragDeltaXY) {
+VerticalFlyout.prototype.isDragTowardWorkspace = function(currentDragDeltaXY) {
   const dx = currentDragDeltaXY.x;
   const dy = currentDragDeltaXY.y;
   // Direction goes from -180 to 180, with 0 toward the right and 90 on top.
@@ -371,7 +369,8 @@ VerticalFlyout.prototype.reflowInternal_ = function() {
       // is in the correct position relative to the new absolute edge (ie
       // toolbox edge).
       this.targetWorkspace.translate(
-          this.targetWorkspace.scrollX + flyoutWidth, this.targetWorkspace.scrollY);
+          this.targetWorkspace.scrollX + flyoutWidth,
+          this.targetWorkspace.scrollY);
     }
 
     // Record the width for workspace metrics and .position.
@@ -381,7 +380,7 @@ VerticalFlyout.prototype.reflowInternal_ = function() {
   }
 };
 
-registry.register(registry.Type.FLYOUTS_VERTICAL_TOOLBOX,
-    registry.DEFAULT, VerticalFlyout);
+registry.register(
+    registry.Type.FLYOUTS_VERTICAL_TOOLBOX, registry.DEFAULT, VerticalFlyout);
 
 exports = VerticalFlyout;

From 90ed883eb0d06fceecbb6a17aa5bd018105adad6 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 08:38:39 -0700
Subject: [PATCH 276/833] Migrate core/generator.js to ES6 const/let

---
 core/generator.js | 48 +++++++++++++++++++++++------------------------
 tests/deps.js     |  2 +-
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/core/generator.js b/core/generator.js
index e365c69ba..a9a2d5418 100644
--- a/core/generator.js
+++ b/core/generator.js
@@ -96,11 +96,11 @@ Blockly.Generator.prototype.workspaceToCode = function(workspace) {
     console.warn('No workspace specified in workspaceToCode call.  Guessing.');
     workspace = Blockly.getMainWorkspace();
   }
-  var code = [];
+  let code = [];
   this.init(workspace);
-  var blocks = workspace.getTopBlocks(true);
-  for (var i = 0, block; (block = blocks[i]); i++) {
-    var line = this.blockToCode(block);
+  const blocks = workspace.getTopBlocks(true);
+  for (let i = 0, block; (block = blocks[i]); i++) {
+    let line = this.blockToCode(block);
     if (Array.isArray(line)) {
       // Value blocks return tuples of code and operator order.
       // Top-level blocks don't care about operator order.
@@ -150,10 +150,10 @@ Blockly.Generator.prototype.prefixLines = function(text, prefix) {
  * @return {string} Concatenated list of comments.
  */
 Blockly.Generator.prototype.allNestedComments = function(block) {
-  var comments = [];
-  var blocks = block.getDescendants(true);
-  for (var i = 0; i < blocks.length; i++) {
-    var comment = blocks[i].getCommentText();
+  const comments = [];
+  const blocks = block.getDescendants(true);
+  for (let i = 0; i < blocks.length; i++) {
+    const comment = blocks[i].getCommentText();
     if (comment) {
       comments.push(comment);
     }
@@ -191,7 +191,7 @@ Blockly.Generator.prototype.blockToCode = function(block, opt_thisOnly) {
     return opt_thisOnly ? '' : this.blockToCode(block.getChildren(false)[0]);
   }
 
-  var func = this[block.type];
+  const func = this[block.type];
   if (typeof func != 'function') {
     throw Error('Language "' + this.name_ + '" does not know how to generate ' +
         'code for block type "' + block.type + '".');
@@ -200,7 +200,7 @@ Blockly.Generator.prototype.blockToCode = function(block, opt_thisOnly) {
   // Prior to 24 September 2013 'this' was the only way to access the block.
   // The current preferred method of accessing the block is through the second
   // argument to func.call, which becomes the first parameter to the generator.
-  var code = func.call(block, block);
+  let code = func.call(block, block);
   if (Array.isArray(code)) {
     // Value blocks return tuples of code and operator order.
     if (!block.outputConnection) {
@@ -235,11 +235,11 @@ Blockly.Generator.prototype.valueToCode = function(block, name, outerOrder) {
   if (isNaN(outerOrder)) {
     throw TypeError('Expecting valid order from block: ' + block.type);
   }
-  var targetBlock = block.getInputTargetBlock(name);
+  const targetBlock = block.getInputTargetBlock(name);
   if (!targetBlock) {
     return '';
   }
-  var tuple = this.blockToCode(targetBlock);
+  const tuple = this.blockToCode(targetBlock);
   if (tuple === '') {
     // Disabled block.
     return '';
@@ -249,8 +249,8 @@ Blockly.Generator.prototype.valueToCode = function(block, name, outerOrder) {
   if (!Array.isArray(tuple)) {
     throw TypeError('Expecting tuple from value block: ' + targetBlock.type);
   }
-  var code = tuple[0];
-  var innerOrder = tuple[1];
+  let code = tuple[0];
+  const innerOrder = tuple[1];
   if (isNaN(innerOrder)) {
     throw TypeError('Expecting valid order from value block: ' +
         targetBlock.type);
@@ -260,9 +260,9 @@ Blockly.Generator.prototype.valueToCode = function(block, name, outerOrder) {
   }
 
   // Add parentheses if needed.
-  var parensNeeded = false;
-  var outerOrderClass = Math.floor(outerOrder);
-  var innerOrderClass = Math.floor(innerOrder);
+  let parensNeeded = false;
+  const outerOrderClass = Math.floor(outerOrder);
+  const innerOrderClass = Math.floor(innerOrder);
   if (outerOrderClass <= innerOrderClass) {
     if (outerOrderClass == innerOrderClass &&
         (outerOrderClass == 0 || outerOrderClass == 99)) {
@@ -276,7 +276,7 @@ Blockly.Generator.prototype.valueToCode = function(block, name, outerOrder) {
       // wrap the code in parentheses.
       parensNeeded = true;
       // Check for special exceptions.
-      for (var i = 0; i < this.ORDER_OVERRIDES.length; i++) {
+      for (let i = 0; i < this.ORDER_OVERRIDES.length; i++) {
         if (this.ORDER_OVERRIDES[i][0] == outerOrder &&
             this.ORDER_OVERRIDES[i][1] == innerOrder) {
           parensNeeded = false;
@@ -303,8 +303,8 @@ Blockly.Generator.prototype.valueToCode = function(block, name, outerOrder) {
  * @return {string} Generated code or '' if no blocks are connected.
  */
 Blockly.Generator.prototype.statementToCode = function(block, name) {
-  var targetBlock = block.getInputTargetBlock(name);
-  var code = this.blockToCode(targetBlock);
+  const targetBlock = block.getInputTargetBlock(name);
+  let code = this.blockToCode(targetBlock);
   // Value blocks must return code and order of operations info.
   // Statement blocks must only return code.
   if (typeof code != 'string') {
@@ -350,7 +350,7 @@ Blockly.Generator.prototype.addLoopTrap = function(branch, block) {
  * @return {string} Code snippet with ID.
  */
 Blockly.Generator.prototype.injectId = function(msg, block) {
-  var id = block.id.replace(/\$/g, '$$$$');  // Issue 251.
+  const id = block.id.replace(/\$/g, '$$$$');  // Issue 251.
   return msg.replace(/%1/g, '\'' + id + '\'');
 };
 
@@ -450,16 +450,16 @@ Object.defineProperty(Blockly.Generator.prototype, 'variableDB_', {
  */
 Blockly.Generator.prototype.provideFunction_ = function(desiredName, code) {
   if (!this.definitions_[desiredName]) {
-    var functionName = this.nameDB_.getDistinctName(
+    const functionName = this.nameDB_.getDistinctName(
         desiredName, Blockly.internalConstants.PROCEDURE_CATEGORY_NAME);
     this.functionNames_[desiredName] = functionName;
-    var codeText = code.join('\n').replace(
+    let codeText = code.join('\n').replace(
         this.FUNCTION_NAME_PLACEHOLDER_REGEXP_, functionName);
     // Change all '  ' indents into the desired indent.
     // To avoid an infinite loop of replacements, change all indents to '\0'
     // character first, then replace them all with the indent.
     // We are assuming that no provided functions contain a literal null char.
-    var oldCodeText;
+    let oldCodeText;
     while (oldCodeText != codeText) {
       oldCodeText = codeText;
       codeText = codeText.replace(/^(( {2})*) {2}/gm, '$1\0');
diff --git a/tests/deps.js b/tests/deps.js
index f62333982..87a32ab95 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -65,7 +65,7 @@ goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Bl
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es5'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.Block', 'Blockly.internalConstants', 'Blockly.utils.deprecation']);
+goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.Block', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6'});
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom']);

From 4741d4c312586221a1c776510b8354fde6f1102f Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 08:41:57 -0700
Subject: [PATCH 277/833] Migrate core/generator.js to goog.module

---
 core/generator.js | 69 ++++++++++++++++++++++++-----------------------
 tests/deps.js     |  2 +-
 2 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/core/generator.js b/core/generator.js
index a9a2d5418..609e9d56c 100644
--- a/core/generator.js
+++ b/core/generator.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Generator');
+goog.module('Blockly.Generator');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Block');
 goog.require('Blockly.internalConstants');
@@ -26,7 +27,7 @@ goog.requireType('Blockly.Workspace');
  * @param {string} name Language name of this generator.
  * @constructor
  */
-Blockly.Generator = function(name) {
+const Generator = function(name) {
   this.name_ = name;
   this.FUNCTION_NAME_PLACEHOLDER_REGEXP_ =
       new RegExp(this.FUNCTION_NAME_PLACEHOLDER_, 'g');
@@ -38,7 +39,7 @@ Blockly.Generator = function(name) {
  * E.g. '  checkTimeout(%1);\n'
  * @type {?string}
  */
-Blockly.Generator.prototype.INFINITE_LOOP_TRAP = null;
+Generator.prototype.INFINITE_LOOP_TRAP = null;
 
 /**
  * Arbitrary code to inject before every statement.
@@ -46,7 +47,7 @@ Blockly.Generator.prototype.INFINITE_LOOP_TRAP = null;
  * E.g. 'highlight(%1);\n'
  * @type {?string}
  */
-Blockly.Generator.prototype.STATEMENT_PREFIX = null;
+Generator.prototype.STATEMENT_PREFIX = null;
 
 /**
  * Arbitrary code to inject after every statement.
@@ -54,27 +55,27 @@ Blockly.Generator.prototype.STATEMENT_PREFIX = null;
  * E.g. 'highlight(%1);\n'
  * @type {?string}
  */
-Blockly.Generator.prototype.STATEMENT_SUFFIX = null;
+Generator.prototype.STATEMENT_SUFFIX = null;
 
 /**
  * The method of indenting.  Defaults to two spaces, but language generators
  * may override this to increase indent or change to tabs.
  * @type {string}
  */
-Blockly.Generator.prototype.INDENT = '  ';
+Generator.prototype.INDENT = '  ';
 
 /**
  * Maximum length for a comment before wrapping.  Does not account for
  * indenting level.
  * @type {number}
  */
-Blockly.Generator.prototype.COMMENT_WRAP = 60;
+Generator.prototype.COMMENT_WRAP = 60;
 
 /**
  * List of outer-inner pairings that do NOT require parentheses.
  * @type {!Array<!Array<number>>}
  */
-Blockly.Generator.prototype.ORDER_OVERRIDES = [];
+Generator.prototype.ORDER_OVERRIDES = [];
 
 /**
  * Whether the init method has been called.
@@ -83,14 +84,14 @@ Blockly.Generator.prototype.ORDER_OVERRIDES = [];
  * initialized. If this flag is untouched, it will have no effect.
  * @type {?boolean}
  */
-Blockly.Generator.prototype.isInitialized = null;
+Generator.prototype.isInitialized = null;
 
 /**
  * Generate code for all blocks in the workspace to the specified language.
  * @param {!Blockly.Workspace=} workspace Workspace to generate code from.
  * @return {string} Generated code.
  */
-Blockly.Generator.prototype.workspaceToCode = function(workspace) {
+Generator.prototype.workspaceToCode = function(workspace) {
   if (!workspace) {
     // Backwards compatibility from before there could be multiple workspaces.
     console.warn('No workspace specified in workspaceToCode call.  Guessing.');
@@ -140,7 +141,7 @@ Blockly.Generator.prototype.workspaceToCode = function(workspace) {
  * @param {string} prefix The common prefix.
  * @return {string} The prefixed lines of code.
  */
-Blockly.Generator.prototype.prefixLines = function(text, prefix) {
+Generator.prototype.prefixLines = function(text, prefix) {
   return prefix + text.replace(/(?!\n$)\n/g, '\n' + prefix);
 };
 
@@ -149,7 +150,7 @@ Blockly.Generator.prototype.prefixLines = function(text, prefix) {
  * @param {!Blockly.Block} block The block from which to start spidering.
  * @return {string} Concatenated list of comments.
  */
-Blockly.Generator.prototype.allNestedComments = function(block) {
+Generator.prototype.allNestedComments = function(block) {
   const comments = [];
   const blocks = block.getDescendants(true);
   for (let i = 0; i < blocks.length; i++) {
@@ -174,7 +175,7 @@ Blockly.Generator.prototype.allNestedComments = function(block) {
  *     For value blocks, an array containing the generated code and an
  *     operator order value.  Returns '' if block is null.
  */
-Blockly.Generator.prototype.blockToCode = function(block, opt_thisOnly) {
+Generator.prototype.blockToCode = function(block, opt_thisOnly) {
   if (this.isInitialized === false) {
     console.warn(
         'Generator init was not called before blockToCode was called.');
@@ -231,7 +232,7 @@ Blockly.Generator.prototype.blockToCode = function(block, opt_thisOnly) {
  * @return {string} Generated code or '' if no blocks are connected or the
  *     specified input does not exist.
  */
-Blockly.Generator.prototype.valueToCode = function(block, name, outerOrder) {
+Generator.prototype.valueToCode = function(block, name, outerOrder) {
   if (isNaN(outerOrder)) {
     throw TypeError('Expecting valid order from block: ' + block.type);
   }
@@ -302,7 +303,7 @@ Blockly.Generator.prototype.valueToCode = function(block, name, outerOrder) {
  * @param {string} name The name of the input.
  * @return {string} Generated code or '' if no blocks are connected.
  */
-Blockly.Generator.prototype.statementToCode = function(block, name) {
+Generator.prototype.statementToCode = function(block, name) {
   const targetBlock = block.getInputTargetBlock(name);
   let code = this.blockToCode(targetBlock);
   // Value blocks must return code and order of operations info.
@@ -326,7 +327,7 @@ Blockly.Generator.prototype.statementToCode = function(block, name) {
  * @param {!Blockly.Block} block Enclosing block.
  * @return {string} Loop contents, with infinite loop trap added.
  */
-Blockly.Generator.prototype.addLoopTrap = function(branch, block) {
+Generator.prototype.addLoopTrap = function(branch, block) {
   if (this.INFINITE_LOOP_TRAP) {
     branch = this.prefixLines(this.injectId(this.INFINITE_LOOP_TRAP, block),
         this.INDENT) + branch;
@@ -349,7 +350,7 @@ Blockly.Generator.prototype.addLoopTrap = function(branch, block) {
  * @param {!Blockly.Block} block Block which has an ID.
  * @return {string} Code snippet with ID.
  */
-Blockly.Generator.prototype.injectId = function(msg, block) {
+Generator.prototype.injectId = function(msg, block) {
   const id = block.id.replace(/\$/g, '$$$$');  // Issue 251.
   return msg.replace(/%1/g, '\'' + id + '\'');
 };
@@ -359,33 +360,33 @@ Blockly.Generator.prototype.injectId = function(msg, block) {
  * @type {string}
  * @protected
  */
-Blockly.Generator.prototype.RESERVED_WORDS_ = '';
+Generator.prototype.RESERVED_WORDS_ = '';
 
 /**
  * Add one or more words to the list of reserved words for this language.
  * @param {string} words Comma-separated list of words to add to the list.
  *     No spaces.  Duplicates are ok.
  */
-Blockly.Generator.prototype.addReservedWords = function(words) {
+Generator.prototype.addReservedWords = function(words) {
   this.RESERVED_WORDS_ += words + ',';
 };
 
 /**
  * This is used as a placeholder in functions defined using
- * Blockly.Generator.provideFunction_.  It must not be legal code that could
+ * Generator.provideFunction_.  It must not be legal code that could
  * legitimately appear in a function definition (or comment), and it must
  * not confuse the regular expression parser.
  * @type {string}
  * @protected
  */
-Blockly.Generator.prototype.FUNCTION_NAME_PLACEHOLDER_ = '{leCUI8hutHZI4480Dc}';
+Generator.prototype.FUNCTION_NAME_PLACEHOLDER_ = '{leCUI8hutHZI4480Dc}';
 
 /**
  * A dictionary of definitions to be printed before the code.
  * @type {!Object|undefined}
  * @protected
  */
-Blockly.Generator.prototype.definitions_;
+Generator.prototype.definitions_;
 
 /**
  * A dictionary mapping desired function names in definitions_ to actual
@@ -393,20 +394,20 @@ Blockly.Generator.prototype.definitions_;
  * @type {!Object|undefined}
  * @protected
  */
-Blockly.Generator.prototype.functionNames_;
+Generator.prototype.functionNames_;
 
 /**
  * A database of variable and procedure names.
  * @type {!Blockly.Names|undefined}
  * @protected
  */
-Blockly.Generator.prototype.nameDB_;
+Generator.prototype.nameDB_;
 
-Object.defineProperty(Blockly.Generator.prototype, 'variableDB_', {
+Object.defineProperty(Generator.prototype, 'variableDB_', {
   /**
    * Getter.
    * @deprecated 'variableDB_' was renamed to 'nameDB_' (May 2021).
-   * @this {Blockly.Generator}
+   * @this {Generator}
    * @return {!Blockly.Names|undefined} Name database.
    */
   get: function() {
@@ -417,7 +418,7 @@ Object.defineProperty(Blockly.Generator.prototype, 'variableDB_', {
   /**
    * Setter.
    * @deprecated 'variableDB_' was renamed to 'nameDB_' (May 2021).
-   * @this {Blockly.Generator}
+   * @this {Generator}
    * @param {!Blockly.Names|undefined} nameDb New name database.
    */
   set: function(nameDb) {
@@ -439,7 +440,7 @@ Object.defineProperty(Blockly.Generator.prototype, 'variableDB_', {
  * "listRandom", not "random").  There is no danger of colliding with reserved
  * words, or user-defined variable or procedure names.
  *
- * The code gets output when Blockly.Generator.finish() is called.
+ * The code gets output when Generator.finish() is called.
  *
  * @param {string} desiredName The desired name of the function
  *     (e.g. mathIsPrime).
@@ -448,7 +449,7 @@ Object.defineProperty(Blockly.Generator.prototype, 'variableDB_', {
  *     from desiredName if the former has already been taken by the user.
  * @protected
  */
-Blockly.Generator.prototype.provideFunction_ = function(desiredName, code) {
+Generator.prototype.provideFunction_ = function(desiredName, code) {
   if (!this.definitions_[desiredName]) {
     const functionName = this.nameDB_.getDistinctName(
         desiredName, Blockly.internalConstants.PROCEDURE_CATEGORY_NAME);
@@ -476,7 +477,7 @@ Blockly.Generator.prototype.provideFunction_ = function(desiredName, code) {
  * names.
  * @param {!Blockly.Workspace} _workspace Workspace to generate code from.
  */
-Blockly.Generator.prototype.init = function(_workspace) {
+Generator.prototype.init = function(_workspace) {
   // Optionally override
   // Create a dictionary of definitions to be printed before the code.
   this.definitions_ = Object.create(null);
@@ -499,7 +500,7 @@ Blockly.Generator.prototype.init = function(_workspace) {
  * @return {string} Code with comments and subsequent blocks added.
  * @protected
  */
-Blockly.Generator.prototype.scrub_ = function(_block, code, _opt_thisOnly) {
+Generator.prototype.scrub_ = function(_block, code, _opt_thisOnly) {
   // Optionally override
   return code;
 };
@@ -511,7 +512,7 @@ Blockly.Generator.prototype.scrub_ = function(_block, code, _opt_thisOnly) {
  * @param {string} code Generated code.
  * @return {string} Completed code.
  */
-Blockly.Generator.prototype.finish = function(code) {
+Generator.prototype.finish = function(code) {
   // Optionally override
   // Clean up temporary data.
   delete this.definitions_;
@@ -527,7 +528,9 @@ Blockly.Generator.prototype.finish = function(code) {
  * @param {string} line Line of generated code.
  * @return {string} Legal line of code.
  */
-Blockly.Generator.prototype.scrubNakedValue = function(line) {
+Generator.prototype.scrubNakedValue = function(line) {
   // Optionally override
   return line;
 };
+
+exports = Generator;
diff --git a/tests/deps.js b/tests/deps.js
index 87a32ab95..db93b7671 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -65,7 +65,7 @@ goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Bl
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es5'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.Block', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6'});
+goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.Block', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom']);

From 1a1bad0bd718255cf53ce9de1787e123356da225 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 08:45:25 -0700
Subject: [PATCH 278/833] Migrate core/generator.js to named requires

---
 core/generator.js | 47 +++++++++++++++++++++++++----------------------
 tests/deps.js     |  2 +-
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/core/generator.js b/core/generator.js
index 609e9d56c..7882a0402 100644
--- a/core/generator.js
+++ b/core/generator.js
@@ -14,12 +14,15 @@
 goog.module('Blockly.Generator');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Block');
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.utils.deprecation');
-
-goog.requireType('Blockly.Names');
-goog.requireType('Blockly.Workspace');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.require('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');
+const internalConstants = goog.require('Blockly.internalConstants');
+const deprecation = goog.require('Blockly.utils.deprecation');
+const {getMainWorkspace} = goog.require('Blockly');
 
 
 /**
@@ -88,14 +91,14 @@ Generator.prototype.isInitialized = null;
 
 /**
  * Generate code for all blocks in the workspace to the specified language.
- * @param {!Blockly.Workspace=} workspace Workspace to generate code from.
+ * @param {!Workspace=} workspace Workspace to generate code from.
  * @return {string} Generated code.
  */
 Generator.prototype.workspaceToCode = function(workspace) {
   if (!workspace) {
     // Backwards compatibility from before there could be multiple workspaces.
     console.warn('No workspace specified in workspaceToCode call.  Guessing.');
-    workspace = Blockly.getMainWorkspace();
+    workspace = getMainWorkspace();
   }
   let code = [];
   this.init(workspace);
@@ -147,7 +150,7 @@ Generator.prototype.prefixLines = function(text, prefix) {
 
 /**
  * Recursively spider a tree of blocks, returning all their comments.
- * @param {!Blockly.Block} block The block from which to start spidering.
+ * @param {!Block} block The block from which to start spidering.
  * @return {string} Concatenated list of comments.
  */
 Generator.prototype.allNestedComments = function(block) {
@@ -169,7 +172,7 @@ Generator.prototype.allNestedComments = function(block) {
 /**
  * Generate code for the specified block (and attached blocks).
  * The generator must be initialized before calling this function.
- * @param {Blockly.Block} block The block to generate code for.
+ * @param {Block} block The block to generate code for.
  * @param {boolean=} opt_thisOnly True to generate code for only this statement.
  * @return {string|!Array} For statement blocks, the generated code.
  *     For value blocks, an array containing the generated code and an
@@ -225,7 +228,7 @@ Generator.prototype.blockToCode = function(block, opt_thisOnly) {
 
 /**
  * Generate code representing the specified value input.
- * @param {!Blockly.Block} block The block containing the input.
+ * @param {!Block} block The block containing the input.
  * @param {string} name The name of the input.
  * @param {number} outerOrder The maximum binding strength (minimum order value)
  *     of any operators adjacent to "block".
@@ -299,7 +302,7 @@ Generator.prototype.valueToCode = function(block, name, outerOrder) {
  * statement input. Indent the code.
  * This is mainly used in generators. When trying to generate code to evaluate
  * look at using workspaceToCode or blockToCode.
- * @param {!Blockly.Block} block The block containing the input.
+ * @param {!Block} block The block containing the input.
  * @param {string} name The name of the input.
  * @return {string} Generated code or '' if no blocks are connected.
  */
@@ -324,7 +327,7 @@ Generator.prototype.statementToCode = function(block, name) {
  * statement executes), and a statement prefix to the end of the loop block
  * (right before the loop statement executes).
  * @param {string} branch Code for loop contents.
- * @param {!Blockly.Block} block Enclosing block.
+ * @param {!Block} block Enclosing block.
  * @return {string} Loop contents, with infinite loop trap added.
  */
 Generator.prototype.addLoopTrap = function(branch, block) {
@@ -347,7 +350,7 @@ Generator.prototype.addLoopTrap = function(branch, block) {
  * Inject a block ID into a message to replace '%1'.
  * Used for STATEMENT_PREFIX, STATEMENT_SUFFIX, and INFINITE_LOOP_TRAP.
  * @param {string} msg Code snippet with '%1'.
- * @param {!Blockly.Block} block Block which has an ID.
+ * @param {!Block} block Block which has an ID.
  * @return {string} Code snippet with ID.
  */
 Generator.prototype.injectId = function(msg, block) {
@@ -398,7 +401,7 @@ Generator.prototype.functionNames_;
 
 /**
  * A database of variable and procedure names.
- * @type {!Blockly.Names|undefined}
+ * @type {!Names|undefined}
  * @protected
  */
 Generator.prototype.nameDB_;
@@ -408,10 +411,10 @@ Object.defineProperty(Generator.prototype, 'variableDB_', {
    * Getter.
    * @deprecated 'variableDB_' was renamed to 'nameDB_' (May 2021).
    * @this {Generator}
-   * @return {!Blockly.Names|undefined} Name database.
+   * @return {!Names|undefined} Name database.
    */
   get: function() {
-    Blockly.utils.deprecation.warn(
+    deprecation.warn(
         'variableDB_', 'May 2021', 'May 2026', 'nameDB_');
     return this.nameDB_;
   },
@@ -419,10 +422,10 @@ Object.defineProperty(Generator.prototype, 'variableDB_', {
    * Setter.
    * @deprecated 'variableDB_' was renamed to 'nameDB_' (May 2021).
    * @this {Generator}
-   * @param {!Blockly.Names|undefined} nameDb New name database.
+   * @param {!Names|undefined} nameDb New name database.
    */
   set: function(nameDb) {
-    Blockly.utils.deprecation.warn(
+    deprecation.warn(
         'variableDB_', 'May 2021', 'May 2026', 'nameDB_');
     this.nameDB_ = nameDb;
   }
@@ -452,7 +455,7 @@ Object.defineProperty(Generator.prototype, 'variableDB_', {
 Generator.prototype.provideFunction_ = function(desiredName, code) {
   if (!this.definitions_[desiredName]) {
     const functionName = this.nameDB_.getDistinctName(
-        desiredName, Blockly.internalConstants.PROCEDURE_CATEGORY_NAME);
+        desiredName, internalConstants.PROCEDURE_CATEGORY_NAME);
     this.functionNames_[desiredName] = functionName;
     let codeText = code.join('\n').replace(
         this.FUNCTION_NAME_PLACEHOLDER_REGEXP_, functionName);
@@ -475,7 +478,7 @@ Generator.prototype.provideFunction_ = function(desiredName, code) {
  * Hook for code to run before code generation starts.
  * Subclasses may override this, e.g. to initialise the database of variable
  * names.
- * @param {!Blockly.Workspace} _workspace Workspace to generate code from.
+ * @param {!Workspace} _workspace Workspace to generate code from.
  */
 Generator.prototype.init = function(_workspace) {
   // Optionally override
@@ -493,7 +496,7 @@ Generator.prototype.init = function(_workspace) {
  * Subclasses may override this, e.g. to generate code for statements following
  * the block, or to handle comments for the specified block and any connected
  * value blocks.
- * @param {!Blockly.Block} _block The current block.
+ * @param {!Block} _block The current block.
  * @param {string} code The code created for this block.
  * @param {boolean=} _opt_thisOnly True to generate code for only this
  *     statement.
diff --git a/tests/deps.js b/tests/deps.js
index db93b7671..c40db7cbc 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -65,7 +65,7 @@ goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Bl
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es5'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.Block', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly', 'Blockly.Block', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom']);

From da77f3e5b42985828486f19fefcaeacca0c0eedd Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 08:46:01 -0700
Subject: [PATCH 279/833] clang-format core/generator.js

---
 core/generator.js | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/core/generator.js b/core/generator.js
index 7882a0402..8e71fb040 100644
--- a/core/generator.js
+++ b/core/generator.js
@@ -197,7 +197,8 @@ Generator.prototype.blockToCode = function(block, opt_thisOnly) {
 
   const func = this[block.type];
   if (typeof func != 'function') {
-    throw Error('Language "' + this.name_ + '" does not know how to generate ' +
+    throw Error(
+        'Language "' + this.name_ + '" does not know how to generate ' +
         'code for block type "' + block.type + '".');
   }
   // First argument to func.call is the value of 'this' in the generator.
@@ -256,8 +257,8 @@ Generator.prototype.valueToCode = function(block, name, outerOrder) {
   let code = tuple[0];
   const innerOrder = tuple[1];
   if (isNaN(innerOrder)) {
-    throw TypeError('Expecting valid order from value block: ' +
-        targetBlock.type);
+    throw TypeError(
+        'Expecting valid order from value block: ' + targetBlock.type);
   }
   if (!code) {
     return '';
@@ -312,7 +313,8 @@ Generator.prototype.statementToCode = function(block, name) {
   // Value blocks must return code and order of operations info.
   // Statement blocks must only return code.
   if (typeof code != 'string') {
-    throw TypeError('Expecting code from statement block: ' +
+    throw TypeError(
+        'Expecting code from statement block: ' +
         (targetBlock && targetBlock.type));
   }
   if (code) {
@@ -332,16 +334,19 @@ Generator.prototype.statementToCode = function(block, name) {
  */
 Generator.prototype.addLoopTrap = function(branch, block) {
   if (this.INFINITE_LOOP_TRAP) {
-    branch = this.prefixLines(this.injectId(this.INFINITE_LOOP_TRAP, block),
-        this.INDENT) + branch;
+    branch = this.prefixLines(
+                 this.injectId(this.INFINITE_LOOP_TRAP, block), this.INDENT) +
+        branch;
   }
   if (this.STATEMENT_SUFFIX && !block.suppressPrefixSuffix) {
-    branch = this.prefixLines(this.injectId(this.STATEMENT_SUFFIX, block),
-        this.INDENT) + branch;
+    branch = this.prefixLines(
+                 this.injectId(this.STATEMENT_SUFFIX, block), this.INDENT) +
+        branch;
   }
   if (this.STATEMENT_PREFIX && !block.suppressPrefixSuffix) {
-    branch = branch + this.prefixLines(this.injectId(this.STATEMENT_PREFIX,
-        block), this.INDENT);
+    branch = branch +
+        this.prefixLines(
+            this.injectId(this.STATEMENT_PREFIX, block), this.INDENT);
   }
   return branch;
 };
@@ -414,8 +419,7 @@ Object.defineProperty(Generator.prototype, 'variableDB_', {
    * @return {!Names|undefined} Name database.
    */
   get: function() {
-    deprecation.warn(
-        'variableDB_', 'May 2021', 'May 2026', 'nameDB_');
+    deprecation.warn('variableDB_', 'May 2021', 'May 2026', 'nameDB_');
     return this.nameDB_;
   },
   /**
@@ -425,8 +429,7 @@ Object.defineProperty(Generator.prototype, 'variableDB_', {
    * @param {!Names|undefined} nameDb New name database.
    */
   set: function(nameDb) {
-    deprecation.warn(
-        'variableDB_', 'May 2021', 'May 2026', 'nameDB_');
+    deprecation.warn('variableDB_', 'May 2021', 'May 2026', 'nameDB_');
     this.nameDB_ = nameDb;
   }
 });

From 1941e857e3564b6aa9ad323b607d66559ef1fe5b Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 08:51:58 -0700
Subject: [PATCH 280/833] Migrate core/grid.js to ES6 const/let

---
 core/grid.js  | 10 +++++-----
 tests/deps.js |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/grid.js b/core/grid.js
index 56171ef50..b01d59dbd 100644
--- a/core/grid.js
+++ b/core/grid.js
@@ -125,14 +125,14 @@ Blockly.Grid.prototype.getPatternId = function() {
 Blockly.Grid.prototype.update = function(scale) {
   this.scale_ = scale;
   // MSIE freaks if it sees a 0x0 pattern, so set empty patterns to 100x100.
-  var safeSpacing = (this.spacing_ * scale) || 100;
+  const safeSpacing = (this.spacing_ * scale) || 100;
 
   this.gridPattern_.setAttribute('width', safeSpacing);
   this.gridPattern_.setAttribute('height', safeSpacing);
 
-  var half = Math.floor(this.spacing_ / 2) + 0.5;
-  var start = half - this.length_ / 2;
-  var end = half + this.length_ / 2;
+  let half = Math.floor(this.spacing_ / 2) + 0.5;
+  let start = half - this.length_ / 2;
+  let end = half + this.length_ / 2;
 
   half *= scale;
   start *= scale;
@@ -197,7 +197,7 @@ Blockly.Grid.createDom = function(rnd, gridOptions, defs) {
       <rect stroke="#888" />
     </pattern>
   */
-  var gridPattern = Blockly.utils.dom.createSvgElement(
+  const gridPattern = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.PATTERN,
       {
         'id': 'blocklyGridPattern' + rnd,
diff --git a/tests/deps.js b/tests/deps.js
index f62333982..25dd37c2e 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -67,7 +67,7 @@ goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.Block', 'Blockly.internalConstants', 'Blockly.utils.deprecation']);
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
-goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.Connection', 'Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es5'});

From 4c7ac8dd382cd2cc8d2dd46c4e9eabf7af86def4 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 08:54:43 -0700
Subject: [PATCH 281/833] Migrate core/grid.js to goog.module

---
 core/grid.js  | 25 ++++++++++++++-----------
 tests/deps.js |  2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/core/grid.js b/core/grid.js
index b01d59dbd..48189fe69 100644
--- a/core/grid.js
+++ b/core/grid.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Grid');
+goog.module('Blockly.Grid');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.Svg');
@@ -27,7 +28,7 @@ goog.require('Blockly.utils.userAgent');
  *     https://developers.google.com/blockly/guides/configure/web/grid
  * @constructor
  */
-Blockly.Grid = function(pattern, options) {
+const Grid = function(pattern, options) {
   /**
    * The grid's SVG pattern, created during injection.
    * @type {!SVGElement}
@@ -78,14 +79,14 @@ Blockly.Grid = function(pattern, options) {
  * @type {number}
  * @private
  */
-Blockly.Grid.prototype.scale_ = 1;
+Grid.prototype.scale_ = 1;
 
 /**
  * Dispose of this grid and unlink from the DOM.
  * @package
  * @suppress {checkTypes}
  */
-Blockly.Grid.prototype.dispose = function() {
+Grid.prototype.dispose = function() {
   this.gridPattern_ = null;
 };
 
@@ -94,7 +95,7 @@ Blockly.Grid.prototype.dispose = function() {
  * @return {boolean} True if blocks should snap, false otherwise.
  * @package
  */
-Blockly.Grid.prototype.shouldSnap = function() {
+Grid.prototype.shouldSnap = function() {
   return this.snapToGrid_;
 };
 
@@ -103,7 +104,7 @@ Blockly.Grid.prototype.shouldSnap = function() {
  * @return {number} The spacing of the grid points.
  * @package
  */
-Blockly.Grid.prototype.getSpacing = function() {
+Grid.prototype.getSpacing = function() {
   return this.spacing_;
 };
 
@@ -113,7 +114,7 @@ Blockly.Grid.prototype.getSpacing = function() {
  * @return {string} The pattern ID.
  * @package
  */
-Blockly.Grid.prototype.getPatternId = function() {
+Grid.prototype.getPatternId = function() {
   return this.gridPattern_.id;
 };
 
@@ -122,7 +123,7 @@ Blockly.Grid.prototype.getPatternId = function() {
  * @param {number} scale The new workspace scale.
  * @package
  */
-Blockly.Grid.prototype.update = function(scale) {
+Grid.prototype.update = function(scale) {
   this.scale_ = scale;
   // MSIE freaks if it sees a 0x0 pattern, so set empty patterns to 100x100.
   const safeSpacing = (this.spacing_ * scale) || 100;
@@ -153,7 +154,7 @@ Blockly.Grid.prototype.update = function(scale) {
  * @param {number} y2 The new y end position of the line (in px).
  * @private
  */
-Blockly.Grid.prototype.setLineAttributes_ = function(line, width,
+Grid.prototype.setLineAttributes_ = function(line, width,
     x1, x2, y1, y2) {
   if (line) {
     line.setAttribute('stroke-width', width);
@@ -171,7 +172,7 @@ Blockly.Grid.prototype.setLineAttributes_ = function(line, width,
  * @param {number} y The new y position of the grid (in px).
  * @package
  */
-Blockly.Grid.prototype.moveTo = function(x, y) {
+Grid.prototype.moveTo = function(x, y) {
   this.gridPattern_.setAttribute('x', x);
   this.gridPattern_.setAttribute('y', y);
 
@@ -190,7 +191,7 @@ Blockly.Grid.prototype.moveTo = function(x, y) {
  * @return {!SVGElement} The SVG element for the grid pattern.
  * @package
  */
-Blockly.Grid.createDom = function(rnd, gridOptions, defs) {
+Grid.createDom = function(rnd, gridOptions, defs) {
   /*
     <pattern id="blocklyGridPattern837493" patternUnits="userSpaceOnUse">
       <rect stroke="#888" />
@@ -220,3 +221,5 @@ Blockly.Grid.createDom = function(rnd, gridOptions, defs) {
   }
   return gridPattern;
 };
+
+exports = Grid;
diff --git a/tests/deps.js b/tests/deps.js
index 25dd37c2e..f6a0972e2 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -67,7 +67,7 @@ goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.Block', 'Blockly.internalConstants', 'Blockly.utils.deprecation']);
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
-goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6'});
+goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.Connection', 'Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es5'});

From 25cb8773cd0627fe8c6066a5bf6c2198f2de5cac Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 08:59:42 -0700
Subject: [PATCH 282/833] Migrate core/grid.js to named requires

---
 core/grid.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/grid.js b/core/grid.js
index 48189fe69..b93a39fa1 100644
--- a/core/grid.js
+++ b/core/grid.js
@@ -14,9 +14,9 @@
 goog.module('Blockly.Grid');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.userAgent');
+const Svg = goog.require('Blockly.utils.Svg');
+const dom = goog.require('Blockly.utils.dom');
+const userAgent = goog.require('Blockly.utils.userAgent');
 
 
 /**
@@ -176,7 +176,7 @@ Grid.prototype.moveTo = function(x, y) {
   this.gridPattern_.setAttribute('x', x);
   this.gridPattern_.setAttribute('y', y);
 
-  if (Blockly.utils.userAgent.IE || Blockly.utils.userAgent.EDGE) {
+  if (userAgent.IE || userAgent.EDGE) {
     // IE/Edge doesn't notice that the x/y offsets have changed.
     // Force an update.
     this.update(this.scale_);
@@ -198,26 +198,26 @@ Grid.createDom = function(rnd, gridOptions, defs) {
       <rect stroke="#888" />
     </pattern>
   */
-  const gridPattern = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATTERN,
+  const gridPattern = dom.createSvgElement(
+      Svg.PATTERN,
       {
         'id': 'blocklyGridPattern' + rnd,
         'patternUnits': 'userSpaceOnUse'
       }, defs);
   if (gridOptions['length'] > 0 && gridOptions['spacing'] > 0) {
-    Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.LINE,
+    dom.createSvgElement(
+        Svg.LINE,
         {'stroke': gridOptions['colour']}, gridPattern);
     if (gridOptions['length'] > 1) {
-      Blockly.utils.dom.createSvgElement(
-          Blockly.utils.Svg.LINE,
+      dom.createSvgElement(
+          Svg.LINE,
           {'stroke': gridOptions['colour']}, gridPattern);
     }
     // x1, y1, x1, x2 properties will be set later in update.
   } else {
     // Edge 16 doesn't handle empty patterns
-    Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.LINE, {}, gridPattern);
+    dom.createSvgElement(
+        Svg.LINE, {}, gridPattern);
   }
   return gridPattern;
 };

From d36abd2b338117eb4ca248346926bdc5f36e7c2f Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 09:00:09 -0700
Subject: [PATCH 283/833] clang-format core/grid.js

---
 core/grid.js | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/core/grid.js b/core/grid.js
index b93a39fa1..1a1d5f2a3 100644
--- a/core/grid.js
+++ b/core/grid.js
@@ -62,8 +62,8 @@ const Grid = function(pattern, options) {
    * @type {SVGElement}
    * @private
    */
-  this.line2_ = this.line1_ &&
-    (/** @type {SVGElement} */ (this.line1_.nextSibling));
+  this.line2_ =
+      this.line1_ && (/** @type {SVGElement} */ (this.line1_.nextSibling));
 
   /**
    * Whether blocks should snap to the grid.
@@ -154,8 +154,7 @@ Grid.prototype.update = function(scale) {
  * @param {number} y2 The new y end position of the line (in px).
  * @private
  */
-Grid.prototype.setLineAttributes_ = function(line, width,
-    x1, x2, y1, y2) {
+Grid.prototype.setLineAttributes_ = function(line, width, x1, x2, y1, y2) {
   if (line) {
     line.setAttribute('stroke-width', width);
     line.setAttribute('x1', x1);
@@ -200,24 +199,19 @@ Grid.createDom = function(rnd, gridOptions, defs) {
   */
   const gridPattern = dom.createSvgElement(
       Svg.PATTERN,
-      {
-        'id': 'blocklyGridPattern' + rnd,
-        'patternUnits': 'userSpaceOnUse'
-      }, defs);
+      {'id': 'blocklyGridPattern' + rnd, 'patternUnits': 'userSpaceOnUse'},
+      defs);
   if (gridOptions['length'] > 0 && gridOptions['spacing'] > 0) {
     dom.createSvgElement(
-        Svg.LINE,
-        {'stroke': gridOptions['colour']}, gridPattern);
+        Svg.LINE, {'stroke': gridOptions['colour']}, gridPattern);
     if (gridOptions['length'] > 1) {
       dom.createSvgElement(
-          Svg.LINE,
-          {'stroke': gridOptions['colour']}, gridPattern);
+          Svg.LINE, {'stroke': gridOptions['colour']}, gridPattern);
     }
     // x1, y1, x1, x2 properties will be set later in update.
   } else {
     // Edge 16 doesn't handle empty patterns
-    dom.createSvgElement(
-        Svg.LINE, {}, gridPattern);
+    dom.createSvgElement(Svg.LINE, {}, gridPattern);
   }
   return gridPattern;
 };

From 341b5156934f8239924049c51c918c80ec973258 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 09:15:58 -0700
Subject: [PATCH 284/833] Migrate core/icon.js to ES6 const/let

---
 core/icon.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/icon.js b/core/icon.js
index c5f3477cd..ca1548aa3 100644
--- a/core/icon.js
+++ b/core/icon.js
@@ -164,10 +164,10 @@ Blockly.Icon.prototype.setIconLocation = function(xy) {
  */
 Blockly.Icon.prototype.computeIconLocation = function() {
   // Find coordinates for the centre of the icon and update the arrow.
-  var blockXY = this.block_.getRelativeToSurfaceXY();
-  var iconXY = Blockly.utils.getRelativeXY(
+  const blockXY = this.block_.getRelativeToSurfaceXY();
+  const iconXY = Blockly.utils.getRelativeXY(
       /** @type {!SVGElement} */ (this.iconGroup_));
-  var newXY = new Blockly.utils.Coordinate(
+  const newXY = new Blockly.utils.Coordinate(
       blockXY.x + iconXY.x + this.SIZE / 2,
       blockXY.y + iconXY.y + this.SIZE / 2);
   if (!Blockly.utils.Coordinate.equals(this.getIconLocation(), newXY)) {

From 8f72d004741ef12eca40fd96ebd4ff85395efa41 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 09:17:59 -0700
Subject: [PATCH 285/833] Migrate core/icon.js to goog.module

---
 core/icon.js  | 41 ++++++++++++++++++++++-------------------
 tests/deps.js |  2 +-
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/core/icon.js b/core/icon.js
index ca1548aa3..02e6f7348 100644
--- a/core/icon.js
+++ b/core/icon.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Icon');
+goog.module('Blockly.Icon');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.utils');
@@ -29,7 +30,7 @@ goog.requireType('Blockly.Bubble');
  * @constructor
  * @abstract
  */
-Blockly.Icon = function(block) {
+const Icon = function(block) {
   /**
    * The block this icon is attached to.
    * @type {Blockly.BlockSvg}
@@ -47,31 +48,31 @@ Blockly.Icon = function(block) {
 /**
  * Does this icon get hidden when the block is collapsed.
  */
-Blockly.Icon.prototype.collapseHidden = true;
+Icon.prototype.collapseHidden = true;
 
 /**
  * Height and width of icons.
  */
-Blockly.Icon.prototype.SIZE = 17;
+Icon.prototype.SIZE = 17;
 
 /**
  * Bubble UI (if visible).
  * @type {?Blockly.Bubble}
  * @protected
  */
-Blockly.Icon.prototype.bubble_ = null;
+Icon.prototype.bubble_ = null;
 
 /**
  * Absolute coordinate of icon's center.
  * @type {?Blockly.utils.Coordinate}
  * @protected
  */
-Blockly.Icon.prototype.iconXY_ = null;
+Icon.prototype.iconXY_ = null;
 
 /**
  * Create the icon on the block.
  */
-Blockly.Icon.prototype.createIcon = function() {
+Icon.prototype.createIcon = function() {
   if (this.iconGroup_) {
     // Icon already exists.
     return;
@@ -99,7 +100,7 @@ Blockly.Icon.prototype.createIcon = function() {
 /**
  * Dispose of this icon.
  */
-Blockly.Icon.prototype.dispose = function() {
+Icon.prototype.dispose = function() {
   // Dispose of and unlink the icon.
   Blockly.utils.dom.removeNode(this.iconGroup_);
   this.iconGroup_ = null;
@@ -111,7 +112,7 @@ Blockly.Icon.prototype.dispose = function() {
 /**
  * Add or remove the UI indicating if this icon may be clicked or not.
  */
-Blockly.Icon.prototype.updateEditable = function() {
+Icon.prototype.updateEditable = function() {
   // No-op on the base class.
 };
 
@@ -119,7 +120,7 @@ Blockly.Icon.prototype.updateEditable = function() {
  * Is the associated bubble visible?
  * @return {boolean} True if the bubble is visible.
  */
-Blockly.Icon.prototype.isVisible = function() {
+Icon.prototype.isVisible = function() {
   return !!this.bubble_;
 };
 
@@ -128,7 +129,7 @@ Blockly.Icon.prototype.isVisible = function() {
  * @param {!Event} e Mouse click event.
  * @protected
  */
-Blockly.Icon.prototype.iconClick_ = function(e) {
+Icon.prototype.iconClick_ = function(e) {
   if (this.block_.workspace.isDragging()) {
     // Drag operation is concluding.  Don't open the editor.
     return;
@@ -141,7 +142,7 @@ Blockly.Icon.prototype.iconClick_ = function(e) {
 /**
  * Change the colour of the associated bubble to match its block.
  */
-Blockly.Icon.prototype.applyColour = function() {
+Icon.prototype.applyColour = function() {
   if (this.isVisible()) {
     this.bubble_.setColour(this.block_.style.colourPrimary);
   }
@@ -151,7 +152,7 @@ Blockly.Icon.prototype.applyColour = function() {
  * Notification that the icon has moved.  Update the arrow accordingly.
  * @param {!Blockly.utils.Coordinate} xy Absolute location in workspace coordinates.
  */
-Blockly.Icon.prototype.setIconLocation = function(xy) {
+Icon.prototype.setIconLocation = function(xy) {
   this.iconXY_ = xy;
   if (this.isVisible()) {
     this.bubble_.setAnchorLocation(xy);
@@ -162,7 +163,7 @@ Blockly.Icon.prototype.setIconLocation = function(xy) {
  * Notification that the icon has moved, but we don't really know where.
  * Recompute the icon's location from scratch.
  */
-Blockly.Icon.prototype.computeIconLocation = function() {
+Icon.prototype.computeIconLocation = function() {
   // Find coordinates for the centre of the icon and update the arrow.
   const blockXY = this.block_.getRelativeToSurfaceXY();
   const iconXY = Blockly.utils.getRelativeXY(
@@ -180,7 +181,7 @@ Blockly.Icon.prototype.computeIconLocation = function() {
  * @return {?Blockly.utils.Coordinate} Object with x and y properties in
  *     workspace coordinates.
  */
-Blockly.Icon.prototype.getIconLocation = function() {
+Icon.prototype.getIconLocation = function() {
   return this.iconXY_;
 };
 
@@ -191,9 +192,9 @@ Blockly.Icon.prototype.getIconLocation = function() {
  * @return {!Blockly.utils.Size} Height and width.
  */
 // TODO (#2562): Remove getCorrectedSize.
-Blockly.Icon.prototype.getCorrectedSize = function() {
+Icon.prototype.getCorrectedSize = function() {
   return new Blockly.utils.Size(
-      Blockly.Icon.prototype.SIZE, Blockly.Icon.prototype.SIZE - 2);
+      Icon.prototype.SIZE, Icon.prototype.SIZE - 2);
 };
 
 /**
@@ -201,10 +202,12 @@ Blockly.Icon.prototype.getCorrectedSize = function() {
  * @param {!Element} group The icon group.
  * @protected
  */
-Blockly.Icon.prototype.drawIcon_;
+Icon.prototype.drawIcon_;
 
 /**
  * Show or hide the icon.
  * @param {boolean} visible True if the icon should be visible.
  */
-Blockly.Icon.prototype.setVisible;
+Icon.prototype.setVisible;
+
+exports = Icon;
diff --git a/tests/deps.js b/tests/deps.js
index f62333982..57ab7a557 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -68,7 +68,7 @@ goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'],
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.Block', 'Blockly.internalConstants', 'Blockly.utils.deprecation']);
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.Connection', 'Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es5'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes']);

From f0a3c7214dc086de2ad29dabc41fc35e8c975102 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 22 Jul 2021 13:40:19 -0700
Subject: [PATCH 286/833] Migrate core/interfaces/i_metrics_manager.js to
 goog.module

---
 core/interfaces/i_metrics_manager.js | 25 ++++++++++++++-----------
 tests/deps.js                        |  2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/core/interfaces/i_metrics_manager.js b/core/interfaces/i_metrics_manager.js
index 916f14d5d..f9b74e4c2 100644
--- a/core/interfaces/i_metrics_manager.js
+++ b/core/interfaces/i_metrics_manager.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-goog.provide('Blockly.IMetricsManager');
+goog.module('Blockly.IMetricsManager');
+goog.module.declareLegacyNamespace();
 
 goog.requireType('Blockly.MetricsManager');
 goog.requireType('Blockly.utils.Metrics');
@@ -22,14 +23,14 @@ goog.requireType('Blockly.utils.Size');
  * Interface for a metrics manager.
  * @interface
  */
-Blockly.IMetricsManager = function() {};
+const IMetricsManager = function() {};
 
 /**
  * Returns whether the scroll area has fixed edges.
  * @return {boolean} Whether the scroll area has fixed edges.
  * @package
  */
-Blockly.IMetricsManager.prototype.hasFixedEdges;
+IMetricsManager.prototype.hasFixedEdges;
 
 /**
  * Returns the metrics for the scroll area of the workspace.
@@ -44,7 +45,7 @@ Blockly.IMetricsManager.prototype.hasFixedEdges;
  * @return {!Blockly.MetricsManager.ContainerRegion} The metrics for the scroll
  *    container
  */
-Blockly.IMetricsManager.prototype.getScrollMetrics;
+IMetricsManager.prototype.getScrollMetrics;
 
 /**
  * Gets the width and the height of the flyout on the workspace in pixel
@@ -55,7 +56,7 @@ Blockly.IMetricsManager.prototype.getScrollMetrics;
  *     flyout.
  * @public
  */
-Blockly.IMetricsManager.prototype.getFlyoutMetrics;
+IMetricsManager.prototype.getFlyoutMetrics;
 
 /**
  * Gets the width, height and position of the toolbox on the workspace in pixel
@@ -66,7 +67,7 @@ Blockly.IMetricsManager.prototype.getFlyoutMetrics;
  *     height and position of the toolbox.
  * @public
  */
-Blockly.IMetricsManager.prototype.getToolboxMetrics;
+IMetricsManager.prototype.getToolboxMetrics;
 
 /**
  * Gets the width and height of the workspace's parent SVG element in pixel
@@ -75,7 +76,7 @@ Blockly.IMetricsManager.prototype.getToolboxMetrics;
  *     SVG element.
  * @public
  */
-Blockly.IMetricsManager.prototype.getSvgMetrics;
+IMetricsManager.prototype.getSvgMetrics;
 
 /**
  * Gets the absolute left and absolute top in pixel coordinates.
@@ -84,7 +85,7 @@ Blockly.IMetricsManager.prototype.getSvgMetrics;
  *     the workspace.
  * @public
  */
-Blockly.IMetricsManager.prototype.getAbsoluteMetrics;
+IMetricsManager.prototype.getAbsoluteMetrics;
 
 /**
  * Gets the metrics for the visible workspace in either pixel or workspace
@@ -96,7 +97,7 @@ Blockly.IMetricsManager.prototype.getAbsoluteMetrics;
  *     coordinates.
  * @public
  */
-Blockly.IMetricsManager.prototype.getViewMetrics;
+IMetricsManager.prototype.getViewMetrics;
 
 /**
  * Gets content metrics in either pixel or workspace coordinates.
@@ -108,7 +109,7 @@ Blockly.IMetricsManager.prototype.getViewMetrics;
  *     metrics for the content container.
  * @public
  */
-Blockly.IMetricsManager.prototype.getContentMetrics;
+IMetricsManager.prototype.getContentMetrics;
 
 /**
  * Returns an object with all the metrics required to size scrollbars for a
@@ -142,4 +143,6 @@ Blockly.IMetricsManager.prototype.getContentMetrics;
  *     level workspace.
  * @public
  */
-Blockly.IMetricsManager.prototype.getMetrics;
+IMetricsManager.prototype.getMetrics;
+
+exports = IMetricsManager;
diff --git a/tests/deps.js b/tests/deps.js
index f62333982..5cadf3977 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -91,7 +91,7 @@ goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarg
 goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], ['Blockly.IDeletable'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], ['Blockly.IRegistrable'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_keyboard_accessible.js', ['Blockly.IKeyboardAccessible'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], []);
+goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], [], {'lang': 'es6', 'module': 'goog'});

From f3a0c6414f673f957afff3e921023821820a6f7d Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 22 Jul 2021 13:40:51 -0700
Subject: [PATCH 287/833] Migrate core/interfaces/i_metrics_manager.js named
 requires

---
 core/interfaces/i_metrics_manager.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/core/interfaces/i_metrics_manager.js b/core/interfaces/i_metrics_manager.js
index f9b74e4c2..b8cbd2231 100644
--- a/core/interfaces/i_metrics_manager.js
+++ b/core/interfaces/i_metrics_manager.js
@@ -14,9 +14,9 @@
 goog.module('Blockly.IMetricsManager');
 goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.MetricsManager');
-goog.requireType('Blockly.utils.Metrics');
-goog.requireType('Blockly.utils.Size');
+const Metrics = goog.requireType('Blockly.utils.Metrics');
+const Size = goog.requireType('Blockly.utils.Size');
+const {AbsoluteMetrics, ContainerRegion, ToolboxMetrics} = goog.requireType('Blockly.MetricsManager');
 
 
 /**
@@ -36,13 +36,13 @@ IMetricsManager.prototype.hasFixedEdges;
  * Returns the metrics for the scroll area of the workspace.
  * @param {boolean=} opt_getWorkspaceCoordinates True to get the scroll metrics
  *     in workspace coordinates, false to get them in pixel coordinates.
- * @param {!Blockly.MetricsManager.ContainerRegion=} opt_viewMetrics The view
+ * @param {!ContainerRegion=} opt_viewMetrics The view
  *     metrics if they have been previously computed. Passing in null may cause
  *     the view metrics to be computed again, if it is needed.
- * @param {!Blockly.MetricsManager.ContainerRegion=} opt_contentMetrics The
+ * @param {!ContainerRegion=} opt_contentMetrics The
  *     content metrics if they have been previously computed. Passing in null
  *     may cause the content metrics to be computed again, if it is needed.
- * @return {!Blockly.MetricsManager.ContainerRegion} The metrics for the scroll
+ * @return {!ContainerRegion} The metrics for the scroll
  *    container
  */
 IMetricsManager.prototype.getScrollMetrics;
@@ -52,7 +52,7 @@ IMetricsManager.prototype.getScrollMetrics;
  * coordinates. Returns 0 for the width and height if the workspace has a
  * category toolbox instead of a simple toolbox.
  * @param {boolean=} opt_own Whether to only return the workspace's own flyout.
- * @return {!Blockly.MetricsManager.ToolboxMetrics} The width and height of the
+ * @return {!ToolboxMetrics} The width and height of the
  *     flyout.
  * @public
  */
@@ -63,7 +63,7 @@ IMetricsManager.prototype.getFlyoutMetrics;
  * coordinates. Returns 0 for the width and height if the workspace has a simple
  * toolbox instead of a category toolbox. To get the width and height of a
  * simple toolbox @see {@link getFlyoutMetrics}.
- * @return {!Blockly.MetricsManager.ToolboxMetrics} The object with the width,
+ * @return {!ToolboxMetrics} The object with the width,
  *     height and position of the toolbox.
  * @public
  */
@@ -72,7 +72,7 @@ IMetricsManager.prototype.getToolboxMetrics;
 /**
  * Gets the width and height of the workspace's parent SVG element in pixel
  * coordinates. This area includes the toolbox and the visible workspace area.
- * @return {!Blockly.utils.Size} The width and height of the workspace's parent
+ * @return {!Size} The width and height of the workspace's parent
  *     SVG element.
  * @public
  */
@@ -81,7 +81,7 @@ IMetricsManager.prototype.getSvgMetrics;
 /**
  * Gets the absolute left and absolute top in pixel coordinates.
  * This is where the visible workspace starts in relation to the SVG container.
- * @return {!Blockly.MetricsManager.AbsoluteMetrics} The absolute metrics for
+ * @return {!AbsoluteMetrics} The absolute metrics for
  *     the workspace.
  * @public
  */
@@ -92,7 +92,7 @@ IMetricsManager.prototype.getAbsoluteMetrics;
  * coordinates. The visible workspace does not include the toolbox or flyout.
  * @param {boolean=} opt_getWorkspaceCoordinates True to get the view metrics in
  *     workspace coordinates, false to get them in pixel coordinates.
- * @return {!Blockly.MetricsManager.ContainerRegion} The width, height, top and
+ * @return {!ContainerRegion} The width, height, top and
  *     left of the viewport in either workspace coordinates or pixel
  *     coordinates.
  * @public
@@ -105,7 +105,7 @@ IMetricsManager.prototype.getViewMetrics;
  * workspace (workspace comments and blocks).
  * @param {boolean=} opt_getWorkspaceCoordinates True to get the content metrics
  *     in workspace coordinates, false to get them in pixel coordinates.
- * @return {!Blockly.MetricsManager.ContainerRegion} The
+ * @return {!ContainerRegion} The
  *     metrics for the content container.
  * @public
  */
@@ -139,7 +139,7 @@ IMetricsManager.prototype.getContentMetrics;
  * .flyoutHeight: Height of the flyout if it is always open.  Otherwise zero.
  * .toolboxPosition: Top, bottom, left or right. Use TOOLBOX_AT constants to
  *     compare.
- * @return {!Blockly.utils.Metrics} Contains size and position metrics of a top
+ * @return {!Metrics} Contains size and position metrics of a top
  *     level workspace.
  * @public
  */

From b72c07ad8decc7ec809a2e566bb9bfd524a38d4f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 23 Jul 2021 09:16:10 -0700
Subject: [PATCH 288/833] Add eslint disable for no-unused-vars to
 core/interfaces/i_metrics_manager.js

---
 core/interfaces/i_metrics_manager.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/interfaces/i_metrics_manager.js b/core/interfaces/i_metrics_manager.js
index b8cbd2231..db1f575c1 100644
--- a/core/interfaces/i_metrics_manager.js
+++ b/core/interfaces/i_metrics_manager.js
@@ -14,8 +14,11 @@
 goog.module('Blockly.IMetricsManager');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const Metrics = goog.requireType('Blockly.utils.Metrics');
+/* eslint-disable-next-line no-unused-vars */
 const Size = goog.requireType('Blockly.utils.Size');
+/* eslint-disable-next-line no-unused-vars */
 const {AbsoluteMetrics, ContainerRegion, ToolboxMetrics} = goog.requireType('Blockly.MetricsManager');
 
 

From 977d0f35bff7303573bb83e93e821edd4b839c8d Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 09:21:00 -0700
Subject: [PATCH 289/833] Migrate core/icon.js to named requires

---
 core/icon.js | 53 ++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/core/icon.js b/core/icon.js
index 02e6f7348..0eaf37f0b 100644
--- a/core/icon.js
+++ b/core/icon.js
@@ -13,27 +13,28 @@
 goog.module('Blockly.Icon');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Size');
-goog.require('Blockly.utils.Svg');
-
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.Bubble');
+/* 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');
+const browserEvents = goog.require('Blockly.browserEvents');
+const dom = goog.require('Blockly.utils.dom');
+const {getRelativeXY, isRightButton} = goog.require('Blockly.utils');
 
 
 /**
  * Class for an icon.
- * @param {Blockly.BlockSvg} block The block associated with this icon.
+ * @param {BlockSvg} block The block associated with this icon.
  * @constructor
  * @abstract
  */
 const Icon = function(block) {
   /**
    * The block this icon is attached to.
-   * @type {Blockly.BlockSvg}
+   * @type {BlockSvg}
    * @protected
    */
   this.block_ = block;
@@ -57,14 +58,14 @@ Icon.prototype.SIZE = 17;
 
 /**
  * Bubble UI (if visible).
- * @type {?Blockly.Bubble}
+ * @type {?Bubble}
  * @protected
  */
 Icon.prototype.bubble_ = null;
 
 /**
  * Absolute coordinate of icon's center.
- * @type {?Blockly.utils.Coordinate}
+ * @type {?Coordinate}
  * @protected
  */
 Icon.prototype.iconXY_ = null;
@@ -82,17 +83,17 @@ Icon.prototype.createIcon = function() {
     ...
   </g>
   */
-  this.iconGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
+  this.iconGroup_ = dom.createSvgElement(
+      Svg.G,
       {'class': 'blocklyIconGroup'}, null);
   if (this.block_.isInFlyout) {
-    Blockly.utils.dom.addClass(
+    dom.addClass(
         /** @type {!Element} */ (this.iconGroup_), 'blocklyIconGroupReadonly');
   }
   this.drawIcon_(this.iconGroup_);
 
   this.block_.getSvgRoot().appendChild(this.iconGroup_);
-  Blockly.browserEvents.conditionalBind(
+  browserEvents.conditionalBind(
       this.iconGroup_, 'mouseup', this, this.iconClick_);
   this.updateEditable();
 };
@@ -102,7 +103,7 @@ Icon.prototype.createIcon = function() {
  */
 Icon.prototype.dispose = function() {
   // Dispose of and unlink the icon.
-  Blockly.utils.dom.removeNode(this.iconGroup_);
+  dom.removeNode(this.iconGroup_);
   this.iconGroup_ = null;
   // Dispose of and unlink the bubble.
   this.setVisible(false);
@@ -134,7 +135,7 @@ Icon.prototype.iconClick_ = function(e) {
     // Drag operation is concluding.  Don't open the editor.
     return;
   }
-  if (!this.block_.isInFlyout && !Blockly.utils.isRightButton(e)) {
+  if (!this.block_.isInFlyout && !isRightButton(e)) {
     this.setVisible(!this.isVisible());
   }
 };
@@ -150,7 +151,7 @@ Icon.prototype.applyColour = function() {
 
 /**
  * Notification that the icon has moved.  Update the arrow accordingly.
- * @param {!Blockly.utils.Coordinate} xy Absolute location in workspace coordinates.
+ * @param {!Coordinate} xy Absolute location in workspace coordinates.
  */
 Icon.prototype.setIconLocation = function(xy) {
   this.iconXY_ = xy;
@@ -166,19 +167,19 @@ Icon.prototype.setIconLocation = function(xy) {
 Icon.prototype.computeIconLocation = function() {
   // Find coordinates for the centre of the icon and update the arrow.
   const blockXY = this.block_.getRelativeToSurfaceXY();
-  const iconXY = Blockly.utils.getRelativeXY(
+  const iconXY = getRelativeXY(
       /** @type {!SVGElement} */ (this.iconGroup_));
-  const newXY = new Blockly.utils.Coordinate(
+  const newXY = new Coordinate(
       blockXY.x + iconXY.x + this.SIZE / 2,
       blockXY.y + iconXY.y + this.SIZE / 2);
-  if (!Blockly.utils.Coordinate.equals(this.getIconLocation(), newXY)) {
+  if (!Coordinate.equals(this.getIconLocation(), newXY)) {
     this.setIconLocation(newXY);
   }
 };
 
 /**
  * Returns the center of the block's icon relative to the surface.
- * @return {?Blockly.utils.Coordinate} Object with x and y properties in
+ * @return {?Coordinate} Object with x and y properties in
  *     workspace coordinates.
  */
 Icon.prototype.getIconLocation = function() {
@@ -189,11 +190,11 @@ Icon.prototype.getIconLocation = function() {
  * Get the size of the icon as used for rendering.
  * This differs from the actual size of the icon, because it bulges slightly
  * out of its row rather than increasing the height of its row.
- * @return {!Blockly.utils.Size} Height and width.
+ * @return {!Size} Height and width.
  */
 // TODO (#2562): Remove getCorrectedSize.
 Icon.prototype.getCorrectedSize = function() {
-  return new Blockly.utils.Size(
+  return new Size(
       Icon.prototype.SIZE, Icon.prototype.SIZE - 2);
 };
 

From 7175e9452bceadbf15e80e017bf00e5ffb61bb6b Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 09:21:41 -0700
Subject: [PATCH 290/833] clang-format core/icon.js

---
 core/icon.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/icon.js b/core/icon.js
index 0eaf37f0b..b6b8942a7 100644
--- a/core/icon.js
+++ b/core/icon.js
@@ -83,9 +83,8 @@ Icon.prototype.createIcon = function() {
     ...
   </g>
   */
-  this.iconGroup_ = dom.createSvgElement(
-      Svg.G,
-      {'class': 'blocklyIconGroup'}, null);
+  this.iconGroup_ =
+      dom.createSvgElement(Svg.G, {'class': 'blocklyIconGroup'}, null);
   if (this.block_.isInFlyout) {
     dom.addClass(
         /** @type {!Element} */ (this.iconGroup_), 'blocklyIconGroupReadonly');
@@ -194,8 +193,7 @@ Icon.prototype.getIconLocation = function() {
  */
 // TODO (#2562): Remove getCorrectedSize.
 Icon.prototype.getCorrectedSize = function() {
-  return new Size(
-      Icon.prototype.SIZE, Icon.prototype.SIZE - 2);
+  return new Size(Icon.prototype.SIZE, Icon.prototype.SIZE - 2);
 };
 
 /**

From 2aff67498b516c50479c51a5fbda79bd04aa0951 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 09:49:13 -0700
Subject: [PATCH 291/833] Migrate core/input.js to ES6 const/let

---
 core/input.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/input.js b/core/input.js
index 443bfc83f..315570ed3 100644
--- a/core/input.js
+++ b/core/input.js
@@ -151,7 +151,7 @@ Blockly.Input.prototype.insertFieldAt = function(index, field, opt_name) {
  * @throws {Error} if the field is not present and opt_quiet is false.
  */
 Blockly.Input.prototype.removeField = function(name, opt_quiet) {
-  for (var i = 0, field; (field = this.fieldRow[i]); i++) {
+  for (let i = 0, field; (field = this.fieldRow[i]); i++) {
     if (field.name === name) {
       field.dispose();
       this.fieldRow.splice(i, 1);
@@ -189,13 +189,13 @@ Blockly.Input.prototype.setVisible = function(visible) {
   // Note: Currently there are only unit tests for block.setCollapsed()
   // because this function is package. If this function goes back to being a
   // public API tests (lots of tests) should be added.
-  var renderList = [];
+  let renderList = [];
   if (this.visible_ == visible) {
     return renderList;
   }
   this.visible_ = visible;
 
-  for (var y = 0, field; (field = this.fieldRow[y]); y++) {
+  for (let y = 0, field; (field = this.fieldRow[y]); y++) {
     field.setVisible(visible);
   }
   if (this.connection) {
@@ -207,7 +207,7 @@ Blockly.Input.prototype.setVisible = function(visible) {
     } else {
       this.connection.stopTrackingAll();
     }
-    var child = this.connection.targetBlock();
+    const child = this.connection.targetBlock();
     if (child) {
       child.getSvgRoot().style.display = visible ? 'block' : 'none';
     }
@@ -220,7 +220,7 @@ Blockly.Input.prototype.setVisible = function(visible) {
  * @package
  */
 Blockly.Input.prototype.markDirty = function() {
-  for (var y = 0, field; (field = this.fieldRow[y]); y++) {
+  for (let y = 0, field; (field = this.fieldRow[y]); y++) {
     field.markDirty();
   }
 };
@@ -285,7 +285,7 @@ Blockly.Input.prototype.init = function() {
   if (!this.sourceBlock_.workspace.rendered) {
     return;  // Headless blocks don't need fields initialized.
   }
-  for (var i = 0; i < this.fieldRow.length; i++) {
+  for (let i = 0; i < this.fieldRow.length; i++) {
     this.fieldRow[i].init();
   }
 };
@@ -295,7 +295,7 @@ Blockly.Input.prototype.init = function() {
  * @suppress {checkTypes}
  */
 Blockly.Input.prototype.dispose = function() {
-  for (var i = 0, field; (field = this.fieldRow[i]); i++) {
+  for (let i = 0, field; (field = this.fieldRow[i]); i++) {
     field.dispose();
   }
   if (this.connection) {

From f96c14c0033b27e1a1eef0146fef5f6615283287 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 09:51:25 -0700
Subject: [PATCH 292/833] Migrate core/input.js to goog.module

---
 core/input.js | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/core/input.js b/core/input.js
index 315570ed3..b9b277fde 100644
--- a/core/input.js
+++ b/core/input.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Input');
+goog.module('Blockly.Input');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Connection');
 goog.require('Blockly.fieldRegistry');
@@ -33,7 +34,7 @@ goog.requireType('Blockly.RenderedConnection');
  * @param {Blockly.Connection} connection Optional connection for this input.
  * @constructor
  */
-Blockly.Input = function(type, name, block, connection) {
+const Input = function(type, name, block, connection) {
   if (type != Blockly.inputTypes.DUMMY && !name) {
     throw Error('Value inputs and statement inputs must have non-empty name.');
   }
@@ -56,20 +57,20 @@ Blockly.Input = function(type, name, block, connection) {
  * Alignment of input's fields (left, right or centre).
  * @type {number}
  */
-Blockly.Input.prototype.align = Blockly.constants.ALIGN.LEFT;
+Input.prototype.align = Blockly.constants.ALIGN.LEFT;
 
 /**
  * Is the input visible?
  * @type {boolean}
  * @private
  */
-Blockly.Input.prototype.visible_ = true;
+Input.prototype.visible_ = true;
 
 /**
  * Get the source block for this input.
  * @return {?Blockly.Block} The source block, or null if there is none.
  */
-Blockly.Input.prototype.getSourceBlock = function() {
+Input.prototype.getSourceBlock = function() {
   return this.sourceBlock_;
 };
 
@@ -79,9 +80,9 @@ Blockly.Input.prototype.getSourceBlock = function() {
  * @param {string|!Blockly.Field} field Something to add as a field.
  * @param {string=} opt_name Language-neutral identifier which may used to find
  *     this field again.  Should be unique to the host block.
- * @return {!Blockly.Input} The input being append to (to allow chaining).
+ * @return {!Input} The input being append to (to allow chaining).
  */
-Blockly.Input.prototype.appendField = function(field, opt_name) {
+Input.prototype.appendField = function(field, opt_name) {
   this.insertFieldAt(this.fieldRow.length, field, opt_name);
   return this;
 };
@@ -95,7 +96,7 @@ Blockly.Input.prototype.appendField = function(field, opt_name) {
  *     this field again.  Should be unique to the host block.
  * @return {number} The index following the last inserted field.
  */
-Blockly.Input.prototype.insertFieldAt = function(index, field, opt_name) {
+Input.prototype.insertFieldAt = function(index, field, opt_name) {
   if (index < 0 || index > this.fieldRow.length) {
     throw Error('index ' + index + ' out of bounds.');
   }
@@ -150,7 +151,7 @@ Blockly.Input.prototype.insertFieldAt = function(index, field, opt_name) {
  *     and opt_quiet is true.
  * @throws {Error} if the field is not present and opt_quiet is false.
  */
-Blockly.Input.prototype.removeField = function(name, opt_quiet) {
+Input.prototype.removeField = function(name, opt_quiet) {
   for (let i = 0, field; (field = this.fieldRow[i]); i++) {
     if (field.name === name) {
       field.dispose();
@@ -174,7 +175,7 @@ Blockly.Input.prototype.removeField = function(name, opt_quiet) {
  * Gets whether this input is visible or not.
  * @return {boolean} True if visible.
  */
-Blockly.Input.prototype.isVisible = function() {
+Input.prototype.isVisible = function() {
   return this.visible_;
 };
 
@@ -185,7 +186,7 @@ Blockly.Input.prototype.isVisible = function() {
  * @return {!Array<!Blockly.BlockSvg>} List of blocks to render.
  * @package
  */
-Blockly.Input.prototype.setVisible = function(visible) {
+Input.prototype.setVisible = function(visible) {
   // Note: Currently there are only unit tests for block.setCollapsed()
   // because this function is package. If this function goes back to being a
   // public API tests (lots of tests) should be added.
@@ -219,7 +220,7 @@ Blockly.Input.prototype.setVisible = function(visible) {
  * Mark all fields on this input as dirty.
  * @package
  */
-Blockly.Input.prototype.markDirty = function() {
+Input.prototype.markDirty = function() {
   for (let y = 0, field; (field = this.fieldRow[y]); y++) {
     field.markDirty();
   }
@@ -229,9 +230,9 @@ Blockly.Input.prototype.markDirty = function() {
  * Change a connection's compatibility.
  * @param {string|Array<string>|null} check Compatible value type or
  *     list of value types.  Null if all types are compatible.
- * @return {!Blockly.Input} The input being modified (to allow chaining).
+ * @return {!Input} The input being modified (to allow chaining).
  */
-Blockly.Input.prototype.setCheck = function(check) {
+Input.prototype.setCheck = function(check) {
   if (!this.connection) {
     throw Error('This input does not have a connection.');
   }
@@ -243,9 +244,9 @@ Blockly.Input.prototype.setCheck = function(check) {
  * Change the alignment of the connection's field(s).
  * @param {number} align One of the values of Blockly.constants.ALIGN.
  *   In RTL mode directions are reversed, and ALIGN.RIGHT aligns to the left.
- * @return {!Blockly.Input} The input being modified (to allow chaining).
+ * @return {!Input} The input being modified (to allow chaining).
  */
-Blockly.Input.prototype.setAlign = function(align) {
+Input.prototype.setAlign = function(align) {
   this.align = align;
   if (this.sourceBlock_.rendered) {
     this.sourceBlock_ = /** @type {!Blockly.BlockSvg} */ (this.sourceBlock_);
@@ -257,9 +258,9 @@ Blockly.Input.prototype.setAlign = function(align) {
 /**
  * Changes the connection's shadow block.
  * @param {?Element} shadow DOM representation of a block or null.
- * @return {!Blockly.Input} The input being modified (to allow chaining).
+ * @return {!Input} The input being modified (to allow chaining).
  */
-Blockly.Input.prototype.setShadowDom = function(shadow) {
+Input.prototype.setShadowDom = function(shadow) {
   if (!this.connection) {
     throw Error('This input does not have a connection.');
   }
@@ -271,7 +272,7 @@ Blockly.Input.prototype.setShadowDom = function(shadow) {
  * Returns the XML representation of the connection's shadow block.
  * @return {?Element} Shadow DOM representation of a block or null.
  */
-Blockly.Input.prototype.getShadowDom = function() {
+Input.prototype.getShadowDom = function() {
   if (!this.connection) {
     throw Error('This input does not have a connection.');
   }
@@ -281,7 +282,7 @@ Blockly.Input.prototype.getShadowDom = function() {
 /**
  * Initialize the fields on this input.
  */
-Blockly.Input.prototype.init = function() {
+Input.prototype.init = function() {
   if (!this.sourceBlock_.workspace.rendered) {
     return;  // Headless blocks don't need fields initialized.
   }
@@ -294,7 +295,7 @@ Blockly.Input.prototype.init = function() {
  * Sever all links to this input.
  * @suppress {checkTypes}
  */
-Blockly.Input.prototype.dispose = function() {
+Input.prototype.dispose = function() {
   for (let i = 0, field; (field = this.fieldRow[i]); i++) {
     field.dispose();
   }
@@ -303,3 +304,5 @@ Blockly.Input.prototype.dispose = function() {
   }
   this.sourceBlock_ = null;
 };
+
+exports = Input;

From f59da974b44dcd4fd1de119ae889815e5e86ca7d Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 09:55:41 -0700
Subject: [PATCH 293/833] Migrate core/input.js to named requires

---
 core/input.js | 56 +++++++++++++++++++++++++++------------------------
 tests/deps.js |  2 +-
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/core/input.js b/core/input.js
index b9b277fde..59c3b8a72 100644
--- a/core/input.js
+++ b/core/input.js
@@ -13,29 +13,33 @@
 goog.module('Blockly.Input');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Connection');
-goog.require('Blockly.fieldRegistry');
+/* 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 Connection = goog.require('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');
 /** @suppress {extraRequire} */
 goog.require('Blockly.FieldLabel');
-goog.require('Blockly.inputTypes');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.Field');
-goog.requireType('Blockly.RenderedConnection');
-
 
 /**
  * Class for an input with an optional field.
  * @param {number} type The type of the input.
  * @param {string} name Language-neutral identifier which may used to find this
  *     input again.
- * @param {!Blockly.Block} block The block containing this input.
- * @param {Blockly.Connection} connection Optional connection for this input.
+ * @param {!Block} block The block containing this input.
+ * @param {Connection} connection Optional connection for this input.
  * @constructor
  */
 const Input = function(type, name, block, connection) {
-  if (type != Blockly.inputTypes.DUMMY && !name) {
+  if (type != inputTypes.DUMMY && !name) {
     throw Error('Value inputs and statement inputs must have non-empty name.');
   }
   /** @type {number} */
@@ -43,13 +47,13 @@ const Input = function(type, name, block, connection) {
   /** @type {string} */
   this.name = name;
   /**
-   * @type {!Blockly.Block}
+   * @type {!Block}
    * @private
    */
   this.sourceBlock_ = block;
-  /** @type {Blockly.Connection} */
+  /** @type {Connection} */
   this.connection = connection;
-  /** @type {!Array<!Blockly.Field>} */
+  /** @type {!Array<!Field>} */
   this.fieldRow = [];
 };
 
@@ -57,7 +61,7 @@ const Input = function(type, name, block, connection) {
  * Alignment of input's fields (left, right or centre).
  * @type {number}
  */
-Input.prototype.align = Blockly.constants.ALIGN.LEFT;
+Input.prototype.align = constants.ALIGN.LEFT;
 
 /**
  * Is the input visible?
@@ -68,7 +72,7 @@ Input.prototype.visible_ = true;
 
 /**
  * Get the source block for this input.
- * @return {?Blockly.Block} The source block, or null if there is none.
+ * @return {?Block} The source block, or null if there is none.
  */
 Input.prototype.getSourceBlock = function() {
   return this.sourceBlock_;
@@ -77,7 +81,7 @@ Input.prototype.getSourceBlock = function() {
 /**
  * Add a field (or label from string), and all prefix and suffix fields, to the
  * end of the input's field row.
- * @param {string|!Blockly.Field} field Something to add as a field.
+ * @param {string|!Field} field Something to add as a field.
  * @param {string=} opt_name Language-neutral identifier which may used to find
  *     this field again.  Should be unique to the host block.
  * @return {!Input} The input being append to (to allow chaining).
@@ -91,7 +95,7 @@ Input.prototype.appendField = function(field, opt_name) {
  * Inserts a field (or label from string), and all prefix and suffix fields, at
  * the location of the input's field row.
  * @param {number} index The index at which to insert field.
- * @param {string|!Blockly.Field} field Something to add as a field.
+ * @param {string|!Field} field Something to add as a field.
  * @param {string=} opt_name Language-neutral identifier which may used to find
  *     this field again.  Should be unique to the host block.
  * @return {number} The index following the last inserted field.
@@ -108,7 +112,7 @@ Input.prototype.insertFieldAt = function(index, field, opt_name) {
 
   // Generate a FieldLabel when given a plain text field.
   if (typeof field == 'string') {
-    field = /** @type {!Blockly.Field} **/ (Blockly.fieldRegistry.fromJson({
+    field = /** @type {!Field} **/ (fieldRegistry.fromJson({
       'type': 'field_label',
       'text': field,
     }));
@@ -135,7 +139,7 @@ Input.prototype.insertFieldAt = function(index, field, opt_name) {
   }
 
   if (this.sourceBlock_.rendered) {
-    this.sourceBlock_ = /** @type {!Blockly.BlockSvg} */ (this.sourceBlock_);
+    this.sourceBlock_ = /** @type {!BlockSvg} */ (this.sourceBlock_);
     this.sourceBlock_.render();
     // Adding a field will cause the block to change shape.
     this.sourceBlock_.bumpNeighbours();
@@ -157,7 +161,7 @@ Input.prototype.removeField = function(name, opt_quiet) {
       field.dispose();
       this.fieldRow.splice(i, 1);
       if (this.sourceBlock_.rendered) {
-        this.sourceBlock_ = /** @type {!Blockly.BlockSvg} */ (this.sourceBlock_);
+        this.sourceBlock_ = /** @type {!BlockSvg} */ (this.sourceBlock_);
         this.sourceBlock_.render();
         // Removing a field will cause the block to change shape.
         this.sourceBlock_.bumpNeighbours();
@@ -183,7 +187,7 @@ Input.prototype.isVisible = function() {
  * Sets whether this input is visible or not.
  * Should only be used to collapse/uncollapse a block.
  * @param {boolean} visible True if visible.
- * @return {!Array<!Blockly.BlockSvg>} List of blocks to render.
+ * @return {!Array<!BlockSvg>} List of blocks to render.
  * @package
  */
 Input.prototype.setVisible = function(visible) {
@@ -201,7 +205,7 @@ Input.prototype.setVisible = function(visible) {
   }
   if (this.connection) {
     this.connection =
-      /** @type {!Blockly.RenderedConnection} */ (this.connection);
+      /** @type {!RenderedConnection} */ (this.connection);
     // Has a connection.
     if (visible) {
       renderList = this.connection.startTrackingAll();
@@ -242,14 +246,14 @@ Input.prototype.setCheck = function(check) {
 
 /**
  * Change the alignment of the connection's field(s).
- * @param {number} align One of the values of Blockly.constants.ALIGN.
+ * @param {number} align One of the values of constants.ALIGN.
  *   In RTL mode directions are reversed, and ALIGN.RIGHT aligns to the left.
  * @return {!Input} The input being modified (to allow chaining).
  */
 Input.prototype.setAlign = function(align) {
   this.align = align;
   if (this.sourceBlock_.rendered) {
-    this.sourceBlock_ = /** @type {!Blockly.BlockSvg} */ (this.sourceBlock_);
+    this.sourceBlock_ = /** @type {!BlockSvg} */ (this.sourceBlock_);
     this.sourceBlock_.render();
   }
   return this;
diff --git a/tests/deps.js b/tests/deps.js
index f62333982..1cda35a7e 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -70,7 +70,7 @@ goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.Block
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.Connection', 'Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es5'});
+goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.Connection', 'Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes']);
 goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.internalConstants'], {'lang': 'es5'});
 goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});

From 761eec2b69dd20638171cf7a75302d1a79a89e3b Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 09:56:17 -0700
Subject: [PATCH 294/833] clang-format core/input.js

---
 core/input.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/input.js b/core/input.js
index 59c3b8a72..afa7a3358 100644
--- a/core/input.js
+++ b/core/input.js
@@ -205,7 +205,7 @@ Input.prototype.setVisible = function(visible) {
   }
   if (this.connection) {
     this.connection =
-      /** @type {!RenderedConnection} */ (this.connection);
+        /** @type {!RenderedConnection} */ (this.connection);
     // Has a connection.
     if (visible) {
       renderList = this.connection.startTrackingAll();

From fc10f9e62551d7a5e13841f6ce3fab0751705322 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 22 Jul 2021 07:57:49 -0700
Subject: [PATCH 295/833] Migrate core/block_dragger.js to ES6 const/let

---
 core/block_dragger.js | 53 ++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/core/block_dragger.js b/core/block_dragger.js
index a1d4b6f2d..d51eead48 100644
--- a/core/block_dragger.js
+++ b/core/block_dragger.js
@@ -116,12 +116,13 @@ Blockly.BlockDragger.prototype.dispose = function() {
  */
 Blockly.BlockDragger.initIconData_ = function(block) {
   // Build a list of icons that need to be moved and where they started.
-  var dragIconData = [];
-  var descendants = block.getDescendants(false);
-  for (var i = 0, descendant; (descendant = descendants[i]); i++) {
-    var icons = descendant.getIcons();
-    for (var j = 0; j < icons.length; j++) {
-      var data = {
+  const dragIconData = [];
+  const descendants = block.getDescendants(false);
+
+  for (let i = 0, descendant; (descendant = descendants[i]); i++) {
+    const icons = descendant.getIcons();
+    for (let j = 0; j < icons.length; j++) {
+      const data = {
         // Blockly.utils.Coordinate with x and y properties (workspace
         // coordinates).
         location: icons[j].getIconLocation(),
@@ -198,8 +199,8 @@ Blockly.BlockDragger.prototype.shouldDisconnect_ = function(healStack) {
 Blockly.BlockDragger.prototype.disconnectBlock_ = function(
     healStack, currentDragDeltaXY) {
   this.draggingBlock_.unplug(healStack);
-  var delta = this.pixelsToWorkspaceUnits_(currentDragDeltaXY);
-  var newLoc = Blockly.utils.Coordinate.sum(this.startXY_, delta);
+  const delta = this.pixelsToWorkspaceUnits_(currentDragDeltaXY);
+  const newLoc = Blockly.utils.Coordinate.sum(this.startXY_, delta);
 
   this.draggingBlock_.translate(newLoc.x, newLoc.y);
   Blockly.blockAnimations.disconnectUiEffect(this.draggingBlock_);
@@ -211,7 +212,7 @@ Blockly.BlockDragger.prototype.disconnectBlock_ = function(
  * @protected
  */
 Blockly.BlockDragger.prototype.fireDragStartEvent_ = function() {
-  var event = new (Blockly.Events.get(Blockly.Events.BLOCK_DRAG))(
+  const event = new (Blockly.Events.get(Blockly.Events.BLOCK_DRAG))(
       this.draggingBlock_, true, this.draggingBlock_.getDescendants(false));
   Blockly.Events.fire(event);
 };
@@ -225,16 +226,16 @@ Blockly.BlockDragger.prototype.fireDragStartEvent_ = function() {
  * @public
  */
 Blockly.BlockDragger.prototype.drag = function(e, currentDragDeltaXY) {
-  var delta = this.pixelsToWorkspaceUnits_(currentDragDeltaXY);
-  var newLoc = Blockly.utils.Coordinate.sum(this.startXY_, delta);
+  const delta = this.pixelsToWorkspaceUnits_(currentDragDeltaXY);
+  const newLoc = Blockly.utils.Coordinate.sum(this.startXY_, delta);
   this.draggingBlock_.moveDuringDrag(newLoc);
   this.dragIcons_(delta);
 
-  var oldDragTarget = this.dragTarget_;
+  const oldDragTarget = this.dragTarget_;
   this.dragTarget_ = this.workspace_.getDragTarget(e);
 
   this.draggedConnectionManager_.update(delta, this.dragTarget_);
-  var oldWouldDeleteBlock = this.wouldDeleteBlock_;
+  const oldWouldDeleteBlock = this.wouldDeleteBlock_;
   this.wouldDeleteBlock_ = this.draggedConnectionManager_.wouldDeleteBlock();
   if (oldWouldDeleteBlock != this.wouldDeleteBlock_) {
     // Prevent unnecessary add/remove class calls.
@@ -267,12 +268,12 @@ Blockly.BlockDragger.prototype.endDrag = function(e, currentDragDeltaXY) {
 
   Blockly.blockAnimations.disconnectUiStop();
 
-  var preventMove = !!this.dragTarget_ &&
+  const preventMove = !!this.dragTarget_ &&
       this.dragTarget_.shouldPreventMove(this.draggingBlock_);
   if (preventMove) {
     var newLoc = this.startXY_;
   } else {
-    var newValues = this.getNewLocationAfterDrag_(currentDragDeltaXY);
+    const newValues = this.getNewLocationAfterDrag_(currentDragDeltaXY);
     var delta = newValues.delta;
     var newLoc = newValues.newLocation;
   }
@@ -282,7 +283,7 @@ Blockly.BlockDragger.prototype.endDrag = function(e, currentDragDeltaXY) {
     this.dragTarget_.onDrop(this.draggingBlock_);
   }
 
-  var deleted = this.maybeDeleteBlock_();
+  const deleted = this.maybeDeleteBlock_();
   if (!deleted) {
     // These are expensive and don't need to be done if we're deleting.
     this.draggingBlock_.setDragging(false);
@@ -314,7 +315,7 @@ Blockly.BlockDragger.prototype.endDrag = function(e, currentDragDeltaXY) {
  */
 Blockly.BlockDragger.prototype.getNewLocationAfterDrag_ = function(
     currentDragDeltaXY) {
-  var newValues = {};
+  const newValues = {};
   newValues.delta = this.pixelsToWorkspaceUnits_(currentDragDeltaXY);
   newValues.newLocation =
       Blockly.utils.Coordinate.sum(this.startXY_, newValues.delta);
@@ -362,7 +363,7 @@ Blockly.BlockDragger.prototype.updateBlockAfterMove_ = function(delta) {
  * @protected
  */
 Blockly.BlockDragger.prototype.fireDragEndEvent_ = function() {
-  var event = new (Blockly.Events.get(Blockly.Events.BLOCK_DRAG))(
+  const event = new (Blockly.Events.get(Blockly.Events.BLOCK_DRAG))(
       this.draggingBlock_, false, this.draggingBlock_.getDescendants(false));
   Blockly.Events.fire(event);
 };
@@ -375,11 +376,11 @@ Blockly.BlockDragger.prototype.fireDragEndEvent_ = function() {
  * @protected
  */
 Blockly.BlockDragger.prototype.updateToolboxStyle_ = function(isEnd) {
-  var toolbox = this.workspace_.getToolbox();
+  const toolbox = this.workspace_.getToolbox();
 
   if (toolbox) {
-    var style = this.draggingBlock_.isDeletable() ? 'blocklyToolboxDelete' :
-                                                    'blocklyToolboxGrab';
+    const style = this.draggingBlock_.isDeletable() ? 'blocklyToolboxDelete' :
+        'blocklyToolboxGrab';
 
     if (isEnd && typeof toolbox.removeStyle == 'function') {
       toolbox.removeStyle(style);
@@ -395,7 +396,7 @@ Blockly.BlockDragger.prototype.updateToolboxStyle_ = function(isEnd) {
  * @protected
  */
 Blockly.BlockDragger.prototype.fireMoveEvent_ = function() {
-  var event =
+  const event =
       new (Blockly.Events.get(Blockly.Events.BLOCK_MOVE))(this.draggingBlock_);
   event.oldCoordinate = this.startXY_;
   event.recordNew();
@@ -423,7 +424,7 @@ Blockly.BlockDragger.prototype.updateCursorDuringBlockDrag_ = function() {
  * @protected
  */
 Blockly.BlockDragger.prototype.pixelsToWorkspaceUnits_ = function(pixelCoord) {
-  var result = new Blockly.utils.Coordinate(
+  const result = new Blockly.utils.Coordinate(
       pixelCoord.x / this.workspace_.scale,
       pixelCoord.y / this.workspace_.scale);
   if (this.workspace_.isMutator) {
@@ -431,7 +432,7 @@ Blockly.BlockDragger.prototype.pixelsToWorkspaceUnits_ = function(pixelCoord) {
     // oddities in our rendering optimizations.  The actual scale is the same as
     // the scale on the parent workspace.
     // Fix that for dragging.
-    var mainScale = this.workspace_.options.parentWorkspace.scale;
+    const mainScale = this.workspace_.options.parentWorkspace.scale;
     result.scale(1 / mainScale);
   }
   return result;
@@ -445,8 +446,8 @@ Blockly.BlockDragger.prototype.pixelsToWorkspaceUnits_ = function(pixelCoord) {
  */
 Blockly.BlockDragger.prototype.dragIcons_ = function(dxy) {
   // Moving icons moves their associated bubbles.
-  for (var i = 0; i < this.dragIconData_.length; i++) {
-    var data = this.dragIconData_[i];
+  for (let i = 0; i < this.dragIconData_.length; i++) {
+    const data = this.dragIconData_[i];
     data.icon.setIconLocation(Blockly.utils.Coordinate.sum(data.location, dxy));
   }
 };

From 4850ad0300f5293bbe37511e52cda6853126a662 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 22 Jul 2021 08:08:31 -0700
Subject: [PATCH 296/833] Migrate core/block_dragger.js to goog.module

---
 core/block_dragger.js | 48 ++++++++++++++++++++++---------------------
 tests/deps.js         |  2 +-
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/core/block_dragger.js b/core/block_dragger.js
index d51eead48..ee103f81b 100644
--- a/core/block_dragger.js
+++ b/core/block_dragger.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.BlockDragger');
+goog.module('Blockly.BlockDragger');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockAnimations');
 /** @suppress {extraRequire} */
@@ -39,7 +40,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @constructor
  * @implements {Blockly.IBlockDragger}
  */
-Blockly.BlockDragger = function(block, workspace) {
+const BlockDragger = function(block, workspace) {
   /**
    * The top block in the stack that is being dragged.
    * @type {!Blockly.BlockSvg}
@@ -91,14 +92,14 @@ Blockly.BlockDragger = function(block, workspace) {
    * @type {Array<!Object>}
    * @protected
    */
-  this.dragIconData_ = Blockly.BlockDragger.initIconData_(block);
+  this.dragIconData_ = initIconData(block);
 };
 
 /**
  * Sever all links from this object.
  * @package
  */
-Blockly.BlockDragger.prototype.dispose = function() {
+BlockDragger.prototype.dispose = function() {
   this.dragIconData_.length = 0;
 
   if (this.draggedConnectionManager_) {
@@ -112,9 +113,8 @@ Blockly.BlockDragger.prototype.dispose = function() {
  * extends from it if that bubble is open.
  * @param {!Blockly.BlockSvg} block The root block that is being dragged.
  * @return {!Array<!Object>} The list of all icons and their locations.
- * @private
  */
-Blockly.BlockDragger.initIconData_ = function(block) {
+const initIconData = function(block) {
   // Build a list of icons that need to be moved and where they started.
   const dragIconData = [];
   const descendants = block.getDescendants(false);
@@ -143,7 +143,7 @@ Blockly.BlockDragger.initIconData_ = function(block) {
  *     disconnecting.
  * @public
  */
-Blockly.BlockDragger.prototype.startDrag = function(
+BlockDragger.prototype.startDrag = function(
     currentDragDeltaXY, healStack) {
   if (!Blockly.Events.getGroup()) {
     Blockly.Events.setGroup(true);
@@ -181,7 +181,7 @@ Blockly.BlockDragger.prototype.startDrag = function(
  * @return {boolean} True to disconnect the block, false otherwise.
  * @protected
  */
-Blockly.BlockDragger.prototype.shouldDisconnect_ = function(healStack) {
+BlockDragger.prototype.shouldDisconnect_ = function(healStack) {
   return !!(
     this.draggingBlock_.getParent() ||
       (healStack && this.draggingBlock_.nextConnection &&
@@ -196,7 +196,7 @@ Blockly.BlockDragger.prototype.shouldDisconnect_ = function(healStack) {
  *     moved from the position at mouse down, in pixel units.
  * @protected
  */
-Blockly.BlockDragger.prototype.disconnectBlock_ = function(
+BlockDragger.prototype.disconnectBlock_ = function(
     healStack, currentDragDeltaXY) {
   this.draggingBlock_.unplug(healStack);
   const delta = this.pixelsToWorkspaceUnits_(currentDragDeltaXY);
@@ -211,7 +211,7 @@ Blockly.BlockDragger.prototype.disconnectBlock_ = function(
  * Fire a UI event at the start of a block drag.
  * @protected
  */
-Blockly.BlockDragger.prototype.fireDragStartEvent_ = function() {
+BlockDragger.prototype.fireDragStartEvent_ = function() {
   const event = new (Blockly.Events.get(Blockly.Events.BLOCK_DRAG))(
       this.draggingBlock_, true, this.draggingBlock_.getDescendants(false));
   Blockly.Events.fire(event);
@@ -225,7 +225,7 @@ Blockly.BlockDragger.prototype.fireDragStartEvent_ = function() {
  *     moved from the position at the start of the drag, in pixel units.
  * @public
  */
-Blockly.BlockDragger.prototype.drag = function(e, currentDragDeltaXY) {
+BlockDragger.prototype.drag = function(e, currentDragDeltaXY) {
   const delta = this.pixelsToWorkspaceUnits_(currentDragDeltaXY);
   const newLoc = Blockly.utils.Coordinate.sum(this.startXY_, delta);
   this.draggingBlock_.moveDuringDrag(newLoc);
@@ -258,7 +258,7 @@ Blockly.BlockDragger.prototype.drag = function(e, currentDragDeltaXY) {
  *     moved from the position at the start of the drag, in pixel units.
  * @public
  */
-Blockly.BlockDragger.prototype.endDrag = function(e, currentDragDeltaXY) {
+BlockDragger.prototype.endDrag = function(e, currentDragDeltaXY) {
   // Make sure internal state is fresh.
   this.drag(e, currentDragDeltaXY);
   this.dragIconData_ = [];
@@ -313,7 +313,7 @@ Blockly.BlockDragger.prototype.endDrag = function(e, currentDragDeltaXY) {
  *     end up.
  * @protected
  */
-Blockly.BlockDragger.prototype.getNewLocationAfterDrag_ = function(
+BlockDragger.prototype.getNewLocationAfterDrag_ = function(
     currentDragDeltaXY) {
   const newValues = {};
   newValues.delta = this.pixelsToWorkspaceUnits_(currentDragDeltaXY);
@@ -329,7 +329,7 @@ Blockly.BlockDragger.prototype.getNewLocationAfterDrag_ = function(
  * @return {boolean} True if the block was deleted.
  * @protected
  */
-Blockly.BlockDragger.prototype.maybeDeleteBlock_ = function() {
+BlockDragger.prototype.maybeDeleteBlock_ = function() {
   if (this.wouldDeleteBlock_) {
     // Fire a move event, so we know where to go back to for an undo.
     this.fireMoveEvent_();
@@ -346,7 +346,7 @@ Blockly.BlockDragger.prototype.maybeDeleteBlock_ = function() {
  *     the block started the drag to where it ended the drag.
  * @protected
  */
-Blockly.BlockDragger.prototype.updateBlockAfterMove_ = function(delta) {
+BlockDragger.prototype.updateBlockAfterMove_ = function(delta) {
   this.draggingBlock_.moveConnections(delta.x, delta.y);
   this.fireMoveEvent_();
   if (this.draggedConnectionManager_.wouldConnectBlock()) {
@@ -362,7 +362,7 @@ Blockly.BlockDragger.prototype.updateBlockAfterMove_ = function(delta) {
  * Fire a UI event at the end of a block drag.
  * @protected
  */
-Blockly.BlockDragger.prototype.fireDragEndEvent_ = function() {
+BlockDragger.prototype.fireDragEndEvent_ = function() {
   const event = new (Blockly.Events.get(Blockly.Events.BLOCK_DRAG))(
       this.draggingBlock_, false, this.draggingBlock_.getDescendants(false));
   Blockly.Events.fire(event);
@@ -375,7 +375,7 @@ Blockly.BlockDragger.prototype.fireDragEndEvent_ = function() {
  * @param {boolean} isEnd True if we are at the end of a drag, false otherwise.
  * @protected
  */
-Blockly.BlockDragger.prototype.updateToolboxStyle_ = function(isEnd) {
+BlockDragger.prototype.updateToolboxStyle_ = function(isEnd) {
   const toolbox = this.workspace_.getToolbox();
 
   if (toolbox) {
@@ -395,7 +395,7 @@ Blockly.BlockDragger.prototype.updateToolboxStyle_ = function(isEnd) {
  * Fire a move event at the end of a block drag.
  * @protected
  */
-Blockly.BlockDragger.prototype.fireMoveEvent_ = function() {
+BlockDragger.prototype.fireMoveEvent_ = function() {
   const event =
       new (Blockly.Events.get(Blockly.Events.BLOCK_MOVE))(this.draggingBlock_);
   event.oldCoordinate = this.startXY_;
@@ -408,7 +408,7 @@ Blockly.BlockDragger.prototype.fireMoveEvent_ = function() {
  * dragging block would be deleted if released immediately.
  * @protected
  */
-Blockly.BlockDragger.prototype.updateCursorDuringBlockDrag_ = function() {
+BlockDragger.prototype.updateCursorDuringBlockDrag_ = function() {
   this.draggingBlock_.setDeleteStyle(this.wouldDeleteBlock_);
 };
 
@@ -423,7 +423,7 @@ Blockly.BlockDragger.prototype.updateCursorDuringBlockDrag_ = function() {
  *     workspace scale.
  * @protected
  */
-Blockly.BlockDragger.prototype.pixelsToWorkspaceUnits_ = function(pixelCoord) {
+BlockDragger.prototype.pixelsToWorkspaceUnits_ = function(pixelCoord) {
   const result = new Blockly.utils.Coordinate(
       pixelCoord.x / this.workspace_.scale,
       pixelCoord.y / this.workspace_.scale);
@@ -444,7 +444,7 @@ Blockly.BlockDragger.prototype.pixelsToWorkspaceUnits_ = function(pixelCoord) {
  *     original positions, in workspace units.
  * @protected
  */
-Blockly.BlockDragger.prototype.dragIcons_ = function(dxy) {
+BlockDragger.prototype.dragIcons_ = function(dxy) {
   // Moving icons moves their associated bubbles.
   for (let i = 0; i < this.dragIconData_.length; i++) {
     const data = this.dragIconData_[i];
@@ -459,7 +459,7 @@ Blockly.BlockDragger.prototype.dragIcons_ = function(dxy) {
  *     marker blocks.
  * @public
  */
-Blockly.BlockDragger.prototype.getInsertionMarkers = function() {
+BlockDragger.prototype.getInsertionMarkers = function() {
   // No insertion markers with the old style of dragged connection managers.
   if (this.draggedConnectionManager_ &&
       this.draggedConnectionManager_.getInsertionMarkers) {
@@ -470,4 +470,6 @@ Blockly.BlockDragger.prototype.getInsertionMarkers = function() {
 
 Blockly.registry.register(
     Blockly.registry.Type.BLOCK_DRAGGER, Blockly.registry.DEFAULT,
-    Blockly.BlockDragger);
+    BlockDragger);
+
+exports = BlockDragger;
diff --git a/tests/deps.js b/tests/deps.js
index da56c39f2..b268b88c1 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -10,7 +10,7 @@ goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.Vari
 goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.IASTNodeLocation', 'Blockly.IDeletable', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.Workspace', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es5'});
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom']);
+goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.constants', '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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', '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']);
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});

From 873b75e58a8560506daf39f06c9ed19ddbe3a62f Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 22 Jul 2021 08:15:10 -0700
Subject: [PATCH 297/833] Migrate core/block_dragger.js named requires

---
 core/block_dragger.js | 109 +++++++++++++++++++++---------------------
 1 file changed, 54 insertions(+), 55 deletions(-)

diff --git a/core/block_dragger.js b/core/block_dragger.js
index ee103f81b..40436a4e1 100644
--- a/core/block_dragger.js
+++ b/core/block_dragger.js
@@ -13,59 +13,58 @@
 goog.module('Blockly.BlockDragger');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockAnimations');
+const {disconnectUiEffect, disconnectUiStop} = goog.require('Blockly.blockAnimations');
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.constants');
-goog.require('Blockly.Events');
+const {BLOCK_DRAG, BLOCK_MOVE, fire, get, getGroup, setGroup} = goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockDrag');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockMove');
-goog.require('Blockly.IBlockDragger');
-goog.require('Blockly.InsertionMarkerManager');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.dom');
-
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.IDragTarget');
-goog.requireType('Blockly.WorkspaceSvg');
+const IBlockDragger = goog.require('Blockly.IBlockDragger');
+const IDragTarget = goog.requireType('Blockly.IDragTarget');
+const InsertionMarkerManager = goog.require('Blockly.InsertionMarkerManager');
+const {DEFAULT, Type, register} = goog.require('Blockly.registry');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const {startTextWidthCache, stopTextWidthCache} = goog.require('Blockly.utils.dom');
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
  * Class for a block dragger.  It moves blocks around the workspace when they
  * are being dragged by a mouse or touch.
- * @param {!Blockly.BlockSvg} block The block to drag.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace to drag on.
+ * @param {!BlockSvg} block The block to drag.
+ * @param {!WorkspaceSvg} workspace The workspace to drag on.
  * @constructor
- * @implements {Blockly.IBlockDragger}
+ * @implements {IBlockDragger}
  */
 const BlockDragger = function(block, workspace) {
   /**
    * The top block in the stack that is being dragged.
-   * @type {!Blockly.BlockSvg}
+   * @type {!BlockSvg}
    * @protected
    */
   this.draggingBlock_ = block;
 
   /**
    * The workspace on which the block is being dragged.
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @protected
    */
   this.workspace_ = workspace;
 
   /**
    * Object that keeps track of connections on dragged blocks.
-   * @type {!Blockly.InsertionMarkerManager}
+   * @type {!InsertionMarkerManager}
    * @protected
    */
   this.draggedConnectionManager_ =
-      new Blockly.InsertionMarkerManager(this.draggingBlock_);
+      new InsertionMarkerManager(this.draggingBlock_);
 
   /**
    * Which drag area the mouse pointer is over, if any.
-   * @type {?Blockly.IDragTarget}
+   * @type {?IDragTarget}
    * @private
    */
   this.dragTarget_ = null;
@@ -80,7 +79,7 @@ const BlockDragger = function(block, workspace) {
   /**
    * The location of the top left corner of the dragging block at the beginning
    * of the drag in workspace coordinates.
-   * @type {!Blockly.utils.Coordinate}
+   * @type {!Coordinate}
    * @protected
    */
   this.startXY_ = this.draggingBlock_.getRelativeToSurfaceXY();
@@ -111,7 +110,7 @@ BlockDragger.prototype.dispose = function() {
  * Make a list of all of the icons (comment, warning, and mutator) that are
  * on this block and its descendants.  Moving an icon moves the bubble that
  * extends from it if that bubble is open.
- * @param {!Blockly.BlockSvg} block The root block that is being dragged.
+ * @param {!BlockSvg} block The root block that is being dragged.
  * @return {!Array<!Object>} The list of all icons and their locations.
  */
 const initIconData = function(block) {
@@ -123,7 +122,7 @@ const initIconData = function(block) {
     const icons = descendant.getIcons();
     for (let j = 0; j < icons.length; j++) {
       const data = {
-        // Blockly.utils.Coordinate with x and y properties (workspace
+        // Coordinate with x and y properties (workspace
         // coordinates).
         location: icons[j].getIconLocation(),
         // Blockly.Icon
@@ -137,7 +136,7 @@ const initIconData = function(block) {
 
 /**
  * Start dragging a block.  This includes moving it to the drag surface.
- * @param {!Blockly.utils.Coordinate} currentDragDeltaXY How far the pointer has
+ * @param {!Coordinate} currentDragDeltaXY How far the pointer has
  *     moved from the position at mouse down, in pixel units.
  * @param {boolean} healStack Whether or not to heal the stack after
  *     disconnecting.
@@ -145,8 +144,8 @@ const initIconData = function(block) {
  */
 BlockDragger.prototype.startDrag = function(
     currentDragDeltaXY, healStack) {
-  if (!Blockly.Events.getGroup()) {
-    Blockly.Events.setGroup(true);
+  if (!getGroup()) {
+    setGroup(true);
   }
   this.fireDragStartEvent_();
 
@@ -160,9 +159,9 @@ BlockDragger.prototype.startDrag = function(
 
   // During a drag there may be a lot of rerenders, but not field changes.
   // Turn the cache on so we don't do spurious remeasures during the drag.
-  Blockly.utils.dom.startTextWidthCache();
+  startTextWidthCache();
   this.workspace_.setResizesEnabled(false);
-  Blockly.blockAnimations.disconnectUiStop();
+  disconnectUiStop();
 
   if (this.shouldDisconnect_(healStack)) {
     this.disconnectBlock_(healStack, currentDragDeltaXY);
@@ -192,7 +191,7 @@ BlockDragger.prototype.shouldDisconnect_ = function(healStack) {
  * Disconnects the block and moves it to a new location.
  * @param {boolean} healStack Whether or not to heal the stack after
  *     disconnecting.
- * @param {!Blockly.utils.Coordinate} currentDragDeltaXY How far the pointer has
+ * @param {!Coordinate} currentDragDeltaXY How far the pointer has
  *     moved from the position at mouse down, in pixel units.
  * @protected
  */
@@ -200,10 +199,10 @@ BlockDragger.prototype.disconnectBlock_ = function(
     healStack, currentDragDeltaXY) {
   this.draggingBlock_.unplug(healStack);
   const delta = this.pixelsToWorkspaceUnits_(currentDragDeltaXY);
-  const newLoc = Blockly.utils.Coordinate.sum(this.startXY_, delta);
+  const newLoc = Coordinate.sum(this.startXY_, delta);
 
   this.draggingBlock_.translate(newLoc.x, newLoc.y);
-  Blockly.blockAnimations.disconnectUiEffect(this.draggingBlock_);
+  disconnectUiEffect(this.draggingBlock_);
   this.draggedConnectionManager_.updateAvailableConnections();
 };
 
@@ -212,22 +211,22 @@ BlockDragger.prototype.disconnectBlock_ = function(
  * @protected
  */
 BlockDragger.prototype.fireDragStartEvent_ = function() {
-  const event = new (Blockly.Events.get(Blockly.Events.BLOCK_DRAG))(
+  const event = new (get(BLOCK_DRAG))(
       this.draggingBlock_, true, this.draggingBlock_.getDescendants(false));
-  Blockly.Events.fire(event);
+  fire(event);
 };
 
 /**
  * Execute a step of block dragging, based on the given event.  Update the
  * display accordingly.
  * @param {!Event} e The most recent move event.
- * @param {!Blockly.utils.Coordinate} currentDragDeltaXY How far the pointer has
+ * @param {!Coordinate} currentDragDeltaXY How far the pointer has
  *     moved from the position at the start of the drag, in pixel units.
  * @public
  */
 BlockDragger.prototype.drag = function(e, currentDragDeltaXY) {
   const delta = this.pixelsToWorkspaceUnits_(currentDragDeltaXY);
-  const newLoc = Blockly.utils.Coordinate.sum(this.startXY_, delta);
+  const newLoc = Coordinate.sum(this.startXY_, delta);
   this.draggingBlock_.moveDuringDrag(newLoc);
   this.dragIcons_(delta);
 
@@ -254,7 +253,7 @@ BlockDragger.prototype.drag = function(e, currentDragDeltaXY) {
 /**
  * Finish a block drag and put the block back on the workspace.
  * @param {!Event} e The mouseup/touchend event.
- * @param {!Blockly.utils.Coordinate} currentDragDeltaXY How far the pointer has
+ * @param {!Coordinate} currentDragDeltaXY How far the pointer has
  *     moved from the position at the start of the drag, in pixel units.
  * @public
  */
@@ -264,9 +263,9 @@ BlockDragger.prototype.endDrag = function(e, currentDragDeltaXY) {
   this.dragIconData_ = [];
   this.fireDragEndEvent_();
 
-  Blockly.utils.dom.stopTextWidthCache();
+  stopTextWidthCache();
 
-  Blockly.blockAnimations.disconnectUiStop();
+  disconnectUiStop();
 
   const preventMove = !!this.dragTarget_ &&
       this.dragTarget_.shouldPreventMove(this.draggingBlock_);
@@ -300,15 +299,15 @@ BlockDragger.prototype.endDrag = function(e, currentDragDeltaXY) {
   }
   this.workspace_.setResizesEnabled(true);
 
-  Blockly.Events.setGroup(false);
+  setGroup(false);
 };
 
 /**
  * Calculates the drag delta and new location values after a block is dragged.
- * @param {!Blockly.utils.Coordinate} currentDragDeltaXY How far the pointer has
+ * @param {!Coordinate} currentDragDeltaXY How far the pointer has
  *     moved from the start of the drag, in pixel units.
- * @return {{delta: !Blockly.utils.Coordinate, newLocation:
- *     !Blockly.utils.Coordinate}} New location after drag. delta is in
+ * @return {{delta: !Coordinate, newLocation:
+ *     !Coordinate}} New location after drag. delta is in
  *     workspace units. newLocation is the new coordinate where the block should
  *     end up.
  * @protected
@@ -318,7 +317,7 @@ BlockDragger.prototype.getNewLocationAfterDrag_ = function(
   const newValues = {};
   newValues.delta = this.pixelsToWorkspaceUnits_(currentDragDeltaXY);
   newValues.newLocation =
-      Blockly.utils.Coordinate.sum(this.startXY_, newValues.delta);
+      Coordinate.sum(this.startXY_, newValues.delta);
   return newValues;
 };
 
@@ -342,7 +341,7 @@ BlockDragger.prototype.maybeDeleteBlock_ = function() {
 
 /**
  * Updates the necessary information to place a block at a certain location.
- * @param {!Blockly.utils.Coordinate} delta The change in location from where
+ * @param {!Coordinate} delta The change in location from where
  *     the block started the drag to where it ended the drag.
  * @protected
  */
@@ -363,9 +362,9 @@ BlockDragger.prototype.updateBlockAfterMove_ = function(delta) {
  * @protected
  */
 BlockDragger.prototype.fireDragEndEvent_ = function() {
-  const event = new (Blockly.Events.get(Blockly.Events.BLOCK_DRAG))(
+  const event = new (get(BLOCK_DRAG))(
       this.draggingBlock_, false, this.draggingBlock_.getDescendants(false));
-  Blockly.Events.fire(event);
+  fire(event);
 };
 
 /**
@@ -397,10 +396,10 @@ BlockDragger.prototype.updateToolboxStyle_ = function(isEnd) {
  */
 BlockDragger.prototype.fireMoveEvent_ = function() {
   const event =
-      new (Blockly.Events.get(Blockly.Events.BLOCK_MOVE))(this.draggingBlock_);
+      new (get(BLOCK_MOVE))(this.draggingBlock_);
   event.oldCoordinate = this.startXY_;
   event.recordNew();
-  Blockly.Events.fire(event);
+  fire(event);
 };
 
 /**
@@ -417,14 +416,14 @@ BlockDragger.prototype.updateCursorDuringBlockDrag_ = function() {
  * correction for mutator workspaces.
  * This function does not consider differing origins.  It simply scales the
  * input's x and y values.
- * @param {!Blockly.utils.Coordinate} pixelCoord A coordinate with x and y
+ * @param {!Coordinate} pixelCoord A coordinate with x and y
  *     values in CSS pixel units.
- * @return {!Blockly.utils.Coordinate} The input coordinate divided by the
+ * @return {!Coordinate} The input coordinate divided by the
  *     workspace scale.
  * @protected
  */
 BlockDragger.prototype.pixelsToWorkspaceUnits_ = function(pixelCoord) {
-  const result = new Blockly.utils.Coordinate(
+  const result = new Coordinate(
       pixelCoord.x / this.workspace_.scale,
       pixelCoord.y / this.workspace_.scale);
   if (this.workspace_.isMutator) {
@@ -440,7 +439,7 @@ BlockDragger.prototype.pixelsToWorkspaceUnits_ = function(pixelCoord) {
 
 /**
  * Move all of the icons connected to this drag.
- * @param {!Blockly.utils.Coordinate} dxy How far to move the icons from their
+ * @param {!Coordinate} dxy How far to move the icons from their
  *     original positions, in workspace units.
  * @protected
  */
@@ -448,14 +447,14 @@ BlockDragger.prototype.dragIcons_ = function(dxy) {
   // Moving icons moves their associated bubbles.
   for (let i = 0; i < this.dragIconData_.length; i++) {
     const data = this.dragIconData_[i];
-    data.icon.setIconLocation(Blockly.utils.Coordinate.sum(data.location, dxy));
+    data.icon.setIconLocation(Coordinate.sum(data.location, dxy));
   }
 };
 
 /**
  * Get a list of the insertion markers that currently exist.  Drags have 0, 1,
  * or 2 insertion markers.
- * @return {!Array<!Blockly.BlockSvg>} A possibly empty list of insertion
+ * @return {!Array<!BlockSvg>} A possibly empty list of insertion
  *     marker blocks.
  * @public
  */
@@ -468,8 +467,8 @@ BlockDragger.prototype.getInsertionMarkers = function() {
   return [];
 };
 
-Blockly.registry.register(
-    Blockly.registry.Type.BLOCK_DRAGGER, Blockly.registry.DEFAULT,
+register(
+    Type.BLOCK_DRAGGER, DEFAULT,
     BlockDragger);
 
 exports = BlockDragger;

From 848ec34a0aef90bafe46c2cbee9b5f761d002f99 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 22 Jul 2021 08:16:19 -0700
Subject: [PATCH 298/833] clang-format core/block_dragger.js

---
 core/block_dragger.js | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/core/block_dragger.js b/core/block_dragger.js
index 40436a4e1..e97457d22 100644
--- a/core/block_dragger.js
+++ b/core/block_dragger.js
@@ -142,8 +142,7 @@ const initIconData = function(block) {
  *     disconnecting.
  * @public
  */
-BlockDragger.prototype.startDrag = function(
-    currentDragDeltaXY, healStack) {
+BlockDragger.prototype.startDrag = function(currentDragDeltaXY, healStack) {
   if (!getGroup()) {
     setGroup(true);
   }
@@ -182,7 +181,7 @@ BlockDragger.prototype.startDrag = function(
  */
 BlockDragger.prototype.shouldDisconnect_ = function(healStack) {
   return !!(
-    this.draggingBlock_.getParent() ||
+      this.draggingBlock_.getParent() ||
       (healStack && this.draggingBlock_.nextConnection &&
        this.draggingBlock_.nextConnection.targetBlock()));
 };
@@ -312,12 +311,10 @@ BlockDragger.prototype.endDrag = function(e, currentDragDeltaXY) {
  *     end up.
  * @protected
  */
-BlockDragger.prototype.getNewLocationAfterDrag_ = function(
-    currentDragDeltaXY) {
+BlockDragger.prototype.getNewLocationAfterDrag_ = function(currentDragDeltaXY) {
   const newValues = {};
   newValues.delta = this.pixelsToWorkspaceUnits_(currentDragDeltaXY);
-  newValues.newLocation =
-      Coordinate.sum(this.startXY_, newValues.delta);
+  newValues.newLocation = Coordinate.sum(this.startXY_, newValues.delta);
   return newValues;
 };
 
@@ -379,7 +376,7 @@ BlockDragger.prototype.updateToolboxStyle_ = function(isEnd) {
 
   if (toolbox) {
     const style = this.draggingBlock_.isDeletable() ? 'blocklyToolboxDelete' :
-        'blocklyToolboxGrab';
+                                                      'blocklyToolboxGrab';
 
     if (isEnd && typeof toolbox.removeStyle == 'function') {
       toolbox.removeStyle(style);
@@ -395,8 +392,7 @@ BlockDragger.prototype.updateToolboxStyle_ = function(isEnd) {
  * @protected
  */
 BlockDragger.prototype.fireMoveEvent_ = function() {
-  const event =
-      new (get(BLOCK_MOVE))(this.draggingBlock_);
+  const event = new (get(BLOCK_MOVE))(this.draggingBlock_);
   event.oldCoordinate = this.startXY_;
   event.recordNew();
   fire(event);
@@ -467,8 +463,6 @@ BlockDragger.prototype.getInsertionMarkers = function() {
   return [];
 };
 
-register(
-    Type.BLOCK_DRAGGER, DEFAULT,
-    BlockDragger);
+register(Type.BLOCK_DRAGGER, DEFAULT, BlockDragger);
 
 exports = BlockDragger;

From c838b0e27c158e72810250442e119fffedf8f223 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 22 Jul 2021 08:23:28 -0700
Subject: [PATCH 299/833] Reorder requires

---
 core/block_dragger.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/block_dragger.js b/core/block_dragger.js
index e97457d22..20c619cbc 100644
--- a/core/block_dragger.js
+++ b/core/block_dragger.js
@@ -13,22 +13,22 @@
 goog.module('Blockly.BlockDragger');
 goog.module.declareLegacyNamespace();
 
-const {disconnectUiEffect, disconnectUiStop} = goog.require('Blockly.blockAnimations');
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const IBlockDragger = goog.require('Blockly.IBlockDragger');
+const IDragTarget = goog.requireType('Blockly.IDragTarget');
+const InsertionMarkerManager = goog.require('Blockly.InsertionMarkerManager');
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const {BLOCK_DRAG, BLOCK_MOVE, fire, get, getGroup, setGroup} = goog.require('Blockly.Events');
+const {DEFAULT, Type, register} = goog.require('Blockly.registry');
+const {disconnectUiEffect, disconnectUiStop} = goog.require('Blockly.blockAnimations');
+const {startTextWidthCache, stopTextWidthCache} = goog.require('Blockly.utils.dom');
 /** @suppress {extraRequire} */
 goog.require('Blockly.constants');
-const {BLOCK_DRAG, BLOCK_MOVE, fire, get, getGroup, setGroup} = goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockDrag');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockMove');
-const IBlockDragger = goog.require('Blockly.IBlockDragger');
-const IDragTarget = goog.requireType('Blockly.IDragTarget');
-const InsertionMarkerManager = goog.require('Blockly.InsertionMarkerManager');
-const {DEFAULT, Type, register} = goog.require('Blockly.registry');
-const Coordinate = goog.require('Blockly.utils.Coordinate');
-const {startTextWidthCache, stopTextWidthCache} = goog.require('Blockly.utils.dom');
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**

From 2688329aefdc7b5501a1d77aa688ec842d0923bf Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Fri, 23 Jul 2021 12:12:59 -0700
Subject: [PATCH 300/833] Fix imports

---
 core/block_dragger.js | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/core/block_dragger.js b/core/block_dragger.js
index 20c619cbc..5c3ff6916 100644
--- a/core/block_dragger.js
+++ b/core/block_dragger.js
@@ -13,16 +13,20 @@
 goog.module('Blockly.BlockDragger');
 goog.module.declareLegacyNamespace();
 
+/* 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');
-const {BLOCK_DRAG, BLOCK_MOVE, fire, get, getGroup, setGroup} = goog.require('Blockly.Events');
-const {DEFAULT, Type, register} = goog.require('Blockly.registry');
-const {disconnectUiEffect, disconnectUiStop} = goog.require('Blockly.blockAnimations');
-const {startTextWidthCache, stopTextWidthCache} = goog.require('Blockly.utils.dom');
+const blockAnimation = goog.require('Blockly.blockAnimations');
+const dom = goog.require('Blockly.utils.dom');
+const events = goog.require('Blockly.Events');
+const registry = goog.require('Blockly.registry');
 /** @suppress {extraRequire} */
 goog.require('Blockly.constants');
 /** @suppress {extraRequire} */
@@ -143,8 +147,8 @@ const initIconData = function(block) {
  * @public
  */
 BlockDragger.prototype.startDrag = function(currentDragDeltaXY, healStack) {
-  if (!getGroup()) {
-    setGroup(true);
+  if (!events.getGroup()) {
+    events.setGroup(true);
   }
   this.fireDragStartEvent_();
 
@@ -158,9 +162,9 @@ BlockDragger.prototype.startDrag = function(currentDragDeltaXY, healStack) {
 
   // During a drag there may be a lot of rerenders, but not field changes.
   // Turn the cache on so we don't do spurious remeasures during the drag.
-  startTextWidthCache();
+  dom.startTextWidthCache();
   this.workspace_.setResizesEnabled(false);
-  disconnectUiStop();
+  blockAnimation.disconnectUiStop();
 
   if (this.shouldDisconnect_(healStack)) {
     this.disconnectBlock_(healStack, currentDragDeltaXY);
@@ -201,7 +205,7 @@ BlockDragger.prototype.disconnectBlock_ = function(
   const newLoc = Coordinate.sum(this.startXY_, delta);
 
   this.draggingBlock_.translate(newLoc.x, newLoc.y);
-  disconnectUiEffect(this.draggingBlock_);
+  blockAnimation.disconnectUiEffect(this.draggingBlock_);
   this.draggedConnectionManager_.updateAvailableConnections();
 };
 
@@ -210,9 +214,9 @@ BlockDragger.prototype.disconnectBlock_ = function(
  * @protected
  */
 BlockDragger.prototype.fireDragStartEvent_ = function() {
-  const event = new (get(BLOCK_DRAG))(
+  const event = new (events.get(events.BLOCK_DRAG))(
       this.draggingBlock_, true, this.draggingBlock_.getDescendants(false));
-  fire(event);
+  events.fire(event);
 };
 
 /**
@@ -262,9 +266,9 @@ BlockDragger.prototype.endDrag = function(e, currentDragDeltaXY) {
   this.dragIconData_ = [];
   this.fireDragEndEvent_();
 
-  stopTextWidthCache();
+  dom.stopTextWidthCache();
 
-  disconnectUiStop();
+  blockAnimation.disconnectUiStop();
 
   const preventMove = !!this.dragTarget_ &&
       this.dragTarget_.shouldPreventMove(this.draggingBlock_);
@@ -298,7 +302,7 @@ BlockDragger.prototype.endDrag = function(e, currentDragDeltaXY) {
   }
   this.workspace_.setResizesEnabled(true);
 
-  setGroup(false);
+  events.setGroup(false);
 };
 
 /**
@@ -359,9 +363,9 @@ BlockDragger.prototype.updateBlockAfterMove_ = function(delta) {
  * @protected
  */
 BlockDragger.prototype.fireDragEndEvent_ = function() {
-  const event = new (get(BLOCK_DRAG))(
+  const event = new (events.get(events.BLOCK_DRAG))(
       this.draggingBlock_, false, this.draggingBlock_.getDescendants(false));
-  fire(event);
+  events.fire(event);
 };
 
 /**
@@ -392,10 +396,10 @@ BlockDragger.prototype.updateToolboxStyle_ = function(isEnd) {
  * @protected
  */
 BlockDragger.prototype.fireMoveEvent_ = function() {
-  const event = new (get(BLOCK_MOVE))(this.draggingBlock_);
+  const event = new (events.get(events.BLOCK_MOVE))(this.draggingBlock_);
   event.oldCoordinate = this.startXY_;
   event.recordNew();
-  fire(event);
+  events.fire(event);
 };
 
 /**
@@ -463,6 +467,6 @@ BlockDragger.prototype.getInsertionMarkers = function() {
   return [];
 };
 
-register(Type.BLOCK_DRAGGER, DEFAULT, BlockDragger);
+registry.register(registry.Type.BLOCK_DRAGGER, registry.DEFAULT, BlockDragger);
 
 exports = BlockDragger;

From f88320770c7d6e045279916b537eabcdc3345aa7 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Fri, 23 Jul 2021 12:16:00 -0700
Subject: [PATCH 301/833] Remove unnecessary require

---
 core/block_dragger.js | 2 --
 tests/deps.js         | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/block_dragger.js b/core/block_dragger.js
index 5c3ff6916..b7c11e8a3 100644
--- a/core/block_dragger.js
+++ b/core/block_dragger.js
@@ -28,8 +28,6 @@ const dom = goog.require('Blockly.utils.dom');
 const events = goog.require('Blockly.Events');
 const registry = goog.require('Blockly.registry');
 /** @suppress {extraRequire} */
-goog.require('Blockly.constants');
-/** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockDrag');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockMove');
diff --git a/tests/deps.js b/tests/deps.js
index b268b88c1..42191e253 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -10,7 +10,7 @@ goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.Vari
 goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.IASTNodeLocation', 'Blockly.IDeletable', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.Workspace', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es5'});
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', '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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', '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']);
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});

From 6649619f120e5c8a98c1e581a2a32e87f61269fd Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 12:47:55 -0700
Subject: [PATCH 302/833] Convert Blockly.Block from require to requireType

---
 core/generator.js | 2 +-
 tests/deps.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/generator.js b/core/generator.js
index 8e71fb040..112c2f8a1 100644
--- a/core/generator.js
+++ b/core/generator.js
@@ -15,7 +15,7 @@ goog.module('Blockly.Generator');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const Block = goog.require('Blockly.Block');
+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 */
diff --git a/tests/deps.js b/tests/deps.js
index c40db7cbc..94b646890 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -65,7 +65,7 @@ goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Bl
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es5'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly', 'Blockly.Block', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom']);

From 35673a79e12376c4beacd1223591c230f2c3ea34 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 13:02:15 -0700
Subject: [PATCH 303/833] Remove unused Block.Block require

---
 core/flyout_horizontal.js | 2 --
 tests/deps.js             | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/flyout_horizontal.js b/core/flyout_horizontal.js
index 9bfc8aa91..7f1ad72fd 100644
--- a/core/flyout_horizontal.js
+++ b/core/flyout_horizontal.js
@@ -26,8 +26,6 @@ const registry = goog.require('Blockly.registry');
 const {Position} = goog.require('Blockly.utils.toolbox');
 const {getScrollDeltaPixels} = goog.require('Blockly.utils');
 const {inherits} = goog.require('Blockly.utils.object');
-/** @suppress {extraRequire} */
-goog.require('Blockly.Block');
 
 
 /**
diff --git a/tests/deps.js b/tests/deps.js
index 87600526f..a5e2310db 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -63,7 +63,7 @@ goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'],
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es5'});
-goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.Block', 'Blockly.internalConstants', 'Blockly.utils.deprecation']);
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate']);

From a5c486e5717215fa4fe83ca64988f22c4149b622 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 13:09:48 -0700
Subject: [PATCH 304/833] Made icon size field const

---
 core/icon.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/icon.js b/core/icon.js
index b6b8942a7..69ff3ef37 100644
--- a/core/icon.js
+++ b/core/icon.js
@@ -53,6 +53,7 @@ Icon.prototype.collapseHidden = true;
 
 /**
  * Height and width of icons.
+ * @const
  */
 Icon.prototype.SIZE = 17;
 

From 808ec6a5d3c6069c28e9751e369c224df1cbfcc0 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 14:29:05 -0700
Subject: [PATCH 305/833] Migrate core/marker_manager.js to ES6 const/let

---
 core/marker_manager.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/marker_manager.js b/core/marker_manager.js
index 82c149052..3d3c64bbb 100644
--- a/core/marker_manager.js
+++ b/core/marker_manager.js
@@ -81,7 +81,7 @@ Blockly.MarkerManager.prototype.registerMarker = function(id, marker) {
  * @param {string} id The ID of the marker to unregister.
  */
 Blockly.MarkerManager.prototype.unregisterMarker = function(id) {
-  var marker = this.markers_[id];
+  const marker = this.markers_[id];
   if (marker) {
     marker.dispose();
     delete this.markers_[id];
@@ -119,7 +119,7 @@ Blockly.MarkerManager.prototype.setCursor = function(cursor) {
   }
   this.cursor_ = cursor;
   if (this.cursor_) {
-    var drawer = this.workspace_.getRenderer()
+    const drawer = this.workspace_.getRenderer()
         .makeMarkerDrawer(this.workspace_, this.cursor_);
     this.cursor_.setDrawer(drawer);
     this.setCursorSvg(this.cursor_.getDrawer().createDom());
@@ -180,8 +180,8 @@ Blockly.MarkerManager.prototype.updateMarkers = function() {
  * @package
  */
 Blockly.MarkerManager.prototype.dispose = function() {
-  var markerIds = Object.keys(this.markers_);
-  for (var i = 0, markerId; (markerId = markerIds[i]); i++) {
+  const markerIds = Object.keys(this.markers_);
+  for (let i = 0, markerId; (markerId = markerIds[i]); i++) {
     this.unregisterMarker(markerId);
   }
   this.markers_ = null;

From df794d7e3a47acec6fe91ed278ea99fbcb2652ab Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 14:31:10 -0700
Subject: [PATCH 306/833] Migrate core/marker_manager.js to goog.module

---
 core/marker_manager.js | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/core/marker_manager.js b/core/marker_manager.js
index 3d3c64bbb..59bc64b7a 100644
--- a/core/marker_manager.js
+++ b/core/marker_manager.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.MarkerManager');
+goog.module('Blockly.MarkerManager');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Cursor');
 goog.require('Blockly.Marker');
@@ -24,7 +25,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @constructor
  * @package
  */
-Blockly.MarkerManager = function(workspace){
+const MarkerManager = function(workspace){
   /**
    * The cursor.
    * @type {?Blockly.Cursor}
@@ -59,14 +60,14 @@ Blockly.MarkerManager = function(workspace){
  * @type {string}
  * @const
  */
-Blockly.MarkerManager.LOCAL_MARKER = 'local_marker_1';
+MarkerManager.LOCAL_MARKER = 'local_marker_1';
 
 /**
  * Register the marker by adding it to the map of markers.
  * @param {string} id A unique identifier for the marker.
  * @param {!Blockly.Marker} marker The marker to register.
  */
-Blockly.MarkerManager.prototype.registerMarker = function(id, marker) {
+MarkerManager.prototype.registerMarker = function(id, marker) {
   if (this.markers_[id]) {
     this.unregisterMarker(id);
   }
@@ -80,7 +81,7 @@ Blockly.MarkerManager.prototype.registerMarker = function(id, marker) {
  * Unregister the marker by removing it from the map of markers.
  * @param {string} id The ID of the marker to unregister.
  */
-Blockly.MarkerManager.prototype.unregisterMarker = function(id) {
+MarkerManager.prototype.unregisterMarker = function(id) {
   const marker = this.markers_[id];
   if (marker) {
     marker.dispose();
@@ -95,7 +96,7 @@ Blockly.MarkerManager.prototype.unregisterMarker = function(id) {
  * Get the cursor for the workspace.
  * @return {?Blockly.Cursor} The cursor for this workspace.
  */
-Blockly.MarkerManager.prototype.getCursor = function() {
+MarkerManager.prototype.getCursor = function() {
   return this.cursor_;
 };
 
@@ -105,7 +106,7 @@ Blockly.MarkerManager.prototype.getCursor = function() {
  * @return {?Blockly.Marker} The marker that corresponds to the given ID,
  *     or null if none exists.
  */
-Blockly.MarkerManager.prototype.getMarker = function(id) {
+MarkerManager.prototype.getMarker = function(id) {
   return this.markers_[id] || null;
 };
 
@@ -113,7 +114,7 @@ Blockly.MarkerManager.prototype.getMarker = function(id) {
  * Sets the cursor and initializes the drawer for use with keyboard navigation.
  * @param {Blockly.Cursor} cursor The cursor used to move around this workspace.
  */
-Blockly.MarkerManager.prototype.setCursor = function(cursor) {
+MarkerManager.prototype.setCursor = function(cursor) {
   if (this.cursor_ && this.cursor_.getDrawer()) {
     this.cursor_.getDrawer().dispose();
   }
@@ -132,7 +133,7 @@ Blockly.MarkerManager.prototype.setCursor = function(cursor) {
  *     workspace SVG group.
  * @package
  */
-Blockly.MarkerManager.prototype.setCursorSvg = function(cursorSvg) {
+MarkerManager.prototype.setCursorSvg = function(cursorSvg) {
   if (!cursorSvg) {
     this.cursorSvg_ = null;
     return;
@@ -148,7 +149,7 @@ Blockly.MarkerManager.prototype.setCursorSvg = function(cursorSvg) {
  *     workspace SVG group.
  * @package
  */
-Blockly.MarkerManager.prototype.setMarkerSvg = function(markerSvg) {
+MarkerManager.prototype.setMarkerSvg = function(markerSvg) {
   if (!markerSvg) {
     this.markerSvg_ = null;
     return;
@@ -167,7 +168,7 @@ Blockly.MarkerManager.prototype.setMarkerSvg = function(markerSvg) {
  * Redraw the attached cursor SVG if needed.
  * @package
  */
-Blockly.MarkerManager.prototype.updateMarkers = function() {
+MarkerManager.prototype.updateMarkers = function() {
   if (this.workspace_.keyboardAccessibilityMode && this.cursorSvg_) {
     this.workspace_.getCursor().draw();
   }
@@ -179,7 +180,7 @@ Blockly.MarkerManager.prototype.updateMarkers = function() {
  * @suppress {checkTypes}
  * @package
  */
-Blockly.MarkerManager.prototype.dispose = function() {
+MarkerManager.prototype.dispose = function() {
   const markerIds = Object.keys(this.markers_);
   for (let i = 0, markerId; (markerId = markerIds[i]); i++) {
     this.unregisterMarker(markerId);
@@ -190,3 +191,5 @@ Blockly.MarkerManager.prototype.dispose = function() {
     this.cursor_ = null;
   }
 };
+
+exports = MarkerManager;

From 608a4fd9f1906f99704751d457f578688cbf92de Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 14:34:01 -0700
Subject: [PATCH 307/833] Migrate core/marker_manager.js to named requires

---
 core/marker_manager.js | 26 ++++++++++++++------------
 tests/deps.js          |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/core/marker_manager.js b/core/marker_manager.js
index 59bc64b7a..b2d5c2bd5 100644
--- a/core/marker_manager.js
+++ b/core/marker_manager.js
@@ -13,22 +13,24 @@
 goog.module('Blockly.MarkerManager');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Cursor');
-goog.require('Blockly.Marker');
-
-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');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
  * Class to manage the multiple markers and the cursor on a workspace.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace for the marker manager.
+ * @param {!WorkspaceSvg} workspace The workspace for the marker manager.
  * @constructor
  * @package
  */
 const MarkerManager = function(workspace){
   /**
    * The cursor.
-   * @type {?Blockly.Cursor}
+   * @type {?Cursor}
    * @private
    */
   this.cursor_ = null;
@@ -42,14 +44,14 @@ const MarkerManager = function(workspace){
 
   /**
    * The map of markers for the workspace.
-   * @type {!Object<string, !Blockly.Marker>}
+   * @type {!Object<string, !Marker>}
    * @private
    */
   this.markers_ = Object.create(null);
 
   /**
    * The workspace this marker manager is associated with.
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @private
    */
   this.workspace_ = workspace;
@@ -65,7 +67,7 @@ MarkerManager.LOCAL_MARKER = 'local_marker_1';
 /**
  * Register the marker by adding it to the map of markers.
  * @param {string} id A unique identifier for the marker.
- * @param {!Blockly.Marker} marker The marker to register.
+ * @param {!Marker} marker The marker to register.
  */
 MarkerManager.prototype.registerMarker = function(id, marker) {
   if (this.markers_[id]) {
@@ -94,7 +96,7 @@ MarkerManager.prototype.unregisterMarker = function(id) {
 
 /**
  * Get the cursor for the workspace.
- * @return {?Blockly.Cursor} The cursor for this workspace.
+ * @return {?Cursor} The cursor for this workspace.
  */
 MarkerManager.prototype.getCursor = function() {
   return this.cursor_;
@@ -103,7 +105,7 @@ MarkerManager.prototype.getCursor = function() {
 /**
  * Get a single marker that corresponds to the given ID.
  * @param {string} id A unique identifier for the marker.
- * @return {?Blockly.Marker} The marker that corresponds to the given ID,
+ * @return {?Marker} The marker that corresponds to the given ID,
  *     or null if none exists.
  */
 MarkerManager.prototype.getMarker = function(id) {
@@ -112,7 +114,7 @@ MarkerManager.prototype.getMarker = function(id) {
 
 /**
  * Sets the cursor and initializes the drawer for use with keyboard navigation.
- * @param {Blockly.Cursor} cursor The cursor used to move around this workspace.
+ * @param {Cursor} cursor The cursor used to move around this workspace.
  */
 MarkerManager.prototype.setCursor = function(cursor) {
   if (this.cursor_ && this.cursor_.getDrawer()) {
diff --git a/tests/deps.js b/tests/deps.js
index de575339f..6ed58a69c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -107,7 +107,7 @@ goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCur
 goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], ['Blockly.ASTNode']);
 goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], ['Blockly.Cursor', 'Blockly.Marker']);
+goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], [], {'lang': 'es6', 'module': 'goog'});
 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.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom']);
 goog.addDependency('../../core/metrics_manager.js', ['Blockly.FlyoutMetricsManager', 'Blockly.MetricsManager'], ['Blockly.IMetricsManager', 'Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es5'});

From 126e02927f8752b9dc1c18bee9b9c4e4ab2117d8 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 14:34:30 -0700
Subject: [PATCH 308/833] clang-format core/marker_manager.js

---
 core/marker_manager.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/core/marker_manager.js b/core/marker_manager.js
index b2d5c2bd5..1f16f500a 100644
--- a/core/marker_manager.js
+++ b/core/marker_manager.js
@@ -27,7 +27,7 @@ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
  * @constructor
  * @package
  */
-const MarkerManager = function(workspace){
+const MarkerManager = function(workspace) {
   /**
    * The cursor.
    * @type {?Cursor}
@@ -73,8 +73,8 @@ MarkerManager.prototype.registerMarker = function(id, marker) {
   if (this.markers_[id]) {
     this.unregisterMarker(id);
   }
-  marker.setDrawer(this.workspace_.getRenderer()
-      .makeMarkerDrawer(this.workspace_, marker));
+  marker.setDrawer(
+      this.workspace_.getRenderer().makeMarkerDrawer(this.workspace_, marker));
   this.setMarkerSvg(marker.getDrawer().createDom());
   this.markers_[id] = marker;
 };
@@ -89,7 +89,8 @@ MarkerManager.prototype.unregisterMarker = function(id) {
     marker.dispose();
     delete this.markers_[id];
   } else {
-    throw Error('Marker with ID ' + id + ' does not exist. ' +
+    throw Error(
+        'Marker with ID ' + id + ' does not exist. ' +
         'Can only unregister markers that exist.');
   }
 };
@@ -122,8 +123,8 @@ MarkerManager.prototype.setCursor = function(cursor) {
   }
   this.cursor_ = cursor;
   if (this.cursor_) {
-    const drawer = this.workspace_.getRenderer()
-        .makeMarkerDrawer(this.workspace_, this.cursor_);
+    const drawer = this.workspace_.getRenderer().makeMarkerDrawer(
+        this.workspace_, this.cursor_);
     this.cursor_.setDrawer(drawer);
     this.setCursorSvg(this.cursor_.getDrawer().createDom());
   }

From 046636547ef5e31ea7db352509248a9ccb500fc1 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 23 Jul 2021 14:26:11 -0700
Subject: [PATCH 309/833] Change how the debug filter is created

---
 core/renderers/common/constants.js | 56 ++++++++++++++++++------------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/core/renderers/common/constants.js b/core/renderers/common/constants.js
index 5c73d0510..7508b6050 100644
--- a/core/renderers/common/constants.js
+++ b/core/renderers/common/constants.js
@@ -401,6 +401,14 @@ Blockly.blockRendering.ConstantProvider = function() {
    */
   this.randomIdentifier = String(Math.random()).substring(2);
 
+  /**
+   * The defs tag that contains all filters and patterns for this Blockly
+   * instance.
+   * @type {SVGElement}
+   * @private
+   */
+  this.defs = null;
+
   /**
    * The ID of the emboss filter, or the empty string if no filter is set.
    * @type {string}
@@ -1023,7 +1031,7 @@ Blockly.blockRendering.ConstantProvider.prototype.createDom = function(svg,
     ... filters go here ...
   </defs>
   */
-  var defs = Blockly.utils.dom.createSvgElement(
+  this.defs = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.DEFS, {}, svg);
   /*
     <filter id="blocklyEmbossFilter837493">
@@ -1041,7 +1049,7 @@ Blockly.blockRendering.ConstantProvider.prototype.createDom = function(svg,
   */
   var embossFilter = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.FILTER,
-      {'id': 'blocklyEmbossFilter' + this.randomIdentifier}, defs);
+      {'id': 'blocklyEmbossFilter' + this.randomIdentifier}, this.defs);
   Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.FEGAUSSIANBLUR,
       {'in': 'SourceAlpha', 'stdDeviation': 1, 'result': 'blur'}, embossFilter);
@@ -1095,7 +1103,7 @@ Blockly.blockRendering.ConstantProvider.prototype.createDom = function(svg,
         'patternUnits': 'userSpaceOnUse',
         'width': 10,
         'height': 10
-      }, defs);
+      }, this.defs);
   Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.RECT,
       {'width': 10, 'height': 10, 'fill': '#aaa'}, disabledPattern);
@@ -1105,42 +1113,46 @@ Blockly.blockRendering.ConstantProvider.prototype.createDom = function(svg,
   this.disabledPatternId = disabledPattern.id;
   this.disabledPattern_ = disabledPattern;
 
-  if (Blockly.blockRendering.Debug) {
+  this.createDebugFilter();
+};
+
+/**
+ * Create a filter for highlighting the currently rendering block during
+ * render debugging.
+ * @private
+ */
+Blockly.blockRendering.ConstantProvider.prototype.createDebugFilter =
+    function() {
+  // Only create the debug filter once.
+  if (!this.debugFilter_) {
     var debugFilter = Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.FILTER,
-        {
+        Blockly.utils.Svg.FILTER, {
           'id': 'blocklyDebugFilter' + this.randomIdentifier,
           'height': '160%',
           'width': '180%',
           y: '-30%',
           x: '-40%'
         },
-        defs);
+        this.defs);
     // Set all gaussian blur pixels to 1 opacity before applying flood
     var debugComponentTransfer = Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.FECOMPONENTTRANSFER, {
-          'result': 'outBlur'
-        }, debugFilter);
+        Blockly.utils.Svg.FECOMPONENTTRANSFER, {'result': 'outBlur'},
+        debugFilter);
     Blockly.utils.dom.createSvgElement(
         Blockly.utils.Svg.FEFUNCA,
-        {
-          'type': 'table', 'tableValues': '0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1'
-        },
+        {'type': 'table', 'tableValues': '0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1'},
         debugComponentTransfer);
     // Color the highlight
     Blockly.utils.dom.createSvgElement(
         Blockly.utils.Svg.FEFLOOD,
-        {
-          'flood-color': '#ff0000',
-          'flood-opacity': 0.5,
-          'result': 'outColor'
-        },
+        {'flood-color': '#ff0000', 'flood-opacity': 0.5, 'result': 'outColor'},
         debugFilter);
     Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.FECOMPOSITE,
-        {
-          'in': 'outColor', 'in2': 'outBlur',
-          'operator': 'in', 'result': 'outGlow'
+        Blockly.utils.Svg.FECOMPOSITE, {
+          'in': 'outColor',
+          'in2': 'outBlur',
+          'operator': 'in',
+          'result': 'outGlow'
         },
         debugFilter);
     this.debugFilterId = debugFilter.id;

From e9c1e67d17457111c02f3c1bc53681dafa540974 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 23 Jul 2021 14:38:20 -0700
Subject: [PATCH 310/833] Migrate core/renderers/common/constants.js to
 goog.module

---
 core/renderers/common/constants.js | 53 ++++++++++++++++--------------
 tests/deps.js                      |  2 +-
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/core/renderers/common/constants.js b/core/renderers/common/constants.js
index 7508b6050..071b21e7d 100644
--- a/core/renderers/common/constants.js
+++ b/core/renderers/common/constants.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.blockRendering.ConstantProvider');
+goog.module('Blockly.blockRendering.ConstantProvider');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.connectionTypes');
 goog.require('Blockly.utils');
@@ -30,7 +31,7 @@ goog.requireType('Blockly.Theme');
  * @constructor
  * @package
  */
-Blockly.blockRendering.ConstantProvider = function() {
+const ConstantProvider = function() {
 
   /**
    * The size of an empty spacer.
@@ -543,7 +544,7 @@ Blockly.blockRendering.ConstantProvider = function() {
  * Initialize shape objects based on the constants set in the constructor.
  * @package
  */
-Blockly.blockRendering.ConstantProvider.prototype.init = function() {
+ConstantProvider.prototype.init = function() {
 
   /**
    * An object containing sizing and path information about collapsed block
@@ -588,7 +589,7 @@ Blockly.blockRendering.ConstantProvider.prototype.init = function() {
  * @param {!Blockly.Theme} theme The current workspace theme.
  * @package
  */
-Blockly.blockRendering.ConstantProvider.prototype.setTheme = function(
+ConstantProvider.prototype.setTheme = function(
     theme) {
 
   /**
@@ -611,7 +612,7 @@ Blockly.blockRendering.ConstantProvider.prototype.setTheme = function(
  * @param {!Blockly.Theme} theme The current workspace theme.
  * @protected
  */
-Blockly.blockRendering.ConstantProvider.prototype.setDynamicProperties_ =
+ConstantProvider.prototype.setDynamicProperties_ =
     function(theme) {
     /* eslint-disable indent */
   this.setFontConstants_(theme);
@@ -626,7 +627,7 @@ Blockly.blockRendering.ConstantProvider.prototype.setDynamicProperties_ =
  * @param {!Blockly.Theme} theme The current workspace theme.
  * @protected
  */
-Blockly.blockRendering.ConstantProvider.prototype.setFontConstants_ = function(
+ConstantProvider.prototype.setFontConstants_ = function(
     theme) {
   this.FIELD_TEXT_FONTFAMILY =
       theme.fontStyle && theme.fontStyle['family'] != undefined ?
@@ -652,7 +653,7 @@ Blockly.blockRendering.ConstantProvider.prototype.setFontConstants_ = function(
  * @param {!Blockly.Theme} theme The current workspace theme.
  * @protected
  */
-Blockly.blockRendering.ConstantProvider.prototype.setComponentConstants_ =
+ConstantProvider.prototype.setComponentConstants_ =
     function(theme) {
     /* eslint-disable indent */
   this.CURSOR_COLOUR = theme.getComponentStyle('cursorColour') ||
@@ -675,7 +676,7 @@ Blockly.blockRendering.ConstantProvider.prototype.setComponentConstants_ =
  *     containing the style and an autogenerated name for that style.
  * @package
  */
-Blockly.blockRendering.ConstantProvider.prototype.getBlockStyleForColour =
+ConstantProvider.prototype.getBlockStyleForColour =
     function(colour) {
     /* eslint-disable indent */
   var name = 'auto_' + colour;
@@ -691,7 +692,7 @@ Blockly.blockRendering.ConstantProvider.prototype.getBlockStyleForColour =
  * @return {!Blockly.Theme.BlockStyle} The named block style, or a default style
  *     if no style with the given name was found.
  */
-Blockly.blockRendering.ConstantProvider.prototype.getBlockStyle = function(
+ConstantProvider.prototype.getBlockStyle = function(
     blockStyleName) {
   return this.blockStyles[blockStyleName || ''] ||
       (blockStyleName && blockStyleName.indexOf('auto_') == 0 ?
@@ -706,7 +707,7 @@ Blockly.blockRendering.ConstantProvider.prototype.getBlockStyle = function(
  *     given colour.
  * @protected
  */
-Blockly.blockRendering.ConstantProvider.prototype.createBlockStyle_ = function(
+ConstantProvider.prototype.createBlockStyle_ = function(
     colour) {
   return this.validatedBlockStyle_({
     'colourPrimary': colour
@@ -727,7 +728,7 @@ Blockly.blockRendering.ConstantProvider.prototype.createBlockStyle_ = function(
  *     required properties populated.
  * @protected
  */
-Blockly.blockRendering.ConstantProvider.prototype.validatedBlockStyle_ =
+ConstantProvider.prototype.validatedBlockStyle_ =
     function(blockStyle) {
     /* eslint-disable indent */
   // Make a new object with all of the same properties.
@@ -756,7 +757,7 @@ Blockly.blockRendering.ConstantProvider.prototype.validatedBlockStyle_ =
  * @return {string} The generated secondary colour.
  * @protected
  */
-Blockly.blockRendering.ConstantProvider.prototype.generateSecondaryColour_ =
+ConstantProvider.prototype.generateSecondaryColour_ =
     function(colour) {
     /* eslint-disable indent */
   return Blockly.utils.colour.blend('#fff', colour, 0.6) || colour;
@@ -768,7 +769,7 @@ Blockly.blockRendering.ConstantProvider.prototype.generateSecondaryColour_ =
  * @return {string} The generated tertiary colour.
  * @protected
  */
-Blockly.blockRendering.ConstantProvider.prototype.generateTertiaryColour_ =
+ConstantProvider.prototype.generateTertiaryColour_ =
     function(colour) {
     /* eslint-disable indent */
   return Blockly.utils.colour.blend('#fff', colour, 0.3) || colour;
@@ -780,7 +781,7 @@ Blockly.blockRendering.ConstantProvider.prototype.generateTertiaryColour_ =
  * Delete all DOM elements that this provider created.
  * @package
  */
-Blockly.blockRendering.ConstantProvider.prototype.dispose = function() {
+ConstantProvider.prototype.dispose = function() {
   if (this.embossFilter_) {
     Blockly.utils.dom.removeNode(this.embossFilter_);
   }
@@ -798,7 +799,7 @@ Blockly.blockRendering.ConstantProvider.prototype.dispose = function() {
  *     collapsed block indicators.
  * @package
  */
-Blockly.blockRendering.ConstantProvider.prototype.makeJaggedTeeth = function() {
+ConstantProvider.prototype.makeJaggedTeeth = function() {
   var height = this.JAGGED_TEETH_HEIGHT;
   var width = this.JAGGED_TEETH_WIDTH;
 
@@ -821,7 +822,7 @@ Blockly.blockRendering.ConstantProvider.prototype.makeJaggedTeeth = function() {
  *     start hats.
  * @package
  */
-Blockly.blockRendering.ConstantProvider.prototype.makeStartHat = function() {
+ConstantProvider.prototype.makeStartHat = function() {
   var height = this.START_HAT_HEIGHT;
   var width = this.START_HAT_WIDTH;
 
@@ -844,7 +845,7 @@ Blockly.blockRendering.ConstantProvider.prototype.makeStartHat = function() {
  *     puzzle tabs.
  * @package
  */
-Blockly.blockRendering.ConstantProvider.prototype.makePuzzleTab = function() {
+ConstantProvider.prototype.makePuzzleTab = function() {
   var width = this.TAB_WIDTH;
   var height = this.TAB_HEIGHT;
 
@@ -898,7 +899,7 @@ Blockly.blockRendering.ConstantProvider.prototype.makePuzzleTab = function() {
  *     notches.
  * @package
  */
-Blockly.blockRendering.ConstantProvider.prototype.makeNotch = function() {
+ConstantProvider.prototype.makeNotch = function() {
   var width = this.NOTCH_WIDTH;
   var height = this.NOTCH_HEIGHT;
   var innerWidth = 3;
@@ -928,7 +929,7 @@ Blockly.blockRendering.ConstantProvider.prototype.makeNotch = function() {
  *     inside corners.
  * @package
  */
-Blockly.blockRendering.ConstantProvider.prototype.makeInsideCorners = function() {
+ConstantProvider.prototype.makeInsideCorners = function() {
   var radius = this.CORNER_RADIUS;
 
   var innerTopLeftCorner = Blockly.utils.svgPaths.arc('a', '0 0,0', radius,
@@ -950,7 +951,7 @@ Blockly.blockRendering.ConstantProvider.prototype.makeInsideCorners = function()
  *     outside corners.
  * @package
  */
-Blockly.blockRendering.ConstantProvider.prototype.makeOutsideCorners = function() {
+ConstantProvider.prototype.makeOutsideCorners = function() {
   var radius = this.CORNER_RADIUS;
   /**
    * SVG path for drawing the rounded top-left corner.
@@ -1000,7 +1001,7 @@ Blockly.blockRendering.ConstantProvider.prototype.makeOutsideCorners = function(
  * @return {!Object} The shape object for the connection.
  * @package
  */
-Blockly.blockRendering.ConstantProvider.prototype.shapeFor = function(
+ConstantProvider.prototype.shapeFor = function(
     connection) {
   switch (connection.type) {
     case Blockly.connectionTypes.INPUT_VALUE:
@@ -1022,7 +1023,7 @@ Blockly.blockRendering.ConstantProvider.prototype.shapeFor = function(
  * @suppress {strictModuleDepCheck} Debug renderer only included in playground.
  * @package
  */
-Blockly.blockRendering.ConstantProvider.prototype.createDom = function(svg,
+ConstantProvider.prototype.createDom = function(svg,
     tagName, selector) {
   this.injectCSS_(tagName, selector);
 
@@ -1121,7 +1122,7 @@ Blockly.blockRendering.ConstantProvider.prototype.createDom = function(svg,
  * render debugging.
  * @private
  */
-Blockly.blockRendering.ConstantProvider.prototype.createDebugFilter =
+ConstantProvider.prototype.createDebugFilter =
     function() {
   // Only create the debug filter once.
   if (!this.debugFilter_) {
@@ -1166,7 +1167,7 @@ Blockly.blockRendering.ConstantProvider.prototype.createDebugFilter =
  * @param {string} selector The CSS selector to use.
  * @protected
  */
-Blockly.blockRendering.ConstantProvider.prototype.injectCSS_ = function(
+ConstantProvider.prototype.injectCSS_ = function(
     tagName, selector) {
   var cssArray = this.getCSS_(selector);
   var cssNodeId = 'blockly-renderer-style-' + tagName;
@@ -1194,7 +1195,7 @@ Blockly.blockRendering.ConstantProvider.prototype.injectCSS_ = function(
  * @return {!Array<string>} Array of CSS strings.
  * @protected
  */
-Blockly.blockRendering.ConstantProvider.prototype.getCSS_ = function(selector) {
+ConstantProvider.prototype.getCSS_ = function(selector) {
   return [
     /* eslint-disable indent */
     // Text.
@@ -1269,3 +1270,5 @@ Blockly.blockRendering.ConstantProvider.prototype.getCSS_ = function(selector) {
     /* eslint-enable indent */
   ];
 };
+
+exports = ConstantProvider;
diff --git a/tests/deps.js b/tests/deps.js
index de575339f..14992f734 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -120,7 +120,7 @@ goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], []);
 goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry']);
-goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es5'});
+goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], []);

From 227030f451511c0eceb3bf303de25e2ad89e57ca Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 14:41:22 -0700
Subject: [PATCH 311/833] Migrate core/mutator.js to ES6 const/let

---
 core/mutator.js | 98 +++++++++++++++++++++++++------------------------
 1 file changed, 50 insertions(+), 48 deletions(-)

diff --git a/core/mutator.js b/core/mutator.js
index 2733964c7..3a87e2035 100644
--- a/core/mutator.js
+++ b/core/mutator.js
@@ -161,17 +161,18 @@ Blockly.Mutator.prototype.createEditor_ = function() {
       {'x': Blockly.Bubble.BORDER_WIDTH, 'y': Blockly.Bubble.BORDER_WIDTH},
       null);
   // Convert the list of names into a list of XML objects for the flyout.
+  let quarkXml;
   if (this.quarkNames_.length) {
-    var quarkXml = Blockly.utils.xml.createElement('xml');
-    for (var i = 0, quarkName; (quarkName = this.quarkNames_[i]); i++) {
-      var element = Blockly.utils.xml.createElement('block');
+    quarkXml = Blockly.utils.xml.createElement('xml');
+    for (let i = 0, quarkName; (quarkName = this.quarkNames_[i]); i++) {
+      const element = Blockly.utils.xml.createElement('block');
       element.setAttribute('type', quarkName);
       quarkXml.appendChild(element);
     }
   } else {
-    var quarkXml = null;
+    quarkXml = null;
   }
-  var workspaceOptions = new Blockly.Options(
+  const workspaceOptions = new Blockly.Options(
       /** @type {!Blockly.BlocklyOptions} */
       ({
         // If you want to enable disabling, also remove the
@@ -187,7 +188,7 @@ Blockly.Mutator.prototype.createEditor_ = function() {
   workspaceOptions.toolboxPosition = this.block_.RTL ?
       Blockly.utils.toolbox.Position.RIGHT :
       Blockly.utils.toolbox.Position.LEFT;
-  var hasFlyout = !!quarkXml;
+  const hasFlyout = !!quarkXml;
   if (hasFlyout) {
     workspaceOptions.languageTree =
         Blockly.utils.toolbox.convertToolboxDefToJson(quarkXml);
@@ -200,9 +201,9 @@ Blockly.Mutator.prototype.createEditor_ = function() {
   // a top level SVG. Instead of handling scale themselves, mutators
   // inherit scale from the parent workspace.
   // To fix this, scale needs to be applied at a different level in the DOM.
-  var flyoutSvg = hasFlyout ?
+  const flyoutSvg = hasFlyout ?
       this.workspace_.addFlyout(Blockly.utils.Svg.G) : null;
-  var background = this.workspace_.createDom('blocklyMutatorBackground');
+  const background = this.workspace_.createDom('blocklyMutatorBackground');
 
   if (flyoutSvg) {
     // Insert the flyout after the <rect> but before the block canvas so that
@@ -244,13 +245,13 @@ Blockly.Mutator.prototype.updateEditable = function() {
  * @private
  */
 Blockly.Mutator.prototype.resizeBubble_ = function() {
-  var doubleBorderWidth = 2 * Blockly.Bubble.BORDER_WIDTH;
-  var workspaceSize = this.workspace_.getCanvas().getBBox();
-  var width = workspaceSize.width + workspaceSize.x;
-  var height = workspaceSize.height + doubleBorderWidth * 3;
-  var flyout = this.workspace_.getFlyout();
+  const doubleBorderWidth = 2 * Blockly.Bubble.BORDER_WIDTH;
+  const workspaceSize = this.workspace_.getCanvas().getBBox();
+  let width = workspaceSize.width + workspaceSize.x;
+  let height = workspaceSize.height + doubleBorderWidth * 3;
+  const flyout = this.workspace_.getFlyout();
   if (flyout) {
-    var flyoutScrollMetrics = flyout.getWorkspace().getMetricsManager()
+    const flyoutScrollMetrics = flyout.getWorkspace().getMetricsManager()
         .getScrollMetrics();
     height = Math.max(height, flyoutScrollMetrics.height + 20);
     width += flyout.getWidth();
@@ -276,7 +277,7 @@ Blockly.Mutator.prototype.resizeBubble_ = function() {
 
   if (this.block_.RTL) {
     // Scroll the workspace to always left-align.
-    var translation = 'translate(' + this.workspaceWidth_ + ',0)';
+    const translation = 'translate(' + this.workspaceWidth_ + ',0)';
     this.workspace_.getCanvas().setAttribute('transform', translation);
   }
   this.workspace_.resize();
@@ -312,27 +313,28 @@ Blockly.Mutator.prototype.setVisible = function(visible) {
     // Expose this mutator's block's ID on its top-level SVG group.
     this.bubble_.setSvgId(this.block_.id);
     this.bubble_.registerMoveEvent(this.onBubbleMove_.bind(this));
-    var tree = this.workspace_.options.languageTree;
-    var flyout = this.workspace_.getFlyout();
+    const tree = this.workspace_.options.languageTree;
+    const flyout = this.workspace_.getFlyout();
     if (tree) {
       flyout.init(this.workspace_);
       flyout.show(tree);
     }
 
     this.rootBlock_ = this.block_.decompose(this.workspace_);
-    var blocks = this.rootBlock_.getDescendants(false);
-    for (var i = 0, child; (child = blocks[i]); i++) {
+    const blocks = this.rootBlock_.getDescendants(false);
+    for (let i = 0, child; (child = blocks[i]); i++) {
       child.render();
     }
     // The root block should not be draggable or deletable.
     this.rootBlock_.setMovable(false);
     this.rootBlock_.setDeletable(false);
+    let margin, x;
     if (flyout) {
-      var margin = flyout.CORNER_RADIUS * 2;
-      var x = this.rootBlock_.RTL ? flyout.getWidth() + margin : margin;
+      margin = flyout.CORNER_RADIUS * 2;
+      x = this.rootBlock_.RTL ? flyout.getWidth() + margin : margin;
     } else {
-      var margin = 16;
-      var x = margin;
+      margin = 16;
+      x = margin;
     }
     if (this.block_.RTL) {
       x = -x;
@@ -340,8 +342,8 @@ Blockly.Mutator.prototype.setVisible = function(visible) {
     this.rootBlock_.moveBy(x, margin);
     // Save the initial connections, then listen for further changes.
     if (this.block_.saveConnections) {
-      var thisMutator = this;
-      var mutatorBlock =
+      const thisMutator = this;
+      const mutatorBlock =
         /** @type {{saveConnections: function(!Blockly.Block)}} */ (
           this.block_);
       mutatorBlock.saveConnections(this.rootBlock_);
@@ -385,11 +387,11 @@ Blockly.Mutator.prototype.workspaceChanged_ = function(e) {
   }
 
   if (!this.workspace_.isDragging()) {
-    var blocks = this.workspace_.getTopBlocks(false);
-    var MARGIN = 20;
+    const blocks = this.workspace_.getTopBlocks(false);
+    const MARGIN = 20;
 
-    for (var b = 0, block; (block = blocks[b]); b++) {
-      var blockXY = block.getRelativeToSurfaceXY();
+    for (let b = 0, block; (block = blocks[b]); b++) {
+      const blockXY = block.getRelativeToSurfaceXY();
 
       // Bump any block that's above the top back inside.
       if (blockXY.y < MARGIN) {
@@ -397,8 +399,8 @@ Blockly.Mutator.prototype.workspaceChanged_ = function(e) {
       }
       // Bump any block overlapping the flyout back inside.
       if (block.RTL) {
-        var right = -MARGIN;
-        var flyout = this.workspace_.getFlyout();
+        let right = -MARGIN;
+        const flyout = this.workspace_.getFlyout();
         if (flyout) {
           right -= flyout.getWidth();
         }
@@ -414,12 +416,12 @@ Blockly.Mutator.prototype.workspaceChanged_ = function(e) {
   // When the mutator's workspace changes, update the source block.
   if (this.rootBlock_.workspace == this.workspace_) {
     Blockly.Events.setGroup(true);
-    var block = this.block_;
-    var oldMutationDom = block.mutationToDom();
-    var oldMutation = oldMutationDom && Blockly.Xml.domToText(oldMutationDom);
+    const block = this.block_;
+    const oldMutationDom = block.mutationToDom();
+    const oldMutation = oldMutationDom && Blockly.Xml.domToText(oldMutationDom);
 
     // Switch off rendering while the source block is rebuilt.
-    var savedRendered = block.rendered;
+    const savedRendered = block.rendered;
     // TODO(#4288): We should not be setting the rendered property to false.
     block.rendered = false;
 
@@ -434,13 +436,13 @@ Blockly.Mutator.prototype.workspaceChanged_ = function(e) {
       block.render();
     }
 
-    var newMutationDom = block.mutationToDom();
-    var newMutation = newMutationDom && Blockly.Xml.domToText(newMutationDom);
+    const newMutationDom = block.mutationToDom();
+    const newMutation = newMutationDom && Blockly.Xml.domToText(newMutationDom);
     if (oldMutation != newMutation) {
       Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CHANGE))(
           block, 'mutation', null, oldMutation, newMutation));
       // Ensure that any bump is part of this mutation's event group.
-      var group = Blockly.Events.getGroup();
+      const group = Blockly.Events.getGroup();
       setTimeout(function() {
         Blockly.Events.setGroup(group);
         block.bumpNeighbours();
@@ -470,18 +472,18 @@ Blockly.Mutator.prototype.dispose = function() {
  * @public
  */
 Blockly.Mutator.prototype.updateBlockStyle = function() {
-  var ws = this.workspace_;
+  const ws = this.workspace_;
 
   if (ws && ws.getAllBlocks(false)) {
-    var workspaceBlocks = ws.getAllBlocks(false);
-    for (var i = 0, block; (block = workspaceBlocks[i]); i++) {
+    const workspaceBlocks = ws.getAllBlocks(false);
+    for (let i = 0, block; (block = workspaceBlocks[i]); i++) {
       block.setStyle(block.getStyleName());
     }
 
-    var flyout = ws.getFlyout();
+    const flyout = ws.getFlyout();
     if (flyout) {
-      var flyoutBlocks = flyout.workspace_.getAllBlocks(false);
-      for (var i = 0, block; (block = flyoutBlocks[i]); i++) {
+      const flyoutBlocks = flyout.workspace_.getAllBlocks(false);
+      for (let i = 0, block; (block = flyoutBlocks[i]); i++) {
         block.setStyle(block.getStyleName());
       }
     }
@@ -499,8 +501,8 @@ Blockly.Mutator.reconnect = function(connectionChild, block, inputName) {
   if (!connectionChild || !connectionChild.getSourceBlock().workspace) {
     return false;  // No connection or block has been deleted.
   }
-  var connectionParent = block.getInput(inputName).connection;
-  var currentParent = connectionChild.targetBlock();
+  const connectionParent = block.getInput(inputName).connection;
+  const currentParent = connectionChild.targetBlock();
   if ((!currentParent || currentParent == block) &&
       connectionParent.targetConnection != connectionChild) {
     if (connectionParent.isConnected()) {
@@ -521,9 +523,9 @@ Blockly.Mutator.reconnect = function(connectionChild, block, inputName) {
  * @public
  */
 Blockly.Mutator.findParentWs = function(workspace) {
-  var outerWs = null;
+  let outerWs = null;
   if (workspace && workspace.options) {
-    var parent = workspace.options.parentWorkspace;
+    const parent = workspace.options.parentWorkspace;
     // If we were in a flyout in a mutator, need to go up two levels to find
     // the actual parent.
     if (workspace.isFlyout) {

From e843a68b4117c4d96d497d22b43ed31f80007604 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 14:43:32 -0700
Subject: [PATCH 312/833] Migrate core/mutator.js to goog.module

---
 core/mutator.js | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/core/mutator.js b/core/mutator.js
index 3a87e2035..5f1c4cfab 100644
--- a/core/mutator.js
+++ b/core/mutator.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Mutator');
+goog.module('Blockly.Mutator');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Bubble');
 goog.require('Blockly.Events');
@@ -45,37 +46,37 @@ goog.requireType('Blockly.Workspace');
  * @extends {Blockly.Icon}
  * @constructor
  */
-Blockly.Mutator = function(quarkNames) {
-  Blockly.Mutator.superClass_.constructor.call(this, null);
+const Mutator = function(quarkNames) {
+  Mutator.superClass_.constructor.call(this, null);
   this.quarkNames_ = quarkNames;
 };
-Blockly.utils.object.inherits(Blockly.Mutator, Blockly.Icon);
+Blockly.utils.object.inherits(Mutator, Blockly.Icon);
 
 /**
  * Workspace in the mutator's bubble.
  * @type {?Blockly.WorkspaceSvg}
  * @private
  */
-Blockly.Mutator.prototype.workspace_ = null;
+Mutator.prototype.workspace_ = null;
 
 /**
  * Width of workspace.
  * @private
  */
-Blockly.Mutator.prototype.workspaceWidth_ = 0;
+Mutator.prototype.workspaceWidth_ = 0;
 
 /**
  * Height of workspace.
  * @private
  */
-Blockly.Mutator.prototype.workspaceHeight_ = 0;
+Mutator.prototype.workspaceHeight_ = 0;
 
 /**
  * Set the block this mutator is associated with.
  * @param {!Blockly.BlockSvg} block The block associated with this mutator.
  * @package
  */
-Blockly.Mutator.prototype.setBlock = function(block) {
+Mutator.prototype.setBlock = function(block) {
   this.block_ = block;
 };
 
@@ -85,7 +86,7 @@ Blockly.Mutator.prototype.setBlock = function(block) {
  *     bubble or null if the mutator isn't open.
  * @package
  */
-Blockly.Mutator.prototype.getWorkspace = function() {
+Mutator.prototype.getWorkspace = function() {
   return this.workspace_;
 };
 
@@ -94,7 +95,7 @@ Blockly.Mutator.prototype.getWorkspace = function() {
  * @param {!Element} group The icon group.
  * @protected
  */
-Blockly.Mutator.prototype.drawIcon_ = function(group) {
+Mutator.prototype.drawIcon_ = function(group) {
   // Square with rounded corners.
   Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.RECT,
@@ -139,7 +140,7 @@ Blockly.Mutator.prototype.drawIcon_ = function(group) {
  * @protected
  * @override
  */
-Blockly.Mutator.prototype.iconClick_ = function(e) {
+Mutator.prototype.iconClick_ = function(e) {
   if (this.block_.isEditable()) {
     Blockly.Icon.prototype.iconClick_.call(this, e);
   }
@@ -150,7 +151,7 @@ Blockly.Mutator.prototype.iconClick_ = function(e) {
  * @return {!SVGElement} The top-level node of the editor.
  * @private
  */
-Blockly.Mutator.prototype.createEditor_ = function() {
+Mutator.prototype.createEditor_ = function() {
   /* Create the editor.  Here's the markup that will be generated:
   <svg>
     [Workspace]
@@ -219,8 +220,8 @@ Blockly.Mutator.prototype.createEditor_ = function() {
 /**
  * Add or remove the UI indicating if this icon may be clicked or not.
  */
-Blockly.Mutator.prototype.updateEditable = function() {
-  Blockly.Mutator.superClass_.updateEditable.call(this);
+Mutator.prototype.updateEditable = function() {
+  Mutator.superClass_.updateEditable.call(this);
   if (!this.block_.isInFlyout) {
     if (this.block_.isEditable()) {
       if (this.iconGroup_) {
@@ -244,7 +245,7 @@ Blockly.Mutator.prototype.updateEditable = function() {
  * Resize the bubble to match the size of the workspace.
  * @private
  */
-Blockly.Mutator.prototype.resizeBubble_ = function() {
+Mutator.prototype.resizeBubble_ = function() {
   const doubleBorderWidth = 2 * Blockly.Bubble.BORDER_WIDTH;
   const workspaceSize = this.workspace_.getCanvas().getBBox();
   let width = workspaceSize.width + workspaceSize.x;
@@ -287,7 +288,7 @@ Blockly.Mutator.prototype.resizeBubble_ = function() {
  * A method handler for when the bubble is moved.
  * @private
  */
-Blockly.Mutator.prototype.onBubbleMove_ = function() {
+Mutator.prototype.onBubbleMove_ = function() {
   if (this.workspace_) {
     this.workspace_.recordDragTargets();
   }
@@ -297,7 +298,7 @@ Blockly.Mutator.prototype.onBubbleMove_ = function() {
  * Show or hide the mutator bubble.
  * @param {boolean} visible True if the bubble should be visible.
  */
-Blockly.Mutator.prototype.setVisible = function(visible) {
+Mutator.prototype.setVisible = function(visible) {
   if (visible == this.isVisible()) {
     // No change.
     return;
@@ -380,7 +381,7 @@ Blockly.Mutator.prototype.setVisible = function(visible) {
  * @param {!Blockly.Events.Abstract} e Custom data for event.
  * @private
  */
-Blockly.Mutator.prototype.workspaceChanged_ = function(e) {
+Mutator.prototype.workspaceChanged_ = function(e) {
   if (e.isUiEvent ||
       (e.type == Blockly.Events.CHANGE && e.element == 'disabled')) {
     return;
@@ -462,7 +463,7 @@ Blockly.Mutator.prototype.workspaceChanged_ = function(e) {
 /**
  * Dispose of this mutator.
  */
-Blockly.Mutator.prototype.dispose = function() {
+Mutator.prototype.dispose = function() {
   this.block_.mutator = null;
   Blockly.Icon.prototype.dispose.call(this);
 };
@@ -471,7 +472,7 @@ Blockly.Mutator.prototype.dispose = function() {
  * Update the styles on all blocks in the mutator.
  * @public
  */
-Blockly.Mutator.prototype.updateBlockStyle = function() {
+Mutator.prototype.updateBlockStyle = function() {
   const ws = this.workspace_;
 
   if (ws && ws.getAllBlocks(false)) {
@@ -497,7 +498,7 @@ Blockly.Mutator.prototype.updateBlockStyle = function() {
  * @param {string} inputName Name of input on parent block.
  * @return {boolean} True iff a reconnection was made, false otherwise.
  */
-Blockly.Mutator.reconnect = function(connectionChild, block, inputName) {
+Mutator.reconnect = function(connectionChild, block, inputName) {
   if (!connectionChild || !connectionChild.getSourceBlock().workspace) {
     return false;  // No connection or block has been deleted.
   }
@@ -522,7 +523,7 @@ Blockly.Mutator.reconnect = function(connectionChild, block, inputName) {
  * @return {?Blockly.Workspace} The mutator's parent workspace or null.
  * @public
  */
-Blockly.Mutator.findParentWs = function(workspace) {
+Mutator.findParentWs = function(workspace) {
   let outerWs = null;
   if (workspace && workspace.options) {
     const parent = workspace.options.parentWorkspace;
@@ -538,3 +539,5 @@ Blockly.Mutator.findParentWs = function(workspace) {
   }
   return outerWs;
 };
+
+exports = Mutator;

From 82c1d8c47ad70327dde017dfd1a13142109e679a Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 23 Jul 2021 14:48:55 -0700
Subject: [PATCH 313/833] Migrate core/renderers/common/constants.js named
 requires

---
 core/renderers/common/constants.js | 207 ++++++++++++++---------------
 1 file changed, 103 insertions(+), 104 deletions(-)

diff --git a/core/renderers/common/constants.js b/core/renderers/common/constants.js
index 071b21e7d..4f64223d7 100644
--- a/core/renderers/common/constants.js
+++ b/core/renderers/common/constants.js
@@ -13,17 +13,17 @@
 goog.module('Blockly.blockRendering.ConstantProvider');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.connectionTypes');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.colour');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.svgPaths');
-goog.require('Blockly.utils.userAgent');
-
-goog.requireType('Blockly.blockRendering.Debug');
-goog.requireType('Blockly.RenderedConnection');
-goog.requireType('Blockly.Theme');
+/* 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 */
+const Theme = goog.requireType('Blockly.Theme');
+const colour = goog.require('Blockly.utils.colour');
+const connectionTypes = goog.require('Blockly.connectionTypes');
+const dom = goog.require('Blockly.utils.dom');
+const svgPaths = goog.require('Blockly.utils.svgPaths');
+const userAgent = goog.require('Blockly.utils.userAgent');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -223,7 +223,7 @@ const ConstantProvider = function() {
    */
   this.EMPTY_STATEMENT_INPUT_HEIGHT = this.MIN_BLOCK_HEIGHT;
 
-  this.START_POINT = Blockly.utils.svgPaths.moveBy(0, 0);
+  this.START_POINT = svgPaths.moveBy(0, 0);
 
   /**
    * Height of SVG path for jagged teeth at the end of collapsed blocks.
@@ -305,7 +305,7 @@ const ConstantProvider = function() {
    * @type {boolean}
    */
   this.FIELD_TEXT_BASELINE_CENTER =
-      !Blockly.utils.userAgent.IE && !Blockly.utils.userAgent.EDGE;
+      !userAgent.IE && !userAgent.EDGE;
 
   /**
    * A dropdown field's border rect height.
@@ -586,7 +586,7 @@ ConstantProvider.prototype.init = function() {
 
 /**
  * Refresh constants properties that depend on the theme.
- * @param {!Blockly.Theme} theme The current workspace theme.
+ * @param {!Theme} theme The current workspace theme.
  * @package
  */
 ConstantProvider.prototype.setTheme = function(
@@ -594,7 +594,7 @@ ConstantProvider.prototype.setTheme = function(
 
   /**
    * The block styles map.
-   * @type {Object<string, !Blockly.Theme.BlockStyle>}
+   * @type {Object<string, !Theme.BlockStyle>}
    * @package
    */
   this.blockStyles = Object.create(null);
@@ -609,7 +609,7 @@ ConstantProvider.prototype.setTheme = function(
 
 /**
  * Sets dynamic properties that depend on other values or theme properties.
- * @param {!Blockly.Theme} theme The current workspace theme.
+ * @param {!Theme} theme The current workspace theme.
  * @protected
  */
 ConstantProvider.prototype.setDynamicProperties_ =
@@ -624,7 +624,7 @@ ConstantProvider.prototype.setDynamicProperties_ =
 
 /**
  * Set constants related to fonts.
- * @param {!Blockly.Theme} theme The current workspace theme.
+ * @param {!Theme} theme The current workspace theme.
  * @protected
  */
 ConstantProvider.prototype.setFontConstants_ = function(
@@ -639,7 +639,7 @@ ConstantProvider.prototype.setFontConstants_ = function(
       theme.fontStyle && theme.fontStyle['size'] != undefined ?
       theme.fontStyle['size'] : this.FIELD_TEXT_FONTSIZE;
 
-  var fontMetrics = Blockly.utils.dom.measureFontMetrics('Hg',
+  var fontMetrics = dom.measureFontMetrics('Hg',
       this.FIELD_TEXT_FONTSIZE + 'pt',
       this.FIELD_TEXT_FONTWEIGHT,
       this.FIELD_TEXT_FONTFAMILY);
@@ -650,7 +650,7 @@ ConstantProvider.prototype.setFontConstants_ = function(
 
 /**
  * Set constants from a theme's component styles.
- * @param {!Blockly.Theme} theme The current workspace theme.
+ * @param {!Theme} theme The current workspace theme.
  * @protected
  */
 ConstantProvider.prototype.setComponentConstants_ =
@@ -672,7 +672,7 @@ ConstantProvider.prototype.setComponentConstants_ =
  * Get or create a block style based on a single colour value.  Generate a name
  * for the style based on the colour.
  * @param {string} colour #RRGGBB colour string.
- * @return {{style: !Blockly.Theme.BlockStyle, name: string}} An object
+ * @return {{style: !Theme.BlockStyle, name: string}} An object
  *     containing the style and an autogenerated name for that style.
  * @package
  */
@@ -689,7 +689,7 @@ ConstantProvider.prototype.getBlockStyleForColour =
 /**
  * Gets the BlockStyle for the given block style name.
  * @param {?string} blockStyleName The name of the block style.
- * @return {!Blockly.Theme.BlockStyle} The named block style, or a default style
+ * @return {!Theme.BlockStyle} The named block style, or a default style
  *     if no style with the given name was found.
  */
 ConstantProvider.prototype.getBlockStyle = function(
@@ -703,7 +703,7 @@ ConstantProvider.prototype.getBlockStyle = function(
 /**
  * Create a block style object based on the given colour.
  * @param {string} colour #RRGGBB colour string.
- * @return {!Blockly.Theme.BlockStyle} A populated block style based on the
+ * @return {!Theme.BlockStyle} A populated block style based on the
  *     given colour.
  * @protected
  */
@@ -724,7 +724,7 @@ ConstantProvider.prototype.createBlockStyle_ = function(
  *     hat:(string|undefined)
  * }} blockStyle A full or partial block style object.
 
- * @return {!Blockly.Theme.BlockStyle} A full block style object, with all
+ * @return {!Theme.BlockStyle} A full block style object, with all
  *     required properties populated.
  * @protected
  */
@@ -732,19 +732,19 @@ ConstantProvider.prototype.validatedBlockStyle_ =
     function(blockStyle) {
     /* eslint-disable indent */
   // Make a new object with all of the same properties.
-  var valid = /** @type {!Blockly.Theme.BlockStyle} */ ({});
+  var valid = /** @type {!Theme.BlockStyle} */ ({});
   if (blockStyle) {
-    Blockly.utils.object.mixin(valid, blockStyle);
+    utils.object.mixin(valid, blockStyle);
   }
   // Validate required properties.
-  var parsedColour = Blockly.utils.parseBlockColour(
+  var parsedColour = utils.parseBlockColour(
       valid['colourPrimary'] || '#000');
   valid.colourPrimary = parsedColour.hex;
   valid.colourSecondary = valid['colourSecondary'] ?
-      Blockly.utils.parseBlockColour(valid['colourSecondary']).hex :
+      utils.parseBlockColour(valid['colourSecondary']).hex :
       this.generateSecondaryColour_(valid.colourPrimary);
   valid.colourTertiary = valid['colourTertiary'] ?
-      Blockly.utils.parseBlockColour(valid['colourTertiary']).hex :
+      utils.parseBlockColour(valid['colourTertiary']).hex :
       this.generateTertiaryColour_(valid.colourPrimary);
 
   valid.hat = valid['hat'] || '';
@@ -758,9 +758,9 @@ ConstantProvider.prototype.validatedBlockStyle_ =
  * @protected
  */
 ConstantProvider.prototype.generateSecondaryColour_ =
-    function(colour) {
+    function(inputColour) {
     /* eslint-disable indent */
-  return Blockly.utils.colour.blend('#fff', colour, 0.6) || colour;
+    return colour.blend('#fff', inputColour, 0.6) || inputColour;
 }; /* eslint-enable indent */
 
 /**
@@ -769,10 +769,9 @@ ConstantProvider.prototype.generateSecondaryColour_ =
  * @return {string} The generated tertiary colour.
  * @protected
  */
-ConstantProvider.prototype.generateTertiaryColour_ =
-    function(colour) {
-    /* eslint-disable indent */
-  return Blockly.utils.colour.blend('#fff', colour, 0.3) || colour;
+ConstantProvider.prototype.generateTertiaryColour_ = function(inputColour) {
+  /* eslint-disable indent */
+  return colour.blend('#fff', inputColour, 0.3) || inputColour;
 }; /* eslint-enable indent */
 
 
@@ -783,13 +782,13 @@ ConstantProvider.prototype.generateTertiaryColour_ =
  */
 ConstantProvider.prototype.dispose = function() {
   if (this.embossFilter_) {
-    Blockly.utils.dom.removeNode(this.embossFilter_);
+    dom.removeNode(this.embossFilter_);
   }
   if (this.disabledPattern_) {
-    Blockly.utils.dom.removeNode(this.disabledPattern_);
+    dom.removeNode(this.disabledPattern_);
   }
   if (this.debugFilter_) {
-    Blockly.utils.dom.removeNode(this.debugFilter_);
+    dom.removeNode(this.debugFilter_);
   }
   this.cssNode_ = null;
 };
@@ -804,11 +803,11 @@ ConstantProvider.prototype.makeJaggedTeeth = function() {
   var width = this.JAGGED_TEETH_WIDTH;
 
   var mainPath =
-      Blockly.utils.svgPaths.line(
+      svgPaths.line(
           [
-            Blockly.utils.svgPaths.point(width, height / 4),
-            Blockly.utils.svgPaths.point(-width * 2, height / 2),
-            Blockly.utils.svgPaths.point(width, height / 4)
+            svgPaths.point(width, height / 4),
+            svgPaths.point(-width * 2, height / 2),
+            svgPaths.point(width, height / 4)
           ]);
   return {
     height: height,
@@ -827,11 +826,11 @@ ConstantProvider.prototype.makeStartHat = function() {
   var width = this.START_HAT_WIDTH;
 
   var mainPath =
-      Blockly.utils.svgPaths.curve('c',
+      svgPaths.curve('c',
           [
-            Blockly.utils.svgPaths.point(30, -height),
-            Blockly.utils.svgPaths.point(70, -height),
-            Blockly.utils.svgPaths.point(width, 0)
+            svgPaths.point(30, -height),
+            svgPaths.point(70, -height),
+            svgPaths.point(width, 0)
           ]);
   return {
     height: height,
@@ -864,18 +863,18 @@ ConstantProvider.prototype.makePuzzleTab = function() {
     var control2Y = halfHeight + 0.5;
     var control3Y = overlap;  // 2.5
 
-    var endPoint1 = Blockly.utils.svgPaths.point(-width, forward * halfHeight);
-    var endPoint2 = Blockly.utils.svgPaths.point(width, forward * halfHeight);
+    var endPoint1 = svgPaths.point(-width, forward * halfHeight);
+    var endPoint2 = svgPaths.point(width, forward * halfHeight);
 
-    return Blockly.utils.svgPaths.curve('c',
+    return svgPaths.curve('c',
         [
-          Blockly.utils.svgPaths.point(0, forward * control1Y),
-          Blockly.utils.svgPaths.point(-width, back * control2Y),
+          svgPaths.point(0, forward * control1Y),
+          svgPaths.point(-width, back * control2Y),
           endPoint1
         ]) +
-        Blockly.utils.svgPaths.curve('s',
+        svgPaths.curve('s',
             [
-              Blockly.utils.svgPaths.point(width, back * control3Y),
+              svgPaths.point(width, back * control3Y),
               endPoint2
             ]);
   }
@@ -905,11 +904,11 @@ ConstantProvider.prototype.makeNotch = function() {
   var innerWidth = 3;
   var outerWidth = (width - innerWidth) / 2;
   function makeMainPath(dir) {
-    return Blockly.utils.svgPaths.line(
+    return svgPaths.line(
         [
-          Blockly.utils.svgPaths.point(dir * outerWidth, height),
-          Blockly.utils.svgPaths.point(dir * innerWidth, 0),
-          Blockly.utils.svgPaths.point(dir * outerWidth, -height)
+          svgPaths.point(dir * outerWidth, height),
+          svgPaths.point(dir * innerWidth, 0),
+          svgPaths.point(dir * outerWidth, -height)
         ]);
   }
   var pathLeft = makeMainPath(1);
@@ -932,11 +931,11 @@ ConstantProvider.prototype.makeNotch = function() {
 ConstantProvider.prototype.makeInsideCorners = function() {
   var radius = this.CORNER_RADIUS;
 
-  var innerTopLeftCorner = Blockly.utils.svgPaths.arc('a', '0 0,0', radius,
-      Blockly.utils.svgPaths.point(-radius, radius));
+  var innerTopLeftCorner = svgPaths.arc('a', '0 0,0', radius,
+      svgPaths.point(-radius, radius));
 
-  var innerBottomLeftCorner = Blockly.utils.svgPaths.arc('a', '0 0,0', radius,
-      Blockly.utils.svgPaths.point(radius, radius));
+  var innerBottomLeftCorner = svgPaths.arc('a', '0 0,0', radius,
+      svgPaths.point(radius, radius));
 
   return {
     width: radius,
@@ -958,31 +957,31 @@ ConstantProvider.prototype.makeOutsideCorners = function() {
    * @const
    */
   var topLeft =
-      Blockly.utils.svgPaths.moveBy(0, radius) +
-      Blockly.utils.svgPaths.arc('a', '0 0,1', radius,
-          Blockly.utils.svgPaths.point(radius, -radius));
+      svgPaths.moveBy(0, radius) +
+      svgPaths.arc('a', '0 0,1', radius,
+          svgPaths.point(radius, -radius));
 
   /**
    * SVG path for drawing the rounded top-right corner.
    * @const
    */
   var topRight =
-      Blockly.utils.svgPaths.arc('a', '0 0,1', radius,
-          Blockly.utils.svgPaths.point(radius, radius));
+      svgPaths.arc('a', '0 0,1', radius,
+          svgPaths.point(radius, radius));
 
   /**
    * SVG path for drawing the rounded bottom-left corner.
    * @const
    */
-  var bottomLeft = Blockly.utils.svgPaths.arc('a', '0 0,1', radius,
-      Blockly.utils.svgPaths.point(-radius, -radius));
+  var bottomLeft = svgPaths.arc('a', '0 0,1', radius,
+      svgPaths.point(-radius, -radius));
 
   /**
    * SVG path for drawing the rounded bottom-right corner.
    * @const
    */
-  var bottomRight = Blockly.utils.svgPaths.arc('a', '0 0,1', radius,
-      Blockly.utils.svgPaths.point(-radius, radius));
+  var bottomRight = svgPaths.arc('a', '0 0,1', radius,
+      svgPaths.point(-radius, radius));
 
   return {
     topLeft: topLeft,
@@ -996,7 +995,7 @@ ConstantProvider.prototype.makeOutsideCorners = function() {
 /**
  * Get an object with connection shape and sizing information based on the type
  * of the connection.
- * @param {!Blockly.RenderedConnection} connection The connection to find a
+ * @param {!RenderedConnection} connection The connection to find a
  *     shape object for
  * @return {!Object} The shape object for the connection.
  * @package
@@ -1004,11 +1003,11 @@ ConstantProvider.prototype.makeOutsideCorners = function() {
 ConstantProvider.prototype.shapeFor = function(
     connection) {
   switch (connection.type) {
-    case Blockly.connectionTypes.INPUT_VALUE:
-    case Blockly.connectionTypes.OUTPUT_VALUE:
+    case connectionTypes.INPUT_VALUE:
+    case connectionTypes.OUTPUT_VALUE:
       return this.PUZZLE_TAB;
-    case Blockly.connectionTypes.PREVIOUS_STATEMENT:
-    case Blockly.connectionTypes.NEXT_STATEMENT:
+    case connectionTypes.PREVIOUS_STATEMENT:
+    case connectionTypes.NEXT_STATEMENT:
       return this.NOTCH;
     default:
       throw Error('Unknown connection type');
@@ -1032,8 +1031,8 @@ ConstantProvider.prototype.createDom = function(svg,
     ... filters go here ...
   </defs>
   */
-  this.defs = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.DEFS, {}, svg);
+  this.defs = dom.createSvgElement(
+      Svg.DEFS, {}, svg);
   /*
     <filter id="blocklyEmbossFilter837493">
       <feGaussianBlur in="SourceAlpha" stdDeviation="1" result="blur" />
@@ -1048,14 +1047,14 @@ ConstantProvider.prototype.createDom = function(svg,
                    k1="0" k2="1" k3="1" k4="0" />
     </filter>
   */
-  var embossFilter = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FILTER,
+  var embossFilter = dom.createSvgElement(
+      Svg.FILTER,
       {'id': 'blocklyEmbossFilter' + this.randomIdentifier}, this.defs);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FEGAUSSIANBLUR,
+  dom.createSvgElement(
+      Svg.FEGAUSSIANBLUR,
       {'in': 'SourceAlpha', 'stdDeviation': 1, 'result': 'blur'}, embossFilter);
-  var feSpecularLighting = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FESPECULARLIGHTING,
+  var feSpecularLighting = dom.createSvgElement(
+      Svg.FESPECULARLIGHTING,
       {
         'in': 'blur',
         'surfaceScale': 1,
@@ -1065,19 +1064,19 @@ ConstantProvider.prototype.createDom = function(svg,
         'result': 'specOut'
       },
       embossFilter);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FEPOINTLIGHT,
+  dom.createSvgElement(
+      Svg.FEPOINTLIGHT,
       {'x': -5000, 'y': -10000, 'z': 20000}, feSpecularLighting);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FECOMPOSITE,
+  dom.createSvgElement(
+      Svg.FECOMPOSITE,
       {
         'in': 'specOut',
         'in2': 'SourceAlpha',
         'operator': 'in',
         'result': 'specOut'
       }, embossFilter);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FECOMPOSITE,
+  dom.createSvgElement(
+      Svg.FECOMPOSITE,
       {
         'in': 'SourceGraphic',
         'in2': 'specOut',
@@ -1097,19 +1096,19 @@ ConstantProvider.prototype.createDom = function(svg,
       <path d="M 0 0 L 10 10 M 10 0 L 0 10" stroke="#cc0" />
     </pattern>
   */
-  var disabledPattern = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATTERN,
+  var disabledPattern = dom.createSvgElement(
+      Svg.PATTERN,
       {
         'id': 'blocklyDisabledPattern' + this.randomIdentifier,
         'patternUnits': 'userSpaceOnUse',
         'width': 10,
         'height': 10
       }, this.defs);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  dom.createSvgElement(
+      Svg.RECT,
       {'width': 10, 'height': 10, 'fill': '#aaa'}, disabledPattern);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
+  dom.createSvgElement(
+      Svg.PATH,
       {'d': 'M 0 0 L 10 10 M 10 0 L 0 10', 'stroke': '#cc0'}, disabledPattern);
   this.disabledPatternId = disabledPattern.id;
   this.disabledPattern_ = disabledPattern;
@@ -1126,8 +1125,8 @@ ConstantProvider.prototype.createDebugFilter =
     function() {
   // Only create the debug filter once.
   if (!this.debugFilter_) {
-    var debugFilter = Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.FILTER, {
+    var debugFilter = dom.createSvgElement(
+        Svg.FILTER, {
           'id': 'blocklyDebugFilter' + this.randomIdentifier,
           'height': '160%',
           'width': '180%',
@@ -1136,20 +1135,20 @@ ConstantProvider.prototype.createDebugFilter =
         },
         this.defs);
     // Set all gaussian blur pixels to 1 opacity before applying flood
-    var debugComponentTransfer = Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.FECOMPONENTTRANSFER, {'result': 'outBlur'},
+    var debugComponentTransfer = dom.createSvgElement(
+        Svg.FECOMPONENTTRANSFER, {'result': 'outBlur'},
         debugFilter);
-    Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.FEFUNCA,
+    dom.createSvgElement(
+        Svg.FEFUNCA,
         {'type': 'table', 'tableValues': '0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1'},
         debugComponentTransfer);
     // Color the highlight
-    Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.FEFLOOD,
+    dom.createSvgElement(
+        Svg.FEFLOOD,
         {'flood-color': '#ff0000', 'flood-opacity': 0.5, 'result': 'outColor'},
         debugFilter);
-    Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.FECOMPOSITE, {
+    dom.createSvgElement(
+        Svg.FECOMPOSITE, {
           'in': 'outColor',
           'in2': 'outBlur',
           'operator': 'in',

From 96ec93f91e9f2e46295e70cd72dd712c2921afb8 Mon Sep 17 00:00:00 2001
From: Monica Kozbial <6621618+moniika@users.noreply.github.com>
Date: Fri, 23 Jul 2021 14:52:42 -0700
Subject: [PATCH 314/833] Remove deconstructing properties and update logic
 (#5202)

---
 scripts/goog_module/convert-file.sh | 47 +++++++++--------------------
 1 file changed, 14 insertions(+), 33 deletions(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index 8b6bdfc6f..f3138e9cf 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -163,6 +163,11 @@ step3() {
       continue
     fi
 
+    local require_name=$(echo "${require}" | perl -pe 's/(\w+\.)+(\w+)/\2/g')
+    inf "Updating require declaration for ${require}..."
+    perl -pi -e 's/^(goog\.(require|requireType)\('\'"${require}"\''\);)/const '"${require_name}"' = \1/' "${filepath}"
+
+    # Parse property access of module
     local direct_access_count=$(perl -nle'print $& while m{'"${require}"'[^\.'\'']}g' "${filepath}" | wc -l)
     local properties_accessed=$(perl -nle'print $& while m{(?<='"${require}"'\.)(?!prototype)\w+}g' "${filepath}" | tr ' ' '\n' | sort -u)
     # Detect requires overlap
@@ -181,42 +186,18 @@ step3() {
     fi
     properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/\s+/ /g' | xargs)
 
-    if [[ "${direct_access_count}" -eq "0" && -n "${properties_accessed}" ]]; then
-      local deconstructed_comma=$(echo "${properties_accessed}" | perl -pe 's/\s+/, /g' | perl -pe 's/, $//')
-      local confirm=''
-      while true; do
-        read -p "Would you like to deconstruct ${require} into \"{${deconstructed_comma}}\"? (y/n): " yn </dev/tty
-        case $yn in
-          [Yy]* )
-            confirm='true'
-            break
-            ;;
-          [Nn]* )
-            confirm='false'
-            break
-            ;;
-          * ) reenter_instructions "Please type y or n \"${yn}\"";;
-        esac
+    if [[ -n "${properties_accessed}" ]]; then
+      local comma_properties=$(echo "${properties_accessed}" | perl -pe 's/\s+/, /g' | perl -pe 's/, $//')
+      inf "Detected references of ${require}: ${comma_properties}"
+
+      for require_prop in echo "${properties_accessed}"; do
+        inf "Updating references of ${require}.${require_prop} to ${require_name}.${require_prop}..."
+        perl -pi -e 's/'"${require}"'\.'"${require_prop}"'([^'\''\w])/'"${require_name}"'\.'"${require_prop}"'\1/g' "${filepath}"
       done
-
-      if [[ "${confirm}" == 'true' ]]; then
-        inf "Deconstructing ${require} into \"{${deconstructed_comma}}\"..."
-        perl -pi -e 's/^(goog\.(require|requireType)\('\'"${require}"\''\);)/const \{'"${deconstructed_comma}"'\} = \1/' "${filepath}"
-
-        for require_prop in $(echo "${properties_accessed}"); do
-          inf "Updating references of ${require}.${require_prop} to ${require_prop}..."
-          perl -pi -e 's/'"${require}"'\.'"${require_prop}"'([^'\''\w])/'"${require_prop}"'\1/g' "${filepath}"
-        done
-        continue
-      fi
     fi
 
-    local require_name=$(echo "${require}" | perl -pe 's/(\w+\.)+(\w+)/\2/g')
-    inf "Updating require declaration for ${require}..."
-    perl -pi -e 's/^(goog\.(require|requireType)\('\'"${require}"\''\);)/const '"${require_name}"' = \1/' "${filepath}"
-
-    inf "Updating references of ${require} to ${require_name}..."
-    perl -pi -e 's/'"${require}"'([^'\''\w])/'"${require_name}"'\1/g' "${filepath}"
+    inf "Updating direct references of ${require} to ${require_name}..."
+    perl -pi -e 's/'"${require}"'([^'\''\w]\.)/'"${require_name}"'\1/g' "${filepath}"
   done
 
   local missing_requires=$(perl -nle'print $& while m{(?<!'\'')Blockly(\.\w+)+}g' "${filepath}")

From 949d3f3593d19b8fdca6d8abf8a2cb4ef976c13e Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 14:59:16 -0700
Subject: [PATCH 315/833] Migrate core/mutator.js to named requires

---
 core/mutator.js | 142 +++++++++++++++++++++++++-----------------------
 tests/deps.js   |   2 +-
 2 files changed, 75 insertions(+), 69 deletions(-)

diff --git a/core/mutator.js b/core/mutator.js
index 5f1c4cfab..ca8475cdf 100644
--- a/core/mutator.js
+++ b/core/mutator.js
@@ -14,47 +14,53 @@
 goog.module('Blockly.Mutator');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Bubble');
-goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Abstract = goog.requireType('Blockly.Events.Abstract');
+/* 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 Blockly = goog.requireType('Blockly');
+const Bubble = goog.require('Blockly.Bubble');
+/* eslint-disable-next-line no-unused-vars */
+const Connection = goog.requireType('Blockly.Connection');
+/* eslint-disable-next-line no-unused-vars */
+const Coordinate = goog.requireType('Blockly.utils.Coordinate');
+const Events = goog.require('Blockly.Events');
+const Icon = goog.require('Blockly.Icon');
+const Options = goog.require('Blockly.Options');
+const Svg = goog.require('Blockly.utils.Svg');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+const WorkspaceSvg = goog.require('Blockly.WorkspaceSvg');
+const Xml = goog.require('Blockly.Xml');
+const dom = goog.require('Blockly.utils.dom');
+const internalConstants = goog.require('Blockly.internalConstants');
+const object = goog.require('Blockly.utils.object');
+const toolbox = goog.require('Blockly.utils.toolbox');
+const xml = goog.require('Blockly.utils.xml');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BubbleOpen');
-goog.require('Blockly.Icon');
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.Options');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.toolbox');
-goog.require('Blockly.utils.xml');
-goog.require('Blockly.WorkspaceSvg');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.Connection');
-goog.requireType('Blockly.Events.Abstract');
-goog.requireType('Blockly.utils.Coordinate');
-goog.requireType('Blockly.Workspace');
 
 
 /**
  * Class for a mutator dialog.
  * @param {!Array<string>} quarkNames List of names of sub-blocks for flyout.
- * @extends {Blockly.Icon}
+ * @extends {Icon}
  * @constructor
  */
 const Mutator = function(quarkNames) {
   Mutator.superClass_.constructor.call(this, null);
   this.quarkNames_ = quarkNames;
 };
-Blockly.utils.object.inherits(Mutator, Blockly.Icon);
+object.inherits(Mutator, Icon);
 
 /**
  * Workspace in the mutator's bubble.
- * @type {?Blockly.WorkspaceSvg}
+ * @type {?WorkspaceSvg}
  * @private
  */
 Mutator.prototype.workspace_ = null;
@@ -73,7 +79,7 @@ Mutator.prototype.workspaceHeight_ = 0;
 
 /**
  * Set the block this mutator is associated with.
- * @param {!Blockly.BlockSvg} block The block associated with this mutator.
+ * @param {!BlockSvg} block The block associated with this mutator.
  * @package
  */
 Mutator.prototype.setBlock = function(block) {
@@ -82,7 +88,7 @@ Mutator.prototype.setBlock = function(block) {
 
 /**
  * Returns the workspace inside this mutator icon's bubble.
- * @return {?Blockly.WorkspaceSvg} The workspace inside this mutator icon's
+ * @return {?WorkspaceSvg} The workspace inside this mutator icon's
  *     bubble or null if the mutator isn't open.
  * @package
  */
@@ -97,8 +103,8 @@ Mutator.prototype.getWorkspace = function() {
  */
 Mutator.prototype.drawIcon_ = function(group) {
   // Square with rounded corners.
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  dom.createSvgElement(
+      Svg.RECT,
       {
         'class': 'blocklyIconShape',
         'rx': '4',
@@ -108,8 +114,8 @@ Mutator.prototype.drawIcon_ = function(group) {
       },
       group);
   // Gear teeth.
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
+  dom.createSvgElement(
+      Svg.PATH,
       {
         'class': 'blocklyIconSymbol',
         'd': 'm4.203,7.296 0,1.368 -0.92,0.677 -0.11,0.41 0.9,1.559 0.41,' +
@@ -122,8 +128,8 @@ Mutator.prototype.drawIcon_ = function(group) {
       },
       group);
   // Axle hole.
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.CIRCLE,
+  dom.createSvgElement(
+      Svg.CIRCLE,
       {
         'class': 'blocklyIconShape',
         'r': '2.7',
@@ -142,7 +148,7 @@ Mutator.prototype.drawIcon_ = function(group) {
  */
 Mutator.prototype.iconClick_ = function(e) {
   if (this.block_.isEditable()) {
-    Blockly.Icon.prototype.iconClick_.call(this, e);
+    Icon.prototype.iconClick_.call(this, e);
   }
 };
 
@@ -157,23 +163,23 @@ Mutator.prototype.createEditor_ = function() {
     [Workspace]
   </svg>
   */
-  this.svgDialog_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.SVG,
-      {'x': Blockly.Bubble.BORDER_WIDTH, 'y': Blockly.Bubble.BORDER_WIDTH},
+  this.svgDialog_ = dom.createSvgElement(
+      Svg.SVG,
+      {'x': Bubble.BORDER_WIDTH, 'y': Bubble.BORDER_WIDTH},
       null);
   // Convert the list of names into a list of XML objects for the flyout.
   let quarkXml;
   if (this.quarkNames_.length) {
-    quarkXml = Blockly.utils.xml.createElement('xml');
+    quarkXml = xml.createElement('xml');
     for (let i = 0, quarkName; (quarkName = this.quarkNames_[i]); i++) {
-      const element = Blockly.utils.xml.createElement('block');
+      const element = xml.createElement('block');
       element.setAttribute('type', quarkName);
       quarkXml.appendChild(element);
     }
   } else {
     quarkXml = null;
   }
-  const workspaceOptions = new Blockly.Options(
+  const workspaceOptions = new Options(
       /** @type {!Blockly.BlocklyOptions} */
       ({
         // If you want to enable disabling, also remove the
@@ -187,23 +193,23 @@ Mutator.prototype.createEditor_ = function() {
         'rendererOverrides': this.block_.workspace.options.rendererOverrides
       }));
   workspaceOptions.toolboxPosition = this.block_.RTL ?
-      Blockly.utils.toolbox.Position.RIGHT :
-      Blockly.utils.toolbox.Position.LEFT;
+      toolbox.Position.RIGHT :
+      toolbox.Position.LEFT;
   const hasFlyout = !!quarkXml;
   if (hasFlyout) {
     workspaceOptions.languageTree =
-        Blockly.utils.toolbox.convertToolboxDefToJson(quarkXml);
+        toolbox.convertToolboxDefToJson(quarkXml);
   }
-  this.workspace_ = new Blockly.WorkspaceSvg(workspaceOptions);
+  this.workspace_ = new WorkspaceSvg(workspaceOptions);
   this.workspace_.isMutator = true;
-  this.workspace_.addChangeListener(Blockly.Events.disableOrphans);
+  this.workspace_.addChangeListener(Events.disableOrphans);
 
   // Mutator flyouts go inside the mutator workspace's <g> rather than in
   // a top level SVG. Instead of handling scale themselves, mutators
   // inherit scale from the parent workspace.
   // To fix this, scale needs to be applied at a different level in the DOM.
   const flyoutSvg = hasFlyout ?
-      this.workspace_.addFlyout(Blockly.utils.Svg.G) : null;
+      this.workspace_.addFlyout(Svg.G) : null;
   const background = this.workspace_.createDom('blocklyMutatorBackground');
 
   if (flyoutSvg) {
@@ -225,7 +231,7 @@ Mutator.prototype.updateEditable = function() {
   if (!this.block_.isInFlyout) {
     if (this.block_.isEditable()) {
       if (this.iconGroup_) {
-        Blockly.utils.dom.removeClass(
+        dom.removeClass(
             /** @type {!Element} */ (this.iconGroup_),
             'blocklyIconGroupReadonly');
       }
@@ -233,7 +239,7 @@ Mutator.prototype.updateEditable = function() {
       // Close any mutator bubble.  Icon is not clickable.
       this.setVisible(false);
       if (this.iconGroup_) {
-        Blockly.utils.dom.addClass(
+        dom.addClass(
             /** @type {!Element} */ (this.iconGroup_),
             'blocklyIconGroupReadonly');
       }
@@ -246,7 +252,7 @@ Mutator.prototype.updateEditable = function() {
  * @private
  */
 Mutator.prototype.resizeBubble_ = function() {
-  const doubleBorderWidth = 2 * Blockly.Bubble.BORDER_WIDTH;
+  const doubleBorderWidth = 2 * Bubble.BORDER_WIDTH;
   const workspaceSize = this.workspace_.getCanvas().getBBox();
   let width = workspaceSize.width + workspaceSize.x;
   let height = workspaceSize.height + doubleBorderWidth * 3;
@@ -303,14 +309,14 @@ Mutator.prototype.setVisible = function(visible) {
     // No change.
     return;
   }
-  Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BUBBLE_OPEN))(
+  Events.fire(new (Events.get(Events.BUBBLE_OPEN))(
       this.block_, visible, 'mutator'));
   if (visible) {
     // Create the bubble.
-    this.bubble_ = new Blockly.Bubble(
-        /** @type {!Blockly.WorkspaceSvg} */ (this.block_.workspace),
+    this.bubble_ = new Bubble(
+        /** @type {!WorkspaceSvg} */ (this.block_.workspace),
         this.createEditor_(), this.block_.pathObject.svgPath,
-        /** @type {!Blockly.utils.Coordinate} */ (this.iconXY_), null, null);
+        /** @type {!Coordinate} */ (this.iconXY_), null, null);
     // Expose this mutator's block's ID on its top-level SVG group.
     this.bubble_.setSvgId(this.block_.id);
     this.bubble_.registerMoveEvent(this.onBubbleMove_.bind(this));
@@ -345,7 +351,7 @@ Mutator.prototype.setVisible = function(visible) {
     if (this.block_.saveConnections) {
       const thisMutator = this;
       const mutatorBlock =
-        /** @type {{saveConnections: function(!Blockly.Block)}} */ (
+        /** @type {{saveConnections: function(!Block)}} */ (
           this.block_);
       mutatorBlock.saveConnections(this.rootBlock_);
       this.sourceListener_ = function() {
@@ -378,12 +384,12 @@ Mutator.prototype.setVisible = function(visible) {
  * Update the source block when the mutator's blocks are changed.
  * Bump down any block that's too high.
  * Fired whenever a change is made to the mutator's workspace.
- * @param {!Blockly.Events.Abstract} e Custom data for event.
+ * @param {!Abstract} e Custom data for event.
  * @private
  */
 Mutator.prototype.workspaceChanged_ = function(e) {
   if (e.isUiEvent ||
-      (e.type == Blockly.Events.CHANGE && e.element == 'disabled')) {
+      (e.type == Events.CHANGE && e.element == 'disabled')) {
     return;
   }
 
@@ -416,10 +422,10 @@ Mutator.prototype.workspaceChanged_ = function(e) {
 
   // When the mutator's workspace changes, update the source block.
   if (this.rootBlock_.workspace == this.workspace_) {
-    Blockly.Events.setGroup(true);
+    Events.setGroup(true);
     const block = this.block_;
     const oldMutationDom = block.mutationToDom();
-    const oldMutation = oldMutationDom && Blockly.Xml.domToText(oldMutationDom);
+    const oldMutation = oldMutationDom && Xml.domToText(oldMutationDom);
 
     // Switch off rendering while the source block is rebuilt.
     const savedRendered = block.rendered;
@@ -438,17 +444,17 @@ Mutator.prototype.workspaceChanged_ = function(e) {
     }
 
     const newMutationDom = block.mutationToDom();
-    const newMutation = newMutationDom && Blockly.Xml.domToText(newMutationDom);
+    const newMutation = newMutationDom && Xml.domToText(newMutationDom);
     if (oldMutation != newMutation) {
-      Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CHANGE))(
+      Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
           block, 'mutation', null, oldMutation, newMutation));
       // Ensure that any bump is part of this mutation's event group.
-      const group = Blockly.Events.getGroup();
+      const group = Events.getGroup();
       setTimeout(function() {
-        Blockly.Events.setGroup(group);
+        Events.setGroup(group);
         block.bumpNeighbours();
-        Blockly.Events.setGroup(false);
-      }, Blockly.internalConstants.BUMP_DELAY);
+        Events.setGroup(false);
+      }, internalConstants.BUMP_DELAY);
     }
 
     // Don't update the bubble until the drag has ended, to avoid moving blocks
@@ -456,7 +462,7 @@ Mutator.prototype.workspaceChanged_ = function(e) {
     if (!this.workspace_.isDragging()) {
       this.resizeBubble_();
     }
-    Blockly.Events.setGroup(false);
+    Events.setGroup(false);
   }
 };
 
@@ -465,7 +471,7 @@ Mutator.prototype.workspaceChanged_ = function(e) {
  */
 Mutator.prototype.dispose = function() {
   this.block_.mutator = null;
-  Blockly.Icon.prototype.dispose.call(this);
+  Icon.prototype.dispose.call(this);
 };
 
 /**
@@ -493,8 +499,8 @@ Mutator.prototype.updateBlockStyle = function() {
 
 /**
  * Reconnect an block to a mutated input.
- * @param {Blockly.Connection} connectionChild Connection on child block.
- * @param {!Blockly.Block} block Parent block.
+ * @param {Connection} connectionChild Connection on child block.
+ * @param {!Block} block Parent block.
  * @param {string} inputName Name of input on parent block.
  * @return {boolean} True iff a reconnection was made, false otherwise.
  */
@@ -519,8 +525,8 @@ Mutator.reconnect = function(connectionChild, block, inputName) {
 /**
  * Get the parent workspace of a workspace that is inside a mutator, taking into
  * account whether it is a flyout.
- * @param {Blockly.Workspace} workspace The workspace that is inside a mutator.
- * @return {?Blockly.Workspace} The mutator's parent workspace or null.
+ * @param {Workspace} workspace The workspace that is inside a mutator.
+ * @return {?Workspace} The mutator's parent workspace or null.
  * @public
  */
 Mutator.findParentWs = function(workspace) {
diff --git a/tests/deps.js b/tests/deps.js
index de575339f..de6795326 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -112,7 +112,7 @@ goog.addDependency('../../core/menu.js', ['Blockly.Menu'], ['Blockly.browserEven
 goog.addDependency('../../core/menuitem.js', ['Blockly.MenuItem'], ['Blockly.utils.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom']);
 goog.addDependency('../../core/metrics_manager.js', ['Blockly.FlyoutMetricsManager', 'Blockly.MetricsManager'], ['Blockly.IMetricsManager', 'Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global']);
-goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
+goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', '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.internalConstants']);
 goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.Metrics', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox']);

From e7feef669ebe281630c1cd16e8d1bf7c9ef011a5 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 15:00:09 -0700
Subject: [PATCH 316/833] clang-format core/mutator.js

---
 core/mutator.js | 55 ++++++++++++++++++-------------------------------
 1 file changed, 20 insertions(+), 35 deletions(-)

diff --git a/core/mutator.js b/core/mutator.js
index ca8475cdf..8f9bab118 100644
--- a/core/mutator.js
+++ b/core/mutator.js
@@ -104,8 +104,7 @@ Mutator.prototype.getWorkspace = function() {
 Mutator.prototype.drawIcon_ = function(group) {
   // Square with rounded corners.
   dom.createSvgElement(
-      Svg.RECT,
-      {
+      Svg.RECT, {
         'class': 'blocklyIconShape',
         'rx': '4',
         'ry': '4',
@@ -115,28 +114,21 @@ Mutator.prototype.drawIcon_ = function(group) {
       group);
   // Gear teeth.
   dom.createSvgElement(
-      Svg.PATH,
-      {
+      Svg.PATH, {
         'class': 'blocklyIconSymbol',
         'd': 'm4.203,7.296 0,1.368 -0.92,0.677 -0.11,0.41 0.9,1.559 0.41,' +
-             '0.11 1.043,-0.457 1.187,0.683 0.127,1.134 0.3,0.3 1.8,0 0.3,' +
-             '-0.299 0.127,-1.138 1.185,-0.682 1.046,0.458 0.409,-0.11 0.9,' +
-             '-1.559 -0.11,-0.41 -0.92,-0.677 0,-1.366 0.92,-0.677 0.11,' +
-             '-0.41 -0.9,-1.559 -0.409,-0.109 -1.046,0.458 -1.185,-0.682 ' +
-             '-0.127,-1.138 -0.3,-0.299 -1.8,0 -0.3,0.3 -0.126,1.135 -1.187,' +
-             '0.682 -1.043,-0.457 -0.41,0.11 -0.899,1.559 0.108,0.409z'
+            '0.11 1.043,-0.457 1.187,0.683 0.127,1.134 0.3,0.3 1.8,0 0.3,' +
+            '-0.299 0.127,-1.138 1.185,-0.682 1.046,0.458 0.409,-0.11 0.9,' +
+            '-1.559 -0.11,-0.41 -0.92,-0.677 0,-1.366 0.92,-0.677 0.11,' +
+            '-0.41 -0.9,-1.559 -0.409,-0.109 -1.046,0.458 -1.185,-0.682 ' +
+            '-0.127,-1.138 -0.3,-0.299 -1.8,0 -0.3,0.3 -0.126,1.135 -1.187,' +
+            '0.682 -1.043,-0.457 -0.41,0.11 -0.899,1.559 0.108,0.409z'
       },
       group);
   // Axle hole.
   dom.createSvgElement(
       Svg.CIRCLE,
-      {
-        'class': 'blocklyIconShape',
-        'r': '2.7',
-        'cx': '8',
-        'cy': '8'
-      },
-      group);
+      {'class': 'blocklyIconShape', 'r': '2.7', 'cx': '8', 'cy': '8'}, group);
 };
 
 /**
@@ -164,9 +156,7 @@ Mutator.prototype.createEditor_ = function() {
   </svg>
   */
   this.svgDialog_ = dom.createSvgElement(
-      Svg.SVG,
-      {'x': Bubble.BORDER_WIDTH, 'y': Bubble.BORDER_WIDTH},
-      null);
+      Svg.SVG, {'x': Bubble.BORDER_WIDTH, 'y': Bubble.BORDER_WIDTH}, null);
   // Convert the list of names into a list of XML objects for the flyout.
   let quarkXml;
   if (this.quarkNames_.length) {
@@ -192,13 +182,11 @@ Mutator.prototype.createEditor_ = function() {
         'renderer': this.block_.workspace.options.renderer,
         'rendererOverrides': this.block_.workspace.options.rendererOverrides
       }));
-  workspaceOptions.toolboxPosition = this.block_.RTL ?
-      toolbox.Position.RIGHT :
-      toolbox.Position.LEFT;
+  workspaceOptions.toolboxPosition =
+      this.block_.RTL ? toolbox.Position.RIGHT : toolbox.Position.LEFT;
   const hasFlyout = !!quarkXml;
   if (hasFlyout) {
-    workspaceOptions.languageTree =
-        toolbox.convertToolboxDefToJson(quarkXml);
+    workspaceOptions.languageTree = toolbox.convertToolboxDefToJson(quarkXml);
   }
   this.workspace_ = new WorkspaceSvg(workspaceOptions);
   this.workspace_.isMutator = true;
@@ -208,8 +196,7 @@ Mutator.prototype.createEditor_ = function() {
   // a top level SVG. Instead of handling scale themselves, mutators
   // inherit scale from the parent workspace.
   // To fix this, scale needs to be applied at a different level in the DOM.
-  const flyoutSvg = hasFlyout ?
-      this.workspace_.addFlyout(Svg.G) : null;
+  const flyoutSvg = hasFlyout ? this.workspace_.addFlyout(Svg.G) : null;
   const background = this.workspace_.createDom('blocklyMutatorBackground');
 
   if (flyoutSvg) {
@@ -258,8 +245,8 @@ Mutator.prototype.resizeBubble_ = function() {
   let height = workspaceSize.height + doubleBorderWidth * 3;
   const flyout = this.workspace_.getFlyout();
   if (flyout) {
-    const flyoutScrollMetrics = flyout.getWorkspace().getMetricsManager()
-        .getScrollMetrics();
+    const flyoutScrollMetrics =
+        flyout.getWorkspace().getMetricsManager().getScrollMetrics();
     height = Math.max(height, flyoutScrollMetrics.height + 20);
     width += flyout.getWidth();
   }
@@ -309,8 +296,8 @@ Mutator.prototype.setVisible = function(visible) {
     // No change.
     return;
   }
-  Events.fire(new (Events.get(Events.BUBBLE_OPEN))(
-      this.block_, visible, 'mutator'));
+  Events.fire(
+      new (Events.get(Events.BUBBLE_OPEN))(this.block_, visible, 'mutator'));
   if (visible) {
     // Create the bubble.
     this.bubble_ = new Bubble(
@@ -351,8 +338,7 @@ Mutator.prototype.setVisible = function(visible) {
     if (this.block_.saveConnections) {
       const thisMutator = this;
       const mutatorBlock =
-        /** @type {{saveConnections: function(!Block)}} */ (
-          this.block_);
+          /** @type {{saveConnections: function(!Block)}} */ (this.block_);
       mutatorBlock.saveConnections(this.rootBlock_);
       this.sourceListener_ = function() {
         mutatorBlock.saveConnections(thisMutator.rootBlock_);
@@ -388,8 +374,7 @@ Mutator.prototype.setVisible = function(visible) {
  * @private
  */
 Mutator.prototype.workspaceChanged_ = function(e) {
-  if (e.isUiEvent ||
-      (e.type == Events.CHANGE && e.element == 'disabled')) {
+  if (e.isUiEvent || (e.type == Events.CHANGE && e.element == 'disabled')) {
     return;
   }
 

From 4aef7e3bcdc78d8f09c44253d48a3a5cfcd238ef Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 23 Jul 2021 15:00:14 -0700
Subject: [PATCH 317/833] clang-format core/renderers/common/constants.js

---
 core/renderers/common/constants.js | 286 ++++++++++++-----------------
 1 file changed, 118 insertions(+), 168 deletions(-)

diff --git a/core/renderers/common/constants.js b/core/renderers/common/constants.js
index 4f64223d7..5fdacc2ea 100644
--- a/core/renderers/common/constants.js
+++ b/core/renderers/common/constants.js
@@ -32,7 +32,6 @@ const utils = goog.require('Blockly.utils');
  * @package
  */
 const ConstantProvider = function() {
-
   /**
    * The size of an empty spacer.
    * @type {number}
@@ -215,10 +214,10 @@ const ConstantProvider = function() {
   this.EXTERNAL_VALUE_INPUT_PADDING = 2;
 
   /**
-   * The height of an empty statement input.  Note that in the old rendering this
-   * varies slightly depending on whether the block has external or inline inputs.
-   * In the new rendering this is consistent.  It seems unlikely that the old
-   * behaviour was intentional.
+   * The height of an empty statement input.  Note that in the old rendering
+   * this varies slightly depending on whether the block has external or inline
+   * inputs. In the new rendering this is consistent.  It seems unlikely that
+   * the old behaviour was intentional.
    * @type {number}
    */
   this.EMPTY_STATEMENT_INPUT_HEIGHT = this.MIN_BLOCK_HEIGHT;
@@ -304,8 +303,7 @@ const ConstantProvider = function() {
    * A field's text element's dominant baseline.
    * @type {boolean}
    */
-  this.FIELD_TEXT_BASELINE_CENTER =
-      !userAgent.IE && !userAgent.EDGE;
+  this.FIELD_TEXT_BASELINE_CENTER = !userAgent.IE && !userAgent.EDGE;
 
   /**
    * A dropdown field's border rect height.
@@ -350,17 +348,17 @@ const ConstantProvider = function() {
    * @type {string}
    */
   this.FIELD_DROPDOWN_SVG_ARROW_DATAURI =
-    'data:image/svg+xml;base64,PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllci' +
-    'AxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMi43MSIgaG' +
-    'VpZ2h0PSI4Ljc5IiB2aWV3Qm94PSIwIDAgMTIuNzEgOC43OSI+PHRpdGxlPmRyb3Bkb3duLW' +
-    'Fycm93PC90aXRsZT48ZyBvcGFjaXR5PSIwLjEiPjxwYXRoIGQ9Ik0xMi43MSwyLjQ0QTIuND' +
-    'EsMi40MSwwLDAsMSwxMiw0LjE2TDguMDgsOC4wOGEyLjQ1LDIuNDUsMCwwLDEtMy40NSwwTD' +
-    'AuNzIsNC4xNkEyLjQyLDIuNDIsMCwwLDEsMCwyLjQ0LDIuNDgsMi40OCwwLDAsMSwuNzEuNz' +
-    'FDMSwwLjQ3LDEuNDMsMCw2LjM2LDBTMTEuNzUsMC40NiwxMiwuNzFBMi40NCwyLjQ0LDAsMC' +
-    'wxLDEyLjcxLDIuNDRaIiBmaWxsPSIjMjMxZjIwIi8+PC9nPjxwYXRoIGQ9Ik02LjM2LDcuNz' +
-    'lhMS40MywxLjQzLDAsMCwxLTEtLjQyTDEuNDIsMy40NWExLjQ0LDEuNDQsMCwwLDEsMC0yYz' +
-    'AuNTYtLjU2LDkuMzEtMC41Niw5Ljg3LDBhMS40NCwxLjQ0LDAsMCwxLDAsMkw3LjM3LDcuMz' +
-    'dBMS40MywxLjQzLDAsMCwxLDYuMzYsNy43OVoiIGZpbGw9IiNmZmYiLz48L3N2Zz4=';
+      'data:image/svg+xml;base64,PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllci' +
+      'AxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMi43MSIgaG' +
+      'VpZ2h0PSI4Ljc5IiB2aWV3Qm94PSIwIDAgMTIuNzEgOC43OSI+PHRpdGxlPmRyb3Bkb3duLW' +
+      'Fycm93PC90aXRsZT48ZyBvcGFjaXR5PSIwLjEiPjxwYXRoIGQ9Ik0xMi43MSwyLjQ0QTIuND' +
+      'EsMi40MSwwLDAsMSwxMiw0LjE2TDguMDgsOC4wOGEyLjQ1LDIuNDUsMCwwLDEtMy40NSwwTD' +
+      'AuNzIsNC4xNkEyLjQyLDIuNDIsMCwwLDEsMCwyLjQ0LDIuNDgsMi40OCwwLDAsMSwuNzEuNz' +
+      'FDMSwwLjQ3LDEuNDMsMCw2LjM2LDBTMTEuNzUsMC40NiwxMiwuNzFBMi40NCwyLjQ0LDAsMC' +
+      'wxLDEyLjcxLDIuNDRaIiBmaWxsPSIjMjMxZjIwIi8+PC9nPjxwYXRoIGQ9Ik02LjM2LDcuNz' +
+      'lhMS40MywxLjQzLDAsMCwxLTEtLjQyTDEuNDIsMy40NWExLjQ0LDEuNDQsMCwwLDEsMC0yYz' +
+      'AuNTYtLjU2LDkuMzEtMC41Niw5Ljg3LDBhMS40NCwxLjQ0LDAsMCwxLDAsMkw3LjM3LDcuMz' +
+      'dBMS40MywxLjQzLDAsMCwxLDYuMzYsNy43OVoiIGZpbGw9IiNmZmYiLz48L3N2Zz4=';
 
   /**
    * Whether or not to show a box shadow around the widget div. This is only a
@@ -534,10 +532,7 @@ const ConstantProvider = function() {
    * Enum for connection shapes.
    * @enum {number}
    */
-  this.SHAPES = {
-    PUZZLE: 1,
-    NOTCH: 2
-  };
+  this.SHAPES = {PUZZLE: 1, NOTCH: 2};
 };
 
 /**
@@ -545,7 +540,6 @@ const ConstantProvider = function() {
  * @package
  */
 ConstantProvider.prototype.init = function() {
-
   /**
    * An object containing sizing and path information about collapsed block
    * indicators.
@@ -589,9 +583,7 @@ ConstantProvider.prototype.init = function() {
  * @param {!Theme} theme The current workspace theme.
  * @package
  */
-ConstantProvider.prototype.setTheme = function(
-    theme) {
-
+ConstantProvider.prototype.setTheme = function(theme) {
   /**
    * The block styles map.
    * @type {Object<string, !Theme.BlockStyle>}
@@ -612,36 +604,35 @@ ConstantProvider.prototype.setTheme = function(
  * @param {!Theme} theme The current workspace theme.
  * @protected
  */
-ConstantProvider.prototype.setDynamicProperties_ =
-    function(theme) {
-    /* eslint-disable indent */
+ConstantProvider.prototype.setDynamicProperties_ = function(theme) {
   this.setFontConstants_(theme);
   this.setComponentConstants_(theme);
 
-  this.ADD_START_HATS = theme.startHats != null ? theme.startHats :
-      this.ADD_START_HATS;
-}; /* eslint-enable indent */
+  this.ADD_START_HATS =
+      theme.startHats != null ? theme.startHats : this.ADD_START_HATS;
+};
 
 /**
  * Set constants related to fonts.
  * @param {!Theme} theme The current workspace theme.
  * @protected
  */
-ConstantProvider.prototype.setFontConstants_ = function(
-    theme) {
+ConstantProvider.prototype.setFontConstants_ = function(theme) {
   this.FIELD_TEXT_FONTFAMILY =
       theme.fontStyle && theme.fontStyle['family'] != undefined ?
-      theme.fontStyle['family'] : this.FIELD_TEXT_FONTFAMILY;
+      theme.fontStyle['family'] :
+      this.FIELD_TEXT_FONTFAMILY;
   this.FIELD_TEXT_FONTWEIGHT =
       theme.fontStyle && theme.fontStyle['weight'] != undefined ?
-      theme.fontStyle['weight'] : this.FIELD_TEXT_FONTWEIGHT;
+      theme.fontStyle['weight'] :
+      this.FIELD_TEXT_FONTWEIGHT;
   this.FIELD_TEXT_FONTSIZE =
       theme.fontStyle && theme.fontStyle['size'] != undefined ?
-      theme.fontStyle['size'] : this.FIELD_TEXT_FONTSIZE;
+      theme.fontStyle['size'] :
+      this.FIELD_TEXT_FONTSIZE;
 
-  var fontMetrics = dom.measureFontMetrics('Hg',
-      this.FIELD_TEXT_FONTSIZE + 'pt',
-      this.FIELD_TEXT_FONTWEIGHT,
+  var fontMetrics = dom.measureFontMetrics(
+      'Hg', this.FIELD_TEXT_FONTSIZE + 'pt', this.FIELD_TEXT_FONTWEIGHT,
       this.FIELD_TEXT_FONTFAMILY);
 
   this.FIELD_TEXT_HEIGHT = fontMetrics.height;
@@ -653,20 +644,18 @@ ConstantProvider.prototype.setFontConstants_ = function(
  * @param {!Theme} theme The current workspace theme.
  * @protected
  */
-ConstantProvider.prototype.setComponentConstants_ =
-    function(theme) {
-    /* eslint-disable indent */
-  this.CURSOR_COLOUR = theme.getComponentStyle('cursorColour') ||
-    this.CURSOR_COLOUR;
-  this.MARKER_COLOUR = theme.getComponentStyle('markerColour') ||
-    this.MARKER_COLOUR;
+ConstantProvider.prototype.setComponentConstants_ = function(theme) {
+  this.CURSOR_COLOUR =
+      theme.getComponentStyle('cursorColour') || this.CURSOR_COLOUR;
+  this.MARKER_COLOUR =
+      theme.getComponentStyle('markerColour') || this.MARKER_COLOUR;
   this.INSERTION_MARKER_COLOUR =
-    theme.getComponentStyle('insertionMarkerColour') ||
-    this.INSERTION_MARKER_COLOUR;
+      theme.getComponentStyle('insertionMarkerColour') ||
+      this.INSERTION_MARKER_COLOUR;
   this.INSERTION_MARKER_OPACITY =
-    Number(theme.getComponentStyle('insertionMarkerOpacity')) ||
-    this.INSERTION_MARKER_OPACITY;
-}; /* eslint-enable indent */
+      Number(theme.getComponentStyle('insertionMarkerOpacity')) ||
+      this.INSERTION_MARKER_OPACITY;
+};
 
 /**
  * Get or create a block style based on a single colour value.  Generate a name
@@ -676,15 +665,13 @@ ConstantProvider.prototype.setComponentConstants_ =
  *     containing the style and an autogenerated name for that style.
  * @package
  */
-ConstantProvider.prototype.getBlockStyleForColour =
-    function(colour) {
-    /* eslint-disable indent */
+ConstantProvider.prototype.getBlockStyleForColour = function(colour) {
   var name = 'auto_' + colour;
   if (!this.blockStyles[name]) {
     this.blockStyles[name] = this.createBlockStyle_(colour);
   }
   return {style: this.blockStyles[name], name: name};
-}; /* eslint-enable indent */
+};
 
 /**
  * Gets the BlockStyle for the given block style name.
@@ -692,12 +679,11 @@ ConstantProvider.prototype.getBlockStyleForColour =
  * @return {!Theme.BlockStyle} The named block style, or a default style
  *     if no style with the given name was found.
  */
-ConstantProvider.prototype.getBlockStyle = function(
-    blockStyleName) {
+ConstantProvider.prototype.getBlockStyle = function(blockStyleName) {
   return this.blockStyles[blockStyleName || ''] ||
       (blockStyleName && blockStyleName.indexOf('auto_') == 0 ?
-        this.getBlockStyleForColour(blockStyleName.substring(5)).style :
-        this.createBlockStyle_('#000000'));
+           this.getBlockStyleForColour(blockStyleName.substring(5)).style :
+           this.createBlockStyle_('#000000'));
 };
 
 /**
@@ -707,11 +693,8 @@ ConstantProvider.prototype.getBlockStyle = function(
  *     given colour.
  * @protected
  */
-ConstantProvider.prototype.createBlockStyle_ = function(
-    colour) {
-  return this.validatedBlockStyle_({
-    'colourPrimary': colour
-  });
+ConstantProvider.prototype.createBlockStyle_ = function(colour) {
+  return this.validatedBlockStyle_({'colourPrimary': colour});
 };
 
 /**
@@ -728,17 +711,14 @@ ConstantProvider.prototype.createBlockStyle_ = function(
  *     required properties populated.
  * @protected
  */
-ConstantProvider.prototype.validatedBlockStyle_ =
-    function(blockStyle) {
-    /* eslint-disable indent */
+ConstantProvider.prototype.validatedBlockStyle_ = function(blockStyle) {
   // Make a new object with all of the same properties.
   var valid = /** @type {!Theme.BlockStyle} */ ({});
   if (blockStyle) {
     utils.object.mixin(valid, blockStyle);
   }
   // Validate required properties.
-  var parsedColour = utils.parseBlockColour(
-      valid['colourPrimary'] || '#000');
+  var parsedColour = utils.parseBlockColour(valid['colourPrimary'] || '#000');
   valid.colourPrimary = parsedColour.hex;
   valid.colourSecondary = valid['colourSecondary'] ?
       utils.parseBlockColour(valid['colourSecondary']).hex :
@@ -749,30 +729,27 @@ ConstantProvider.prototype.validatedBlockStyle_ =
 
   valid.hat = valid['hat'] || '';
   return valid;
-}; /* eslint-enable indent */
+};
 
 /**
  * Generate a secondary colour from the passed in primary colour.
- * @param {string} colour Primary colour.
+ * @param {string} inputColour Primary colour.
  * @return {string} The generated secondary colour.
  * @protected
  */
-ConstantProvider.prototype.generateSecondaryColour_ =
-    function(inputColour) {
-    /* eslint-disable indent */
-    return colour.blend('#fff', inputColour, 0.6) || inputColour;
-}; /* eslint-enable indent */
+ConstantProvider.prototype.generateSecondaryColour_ = function(inputColour) {
+  return colour.blend('#fff', inputColour, 0.6) || inputColour;
+};
 
 /**
  * Generate a tertiary colour from the passed in primary colour.
- * @param {string} colour Primary colour.
+ * @param {string} inputColour Primary colour.
  * @return {string} The generated tertiary colour.
  * @protected
  */
 ConstantProvider.prototype.generateTertiaryColour_ = function(inputColour) {
-  /* eslint-disable indent */
   return colour.blend('#fff', inputColour, 0.3) || inputColour;
-}; /* eslint-enable indent */
+};
 
 
 /**
@@ -802,18 +779,11 @@ ConstantProvider.prototype.makeJaggedTeeth = function() {
   var height = this.JAGGED_TEETH_HEIGHT;
   var width = this.JAGGED_TEETH_WIDTH;
 
-  var mainPath =
-      svgPaths.line(
-          [
-            svgPaths.point(width, height / 4),
-            svgPaths.point(-width * 2, height / 2),
-            svgPaths.point(width, height / 4)
-          ]);
-  return {
-    height: height,
-    width: width,
-    path: mainPath
-  };
+  var mainPath = svgPaths.line([
+    svgPaths.point(width, height / 4), svgPaths.point(-width * 2, height / 2),
+    svgPaths.point(width, height / 4)
+  ]);
+  return {height: height, width: width, path: mainPath};
 };
 
 /**
@@ -825,18 +795,11 @@ ConstantProvider.prototype.makeStartHat = function() {
   var height = this.START_HAT_HEIGHT;
   var width = this.START_HAT_WIDTH;
 
-  var mainPath =
-      svgPaths.curve('c',
-          [
-            svgPaths.point(30, -height),
-            svgPaths.point(70, -height),
-            svgPaths.point(width, 0)
-          ]);
-  return {
-    height: height,
-    width: width,
-    path: mainPath
-  };
+  var mainPath = svgPaths.curve('c', [
+    svgPaths.point(30, -height), svgPaths.point(70, -height),
+    svgPaths.point(width, 0)
+  ]);
+  return {height: height, width: width, path: mainPath};
 };
 
 /**
@@ -866,17 +829,14 @@ ConstantProvider.prototype.makePuzzleTab = function() {
     var endPoint1 = svgPaths.point(-width, forward * halfHeight);
     var endPoint2 = svgPaths.point(width, forward * halfHeight);
 
-    return svgPaths.curve('c',
-        [
-          svgPaths.point(0, forward * control1Y),
-          svgPaths.point(-width, back * control2Y),
-          endPoint1
-        ]) +
-        svgPaths.curve('s',
-            [
-              svgPaths.point(width, back * control3Y),
-              endPoint2
-            ]);
+    return svgPaths.curve(
+               'c',
+               [
+                 svgPaths.point(0, forward * control1Y),
+                 svgPaths.point(-width, back * control2Y), endPoint1
+               ]) +
+        svgPaths.curve(
+            's', [svgPaths.point(width, back * control3Y), endPoint2]);
   }
 
   // c 0,-10  -8,8  -8,-7.5  s 8,2.5  8,-7.5
@@ -904,12 +864,11 @@ ConstantProvider.prototype.makeNotch = function() {
   var innerWidth = 3;
   var outerWidth = (width - innerWidth) / 2;
   function makeMainPath(dir) {
-    return svgPaths.line(
-        [
-          svgPaths.point(dir * outerWidth, height),
-          svgPaths.point(dir * innerWidth, 0),
-          svgPaths.point(dir * outerWidth, -height)
-        ]);
+    return svgPaths.line([
+      svgPaths.point(dir * outerWidth, height),
+      svgPaths.point(dir * innerWidth, 0),
+      svgPaths.point(dir * outerWidth, -height)
+    ]);
   }
   var pathLeft = makeMainPath(1);
   var pathRight = makeMainPath(-1);
@@ -931,11 +890,11 @@ ConstantProvider.prototype.makeNotch = function() {
 ConstantProvider.prototype.makeInsideCorners = function() {
   var radius = this.CORNER_RADIUS;
 
-  var innerTopLeftCorner = svgPaths.arc('a', '0 0,0', radius,
-      svgPaths.point(-radius, radius));
+  var innerTopLeftCorner =
+      svgPaths.arc('a', '0 0,0', radius, svgPaths.point(-radius, radius));
 
-  var innerBottomLeftCorner = svgPaths.arc('a', '0 0,0', radius,
-      svgPaths.point(radius, radius));
+  var innerBottomLeftCorner =
+      svgPaths.arc('a', '0 0,0', radius, svgPaths.point(radius, radius));
 
   return {
     width: radius,
@@ -956,32 +915,29 @@ ConstantProvider.prototype.makeOutsideCorners = function() {
    * SVG path for drawing the rounded top-left corner.
    * @const
    */
-  var topLeft =
-      svgPaths.moveBy(0, radius) +
-      svgPaths.arc('a', '0 0,1', radius,
-          svgPaths.point(radius, -radius));
+  var topLeft = svgPaths.moveBy(0, radius) +
+      svgPaths.arc('a', '0 0,1', radius, svgPaths.point(radius, -radius));
 
   /**
    * SVG path for drawing the rounded top-right corner.
    * @const
    */
   var topRight =
-      svgPaths.arc('a', '0 0,1', radius,
-          svgPaths.point(radius, radius));
+      svgPaths.arc('a', '0 0,1', radius, svgPaths.point(radius, radius));
 
   /**
    * SVG path for drawing the rounded bottom-left corner.
    * @const
    */
-  var bottomLeft = svgPaths.arc('a', '0 0,1', radius,
-      svgPaths.point(-radius, -radius));
+  var bottomLeft =
+      svgPaths.arc('a', '0 0,1', radius, svgPaths.point(-radius, -radius));
 
   /**
    * SVG path for drawing the rounded bottom-right corner.
    * @const
    */
-  var bottomRight = svgPaths.arc('a', '0 0,1', radius,
-      svgPaths.point(-radius, radius));
+  var bottomRight =
+      svgPaths.arc('a', '0 0,1', radius, svgPaths.point(-radius, radius));
 
   return {
     topLeft: topLeft,
@@ -1000,8 +956,7 @@ ConstantProvider.prototype.makeOutsideCorners = function() {
  * @return {!Object} The shape object for the connection.
  * @package
  */
-ConstantProvider.prototype.shapeFor = function(
-    connection) {
+ConstantProvider.prototype.shapeFor = function(connection) {
   switch (connection.type) {
     case connectionTypes.INPUT_VALUE:
     case connectionTypes.OUTPUT_VALUE:
@@ -1022,8 +977,7 @@ ConstantProvider.prototype.shapeFor = function(
  * @suppress {strictModuleDepCheck} Debug renderer only included in playground.
  * @package
  */
-ConstantProvider.prototype.createDom = function(svg,
-    tagName, selector) {
+ConstantProvider.prototype.createDom = function(svg, tagName, selector) {
   this.injectCSS_(tagName, selector);
 
   /*
@@ -1031,8 +985,7 @@ ConstantProvider.prototype.createDom = function(svg,
     ... filters go here ...
   </defs>
   */
-  this.defs = dom.createSvgElement(
-      Svg.DEFS, {}, svg);
+  this.defs = dom.createSvgElement(Svg.DEFS, {}, svg);
   /*
     <filter id="blocklyEmbossFilter837493">
       <feGaussianBlur in="SourceAlpha" stdDeviation="1" result="blur" />
@@ -1048,14 +1001,13 @@ ConstantProvider.prototype.createDom = function(svg,
     </filter>
   */
   var embossFilter = dom.createSvgElement(
-      Svg.FILTER,
-      {'id': 'blocklyEmbossFilter' + this.randomIdentifier}, this.defs);
+      Svg.FILTER, {'id': 'blocklyEmbossFilter' + this.randomIdentifier},
+      this.defs);
   dom.createSvgElement(
       Svg.FEGAUSSIANBLUR,
       {'in': 'SourceAlpha', 'stdDeviation': 1, 'result': 'blur'}, embossFilter);
   var feSpecularLighting = dom.createSvgElement(
-      Svg.FESPECULARLIGHTING,
-      {
+      Svg.FESPECULARLIGHTING, {
         'in': 'blur',
         'surfaceScale': 1,
         'specularConstant': 0.5,
@@ -1065,19 +1017,18 @@ ConstantProvider.prototype.createDom = function(svg,
       },
       embossFilter);
   dom.createSvgElement(
-      Svg.FEPOINTLIGHT,
-      {'x': -5000, 'y': -10000, 'z': 20000}, feSpecularLighting);
+      Svg.FEPOINTLIGHT, {'x': -5000, 'y': -10000, 'z': 20000},
+      feSpecularLighting);
   dom.createSvgElement(
-      Svg.FECOMPOSITE,
-      {
+      Svg.FECOMPOSITE, {
         'in': 'specOut',
         'in2': 'SourceAlpha',
         'operator': 'in',
         'result': 'specOut'
-      }, embossFilter);
+      },
+      embossFilter);
   dom.createSvgElement(
-      Svg.FECOMPOSITE,
-      {
+      Svg.FECOMPOSITE, {
         'in': 'SourceGraphic',
         'in2': 'specOut',
         'operator': 'arithmetic',
@@ -1085,7 +1036,8 @@ ConstantProvider.prototype.createDom = function(svg,
         'k2': 1,
         'k3': 1,
         'k4': 0
-      }, embossFilter);
+      },
+      embossFilter);
   this.embossFilterId = embossFilter.id;
   this.embossFilter_ = embossFilter;
 
@@ -1097,19 +1049,18 @@ ConstantProvider.prototype.createDom = function(svg,
     </pattern>
   */
   var disabledPattern = dom.createSvgElement(
-      Svg.PATTERN,
-      {
+      Svg.PATTERN, {
         'id': 'blocklyDisabledPattern' + this.randomIdentifier,
         'patternUnits': 'userSpaceOnUse',
         'width': 10,
         'height': 10
-      }, this.defs);
+      },
+      this.defs);
   dom.createSvgElement(
-      Svg.RECT,
-      {'width': 10, 'height': 10, 'fill': '#aaa'}, disabledPattern);
+      Svg.RECT, {'width': 10, 'height': 10, 'fill': '#aaa'}, disabledPattern);
   dom.createSvgElement(
-      Svg.PATH,
-      {'d': 'M 0 0 L 10 10 M 10 0 L 0 10', 'stroke': '#cc0'}, disabledPattern);
+      Svg.PATH, {'d': 'M 0 0 L 10 10 M 10 0 L 0 10', 'stroke': '#cc0'},
+      disabledPattern);
   this.disabledPatternId = disabledPattern.id;
   this.disabledPattern_ = disabledPattern;
 
@@ -1121,8 +1072,7 @@ ConstantProvider.prototype.createDom = function(svg,
  * render debugging.
  * @private
  */
-ConstantProvider.prototype.createDebugFilter =
-    function() {
+ConstantProvider.prototype.createDebugFilter = function() {
   // Only create the debug filter once.
   if (!this.debugFilter_) {
     var debugFilter = dom.createSvgElement(
@@ -1136,8 +1086,7 @@ ConstantProvider.prototype.createDebugFilter =
         this.defs);
     // Set all gaussian blur pixels to 1 opacity before applying flood
     var debugComponentTransfer = dom.createSvgElement(
-        Svg.FECOMPONENTTRANSFER, {'result': 'outBlur'},
-        debugFilter);
+        Svg.FECOMPONENTTRANSFER, {'result': 'outBlur'}, debugFilter);
     dom.createSvgElement(
         Svg.FEFUNCA,
         {'type': 'table', 'tableValues': '0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1'},
@@ -1166,12 +1115,11 @@ ConstantProvider.prototype.createDebugFilter =
  * @param {string} selector The CSS selector to use.
  * @protected
  */
-ConstantProvider.prototype.injectCSS_ = function(
-    tagName, selector) {
+ConstantProvider.prototype.injectCSS_ = function(tagName, selector) {
   var cssArray = this.getCSS_(selector);
   var cssNodeId = 'blockly-renderer-style-' + tagName;
   this.cssNode_ =
-    /** @type {!HTMLStyleElement} */ (document.getElementById(cssNodeId));
+      /** @type {!HTMLStyleElement} */ (document.getElementById(cssNodeId));
   var text = cssArray.join('\n');
   if (this.cssNode_) {
     // Already injected, update if the theme changed.
@@ -1180,7 +1128,7 @@ ConstantProvider.prototype.injectCSS_ = function(
   }
   // Inject CSS tag at start of head.
   var cssNode =
-    /** @type {!HTMLStyleElement} */ (document.createElement('style'));
+      /** @type {!HTMLStyleElement} */ (document.createElement('style'));
   cssNode.id = cssNodeId;
   var cssTextNode = document.createTextNode(text);
   cssNode.appendChild(cssTextNode);
@@ -1197,6 +1145,7 @@ ConstantProvider.prototype.injectCSS_ = function(
 ConstantProvider.prototype.getCSS_ = function(selector) {
   return [
     /* eslint-disable indent */
+    /* clang-format off */
     // Text.
     selector + ' .blocklyText, ',
     selector + ' .blocklyFlyoutLabelText {',
@@ -1266,6 +1215,7 @@ ConstantProvider.prototype.getCSS_ = function(selector) {
       'fill-opacity: ' + this.INSERTION_MARKER_OPACITY + ';',
       'stroke: none;',
     '}',
+    /* clang-format on */
     /* eslint-enable indent */
   ];
 };

From a392696c7a633f0e4d88fa2db42977ca39ce413b Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 23 Jul 2021 15:07:30 -0700
Subject: [PATCH 318/833] Convert core/renderers/common/constants.js to
 const/let

---
 core/renderers/common/constants.js | 98 +++++++++++++++---------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/core/renderers/common/constants.js b/core/renderers/common/constants.js
index 5fdacc2ea..6847aea22 100644
--- a/core/renderers/common/constants.js
+++ b/core/renderers/common/constants.js
@@ -591,8 +591,8 @@ ConstantProvider.prototype.setTheme = function(theme) {
    */
   this.blockStyles = Object.create(null);
 
-  var blockStyles = theme.blockStyles;
-  for (var key in blockStyles) {
+  const blockStyles = theme.blockStyles;
+  for (const key in blockStyles) {
     this.blockStyles[key] = this.validatedBlockStyle_(blockStyles[key]);
   }
 
@@ -631,7 +631,7 @@ ConstantProvider.prototype.setFontConstants_ = function(theme) {
       theme.fontStyle['size'] :
       this.FIELD_TEXT_FONTSIZE;
 
-  var fontMetrics = dom.measureFontMetrics(
+  const fontMetrics = dom.measureFontMetrics(
       'Hg', this.FIELD_TEXT_FONTSIZE + 'pt', this.FIELD_TEXT_FONTWEIGHT,
       this.FIELD_TEXT_FONTFAMILY);
 
@@ -666,7 +666,7 @@ ConstantProvider.prototype.setComponentConstants_ = function(theme) {
  * @package
  */
 ConstantProvider.prototype.getBlockStyleForColour = function(colour) {
-  var name = 'auto_' + colour;
+  const name = 'auto_' + colour;
   if (!this.blockStyles[name]) {
     this.blockStyles[name] = this.createBlockStyle_(colour);
   }
@@ -713,12 +713,12 @@ ConstantProvider.prototype.createBlockStyle_ = function(colour) {
  */
 ConstantProvider.prototype.validatedBlockStyle_ = function(blockStyle) {
   // Make a new object with all of the same properties.
-  var valid = /** @type {!Theme.BlockStyle} */ ({});
+  const valid = /** @type {!Theme.BlockStyle} */ ({});
   if (blockStyle) {
     utils.object.mixin(valid, blockStyle);
   }
   // Validate required properties.
-  var parsedColour = utils.parseBlockColour(valid['colourPrimary'] || '#000');
+  const parsedColour = utils.parseBlockColour(valid['colourPrimary'] || '#000');
   valid.colourPrimary = parsedColour.hex;
   valid.colourSecondary = valid['colourSecondary'] ?
       utils.parseBlockColour(valid['colourSecondary']).hex :
@@ -776,10 +776,10 @@ ConstantProvider.prototype.dispose = function() {
  * @package
  */
 ConstantProvider.prototype.makeJaggedTeeth = function() {
-  var height = this.JAGGED_TEETH_HEIGHT;
-  var width = this.JAGGED_TEETH_WIDTH;
+  const height = this.JAGGED_TEETH_HEIGHT;
+  const width = this.JAGGED_TEETH_WIDTH;
 
-  var mainPath = svgPaths.line([
+  const mainPath = svgPaths.line([
     svgPaths.point(width, height / 4), svgPaths.point(-width * 2, height / 2),
     svgPaths.point(width, height / 4)
   ]);
@@ -792,10 +792,10 @@ ConstantProvider.prototype.makeJaggedTeeth = function() {
  * @package
  */
 ConstantProvider.prototype.makeStartHat = function() {
-  var height = this.START_HAT_HEIGHT;
-  var width = this.START_HAT_WIDTH;
+  const height = this.START_HAT_HEIGHT;
+  const width = this.START_HAT_WIDTH;
 
-  var mainPath = svgPaths.curve('c', [
+  const mainPath = svgPaths.curve('c', [
     svgPaths.point(30, -height), svgPaths.point(70, -height),
     svgPaths.point(width, 0)
   ]);
@@ -808,8 +808,8 @@ ConstantProvider.prototype.makeStartHat = function() {
  * @package
  */
 ConstantProvider.prototype.makePuzzleTab = function() {
-  var width = this.TAB_WIDTH;
-  var height = this.TAB_HEIGHT;
+  const width = this.TAB_WIDTH;
+  const height = this.TAB_HEIGHT;
 
   // The main path for the puzzle tab is made out of a few curves (c and s).
   // Those curves are defined with relative positions.  The 'up' and 'down'
@@ -817,17 +817,17 @@ ConstantProvider.prototype.makePuzzleTab = function() {
   // are the signs to use to move the cursor in the direction that the path is
   // being drawn.
   function makeMainPath(up) {
-    var forward = up ? -1 : 1;
-    var back = -forward;
+    const forward = up ? -1 : 1;
+    const back = -forward;
 
-    var overlap = 2.5;
-    var halfHeight = height / 2;
-    var control1Y = halfHeight + overlap;
-    var control2Y = halfHeight + 0.5;
-    var control3Y = overlap;  // 2.5
+    const overlap = 2.5;
+    const halfHeight = height / 2;
+    const control1Y = halfHeight + overlap;
+    const control2Y = halfHeight + 0.5;
+    const control3Y = overlap;  // 2.5
 
-    var endPoint1 = svgPaths.point(-width, forward * halfHeight);
-    var endPoint2 = svgPaths.point(width, forward * halfHeight);
+    const endPoint1 = svgPaths.point(-width, forward * halfHeight);
+    const endPoint2 = svgPaths.point(width, forward * halfHeight);
 
     return svgPaths.curve(
                'c',
@@ -840,9 +840,9 @@ ConstantProvider.prototype.makePuzzleTab = function() {
   }
 
   // c 0,-10  -8,8  -8,-7.5  s 8,2.5  8,-7.5
-  var pathUp = makeMainPath(true);
+  const pathUp = makeMainPath(true);
   // c 0,10  -8,-8  -8,7.5  s 8,-2.5  8,7.5
-  var pathDown = makeMainPath(false);
+  const pathDown = makeMainPath(false);
 
   return {
     type: this.SHAPES.PUZZLE,
@@ -859,10 +859,10 @@ ConstantProvider.prototype.makePuzzleTab = function() {
  * @package
  */
 ConstantProvider.prototype.makeNotch = function() {
-  var width = this.NOTCH_WIDTH;
-  var height = this.NOTCH_HEIGHT;
-  var innerWidth = 3;
-  var outerWidth = (width - innerWidth) / 2;
+  const width = this.NOTCH_WIDTH;
+  const height = this.NOTCH_HEIGHT;
+  const innerWidth = 3;
+  const outerWidth = (width - innerWidth) / 2;
   function makeMainPath(dir) {
     return svgPaths.line([
       svgPaths.point(dir * outerWidth, height),
@@ -870,8 +870,8 @@ ConstantProvider.prototype.makeNotch = function() {
       svgPaths.point(dir * outerWidth, -height)
     ]);
   }
-  var pathLeft = makeMainPath(1);
-  var pathRight = makeMainPath(-1);
+  const pathLeft = makeMainPath(1);
+  const pathRight = makeMainPath(-1);
 
   return {
     type: this.SHAPES.NOTCH,
@@ -888,12 +888,12 @@ ConstantProvider.prototype.makeNotch = function() {
  * @package
  */
 ConstantProvider.prototype.makeInsideCorners = function() {
-  var radius = this.CORNER_RADIUS;
+  const radius = this.CORNER_RADIUS;
 
-  var innerTopLeftCorner =
+  const innerTopLeftCorner =
       svgPaths.arc('a', '0 0,0', radius, svgPaths.point(-radius, radius));
 
-  var innerBottomLeftCorner =
+  const innerBottomLeftCorner =
       svgPaths.arc('a', '0 0,0', radius, svgPaths.point(radius, radius));
 
   return {
@@ -910,33 +910,33 @@ ConstantProvider.prototype.makeInsideCorners = function() {
  * @package
  */
 ConstantProvider.prototype.makeOutsideCorners = function() {
-  var radius = this.CORNER_RADIUS;
+  const radius = this.CORNER_RADIUS;
   /**
    * SVG path for drawing the rounded top-left corner.
    * @const
    */
-  var topLeft = svgPaths.moveBy(0, radius) +
+  const topLeft = svgPaths.moveBy(0, radius) +
       svgPaths.arc('a', '0 0,1', radius, svgPaths.point(radius, -radius));
 
   /**
    * SVG path for drawing the rounded top-right corner.
    * @const
    */
-  var topRight =
+  const topRight =
       svgPaths.arc('a', '0 0,1', radius, svgPaths.point(radius, radius));
 
   /**
    * SVG path for drawing the rounded bottom-left corner.
    * @const
    */
-  var bottomLeft =
+  const bottomLeft =
       svgPaths.arc('a', '0 0,1', radius, svgPaths.point(-radius, -radius));
 
   /**
    * SVG path for drawing the rounded bottom-right corner.
    * @const
    */
-  var bottomRight =
+  const bottomRight =
       svgPaths.arc('a', '0 0,1', radius, svgPaths.point(-radius, radius));
 
   return {
@@ -1000,13 +1000,13 @@ ConstantProvider.prototype.createDom = function(svg, tagName, selector) {
                    k1="0" k2="1" k3="1" k4="0" />
     </filter>
   */
-  var embossFilter = dom.createSvgElement(
+  const embossFilter = dom.createSvgElement(
       Svg.FILTER, {'id': 'blocklyEmbossFilter' + this.randomIdentifier},
       this.defs);
   dom.createSvgElement(
       Svg.FEGAUSSIANBLUR,
       {'in': 'SourceAlpha', 'stdDeviation': 1, 'result': 'blur'}, embossFilter);
-  var feSpecularLighting = dom.createSvgElement(
+  const feSpecularLighting = dom.createSvgElement(
       Svg.FESPECULARLIGHTING, {
         'in': 'blur',
         'surfaceScale': 1,
@@ -1048,7 +1048,7 @@ ConstantProvider.prototype.createDom = function(svg, tagName, selector) {
       <path d="M 0 0 L 10 10 M 10 0 L 0 10" stroke="#cc0" />
     </pattern>
   */
-  var disabledPattern = dom.createSvgElement(
+  const disabledPattern = dom.createSvgElement(
       Svg.PATTERN, {
         'id': 'blocklyDisabledPattern' + this.randomIdentifier,
         'patternUnits': 'userSpaceOnUse',
@@ -1075,7 +1075,7 @@ ConstantProvider.prototype.createDom = function(svg, tagName, selector) {
 ConstantProvider.prototype.createDebugFilter = function() {
   // Only create the debug filter once.
   if (!this.debugFilter_) {
-    var debugFilter = dom.createSvgElement(
+    const debugFilter = dom.createSvgElement(
         Svg.FILTER, {
           'id': 'blocklyDebugFilter' + this.randomIdentifier,
           'height': '160%',
@@ -1085,7 +1085,7 @@ ConstantProvider.prototype.createDebugFilter = function() {
         },
         this.defs);
     // Set all gaussian blur pixels to 1 opacity before applying flood
-    var debugComponentTransfer = dom.createSvgElement(
+    const debugComponentTransfer = dom.createSvgElement(
         Svg.FECOMPONENTTRANSFER, {'result': 'outBlur'}, debugFilter);
     dom.createSvgElement(
         Svg.FEFUNCA,
@@ -1116,21 +1116,21 @@ ConstantProvider.prototype.createDebugFilter = function() {
  * @protected
  */
 ConstantProvider.prototype.injectCSS_ = function(tagName, selector) {
-  var cssArray = this.getCSS_(selector);
-  var cssNodeId = 'blockly-renderer-style-' + tagName;
+  const cssArray = this.getCSS_(selector);
+  const cssNodeId = 'blockly-renderer-style-' + tagName;
   this.cssNode_ =
       /** @type {!HTMLStyleElement} */ (document.getElementById(cssNodeId));
-  var text = cssArray.join('\n');
+  const text = cssArray.join('\n');
   if (this.cssNode_) {
     // Already injected, update if the theme changed.
     this.cssNode_.firstChild.textContent = text;
     return;
   }
   // Inject CSS tag at start of head.
-  var cssNode =
+  const cssNode =
       /** @type {!HTMLStyleElement} */ (document.createElement('style'));
   cssNode.id = cssNodeId;
-  var cssTextNode = document.createTextNode(text);
+  const cssTextNode = document.createTextNode(text);
   cssNode.appendChild(cssTextNode);
   document.head.insertBefore(cssNode, document.head.firstChild);
   this.cssNode_ = cssNode;

From 1dfee3a722a6f542700a5d980440e6c091418bcd Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 23 Jul 2021 16:39:40 -0700
Subject: [PATCH 319/833] Make defs private and add nullability

---
 core/renderers/common/constants.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/renderers/common/constants.js b/core/renderers/common/constants.js
index 6847aea22..5e5ecb747 100644
--- a/core/renderers/common/constants.js
+++ b/core/renderers/common/constants.js
@@ -403,10 +403,10 @@ const ConstantProvider = function() {
   /**
    * The defs tag that contains all filters and patterns for this Blockly
    * instance.
-   * @type {SVGElement}
+   * @type {?SVGElement}
    * @private
    */
-  this.defs = null;
+  this.defs_ = null;
 
   /**
    * The ID of the emboss filter, or the empty string if no filter is set.
@@ -985,7 +985,7 @@ ConstantProvider.prototype.createDom = function(svg, tagName, selector) {
     ... filters go here ...
   </defs>
   */
-  this.defs = dom.createSvgElement(Svg.DEFS, {}, svg);
+  this.defs_ = dom.createSvgElement(Svg.DEFS, {}, svg);
   /*
     <filter id="blocklyEmbossFilter837493">
       <feGaussianBlur in="SourceAlpha" stdDeviation="1" result="blur" />
@@ -1002,7 +1002,7 @@ ConstantProvider.prototype.createDom = function(svg, tagName, selector) {
   */
   const embossFilter = dom.createSvgElement(
       Svg.FILTER, {'id': 'blocklyEmbossFilter' + this.randomIdentifier},
-      this.defs);
+      this.defs_);
   dom.createSvgElement(
       Svg.FEGAUSSIANBLUR,
       {'in': 'SourceAlpha', 'stdDeviation': 1, 'result': 'blur'}, embossFilter);
@@ -1055,7 +1055,7 @@ ConstantProvider.prototype.createDom = function(svg, tagName, selector) {
         'width': 10,
         'height': 10
       },
-      this.defs);
+      this.defs_);
   dom.createSvgElement(
       Svg.RECT, {'width': 10, 'height': 10, 'fill': '#aaa'}, disabledPattern);
   dom.createSvgElement(
@@ -1083,7 +1083,7 @@ ConstantProvider.prototype.createDebugFilter = function() {
           y: '-30%',
           x: '-40%'
         },
-        this.defs);
+        this.defs_);
     // Set all gaussian blur pixels to 1 opacity before applying flood
     const debugComponentTransfer = dom.createSvgElement(
         Svg.FECOMPONENTTRANSFER, {'result': 'outBlur'}, debugFilter);

From 1360b5bb49fa460f7ccaf1ba37fa56999b0b95b1 Mon Sep 17 00:00:00 2001
From: Monica Kozbial <6621618+moniika@users.noreply.github.com>
Date: Fri, 23 Jul 2021 18:10:38 -0700
Subject: [PATCH 320/833] Apply fixes for convert-file script (#5206)

---
 scripts/goog_module/convert-file.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index f3138e9cf..6a8d36cd0 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -190,20 +190,27 @@ step3() {
       local comma_properties=$(echo "${properties_accessed}" | perl -pe 's/\s+/, /g' | perl -pe 's/, $//')
       inf "Detected references of ${require}: ${comma_properties}"
 
-      for require_prop in echo "${properties_accessed}"; do
+      for require_prop in $(echo "${properties_accessed}"); do
         inf "Updating references of ${require}.${require_prop} to ${require_name}.${require_prop}..."
-        perl -pi -e 's/'"${require}"'\.'"${require_prop}"'([^'\''\w])/'"${require_name}"'\.'"${require_prop}"'\1/g' "${filepath}"
+        perl -pi -e 's/'"${require}"'\.'"${require_prop}"'(?!\w)/'"${require_name}"'\.'"${require_prop}"'/g' "${filepath}"
       done
     fi
 
     inf "Updating direct references of ${require} to ${require_name}..."
-    perl -pi -e 's/'"${require}"'([^'\''\w]\.)/'"${require_name}"'\1/g' "${filepath}"
+    perl -pi -e 's/'"${require}"'(?!['\''\w\.])/'"${require_name}"'/g' "${filepath}"
   done
 
   local missing_requires=$(perl -nle'print $& while m{(?<!'\'')Blockly(\.\w+)+}g' "${filepath}")
   missing_requires=$(echo "${missing_requires}" | tr ' ' '\n' | sort -u)
   if [[ -n "${missing_requires}" ]]; then
-    err "Missing requires for:\n${missing_requires}\nPlease manually fix."
+    # Search for the string goog.require('Blockly') or goog.requireType('Blockly')
+    local has_blockly_require=$(perl -ne'print m{goog\.(require|requireType)\('\''Blockly'\''\)}g' "${filepath}")
+    if [[ -n "${has_blockly_require}" ]]; then
+      warn 'Blockly detected as a require.'
+      warn "Potentially missing requires for:\n${missing_requires}\nPlease manually review."
+    else
+      err "Missing requires for:\n${missing_requires}\nPlease manually fix."
+    fi
   fi
 
   success "Completed automation for step 3. Please manually review and reorder requires."

From 78fee484597bba1ccfc9a437b9de0b74cc76bdb7 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 21 Jul 2021 15:32:39 -0700
Subject: [PATCH 321/833] Migrate core/field_label.js to ES6 const/let

---
 core/field_label.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/field_label.js b/core/field_label.js
index 5dc434c92..4a19dc07e 100644
--- a/core/field_label.js
+++ b/core/field_label.js
@@ -64,7 +64,7 @@ Blockly.FieldLabel.prototype.DEFAULT_VALUE = '';
  * @nocollapse
  */
 Blockly.FieldLabel.fromJson = function(options) {
-  var text = Blockly.utils.replaceMessageReferences(options['text']);
+  const text = Blockly.utils.replaceMessageReferences(options['text']);
   // `this` might be a subclass of FieldLabel if that class doesn't override
   // the static fromJson method.
   return new this(text, undefined, options);

From a765a3016e4f9cc341f0b5696be548a5f0e6acfa Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 21 Jul 2021 15:32:52 -0700
Subject: [PATCH 322/833] Migrate core/field_label.js to goog.module

---
 core/field_label.js | 31 +++++++++++++++++--------------
 tests/deps.js       |  2 +-
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/core/field_label.js b/core/field_label.js
index 4a19dc07e..4c15d4f96 100644
--- a/core/field_label.js
+++ b/core/field_label.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.FieldLabel');
+goog.module('Blockly.FieldLabel');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Field');
 goog.require('Blockly.fieldRegistry');
@@ -31,7 +32,7 @@ goog.require('Blockly.utils.object');
  * @extends {Blockly.Field}
  * @constructor
  */
-Blockly.FieldLabel = function(opt_value, opt_class, opt_config) {
+const FieldLabel = function(opt_value, opt_class, opt_config) {
   /**
    * The html class name to use for this field.
    * @type {?string}
@@ -39,31 +40,31 @@ Blockly.FieldLabel = function(opt_value, opt_class, opt_config) {
    */
   this.class_ = null;
 
-  Blockly.FieldLabel.superClass_.constructor.call(
+  FieldLabel.superClass_.constructor.call(
       this, opt_value, null, opt_config);
 
   if (!opt_config) {  // If the config was not passed use old configuration.
     this.class_ = opt_class || null;
   }
 };
-Blockly.utils.object.inherits(Blockly.FieldLabel, Blockly.Field);
+Blockly.utils.object.inherits(FieldLabel, Blockly.Field);
 
 /**
  * The default value for this field.
  * @type {*}
  * @protected
  */
-Blockly.FieldLabel.prototype.DEFAULT_VALUE = '';
+FieldLabel.prototype.DEFAULT_VALUE = '';
 
 /**
  * Construct a FieldLabel from a JSON arg object,
  * dereferencing any string table references.
  * @param {!Object} options A JSON object with options (text, and class).
- * @return {!Blockly.FieldLabel} The new field instance.
+ * @return {!FieldLabel} The new field instance.
  * @package
  * @nocollapse
  */
-Blockly.FieldLabel.fromJson = function(options) {
+FieldLabel.fromJson = function(options) {
   const text = Blockly.utils.replaceMessageReferences(options['text']);
   // `this` might be a subclass of FieldLabel if that class doesn't override
   // the static fromJson method.
@@ -75,13 +76,13 @@ Blockly.FieldLabel.fromJson = function(options) {
  * editable. This field should not.
  * @type {boolean}
  */
-Blockly.FieldLabel.prototype.EDITABLE = false;
+FieldLabel.prototype.EDITABLE = false;
 
 /**
  * @override
  */
-Blockly.FieldLabel.prototype.configure_ = function(config) {
-  Blockly.FieldLabel.superClass_.configure_.call(this, config);
+FieldLabel.prototype.configure_ = function(config) {
+  FieldLabel.superClass_.configure_.call(this, config);
   this.class_ = config['class'];
 };
 
@@ -89,7 +90,7 @@ Blockly.FieldLabel.prototype.configure_ = function(config) {
  * Create block UI for this label.
  * @package
  */
-Blockly.FieldLabel.prototype.initView = function() {
+FieldLabel.prototype.initView = function() {
   this.createTextElement_();
   if (this.class_) {
     Blockly.utils.dom.addClass(
@@ -103,7 +104,7 @@ Blockly.FieldLabel.prototype.initView = function() {
  * @return {?string} A valid string, or null if invalid.
  * @protected
  */
-Blockly.FieldLabel.prototype.doClassValidation_ = function(opt_newValue) {
+FieldLabel.prototype.doClassValidation_ = function(opt_newValue) {
   if (opt_newValue === null || opt_newValue === undefined) {
     return null;
   }
@@ -114,7 +115,7 @@ Blockly.FieldLabel.prototype.doClassValidation_ = function(opt_newValue) {
  * Set the CSS class applied to the field's textElement_.
  * @param {?string} cssClass The new CSS class name, or null to remove.
  */
-Blockly.FieldLabel.prototype.setClass = function(cssClass) {
+FieldLabel.prototype.setClass = function(cssClass) {
   if (this.textElement_) {
     // This check isn't necessary, but it's faster than letting removeClass
     // figure it out.
@@ -128,4 +129,6 @@ Blockly.FieldLabel.prototype.setClass = function(cssClass) {
   this.class_ = cssClass;
 };
 
-Blockly.fieldRegistry.register('field_label', Blockly.FieldLabel);
+Blockly.fieldRegistry.register('field_label', FieldLabel);
+
+exports = FieldLabel;
diff --git a/tests/deps.js b/tests/deps.js
index 3dc163ac5..9b2ca48af 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -54,7 +54,7 @@ goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['
 goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.IdGenerator', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['Blockly.DropDownDiv', 'Blockly.Field', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabelSerializable'], ['Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 4945825d6edeeed9728751cd27755dbe341c5ff5 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 21 Jul 2021 15:33:37 -0700
Subject: [PATCH 323/833] Migrate core/field_label.js named requires

---
 core/field_label.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/field_label.js b/core/field_label.js
index 4c15d4f96..c6f1bbcd8 100644
--- a/core/field_label.js
+++ b/core/field_label.js
@@ -14,11 +14,11 @@
 goog.module('Blockly.FieldLabel');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Field');
-goog.require('Blockly.fieldRegistry');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
+const Field = goog.require('Blockly.Field');
+const fieldRegistry = goog.require('Blockly.fieldRegistry');
+const dom = goog.require('Blockly.utils.dom');
+const {inherits} = goog.require('Blockly.utils.object');
+const {replaceMessageReferences} = goog.require('Blockly.utils');
 
 
 /**
@@ -29,7 +29,7 @@ goog.require('Blockly.utils.object');
  * @param {Object=} opt_config A map of options used to configure the field.
  *    See the [field creation documentation]{@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/label#creation}
  *    for a list of properties this parameter supports.
- * @extends {Blockly.Field}
+ * @extends {Field}
  * @constructor
  */
 const FieldLabel = function(opt_value, opt_class, opt_config) {
@@ -47,7 +47,7 @@ const FieldLabel = function(opt_value, opt_class, opt_config) {
     this.class_ = opt_class || null;
   }
 };
-Blockly.utils.object.inherits(FieldLabel, Blockly.Field);
+inherits(FieldLabel, Field);
 
 /**
  * The default value for this field.
@@ -65,7 +65,7 @@ FieldLabel.prototype.DEFAULT_VALUE = '';
  * @nocollapse
  */
 FieldLabel.fromJson = function(options) {
-  const text = Blockly.utils.replaceMessageReferences(options['text']);
+  const text = replaceMessageReferences(options['text']);
   // `this` might be a subclass of FieldLabel if that class doesn't override
   // the static fromJson method.
   return new this(text, undefined, options);
@@ -93,7 +93,7 @@ FieldLabel.prototype.configure_ = function(config) {
 FieldLabel.prototype.initView = function() {
   this.createTextElement_();
   if (this.class_) {
-    Blockly.utils.dom.addClass(
+    dom.addClass(
         /** @type {!SVGTextElement} */ (this.textElement_), this.class_);
   }
 };
@@ -120,15 +120,15 @@ FieldLabel.prototype.setClass = function(cssClass) {
     // This check isn't necessary, but it's faster than letting removeClass
     // figure it out.
     if (this.class_) {
-      Blockly.utils.dom.removeClass(this.textElement_, this.class_);
+      dom.removeClass(this.textElement_, this.class_);
     }
     if (cssClass) {
-      Blockly.utils.dom.addClass(this.textElement_, cssClass);
+      dom.addClass(this.textElement_, cssClass);
     }
   }
   this.class_ = cssClass;
 };
 
-Blockly.fieldRegistry.register('field_label', FieldLabel);
+fieldRegistry.register('field_label', FieldLabel);
 
 exports = FieldLabel;

From 0889defe55645de721ba84e56e2e26c4d1baf1ad Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 22 Jul 2021 10:22:33 -0700
Subject: [PATCH 324/833] clang-format core/field_label.js

---
 core/field_label.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/field_label.js b/core/field_label.js
index c6f1bbcd8..8d23bbb18 100644
--- a/core/field_label.js
+++ b/core/field_label.js
@@ -27,7 +27,8 @@ const {replaceMessageReferences} = goog.require('Blockly.utils');
  *    string. Defaults to an empty string if null or undefined.
  * @param {string=} opt_class Optional CSS class for the field's text.
  * @param {Object=} opt_config A map of options used to configure the field.
- *    See the [field creation documentation]{@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/label#creation}
+ *    See the [field creation documentation]{@link
+ * https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/label#creation}
  *    for a list of properties this parameter supports.
  * @extends {Field}
  * @constructor
@@ -40,8 +41,7 @@ const FieldLabel = function(opt_value, opt_class, opt_config) {
    */
   this.class_ = null;
 
-  FieldLabel.superClass_.constructor.call(
-      this, opt_value, null, opt_config);
+  FieldLabel.superClass_.constructor.call(this, opt_value, null, opt_config);
 
   if (!opt_config) {  // If the config was not passed use old configuration.
     this.class_ = opt_class || null;

From e997330085edd26b57dd254ae4622bb6186c4d40 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 22 Jul 2021 10:24:42 -0700
Subject: [PATCH 325/833] Fix require order in core/field_label.js

---
 core/field_label.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/field_label.js b/core/field_label.js
index 8d23bbb18..822d476ab 100644
--- a/core/field_label.js
+++ b/core/field_label.js
@@ -15,8 +15,8 @@ goog.module('Blockly.FieldLabel');
 goog.module.declareLegacyNamespace();
 
 const Field = goog.require('Blockly.Field');
-const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const dom = goog.require('Blockly.utils.dom');
+const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const {inherits} = goog.require('Blockly.utils.object');
 const {replaceMessageReferences} = goog.require('Blockly.utils');
 

From ccd314279e022002fe4feaa1011e43dd6c66c5de Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 09:24:43 -0700
Subject: [PATCH 326/833] Migrate core/registry.js to ES6 const/let

---
 core/registry.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/registry.js b/core/registry.js
index 2959cf73e..0ea2883f8 100644
--- a/core/registry.js
+++ b/core/registry.js
@@ -139,7 +139,7 @@ Blockly.registry.register = function(
   if (!registryItem) {
     throw Error('Can not register a null value');
   }
-  var typeRegistry = Blockly.registry.typeMap_[type];
+  let typeRegistry = Blockly.registry.typeMap_[type];
   // If the type registry has not been created, create it.
   if (!typeRegistry) {
     typeRegistry = Blockly.registry.typeMap_[type] = Object.create(null);
@@ -184,7 +184,7 @@ Blockly.registry.validate_ = function(type, registryItem) {
 Blockly.registry.unregister = function(type, name) {
   type = String(type).toLowerCase();
   name = name.toLowerCase();
-  var typeRegistry = Blockly.registry.typeMap_[type];
+  const typeRegistry = Blockly.registry.typeMap_[type];
   if (!typeRegistry || !typeRegistry[name]) {
     console.warn('Unable to unregister [' + name + '][' + type + '] from the ' +
       'registry.');
@@ -208,9 +208,9 @@ Blockly.registry.unregister = function(type, name) {
 Blockly.registry.getItem_ = function(type, name, opt_throwIfMissing) {
   type = String(type).toLowerCase();
   name = name.toLowerCase();
-  var typeRegistry = Blockly.registry.typeMap_[type];
+  const typeRegistry = Blockly.registry.typeMap_[type];
   if (!typeRegistry || !typeRegistry[name]) {
-    var msg = 'Unable to find [' + name + '][' + type + '] in the registry.';
+    const msg = 'Unable to find [' + name + '][' + type + '] in the registry.';
     if (opt_throwIfMissing) {
       throw new Error(msg + ' You must require or register a ' + type +
         ' plugin.');
@@ -235,7 +235,7 @@ Blockly.registry.getItem_ = function(type, name, opt_throwIfMissing) {
 Blockly.registry.hasItem = function(type, name) {
   type = String(type).toLowerCase();
   name = name.toLowerCase();
-  var typeRegistry = Blockly.registry.typeMap_[type];
+  const typeRegistry = Blockly.registry.typeMap_[type];
   if (!typeRegistry) {
     return false;
   }
@@ -286,8 +286,8 @@ Blockly.registry.getObject = function(type, name, opt_throwIfMissing) {
  */
 Blockly.registry.getClassFromOptions = function(type, options,
     opt_throwIfMissing) {
-  var typeName = type.toString();
-  var plugin = options.plugins[typeName] || Blockly.registry.DEFAULT;
+  const typeName = type.toString();
+  const plugin = options.plugins[typeName] || Blockly.registry.DEFAULT;
 
   // If the user passed in a plugin class instead of a registered plugin name.
   if (typeof plugin == 'function') {

From 6ce759d15e02ffbd7bddb5902ccf7dca93d9f7f7 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 09:40:02 -0700
Subject: [PATCH 327/833] Migrate core/registry.js to goog.module

---
 core/registry.js | 138 +++++++++++++++++++++++++----------------------
 tests/deps.js    |   2 +-
 2 files changed, 75 insertions(+), 65 deletions(-)

diff --git a/core/registry.js b/core/registry.js
index 0ea2883f8..9d7d72201 100644
--- a/core/registry.js
+++ b/core/registry.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.registry');
+goog.module('Blockly.registry');
+goog.module.declareLegacyNamespace();
 
 goog.requireType('Blockly.blockRendering.Renderer');
 goog.requireType('Blockly.Cursor');
@@ -34,13 +35,16 @@ goog.requireType('Blockly.ToolboxItem');
  *
  * @type {Object<string, Object<string, function(new:?)>>}
  */
-Blockly.registry.typeMap_ = Object.create(null);
+const typeMap = Object.create(null);
+/** @private */
+exports.typeMap_ = typeMap;
 
 /**
  * The string used to register the default class for a type of plugin.
  * @type {string}
  */
-Blockly.registry.DEFAULT = 'default';
+const DEFAULT = 'default';
+exports.DEFAULT = DEFAULT;
 
 /**
  * A name with the type of the element stored in the generic.
@@ -48,67 +52,68 @@ Blockly.registry.DEFAULT = 'default';
  * @constructor
  * @template T
  */
-Blockly.registry.Type = function(name) {
+const Type = function(name) {
   /**
    * @type {string}
    * @private
    */
   this.name_ = name;
 };
+exports.Type = Type;
 
 /**
  * Returns the name of the type.
  * @return {string} The name.
  * @override
  */
-Blockly.registry.Type.prototype.toString = function() {
+Type.prototype.toString = function() {
   return this.name_;
 };
 
-/** @type {!Blockly.registry.Type<Blockly.IConnectionChecker>} */
-Blockly.registry.Type.CONNECTION_CHECKER =
-    new Blockly.registry.Type('connectionChecker');
+/** @type {!Type<Blockly.IConnectionChecker>} */
+Type.CONNECTION_CHECKER =
+    new Type('connectionChecker');
 
-/** @type {!Blockly.registry.Type<Blockly.Cursor>} */
-Blockly.registry.Type.CURSOR = new Blockly.registry.Type('cursor');
+/** @type {!Type<Blockly.Cursor>} */
+Type.CURSOR = new Type('cursor');
 
-/** @type {!Blockly.registry.Type<Blockly.Events.Abstract>} */
-Blockly.registry.Type.EVENT = new Blockly.registry.Type('event');
+/** @type {!Type<Blockly.Events.Abstract>} */
+Type.EVENT = new Type('event');
 
-/** @type {!Blockly.registry.Type<Blockly.Field>} */
-Blockly.registry.Type.FIELD = new Blockly.registry.Type('field');
+/** @type {!Type<Blockly.Field>} */
+Type.FIELD = new Type('field');
 
-/** @type {!Blockly.registry.Type<Blockly.blockRendering.Renderer>} */
-Blockly.registry.Type.RENDERER = new Blockly.registry.Type('renderer');
+/** @type {!Type<Blockly.blockRendering.Renderer>} */
+Type.RENDERER = new Type('renderer');
 
-/** @type {!Blockly.registry.Type<Blockly.IToolbox>} */
-Blockly.registry.Type.TOOLBOX = new Blockly.registry.Type('toolbox');
+/** @type {!Type<Blockly.IToolbox>} */
+Type.TOOLBOX = new Type('toolbox');
 
-/** @type {!Blockly.registry.Type<Blockly.Theme>} */
-Blockly.registry.Type.THEME = new Blockly.registry.Type('theme');
+/** @type {!Type<Blockly.Theme>} */
+Type.THEME = new Type('theme');
 
-/** @type {!Blockly.registry.Type<Blockly.ToolboxItem>} */
-Blockly.registry.Type.TOOLBOX_ITEM = new Blockly.registry.Type('toolboxItem');
+/** @type {!Type<Blockly.ToolboxItem>} */
+Type.TOOLBOX_ITEM = new Type('toolboxItem');
 
-/** @type {!Blockly.registry.Type<Blockly.IFlyout>} */
-Blockly.registry.Type.FLYOUTS_VERTICAL_TOOLBOX =
-    new Blockly.registry.Type('flyoutsVerticalToolbox');
+/** @type {!Type<Blockly.IFlyout>} */
+Type.FLYOUTS_VERTICAL_TOOLBOX =
+    new Type('flyoutsVerticalToolbox');
 
-/** @type {!Blockly.registry.Type<Blockly.IFlyout>} */
-Blockly.registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX =
-    new Blockly.registry.Type('flyoutsHorizontalToolbox');
+/** @type {!Type<Blockly.IFlyout>} */
+Type.FLYOUTS_HORIZONTAL_TOOLBOX =
+    new Type('flyoutsHorizontalToolbox');
 
-/** @type {!Blockly.registry.Type<Blockly.IMetricsManager>} */
-Blockly.registry.Type.METRICS_MANAGER =
-    new Blockly.registry.Type('metricsManager');
+/** @type {!Type<Blockly.IMetricsManager>} */
+Type.METRICS_MANAGER =
+    new Type('metricsManager');
 
-/** @type {!Blockly.registry.Type<Blockly.IBlockDragger>} */
-Blockly.registry.Type.BLOCK_DRAGGER =
-    new Blockly.registry.Type('blockDragger');
+/** @type {!Type<Blockly.IBlockDragger>} */
+Type.BLOCK_DRAGGER =
+    new Type('blockDragger');
 
 /**
  * Registers a class based on a type and name.
- * @param {string|!Blockly.registry.Type<T>} type The type of the plugin.
+ * @param {string|!Type<T>} type The type of the plugin.
  *     (e.g. Field, Renderer)
  * @param {string} name The plugin's name. (Ex. field_angle, geras)
  * @param {?function(new:T, ...?)|Object} registryItem The class or object to
@@ -120,13 +125,13 @@ Blockly.registry.Type.BLOCK_DRAGGER =
  * it's type.
  * @template T
  */
-Blockly.registry.register = function(
+const register = function(
     type, name, registryItem, opt_allowOverrides) {
-  if ((!(type instanceof Blockly.registry.Type) && typeof type != 'string') ||
+  if ((!(type instanceof Type) && typeof type != 'string') ||
       String(type).trim() == '') {
     throw Error(
         'Invalid type "' + type + '". The type must be a' +
-        ' non-empty string or a Blockly.registry.Type.');
+        ' non-empty string or a Type.');
   }
   type = String(type).toLowerCase();
 
@@ -139,14 +144,14 @@ Blockly.registry.register = function(
   if (!registryItem) {
     throw Error('Can not register a null value');
   }
-  let typeRegistry = Blockly.registry.typeMap_[type];
+  let typeRegistry = typeMap[type];
   // If the type registry has not been created, create it.
   if (!typeRegistry) {
-    typeRegistry = Blockly.registry.typeMap_[type] = Object.create(null);
+    typeRegistry = typeMap[type] = Object.create(null);
   }
 
   // Validate that the given class has all the required properties.
-  Blockly.registry.validate_(type, registryItem);
+  validate(type, registryItem);
 
   // Don't throw an error if opt_allowOverrides is true.
   if (!opt_allowOverrides && typeRegistry[name]) {
@@ -155,6 +160,7 @@ Blockly.registry.register = function(
   }
   typeRegistry[name] = registryItem;
 };
+exports.register = register;
 
 /**
  * Checks the given registry item for properties that are required based on the
@@ -162,11 +168,10 @@ Blockly.registry.register = function(
  * @param {string} type The type of the plugin. (e.g. Field, Renderer)
  * @param {Function|Object} registryItem A class or object that we are checking
  *     for the required properties.
- * @private
  */
-Blockly.registry.validate_ = function(type, registryItem) {
+const validate = function(type, registryItem) {
   switch (type) {
-    case String(Blockly.registry.Type.FIELD):
+    case String(Type.FIELD):
       if (typeof registryItem.fromJson != 'function') {
         throw Error('Type "' + type + '" must have a fromJson function');
       }
@@ -176,27 +181,28 @@ Blockly.registry.validate_ = function(type, registryItem) {
 
 /**
  * Unregisters the registry item with the given type and name.
- * @param {string|!Blockly.registry.Type<T>} type The type of the plugin.
+ * @param {string|!Type<T>} type The type of the plugin.
  *     (e.g. Field, Renderer)
  * @param {string} name The plugin's name. (Ex. field_angle, geras)
  * @template T
  */
-Blockly.registry.unregister = function(type, name) {
+const unregister = function(type, name) {
   type = String(type).toLowerCase();
   name = name.toLowerCase();
-  const typeRegistry = Blockly.registry.typeMap_[type];
+  const typeRegistry = typeMap[type];
   if (!typeRegistry || !typeRegistry[name]) {
     console.warn('Unable to unregister [' + name + '][' + type + '] from the ' +
       'registry.');
     return;
   }
-  delete Blockly.registry.typeMap_[type][name];
+  delete typeMap[type][name];
 };
+exports.unregister = unregister;
 
 /**
  * Gets the registry item for the given name and type. This can be either a
  * class or an object.
- * @param {string|!Blockly.registry.Type<T>} type The type of the plugin.
+ * @param {string|!Type<T>} type The type of the plugin.
  *     (e.g. Field, Renderer)
  * @param {string} name The plugin's name. (Ex. field_angle, geras)
  * @param {boolean=} opt_throwIfMissing Whether or not to throw an error if we
@@ -205,10 +211,10 @@ Blockly.registry.unregister = function(type, name) {
  *     name and type or null if none exists.
  * @template T
  */
-Blockly.registry.getItem_ = function(type, name, opt_throwIfMissing) {
+const getItem = function(type, name, opt_throwIfMissing) {
   type = String(type).toLowerCase();
   name = name.toLowerCase();
-  const typeRegistry = Blockly.registry.typeMap_[type];
+  const typeRegistry = typeMap[type];
   if (!typeRegistry || !typeRegistry[name]) {
     const msg = 'Unable to find [' + name + '][' + type + '] in the registry.';
     if (opt_throwIfMissing) {
@@ -225,26 +231,27 @@ Blockly.registry.getItem_ = function(type, name, opt_throwIfMissing) {
 /**
  * Returns whether or not the registry contains an item with the given type and
  * name.
- * @param {string|!Blockly.registry.Type<T>} type The type of the plugin.
+ * @param {string|!Type<T>} type The type of the plugin.
  *     (e.g. Field, Renderer)
  * @param {string} name The plugin's name. (Ex. field_angle, geras)
  * @return {boolean} True if the registry has an item with the given type and
  *     name, false otherwise.
  * @template T
  */
-Blockly.registry.hasItem = function(type, name) {
+const hasItem = function(type, name) {
   type = String(type).toLowerCase();
   name = name.toLowerCase();
-  const typeRegistry = Blockly.registry.typeMap_[type];
+  const typeRegistry = typeMap[type];
   if (!typeRegistry) {
     return false;
   }
   return !!(typeRegistry[name]);
 };
+exports.hasItem = hasItem;
 
 /**
  * Gets the class for the given name and type.
- * @param {string|!Blockly.registry.Type<T>} type The type of the plugin.
+ * @param {string|!Type<T>} type The type of the plugin.
  *     (e.g. Field, Renderer)
  * @param {string} name The plugin's name. (Ex. field_angle, geras)
  * @param {boolean=} opt_throwIfMissing Whether or not to throw an error if we
@@ -253,14 +260,15 @@ Blockly.registry.hasItem = function(type, name) {
  *     null if none exists.
  * @template T
  */
-Blockly.registry.getClass = function(type, name, opt_throwIfMissing) {
+const getClass = function(type, name, opt_throwIfMissing) {
   return /** @type {?function(new:T, ...?)} */ (
-    Blockly.registry.getItem_(type, name, opt_throwIfMissing));
+    getItem(type, name, opt_throwIfMissing));
 };
+exports.getClass = getClass;
 
 /**
  * Gets the object for the given name and type.
- * @param {string|!Blockly.registry.Type<T>} type The type of the plugin.
+ * @param {string|!Type<T>} type The type of the plugin.
  *     (e.g. Category)
  * @param {string} name The plugin's name. (Ex. logic_category)
  * @param {boolean=} opt_throwIfMissing Whether or not to throw an error if we
@@ -268,15 +276,16 @@ Blockly.registry.getClass = function(type, name, opt_throwIfMissing) {
  * @return {?T} The object with the given name and type or null if none exists.
  * @template T
  */
-Blockly.registry.getObject = function(type, name, opt_throwIfMissing) {
+const getObject = function(type, name, opt_throwIfMissing) {
   return /** @type {T} */ (
-    Blockly.registry.getItem_(type, name, opt_throwIfMissing));
+    getItem(type, name, opt_throwIfMissing));
 };
+exports.getObject = getObject;
 
 /**
  * Gets the class from Blockly options for the given type.
  * This is used for plugins that override a built in feature. (e.g. Toolbox)
- * @param {!Blockly.registry.Type<T>} type The type of the plugin.
+ * @param {!Type<T>} type The type of the plugin.
  * @param {!Blockly.Options} options The option object to check for the given
  *     plugin.
  * @param {boolean=} opt_throwIfMissing Whether or not to throw an error if we
@@ -284,14 +293,15 @@ Blockly.registry.getObject = function(type, name, opt_throwIfMissing) {
  * @return {?function(new:T, ...?)} The class for the plugin.
  * @template T
  */
-Blockly.registry.getClassFromOptions = function(type, options,
+const getClassFromOptions = function(type, options,
     opt_throwIfMissing) {
   const typeName = type.toString();
-  const plugin = options.plugins[typeName] || Blockly.registry.DEFAULT;
+  const plugin = options.plugins[typeName] || DEFAULT;
 
   // If the user passed in a plugin class instead of a registered plugin name.
   if (typeof plugin == 'function') {
     return plugin;
   }
-  return Blockly.registry.getClass(type, plugin, opt_throwIfMissing);
+  return getClass(type, plugin, opt_throwIfMissing);
 };
+exports.getClassFromOptions = getClassFromOptions;
diff --git a/tests/deps.js b/tests/deps.js
index de575339f..93d8ee6a0 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -117,7 +117,7 @@ goog.addDependency('../../core/names.js', ['Blockly.Names'], ['Blockly.Msg', 'Bl
 goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.Metrics', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.xml']);
-goog.addDependency('../../core/registry.js', ['Blockly.registry'], []);
+goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry']);
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es5'});

From 71e187adc9af78b56c171ebaf46c8d7926172a28 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 22 Jul 2021 17:59:35 -0700
Subject: [PATCH 328/833] Migrate core/gesture.js to ES6 const/let

---
 core/gesture.js | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/core/gesture.js b/core/gesture.js
index 483d73a25..59dbd57f0 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -266,8 +266,8 @@ Blockly.Gesture.prototype.dispose = function() {
  * @private
  */
 Blockly.Gesture.prototype.updateFromEvent_ = function(e) {
-  var currentXY = new Blockly.utils.Coordinate(e.clientX, e.clientY);
-  var changed = this.updateDragDelta_(currentXY);
+  const currentXY = new Blockly.utils.Coordinate(e.clientX, e.clientY);
+  const changed = this.updateDragDelta_(currentXY);
   // Exceeded the drag radius for the first time.
   if (changed) {
     this.updateIsDragging_();
@@ -290,11 +290,11 @@ Blockly.Gesture.prototype.updateDragDelta_ = function(currentXY) {
       /** @type {!Blockly.utils.Coordinate} */ (this.mouseDownXY_));
 
   if (!this.hasExceededDragRadius_) {
-    var currentDragDelta =
+    const currentDragDelta =
         Blockly.utils.Coordinate.magnitude(this.currentDragDeltaXY_);
 
     // The flyout has a different drag radius from the rest of Blockly.
-    var limitRadius = this.flyout_ ?
+    const limitRadius = this.flyout_ ?
         Blockly.internalConstants.FLYOUT_DRAG_RADIUS :
         Blockly.internalConstants.DRAG_RADIUS;
 
@@ -394,7 +394,7 @@ Blockly.Gesture.prototype.updateIsDraggingBlock_ = function() {
  * @private
  */
 Blockly.Gesture.prototype.updateIsDraggingWorkspace_ = function() {
-  var wsMovable = this.flyout_ ?
+  const wsMovable = this.flyout_ ?
       this.flyout_.isScrollable() :
       this.startWorkspace_ && this.startWorkspace_.isDraggable();
 
@@ -439,8 +439,9 @@ Blockly.Gesture.prototype.updateIsDragging_ = function() {
  * @private
  */
 Blockly.Gesture.prototype.startDraggingBlock_ = function() {
-  var BlockDraggerClass = Blockly.registry.getClassFromOptions(
-      Blockly.registry.Type.BLOCK_DRAGGER, this.creatorWorkspace_.options, true);
+  const BlockDraggerClass = Blockly.registry.getClassFromOptions(
+      Blockly.registry.Type.BLOCK_DRAGGER, this.creatorWorkspace_.options,
+      true);
 
   this.blockDragger_ = new BlockDraggerClass(
       /** @type {!Blockly.BlockSvg} */ (this.targetBlock_),
@@ -747,12 +748,12 @@ Blockly.Gesture.prototype.doBlockClick_ = function() {
       if (!Blockly.Events.getGroup()) {
         Blockly.Events.setGroup(true);
       }
-      var newBlock = this.flyout_.createBlock(this.targetBlock_);
+      const newBlock = this.flyout_.createBlock(this.targetBlock_);
       newBlock.scheduleSnapAndBump();
     }
   } else {
     // Clicks events are on the start block, even if it was a shadow.
-    var event = new (Blockly.Events.get(Blockly.Events.CLICK))(
+    const event = new (Blockly.Events.get(Blockly.Events.CLICK))(
         this.startBlock_, this.startWorkspace_.id, 'block');
     Blockly.Events.fire(event);
   }
@@ -767,7 +768,7 @@ Blockly.Gesture.prototype.doBlockClick_ = function() {
  * @private
  */
 Blockly.Gesture.prototype.doWorkspaceClick_ = function(_e) {
-  var ws = this.creatorWorkspace_;
+  const ws = this.creatorWorkspace_;
   if (Blockly.selected) {
     Blockly.selected.unselect();
   }
@@ -888,7 +889,7 @@ Blockly.Gesture.prototype.setStartFlyout_ = function(flyout) {
  */
 Blockly.Gesture.prototype.isBubbleClick_ = function() {
   // A bubble click starts on a bubble and never escapes the drag radius.
-  var hasStartBubble = !!this.startBubble_;
+  const hasStartBubble = !!this.startBubble_;
   return hasStartBubble && !this.hasExceededDragRadius_;
 };
 
@@ -901,7 +902,7 @@ Blockly.Gesture.prototype.isBubbleClick_ = function() {
 Blockly.Gesture.prototype.isBlockClick_ = function() {
   // A block click starts on a block, never escapes the drag radius, and is not
   // a field click.
-  var hasStartBlock = !!this.startBlock_;
+  const hasStartBlock = !!this.startBlock_;
   return hasStartBlock && !this.hasExceededDragRadius_ && !this.isFieldClick_();
 };
 
@@ -912,7 +913,7 @@ Blockly.Gesture.prototype.isBlockClick_ = function() {
  * @private
  */
 Blockly.Gesture.prototype.isFieldClick_ = function() {
-  var fieldClickable =
+  const fieldClickable =
       this.startField_ ? this.startField_.isClickable() : false;
   return fieldClickable && !this.hasExceededDragRadius_ &&
       (!this.flyout_ || !this.flyout_.autoClose);
@@ -925,7 +926,7 @@ Blockly.Gesture.prototype.isFieldClick_ = function() {
  * @private
  */
 Blockly.Gesture.prototype.isWorkspaceClick_ = function() {
-  var onlyTouchedWorkspace =
+  const onlyTouchedWorkspace =
       !this.startBlock_ && !this.startBubble_ && !this.startField_;
   return onlyTouchedWorkspace && !this.hasExceededDragRadius_;
 };
@@ -991,8 +992,8 @@ Blockly.Gesture.prototype.getCurrentDragger = function() {
  * @return {boolean} True if gesture is occurring.
  */
 Blockly.Gesture.inProgress = function() {
-  var workspaces = Blockly.Workspace.getAll();
-  for (var i = 0, workspace; (workspace = workspaces[i]); i++) {
+  const workspaces = Blockly.Workspace.getAll();
+  for (let i = 0, workspace; (workspace = workspaces[i]); i++) {
     if (workspace.currentGesture_) {
       return true;
     }

From 1d847eda4a847ad0ac77326db8a79cbd7d2e3893 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 23 Jul 2021 18:45:51 -0700
Subject: [PATCH 329/833] Migrate core/gesture.js to goog.module

---
 core/gesture.js | 90 ++++++++++++++++++++++++++-----------------------
 tests/deps.js   |  2 +-
 2 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/core/gesture.js b/core/gesture.js
index 59dbd57f0..a5b786b5b 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Gesture');
+goog.module('Blockly.Gesture');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockAnimations');
 /** @suppress {extraRequire} */
@@ -22,6 +23,7 @@ goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.Click');
 goog.require('Blockly.internalConstants');
+goog.require('Blockly.registry');
 goog.require('Blockly.Tooltip');
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
@@ -50,7 +52,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  *     this gesture and has a reference to it.
  * @constructor
  */
-Blockly.Gesture = function(e, creatorWorkspace) {
+const Gesture = function(e, creatorWorkspace) {
   /**
    * The position of the mouse when the gesture started.  Units are CSS pixels,
    * with (0, 0) at the top left of the browser window (mouseEvent clientX/Y).
@@ -236,7 +238,7 @@ Blockly.Gesture = function(e, creatorWorkspace) {
  * Sever all links from this object.
  * @package
  */
-Blockly.Gesture.prototype.dispose = function() {
+Gesture.prototype.dispose = function() {
   Blockly.Touch.clearTouchIdentifier();
   Blockly.Tooltip.unblock();
   // Clear the owner's reference to this gesture.
@@ -265,7 +267,7 @@ Blockly.Gesture.prototype.dispose = function() {
  * @param {!Event} e The most recent mouse or touch event.
  * @private
  */
-Blockly.Gesture.prototype.updateFromEvent_ = function(e) {
+Gesture.prototype.updateFromEvent_ = function(e) {
   const currentXY = new Blockly.utils.Coordinate(e.clientX, e.clientY);
   const changed = this.updateDragDelta_(currentXY);
   // Exceeded the drag radius for the first time.
@@ -284,7 +286,7 @@ Blockly.Gesture.prototype.updateFromEvent_ = function(e) {
  *     first time.
  * @private
  */
-Blockly.Gesture.prototype.updateDragDelta_ = function(currentXY) {
+Gesture.prototype.updateDragDelta_ = function(currentXY) {
   this.currentDragDeltaXY_ = Blockly.utils.Coordinate.difference(
       currentXY,
       /** @type {!Blockly.utils.Coordinate} */ (this.mouseDownXY_));
@@ -314,7 +316,7 @@ Blockly.Gesture.prototype.updateDragDelta_ = function(currentXY) {
  * @return {boolean} True if a block is being dragged from the flyout.
  * @private
  */
-Blockly.Gesture.prototype.updateIsDraggingFromFlyout_ = function() {
+Gesture.prototype.updateIsDraggingFromFlyout_ = function() {
   if (!this.targetBlock_) {
     return false;
   }
@@ -348,7 +350,7 @@ Blockly.Gesture.prototype.updateIsDraggingFromFlyout_ = function() {
  * @return {boolean} True if a bubble is being dragged.
  * @private
  */
-Blockly.Gesture.prototype.updateIsDraggingBubble_ = function() {
+Gesture.prototype.updateIsDraggingBubble_ = function() {
   if (!this.startBubble_) {
     return false;
   }
@@ -367,7 +369,7 @@ Blockly.Gesture.prototype.updateIsDraggingBubble_ = function() {
  * @return {boolean} True if a block is being dragged.
  * @private
  */
-Blockly.Gesture.prototype.updateIsDraggingBlock_ = function() {
+Gesture.prototype.updateIsDraggingBlock_ = function() {
   if (!this.targetBlock_) {
     return false;
   }
@@ -393,7 +395,7 @@ Blockly.Gesture.prototype.updateIsDraggingBlock_ = function() {
  * WorkspaceDragger and starts the drag.
  * @private
  */
-Blockly.Gesture.prototype.updateIsDraggingWorkspace_ = function() {
+Gesture.prototype.updateIsDraggingWorkspace_ = function() {
   const wsMovable = this.flyout_ ?
       this.flyout_.isScrollable() :
       this.startWorkspace_ && this.startWorkspace_.isDraggable();
@@ -415,7 +417,7 @@ Blockly.Gesture.prototype.updateIsDraggingWorkspace_ = function() {
  * drag radius is exceeded.  It should be called no more than once per gesture.
  * @private
  */
-Blockly.Gesture.prototype.updateIsDragging_ = function() {
+Gesture.prototype.updateIsDragging_ = function() {
   // Sanity check.
   if (this.calledUpdateIsDragging_) {
     throw Error('updateIsDragging_ should only be called once per gesture.');
@@ -438,7 +440,7 @@ Blockly.Gesture.prototype.updateIsDragging_ = function() {
  * Create a block dragger and start dragging the selected block.
  * @private
  */
-Blockly.Gesture.prototype.startDraggingBlock_ = function() {
+Gesture.prototype.startDraggingBlock_ = function() {
   const BlockDraggerClass = Blockly.registry.getClassFromOptions(
       Blockly.registry.Type.BLOCK_DRAGGER, this.creatorWorkspace_.options,
       true);
@@ -455,7 +457,7 @@ Blockly.Gesture.prototype.startDraggingBlock_ = function() {
  * @private
  */
 // TODO (fenichel): Possibly combine this and startDraggingBlock_.
-Blockly.Gesture.prototype.startDraggingBubble_ = function() {
+Gesture.prototype.startDraggingBubble_ = function() {
   this.bubbleDragger_ = new Blockly.BubbleDragger(
       /** @type {!Blockly.IBubble} */ (this.startBubble_),
       /** @type {!Blockly.WorkspaceSvg} */ (this.startWorkspace_));
@@ -469,7 +471,7 @@ Blockly.Gesture.prototype.startDraggingBubble_ = function() {
  * @param {!Event} e A mouse down or touch start event.
  * @package
  */
-Blockly.Gesture.prototype.doStart = function(e) {
+Gesture.prototype.doStart = function(e) {
   if (Blockly.utils.isTargetInput(e)) {
     this.cancel();
     return;
@@ -519,7 +521,7 @@ Blockly.Gesture.prototype.doStart = function(e) {
  * @param {!Event} e A mouse down or touch start event.
  * @package
  */
-Blockly.Gesture.prototype.bindMouseEvents = function(e) {
+Gesture.prototype.bindMouseEvents = function(e) {
   this.onMoveWrapper_ = Blockly.browserEvents.conditionalBind(
       document, 'mousemove', null, this.handleMove.bind(this));
   this.onUpWrapper_ = Blockly.browserEvents.conditionalBind(
@@ -534,7 +536,7 @@ Blockly.Gesture.prototype.bindMouseEvents = function(e) {
  * @param {!Event} e A mouse move or touch move event.
  * @package
  */
-Blockly.Gesture.prototype.handleMove = function(e) {
+Gesture.prototype.handleMove = function(e) {
   this.updateFromEvent_(e);
   if (this.isDraggingWorkspace_) {
     this.workspaceDragger_.drag(this.currentDragDeltaXY_);
@@ -554,7 +556,7 @@ Blockly.Gesture.prototype.handleMove = function(e) {
  * @param {!Event} e A mouse up or touch end event.
  * @package
  */
-Blockly.Gesture.prototype.handleUp = function(e) {
+Gesture.prototype.handleUp = function(e) {
   this.updateFromEvent_(e);
   Blockly.longStop_();
 
@@ -596,7 +598,7 @@ Blockly.Gesture.prototype.handleUp = function(e) {
  * end the drag at the most recent location.
  * @package
  */
-Blockly.Gesture.prototype.cancel = function() {
+Gesture.prototype.cancel = function() {
   // Disposing of a block cancels in-progress drags, but dragging to a delete
   // area disposes of a block and leads to recursive disposal. Break that cycle.
   if (this.isEnding_) {
@@ -620,7 +622,7 @@ Blockly.Gesture.prototype.cancel = function() {
  * @param {!Event} e A mouse move or touch move event.
  * @package
  */
-Blockly.Gesture.prototype.handleRightClick = function(e) {
+Gesture.prototype.handleRightClick = function(e) {
   if (this.targetBlock_) {
     this.bringBlockToFront_();
     Blockly.hideChaff(!!this.flyout_);
@@ -645,7 +647,7 @@ Blockly.Gesture.prototype.handleRightClick = function(e) {
  * @param {!Blockly.WorkspaceSvg} ws The workspace the event hit.
  * @package
  */
-Blockly.Gesture.prototype.handleWsStart = function(e, ws) {
+Gesture.prototype.handleWsStart = function(e, ws) {
   if (this.hasStarted_) {
     throw Error(
         'Tried to call gesture.handleWsStart, ' +
@@ -661,7 +663,7 @@ Blockly.Gesture.prototype.handleWsStart = function(e, ws) {
  * @param {!Blockly.WorkspaceSvg} ws The workspace that a user clicks on.
  * @private
  */
-Blockly.Gesture.prototype.fireWorkspaceClick_ = function(ws) {
+Gesture.prototype.fireWorkspaceClick_ = function(ws) {
   Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.CLICK))(
       null, ws.id, 'workspace'));
 };
@@ -672,7 +674,7 @@ Blockly.Gesture.prototype.fireWorkspaceClick_ = function(ws) {
  * @param {!Blockly.IFlyout} flyout The flyout the event hit.
  * @package
  */
-Blockly.Gesture.prototype.handleFlyoutStart = function(e, flyout) {
+Gesture.prototype.handleFlyoutStart = function(e, flyout) {
   if (this.hasStarted_) {
     throw Error(
         'Tried to call gesture.handleFlyoutStart, ' +
@@ -688,7 +690,7 @@ Blockly.Gesture.prototype.handleFlyoutStart = function(e, flyout) {
  * @param {!Blockly.BlockSvg} block The block the event hit.
  * @package
  */
-Blockly.Gesture.prototype.handleBlockStart = function(e, block) {
+Gesture.prototype.handleBlockStart = function(e, block) {
   if (this.hasStarted_) {
     throw Error(
         'Tried to call gesture.handleBlockStart, ' +
@@ -704,7 +706,7 @@ Blockly.Gesture.prototype.handleBlockStart = function(e, block) {
  * @param {!Blockly.IBubble} bubble The bubble the event hit.
  * @package
  */
-Blockly.Gesture.prototype.handleBubbleStart = function(e, bubble) {
+Gesture.prototype.handleBubbleStart = function(e, bubble) {
   if (this.hasStarted_) {
     throw Error(
         'Tried to call gesture.handleBubbleStart, ' +
@@ -722,7 +724,7 @@ Blockly.Gesture.prototype.handleBubbleStart = function(e, bubble) {
  * Execute a bubble click.
  * @private
  */
-Blockly.Gesture.prototype.doBubbleClick_ = function() {
+Gesture.prototype.doBubbleClick_ = function() {
   // TODO (#1673): Consistent handling of single clicks.
   this.startBubble_.setFocus && this.startBubble_.setFocus();
   this.startBubble_.select && this.startBubble_.select();
@@ -732,7 +734,7 @@ Blockly.Gesture.prototype.doBubbleClick_ = function() {
  * Execute a field click.
  * @private
  */
-Blockly.Gesture.prototype.doFieldClick_ = function() {
+Gesture.prototype.doFieldClick_ = function() {
   this.startField_.showEditor(this.mostRecentEvent_);
   this.bringBlockToFront_();
 };
@@ -741,7 +743,7 @@ Blockly.Gesture.prototype.doFieldClick_ = function() {
  * Execute a block click.
  * @private
  */
-Blockly.Gesture.prototype.doBlockClick_ = function() {
+Gesture.prototype.doBlockClick_ = function() {
   // Block click in an autoclosing flyout.
   if (this.flyout_ && this.flyout_.autoClose) {
     if (this.targetBlock_.isEnabled()) {
@@ -767,7 +769,7 @@ Blockly.Gesture.prototype.doBlockClick_ = function() {
  * @param {!Event} _e A mouse up or touch end event.
  * @private
  */
-Blockly.Gesture.prototype.doWorkspaceClick_ = function(_e) {
+Gesture.prototype.doWorkspaceClick_ = function(_e) {
   const ws = this.creatorWorkspace_;
   if (Blockly.selected) {
     Blockly.selected.unselect();
@@ -784,7 +786,7 @@ Blockly.Gesture.prototype.doWorkspaceClick_ = function(_e) {
  * not occluded by other blocks.
  * @private
  */
-Blockly.Gesture.prototype.bringBlockToFront_ = function() {
+Gesture.prototype.bringBlockToFront_ = function() {
   // Blocks in the flyout don't overlap, so skip the work.
   if (this.targetBlock_ && !this.flyout_) {
     this.targetBlock_.bringToFront();
@@ -798,7 +800,7 @@ Blockly.Gesture.prototype.bringBlockToFront_ = function() {
  * @param {Blockly.Field} field The field the gesture started on.
  * @package
  */
-Blockly.Gesture.prototype.setStartField = function(field) {
+Gesture.prototype.setStartField = function(field) {
   if (this.hasStarted_) {
     throw Error(
         'Tried to call gesture.setStartField, ' +
@@ -814,7 +816,7 @@ Blockly.Gesture.prototype.setStartField = function(field) {
  * @param {Blockly.IBubble} bubble The bubble the gesture started on.
  * @package
  */
-Blockly.Gesture.prototype.setStartBubble = function(bubble) {
+Gesture.prototype.setStartBubble = function(bubble) {
   if (!this.startBubble_) {
     this.startBubble_ = bubble;
   }
@@ -826,7 +828,7 @@ Blockly.Gesture.prototype.setStartBubble = function(bubble) {
  * @param {Blockly.BlockSvg} block The block the gesture started on.
  * @package
  */
-Blockly.Gesture.prototype.setStartBlock = function(block) {
+Gesture.prototype.setStartBlock = function(block) {
   // If the gesture already went through a bubble, don't set the start block.
   if (!this.startBlock_ && !this.startBubble_) {
     this.startBlock_ = block;
@@ -845,7 +847,7 @@ Blockly.Gesture.prototype.setStartBlock = function(block) {
  * @param {Blockly.BlockSvg} block The block the gesture targets.
  * @private
  */
-Blockly.Gesture.prototype.setTargetBlock_ = function(block) {
+Gesture.prototype.setTargetBlock_ = function(block) {
   if (block.isShadow()) {
     this.setTargetBlock_(block.getParent());
   } else {
@@ -858,7 +860,7 @@ Blockly.Gesture.prototype.setTargetBlock_ = function(block) {
  * @param {Blockly.WorkspaceSvg} ws The workspace the gesture started on.
  * @private
  */
-Blockly.Gesture.prototype.setStartWorkspace_ = function(ws) {
+Gesture.prototype.setStartWorkspace_ = function(ws) {
   if (!this.startWorkspace_) {
     this.startWorkspace_ = ws;
   }
@@ -869,7 +871,7 @@ Blockly.Gesture.prototype.setStartWorkspace_ = function(ws) {
  * @param {Blockly.IFlyout} flyout The flyout the gesture started on.
  * @private
  */
-Blockly.Gesture.prototype.setStartFlyout_ = function(flyout) {
+Gesture.prototype.setStartFlyout_ = function(flyout) {
   if (!this.flyout_) {
     this.flyout_ = flyout;
   }
@@ -887,7 +889,7 @@ Blockly.Gesture.prototype.setStartFlyout_ = function(flyout) {
  * @return {boolean} Whether this gesture was a click on a bubble.
  * @private
  */
-Blockly.Gesture.prototype.isBubbleClick_ = function() {
+Gesture.prototype.isBubbleClick_ = function() {
   // A bubble click starts on a bubble and never escapes the drag radius.
   const hasStartBubble = !!this.startBubble_;
   return hasStartBubble && !this.hasExceededDragRadius_;
@@ -899,7 +901,7 @@ Blockly.Gesture.prototype.isBubbleClick_ = function() {
  * @return {boolean} Whether this gesture was a click on a block.
  * @private
  */
-Blockly.Gesture.prototype.isBlockClick_ = function() {
+Gesture.prototype.isBlockClick_ = function() {
   // A block click starts on a block, never escapes the drag radius, and is not
   // a field click.
   const hasStartBlock = !!this.startBlock_;
@@ -912,7 +914,7 @@ Blockly.Gesture.prototype.isBlockClick_ = function() {
  * @return {boolean} Whether this gesture was a click on a field.
  * @private
  */
-Blockly.Gesture.prototype.isFieldClick_ = function() {
+Gesture.prototype.isFieldClick_ = function() {
   const fieldClickable =
       this.startField_ ? this.startField_.isClickable() : false;
   return fieldClickable && !this.hasExceededDragRadius_ &&
@@ -925,7 +927,7 @@ Blockly.Gesture.prototype.isFieldClick_ = function() {
  * @return {boolean} Whether this gesture was a click on a workspace.
  * @private
  */
-Blockly.Gesture.prototype.isWorkspaceClick_ = function() {
+Gesture.prototype.isWorkspaceClick_ = function() {
   const onlyTouchedWorkspace =
       !this.startBlock_ && !this.startBubble_ && !this.startField_;
   return onlyTouchedWorkspace && !this.hasExceededDragRadius_;
@@ -940,7 +942,7 @@ Blockly.Gesture.prototype.isWorkspaceClick_ = function() {
  * @return {boolean} True if this gesture is a drag of a workspace or block.
  * @package
  */
-Blockly.Gesture.prototype.isDragging = function() {
+Gesture.prototype.isDragging = function() {
   return this.isDraggingWorkspace_ || this.isDraggingBlock_ ||
       this.isDraggingBubble_;
 };
@@ -952,7 +954,7 @@ Blockly.Gesture.prototype.isDragging = function() {
  * @return {boolean} Whether this gesture was a click on a workspace.
  * @package
  */
-Blockly.Gesture.prototype.hasStarted = function() {
+Gesture.prototype.hasStarted = function() {
   return this.hasStarted_;
 };
 
@@ -963,7 +965,7 @@ Blockly.Gesture.prototype.hasStarted = function() {
  *     marker blocks.
  * @package
  */
-Blockly.Gesture.prototype.getInsertionMarkers = function() {
+Gesture.prototype.getInsertionMarkers = function() {
   if (this.blockDragger_) {
     return this.blockDragger_.getInsertionMarkers();
   }
@@ -976,7 +978,7 @@ Blockly.Gesture.prototype.getInsertionMarkers = function() {
  * @return {!Blockly.WorkspaceDragger|!Blockly.BubbleDragger|!Blockly.IBlockDragger|null}
  *    The dragger that is currently in use or null if no drag is in progress.
  */
-Blockly.Gesture.prototype.getCurrentDragger = function() {
+Gesture.prototype.getCurrentDragger = function() {
   if (this.isDraggingBlock_) {
     return this.blockDragger_;
   } else if (this.isDraggingWorkspace_) {
@@ -991,7 +993,7 @@ Blockly.Gesture.prototype.getCurrentDragger = function() {
  * Is a drag or other gesture currently in progress on any workspace?
  * @return {boolean} True if gesture is occurring.
  */
-Blockly.Gesture.inProgress = function() {
+Gesture.inProgress = function() {
   const workspaces = Blockly.Workspace.getAll();
   for (let i = 0, workspace; (workspace = workspaces[i]); i++) {
     if (workspace.currentGesture_) {
@@ -1000,3 +1002,5 @@ Blockly.Gesture.inProgress = function() {
   }
   return false;
 };
+
+exports = Gesture;
diff --git a/tests/deps.js b/tests/deps.js
index 9b2ca48af..6d78e4217 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -66,7 +66,7 @@ goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Bl
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
+goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);

From 12aa4af67462d8c5003836c10cb13ae2b9e31a1d Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 23 Jul 2021 18:47:55 -0700
Subject: [PATCH 330/833] Migrate core/gesture.js named requires

---
 core/gesture.js | 177 +++++++++++++++++++++++++-----------------------
 1 file changed, 92 insertions(+), 85 deletions(-)

diff --git a/core/gesture.js b/core/gesture.js
index a5b786b5b..c74efb2f4 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -14,29 +14,36 @@
 goog.module('Blockly.Gesture');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockAnimations');
+// TODO(#5073): Add Blockly require after fixing circular dependency.
+// goog.require('Blockly');
+/* 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 Events = goog.require('Blockly.Events');
+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');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.require('Blockly.Workspace');
+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 internalConstants = goog.require('Blockly.internalConstants');
+const registry = goog.require('Blockly.registry');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.BlockDragger');
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.BubbleDragger');
-goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.Click');
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.registry');
-goog.require('Blockly.Tooltip');
-goog.require('Blockly.Touch');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.Workspace');
-goog.require('Blockly.WorkspaceDragger');
-
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.Field');
-goog.requireType('Blockly.IBlockDragger');
-goog.requireType('Blockly.IBubble');
-goog.requireType('Blockly.IFlyout');
-goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
@@ -48,7 +55,7 @@ goog.requireType('Blockly.WorkspaceSvg');
 /**
  * Class for one gesture.
  * @param {!Event} e The event that kicked off this gesture.
- * @param {!Blockly.WorkspaceSvg} creatorWorkspace The workspace that created
+ * @param {!WorkspaceSvg} creatorWorkspace The workspace that created
  *     this gesture and has a reference to it.
  * @constructor
  */
@@ -56,7 +63,7 @@ const Gesture = function(e, creatorWorkspace) {
   /**
    * The position of the mouse when the gesture started.  Units are CSS pixels,
    * with (0, 0) at the top left of the browser window (mouseEvent clientX/Y).
-   * @type {Blockly.utils.Coordinate}
+   * @type {Coordinate}
    * @private
    */
   this.mouseDownXY_ = null;
@@ -64,15 +71,15 @@ const Gesture = function(e, creatorWorkspace) {
   /**
    * How far the mouse has moved during this drag, in pixel units.
    * (0, 0) is at this.mouseDownXY_.
-   * @type {!Blockly.utils.Coordinate}
+   * @type {!Coordinate}
    * @private
    */
-  this.currentDragDeltaXY_ = new Blockly.utils.Coordinate(0, 0);
+  this.currentDragDeltaXY_ = new Coordinate(0, 0);
 
   /**
    * The bubble that the gesture started on, or null if it did not start on a
    * bubble.
-   * @type {Blockly.IBubble}
+   * @type {IBubble}
    * @private
    */
   this.startBubble_ = null;
@@ -80,7 +87,7 @@ const Gesture = function(e, creatorWorkspace) {
   /**
    * The field that the gesture started on, or null if it did not start on a
    * field.
-   * @type {Blockly.Field}
+   * @type {Field}
    * @private
    */
   this.startField_ = null;
@@ -88,7 +95,7 @@ const Gesture = function(e, creatorWorkspace) {
   /**
    * The block that the gesture started on, or null if it did not start on a
    * block.
-   * @type {Blockly.BlockSvg}
+   * @type {BlockSvg}
    * @private
    */
   this.startBlock_ = null;
@@ -98,7 +105,7 @@ const Gesture = function(e, creatorWorkspace) {
    * shadow block, this is the first non-shadow parent of the block.  If the
    * gesture started in the flyout, this is the root block of the block group
    * that was clicked or dragged.
-   * @type {Blockly.BlockSvg}
+   * @type {BlockSvg}
    * @private
    */
   this.targetBlock_ = null;
@@ -107,7 +114,7 @@ const Gesture = function(e, creatorWorkspace) {
    * The workspace that the gesture started on.  There may be multiple
    * workspaces on a page; this is more accurate than using
    * Blockly.getMainWorkspace().
-   * @type {Blockly.WorkspaceSvg}
+   * @type {WorkspaceSvg}
    * @protected
    */
   this.startWorkspace_ = null;
@@ -117,7 +124,7 @@ const Gesture = function(e, creatorWorkspace) {
    * to the gesture, which will need to be cleared at deletion.
    * This may be different from the start workspace.  For instance, a flyout is
    * a workspace, but its parent workspace manages gestures for it.
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @private
    */
   this.creatorWorkspace_ = creatorWorkspace;
@@ -162,7 +169,7 @@ const Gesture = function(e, creatorWorkspace) {
   /**
    * A handle to use to unbind a mouse move listener at the end of a drag.
    * Opaque data returned from Blockly.bindEventWithChecks_.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @protected
    */
   this.onMoveWrapper_ = null;
@@ -170,21 +177,21 @@ const Gesture = function(e, creatorWorkspace) {
   /**
    * A handle to use to unbind a mouse up listener at the end of a drag.
    * Opaque data returned from Blockly.bindEventWithChecks_.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @protected
    */
   this.onUpWrapper_ = null;
 
   /**
    * The object tracking a bubble drag, or null if none is in progress.
-   * @type {Blockly.BubbleDragger}
+   * @type {BubbleDragger}
    * @private
    */
   this.bubbleDragger_ = null;
 
   /**
    * The object tracking a block drag, or null if none is in progress.
-   * @type {?Blockly.IBlockDragger}
+   * @type {?IBlockDragger}
    * @private
    */
   this.blockDragger_ = null;
@@ -192,14 +199,14 @@ const Gesture = function(e, creatorWorkspace) {
   /**
    * The object tracking a workspace or flyout workspace drag, or null if none
    * is in progress.
-   * @type {Blockly.WorkspaceDragger}
+   * @type {WorkspaceDragger}
    * @private
    */
   this.workspaceDragger_ = null;
 
   /**
    * The flyout a gesture started in, if any.
-   * @type {Blockly.IFlyout}
+   * @type {IFlyout}
    * @private
    */
   this.flyout_ = null;
@@ -231,7 +238,7 @@ const Gesture = function(e, creatorWorkspace) {
    * @type {boolean}
    * @private
    */
-  this.healStack_ = !Blockly.internalConstants.DRAG_STACK;
+  this.healStack_ = !internalConstants.DRAG_STACK;
 };
 
 /**
@@ -239,16 +246,16 @@ const Gesture = function(e, creatorWorkspace) {
  * @package
  */
 Gesture.prototype.dispose = function() {
-  Blockly.Touch.clearTouchIdentifier();
-  Blockly.Tooltip.unblock();
+  Touch.clearTouchIdentifier();
+  Tooltip.unblock();
   // Clear the owner's reference to this gesture.
   this.creatorWorkspace_.clearGesture();
 
   if (this.onMoveWrapper_) {
-    Blockly.browserEvents.unbind(this.onMoveWrapper_);
+    browserEvents.unbind(this.onMoveWrapper_);
   }
   if (this.onUpWrapper_) {
-    Blockly.browserEvents.unbind(this.onUpWrapper_);
+    browserEvents.unbind(this.onUpWrapper_);
   }
 
   if (this.blockDragger_) {
@@ -268,7 +275,7 @@ Gesture.prototype.dispose = function() {
  * @private
  */
 Gesture.prototype.updateFromEvent_ = function(e) {
-  const currentXY = new Blockly.utils.Coordinate(e.clientX, e.clientY);
+  const currentXY = new Coordinate(e.clientX, e.clientY);
   const changed = this.updateDragDelta_(currentXY);
   // Exceeded the drag radius for the first time.
   if (changed) {
@@ -280,25 +287,25 @@ Gesture.prototype.updateFromEvent_ = function(e) {
 
 /**
  * DO MATH to set currentDragDeltaXY_ based on the most recent mouse position.
- * @param {!Blockly.utils.Coordinate} currentXY The most recent mouse/pointer
+ * @param {!Coordinate} currentXY The most recent mouse/pointer
  *     position, in pixel units, with (0, 0) at the window's top left corner.
  * @return {boolean} True if the drag just exceeded the drag radius for the
  *     first time.
  * @private
  */
 Gesture.prototype.updateDragDelta_ = function(currentXY) {
-  this.currentDragDeltaXY_ = Blockly.utils.Coordinate.difference(
+  this.currentDragDeltaXY_ = Coordinate.difference(
       currentXY,
-      /** @type {!Blockly.utils.Coordinate} */ (this.mouseDownXY_));
+      /** @type {!Coordinate} */ (this.mouseDownXY_));
 
   if (!this.hasExceededDragRadius_) {
     const currentDragDelta =
-        Blockly.utils.Coordinate.magnitude(this.currentDragDeltaXY_);
+        Coordinate.magnitude(this.currentDragDeltaXY_);
 
     // The flyout has a different drag radius from the rest of Blockly.
     const limitRadius = this.flyout_ ?
-        Blockly.internalConstants.FLYOUT_DRAG_RADIUS :
-        Blockly.internalConstants.DRAG_RADIUS;
+        internalConstants.FLYOUT_DRAG_RADIUS :
+        internalConstants.DRAG_RADIUS;
 
     this.hasExceededDragRadius_ = currentDragDelta > limitRadius;
     return this.hasExceededDragRadius_;
@@ -329,8 +336,8 @@ Gesture.prototype.updateIsDraggingFromFlyout_ = function() {
     this.startWorkspace_.updateScreenCalculationsIfScrolled();
     // Start the event group now, so that the same event group is used for block
     // creation and block dragging.
-    if (!Blockly.Events.getGroup()) {
-      Blockly.Events.setGroup(true);
+    if (!Events.getGroup()) {
+      Events.setGroup(true);
     }
     // The start block is no longer relevant, because this is a drag.
     this.startBlock_ = null;
@@ -404,8 +411,8 @@ Gesture.prototype.updateIsDraggingWorkspace_ = function() {
     return;
   }
 
-  this.workspaceDragger_ = new Blockly.WorkspaceDragger(
-      /** @type {!Blockly.WorkspaceSvg} */ (this.startWorkspace_));
+  this.workspaceDragger_ = new WorkspaceDragger(
+      /** @type {!WorkspaceSvg} */ (this.startWorkspace_));
 
   this.isDraggingWorkspace_ = true;
   this.workspaceDragger_.startDrag();
@@ -441,13 +448,13 @@ Gesture.prototype.updateIsDragging_ = function() {
  * @private
  */
 Gesture.prototype.startDraggingBlock_ = function() {
-  const BlockDraggerClass = Blockly.registry.getClassFromOptions(
-      Blockly.registry.Type.BLOCK_DRAGGER, this.creatorWorkspace_.options,
+  const BlockDraggerClass = registry.getClassFromOptions(
+      registry.Type.BLOCK_DRAGGER, this.creatorWorkspace_.options,
       true);
 
   this.blockDragger_ = new BlockDraggerClass(
-      /** @type {!Blockly.BlockSvg} */ (this.targetBlock_),
-      /** @type {!Blockly.WorkspaceSvg} */ (this.startWorkspace_));
+      /** @type {!BlockSvg} */ (this.targetBlock_),
+      /** @type {!WorkspaceSvg} */ (this.startWorkspace_));
   this.blockDragger_.startDrag(this.currentDragDeltaXY_, this.healStack_);
   this.blockDragger_.drag(this.mostRecentEvent_, this.currentDragDeltaXY_);
 };
@@ -458,9 +465,9 @@ Gesture.prototype.startDraggingBlock_ = function() {
  */
 // TODO (fenichel): Possibly combine this and startDraggingBlock_.
 Gesture.prototype.startDraggingBubble_ = function() {
-  this.bubbleDragger_ = new Blockly.BubbleDragger(
-      /** @type {!Blockly.IBubble} */ (this.startBubble_),
-      /** @type {!Blockly.WorkspaceSvg} */ (this.startWorkspace_));
+  this.bubbleDragger_ = new BubbleDragger(
+      /** @type {!IBubble} */ (this.startBubble_),
+      /** @type {!WorkspaceSvg} */ (this.startWorkspace_));
   this.bubbleDragger_.startBubbleDrag();
   this.bubbleDragger_.dragBubble(
       this.mostRecentEvent_, this.currentDragDeltaXY_);
@@ -472,13 +479,13 @@ Gesture.prototype.startDraggingBubble_ = function() {
  * @package
  */
 Gesture.prototype.doStart = function(e) {
-  if (Blockly.utils.isTargetInput(e)) {
+  if (utils.isTargetInput(e)) {
     this.cancel();
     return;
   }
   this.hasStarted_ = true;
 
-  Blockly.blockAnimations.disconnectUiStop();
+  blockAnimations.disconnectUiStop();
   this.startWorkspace_.updateScreenCalculationsIfScrolled();
   if (this.startWorkspace_.isMutator) {
     // Mutator's coordinate system could be out of date because the bubble was
@@ -493,13 +500,13 @@ Gesture.prototype.doStart = function(e) {
   this.startWorkspace_.markFocused();
   this.mostRecentEvent_ = e;
 
-  Blockly.Tooltip.block();
+  Tooltip.block();
 
   if (this.targetBlock_) {
     this.targetBlock_.select();
   }
 
-  if (Blockly.utils.isRightButton(e)) {
+  if (utils.isRightButton(e)) {
     this.handleRightClick(e);
     return;
   }
@@ -510,7 +517,7 @@ Gesture.prototype.doStart = function(e) {
     Blockly.longStart(e, this);
   }
 
-  this.mouseDownXY_ = new Blockly.utils.Coordinate(e.clientX, e.clientY);
+  this.mouseDownXY_ = new Coordinate(e.clientX, e.clientY);
   this.healStack_ = e.altKey || e.ctrlKey || e.metaKey;
 
   this.bindMouseEvents(e);
@@ -522,9 +529,9 @@ Gesture.prototype.doStart = function(e) {
  * @package
  */
 Gesture.prototype.bindMouseEvents = function(e) {
-  this.onMoveWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onMoveWrapper_ = browserEvents.conditionalBind(
       document, 'mousemove', null, this.handleMove.bind(this));
-  this.onUpWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onUpWrapper_ = browserEvents.conditionalBind(
       document, 'mouseup', null, this.handleUp.bind(this));
 
   e.preventDefault();
@@ -644,7 +651,7 @@ Gesture.prototype.handleRightClick = function(e) {
 /**
  * Handle a mousedown/touchstart event on a workspace.
  * @param {!Event} e A mouse down or touch start event.
- * @param {!Blockly.WorkspaceSvg} ws The workspace the event hit.
+ * @param {!WorkspaceSvg} ws The workspace the event hit.
  * @package
  */
 Gesture.prototype.handleWsStart = function(e, ws) {
@@ -660,18 +667,18 @@ Gesture.prototype.handleWsStart = function(e, ws) {
 
 /**
  * Fires a workspace click event.
- * @param {!Blockly.WorkspaceSvg} ws The workspace that a user clicks on.
+ * @param {!WorkspaceSvg} ws The workspace that a user clicks on.
  * @private
  */
 Gesture.prototype.fireWorkspaceClick_ = function(ws) {
-  Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.CLICK))(
+  Events.fire(new (Events.get(Events.CLICK))(
       null, ws.id, 'workspace'));
 };
 
 /**
  * Handle a mousedown/touchstart event on a flyout.
  * @param {!Event} e A mouse down or touch start event.
- * @param {!Blockly.IFlyout} flyout The flyout the event hit.
+ * @param {!IFlyout} flyout The flyout the event hit.
  * @package
  */
 Gesture.prototype.handleFlyoutStart = function(e, flyout) {
@@ -687,7 +694,7 @@ Gesture.prototype.handleFlyoutStart = function(e, flyout) {
 /**
  * Handle a mousedown/touchstart event on a block.
  * @param {!Event} e A mouse down or touch start event.
- * @param {!Blockly.BlockSvg} block The block the event hit.
+ * @param {!BlockSvg} block The block the event hit.
  * @package
  */
 Gesture.prototype.handleBlockStart = function(e, block) {
@@ -703,7 +710,7 @@ Gesture.prototype.handleBlockStart = function(e, block) {
 /**
  * Handle a mousedown/touchstart event on a bubble.
  * @param {!Event} e A mouse down or touch start event.
- * @param {!Blockly.IBubble} bubble The bubble the event hit.
+ * @param {!IBubble} bubble The bubble the event hit.
  * @package
  */
 Gesture.prototype.handleBubbleStart = function(e, bubble) {
@@ -747,20 +754,20 @@ Gesture.prototype.doBlockClick_ = function() {
   // Block click in an autoclosing flyout.
   if (this.flyout_ && this.flyout_.autoClose) {
     if (this.targetBlock_.isEnabled()) {
-      if (!Blockly.Events.getGroup()) {
-        Blockly.Events.setGroup(true);
+      if (!Events.getGroup()) {
+        Events.setGroup(true);
       }
       const newBlock = this.flyout_.createBlock(this.targetBlock_);
       newBlock.scheduleSnapAndBump();
     }
   } else {
     // Clicks events are on the start block, even if it was a shadow.
-    const event = new (Blockly.Events.get(Blockly.Events.CLICK))(
+    const event = new (Events.get(Events.CLICK))(
         this.startBlock_, this.startWorkspace_.id, 'block');
-    Blockly.Events.fire(event);
+    Events.fire(event);
   }
   this.bringBlockToFront_();
-  Blockly.Events.setGroup(false);
+  Events.setGroup(false);
 };
 
 /**
@@ -797,7 +804,7 @@ Gesture.prototype.bringBlockToFront_ = function() {
 
 /**
  * Record the field that a gesture started on.
- * @param {Blockly.Field} field The field the gesture started on.
+ * @param {Field} field The field the gesture started on.
  * @package
  */
 Gesture.prototype.setStartField = function(field) {
@@ -813,7 +820,7 @@ Gesture.prototype.setStartField = function(field) {
 
 /**
  * Record the bubble that a gesture started on
- * @param {Blockly.IBubble} bubble The bubble the gesture started on.
+ * @param {IBubble} bubble The bubble the gesture started on.
  * @package
  */
 Gesture.prototype.setStartBubble = function(bubble) {
@@ -825,7 +832,7 @@ Gesture.prototype.setStartBubble = function(bubble) {
 /**
  * Record the block that a gesture started on, and set the target block
  * appropriately.
- * @param {Blockly.BlockSvg} block The block the gesture started on.
+ * @param {BlockSvg} block The block the gesture started on.
  * @package
  */
 Gesture.prototype.setStartBlock = function(block) {
@@ -844,7 +851,7 @@ Gesture.prototype.setStartBlock = function(block) {
  * Record the block that a gesture targets, meaning the block that will be
  * dragged if this turns into a drag.  If this block is a shadow, that will be
  * its first non-shadow parent.
- * @param {Blockly.BlockSvg} block The block the gesture targets.
+ * @param {BlockSvg} block The block the gesture targets.
  * @private
  */
 Gesture.prototype.setTargetBlock_ = function(block) {
@@ -857,7 +864,7 @@ Gesture.prototype.setTargetBlock_ = function(block) {
 
 /**
  * Record the workspace that a gesture started on.
- * @param {Blockly.WorkspaceSvg} ws The workspace the gesture started on.
+ * @param {WorkspaceSvg} ws The workspace the gesture started on.
  * @private
  */
 Gesture.prototype.setStartWorkspace_ = function(ws) {
@@ -868,7 +875,7 @@ Gesture.prototype.setStartWorkspace_ = function(ws) {
 
 /**
  * Record the flyout that a gesture started on.
- * @param {Blockly.IFlyout} flyout The flyout the gesture started on.
+ * @param {IFlyout} flyout The flyout the gesture started on.
  * @private
  */
 Gesture.prototype.setStartFlyout_ = function(flyout) {
@@ -961,7 +968,7 @@ Gesture.prototype.hasStarted = function() {
 /**
  * Get a list of the insertion markers that currently exist.  Block drags have
  * 0, 1, or 2 insertion markers.
- * @return {!Array<!Blockly.BlockSvg>} A possibly empty list of insertion
+ * @return {!Array<!BlockSvg>} A possibly empty list of insertion
  *     marker blocks.
  * @package
  */
@@ -975,7 +982,7 @@ Gesture.prototype.getInsertionMarkers = function() {
 /**
  * Gets the current dragger if an item is being dragged. Null if nothing is
  * being dragged.
- * @return {!Blockly.WorkspaceDragger|!Blockly.BubbleDragger|!Blockly.IBlockDragger|null}
+ * @return {!WorkspaceDragger|!BubbleDragger|!IBlockDragger|null}
  *    The dragger that is currently in use or null if no drag is in progress.
  */
 Gesture.prototype.getCurrentDragger = function() {
@@ -994,7 +1001,7 @@ Gesture.prototype.getCurrentDragger = function() {
  * @return {boolean} True if gesture is occurring.
  */
 Gesture.inProgress = function() {
-  const workspaces = Blockly.Workspace.getAll();
+  const workspaces = Workspace.getAll();
   for (let i = 0, workspace; (workspace = workspaces[i]); i++) {
     if (workspace.currentGesture_) {
       return true;

From 46c0050ce6f4ec2bbc5a87c3e4e2adf9b4b72aaf Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 23 Jul 2021 18:48:02 -0700
Subject: [PATCH 331/833] clang-format core/gesture.js

---
 core/gesture.js | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/core/gesture.js b/core/gesture.js
index c74efb2f4..933930e44 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -299,13 +299,11 @@ Gesture.prototype.updateDragDelta_ = function(currentXY) {
       /** @type {!Coordinate} */ (this.mouseDownXY_));
 
   if (!this.hasExceededDragRadius_) {
-    const currentDragDelta =
-        Coordinate.magnitude(this.currentDragDeltaXY_);
+    const currentDragDelta = Coordinate.magnitude(this.currentDragDeltaXY_);
 
     // The flyout has a different drag radius from the rest of Blockly.
-    const limitRadius = this.flyout_ ?
-        internalConstants.FLYOUT_DRAG_RADIUS :
-        internalConstants.DRAG_RADIUS;
+    const limitRadius = this.flyout_ ? internalConstants.FLYOUT_DRAG_RADIUS :
+                                       internalConstants.DRAG_RADIUS;
 
     this.hasExceededDragRadius_ = currentDragDelta > limitRadius;
     return this.hasExceededDragRadius_;
@@ -449,8 +447,7 @@ Gesture.prototype.updateIsDragging_ = function() {
  */
 Gesture.prototype.startDraggingBlock_ = function() {
   const BlockDraggerClass = registry.getClassFromOptions(
-      registry.Type.BLOCK_DRAGGER, this.creatorWorkspace_.options,
-      true);
+      registry.Type.BLOCK_DRAGGER, this.creatorWorkspace_.options, true);
 
   this.blockDragger_ = new BlockDraggerClass(
       /** @type {!BlockSvg} */ (this.targetBlock_),
@@ -548,8 +545,7 @@ Gesture.prototype.handleMove = function(e) {
   if (this.isDraggingWorkspace_) {
     this.workspaceDragger_.drag(this.currentDragDeltaXY_);
   } else if (this.isDraggingBlock_) {
-    this.blockDragger_.drag(
-        this.mostRecentEvent_, this.currentDragDeltaXY_);
+    this.blockDragger_.drag(this.mostRecentEvent_, this.currentDragDeltaXY_);
   } else if (this.isDraggingBubble_) {
     this.bubbleDragger_.dragBubble(
         this.mostRecentEvent_, this.currentDragDeltaXY_);
@@ -616,8 +612,7 @@ Gesture.prototype.cancel = function() {
     this.bubbleDragger_.endBubbleDrag(
         this.mostRecentEvent_, this.currentDragDeltaXY_);
   } else if (this.isDraggingBlock_) {
-    this.blockDragger_.endDrag(
-        this.mostRecentEvent_, this.currentDragDeltaXY_);
+    this.blockDragger_.endDrag(this.mostRecentEvent_, this.currentDragDeltaXY_);
   } else if (this.isDraggingWorkspace_) {
     this.workspaceDragger_.endDrag(this.currentDragDeltaXY_);
   }
@@ -671,8 +666,7 @@ Gesture.prototype.handleWsStart = function(e, ws) {
  * @private
  */
 Gesture.prototype.fireWorkspaceClick_ = function(ws) {
-  Events.fire(new (Events.get(Events.CLICK))(
-      null, ws.id, 'workspace'));
+  Events.fire(new (Events.get(Events.CLICK))(null, ws.id, 'workspace'));
 };
 
 /**

From 6c40e05dc83973d108a4baf1b7997745b8b81140 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 09:46:35 -0700
Subject: [PATCH 332/833] Migrate core/registry.js to named requires

---
 core/registry.js | 62 +++++++++++++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 25 deletions(-)

diff --git a/core/registry.js b/core/registry.js
index 9d7d72201..8c29a6e3e 100644
--- a/core/registry.js
+++ b/core/registry.js
@@ -14,18 +14,30 @@
 goog.module('Blockly.registry');
 goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.blockRendering.Renderer');
-goog.requireType('Blockly.Cursor');
-goog.requireType('Blockly.Events.Abstract');
-goog.requireType('Blockly.Field');
-goog.requireType('Blockly.IBlockDragger');
-goog.requireType('Blockly.IConnectionChecker');
-goog.requireType('Blockly.IFlyout');
-goog.requireType('Blockly.IMetricsManager');
-goog.requireType('Blockly.IToolbox');
-goog.requireType('Blockly.Options');
-goog.requireType('Blockly.Theme');
-goog.requireType('Blockly.ToolboxItem');
+/* 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');
+/* eslint-disable-next-line no-unused-vars */
+const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');
+/* eslint-disable-next-line no-unused-vars */
+const IFlyout = goog.requireType('Blockly.IFlyout');
+/* eslint-disable-next-line no-unused-vars */
+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 Options = goog.requireType('Blockly.Options');
+/* eslint-disable-next-line no-unused-vars */
+const Renderer = goog.requireType('Blockly.blockRendering.Renderer');
+/* eslint-disable-next-line no-unused-vars */
+const Theme = goog.requireType('Blockly.Theme');
+/* eslint-disable-next-line no-unused-vars */
+const ToolboxItem = goog.requireType('Blockly.ToolboxItem');
 
 
 /**
@@ -70,44 +82,44 @@ Type.prototype.toString = function() {
   return this.name_;
 };
 
-/** @type {!Type<Blockly.IConnectionChecker>} */
+/** @type {!Type<IConnectionChecker>} */
 Type.CONNECTION_CHECKER =
     new Type('connectionChecker');
 
-/** @type {!Type<Blockly.Cursor>} */
+/** @type {!Type<Cursor>} */
 Type.CURSOR = new Type('cursor');
 
-/** @type {!Type<Blockly.Events.Abstract>} */
+/** @type {!Type<Abstract>} */
 Type.EVENT = new Type('event');
 
-/** @type {!Type<Blockly.Field>} */
+/** @type {!Type<Field>} */
 Type.FIELD = new Type('field');
 
-/** @type {!Type<Blockly.blockRendering.Renderer>} */
+/** @type {!Type<Renderer>} */
 Type.RENDERER = new Type('renderer');
 
-/** @type {!Type<Blockly.IToolbox>} */
+/** @type {!Type<IToolbox>} */
 Type.TOOLBOX = new Type('toolbox');
 
-/** @type {!Type<Blockly.Theme>} */
+/** @type {!Type<Theme>} */
 Type.THEME = new Type('theme');
 
-/** @type {!Type<Blockly.ToolboxItem>} */
+/** @type {!Type<ToolboxItem>} */
 Type.TOOLBOX_ITEM = new Type('toolboxItem');
 
-/** @type {!Type<Blockly.IFlyout>} */
+/** @type {!Type<IFlyout>} */
 Type.FLYOUTS_VERTICAL_TOOLBOX =
     new Type('flyoutsVerticalToolbox');
 
-/** @type {!Type<Blockly.IFlyout>} */
+/** @type {!Type<IFlyout>} */
 Type.FLYOUTS_HORIZONTAL_TOOLBOX =
     new Type('flyoutsHorizontalToolbox');
 
-/** @type {!Type<Blockly.IMetricsManager>} */
+/** @type {!Type<IMetricsManager>} */
 Type.METRICS_MANAGER =
     new Type('metricsManager');
 
-/** @type {!Type<Blockly.IBlockDragger>} */
+/** @type {!Type<IBlockDragger>} */
 Type.BLOCK_DRAGGER =
     new Type('blockDragger');
 
@@ -286,7 +298,7 @@ exports.getObject = getObject;
  * Gets the class from Blockly options for the given type.
  * This is used for plugins that override a built in feature. (e.g. Toolbox)
  * @param {!Type<T>} type The type of the plugin.
- * @param {!Blockly.Options} options The option object to check for the given
+ * @param {!Options} options The option object to check for the given
  *     plugin.
  * @param {boolean=} opt_throwIfMissing Whether or not to throw an error if we
  *     are unable to find the plugin.

From e0efd4cf29293dd5ee348ccde3674c171be8905a Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 09:47:06 -0700
Subject: [PATCH 333/833] clang-format core/registry.js

---
 core/registry.js | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/core/registry.js b/core/registry.js
index 8c29a6e3e..1be9b2a2b 100644
--- a/core/registry.js
+++ b/core/registry.js
@@ -83,8 +83,7 @@ Type.prototype.toString = function() {
 };
 
 /** @type {!Type<IConnectionChecker>} */
-Type.CONNECTION_CHECKER =
-    new Type('connectionChecker');
+Type.CONNECTION_CHECKER = new Type('connectionChecker');
 
 /** @type {!Type<Cursor>} */
 Type.CURSOR = new Type('cursor');
@@ -108,20 +107,16 @@ Type.THEME = new Type('theme');
 Type.TOOLBOX_ITEM = new Type('toolboxItem');
 
 /** @type {!Type<IFlyout>} */
-Type.FLYOUTS_VERTICAL_TOOLBOX =
-    new Type('flyoutsVerticalToolbox');
+Type.FLYOUTS_VERTICAL_TOOLBOX = new Type('flyoutsVerticalToolbox');
 
 /** @type {!Type<IFlyout>} */
-Type.FLYOUTS_HORIZONTAL_TOOLBOX =
-    new Type('flyoutsHorizontalToolbox');
+Type.FLYOUTS_HORIZONTAL_TOOLBOX = new Type('flyoutsHorizontalToolbox');
 
 /** @type {!Type<IMetricsManager>} */
-Type.METRICS_MANAGER =
-    new Type('metricsManager');
+Type.METRICS_MANAGER = new Type('metricsManager');
 
 /** @type {!Type<IBlockDragger>} */
-Type.BLOCK_DRAGGER =
-    new Type('blockDragger');
+Type.BLOCK_DRAGGER = new Type('blockDragger');
 
 /**
  * Registers a class based on a type and name.
@@ -137,8 +132,7 @@ Type.BLOCK_DRAGGER =
  * it's type.
  * @template T
  */
-const register = function(
-    type, name, registryItem, opt_allowOverrides) {
+const register = function(type, name, registryItem, opt_allowOverrides) {
   if ((!(type instanceof Type) && typeof type != 'string') ||
       String(type).trim() == '') {
     throw Error(
@@ -203,8 +197,9 @@ const unregister = function(type, name) {
   name = name.toLowerCase();
   const typeRegistry = typeMap[type];
   if (!typeRegistry || !typeRegistry[name]) {
-    console.warn('Unable to unregister [' + name + '][' + type + '] from the ' +
-      'registry.');
+    console.warn(
+        'Unable to unregister [' + name + '][' + type + '] from the ' +
+        'registry.');
     return;
   }
   delete typeMap[type][name];
@@ -230,8 +225,8 @@ const getItem = function(type, name, opt_throwIfMissing) {
   if (!typeRegistry || !typeRegistry[name]) {
     const msg = 'Unable to find [' + name + '][' + type + '] in the registry.';
     if (opt_throwIfMissing) {
-      throw new Error(msg + ' You must require or register a ' + type +
-        ' plugin.');
+      throw new Error(
+          msg + ' You must require or register a ' + type + ' plugin.');
     } else {
       console.warn(msg);
     }
@@ -274,7 +269,7 @@ exports.hasItem = hasItem;
  */
 const getClass = function(type, name, opt_throwIfMissing) {
   return /** @type {?function(new:T, ...?)} */ (
-    getItem(type, name, opt_throwIfMissing));
+      getItem(type, name, opt_throwIfMissing));
 };
 exports.getClass = getClass;
 
@@ -289,8 +284,7 @@ exports.getClass = getClass;
  * @template T
  */
 const getObject = function(type, name, opt_throwIfMissing) {
-  return /** @type {T} */ (
-    getItem(type, name, opt_throwIfMissing));
+  return /** @type {T} */ (getItem(type, name, opt_throwIfMissing));
 };
 exports.getObject = getObject;
 
@@ -305,8 +299,7 @@ exports.getObject = getObject;
  * @return {?function(new:T, ...?)} The class for the plugin.
  * @template T
  */
-const getClassFromOptions = function(type, options,
-    opt_throwIfMissing) {
+const getClassFromOptions = function(type, options, opt_throwIfMissing) {
   const typeName = type.toString();
   const plugin = options.plugins[typeName] || DEFAULT;
 

From a663b1225b8f7fe4fd534187e5e5d28324498334 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 09:50:47 -0700
Subject: [PATCH 334/833] Move @package annotation to export for
 core/marker_manager.js

---
 core/marker_manager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/marker_manager.js b/core/marker_manager.js
index 1f16f500a..60cb3b870 100644
--- a/core/marker_manager.js
+++ b/core/marker_manager.js
@@ -25,7 +25,6 @@ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
  * Class to manage the multiple markers and the cursor on a workspace.
  * @param {!WorkspaceSvg} workspace The workspace for the marker manager.
  * @constructor
- * @package
  */
 const MarkerManager = function(workspace) {
   /**
@@ -195,4 +194,5 @@ MarkerManager.prototype.dispose = function() {
   }
 };
 
+/** @package */
 exports = MarkerManager;

From d5f729e636b2c318b820b79afceabcfbfc74e1d1 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 09:56:57 -0700
Subject: [PATCH 335/833] Migrate core/rendered_connection.js to ES6 const/let

---
 core/rendered_connection.js | 88 ++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index cddda9200..11c7a9a6d 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -135,8 +135,8 @@ Blockly.RenderedConnection.prototype.targetBlock = function() {
  * @return {number} The distance between connections, in workspace units.
  */
 Blockly.RenderedConnection.prototype.distanceFrom = function(otherConnection) {
-  var xDiff = this.x - otherConnection.x;
-  var yDiff = this.y - otherConnection.y;
+  const xDiff = this.x - otherConnection.x;
+  const yDiff = this.y - otherConnection.y;
   return Math.sqrt(xDiff * xDiff + yDiff * yDiff);
 };
 
@@ -153,12 +153,12 @@ Blockly.RenderedConnection.prototype.bumpAwayFrom = function(staticConnection) {
     return;
   }
   // Move the root block.
-  var rootBlock = this.sourceBlock_.getRootBlock();
+  let rootBlock = this.sourceBlock_.getRootBlock();
   if (rootBlock.isInFlyout) {
     // Don't move blocks around in a flyout.
     return;
   }
-  var reverse = false;
+  let reverse = false;
   if (!rootBlock.isMovable()) {
     // Can't bump an uneditable block away.
     // Check to see if the other block is movable.
@@ -171,13 +171,13 @@ Blockly.RenderedConnection.prototype.bumpAwayFrom = function(staticConnection) {
     reverse = true;
   }
   // Raise it to the top for extra visibility.
-  var selected = Blockly.selected == rootBlock;
+  const selected = Blockly.selected == rootBlock;
   selected || rootBlock.addSelect();
-  var dx =
+  let dx =
       (staticConnection.x + Blockly.internalConstants.SNAP_RADIUS +
        Math.floor(Math.random() * Blockly.internalConstants.BUMP_RANDOMNESS)) -
       this.x;
-  var dy =
+  let dy =
       (staticConnection.y + Blockly.internalConstants.SNAP_RADIUS +
        Math.floor(Math.random() * Blockly.internalConstants.BUMP_RANDOMNESS)) -
       this.y;
@@ -257,16 +257,16 @@ Blockly.RenderedConnection.prototype.getOffsetInBlock = function() {
  * @package
  */
 Blockly.RenderedConnection.prototype.tighten = function() {
-  var dx = this.targetConnection.x - this.x;
-  var dy = this.targetConnection.y - this.y;
+  const dx = this.targetConnection.x - this.x;
+  const dy = this.targetConnection.y - this.y;
   if (dx != 0 || dy != 0) {
-    var block = this.targetBlock();
-    var svgRoot = block.getSvgRoot();
+    const block = this.targetBlock();
+    const svgRoot = block.getSvgRoot();
     if (!svgRoot) {
       throw Error('block is not rendered.');
     }
     // Workspace coordinates.
-    var xy = Blockly.utils.getRelativeXY(svgRoot);
+    const xy = Blockly.utils.getRelativeXY(svgRoot);
     block.getSvgRoot().setAttribute('transform',
         'translate(' + (xy.x - dx) + ',' + (xy.y - dy) + ')');
     block.moveConnections(-dx, -dy);
@@ -291,20 +291,20 @@ Blockly.RenderedConnection.prototype.closest = function(maxLimit, dxy) {
  * Add highlighting around this connection.
  */
 Blockly.RenderedConnection.prototype.highlight = function() {
-  var steps;
-  var sourceBlockSvg = /** @type {!Blockly.BlockSvg} */ (this.sourceBlock_);
-  var renderConstants = sourceBlockSvg.workspace.getRenderer().getConstants();
-  var shape = renderConstants.shapeFor(this);
+  let steps;
+  const sourceBlockSvg = /** @type {!Blockly.BlockSvg} */ (this.sourceBlock_);
+  const renderConstants = sourceBlockSvg.workspace.getRenderer().getConstants();
+  const shape = renderConstants.shapeFor(this);
   if (this.type == Blockly.connectionTypes.INPUT_VALUE ||
       this.type == Blockly.connectionTypes.OUTPUT_VALUE) {
     // Vertical line, puzzle tab, vertical line.
-    var yLen = renderConstants.TAB_OFFSET_FROM_TOP;
+    const yLen = renderConstants.TAB_OFFSET_FROM_TOP;
     steps = Blockly.utils.svgPaths.moveBy(0, -yLen) +
         Blockly.utils.svgPaths.lineOnAxis('v', yLen) +
         shape.pathDown +
         Blockly.utils.svgPaths.lineOnAxis('v', yLen);
   } else {
-    var xLen =
+    const xLen =
         renderConstants.NOTCH_OFFSET_LEFT - renderConstants.CORNER_RADIUS;
     // Horizontal line, notch, horizontal line.
     steps = Blockly.utils.svgPaths.moveBy(-xLen, 0) +
@@ -312,9 +312,9 @@ Blockly.RenderedConnection.prototype.highlight = function() {
         shape.pathLeft +
         Blockly.utils.svgPaths.lineOnAxis('h', xLen);
   }
-  var xy = this.sourceBlock_.getRelativeToSurfaceXY();
-  var x = this.x - xy.x;
-  var y = this.y - xy.y;
+  const xy = this.sourceBlock_.getRelativeToSurfaceXY();
+  const x = this.x - xy.x;
+  const y = this.y - xy.y;
   Blockly.Connection.highlightedPath_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.PATH,
       {
@@ -372,17 +372,17 @@ Blockly.RenderedConnection.prototype.setTracking = function(doTracking) {
 Blockly.RenderedConnection.prototype.stopTrackingAll = function() {
   this.setTracking(false);
   if (this.targetConnection) {
-    var blocks = this.targetBlock().getDescendants(false);
-    for (var i = 0; i < blocks.length; i++) {
-      var block = blocks[i];
+    const blocks = this.targetBlock().getDescendants(false);
+    for (let i = 0; i < blocks.length; i++) {
+      const block = blocks[i];
       // Stop tracking connections of all children.
-      var connections = block.getConnections_(true);
-      for (var j = 0; j < connections.length; j++) {
+      const connections = block.getConnections_(true);
+      for (let j = 0; j < connections.length; j++) {
         connections[j].setTracking(false);
       }
       // Close all bubbles of all children.
-      var icons = block.getIcons();
-      for (var j = 0; j < icons.length; j++) {
+      const icons = block.getIcons();
+      for (let j = 0; j < icons.length; j++) {
         icons[j].setVisible(false);
       }
     }
@@ -400,15 +400,15 @@ Blockly.RenderedConnection.prototype.startTrackingAll = function() {
   // rendering takes place, since rendering requires knowing the dimensions
   // of lower blocks. Also, since rendering a block renders all its parents,
   // we only need to render the leaf nodes.
-  var renderList = [];
+  const renderList = [];
   if (this.type != Blockly.connectionTypes.INPUT_VALUE &&
       this.type != Blockly.connectionTypes.NEXT_STATEMENT) {
     // Only spider down.
     return renderList;
   }
-  var block = this.targetBlock();
+  const block = this.targetBlock();
   if (block) {
-    var connections;
+    let connections;
     if (block.isCollapsed()) {
       // This block should only be partially revealed since it is collapsed.
       connections = [];
@@ -419,7 +419,7 @@ Blockly.RenderedConnection.prototype.startTrackingAll = function() {
       // Show all connections of this block.
       connections = block.getConnections_(true);
     }
-    for (var i = 0; i < connections.length; i++) {
+    for (let i = 0; i < connections.length; i++) {
       renderList.push.apply(renderList, connections[i].startTrackingAll());
     }
     if (!renderList.length) {
@@ -463,9 +463,9 @@ Blockly.RenderedConnection.prototype.isConnectionAllowed = function(candidate,
  */
 Blockly.RenderedConnection.prototype.onFailedConnect =
     function(otherConnection) {
-      var block = this.getSourceBlock();
+      const block = this.getSourceBlock();
       if (Blockly.Events.recordUndo) {
-        var group = Blockly.Events.getGroup();
+        const group = Blockly.Events.getGroup();
         setTimeout(function() {
           if (!block.isDisposed() && !block.getParent()) {
             Blockly.Events.setGroup(group);
@@ -508,7 +508,7 @@ Blockly.RenderedConnection.prototype.disconnectInternal_ = function(parentBlock,
  */
 Blockly.RenderedConnection.prototype.respawnShadow_ = function() {
   Blockly.RenderedConnection.superClass_.respawnShadow_.call(this);
-  var blockShadow = this.targetBlock();
+  const blockShadow = this.targetBlock();
   if (!blockShadow) {
     // This connection must not have a shadowDom_.
     return;
@@ -516,7 +516,7 @@ Blockly.RenderedConnection.prototype.respawnShadow_ = function() {
   blockShadow.initSvg();
   blockShadow.render(false);
 
-  var parentBlock = this.getSourceBlock();
+  const parentBlock = this.getSourceBlock();
   if (parentBlock.rendered) {
     parentBlock.render();
   }
@@ -543,11 +543,11 @@ Blockly.RenderedConnection.prototype.neighbours = function(maxLimit) {
 Blockly.RenderedConnection.prototype.connect_ = function(childConnection) {
   Blockly.RenderedConnection.superClass_.connect_.call(this, childConnection);
 
-  var parentConnection = this;
-  var parentBlock = parentConnection.getSourceBlock();
-  var childBlock = childConnection.getSourceBlock();
-  var parentRendered = parentBlock.rendered;
-  var childRendered = childBlock.rendered;
+  const parentConnection = this;
+  const parentBlock = parentConnection.getSourceBlock();
+  const childBlock = childConnection.getSourceBlock();
+  const parentRendered = parentBlock.rendered;
+  const childRendered = childBlock.rendered;
 
   if (parentRendered) {
     parentBlock.updateDisabled();
@@ -569,9 +569,9 @@ Blockly.RenderedConnection.prototype.connect_ = function(childConnection) {
   }
 
   // The input the child block is connected to (if any).
-  var parentInput = parentBlock.getInputWithBlock(childBlock);
+  const parentInput = parentBlock.getInputWithBlock(childBlock);
   if (parentInput) {
-    var visible = parentInput.isVisible();
+    const visible = parentInput.isVisible();
     childBlock.getSvgRoot().style.display = visible ? 'block' : 'none';
   }
 };
@@ -585,7 +585,7 @@ Blockly.RenderedConnection.prototype.onCheckChanged_ = function() {
   if (this.isConnected() && (!this.targetConnection ||
       !this.getConnectionChecker().canConnect(
           this, this.targetConnection, false))) {
-    var child = this.isSuperior() ? this.targetBlock() : this.sourceBlock_;
+    const child = this.isSuperior() ? this.targetBlock() : this.sourceBlock_;
     child.unplug();
     // Bump away.
     this.sourceBlock_.bumpNeighbours();

From 07b2e07ba88903ff385ebdc595c59f9eab9f9a95 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 09:59:41 -0700
Subject: [PATCH 336/833] Migrate core/rendered_connection.js to goog.module

---
 core/rendered_connection.js | 99 +++++++++++++++++++------------------
 tests/deps.js               |  2 +-
 2 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index 11c7a9a6d..a4d265746 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.RenderedConnection');
+goog.module('Blockly.RenderedConnection');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Connection');
 goog.require('Blockly.connectionTypes');
@@ -34,8 +35,8 @@ goog.requireType('Blockly.ConnectionDB');
  * @extends {Blockly.Connection}
  * @constructor
  */
-Blockly.RenderedConnection = function(source, type) {
-  Blockly.RenderedConnection.superClass_.constructor.call(this, source, type);
+const RenderedConnection = function(source, type) {
+  RenderedConnection.superClass_.constructor.call(this, source, type);
 
   /**
    * Connection database for connections of this type on the current workspace.
@@ -63,18 +64,18 @@ Blockly.RenderedConnection = function(source, type) {
 
   /**
    * Describes the state of this connection's tracked-ness.
-   * @type {Blockly.RenderedConnection.TrackedState}
+   * @type {RenderedConnection.TrackedState}
    * @private
    */
-  this.trackedState_ = Blockly.RenderedConnection.TrackedState.WILL_TRACK;
+  this.trackedState_ = RenderedConnection.TrackedState.WILL_TRACK;
 
   /**
    * Connection this connection connects to.  Null if not connected.
-   * @type {Blockly.RenderedConnection}
+   * @type {RenderedConnection}
    */
   this.targetConnection = null;
 };
-Blockly.utils.object.inherits(Blockly.RenderedConnection, Blockly.Connection);
+Blockly.utils.object.inherits(RenderedConnection, Blockly.Connection);
 
 /**
  * Enum for different kinds of tracked states.
@@ -88,7 +89,7 @@ Blockly.utils.object.inherits(Blockly.RenderedConnection, Blockly.Connection);
  * TRACKED means that this connection is currently being tracked.
  * @enum {number}
  */
-Blockly.RenderedConnection.TrackedState = {
+RenderedConnection.TrackedState = {
   WILL_TRACK: -1,
   UNTRACKED: 0,
   TRACKED: 1
@@ -100,9 +101,9 @@ Blockly.RenderedConnection.TrackedState = {
  * @override
  * @package
  */
-Blockly.RenderedConnection.prototype.dispose = function() {
-  Blockly.RenderedConnection.superClass_.dispose.call(this);
-  if (this.trackedState_ == Blockly.RenderedConnection.TrackedState.TRACKED) {
+RenderedConnection.prototype.dispose = function() {
+  RenderedConnection.superClass_.dispose.call(this);
+  if (this.trackedState_ == RenderedConnection.TrackedState.TRACKED) {
     this.db_.removeConnection(this, this.y);
   }
 };
@@ -112,9 +113,9 @@ Blockly.RenderedConnection.prototype.dispose = function() {
  * @return {!Blockly.BlockSvg} The source block.
  * @override
  */
-Blockly.RenderedConnection.prototype.getSourceBlock = function() {
+RenderedConnection.prototype.getSourceBlock = function() {
   return /** @type {!Blockly.BlockSvg} */ (
-    Blockly.RenderedConnection.superClass_.getSourceBlock.call(this));
+    RenderedConnection.superClass_.getSourceBlock.call(this));
 };
 
 /**
@@ -122,9 +123,9 @@ Blockly.RenderedConnection.prototype.getSourceBlock = function() {
  * @return {?Blockly.BlockSvg} The connected block or null if none is connected.
  * @override
  */
-Blockly.RenderedConnection.prototype.targetBlock = function() {
+RenderedConnection.prototype.targetBlock = function() {
   return /** @type {Blockly.BlockSvg} */ (
-    Blockly.RenderedConnection.superClass_.targetBlock.call(this));
+    RenderedConnection.superClass_.targetBlock.call(this));
 };
 
 /**
@@ -134,7 +135,7 @@ Blockly.RenderedConnection.prototype.targetBlock = function() {
  *     the distance to.
  * @return {number} The distance between connections, in workspace units.
  */
-Blockly.RenderedConnection.prototype.distanceFrom = function(otherConnection) {
+RenderedConnection.prototype.distanceFrom = function(otherConnection) {
   const xDiff = this.x - otherConnection.x;
   const yDiff = this.y - otherConnection.y;
   return Math.sqrt(xDiff * xDiff + yDiff * yDiff);
@@ -147,7 +148,7 @@ Blockly.RenderedConnection.prototype.distanceFrom = function(otherConnection) {
  *     from.
  * @package
  */
-Blockly.RenderedConnection.prototype.bumpAwayFrom = function(staticConnection) {
+RenderedConnection.prototype.bumpAwayFrom = function(staticConnection) {
   if (this.sourceBlock_.workspace.isDragging()) {
     // Don't move blocks around while the user is doing the same.
     return;
@@ -200,11 +201,11 @@ Blockly.RenderedConnection.prototype.bumpAwayFrom = function(staticConnection) {
  * @param {number} x New absolute x coordinate, in workspace coordinates.
  * @param {number} y New absolute y coordinate, in workspace coordinates.
  */
-Blockly.RenderedConnection.prototype.moveTo = function(x, y) {
-  if (this.trackedState_ == Blockly.RenderedConnection.TrackedState.WILL_TRACK) {
+RenderedConnection.prototype.moveTo = function(x, y) {
+  if (this.trackedState_ == RenderedConnection.TrackedState.WILL_TRACK) {
     this.db_.addConnection(this, y);
-    this.trackedState_ = Blockly.RenderedConnection.TrackedState.TRACKED;
-  } else if (this.trackedState_ == Blockly.RenderedConnection
+    this.trackedState_ = RenderedConnection.TrackedState.TRACKED;
+  } else if (this.trackedState_ == RenderedConnection
       .TrackedState.TRACKED) {
     this.db_.removeConnection(this, this.y);
     this.db_.addConnection(this, y);
@@ -218,7 +219,7 @@ Blockly.RenderedConnection.prototype.moveTo = function(x, y) {
  * @param {number} dx Change to x coordinate, in workspace units.
  * @param {number} dy Change to y coordinate, in workspace units.
  */
-Blockly.RenderedConnection.prototype.moveBy = function(dx, dy) {
+RenderedConnection.prototype.moveBy = function(dx, dy) {
   this.moveTo(this.x + dx, this.y + dy);
 };
 
@@ -228,7 +229,7 @@ Blockly.RenderedConnection.prototype.moveBy = function(dx, dy) {
  * @param {!Blockly.utils.Coordinate} blockTL The location of the top left
  *     corner of the block, in workspace coordinates.
  */
-Blockly.RenderedConnection.prototype.moveToOffset = function(blockTL) {
+RenderedConnection.prototype.moveToOffset = function(blockTL) {
   this.moveTo(blockTL.x + this.offsetInBlock_.x,
       blockTL.y + this.offsetInBlock_.y);
 };
@@ -238,7 +239,7 @@ Blockly.RenderedConnection.prototype.moveToOffset = function(blockTL) {
  * @param {number} x The new relative x, in workspace units.
  * @param {number} y The new relative y, in workspace units.
  */
-Blockly.RenderedConnection.prototype.setOffsetInBlock = function(x, y) {
+RenderedConnection.prototype.setOffsetInBlock = function(x, y) {
   this.offsetInBlock_.x = x;
   this.offsetInBlock_.y = y;
 };
@@ -248,7 +249,7 @@ Blockly.RenderedConnection.prototype.setOffsetInBlock = function(x, y) {
  * @return {!Blockly.utils.Coordinate} The offset of the connection.
  * @package
  */
-Blockly.RenderedConnection.prototype.getOffsetInBlock = function() {
+RenderedConnection.prototype.getOffsetInBlock = function() {
   return this.offsetInBlock_;
 };
 
@@ -256,7 +257,7 @@ Blockly.RenderedConnection.prototype.getOffsetInBlock = function() {
  * Move the blocks on either side of this connection right next to each other.
  * @package
  */
-Blockly.RenderedConnection.prototype.tighten = function() {
+RenderedConnection.prototype.tighten = function() {
   const dx = this.targetConnection.x - this.x;
   const dy = this.targetConnection.y - this.y;
   if (dx != 0 || dy != 0) {
@@ -283,14 +284,14 @@ Blockly.RenderedConnection.prototype.tighten = function() {
  *     properties: 'connection' which is either another connection or null,
  *     and 'radius' which is the distance.
  */
-Blockly.RenderedConnection.prototype.closest = function(maxLimit, dxy) {
+RenderedConnection.prototype.closest = function(maxLimit, dxy) {
   return this.dbOpposite_.searchForClosest(this, maxLimit, dxy);
 };
 
 /**
  * Add highlighting around this connection.
  */
-Blockly.RenderedConnection.prototype.highlight = function() {
+RenderedConnection.prototype.highlight = function() {
   let steps;
   const sourceBlockSvg = /** @type {!Blockly.BlockSvg} */ (this.sourceBlock_);
   const renderConstants = sourceBlockSvg.workspace.getRenderer().getConstants();
@@ -329,7 +330,7 @@ Blockly.RenderedConnection.prototype.highlight = function() {
 /**
  * Remove the highlighting around this connection.
  */
-Blockly.RenderedConnection.prototype.unhighlight = function() {
+RenderedConnection.prototype.unhighlight = function() {
   Blockly.utils.dom.removeNode(Blockly.Connection.highlightedPath_);
   delete Blockly.Connection.highlightedPath_;
 };
@@ -339,11 +340,11 @@ Blockly.RenderedConnection.prototype.unhighlight = function() {
  * @param {boolean} doTracking If true, start tracking. If false, stop tracking.
  * @package
  */
-Blockly.RenderedConnection.prototype.setTracking = function(doTracking) {
+RenderedConnection.prototype.setTracking = function(doTracking) {
   if ((doTracking && this.trackedState_ ==
-      Blockly.RenderedConnection.TrackedState.TRACKED) ||
+      RenderedConnection.TrackedState.TRACKED) ||
       (!doTracking && this.trackedState_ ==
-      Blockly.RenderedConnection.TrackedState.UNTRACKED)) {
+      RenderedConnection.TrackedState.UNTRACKED)) {
     return;
   }
   if (this.sourceBlock_.isInFlyout) {
@@ -352,13 +353,13 @@ Blockly.RenderedConnection.prototype.setTracking = function(doTracking) {
   }
   if (doTracking) {
     this.db_.addConnection(this, this.y);
-    this.trackedState_ = Blockly.RenderedConnection.TrackedState.TRACKED;
+    this.trackedState_ = RenderedConnection.TrackedState.TRACKED;
     return;
   }
-  if (this.trackedState_ == Blockly.RenderedConnection.TrackedState.TRACKED) {
+  if (this.trackedState_ == RenderedConnection.TrackedState.TRACKED) {
     this.db_.removeConnection(this, this.y);
   }
-  this.trackedState_ = Blockly.RenderedConnection.TrackedState.UNTRACKED;
+  this.trackedState_ = RenderedConnection.TrackedState.UNTRACKED;
 };
 
 /**
@@ -369,7 +370,7 @@ Blockly.RenderedConnection.prototype.setTracking = function(doTracking) {
  * Also closes down-stream icons/bubbles.
  * @package
  */
-Blockly.RenderedConnection.prototype.stopTrackingAll = function() {
+RenderedConnection.prototype.stopTrackingAll = function() {
   this.setTracking(false);
   if (this.targetConnection) {
     const blocks = this.targetBlock().getDescendants(false);
@@ -394,7 +395,7 @@ Blockly.RenderedConnection.prototype.stopTrackingAll = function() {
  * any block attached to this connection. This happens when a block is expanded.
  * @return {!Array<!Blockly.Block>} List of blocks to render.
  */
-Blockly.RenderedConnection.prototype.startTrackingAll = function() {
+RenderedConnection.prototype.startTrackingAll = function() {
   this.setTracking(true);
   // All blocks that are not tracked must start tracking before any
   // rendering takes place, since rendering requires knowing the dimensions
@@ -438,7 +439,7 @@ Blockly.RenderedConnection.prototype.startTrackingAll = function() {
  * @return {boolean} True if the connection is allowed, false otherwise.
  * @deprecated July 2020
  */
-Blockly.RenderedConnection.prototype.isConnectionAllowed = function(candidate,
+RenderedConnection.prototype.isConnectionAllowed = function(candidate,
     maxRadius) {
   Blockly.utils.deprecation.warn(
       'RenderedConnection.prototype.isConnectionAllowed',
@@ -449,7 +450,7 @@ Blockly.RenderedConnection.prototype.isConnectionAllowed = function(candidate,
     return false;
   }
 
-  return Blockly.RenderedConnection.superClass_.isConnectionAllowed.call(this,
+  return RenderedConnection.superClass_.isConnectionAllowed.call(this,
       candidate);
 };
 
@@ -461,7 +462,7 @@ Blockly.RenderedConnection.prototype.isConnectionAllowed = function(candidate,
  *     failed to connect to.
  * @package
  */
-Blockly.RenderedConnection.prototype.onFailedConnect =
+RenderedConnection.prototype.onFailedConnect =
     function(otherConnection) {
       const block = this.getSourceBlock();
       if (Blockly.Events.recordUndo) {
@@ -484,9 +485,9 @@ Blockly.RenderedConnection.prototype.onFailedConnect =
  * @protected
  * @override
  */
-Blockly.RenderedConnection.prototype.disconnectInternal_ = function(parentBlock,
+RenderedConnection.prototype.disconnectInternal_ = function(parentBlock,
     childBlock) {
-  Blockly.RenderedConnection.superClass_.disconnectInternal_.call(this,
+  RenderedConnection.superClass_.disconnectInternal_.call(this,
       parentBlock, childBlock);
   // Rerender the parent so that it may reflow.
   if (parentBlock.rendered) {
@@ -506,8 +507,8 @@ Blockly.RenderedConnection.prototype.disconnectInternal_ = function(parentBlock,
  * @protected
  * @override
  */
-Blockly.RenderedConnection.prototype.respawnShadow_ = function() {
-  Blockly.RenderedConnection.superClass_.respawnShadow_.call(this);
+RenderedConnection.prototype.respawnShadow_ = function() {
+  RenderedConnection.superClass_.respawnShadow_.call(this);
   const blockShadow = this.targetBlock();
   if (!blockShadow) {
     // This connection must not have a shadowDom_.
@@ -530,7 +531,7 @@ Blockly.RenderedConnection.prototype.respawnShadow_ = function() {
  * @return {!Array<!Blockly.Connection>} List of connections.
  * @package
  */
-Blockly.RenderedConnection.prototype.neighbours = function(maxLimit) {
+RenderedConnection.prototype.neighbours = function(maxLimit) {
   return this.dbOpposite_.getNeighbours(this, maxLimit);
 };
 
@@ -540,8 +541,8 @@ Blockly.RenderedConnection.prototype.neighbours = function(maxLimit) {
  * @param {!Blockly.Connection} childConnection Connection on inferior block.
  * @protected
  */
-Blockly.RenderedConnection.prototype.connect_ = function(childConnection) {
-  Blockly.RenderedConnection.superClass_.connect_.call(this, childConnection);
+RenderedConnection.prototype.connect_ = function(childConnection) {
+  RenderedConnection.superClass_.connect_.call(this, childConnection);
 
   const parentConnection = this;
   const parentBlock = parentConnection.getSourceBlock();
@@ -580,7 +581,7 @@ Blockly.RenderedConnection.prototype.connect_ = function(childConnection) {
  * Function to be called when this connection's compatible types have changed.
  * @protected
  */
-Blockly.RenderedConnection.prototype.onCheckChanged_ = function() {
+RenderedConnection.prototype.onCheckChanged_ = function() {
   // The new value type may not be compatible with the existing connection.
   if (this.isConnected() && (!this.targetConnection ||
       !this.getConnectionChecker().canConnect(
@@ -591,3 +592,5 @@ Blockly.RenderedConnection.prototype.onCheckChanged_ = function() {
     this.sourceBlock_.bumpNeighbours();
   }
 };
+
+exports = RenderedConnection;
diff --git a/tests/deps.js b/tests/deps.js
index de575339f..367e41229 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -118,7 +118,7 @@ goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.xml']);
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], []);
-goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry']);
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});

From c9225da3f3038f7965f9bb94de6aebdd09fa2185 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 10:38:47 -0700
Subject: [PATCH 337/833] Migrate core/rendered_connection.js to named requires

---
 core/rendered_connection.js | 139 ++++++++++++++++++------------------
 tests/deps.js               |   2 +-
 2 files changed, 72 insertions(+), 69 deletions(-)

diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index a4d265746..953062f20 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -13,26 +13,29 @@
 goog.module('Blockly.RenderedConnection');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Connection');
-goog.require('Blockly.connectionTypes');
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.deprecation');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Svg');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.ConnectionDB');
+/* 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.require('Blockly.Connection');
+/* eslint-disable-next-line no-unused-vars */
+const ConnectionDB = goog.requireType('Blockly.ConnectionDB');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Events = goog.require('Blockly.Events');
+const Svg = goog.require('Blockly.utils.Svg');
+const connectionTypes = goog.require('Blockly.connectionTypes');
+const deprecation = goog.require('Blockly.utils.deprecation');
+const dom = goog.require('Blockly.utils.dom');
+const internalConstants = goog.require('Blockly.internalConstants');
+const object = goog.require('Blockly.utils.object');
+const utils = goog.require('Blockly.utils');
 
 
 /**
  * Class for a connection between blocks that may be rendered on screen.
- * @param {!Blockly.BlockSvg} source The block establishing this connection.
+ * @param {!BlockSvg} source The block establishing this connection.
  * @param {number} type The type of the connection.
- * @extends {Blockly.Connection}
+ * @extends {Connection}
  * @constructor
  */
 const RenderedConnection = function(source, type) {
@@ -40,7 +43,7 @@ const RenderedConnection = function(source, type) {
 
   /**
    * Connection database for connections of this type on the current workspace.
-   * @const {!Blockly.ConnectionDB}
+   * @const {!ConnectionDB}
    * @private
    */
   this.db_ = source.workspace.connectionDBList[type];
@@ -48,19 +51,19 @@ const RenderedConnection = function(source, type) {
   /**
    * Connection database for connections compatible with this type on the
    * current workspace.
-   * @const {!Blockly.ConnectionDB}
+   * @const {!ConnectionDB}
    * @private
    */
   this.dbOpposite_ =
       source.workspace
-          .connectionDBList[Blockly.internalConstants.OPPOSITE_TYPE[type]];
+          .connectionDBList[internalConstants.OPPOSITE_TYPE[type]];
 
   /**
    * Workspace units, (0, 0) is top left of block.
-   * @type {!Blockly.utils.Coordinate}
+   * @type {!Coordinate}
    * @private
    */
-  this.offsetInBlock_ = new Blockly.utils.Coordinate(0, 0);
+  this.offsetInBlock_ = new Coordinate(0, 0);
 
   /**
    * Describes the state of this connection's tracked-ness.
@@ -75,7 +78,7 @@ const RenderedConnection = function(source, type) {
    */
   this.targetConnection = null;
 };
-Blockly.utils.object.inherits(RenderedConnection, Blockly.Connection);
+object.inherits(RenderedConnection, Connection);
 
 /**
  * Enum for different kinds of tracked states.
@@ -110,28 +113,28 @@ RenderedConnection.prototype.dispose = function() {
 
 /**
  * Get the source block for this connection.
- * @return {!Blockly.BlockSvg} The source block.
+ * @return {!BlockSvg} The source block.
  * @override
  */
 RenderedConnection.prototype.getSourceBlock = function() {
-  return /** @type {!Blockly.BlockSvg} */ (
+  return /** @type {!BlockSvg} */ (
     RenderedConnection.superClass_.getSourceBlock.call(this));
 };
 
 /**
  * Returns the block that this connection connects to.
- * @return {?Blockly.BlockSvg} The connected block or null if none is connected.
+ * @return {?BlockSvg} The connected block or null if none is connected.
  * @override
  */
 RenderedConnection.prototype.targetBlock = function() {
-  return /** @type {Blockly.BlockSvg} */ (
+  return /** @type {BlockSvg} */ (
     RenderedConnection.superClass_.targetBlock.call(this));
 };
 
 /**
  * Returns the distance between this connection and another connection in
  * workspace units.
- * @param {!Blockly.Connection} otherConnection The other connection to measure
+ * @param {!Connection} otherConnection The other connection to measure
  *     the distance to.
  * @return {number} The distance between connections, in workspace units.
  */
@@ -144,7 +147,7 @@ RenderedConnection.prototype.distanceFrom = function(otherConnection) {
 /**
  * Move the block(s) belonging to the connection to a point where they don't
  * visually interfere with the specified connection.
- * @param {!Blockly.Connection} staticConnection The connection to move away
+ * @param {!Connection} staticConnection The connection to move away
  *     from.
  * @package
  */
@@ -175,21 +178,21 @@ RenderedConnection.prototype.bumpAwayFrom = function(staticConnection) {
   const selected = Blockly.selected == rootBlock;
   selected || rootBlock.addSelect();
   let dx =
-      (staticConnection.x + Blockly.internalConstants.SNAP_RADIUS +
-       Math.floor(Math.random() * Blockly.internalConstants.BUMP_RANDOMNESS)) -
+      (staticConnection.x + internalConstants.SNAP_RADIUS +
+       Math.floor(Math.random() * internalConstants.BUMP_RANDOMNESS)) -
       this.x;
   let dy =
-      (staticConnection.y + Blockly.internalConstants.SNAP_RADIUS +
-       Math.floor(Math.random() * Blockly.internalConstants.BUMP_RANDOMNESS)) -
+      (staticConnection.y + internalConstants.SNAP_RADIUS +
+       Math.floor(Math.random() * internalConstants.BUMP_RANDOMNESS)) -
       this.y;
   if (reverse) {
     // When reversing a bump due to an uneditable block, bump up.
     dy = -dy;
   }
   if (rootBlock.RTL) {
-    dx = (staticConnection.x - Blockly.internalConstants.SNAP_RADIUS -
+    dx = (staticConnection.x - internalConstants.SNAP_RADIUS -
           Math.floor(
-              Math.random() * Blockly.internalConstants.BUMP_RANDOMNESS)) -
+              Math.random() * internalConstants.BUMP_RANDOMNESS)) -
         this.x;
   }
   rootBlock.moveBy(dx, dy);
@@ -226,7 +229,7 @@ RenderedConnection.prototype.moveBy = function(dx, dy) {
 /**
  * Move this connection to the location given by its offset within the block and
  * the location of the block's top left corner.
- * @param {!Blockly.utils.Coordinate} blockTL The location of the top left
+ * @param {!Coordinate} blockTL The location of the top left
  *     corner of the block, in workspace coordinates.
  */
 RenderedConnection.prototype.moveToOffset = function(blockTL) {
@@ -246,7 +249,7 @@ RenderedConnection.prototype.setOffsetInBlock = function(x, y) {
 
 /**
  * Get the offset of this connection relative to the top left of its block.
- * @return {!Blockly.utils.Coordinate} The offset of the connection.
+ * @return {!Coordinate} The offset of the connection.
  * @package
  */
 RenderedConnection.prototype.getOffsetInBlock = function() {
@@ -267,7 +270,7 @@ RenderedConnection.prototype.tighten = function() {
       throw Error('block is not rendered.');
     }
     // Workspace coordinates.
-    const xy = Blockly.utils.getRelativeXY(svgRoot);
+    const xy = utils.getRelativeXY(svgRoot);
     block.getSvgRoot().setAttribute('transform',
         'translate(' + (xy.x - dx) + ',' + (xy.y - dy) + ')');
     block.moveConnections(-dx, -dy);
@@ -278,9 +281,9 @@ RenderedConnection.prototype.tighten = function() {
  * Find the closest compatible connection to this connection.
  * All parameters are in workspace units.
  * @param {number} maxLimit The maximum radius to another connection.
- * @param {!Blockly.utils.Coordinate} dxy Offset between this connection's location
+ * @param {!Coordinate} dxy Offset between this connection's location
  *     in the database and the current location (as a result of dragging).
- * @return {!{connection: ?Blockly.Connection, radius: number}} Contains two
+ * @return {!{connection: ?Connection, radius: number}} Contains two
  *     properties: 'connection' which is either another connection or null,
  *     and 'radius' which is the distance.
  */
@@ -293,31 +296,31 @@ RenderedConnection.prototype.closest = function(maxLimit, dxy) {
  */
 RenderedConnection.prototype.highlight = function() {
   let steps;
-  const sourceBlockSvg = /** @type {!Blockly.BlockSvg} */ (this.sourceBlock_);
+  const sourceBlockSvg = /** @type {!BlockSvg} */ (this.sourceBlock_);
   const renderConstants = sourceBlockSvg.workspace.getRenderer().getConstants();
   const shape = renderConstants.shapeFor(this);
-  if (this.type == Blockly.connectionTypes.INPUT_VALUE ||
-      this.type == Blockly.connectionTypes.OUTPUT_VALUE) {
+  if (this.type == connectionTypes.INPUT_VALUE ||
+      this.type == connectionTypes.OUTPUT_VALUE) {
     // Vertical line, puzzle tab, vertical line.
     const yLen = renderConstants.TAB_OFFSET_FROM_TOP;
-    steps = Blockly.utils.svgPaths.moveBy(0, -yLen) +
-        Blockly.utils.svgPaths.lineOnAxis('v', yLen) +
+    steps = utils.svgPaths.moveBy(0, -yLen) +
+        utils.svgPaths.lineOnAxis('v', yLen) +
         shape.pathDown +
-        Blockly.utils.svgPaths.lineOnAxis('v', yLen);
+        utils.svgPaths.lineOnAxis('v', yLen);
   } else {
     const xLen =
         renderConstants.NOTCH_OFFSET_LEFT - renderConstants.CORNER_RADIUS;
     // Horizontal line, notch, horizontal line.
-    steps = Blockly.utils.svgPaths.moveBy(-xLen, 0) +
-        Blockly.utils.svgPaths.lineOnAxis('h', xLen) +
+    steps = utils.svgPaths.moveBy(-xLen, 0) +
+        utils.svgPaths.lineOnAxis('h', xLen) +
         shape.pathLeft +
-        Blockly.utils.svgPaths.lineOnAxis('h', xLen);
+        utils.svgPaths.lineOnAxis('h', xLen);
   }
   const xy = this.sourceBlock_.getRelativeToSurfaceXY();
   const x = this.x - xy.x;
   const y = this.y - xy.y;
-  Blockly.Connection.highlightedPath_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
+  Connection.highlightedPath_ = dom.createSvgElement(
+      Svg.PATH,
       {
         'class': 'blocklyHighlightedConnectionPath',
         'd': steps,
@@ -331,8 +334,8 @@ RenderedConnection.prototype.highlight = function() {
  * Remove the highlighting around this connection.
  */
 RenderedConnection.prototype.unhighlight = function() {
-  Blockly.utils.dom.removeNode(Blockly.Connection.highlightedPath_);
-  delete Blockly.Connection.highlightedPath_;
+  dom.removeNode(Connection.highlightedPath_);
+  delete Connection.highlightedPath_;
 };
 
 /**
@@ -393,7 +396,7 @@ RenderedConnection.prototype.stopTrackingAll = function() {
 /**
  * Start tracking this connection, as well as all down-stream connections on
  * any block attached to this connection. This happens when a block is expanded.
- * @return {!Array<!Blockly.Block>} List of blocks to render.
+ * @return {!Array<!Block>} List of blocks to render.
  */
 RenderedConnection.prototype.startTrackingAll = function() {
   this.setTracking(true);
@@ -402,8 +405,8 @@ RenderedConnection.prototype.startTrackingAll = function() {
   // of lower blocks. Also, since rendering a block renders all its parents,
   // we only need to render the leaf nodes.
   const renderList = [];
-  if (this.type != Blockly.connectionTypes.INPUT_VALUE &&
-      this.type != Blockly.connectionTypes.NEXT_STATEMENT) {
+  if (this.type != connectionTypes.INPUT_VALUE &&
+      this.type != connectionTypes.NEXT_STATEMENT) {
     // Only spider down.
     return renderList;
   }
@@ -433,7 +436,7 @@ RenderedConnection.prototype.startTrackingAll = function() {
 
 /**
  * Check if the two connections can be dragged to connect to each other.
- * @param {!Blockly.Connection} candidate A nearby connection to check.
+ * @param {!Connection} candidate A nearby connection to check.
  * @param {number=} maxRadius The maximum radius allowed for connections, in
  *     workspace units.
  * @return {boolean} True if the connection is allowed, false otherwise.
@@ -441,7 +444,7 @@ RenderedConnection.prototype.startTrackingAll = function() {
  */
 RenderedConnection.prototype.isConnectionAllowed = function(candidate,
     maxRadius) {
-  Blockly.utils.deprecation.warn(
+  deprecation.warn(
       'RenderedConnection.prototype.isConnectionAllowed',
       'July 2020',
       'July 2021',
@@ -458,30 +461,30 @@ RenderedConnection.prototype.isConnectionAllowed = function(candidate,
  * Behavior after a connection attempt fails.
  * Bumps this connection away from the other connection. Called when an
  * attempted connection fails.
- * @param {!Blockly.Connection} otherConnection Connection that this connection
+ * @param {!Connection} otherConnection Connection that this connection
  *     failed to connect to.
  * @package
  */
 RenderedConnection.prototype.onFailedConnect =
     function(otherConnection) {
       const block = this.getSourceBlock();
-      if (Blockly.Events.recordUndo) {
-        const group = Blockly.Events.getGroup();
+      if (Events.recordUndo) {
+        const group = Events.getGroup();
         setTimeout(function() {
           if (!block.isDisposed() && !block.getParent()) {
-            Blockly.Events.setGroup(group);
+            Events.setGroup(group);
             this.bumpAwayFrom(otherConnection);
-            Blockly.Events.setGroup(false);
+            Events.setGroup(false);
           }
-        }.bind(this), Blockly.internalConstants.BUMP_DELAY);
+        }.bind(this), internalConstants.BUMP_DELAY);
       }
     };
 
 
 /**
  * Disconnect two blocks that are connected by this connection.
- * @param {!Blockly.Block} parentBlock The superior block.
- * @param {!Blockly.Block} childBlock The inferior block.
+ * @param {!Block} parentBlock The superior block.
+ * @param {!Block} childBlock The inferior block.
  * @protected
  * @override
  */
@@ -528,7 +531,7 @@ RenderedConnection.prototype.respawnShadow_ = function() {
  * Type checking does not apply, since this function is used for bumping.
  * @param {number} maxLimit The maximum radius to another connection, in
  *     workspace units.
- * @return {!Array<!Blockly.Connection>} List of connections.
+ * @return {!Array<!Connection>} List of connections.
  * @package
  */
 RenderedConnection.prototype.neighbours = function(maxLimit) {
@@ -538,7 +541,7 @@ RenderedConnection.prototype.neighbours = function(maxLimit) {
 /**
  * Connect two connections together.  This is the connection on the superior
  * block.  Rerender blocks as needed.
- * @param {!Blockly.Connection} childConnection Connection on inferior block.
+ * @param {!Connection} childConnection Connection on inferior block.
  * @protected
  */
 RenderedConnection.prototype.connect_ = function(childConnection) {
@@ -557,8 +560,8 @@ RenderedConnection.prototype.connect_ = function(childConnection) {
     childBlock.updateDisabled();
   }
   if (parentRendered && childRendered) {
-    if (parentConnection.type == Blockly.connectionTypes.NEXT_STATEMENT ||
-        parentConnection.type == Blockly.connectionTypes.PREVIOUS_STATEMENT) {
+    if (parentConnection.type == connectionTypes.NEXT_STATEMENT ||
+        parentConnection.type == connectionTypes.PREVIOUS_STATEMENT) {
       // Child block may need to square off its corners if it is in a stack.
       // Rendering a child will render its parent.
       childBlock.render();
diff --git a/tests/deps.js b/tests/deps.js
index 367e41229..1b419caf7 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -118,7 +118,7 @@ goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.xml']);
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], []);
-goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry']);
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});

From 372f5c0834f23d8e08cfc6fee4278f2c7bc74668 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 10:39:45 -0700
Subject: [PATCH 338/833] clang-format core/rendered_connection.js

---
 core/rendered_connection.js | 99 +++++++++++++++++--------------------
 1 file changed, 45 insertions(+), 54 deletions(-)

diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index 953062f20..0abc123e5 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -55,8 +55,7 @@ const RenderedConnection = function(source, type) {
    * @private
    */
   this.dbOpposite_ =
-      source.workspace
-          .connectionDBList[internalConstants.OPPOSITE_TYPE[type]];
+      source.workspace.connectionDBList[internalConstants.OPPOSITE_TYPE[type]];
 
   /**
    * Workspace units, (0, 0) is top left of block.
@@ -118,7 +117,7 @@ RenderedConnection.prototype.dispose = function() {
  */
 RenderedConnection.prototype.getSourceBlock = function() {
   return /** @type {!BlockSvg} */ (
-    RenderedConnection.superClass_.getSourceBlock.call(this));
+      RenderedConnection.superClass_.getSourceBlock.call(this));
 };
 
 /**
@@ -128,7 +127,7 @@ RenderedConnection.prototype.getSourceBlock = function() {
  */
 RenderedConnection.prototype.targetBlock = function() {
   return /** @type {BlockSvg} */ (
-    RenderedConnection.superClass_.targetBlock.call(this));
+      RenderedConnection.superClass_.targetBlock.call(this));
 };
 
 /**
@@ -177,13 +176,11 @@ RenderedConnection.prototype.bumpAwayFrom = function(staticConnection) {
   // Raise it to the top for extra visibility.
   const selected = Blockly.selected == rootBlock;
   selected || rootBlock.addSelect();
-  let dx =
-      (staticConnection.x + internalConstants.SNAP_RADIUS +
-       Math.floor(Math.random() * internalConstants.BUMP_RANDOMNESS)) -
+  let dx = (staticConnection.x + internalConstants.SNAP_RADIUS +
+            Math.floor(Math.random() * internalConstants.BUMP_RANDOMNESS)) -
       this.x;
-  let dy =
-      (staticConnection.y + internalConstants.SNAP_RADIUS +
-       Math.floor(Math.random() * internalConstants.BUMP_RANDOMNESS)) -
+  let dy = (staticConnection.y + internalConstants.SNAP_RADIUS +
+            Math.floor(Math.random() * internalConstants.BUMP_RANDOMNESS)) -
       this.y;
   if (reverse) {
     // When reversing a bump due to an uneditable block, bump up.
@@ -191,8 +188,7 @@ RenderedConnection.prototype.bumpAwayFrom = function(staticConnection) {
   }
   if (rootBlock.RTL) {
     dx = (staticConnection.x - internalConstants.SNAP_RADIUS -
-          Math.floor(
-              Math.random() * internalConstants.BUMP_RANDOMNESS)) -
+          Math.floor(Math.random() * internalConstants.BUMP_RANDOMNESS)) -
         this.x;
   }
   rootBlock.moveBy(dx, dy);
@@ -208,8 +204,7 @@ RenderedConnection.prototype.moveTo = function(x, y) {
   if (this.trackedState_ == RenderedConnection.TrackedState.WILL_TRACK) {
     this.db_.addConnection(this, y);
     this.trackedState_ = RenderedConnection.TrackedState.TRACKED;
-  } else if (this.trackedState_ == RenderedConnection
-      .TrackedState.TRACKED) {
+  } else if (this.trackedState_ == RenderedConnection.TrackedState.TRACKED) {
     this.db_.removeConnection(this, this.y);
     this.db_.addConnection(this, y);
   }
@@ -233,8 +228,8 @@ RenderedConnection.prototype.moveBy = function(dx, dy) {
  *     corner of the block, in workspace coordinates.
  */
 RenderedConnection.prototype.moveToOffset = function(blockTL) {
-  this.moveTo(blockTL.x + this.offsetInBlock_.x,
-      blockTL.y + this.offsetInBlock_.y);
+  this.moveTo(
+      blockTL.x + this.offsetInBlock_.x, blockTL.y + this.offsetInBlock_.y);
 };
 
 /**
@@ -271,8 +266,8 @@ RenderedConnection.prototype.tighten = function() {
     }
     // Workspace coordinates.
     const xy = utils.getRelativeXY(svgRoot);
-    block.getSvgRoot().setAttribute('transform',
-        'translate(' + (xy.x - dx) + ',' + (xy.y - dy) + ')');
+    block.getSvgRoot().setAttribute(
+        'transform', 'translate(' + (xy.x - dx) + ',' + (xy.y - dy) + ')');
     block.moveConnections(-dx, -dy);
   }
 };
@@ -304,24 +299,21 @@ RenderedConnection.prototype.highlight = function() {
     // Vertical line, puzzle tab, vertical line.
     const yLen = renderConstants.TAB_OFFSET_FROM_TOP;
     steps = utils.svgPaths.moveBy(0, -yLen) +
-        utils.svgPaths.lineOnAxis('v', yLen) +
-        shape.pathDown +
+        utils.svgPaths.lineOnAxis('v', yLen) + shape.pathDown +
         utils.svgPaths.lineOnAxis('v', yLen);
   } else {
     const xLen =
         renderConstants.NOTCH_OFFSET_LEFT - renderConstants.CORNER_RADIUS;
     // Horizontal line, notch, horizontal line.
     steps = utils.svgPaths.moveBy(-xLen, 0) +
-        utils.svgPaths.lineOnAxis('h', xLen) +
-        shape.pathLeft +
+        utils.svgPaths.lineOnAxis('h', xLen) + shape.pathLeft +
         utils.svgPaths.lineOnAxis('h', xLen);
   }
   const xy = this.sourceBlock_.getRelativeToSurfaceXY();
   const x = this.x - xy.x;
   const y = this.y - xy.y;
   Connection.highlightedPath_ = dom.createSvgElement(
-      Svg.PATH,
-      {
+      Svg.PATH, {
         'class': 'blocklyHighlightedConnectionPath',
         'd': steps,
         transform: 'translate(' + x + ',' + y + ')' +
@@ -344,10 +336,10 @@ RenderedConnection.prototype.unhighlight = function() {
  * @package
  */
 RenderedConnection.prototype.setTracking = function(doTracking) {
-  if ((doTracking && this.trackedState_ ==
-      RenderedConnection.TrackedState.TRACKED) ||
-      (!doTracking && this.trackedState_ ==
-      RenderedConnection.TrackedState.UNTRACKED)) {
+  if ((doTracking &&
+       this.trackedState_ == RenderedConnection.TrackedState.TRACKED) ||
+      (!doTracking &&
+       this.trackedState_ == RenderedConnection.TrackedState.UNTRACKED)) {
     return;
   }
   if (this.sourceBlock_.isInFlyout) {
@@ -442,19 +434,18 @@ RenderedConnection.prototype.startTrackingAll = function() {
  * @return {boolean} True if the connection is allowed, false otherwise.
  * @deprecated July 2020
  */
-RenderedConnection.prototype.isConnectionAllowed = function(candidate,
-    maxRadius) {
+RenderedConnection.prototype.isConnectionAllowed = function(
+    candidate, maxRadius) {
   deprecation.warn(
-      'RenderedConnection.prototype.isConnectionAllowed',
-      'July 2020',
+      'RenderedConnection.prototype.isConnectionAllowed', 'July 2020',
       'July 2021',
       'Blockly.Workspace.prototype.getConnectionChecker().canConnect');
   if (this.distanceFrom(candidate) > maxRadius) {
     return false;
   }
 
-  return RenderedConnection.superClass_.isConnectionAllowed.call(this,
-      candidate);
+  return RenderedConnection.superClass_.isConnectionAllowed.call(
+      this, candidate);
 };
 
 /**
@@ -465,20 +456,19 @@ RenderedConnection.prototype.isConnectionAllowed = function(candidate,
  *     failed to connect to.
  * @package
  */
-RenderedConnection.prototype.onFailedConnect =
-    function(otherConnection) {
-      const block = this.getSourceBlock();
-      if (Events.recordUndo) {
-        const group = Events.getGroup();
-        setTimeout(function() {
-          if (!block.isDisposed() && !block.getParent()) {
-            Events.setGroup(group);
-            this.bumpAwayFrom(otherConnection);
-            Events.setGroup(false);
-          }
-        }.bind(this), internalConstants.BUMP_DELAY);
+RenderedConnection.prototype.onFailedConnect = function(otherConnection) {
+  const block = this.getSourceBlock();
+  if (Events.recordUndo) {
+    const group = Events.getGroup();
+    setTimeout(function() {
+      if (!block.isDisposed() && !block.getParent()) {
+        Events.setGroup(group);
+        this.bumpAwayFrom(otherConnection);
+        Events.setGroup(false);
       }
-    };
+    }.bind(this), internalConstants.BUMP_DELAY);
+  }
+};
 
 
 /**
@@ -488,10 +478,10 @@ RenderedConnection.prototype.onFailedConnect =
  * @protected
  * @override
  */
-RenderedConnection.prototype.disconnectInternal_ = function(parentBlock,
-    childBlock) {
-  RenderedConnection.superClass_.disconnectInternal_.call(this,
-      parentBlock, childBlock);
+RenderedConnection.prototype.disconnectInternal_ = function(
+    parentBlock, childBlock) {
+  RenderedConnection.superClass_.disconnectInternal_.call(
+      this, parentBlock, childBlock);
   // Rerender the parent so that it may reflow.
   if (parentBlock.rendered) {
     parentBlock.render();
@@ -586,9 +576,10 @@ RenderedConnection.prototype.connect_ = function(childConnection) {
  */
 RenderedConnection.prototype.onCheckChanged_ = function() {
   // The new value type may not be compatible with the existing connection.
-  if (this.isConnected() && (!this.targetConnection ||
-      !this.getConnectionChecker().canConnect(
-          this, this.targetConnection, false))) {
+  if (this.isConnected() &&
+      (!this.targetConnection ||
+       !this.getConnectionChecker().canConnect(
+           this, this.targetConnection, false))) {
     const child = this.isSuperior() ? this.targetBlock() : this.sourceBlock_;
     child.unplug();
     // Bump away.

From 055533e783dcaf9268a3f6849a2974e91537be7d Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 11:17:17 -0700
Subject: [PATCH 339/833] Migrate core/shortcut_registry.js to ES6 const/let

---
 core/shortcut_registry.js | 42 +++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/core/shortcut_registry.js b/core/shortcut_registry.js
index 14684e1b8..807f40d84 100644
--- a/core/shortcut_registry.js
+++ b/core/shortcut_registry.js
@@ -78,7 +78,7 @@ Blockly.ShortcutRegistry.KeyboardShortcut;
  */
 Blockly.ShortcutRegistry.prototype.register = function(
     shortcut, opt_allowOverrides) {
-  var registeredShortcut = this.registry_[shortcut.name];
+  const registeredShortcut = this.registry_[shortcut.name];
   if (registeredShortcut && !opt_allowOverrides) {
     throw new Error(
         'Shortcut with name "' + shortcut.name + '" already exists.');
@@ -94,7 +94,7 @@ Blockly.ShortcutRegistry.prototype.register = function(
  * @public
  */
 Blockly.ShortcutRegistry.prototype.unregister = function(shortcutName) {
-  var shortcut = this.registry_[shortcutName];
+  const shortcut = this.registry_[shortcutName];
 
   if (!shortcut) {
     console.warn(
@@ -123,7 +123,7 @@ Blockly.ShortcutRegistry.prototype.unregister = function(shortcutName) {
 Blockly.ShortcutRegistry.prototype.addKeyMapping = function(
     keyCode, shortcutName, opt_allowCollision) {
   keyCode = String(keyCode);
-  var shortcutNames = this.keyMap_[keyCode];
+  const shortcutNames = this.keyMap_[keyCode];
   if (shortcutNames && !opt_allowCollision) {
     throw new Error(
         'Shortcut with name "' + shortcutName + '" collides with shortcuts ' +
@@ -149,7 +149,7 @@ Blockly.ShortcutRegistry.prototype.addKeyMapping = function(
  */
 Blockly.ShortcutRegistry.prototype.removeKeyMapping = function(
     keyCode, shortcutName, opt_quiet) {
-  var shortcutNames = this.keyMap_[keyCode];
+  const shortcutNames = this.keyMap_[keyCode];
 
   if (!shortcutNames && !opt_quiet) {
     console.warn(
@@ -158,7 +158,7 @@ Blockly.ShortcutRegistry.prototype.removeKeyMapping = function(
     return false;
   }
 
-  var shortcutIdx = shortcutNames.indexOf(shortcutName);
+  const shortcutIdx = shortcutNames.indexOf(shortcutName);
   if (shortcutIdx > -1) {
     shortcutNames.splice(shortcutIdx, 1);
     if (shortcutNames.length == 0) {
@@ -181,7 +181,7 @@ Blockly.ShortcutRegistry.prototype.removeKeyMapping = function(
  * @public
  */
 Blockly.ShortcutRegistry.prototype.removeAllKeyMappings = function(shortcutName) {
-  for (var keyCode in this.keyMap_) {
+  for (const keyCode in this.keyMap_) {
     this.removeKeyMapping(keyCode, shortcutName, true);
   }
 };
@@ -225,13 +225,13 @@ Blockly.ShortcutRegistry.prototype.getRegistry = function() {
  * @public
  */
 Blockly.ShortcutRegistry.prototype.onKeyDown = function(workspace, e) {
-  var key = this.serializeKeyEvent_(e);
-  var shortcutNames = this.getShortcutNamesByKeyCode(key);
+  const key = this.serializeKeyEvent_(e);
+  const shortcutNames = this.getShortcutNamesByKeyCode(key);
   if (!shortcutNames) {
     return false;
   }
-  for (var i = 0, shortcutName; (shortcutName = shortcutNames[i]); i++) {
-    var shortcut = this.registry_[shortcutName];
+  for (let i = 0, shortcutName; (shortcutName = shortcutNames[i]); i++) {
+    const shortcut = this.registry_[shortcutName];
     if (!shortcut.preconditionFn || shortcut.preconditionFn(workspace)) {
       // If the key has been handled, stop processing shortcuts.
       if (shortcut.callback && shortcut.callback(workspace, e, shortcut)) {
@@ -264,10 +264,10 @@ Blockly.ShortcutRegistry.prototype.getShortcutNamesByKeyCode = function(
  */
 Blockly.ShortcutRegistry.prototype.getKeyCodesByShortcutName = function(
     shortcutName) {
-  var keys = [];
-  for (var keyCode in this.keyMap_) {
-    var shortcuts = this.keyMap_[keyCode];
-    var shortcutIdx = shortcuts.indexOf(shortcutName);
+  const keys = [];
+  for (const keyCode in this.keyMap_) {
+    const shortcuts = this.keyMap_[keyCode];
+    const shortcutIdx = shortcuts.indexOf(shortcutName);
     if (shortcutIdx > -1) {
       keys.push(keyCode);
     }
@@ -282,8 +282,8 @@ Blockly.ShortcutRegistry.prototype.getKeyCodesByShortcutName = function(
  * @private
  */
 Blockly.ShortcutRegistry.prototype.serializeKeyEvent_ = function(e) {
-  var serializedKey = '';
-  for (var modifier in Blockly.ShortcutRegistry.modifierKeys) {
+  let serializedKey = '';
+  for (const modifier in Blockly.ShortcutRegistry.modifierKeys) {
     if (e.getModifierState(modifier)) {
       if (serializedKey != '') {
         serializedKey += '+';
@@ -307,9 +307,9 @@ Blockly.ShortcutRegistry.prototype.serializeKeyEvent_ = function(e) {
  */
 Blockly.ShortcutRegistry.prototype.checkModifiers_ = function(
     modifiers) {
-  var validModifiers = Blockly.utils.object.values(
+  const validModifiers = Blockly.utils.object.values(
       Blockly.ShortcutRegistry.modifierKeys);
-  for (var i = 0, modifier; (modifier = modifiers[i]); i++) {
+  for (let i = 0, modifier; (modifier = modifiers[i]); i++) {
     if (validModifiers.indexOf(modifier) < 0) {
       throw new Error(modifier + ' is not a valid modifier key.');
     }
@@ -327,12 +327,12 @@ Blockly.ShortcutRegistry.prototype.checkModifiers_ = function(
  */
 Blockly.ShortcutRegistry.prototype.createSerializedKey = function(
     keyCode, modifiers) {
-  var serializedKey = '';
+  let serializedKey = '';
 
   if (modifiers) {
     this.checkModifiers_(modifiers);
-    for (var modifier in Blockly.ShortcutRegistry.modifierKeys) {
-      var modifierKeyCode =
+    for (const modifier in Blockly.ShortcutRegistry.modifierKeys) {
+      const modifierKeyCode =
           Blockly.ShortcutRegistry.modifierKeys[modifier];
       if (modifiers.indexOf(modifierKeyCode) > -1) {
         if (serializedKey != '') {

From 69b900aa4626cf584066a670e22cd8ae4553bc99 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 11:25:30 -0700
Subject: [PATCH 340/833] Migrate core/shortcut_registry.js to goog.module

---
 core/interfaces/i_keyboard_accessible.js |  5 +-
 core/shortcut_registry.js                | 71 ++++++++++++------------
 tests/deps.js                            |  2 +-
 3 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/core/interfaces/i_keyboard_accessible.js b/core/interfaces/i_keyboard_accessible.js
index 8243e67d1..04704a2fe 100644
--- a/core/interfaces/i_keyboard_accessible.js
+++ b/core/interfaces/i_keyboard_accessible.js
@@ -15,7 +15,7 @@ goog.module('Blockly.IKeyboardAccessible');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const {KeyboardShortcut} = goog.requireType('Blockly.ShortcutRegistry');
+const ShortcutRegistry = goog.requireType('Blockly.ShortcutRegistry');
 
 
 /**
@@ -26,7 +26,8 @@ const IKeyboardAccessible = function() {};
 
 /**
  * Handles the given keyboard shortcut.
- * @param {!KeyboardShortcut} shortcut The shortcut to be handled.
+ * @param {!ShortcutRegistry.KeyboardShortcut} shortcut The shortcut to be
+ *     handled.
  * @return {boolean} True if the shortcut has been handled, false otherwise.
  */
 IKeyboardAccessible.prototype.onShortcut;
diff --git a/core/shortcut_registry.js b/core/shortcut_registry.js
index 807f40d84..d75ec9546 100644
--- a/core/shortcut_registry.js
+++ b/core/shortcut_registry.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.ShortcutRegistry');
+goog.module('Blockly.ShortcutRegistry');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.utils.KeyCodes');
 goog.require('Blockly.utils.object');
@@ -22,16 +23,16 @@ goog.requireType('Blockly.Workspace');
 /**
  * Class for the registry of keyboard shortcuts. This is intended to be a
  * singleton. You should not create a new instance, and only access this class
- * from Blockly.ShortcutRegistry.registry.
+ * from ShortcutRegistry.registry.
  * @constructor
  */
-Blockly.ShortcutRegistry = function() {
+const ShortcutRegistry = function() {
   // Singleton instance should be registered once.
-  Blockly.ShortcutRegistry.registry = this;
+  ShortcutRegistry.registry = this;
 
   /**
    * Registry of all keyboard shortcuts, keyed by name of shortcut.
-   * @type {!Object<string, !Blockly.ShortcutRegistry.KeyboardShortcut>}
+   * @type {!Object<string, !ShortcutRegistry.KeyboardShortcut>}
    * @private
    */
   this.registry_ = Object.create(null);
@@ -48,7 +49,7 @@ Blockly.ShortcutRegistry = function() {
  * Enum of valid modifiers.
  * @enum {!Blockly.utils.KeyCodes<number>}
  */
-Blockly.ShortcutRegistry.modifierKeys = {
+ShortcutRegistry.modifierKeys = {
   'Shift': Blockly.utils.KeyCodes.SHIFT,
   'Control': Blockly.utils.KeyCodes.CTRL,
   'Alt': Blockly.utils.KeyCodes.ALT,
@@ -59,24 +60,24 @@ Blockly.ShortcutRegistry.modifierKeys = {
  * A keyboard shortcut.
  * @typedef {{
  *    callback: ((function(!Blockly.Workspace, Event,
- * !Blockly.ShortcutRegistry.KeyboardShortcut):boolean)|undefined),
+ * !ShortcutRegistry.KeyboardShortcut):boolean)|undefined),
  *    name: string,
  *    preconditionFn: ((function(!Blockly.Workspace):boolean)|undefined),
  *    metadata: (Object|undefined)
  * }}
  */
-Blockly.ShortcutRegistry.KeyboardShortcut;
+ShortcutRegistry.KeyboardShortcut;
 
 /**
  * Registers a keyboard shortcut.
- * @param {!Blockly.ShortcutRegistry.KeyboardShortcut} shortcut The
+ * @param {!ShortcutRegistry.KeyboardShortcut} shortcut The
  *     shortcut for this key code.
  * @param {boolean=} opt_allowOverrides True to prevent a warning when
  *     overriding an already registered item.
  * @throws {Error} if a shortcut with the same name already exists.
  * @public
  */
-Blockly.ShortcutRegistry.prototype.register = function(
+ShortcutRegistry.prototype.register = function(
     shortcut, opt_allowOverrides) {
   const registeredShortcut = this.registry_[shortcut.name];
   if (registeredShortcut && !opt_allowOverrides) {
@@ -93,7 +94,7 @@ Blockly.ShortcutRegistry.prototype.register = function(
  * @return {boolean} True if an item was unregistered, false otherwise.
  * @public
  */
-Blockly.ShortcutRegistry.prototype.unregister = function(shortcutName) {
+ShortcutRegistry.prototype.unregister = function(shortcutName) {
   const shortcut = this.registry_[shortcutName];
 
   if (!shortcut) {
@@ -112,7 +113,7 @@ Blockly.ShortcutRegistry.prototype.unregister = function(shortcutName) {
  * Adds a mapping between a keycode and a keyboard shortcut.
  * @param {string|Blockly.utils.KeyCodes} keyCode The key code for the keyboard
  *     shortcut. If registering a key code with a modifier (ex: ctrl+c) use
- *     Blockly.ShortcutRegistry.registry.createSerializedKey;
+ *     ShortcutRegistry.registry.createSerializedKey;
  * @param {string} shortcutName The name of the shortcut to execute when the
  *     given keycode is pressed.
  * @param {boolean=} opt_allowCollision True to prevent an error when adding a
@@ -120,7 +121,7 @@ Blockly.ShortcutRegistry.prototype.unregister = function(shortcutName) {
  * @throws {Error} if the given key code is already mapped to a shortcut.
  * @public
  */
-Blockly.ShortcutRegistry.prototype.addKeyMapping = function(
+ShortcutRegistry.prototype.addKeyMapping = function(
     keyCode, shortcutName, opt_allowCollision) {
   keyCode = String(keyCode);
   const shortcutNames = this.keyMap_[keyCode];
@@ -139,7 +140,7 @@ Blockly.ShortcutRegistry.prototype.addKeyMapping = function(
  * Removes a mapping between a keycode and a keyboard shortcut.
  * @param {string} keyCode The key code for the keyboard shortcut. If
  *     registering a key code with a modifier (ex: ctrl+c) use
- *     Blockly.ShortcutRegistry.registry.createSerializedKey;
+ *     ShortcutRegistry.registry.createSerializedKey;
  * @param {string} shortcutName The name of the shortcut to execute when the
  *     given keycode is pressed.
  * @param {boolean=} opt_quiet True to not console warn when there is no
@@ -147,7 +148,7 @@ Blockly.ShortcutRegistry.prototype.addKeyMapping = function(
  * @return {boolean} True if a key mapping was removed, false otherwise.
  * @public
  */
-Blockly.ShortcutRegistry.prototype.removeKeyMapping = function(
+ShortcutRegistry.prototype.removeKeyMapping = function(
     keyCode, shortcutName, opt_quiet) {
   const shortcutNames = this.keyMap_[keyCode];
 
@@ -180,7 +181,7 @@ Blockly.ShortcutRegistry.prototype.removeKeyMapping = function(
  * @param {string} shortcutName The name of the shortcut to remove from the key map.
  * @public
  */
-Blockly.ShortcutRegistry.prototype.removeAllKeyMappings = function(shortcutName) {
+ShortcutRegistry.prototype.removeAllKeyMappings = function(shortcutName) {
   for (const keyCode in this.keyMap_) {
     this.removeKeyMapping(keyCode, shortcutName, true);
   }
@@ -192,27 +193,27 @@ Blockly.ShortcutRegistry.prototype.removeAllKeyMappings = function(shortcutName)
  *     shortcut names.
  * @public
  */
-Blockly.ShortcutRegistry.prototype.setKeyMap = function(keyMap) {
+ShortcutRegistry.prototype.setKeyMap = function(keyMap) {
   this.keyMap_ = keyMap;
 };
 
 /**
  * Gets the current key map.
- * @return {!Object<string,!Array<!Blockly.ShortcutRegistry.KeyboardShortcut>>}
- *     The object holding key codes to Blockly.ShortcutRegistry.KeyboardShortcut.
+ * @return {!Object<string,!Array<!ShortcutRegistry.KeyboardShortcut>>}
+ *     The object holding key codes to ShortcutRegistry.KeyboardShortcut.
  * @public
  */
-Blockly.ShortcutRegistry.prototype.getKeyMap = function() {
+ShortcutRegistry.prototype.getKeyMap = function() {
   return Blockly.utils.object.deepMerge(Object.create(null), this.keyMap_);
 };
 
 /**
  * Gets the registry of keyboard shortcuts.
- * @return {!Object<string, !Blockly.ShortcutRegistry.KeyboardShortcut>}
+ * @return {!Object<string, !ShortcutRegistry.KeyboardShortcut>}
  *     The registry of keyboard shortcuts.
  * @public
  */
-Blockly.ShortcutRegistry.prototype.getRegistry = function() {
+ShortcutRegistry.prototype.getRegistry = function() {
   return Blockly.utils.object.deepMerge(Object.create(null), this.registry_);
 };
 
@@ -224,7 +225,7 @@ Blockly.ShortcutRegistry.prototype.getRegistry = function() {
  * @return {boolean} True if the event was handled, false otherwise.
  * @public
  */
-Blockly.ShortcutRegistry.prototype.onKeyDown = function(workspace, e) {
+ShortcutRegistry.prototype.onKeyDown = function(workspace, e) {
   const key = this.serializeKeyEvent_(e);
   const shortcutNames = this.getShortcutNamesByKeyCode(key);
   if (!shortcutNames) {
@@ -249,7 +250,7 @@ Blockly.ShortcutRegistry.prototype.onKeyDown = function(workspace, e) {
  *     given keyCode is used. Undefined if no shortcuts exist.
  * @public
  */
-Blockly.ShortcutRegistry.prototype.getShortcutNamesByKeyCode = function(
+ShortcutRegistry.prototype.getShortcutNamesByKeyCode = function(
     keyCode) {
   return this.keyMap_[keyCode] || [];
 };
@@ -262,7 +263,7 @@ Blockly.ShortcutRegistry.prototype.getShortcutNamesByKeyCode = function(
  *     registered under.
  * @public
  */
-Blockly.ShortcutRegistry.prototype.getKeyCodesByShortcutName = function(
+ShortcutRegistry.prototype.getKeyCodesByShortcutName = function(
     shortcutName) {
   const keys = [];
   for (const keyCode in this.keyMap_) {
@@ -281,9 +282,9 @@ Blockly.ShortcutRegistry.prototype.getKeyCodesByShortcutName = function(
  * @return {string} The serialized key code for the given event.
  * @private
  */
-Blockly.ShortcutRegistry.prototype.serializeKeyEvent_ = function(e) {
+ShortcutRegistry.prototype.serializeKeyEvent_ = function(e) {
   let serializedKey = '';
-  for (const modifier in Blockly.ShortcutRegistry.modifierKeys) {
+  for (const modifier in ShortcutRegistry.modifierKeys) {
     if (e.getModifierState(modifier)) {
       if (serializedKey != '') {
         serializedKey += '+';
@@ -305,10 +306,10 @@ Blockly.ShortcutRegistry.prototype.serializeKeyEvent_ = function(e) {
  * @throws {Error} if the modifier is not in the valid modifiers list.
  * @private
  */
-Blockly.ShortcutRegistry.prototype.checkModifiers_ = function(
+ShortcutRegistry.prototype.checkModifiers_ = function(
     modifiers) {
   const validModifiers = Blockly.utils.object.values(
-      Blockly.ShortcutRegistry.modifierKeys);
+      ShortcutRegistry.modifierKeys);
   for (let i = 0, modifier; (modifier = modifiers[i]); i++) {
     if (validModifiers.indexOf(modifier) < 0) {
       throw new Error(modifier + ' is not a valid modifier key.');
@@ -321,19 +322,19 @@ Blockly.ShortcutRegistry.prototype.checkModifiers_ = function(
  * @param {number} keyCode Number code representing the key.
  * @param {?Array<string>} modifiers List of modifier key codes to be used with
  *     the key. All valid modifiers can be found in the
- *     Blockly.ShortcutRegistry.modifierKeys.
+ *     ShortcutRegistry.modifierKeys.
  * @return {string} The serialized key code for the given modifiers and key.
  * @public
  */
-Blockly.ShortcutRegistry.prototype.createSerializedKey = function(
+ShortcutRegistry.prototype.createSerializedKey = function(
     keyCode, modifiers) {
   let serializedKey = '';
 
   if (modifiers) {
     this.checkModifiers_(modifiers);
-    for (const modifier in Blockly.ShortcutRegistry.modifierKeys) {
+    for (const modifier in ShortcutRegistry.modifierKeys) {
       const modifierKeyCode =
-          Blockly.ShortcutRegistry.modifierKeys[modifier];
+          ShortcutRegistry.modifierKeys[modifier];
       if (modifiers.indexOf(modifierKeyCode) > -1) {
         if (serializedKey != '') {
           serializedKey += '+';
@@ -352,4 +353,6 @@ Blockly.ShortcutRegistry.prototype.createSerializedKey = function(
 };
 
 // Creates and assigns the singleton instance.
-new Blockly.ShortcutRegistry();
+new ShortcutRegistry();
+
+exports = ShortcutRegistry;
diff --git a/tests/deps.js b/tests/deps.js
index de575339f..d67006c87 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -160,7 +160,7 @@ goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Ren
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar', 'Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.utils.KeyCodes']);
-goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object']);
+goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils', 'Blockly.utils.object']);
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme']);

From 3519f4abc8d5352214a3a9f7851ca9ca9326afd1 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 11:28:19 -0700
Subject: [PATCH 341/833] Migrate core/shortcut_registry.js to named requires

---
 core/shortcut_registry.js | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/core/shortcut_registry.js b/core/shortcut_registry.js
index d75ec9546..ac492397a 100644
--- a/core/shortcut_registry.js
+++ b/core/shortcut_registry.js
@@ -14,10 +14,10 @@
 goog.module('Blockly.ShortcutRegistry');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.utils.KeyCodes');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.Workspace');
+const KeyCodes = goog.require('Blockly.utils.KeyCodes');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -47,22 +47,22 @@ const ShortcutRegistry = function() {
 
 /**
  * Enum of valid modifiers.
- * @enum {!Blockly.utils.KeyCodes<number>}
+ * @enum {!KeyCodes<number>}
  */
 ShortcutRegistry.modifierKeys = {
-  'Shift': Blockly.utils.KeyCodes.SHIFT,
-  'Control': Blockly.utils.KeyCodes.CTRL,
-  'Alt': Blockly.utils.KeyCodes.ALT,
-  'Meta': Blockly.utils.KeyCodes.META
+  'Shift': KeyCodes.SHIFT,
+  'Control': KeyCodes.CTRL,
+  'Alt': KeyCodes.ALT,
+  'Meta': KeyCodes.META
 };
 
 /**
  * A keyboard shortcut.
  * @typedef {{
- *    callback: ((function(!Blockly.Workspace, Event,
+ *    callback: ((function(!Workspace, Event,
  * !ShortcutRegistry.KeyboardShortcut):boolean)|undefined),
  *    name: string,
- *    preconditionFn: ((function(!Blockly.Workspace):boolean)|undefined),
+ *    preconditionFn: ((function(!Workspace):boolean)|undefined),
  *    metadata: (Object|undefined)
  * }}
  */
@@ -111,7 +111,7 @@ ShortcutRegistry.prototype.unregister = function(shortcutName) {
 
 /**
  * Adds a mapping between a keycode and a keyboard shortcut.
- * @param {string|Blockly.utils.KeyCodes} keyCode The key code for the keyboard
+ * @param {string|KeyCodes} keyCode The key code for the keyboard
  *     shortcut. If registering a key code with a modifier (ex: ctrl+c) use
  *     ShortcutRegistry.registry.createSerializedKey;
  * @param {string} shortcutName The name of the shortcut to execute when the
@@ -204,7 +204,7 @@ ShortcutRegistry.prototype.setKeyMap = function(keyMap) {
  * @public
  */
 ShortcutRegistry.prototype.getKeyMap = function() {
-  return Blockly.utils.object.deepMerge(Object.create(null), this.keyMap_);
+  return object.deepMerge(Object.create(null), this.keyMap_);
 };
 
 /**
@@ -214,12 +214,12 @@ ShortcutRegistry.prototype.getKeyMap = function() {
  * @public
  */
 ShortcutRegistry.prototype.getRegistry = function() {
-  return Blockly.utils.object.deepMerge(Object.create(null), this.registry_);
+  return object.deepMerge(Object.create(null), this.registry_);
 };
 
 /**
  * Handles key down events.
- * @param {!Blockly.Workspace} workspace The main workspace where the event was
+ * @param {!Workspace} workspace The main workspace where the event was
  *     captured.
  * @param {!Event} e The key down event.
  * @return {boolean} True if the event was handled, false otherwise.
@@ -308,7 +308,7 @@ ShortcutRegistry.prototype.serializeKeyEvent_ = function(e) {
  */
 ShortcutRegistry.prototype.checkModifiers_ = function(
     modifiers) {
-  const validModifiers = Blockly.utils.object.values(
+  const validModifiers = object.values(
       ShortcutRegistry.modifierKeys);
   for (let i = 0, modifier; (modifier = modifiers[i]); i++) {
     if (validModifiers.indexOf(modifier) < 0) {

From 9e2d6f2aba5b7c3d43a0705ce7d28f5b4d44cc76 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 11:28:57 -0700
Subject: [PATCH 342/833] clang-format core/shortcut_registry.js

---
 core/shortcut_registry.js | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/core/shortcut_registry.js b/core/shortcut_registry.js
index ac492397a..3da777eae 100644
--- a/core/shortcut_registry.js
+++ b/core/shortcut_registry.js
@@ -77,8 +77,7 @@ ShortcutRegistry.KeyboardShortcut;
  * @throws {Error} if a shortcut with the same name already exists.
  * @public
  */
-ShortcutRegistry.prototype.register = function(
-    shortcut, opt_allowOverrides) {
+ShortcutRegistry.prototype.register = function(shortcut, opt_allowOverrides) {
   const registeredShortcut = this.registry_[shortcut.name];
   if (registeredShortcut && !opt_allowOverrides) {
     throw new Error(
@@ -168,7 +167,8 @@ ShortcutRegistry.prototype.removeKeyMapping = function(
     return true;
   }
   if (!opt_quiet) {
-    console.warn('No keyboard shortcut with name "' + shortcutName +
+    console.warn(
+        'No keyboard shortcut with name "' + shortcutName +
         '" registered with key code "' + keyCode + '"');
   }
   return false;
@@ -176,9 +176,10 @@ ShortcutRegistry.prototype.removeKeyMapping = function(
 
 /**
  * Removes all the key mappings for a shortcut with the given name.
- * Useful when changing the default key mappings and the key codes registered to the shortcut are
- * unknown.
- * @param {string} shortcutName The name of the shortcut to remove from the key map.
+ * Useful when changing the default key mappings and the key codes registered to
+ * the shortcut are unknown.
+ * @param {string} shortcutName The name of the shortcut to remove from the key
+ *     map.
  * @public
  */
 ShortcutRegistry.prototype.removeAllKeyMappings = function(shortcutName) {
@@ -250,8 +251,7 @@ ShortcutRegistry.prototype.onKeyDown = function(workspace, e) {
  *     given keyCode is used. Undefined if no shortcuts exist.
  * @public
  */
-ShortcutRegistry.prototype.getShortcutNamesByKeyCode = function(
-    keyCode) {
+ShortcutRegistry.prototype.getShortcutNamesByKeyCode = function(keyCode) {
   return this.keyMap_[keyCode] || [];
 };
 
@@ -263,8 +263,7 @@ ShortcutRegistry.prototype.getShortcutNamesByKeyCode = function(
  *     registered under.
  * @public
  */
-ShortcutRegistry.prototype.getKeyCodesByShortcutName = function(
-    shortcutName) {
+ShortcutRegistry.prototype.getKeyCodesByShortcutName = function(shortcutName) {
   const keys = [];
   for (const keyCode in this.keyMap_) {
     const shortcuts = this.keyMap_[keyCode];
@@ -306,10 +305,8 @@ ShortcutRegistry.prototype.serializeKeyEvent_ = function(e) {
  * @throws {Error} if the modifier is not in the valid modifiers list.
  * @private
  */
-ShortcutRegistry.prototype.checkModifiers_ = function(
-    modifiers) {
-  const validModifiers = object.values(
-      ShortcutRegistry.modifierKeys);
+ShortcutRegistry.prototype.checkModifiers_ = function(modifiers) {
+  const validModifiers = object.values(ShortcutRegistry.modifierKeys);
   for (let i = 0, modifier; (modifier = modifiers[i]); i++) {
     if (validModifiers.indexOf(modifier) < 0) {
       throw new Error(modifier + ' is not a valid modifier key.');
@@ -326,15 +323,13 @@ ShortcutRegistry.prototype.checkModifiers_ = function(
  * @return {string} The serialized key code for the given modifiers and key.
  * @public
  */
-ShortcutRegistry.prototype.createSerializedKey = function(
-    keyCode, modifiers) {
+ShortcutRegistry.prototype.createSerializedKey = function(keyCode, modifiers) {
   let serializedKey = '';
 
   if (modifiers) {
     this.checkModifiers_(modifiers);
     for (const modifier in ShortcutRegistry.modifierKeys) {
-      const modifierKeyCode =
-          ShortcutRegistry.modifierKeys[modifier];
+      const modifierKeyCode = ShortcutRegistry.modifierKeys[modifier];
       if (modifiers.indexOf(modifierKeyCode) > -1) {
         if (serializedKey != '') {
           serializedKey += '+';

From a106f37cbb3f9a1dd62062c3ed5eedb7b472c0c4 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 11:33:46 -0700
Subject: [PATCH 343/833] Migrate core/theme.js to ES6 const/let

---
 core/theme.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/theme.js b/core/theme.js
index 182710f16..75bfb3779 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -165,7 +165,7 @@ Blockly.Theme.prototype.setCategoryStyle = function(categoryStyleName,
  * @return {?string} The style value.
  */
 Blockly.Theme.prototype.getComponentStyle = function(componentName) {
-  var style = this.componentStyles[componentName];
+  const style = this.componentStyles[componentName];
   if (style && typeof style == 'string' &&
       this.getComponentStyle(/** @type {string} */ (style))) {
     return this.getComponentStyle(/** @type {string} */ (style));
@@ -207,8 +207,8 @@ Blockly.Theme.prototype.setStartHats = function(startHats) {
  * @return {!Blockly.Theme} A new Blockly theme.
 */
 Blockly.Theme.defineTheme = function(name, themeObj) {
-  var theme = new Blockly.Theme(name);
-  var base = themeObj['base'];
+  const theme = new Blockly.Theme(name);
+  let base = themeObj['base'];
   if (base) {
     if (typeof base == "string") {
       base = Blockly.registry.getObject(Blockly.registry.Type.THEME, base);

From 367b94dfdd8c2856efea4f9b66e6237a73200787 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 11:36:48 -0700
Subject: [PATCH 344/833] Migrate core/theme.js to goog.module

---
 core/theme.js | 61 +++++++++++++++++++++++++++------------------------
 tests/deps.js |  2 +-
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/core/theme.js b/core/theme.js
index 75bfb3779..16289a3ad 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -9,7 +9,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Theme');
+goog.module('Blockly.Theme');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.registry');
 goog.require('Blockly.utils');
@@ -19,16 +20,16 @@ goog.require('Blockly.utils.object');
 /**
  * Class for a theme.
  * @param {string} name Theme name.
- * @param {!Object<string, Blockly.Theme.BlockStyle>=} opt_blockStyles A map
+ * @param {!Object<string, Theme.BlockStyle>=} opt_blockStyles A map
  *     from style names (strings) to objects with style attributes for blocks.
- * @param {!Object<string, Blockly.Theme.CategoryStyle>=} opt_categoryStyles A
+ * @param {!Object<string, Theme.CategoryStyle>=} opt_categoryStyles A
  *     map from style names (strings) to objects with style attributes for
  *     categories.
- * @param {!Blockly.Theme.ComponentStyle=} opt_componentStyles A map of Blockly
+ * @param {!Theme.ComponentStyle=} opt_componentStyles A map of Blockly
  *     component names to style value.
  * @constructor
  */
-Blockly.Theme = function(name, opt_blockStyles, opt_categoryStyles,
+const Theme = function(name, opt_blockStyles, opt_categoryStyles,
     opt_componentStyles) {
 
   /**
@@ -39,32 +40,32 @@ Blockly.Theme = function(name, opt_blockStyles, opt_categoryStyles,
 
   /**
    * The block styles map.
-   * @type {!Object<string, !Blockly.Theme.BlockStyle>}
+   * @type {!Object<string, !Theme.BlockStyle>}
    * @package
    */
   this.blockStyles = opt_blockStyles || Object.create(null);
 
   /**
    * The category styles map.
-   * @type {!Object<string, Blockly.Theme.CategoryStyle>}
+   * @type {!Object<string, Theme.CategoryStyle>}
    * @package
    */
   this.categoryStyles = opt_categoryStyles || Object.create(null);
 
   /**
    * The UI components styles map.
-   * @type {!Blockly.Theme.ComponentStyle}
+   * @type {!Theme.ComponentStyle}
    * @package
    */
   this.componentStyles = opt_componentStyles ||
-    (/** @type {Blockly.Theme.ComponentStyle} */ (Object.create(null)));
+    (/** @type {Theme.ComponentStyle} */ (Object.create(null)));
 
   /**
    * The font style.
-   * @type {!Blockly.Theme.FontStyle}
+   * @type {!Theme.FontStyle}
    * @package
    */
-  this.fontStyle = /** @type {Blockly.Theme.FontStyle} */ (Object.create(null));
+  this.fontStyle = /** @type {Theme.FontStyle} */ (Object.create(null));
 
   /**
    * Whether or not to add a 'hat' on top of all blocks with no previous or
@@ -87,7 +88,7 @@ Blockly.Theme = function(name, opt_blockStyles, opt_categoryStyles,
  *            hat:string
  *          }}
  */
-Blockly.Theme.BlockStyle;
+Theme.BlockStyle;
 
 /**
  * A category style.
@@ -95,7 +96,7 @@ Blockly.Theme.BlockStyle;
  *            colour:string
  *          }}
  */
-Blockly.Theme.CategoryStyle;
+Theme.CategoryStyle;
 
 /**
  * A component style.
@@ -118,7 +119,7 @@ Blockly.Theme.CategoryStyle;
  *            replacementGlowOpacity:?number
  *          }}
  */
-Blockly.Theme.ComponentStyle;
+Theme.ComponentStyle;
 
 /**
  * A font style.
@@ -128,32 +129,32 @@ Blockly.Theme.ComponentStyle;
  *            size:?number
  *          }}
  */
-Blockly.Theme.FontStyle;
+Theme.FontStyle;
 
 /**
  * Gets the class name that identifies this theme.
  * @return {string} The CSS class name.
  * @package
  */
-Blockly.Theme.prototype.getClassName = function() {
+Theme.prototype.getClassName = function() {
   return this.name + '-theme';
 };
 
 /**
  * Overrides or adds a style to the blockStyles map.
  * @param {string} blockStyleName The name of the block style.
- * @param {Blockly.Theme.BlockStyle} blockStyle The block style.
+ * @param {Theme.BlockStyle} blockStyle The block style.
 */
-Blockly.Theme.prototype.setBlockStyle = function(blockStyleName, blockStyle) {
+Theme.prototype.setBlockStyle = function(blockStyleName, blockStyle) {
   this.blockStyles[blockStyleName] = blockStyle;
 };
 
 /**
  * Overrides or adds a style to the categoryStyles map.
  * @param {string} categoryStyleName The name of the category style.
- * @param {Blockly.Theme.CategoryStyle} categoryStyle The category style.
+ * @param {Theme.CategoryStyle} categoryStyle The category style.
 */
-Blockly.Theme.prototype.setCategoryStyle = function(categoryStyleName,
+Theme.prototype.setCategoryStyle = function(categoryStyleName,
     categoryStyle) {
   this.categoryStyles[categoryStyleName] = categoryStyle;
 };
@@ -164,7 +165,7 @@ Blockly.Theme.prototype.setCategoryStyle = function(categoryStyleName,
  * @param {string} componentName The name of the component.
  * @return {?string} The style value.
  */
-Blockly.Theme.prototype.getComponentStyle = function(componentName) {
+Theme.prototype.getComponentStyle = function(componentName) {
   const style = this.componentStyles[componentName];
   if (style && typeof style == 'string' &&
       this.getComponentStyle(/** @type {string} */ (style))) {
@@ -178,16 +179,16 @@ Blockly.Theme.prototype.getComponentStyle = function(componentName) {
  * @param {string} componentName The name of the component.
  * @param {*} styleValue The style value.
 */
-Blockly.Theme.prototype.setComponentStyle = function(componentName,
+Theme.prototype.setComponentStyle = function(componentName,
     styleValue) {
   this.componentStyles[componentName] = styleValue;
 };
 
 /**
  * Configure a theme's font style.
- * @param {Blockly.Theme.FontStyle} fontStyle The font style.
+ * @param {Theme.FontStyle} fontStyle The font style.
 */
-Blockly.Theme.prototype.setFontStyle = function(fontStyle) {
+Theme.prototype.setFontStyle = function(fontStyle) {
   this.fontStyle = fontStyle;
 };
 
@@ -196,7 +197,7 @@ Blockly.Theme.prototype.setFontStyle = function(fontStyle) {
  * @param {boolean} startHats True if the theme enables start hats, false
  *     otherwise.
 */
-Blockly.Theme.prototype.setStartHats = function(startHats) {
+Theme.prototype.setStartHats = function(startHats) {
   this.startHats = startHats;
 };
 
@@ -204,16 +205,16 @@ Blockly.Theme.prototype.setStartHats = function(startHats) {
  * Define a new Blockly theme.
  * @param {string} name The name of the theme.
  * @param {!Object} themeObj An object containing theme properties.
- * @return {!Blockly.Theme} A new Blockly theme.
+ * @return {!Theme} A new Blockly theme.
 */
-Blockly.Theme.defineTheme = function(name, themeObj) {
-  const theme = new Blockly.Theme(name);
+Theme.defineTheme = function(name, themeObj) {
+  const theme = new Theme(name);
   let base = themeObj['base'];
   if (base) {
     if (typeof base == "string") {
       base = Blockly.registry.getObject(Blockly.registry.Type.THEME, base);
     }
-    if (base instanceof Blockly.Theme) {
+    if (base instanceof Theme) {
       Blockly.utils.object.deepMerge(theme, base);
       theme.name = name;
     }
@@ -233,3 +234,5 @@ Blockly.Theme.defineTheme = function(name, themeObj) {
 
   return theme;
 };
+
+exports = Theme;
diff --git a/tests/deps.js b/tests/deps.js
index de575339f..42d14c6a8 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -161,7 +161,7 @@ goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', '
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar', 'Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.utils.KeyCodes']);
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object']);
-goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils', 'Blockly.utils.object']);
+goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.Theme']);

From 9cf50a61c189e9e3c076f81bd86d1b436a1878dc Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 11:39:57 -0700
Subject: [PATCH 345/833] Migrate core/theme.js to named requires

---
 core/theme.js | 19 +++++++++----------
 tests/deps.js |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/core/theme.js b/core/theme.js
index 16289a3ad..c9cd46968 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -12,9 +12,8 @@
 goog.module('Blockly.Theme');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.registry');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.object');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
@@ -76,7 +75,7 @@ const Theme = function(name, opt_blockStyles, opt_categoryStyles,
   this.startHats = null;
 
   // Register the theme by name.
-  Blockly.registry.register(Blockly.registry.Type.THEME, name, this);
+  registry.register(registry.Type.THEME, name, this);
 };
 
 /**
@@ -212,21 +211,21 @@ Theme.defineTheme = function(name, themeObj) {
   let base = themeObj['base'];
   if (base) {
     if (typeof base == "string") {
-      base = Blockly.registry.getObject(Blockly.registry.Type.THEME, base);
+      base = registry.getObject(registry.Type.THEME, base);
     }
     if (base instanceof Theme) {
-      Blockly.utils.object.deepMerge(theme, base);
+      object.deepMerge(theme, base);
       theme.name = name;
     }
   }
 
-  Blockly.utils.object.deepMerge(theme.blockStyles,
+  object.deepMerge(theme.blockStyles,
       themeObj['blockStyles']);
-  Blockly.utils.object.deepMerge(theme.categoryStyles,
+  object.deepMerge(theme.categoryStyles,
       themeObj['categoryStyles']);
-  Blockly.utils.object.deepMerge(theme.componentStyles,
+  object.deepMerge(theme.componentStyles,
       themeObj['componentStyles']);
-  Blockly.utils.object.deepMerge(theme.fontStyle,
+  object.deepMerge(theme.fontStyle,
       themeObj['fontStyle']);
   if (themeObj['startHats'] != null) {
     theme.startHats = themeObj['startHats'];
diff --git a/tests/deps.js b/tests/deps.js
index 42d14c6a8..d27093d4d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -161,7 +161,7 @@ goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', '
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar', 'Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.utils.KeyCodes']);
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object']);
-goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.Theme']);

From 4e3bfee2aacb5391a8ee0ede11b4d3b8989ceaf2 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 11:42:17 -0700
Subject: [PATCH 346/833] clang-format core/theme.js

---
 core/theme.js | 39 ++++++++++++++++-----------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/core/theme.js b/core/theme.js
index c9cd46968..11c72e491 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -28,9 +28,8 @@ const registry = goog.require('Blockly.registry');
  *     component names to style value.
  * @constructor
  */
-const Theme = function(name, opt_blockStyles, opt_categoryStyles,
-    opt_componentStyles) {
-
+const Theme = function(
+    name, opt_blockStyles, opt_categoryStyles, opt_componentStyles) {
   /**
    * The theme name. This can be used to reference a specific theme in CSS.
    * @type {string}
@@ -57,7 +56,7 @@ const Theme = function(name, opt_blockStyles, opt_categoryStyles,
    * @package
    */
   this.componentStyles = opt_componentStyles ||
-    (/** @type {Theme.ComponentStyle} */ (Object.create(null)));
+      (/** @type {Theme.ComponentStyle} */ (Object.create(null)));
 
   /**
    * The font style.
@@ -143,7 +142,7 @@ Theme.prototype.getClassName = function() {
  * Overrides or adds a style to the blockStyles map.
  * @param {string} blockStyleName The name of the block style.
  * @param {Theme.BlockStyle} blockStyle The block style.
-*/
+ */
 Theme.prototype.setBlockStyle = function(blockStyleName, blockStyle) {
   this.blockStyles[blockStyleName] = blockStyle;
 };
@@ -152,9 +151,8 @@ Theme.prototype.setBlockStyle = function(blockStyleName, blockStyle) {
  * Overrides or adds a style to the categoryStyles map.
  * @param {string} categoryStyleName The name of the category style.
  * @param {Theme.CategoryStyle} categoryStyle The category style.
-*/
-Theme.prototype.setCategoryStyle = function(categoryStyleName,
-    categoryStyle) {
+ */
+Theme.prototype.setCategoryStyle = function(categoryStyleName, categoryStyle) {
   this.categoryStyles[categoryStyleName] = categoryStyle;
 };
 
@@ -177,16 +175,15 @@ Theme.prototype.getComponentStyle = function(componentName) {
  * Configure a specific Blockly UI component with a style value.
  * @param {string} componentName The name of the component.
  * @param {*} styleValue The style value.
-*/
-Theme.prototype.setComponentStyle = function(componentName,
-    styleValue) {
+ */
+Theme.prototype.setComponentStyle = function(componentName, styleValue) {
   this.componentStyles[componentName] = styleValue;
 };
 
 /**
  * Configure a theme's font style.
  * @param {Theme.FontStyle} fontStyle The font style.
-*/
+ */
 Theme.prototype.setFontStyle = function(fontStyle) {
   this.fontStyle = fontStyle;
 };
@@ -195,7 +192,7 @@ Theme.prototype.setFontStyle = function(fontStyle) {
  * Configure a theme's start hats.
  * @param {boolean} startHats True if the theme enables start hats, false
  *     otherwise.
-*/
+ */
 Theme.prototype.setStartHats = function(startHats) {
   this.startHats = startHats;
 };
@@ -205,12 +202,12 @@ Theme.prototype.setStartHats = function(startHats) {
  * @param {string} name The name of the theme.
  * @param {!Object} themeObj An object containing theme properties.
  * @return {!Theme} A new Blockly theme.
-*/
+ */
 Theme.defineTheme = function(name, themeObj) {
   const theme = new Theme(name);
   let base = themeObj['base'];
   if (base) {
-    if (typeof base == "string") {
+    if (typeof base == 'string') {
       base = registry.getObject(registry.Type.THEME, base);
     }
     if (base instanceof Theme) {
@@ -219,14 +216,10 @@ Theme.defineTheme = function(name, themeObj) {
     }
   }
 
-  object.deepMerge(theme.blockStyles,
-      themeObj['blockStyles']);
-  object.deepMerge(theme.categoryStyles,
-      themeObj['categoryStyles']);
-  object.deepMerge(theme.componentStyles,
-      themeObj['componentStyles']);
-  object.deepMerge(theme.fontStyle,
-      themeObj['fontStyle']);
+  object.deepMerge(theme.blockStyles, themeObj['blockStyles']);
+  object.deepMerge(theme.categoryStyles, themeObj['categoryStyles']);
+  object.deepMerge(theme.componentStyles, themeObj['componentStyles']);
+  object.deepMerge(theme.fontStyle, themeObj['fontStyle']);
   if (themeObj['startHats'] != null) {
     theme.startHats = themeObj['startHats'];
   }

From 2d480a1b202e9fca2eda7bfb25c6c7c8a7e07c79 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 11:46:58 -0700
Subject: [PATCH 347/833] Migrate core/theme_manager.js to ES6 const/let

---
 core/theme_manager.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/core/theme_manager.js b/core/theme_manager.js
index 6c461a2e7..d432e0dd0 100644
--- a/core/theme_manager.js
+++ b/core/theme_manager.js
@@ -82,11 +82,11 @@ Blockly.ThemeManager.prototype.getTheme = function() {
  * @package
  */
 Blockly.ThemeManager.prototype.setTheme = function(theme) {
-  var prevTheme = this.theme_;
+  const prevTheme = this.theme_;
   this.theme_ = theme;
 
   // Set the theme name onto the injection div.
-  var injectionDiv = this.workspace_.getInjectionDiv();
+  const injectionDiv = this.workspace_.getInjectionDiv();
   if (injectionDiv) {
     if (prevTheme) {
       Blockly.utils.dom.removeClass(injectionDiv, prevTheme.getClassName());
@@ -95,17 +95,17 @@ Blockly.ThemeManager.prototype.setTheme = function(theme) {
   }
 
   // Refresh all subscribed workspaces.
-  for (var i = 0, workspace; (workspace = this.subscribedWorkspaces_[i]); i++) {
+  for (let i = 0, workspace; (workspace = this.subscribedWorkspaces_[i]); i++) {
     workspace.refreshTheme();
   }
 
   // Refresh all registered Blockly UI components.
-  for (var i = 0, keys = Object.keys(this.componentDB_),
+  for (let i = 0, keys = Object.keys(this.componentDB_),
     key; (key = keys[i]); i++) {
-    for (var j = 0, component; (component = this.componentDB_[key][j]); j++) {
-      var element = component.element;
-      var propertyName = component.propertyName;
-      var style = this.theme_ && this.theme_.getComponentStyle(key);
+    for (let j = 0, component; (component = this.componentDB_[key][j]); j++) {
+      const element = component.element;
+      const propertyName = component.propertyName;
+      const style = this.theme_ && this.theme_.getComponentStyle(key);
       element.style[propertyName] = style || '';
     }
   }
@@ -129,7 +129,7 @@ Blockly.ThemeManager.prototype.subscribeWorkspace = function(workspace) {
  * @package
  */
 Blockly.ThemeManager.prototype.unsubscribeWorkspace = function(workspace) {
-  var index = this.subscribedWorkspaces_.indexOf(workspace);
+  const index = this.subscribedWorkspaces_.indexOf(workspace);
   if (index < 0) {
     throw Error('Cannot unsubscribe a workspace that hasn\'t been subscribed.');
   }
@@ -158,7 +158,7 @@ Blockly.ThemeManager.prototype.subscribe = function(element, componentName,
   });
 
   // Initialize the element with its corresponding theme style.
-  var style = this.theme_ && this.theme_.getComponentStyle(componentName);
+  const style = this.theme_ && this.theme_.getComponentStyle(componentName);
   element.style[propertyName] = style || '';
 };
 
@@ -172,10 +172,10 @@ Blockly.ThemeManager.prototype.unsubscribe = function(element) {
     return;
   }
   // Go through all component, and remove any references to this element.
-  var componentNames = Object.keys(this.componentDB_);
-  for (var c = 0, componentName; (componentName = componentNames[c]); c++) {
-    var elements = this.componentDB_[componentName];
-    for (var i = elements.length - 1; i >= 0; i--) {
+  const componentNames = Object.keys(this.componentDB_);
+  for (let c = 0, componentName; (componentName = componentNames[c]); c++) {
+    const elements = this.componentDB_[componentName];
+    for (let i = elements.length - 1; i >= 0; i--) {
       if (elements[i].element === element) {
         elements.splice(i, 1);
       }

From 48d422159b246c1062ff413f02ca51c4916bf7fc Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 11:48:59 -0700
Subject: [PATCH 348/833] Migrate core/theme_manager.js to goog.module

---
 core/theme_manager.js | 25 ++++++++++++++-----------
 tests/deps.js         |  2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/core/theme_manager.js b/core/theme_manager.js
index d432e0dd0..3b43f2f55 100644
--- a/core/theme_manager.js
+++ b/core/theme_manager.js
@@ -12,7 +12,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.ThemeManager');
+goog.module('Blockly.ThemeManager');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Theme');
 
@@ -27,7 +28,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @constructor
  * @package
  */
-Blockly.ThemeManager = function(workspace, theme) {
+const ThemeManager = function(workspace, theme) {
 
   /**
    * The main workspace.
@@ -52,7 +53,7 @@ Blockly.ThemeManager = function(workspace, theme) {
 
   /**
    * A map of subscribed UI components, keyed by component name.
-   * @type {!Object<string, !Array<!Blockly.ThemeManager.Component>>}
+   * @type {!Object<string, !Array<!ThemeManager.Component>>}
    * @private
    */
   this.componentDB_ = Object.create(null);
@@ -65,14 +66,14 @@ Blockly.ThemeManager = function(workspace, theme) {
   *            propertyName:string
   *          }}
   */
-Blockly.ThemeManager.Component;
+ThemeManager.Component;
 
 /**
  * Get the workspace theme.
  * @return {!Blockly.Theme} The workspace theme.
  * @package
  */
-Blockly.ThemeManager.prototype.getTheme = function() {
+ThemeManager.prototype.getTheme = function() {
   return this.theme_;
 };
 
@@ -81,7 +82,7 @@ Blockly.ThemeManager.prototype.getTheme = function() {
  * @param {!Blockly.Theme} theme The workspace theme.
  * @package
  */
-Blockly.ThemeManager.prototype.setTheme = function(theme) {
+ThemeManager.prototype.setTheme = function(theme) {
   const prevTheme = this.theme_;
   this.theme_ = theme;
 
@@ -119,7 +120,7 @@ Blockly.ThemeManager.prototype.setTheme = function(theme) {
  * @param {!Blockly.Workspace} workspace The workspace to subscribe.
  * @package
  */
-Blockly.ThemeManager.prototype.subscribeWorkspace = function(workspace) {
+ThemeManager.prototype.subscribeWorkspace = function(workspace) {
   this.subscribedWorkspaces_.push(workspace);
 };
 
@@ -128,7 +129,7 @@ Blockly.ThemeManager.prototype.subscribeWorkspace = function(workspace) {
  * @param {!Blockly.Workspace} workspace The workspace to unsubscribe.
  * @package
  */
-Blockly.ThemeManager.prototype.unsubscribeWorkspace = function(workspace) {
+ThemeManager.prototype.unsubscribeWorkspace = function(workspace) {
   const index = this.subscribedWorkspaces_.indexOf(workspace);
   if (index < 0) {
     throw Error('Cannot unsubscribe a workspace that hasn\'t been subscribed.');
@@ -145,7 +146,7 @@ Blockly.ThemeManager.prototype.unsubscribeWorkspace = function(workspace) {
  * @param {string} propertyName The inline style property name to update.
  * @package
  */
-Blockly.ThemeManager.prototype.subscribe = function(element, componentName,
+ThemeManager.prototype.subscribe = function(element, componentName,
     propertyName) {
   if (!this.componentDB_[componentName]) {
     this.componentDB_[componentName] = [];
@@ -167,7 +168,7 @@ Blockly.ThemeManager.prototype.subscribe = function(element, componentName,
  * @param {Element} element The element to unsubscribe.
  * @package
  */
-Blockly.ThemeManager.prototype.unsubscribe = function(element) {
+ThemeManager.prototype.unsubscribe = function(element) {
   if (!element) {
     return;
   }
@@ -192,9 +193,11 @@ Blockly.ThemeManager.prototype.unsubscribe = function(element) {
  * @package
  * @suppress {checkTypes}
  */
-Blockly.ThemeManager.prototype.dispose = function() {
+ThemeManager.prototype.dispose = function() {
   this.owner_ = null;
   this.theme_ = null;
   this.subscribedWorkspaces_ = null;
   this.componentDB_ = null;
 };
+
+exports = ThemeManager;
diff --git a/tests/deps.js b/tests/deps.js
index de575339f..48a76dd48 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -164,7 +164,7 @@ goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils', 'Blockly.utils.object']);
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme']);
-goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.Theme']);
+goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.IToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es5'});

From 794e28ed481da67009d366e35a60d6de034837ea Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 11:52:43 -0700
Subject: [PATCH 349/833] Migrate core/theme_manager.js to named requires

---
 core/theme_manager.js | 33 ++++++++++++++++++---------------
 tests/deps.js         |  2 +-
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/core/theme_manager.js b/core/theme_manager.js
index 3b43f2f55..a4f0aed6c 100644
--- a/core/theme_manager.js
+++ b/core/theme_manager.js
@@ -15,16 +15,19 @@
 goog.module('Blockly.ThemeManager');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Theme');
-
-goog.requireType('Blockly.Workspace');
-goog.requireType('Blockly.WorkspaceSvg');
+/* eslint-disable-next-line no-unused-vars */
+const Theme = goog.requireType('Blockly.Theme');
+/* 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 dom = goog.require('Blockly.utils.dom');
 
 
 /**
  * Class for storing and updating a workspace's theme and UI components.
- * @param {!Blockly.WorkspaceSvg} workspace The main workspace.
- * @param {!Blockly.Theme} theme The workspace theme.
+ * @param {!WorkspaceSvg} workspace The main workspace.
+ * @param {!Theme} theme The workspace theme.
  * @constructor
  * @package
  */
@@ -32,21 +35,21 @@ const ThemeManager = function(workspace, theme) {
 
   /**
    * The main workspace.
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @private
    */
   this.workspace_ = workspace;
 
   /**
    * The Blockly theme to use.
-   * @type {!Blockly.Theme}
+   * @type {!Theme}
    * @private
    */
   this.theme_ = theme;
 
   /**
    * A list of workspaces that are subscribed to this theme.
-   * @type {!Array<Blockly.Workspace>}
+   * @type {!Array<Workspace>}
    * @private
    */
   this.subscribedWorkspaces_ = [];
@@ -70,7 +73,7 @@ ThemeManager.Component;
 
 /**
  * Get the workspace theme.
- * @return {!Blockly.Theme} The workspace theme.
+ * @return {!Theme} The workspace theme.
  * @package
  */
 ThemeManager.prototype.getTheme = function() {
@@ -79,7 +82,7 @@ ThemeManager.prototype.getTheme = function() {
 
 /**
  * Set the workspace theme, and refresh the workspace and all components.
- * @param {!Blockly.Theme} theme The workspace theme.
+ * @param {!Theme} theme The workspace theme.
  * @package
  */
 ThemeManager.prototype.setTheme = function(theme) {
@@ -90,9 +93,9 @@ ThemeManager.prototype.setTheme = function(theme) {
   const injectionDiv = this.workspace_.getInjectionDiv();
   if (injectionDiv) {
     if (prevTheme) {
-      Blockly.utils.dom.removeClass(injectionDiv, prevTheme.getClassName());
+      dom.removeClass(injectionDiv, prevTheme.getClassName());
     }
-    Blockly.utils.dom.addClass(injectionDiv, this.theme_.getClassName());
+    dom.addClass(injectionDiv, this.theme_.getClassName());
   }
 
   // Refresh all subscribed workspaces.
@@ -117,7 +120,7 @@ ThemeManager.prototype.setTheme = function(theme) {
 /**
  * Subscribe a workspace to changes to the selected theme.  If a new theme is
  * set, the workspace is called to refresh its blocks.
- * @param {!Blockly.Workspace} workspace The workspace to subscribe.
+ * @param {!Workspace} workspace The workspace to subscribe.
  * @package
  */
 ThemeManager.prototype.subscribeWorkspace = function(workspace) {
@@ -126,7 +129,7 @@ ThemeManager.prototype.subscribeWorkspace = function(workspace) {
 
 /**
  * Unsubscribe a workspace to changes to the selected theme.
- * @param {!Blockly.Workspace} workspace The workspace to unsubscribe.
+ * @param {!Workspace} workspace The workspace to unsubscribe.
  * @package
  */
 ThemeManager.prototype.unsubscribeWorkspace = function(workspace) {
diff --git a/tests/deps.js b/tests/deps.js
index 48a76dd48..6affa4354 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -164,7 +164,7 @@ goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils', 'Blockly.utils.object']);
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme']);
-goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.IToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es5'});

From d2a6e93a8a168c2ed87ea3370011de6cffc20722 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 11:53:07 -0700
Subject: [PATCH 350/833] clang-format core/theme_manager.js

---
 core/theme_manager.js | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/core/theme_manager.js b/core/theme_manager.js
index a4f0aed6c..859a33658 100644
--- a/core/theme_manager.js
+++ b/core/theme_manager.js
@@ -32,7 +32,6 @@ const dom = goog.require('Blockly.utils.dom');
  * @package
  */
 const ThemeManager = function(workspace, theme) {
-
   /**
    * The main workspace.
    * @type {!WorkspaceSvg}
@@ -65,10 +64,10 @@ const ThemeManager = function(workspace, theme) {
 /**
  * A Blockly UI component type.
  * @typedef {{
-  *            element:!Element,
-  *            propertyName:string
-  *          }}
-  */
+ *            element:!Element,
+ *            propertyName:string
+ *          }}
+ */
 ThemeManager.Component;
 
 /**
@@ -104,8 +103,8 @@ ThemeManager.prototype.setTheme = function(theme) {
   }
 
   // Refresh all registered Blockly UI components.
-  for (let i = 0, keys = Object.keys(this.componentDB_),
-    key; (key = keys[i]); i++) {
+  for (let i = 0, keys = Object.keys(this.componentDB_), key; (key = keys[i]);
+       i++) {
     for (let j = 0, component; (component = this.componentDB_[key][j]); j++) {
       const element = component.element;
       const propertyName = component.propertyName;
@@ -149,17 +148,15 @@ ThemeManager.prototype.unsubscribeWorkspace = function(workspace) {
  * @param {string} propertyName The inline style property name to update.
  * @package
  */
-ThemeManager.prototype.subscribe = function(element, componentName,
-    propertyName) {
+ThemeManager.prototype.subscribe = function(
+    element, componentName, propertyName) {
   if (!this.componentDB_[componentName]) {
     this.componentDB_[componentName] = [];
   }
 
   // Add the element to our component map.
-  this.componentDB_[componentName].push({
-    element: element,
-    propertyName: propertyName
-  });
+  this.componentDB_[componentName].push(
+      {element: element, propertyName: propertyName});
 
   // Initialize the element with its corresponding theme style.
   const style = this.theme_ && this.theme_.getComponentStyle(componentName);

From f6adf865f29bd9619148a1fbd77ccecfbe25457e Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Fri, 23 Jul 2021 19:39:37 +0100
Subject: [PATCH 351/833] Migrate core/utils/size.js to goog.module

---
 core/utils/size.js | 15 +++++++++------
 tests/deps.js      |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/utils/size.js b/core/utils/size.js
index 2ffa91ac1..56ec2eb91 100644
--- a/core/utils/size.js
+++ b/core/utils/size.js
@@ -13,10 +13,11 @@
 'use strict';
 
 /**
- * @name Blockly.utils.Size
+ * @name Size
  * @namespace
  */
-goog.provide('Blockly.utils.Size');
+goog.module('Blockly.utils.Size');
+goog.module.declareLegacyNamespace();
 
 
 /**
@@ -26,7 +27,7 @@ goog.provide('Blockly.utils.Size');
  * @struct
  * @constructor
  */
-Blockly.utils.Size = function(width, height) {
+const Size = function(width, height) {
   /**
    * Width
    * @type {number}
@@ -42,12 +43,12 @@ Blockly.utils.Size = function(width, height) {
 
 /**
  * Compares sizes for equality.
- * @param {?Blockly.utils.Size} a A Size.
- * @param {?Blockly.utils.Size} b A Size.
+ * @param {?Size} a A Size.
+ * @param {?Size} b A Size.
  * @return {boolean} True iff the sizes have equal widths and equal
  *     heights, or if both are null.
  */
-Blockly.utils.Size.equals = function(a, b) {
+Size.equals = function(a, b) {
   if (a == b) {
     return true;
   }
@@ -56,3 +57,5 @@ Blockly.utils.Size.equals = function(a, b) {
   }
   return a.width == b.width && a.height == b.height;
 };
+
+exports = Size;
diff --git a/tests/deps.js b/tests/deps.js
index ae77407c9..c9fc4067f 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -187,7 +187,7 @@ goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], [], {'lan
 goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], []);
+goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], []);
 goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Blockly.utils.Coordinate', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], []);

From 61bbffc29e28af25531c081760f9ddee9766d48f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 13:03:46 -0700
Subject: [PATCH 352/833] Migrate core/zoom_controls.js to ES6 const/let

---
 core/zoom_controls.js | 50 +++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/core/zoom_controls.js b/core/zoom_controls.js
index 7d0d7e6ce..465a5d165 100644
--- a/core/zoom_controls.js
+++ b/core/zoom_controls.js
@@ -182,7 +182,7 @@ Blockly.ZoomControls.prototype.createDom = function() {
   // Each filter/pattern needs a unique ID for the case of multiple Blockly
   // instances on a page.  Browser behaviour becomes undefined otherwise.
   // https://neil.fraser.name/news/2015/11/01/
-  var rnd = String(Math.random()).substring(2);
+  const rnd = String(Math.random()).substring(2);
   this.createZoomOutSvg_(rnd);
   this.createZoomInSvg_(rnd);
   if (this.workspace_.isMovable()) {
@@ -232,12 +232,12 @@ Blockly.ZoomControls.prototype.dispose = function() {
  *   bounding box should be ignored by other UI elements.
  */
 Blockly.ZoomControls.prototype.getBoundingRectangle = function() {
-  var height = this.SMALL_SPACING_ + 2 * this.HEIGHT_;
+  let height = this.SMALL_SPACING_ + 2 * this.HEIGHT_;
   if (this.zoomResetGroup_) {
     height += this.LARGE_SPACING_ + this.HEIGHT_;
   }
-  var bottom = this.top_ + height;
-  var right = this.left_ + this.WIDTH_;
+  const bottom = this.top_ + height;
+  const right = this.left_ + this.WIDTH_;
   return new Blockly.utils.Rect(this.top_, bottom, this.left_, right);
 };
 
@@ -256,41 +256,41 @@ Blockly.ZoomControls.prototype.position = function(metrics, savedPositions) {
     return;
   }
 
-  var cornerPosition =
+  const cornerPosition =
       Blockly.uiPosition.getCornerOppositeToolbox(this.workspace_, metrics);
-  var height = this.SMALL_SPACING_ + 2 * this.HEIGHT_;
+  let height = this.SMALL_SPACING_ + 2 * this.HEIGHT_;
   if (this.zoomResetGroup_) {
     height += this.LARGE_SPACING_ + this.HEIGHT_;
   }
-  var startRect = Blockly.uiPosition.getStartPositionRect(
+  const startRect = Blockly.uiPosition.getStartPositionRect(
       cornerPosition, new Blockly.utils.Size(this.WIDTH_, height),
       this.MARGIN_HORIZONTAL_, this.MARGIN_VERTICAL_, metrics,
       this.workspace_);
 
-  var verticalPosition = cornerPosition.vertical;
-  var bumpDirection =
+  const verticalPosition = cornerPosition.vertical;
+  const bumpDirection =
       verticalPosition === Blockly.uiPosition.verticalPosition.TOP ?
           Blockly.uiPosition.bumpDirection.DOWN :
           Blockly.uiPosition.bumpDirection.UP;
-  var positionRect = Blockly.uiPosition.bumpPositionRect(
+  const positionRect = Blockly.uiPosition.bumpPositionRect(
       startRect, this.MARGIN_VERTICAL_, bumpDirection, savedPositions);
 
   if (verticalPosition === Blockly.uiPosition.verticalPosition.TOP) {
-    var zoomInTranslateY = this.SMALL_SPACING_ + this.HEIGHT_;
+    const zoomInTranslateY = this.SMALL_SPACING_ + this.HEIGHT_;
     this.zoomInGroup_.setAttribute('transform',
         'translate(0, ' + zoomInTranslateY + ')');
     if (this.zoomResetGroup_) {
-      var zoomResetTranslateY =
+      const zoomResetTranslateY =
           zoomInTranslateY + this.LARGE_SPACING_ + this.HEIGHT_;
       this.zoomResetGroup_.setAttribute('transform',
           'translate(0, ' + zoomResetTranslateY + ')');
     }
   } else {
-    var zoomInTranslateY = this.zoomResetGroup_ ?
+    const zoomInTranslateY = this.zoomResetGroup_ ?
         this.LARGE_SPACING_ + this.HEIGHT_ : 0;
     this.zoomInGroup_.setAttribute('transform',
         'translate(0, ' + zoomInTranslateY + ')');
-    var zoomOutTranslateY =
+    const zoomOutTranslateY =
         zoomInTranslateY + this.SMALL_SPACING_ + this.HEIGHT_;
     this.zoomOutGroup_.setAttribute('transform',
         'translate(0, ' + zoomOutTranslateY + ')');
@@ -322,7 +322,7 @@ Blockly.ZoomControls.prototype.createZoomOutSvg_ = function(rnd) {
   this.zoomOutGroup_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.G,
       {'class': 'blocklyZoom'}, this.svgGroup_);
-  var clip = Blockly.utils.dom.createSvgElement(
+  const clip = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.CLIPPATH,
       {
         'id': 'blocklyZoomoutClipPath' + rnd
@@ -335,7 +335,7 @@ Blockly.ZoomControls.prototype.createZoomOutSvg_ = function(rnd) {
         'height': 32,
       },
       clip);
-  var zoomoutSvg = Blockly.utils.dom.createSvgElement(
+  const zoomoutSvg = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.IMAGE, {
         'width': Blockly.internalConstants.SPRITE.width,
         'height': Blockly.internalConstants.SPRITE.height,
@@ -374,7 +374,7 @@ Blockly.ZoomControls.prototype.createZoomInSvg_ = function(rnd) {
   this.zoomInGroup_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.G,
       {'class': 'blocklyZoom'}, this.svgGroup_);
-  var clip = Blockly.utils.dom.createSvgElement(
+  const clip = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.CLIPPATH,
       {
         'id': 'blocklyZoominClipPath' + rnd
@@ -387,7 +387,7 @@ Blockly.ZoomControls.prototype.createZoomInSvg_ = function(rnd) {
         'height': 32,
       },
       clip);
-  var zoominSvg = Blockly.utils.dom.createSvgElement(
+  const zoominSvg = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.IMAGE, {
         'width': Blockly.internalConstants.SPRITE.width,
         'height': Blockly.internalConstants.SPRITE.height,
@@ -443,7 +443,7 @@ Blockly.ZoomControls.prototype.createZoomResetSvg_ = function(rnd) {
   this.zoomResetGroup_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.G,
       {'class': 'blocklyZoom'}, this.svgGroup_);
-  var clip = Blockly.utils.dom.createSvgElement(
+  const clip = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.CLIPPATH,
       {
         'id': 'blocklyZoomresetClipPath' + rnd
@@ -456,7 +456,7 @@ Blockly.ZoomControls.prototype.createZoomResetSvg_ = function(rnd) {
         'height': 32
       },
       clip);
-  var zoomresetSvg = Blockly.utils.dom.createSvgElement(
+  const zoomresetSvg = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.IMAGE, {
         'width': Blockly.internalConstants.SPRITE.width,
         'height': Blockly.internalConstants.SPRITE.height,
@@ -484,14 +484,14 @@ Blockly.ZoomControls.prototype.resetZoom_ = function(e) {
 
   // zoom is passed amount and computes the new scale using the formula:
   // targetScale = currentScale * Math.pow(speed, amount)
-  var targetScale = this.workspace_.options.zoomOptions.startScale;
-  var currentScale = this.workspace_.scale;
-  var speed = this.workspace_.options.zoomOptions.scaleSpeed;
+  const targetScale = this.workspace_.options.zoomOptions.startScale;
+  const currentScale = this.workspace_.scale;
+  const speed = this.workspace_.options.zoomOptions.scaleSpeed;
   // To compute amount:
   // amount = log(speed, (targetScale / currentScale))
   // Math.log computes natural logarithm (ln), to change the base, use formula:
   // log(base, value) = ln(value) / ln(base)
-  var amount = Math.log(targetScale / currentScale) / Math.log(speed);
+  const amount = Math.log(targetScale / currentScale) / Math.log(speed);
   this.workspace_.beginCanvasTransition();
   this.workspace_.zoomCenter(amount);
   this.workspace_.scrollCenter();
@@ -508,7 +508,7 @@ Blockly.ZoomControls.prototype.resetZoom_ = function(e) {
  * @private
  */
 Blockly.ZoomControls.prototype.fireZoomEvent_ = function() {
-  var uiEvent = new (Blockly.Events.get(Blockly.Events.CLICK))(
+  const uiEvent = new (Blockly.Events.get(Blockly.Events.CLICK))(
       null, this.workspace_.id, 'zoom_controls');
   Blockly.Events.fire(uiEvent);
 };

From bc7c5115e1ca36f235a64052584878cb49b8b8e4 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 13:03:55 -0700
Subject: [PATCH 353/833] Migrate core/zoom_controls.js to goog.module

---
 core/zoom_controls.js | 50 +++++++++++++++++++++++--------------------
 tests/deps.js         |  2 +-
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/core/zoom_controls.js b/core/zoom_controls.js
index 465a5d165..61455c120 100644
--- a/core/zoom_controls.js
+++ b/core/zoom_controls.js
@@ -10,8 +10,10 @@
  */
 'use strict';
 
-goog.provide('Blockly.ZoomControls');
+goog.module('Blockly.ZoomControls');
+goog.module.declareLegacyNamespace();
 
+goog.require('Blockly');
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.ComponentManager');
 goog.require('Blockly.Css');
@@ -36,7 +38,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @constructor
  * @implements {Blockly.IPositionable}
  */
-Blockly.ZoomControls = function(workspace) {
+const ZoomControls = function(workspace) {
   /**
    * @type {!Blockly.WorkspaceSvg}
    * @private
@@ -102,7 +104,7 @@ Blockly.ZoomControls = function(workspace) {
  * @const
  * @private
  */
-Blockly.ZoomControls.prototype.WIDTH_ = 32;
+ZoomControls.prototype.WIDTH_ = 32;
 
 /**
  * Height of each zoom control.
@@ -110,7 +112,7 @@ Blockly.ZoomControls.prototype.WIDTH_ = 32;
  * @const
  * @private
  */
-Blockly.ZoomControls.prototype.HEIGHT_ = 32;
+ZoomControls.prototype.HEIGHT_ = 32;
 
 /**
  * Small spacing used between the zoom in and out control, in pixels.
@@ -118,7 +120,7 @@ Blockly.ZoomControls.prototype.HEIGHT_ = 32;
  * @const
  * @private
  */
-Blockly.ZoomControls.prototype.SMALL_SPACING_ = 2;
+ZoomControls.prototype.SMALL_SPACING_ = 2;
 
 /**
  * Large spacing used between the zoom in and reset control, in pixels.
@@ -126,7 +128,7 @@ Blockly.ZoomControls.prototype.SMALL_SPACING_ = 2;
  * @const
  * @private
  */
-Blockly.ZoomControls.prototype.LARGE_SPACING_ = 11;
+ZoomControls.prototype.LARGE_SPACING_ = 11;
 
 /**
  * Distance between zoom controls and bottom or top edge of workspace.
@@ -134,48 +136,48 @@ Blockly.ZoomControls.prototype.LARGE_SPACING_ = 11;
  * @const
  * @private
  */
-Blockly.ZoomControls.prototype.MARGIN_VERTICAL_ = 20;
+ZoomControls.prototype.MARGIN_VERTICAL_ = 20;
 
 /**
  * Distance between zoom controls and right or left edge of workspace.
  * @type {number}
  * @private
  */
-Blockly.ZoomControls.prototype.MARGIN_HORIZONTAL_ = 20;
+ZoomControls.prototype.MARGIN_HORIZONTAL_ = 20;
 
 /**
  * The SVG group containing the zoom controls.
  * @type {SVGElement}
  * @private
  */
-Blockly.ZoomControls.prototype.svgGroup_ = null;
+ZoomControls.prototype.svgGroup_ = null;
 
 /**
  * Left coordinate of the zoom controls.
  * @type {number}
  * @private
  */
-Blockly.ZoomControls.prototype.left_ = 0;
+ZoomControls.prototype.left_ = 0;
 
 /**
  * Top coordinate of the zoom controls.
  * @type {number}
  * @private
  */
-Blockly.ZoomControls.prototype.top_ = 0;
+ZoomControls.prototype.top_ = 0;
 
 /**
  * Whether this has been initialized.
  * @type {boolean}
  * @private
  */
-Blockly.ZoomControls.prototype.initialized_ = false;
+ZoomControls.prototype.initialized_ = false;
 
 /**
  * Create the zoom controls.
  * @return {!SVGElement} The zoom controls SVG group.
  */
-Blockly.ZoomControls.prototype.createDom = function() {
+ZoomControls.prototype.createDom = function() {
   this.svgGroup_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.G, {}, null);
 
@@ -196,7 +198,7 @@ Blockly.ZoomControls.prototype.createDom = function() {
 /**
  * Initializes the zoom controls.
  */
-Blockly.ZoomControls.prototype.init = function() {
+ZoomControls.prototype.init = function() {
   this.workspace_.getComponentManager().addComponent({
     component: this,
     weight: 2,
@@ -209,7 +211,7 @@ Blockly.ZoomControls.prototype.init = function() {
  * Disposes of this zoom controls.
  * Unlink from all DOM elements to prevent memory leaks.
  */
-Blockly.ZoomControls.prototype.dispose = function() {
+ZoomControls.prototype.dispose = function() {
   this.workspace_.getComponentManager().removeComponent('zoomControls');
   if (this.svgGroup_) {
     Blockly.utils.dom.removeNode(this.svgGroup_);
@@ -231,7 +233,7 @@ Blockly.ZoomControls.prototype.dispose = function() {
  * @return {?Blockly.utils.Rect} The UI elements’s bounding box. Null if
  *   bounding box should be ignored by other UI elements.
  */
-Blockly.ZoomControls.prototype.getBoundingRectangle = function() {
+ZoomControls.prototype.getBoundingRectangle = function() {
   let height = this.SMALL_SPACING_ + 2 * this.HEIGHT_;
   if (this.zoomResetGroup_) {
     height += this.LARGE_SPACING_ + this.HEIGHT_;
@@ -250,7 +252,7 @@ Blockly.ZoomControls.prototype.getBoundingRectangle = function() {
  * @param {!Array<!Blockly.utils.Rect>} savedPositions List of rectangles that
  *     are already on the workspace.
  */
-Blockly.ZoomControls.prototype.position = function(metrics, savedPositions) {
+ZoomControls.prototype.position = function(metrics, savedPositions) {
   // Not yet initialized.
   if (!this.initialized_) {
     return;
@@ -309,7 +311,7 @@ Blockly.ZoomControls.prototype.position = function(metrics, savedPositions) {
  *     instances on the same page.
  * @private
  */
-Blockly.ZoomControls.prototype.createZoomOutSvg_ = function(rnd) {
+ZoomControls.prototype.createZoomOutSvg_ = function(rnd) {
   /* This markup will be generated and added to the .svgGroup_:
   <g class="blocklyZoom">
     <clipPath id="blocklyZoomoutClipPath837493">
@@ -361,7 +363,7 @@ Blockly.ZoomControls.prototype.createZoomOutSvg_ = function(rnd) {
  *     instances on the same page.
  * @private
  */
-Blockly.ZoomControls.prototype.createZoomInSvg_ = function(rnd) {
+ZoomControls.prototype.createZoomInSvg_ = function(rnd) {
   /* This markup will be generated and added to the .svgGroup_:
   <g class="blocklyZoom">
     <clipPath id="blocklyZoominClipPath837493">
@@ -414,7 +416,7 @@ Blockly.ZoomControls.prototype.createZoomInSvg_ = function(rnd) {
  * @param {!Event} e A mouse down event.
  * @private
  */
-Blockly.ZoomControls.prototype.zoom_ = function(amount, e) {
+ZoomControls.prototype.zoom_ = function(amount, e) {
   this.workspace_.markFocused();
   this.workspace_.zoomCenter(amount);
   this.fireZoomEvent_();
@@ -430,7 +432,7 @@ Blockly.ZoomControls.prototype.zoom_ = function(amount, e) {
  *     instances on the same page.
  * @private
  */
-Blockly.ZoomControls.prototype.createZoomResetSvg_ = function(rnd) {
+ZoomControls.prototype.createZoomResetSvg_ = function(rnd) {
   /* This markup will be generated and added to the .svgGroup_:
   <g class="blocklyZoom">
     <clipPath id="blocklyZoomresetClipPath837493">
@@ -479,7 +481,7 @@ Blockly.ZoomControls.prototype.createZoomResetSvg_ = function(rnd) {
  * @param {!Event} e A mouse down event.
  * @private
  */
-Blockly.ZoomControls.prototype.resetZoom_ = function(e) {
+ZoomControls.prototype.resetZoom_ = function(e) {
   this.workspace_.markFocused();
 
   // zoom is passed amount and computes the new scale using the formula:
@@ -507,7 +509,7 @@ Blockly.ZoomControls.prototype.resetZoom_ = function(e) {
  * Fires a zoom control UI event.
  * @private
  */
-Blockly.ZoomControls.prototype.fireZoomEvent_ = function() {
+ZoomControls.prototype.fireZoomEvent_ = function() {
   const uiEvent = new (Blockly.Events.get(Blockly.Events.CLICK))(
       null, this.workspace_.id, 'zoom_controls');
   Blockly.Events.fire(uiEvent);
@@ -531,3 +533,5 @@ Blockly.Css.register([
   '}'
   /* eslint-enable indent */
 ]);
+
+exports = ZoomControls;
diff --git a/tests/deps.js b/tests/deps.js
index 702bf5ae4..c61cd74c1 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -210,6 +210,6 @@ goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.Workspa
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate']);
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
-goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
+goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);
 

From 40c095f496a8d901d97b0b3506fdc586e0f12101 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 13:05:49 -0700
Subject: [PATCH 354/833] Migrate core/zoom_controls.js named requires

---
 core/zoom_controls.js | 166 +++++++++++++++++++++---------------------
 1 file changed, 83 insertions(+), 83 deletions(-)

diff --git a/core/zoom_controls.js b/core/zoom_controls.js
index 61455c120..84451bbd1 100644
--- a/core/zoom_controls.js
+++ b/core/zoom_controls.js
@@ -13,34 +13,34 @@
 goog.module('Blockly.ZoomControls');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly');
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.ComponentManager');
-goog.require('Blockly.Css');
-goog.require('Blockly.Events');
+const Blockly = goog.require('Blockly');
+const ComponentManager = goog.require('Blockly.ComponentManager');
+const Css = goog.require('Blockly.Css');
+const Events = goog.require('Blockly.Events');
+const IPositionable = goog.require('Blockly.IPositionable');
+const Rect = goog.require('Blockly.utils.Rect');
+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 internalConstants = goog.require('Blockly.internalConstants');
+const uiPosition = goog.require('Blockly.uiPosition');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.Click');
-goog.require('Blockly.IPositionable');
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.Touch');
-goog.require('Blockly.uiPosition');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Rect');
-goog.require('Blockly.utils.Svg');
-
-goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
  * Class for a zoom controls.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace to sit in.
+ * @param {!WorkspaceSvg} workspace The workspace to sit in.
  * @constructor
- * @implements {Blockly.IPositionable}
+ * @implements {IPositionable}
  */
 const ZoomControls = function(workspace) {
   /**
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @private
    */
   this.workspace_ = workspace;
@@ -55,7 +55,7 @@ const ZoomControls = function(workspace) {
   /**
    * A handle to use to unbind the mouse down event handler for zoom reset
    *    button. Opaque data returned from Blockly.bindEventWithChecks_.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onZoomResetWrapper_ = null;
@@ -63,7 +63,7 @@ const ZoomControls = function(workspace) {
   /**
    * A handle to use to unbind the mouse down event handler for zoom in button.
    * Opaque data returned from Blockly.bindEventWithChecks_.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onZoomInWrapper_ = null;
@@ -71,7 +71,7 @@ const ZoomControls = function(workspace) {
   /**
    * A handle to use to unbind the mouse down event handler for zoom out button.
    * Opaque data returned from Blockly.bindEventWithChecks_.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onZoomOutWrapper_ = null;
@@ -178,8 +178,8 @@ ZoomControls.prototype.initialized_ = false;
  * @return {!SVGElement} The zoom controls SVG group.
  */
 ZoomControls.prototype.createDom = function() {
-  this.svgGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G, {}, null);
+  this.svgGroup_ = dom.createSvgElement(
+      Svg.G, {}, null);
 
   // Each filter/pattern needs a unique ID for the case of multiple Blockly
   // instances on a page.  Browser behaviour becomes undefined otherwise.
@@ -202,7 +202,7 @@ ZoomControls.prototype.init = function() {
   this.workspace_.getComponentManager().addComponent({
     component: this,
     weight: 2,
-    capabilities: [Blockly.ComponentManager.Capability.POSITIONABLE]
+    capabilities: [ComponentManager.Capability.POSITIONABLE]
   });
   this.initialized_ = true;
 };
@@ -214,23 +214,23 @@ ZoomControls.prototype.init = function() {
 ZoomControls.prototype.dispose = function() {
   this.workspace_.getComponentManager().removeComponent('zoomControls');
   if (this.svgGroup_) {
-    Blockly.utils.dom.removeNode(this.svgGroup_);
+    dom.removeNode(this.svgGroup_);
   }
   if (this.onZoomResetWrapper_) {
-    Blockly.browserEvents.unbind(this.onZoomResetWrapper_);
+    browserEvents.unbind(this.onZoomResetWrapper_);
   }
   if (this.onZoomInWrapper_) {
-    Blockly.browserEvents.unbind(this.onZoomInWrapper_);
+    browserEvents.unbind(this.onZoomInWrapper_);
   }
   if (this.onZoomOutWrapper_) {
-    Blockly.browserEvents.unbind(this.onZoomOutWrapper_);
+    browserEvents.unbind(this.onZoomOutWrapper_);
   }
 };
 
 /**
  * Returns the bounding rectangle of the UI element in pixel units relative to
  * the Blockly injection div.
- * @return {?Blockly.utils.Rect} The UI elements’s bounding box. Null if
+ * @return {?Rect} The UI elements’s bounding box. Null if
  *   bounding box should be ignored by other UI elements.
  */
 ZoomControls.prototype.getBoundingRectangle = function() {
@@ -240,7 +240,7 @@ ZoomControls.prototype.getBoundingRectangle = function() {
   }
   const bottom = this.top_ + height;
   const right = this.left_ + this.WIDTH_;
-  return new Blockly.utils.Rect(this.top_, bottom, this.left_, right);
+  return new Rect(this.top_, bottom, this.left_, right);
 };
 
 
@@ -249,7 +249,7 @@ ZoomControls.prototype.getBoundingRectangle = function() {
  * It is positioned in the opposite corner to the corner the
  * categories/toolbox starts at.
  * @param {!Blockly.MetricsManager.UiMetrics} metrics The workspace metrics.
- * @param {!Array<!Blockly.utils.Rect>} savedPositions List of rectangles that
+ * @param {!Array<!Rect>} savedPositions List of rectangles that
  *     are already on the workspace.
  */
 ZoomControls.prototype.position = function(metrics, savedPositions) {
@@ -259,25 +259,25 @@ ZoomControls.prototype.position = function(metrics, savedPositions) {
   }
 
   const cornerPosition =
-      Blockly.uiPosition.getCornerOppositeToolbox(this.workspace_, metrics);
+      uiPosition.getCornerOppositeToolbox(this.workspace_, metrics);
   let height = this.SMALL_SPACING_ + 2 * this.HEIGHT_;
   if (this.zoomResetGroup_) {
     height += this.LARGE_SPACING_ + this.HEIGHT_;
   }
-  const startRect = Blockly.uiPosition.getStartPositionRect(
-      cornerPosition, new Blockly.utils.Size(this.WIDTH_, height),
+  const startRect = uiPosition.getStartPositionRect(
+      cornerPosition, new utils.Size(this.WIDTH_, height),
       this.MARGIN_HORIZONTAL_, this.MARGIN_VERTICAL_, metrics,
       this.workspace_);
 
   const verticalPosition = cornerPosition.vertical;
   const bumpDirection =
-      verticalPosition === Blockly.uiPosition.verticalPosition.TOP ?
-          Blockly.uiPosition.bumpDirection.DOWN :
-          Blockly.uiPosition.bumpDirection.UP;
-  const positionRect = Blockly.uiPosition.bumpPositionRect(
+      verticalPosition === uiPosition.verticalPosition.TOP ?
+          uiPosition.bumpDirection.DOWN :
+          uiPosition.bumpDirection.UP;
+  const positionRect = uiPosition.bumpPositionRect(
       startRect, this.MARGIN_VERTICAL_, bumpDirection, savedPositions);
 
-  if (verticalPosition === Blockly.uiPosition.verticalPosition.TOP) {
+  if (verticalPosition === uiPosition.verticalPosition.TOP) {
     const zoomInTranslateY = this.SMALL_SPACING_ + this.HEIGHT_;
     this.zoomInGroup_.setAttribute('transform',
         'translate(0, ' + zoomInTranslateY + ')');
@@ -321,38 +321,38 @@ ZoomControls.prototype.createZoomOutSvg_ = function(rnd) {
         clip-path="url(#blocklyZoomoutClipPath837493)"></image>
   </g>
   */
-  this.zoomOutGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
+  this.zoomOutGroup_ = dom.createSvgElement(
+      Svg.G,
       {'class': 'blocklyZoom'}, this.svgGroup_);
-  const clip = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.CLIPPATH,
+  const clip = dom.createSvgElement(
+      Svg.CLIPPATH,
       {
         'id': 'blocklyZoomoutClipPath' + rnd
       },
       this.zoomOutGroup_);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  dom.createSvgElement(
+      Svg.RECT,
       {
         'width': 32,
         'height': 32,
       },
       clip);
-  const zoomoutSvg = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.IMAGE, {
-        'width': Blockly.internalConstants.SPRITE.width,
-        'height': Blockly.internalConstants.SPRITE.height,
+  const zoomoutSvg = dom.createSvgElement(
+      Svg.IMAGE, {
+        'width': internalConstants.SPRITE.width,
+        'height': internalConstants.SPRITE.height,
         'x': -64,
         'y': -92,
         'clip-path': 'url(#blocklyZoomoutClipPath' + rnd + ')'
       },
       this.zoomOutGroup_);
   zoomoutSvg.setAttributeNS(
-      Blockly.utils.dom.XLINK_NS, 'xlink:href',
+      dom.XLINK_NS, 'xlink:href',
       this.workspace_.options.pathToMedia +
-          Blockly.internalConstants.SPRITE.url);
+          internalConstants.SPRITE.url);
 
   // Attach listener.
-  this.onZoomOutWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onZoomOutWrapper_ = browserEvents.conditionalBind(
       this.zoomOutGroup_, 'mousedown', null, this.zoom_.bind(this, -1));
 };
 
@@ -373,38 +373,38 @@ ZoomControls.prototype.createZoomInSvg_ = function(rnd) {
         clip-path="url(#blocklyZoominClipPath837493)"></image>
   </g>
   */
-  this.zoomInGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
+  this.zoomInGroup_ = dom.createSvgElement(
+      Svg.G,
       {'class': 'blocklyZoom'}, this.svgGroup_);
-  const clip = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.CLIPPATH,
+  const clip = dom.createSvgElement(
+      Svg.CLIPPATH,
       {
         'id': 'blocklyZoominClipPath' + rnd
       },
       this.zoomInGroup_);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  dom.createSvgElement(
+      Svg.RECT,
       {
         'width': 32,
         'height': 32,
       },
       clip);
-  const zoominSvg = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.IMAGE, {
-        'width': Blockly.internalConstants.SPRITE.width,
-        'height': Blockly.internalConstants.SPRITE.height,
+  const zoominSvg = dom.createSvgElement(
+      Svg.IMAGE, {
+        'width': internalConstants.SPRITE.width,
+        'height': internalConstants.SPRITE.height,
         'x': -32,
         'y': -92,
         'clip-path': 'url(#blocklyZoominClipPath' + rnd + ')'
       },
       this.zoomInGroup_);
   zoominSvg.setAttributeNS(
-      Blockly.utils.dom.XLINK_NS, 'xlink:href',
+      dom.XLINK_NS, 'xlink:href',
       this.workspace_.options.pathToMedia +
-          Blockly.internalConstants.SPRITE.url);
+          internalConstants.SPRITE.url);
 
   // Attach listener.
-  this.onZoomInWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onZoomInWrapper_ = browserEvents.conditionalBind(
       this.zoomInGroup_, 'mousedown', null, this.zoom_.bind(this, 1));
 };
 
@@ -420,7 +420,7 @@ ZoomControls.prototype.zoom_ = function(amount, e) {
   this.workspace_.markFocused();
   this.workspace_.zoomCenter(amount);
   this.fireZoomEvent_();
-  Blockly.Touch.clearTouchIdentifier();  // Don't block future drags.
+  Touch.clearTouchIdentifier();  // Don't block future drags.
   e.stopPropagation();  // Don't start a workspace scroll.
   e.preventDefault();  // Stop double-clicking from selecting text.
 };
@@ -442,37 +442,37 @@ ZoomControls.prototype.createZoomResetSvg_ = function(rnd) {
         clip-path="url(#blocklyZoomresetClipPath837493)"></image>
   </g>
   */
-  this.zoomResetGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
+  this.zoomResetGroup_ = dom.createSvgElement(
+      Svg.G,
       {'class': 'blocklyZoom'}, this.svgGroup_);
-  const clip = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.CLIPPATH,
+  const clip = dom.createSvgElement(
+      Svg.CLIPPATH,
       {
         'id': 'blocklyZoomresetClipPath' + rnd
       },
       this.zoomResetGroup_);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  dom.createSvgElement(
+      Svg.RECT,
       {
         'width': 32,
         'height': 32
       },
       clip);
-  const zoomresetSvg = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.IMAGE, {
-        'width': Blockly.internalConstants.SPRITE.width,
-        'height': Blockly.internalConstants.SPRITE.height,
+  const zoomresetSvg = dom.createSvgElement(
+      Svg.IMAGE, {
+        'width': internalConstants.SPRITE.width,
+        'height': internalConstants.SPRITE.height,
         'y': -92,
         'clip-path': 'url(#blocklyZoomresetClipPath' + rnd + ')'
       },
       this.zoomResetGroup_);
   zoomresetSvg.setAttributeNS(
-      Blockly.utils.dom.XLINK_NS, 'xlink:href',
+      dom.XLINK_NS, 'xlink:href',
       this.workspace_.options.pathToMedia +
-          Blockly.internalConstants.SPRITE.url);
+          internalConstants.SPRITE.url);
 
   // Attach event listeners.
-  this.onZoomResetWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onZoomResetWrapper_ = browserEvents.conditionalBind(
       this.zoomResetGroup_, 'mousedown', null, this.resetZoom_.bind(this));
 };
 
@@ -500,7 +500,7 @@ ZoomControls.prototype.resetZoom_ = function(e) {
 
   setTimeout(this.workspace_.endCanvasTransition.bind(this.workspace_), 500);
   this.fireZoomEvent_();
-  Blockly.Touch.clearTouchIdentifier();  // Don't block future drags.
+  Touch.clearTouchIdentifier();  // Don't block future drags.
   e.stopPropagation();  // Don't start a workspace scroll.
   e.preventDefault();  // Stop double-clicking from selecting text.
 };
@@ -510,15 +510,15 @@ ZoomControls.prototype.resetZoom_ = function(e) {
  * @private
  */
 ZoomControls.prototype.fireZoomEvent_ = function() {
-  const uiEvent = new (Blockly.Events.get(Blockly.Events.CLICK))(
+  const uiEvent = new (Events.get(Events.CLICK))(
       null, this.workspace_.id, 'zoom_controls');
-  Blockly.Events.fire(uiEvent);
+  Events.fire(uiEvent);
 };
 
 /**
  * CSS for zoom controls.  See css.js for use.
  */
-Blockly.Css.register([
+Css.register([
   /* eslint-disable indent */
   '.blocklyZoom>image, .blocklyZoom>svg>image {',
     'opacity: .4;',

From 5a5aabb7e7a759ce254cd675be84ad8e297285b8 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 14:09:14 -0700
Subject: [PATCH 355/833] clang-format core/zoom_controls.js

---
 core/zoom_controls.js | 133 +++++++++++++++++-------------------------
 1 file changed, 53 insertions(+), 80 deletions(-)

diff --git a/core/zoom_controls.js b/core/zoom_controls.js
index 84451bbd1..37c1cb17d 100644
--- a/core/zoom_controls.js
+++ b/core/zoom_controls.js
@@ -178,8 +178,7 @@ ZoomControls.prototype.initialized_ = false;
  * @return {!SVGElement} The zoom controls SVG group.
  */
 ZoomControls.prototype.createDom = function() {
-  this.svgGroup_ = dom.createSvgElement(
-      Svg.G, {}, null);
+  this.svgGroup_ = dom.createSvgElement(Svg.G, {}, null);
 
   // Each filter/pattern needs a unique ID for the case of multiple Blockly
   // instances on a page.  Browser behaviour becomes undefined otherwise.
@@ -266,42 +265,40 @@ ZoomControls.prototype.position = function(metrics, savedPositions) {
   }
   const startRect = uiPosition.getStartPositionRect(
       cornerPosition, new utils.Size(this.WIDTH_, height),
-      this.MARGIN_HORIZONTAL_, this.MARGIN_VERTICAL_, metrics,
-      this.workspace_);
+      this.MARGIN_HORIZONTAL_, this.MARGIN_VERTICAL_, metrics, this.workspace_);
 
   const verticalPosition = cornerPosition.vertical;
-  const bumpDirection =
-      verticalPosition === uiPosition.verticalPosition.TOP ?
-          uiPosition.bumpDirection.DOWN :
-          uiPosition.bumpDirection.UP;
+  const bumpDirection = verticalPosition === uiPosition.verticalPosition.TOP ?
+      uiPosition.bumpDirection.DOWN :
+      uiPosition.bumpDirection.UP;
   const positionRect = uiPosition.bumpPositionRect(
       startRect, this.MARGIN_VERTICAL_, bumpDirection, savedPositions);
 
   if (verticalPosition === uiPosition.verticalPosition.TOP) {
     const zoomInTranslateY = this.SMALL_SPACING_ + this.HEIGHT_;
-    this.zoomInGroup_.setAttribute('transform',
-        'translate(0, ' + zoomInTranslateY + ')');
+    this.zoomInGroup_.setAttribute(
+        'transform', 'translate(0, ' + zoomInTranslateY + ')');
     if (this.zoomResetGroup_) {
       const zoomResetTranslateY =
           zoomInTranslateY + this.LARGE_SPACING_ + this.HEIGHT_;
-      this.zoomResetGroup_.setAttribute('transform',
-          'translate(0, ' + zoomResetTranslateY + ')');
+      this.zoomResetGroup_.setAttribute(
+          'transform', 'translate(0, ' + zoomResetTranslateY + ')');
     }
   } else {
-    const zoomInTranslateY = this.zoomResetGroup_ ?
-        this.LARGE_SPACING_ + this.HEIGHT_ : 0;
-    this.zoomInGroup_.setAttribute('transform',
-        'translate(0, ' + zoomInTranslateY + ')');
+    const zoomInTranslateY =
+        this.zoomResetGroup_ ? this.LARGE_SPACING_ + this.HEIGHT_ : 0;
+    this.zoomInGroup_.setAttribute(
+        'transform', 'translate(0, ' + zoomInTranslateY + ')');
     const zoomOutTranslateY =
         zoomInTranslateY + this.SMALL_SPACING_ + this.HEIGHT_;
-    this.zoomOutGroup_.setAttribute('transform',
-        'translate(0, ' + zoomOutTranslateY + ')');
+    this.zoomOutGroup_.setAttribute(
+        'transform', 'translate(0, ' + zoomOutTranslateY + ')');
   }
 
   this.top_ = positionRect.top;
   this.left_ = positionRect.left;
-  this.svgGroup_.setAttribute('transform',
-      'translate(' + this.left_ + ',' + this.top_ + ')');
+  this.svgGroup_.setAttribute(
+      'transform', 'translate(' + this.left_ + ',' + this.top_ + ')');
 };
 
 /**
@@ -317,22 +314,17 @@ ZoomControls.prototype.createZoomOutSvg_ = function(rnd) {
     <clipPath id="blocklyZoomoutClipPath837493">
       <rect width="32" height="32></rect>
     </clipPath>
-    <image width="96" height="124" x="-64" y="-92" xlink:href="media/sprites.png"
+    <image width="96" height="124" x="-64" y="-92"
+  xlink:href="media/sprites.png"
         clip-path="url(#blocklyZoomoutClipPath837493)"></image>
   </g>
   */
-  this.zoomOutGroup_ = dom.createSvgElement(
-      Svg.G,
-      {'class': 'blocklyZoom'}, this.svgGroup_);
+  this.zoomOutGroup_ =
+      dom.createSvgElement(Svg.G, {'class': 'blocklyZoom'}, this.svgGroup_);
   const clip = dom.createSvgElement(
-      Svg.CLIPPATH,
-      {
-        'id': 'blocklyZoomoutClipPath' + rnd
-      },
-      this.zoomOutGroup_);
+      Svg.CLIPPATH, {'id': 'blocklyZoomoutClipPath' + rnd}, this.zoomOutGroup_);
   dom.createSvgElement(
-      Svg.RECT,
-      {
+      Svg.RECT, {
         'width': 32,
         'height': 32,
       },
@@ -348,8 +340,7 @@ ZoomControls.prototype.createZoomOutSvg_ = function(rnd) {
       this.zoomOutGroup_);
   zoomoutSvg.setAttributeNS(
       dom.XLINK_NS, 'xlink:href',
-      this.workspace_.options.pathToMedia +
-          internalConstants.SPRITE.url);
+      this.workspace_.options.pathToMedia + internalConstants.SPRITE.url);
 
   // Attach listener.
   this.onZoomOutWrapper_ = browserEvents.conditionalBind(
@@ -369,22 +360,17 @@ ZoomControls.prototype.createZoomInSvg_ = function(rnd) {
     <clipPath id="blocklyZoominClipPath837493">
       <rect width="32" height="32"></rect>
     </clipPath>
-    <image width="96" height="124" x="-32" y="-92" xlink:href="media/sprites.png"
+    <image width="96" height="124" x="-32" y="-92"
+  xlink:href="media/sprites.png"
         clip-path="url(#blocklyZoominClipPath837493)"></image>
   </g>
   */
-  this.zoomInGroup_ = dom.createSvgElement(
-      Svg.G,
-      {'class': 'blocklyZoom'}, this.svgGroup_);
+  this.zoomInGroup_ =
+      dom.createSvgElement(Svg.G, {'class': 'blocklyZoom'}, this.svgGroup_);
   const clip = dom.createSvgElement(
-      Svg.CLIPPATH,
-      {
-        'id': 'blocklyZoominClipPath' + rnd
-      },
-      this.zoomInGroup_);
+      Svg.CLIPPATH, {'id': 'blocklyZoominClipPath' + rnd}, this.zoomInGroup_);
   dom.createSvgElement(
-      Svg.RECT,
-      {
+      Svg.RECT, {
         'width': 32,
         'height': 32,
       },
@@ -400,8 +386,7 @@ ZoomControls.prototype.createZoomInSvg_ = function(rnd) {
       this.zoomInGroup_);
   zoominSvg.setAttributeNS(
       dom.XLINK_NS, 'xlink:href',
-      this.workspace_.options.pathToMedia +
-          internalConstants.SPRITE.url);
+      this.workspace_.options.pathToMedia + internalConstants.SPRITE.url);
 
   // Attach listener.
   this.onZoomInWrapper_ = browserEvents.conditionalBind(
@@ -421,8 +406,8 @@ ZoomControls.prototype.zoom_ = function(amount, e) {
   this.workspace_.zoomCenter(amount);
   this.fireZoomEvent_();
   Touch.clearTouchIdentifier();  // Don't block future drags.
-  e.stopPropagation();  // Don't start a workspace scroll.
-  e.preventDefault();  // Stop double-clicking from selecting text.
+  e.stopPropagation();           // Don't start a workspace scroll.
+  e.preventDefault();            // Stop double-clicking from selecting text.
 };
 
 /**
@@ -438,26 +423,17 @@ ZoomControls.prototype.createZoomResetSvg_ = function(rnd) {
     <clipPath id="blocklyZoomresetClipPath837493">
       <rect width="32" height="32"></rect>
     </clipPath>
-    <image width="96" height="124" x="-32" y="-92" xlink:href="media/sprites.png"
+    <image width="96" height="124" x="-32" y="-92"
+  xlink:href="media/sprites.png"
         clip-path="url(#blocklyZoomresetClipPath837493)"></image>
   </g>
   */
-  this.zoomResetGroup_ = dom.createSvgElement(
-      Svg.G,
-      {'class': 'blocklyZoom'}, this.svgGroup_);
+  this.zoomResetGroup_ =
+      dom.createSvgElement(Svg.G, {'class': 'blocklyZoom'}, this.svgGroup_);
   const clip = dom.createSvgElement(
-      Svg.CLIPPATH,
-      {
-        'id': 'blocklyZoomresetClipPath' + rnd
-      },
+      Svg.CLIPPATH, {'id': 'blocklyZoomresetClipPath' + rnd},
       this.zoomResetGroup_);
-  dom.createSvgElement(
-      Svg.RECT,
-      {
-        'width': 32,
-        'height': 32
-      },
-      clip);
+  dom.createSvgElement(Svg.RECT, {'width': 32, 'height': 32}, clip);
   const zoomresetSvg = dom.createSvgElement(
       Svg.IMAGE, {
         'width': internalConstants.SPRITE.width,
@@ -468,8 +444,7 @@ ZoomControls.prototype.createZoomResetSvg_ = function(rnd) {
       this.zoomResetGroup_);
   zoomresetSvg.setAttributeNS(
       dom.XLINK_NS, 'xlink:href',
-      this.workspace_.options.pathToMedia +
-          internalConstants.SPRITE.url);
+      this.workspace_.options.pathToMedia + internalConstants.SPRITE.url);
 
   // Attach event listeners.
   this.onZoomResetWrapper_ = browserEvents.conditionalBind(
@@ -501,8 +476,8 @@ ZoomControls.prototype.resetZoom_ = function(e) {
   setTimeout(this.workspace_.endCanvasTransition.bind(this.workspace_), 500);
   this.fireZoomEvent_();
   Touch.clearTouchIdentifier();  // Don't block future drags.
-  e.stopPropagation();  // Don't start a workspace scroll.
-  e.preventDefault();  // Stop double-clicking from selecting text.
+  e.stopPropagation();           // Don't start a workspace scroll.
+  e.preventDefault();            // Stop double-clicking from selecting text.
 };
 
 /**
@@ -510,8 +485,8 @@ ZoomControls.prototype.resetZoom_ = function(e) {
  * @private
  */
 ZoomControls.prototype.fireZoomEvent_ = function() {
-  const uiEvent = new (Events.get(Events.CLICK))(
-      null, this.workspace_.id, 'zoom_controls');
+  const uiEvent =
+      new (Events.get(Events.CLICK))(null, this.workspace_.id, 'zoom_controls');
   Events.fire(uiEvent);
 };
 
@@ -519,19 +494,17 @@ ZoomControls.prototype.fireZoomEvent_ = function() {
  * CSS for zoom controls.  See css.js for use.
  */
 Css.register([
-  /* eslint-disable indent */
-  '.blocklyZoom>image, .blocklyZoom>svg>image {',
-    'opacity: .4;',
-  '}',
+  `.blocklyZoom>image, .blocklyZoom>svg>image {
+  opacity: .4;
+}`,
 
-  '.blocklyZoom>image:hover, .blocklyZoom>svg>image:hover {',
-    'opacity: .6;',
-  '}',
+  `.blocklyZoom>image:hover, .blocklyZoom>svg>image:hover {
+  opacity: .6;
+}`,
 
-  '.blocklyZoom>image:active, .blocklyZoom>svg>image:active {',
-    'opacity: .8;',
-  '}'
-  /* eslint-enable indent */
+  `.blocklyZoom>image:active, .blocklyZoom>svg>image:active {
+  'opacity: .8;
+}`
 ]);
 
 exports = ZoomControls;

From 636cd58add1b0449e6b91d660374eecd1eedae4d Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 12:35:21 -0700
Subject: [PATCH 356/833] Add comment to top of convert-file script for
 reference to syntax used throughout the file

---
 scripts/goog_module/convert-file.sh | 55 +++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 10 deletions(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index 6a8d36cd0..9f8ea63ee 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -1,5 +1,39 @@
 #!/bin/bash
 
+# This file makes extensive use of perl for the purpose of extracting and
+# replacing string (regex) patterns in a way that is both GNU and macOS
+# compatible.
+#
+# Common perl flags used (also decribed at https://perldoc.perl.org/perlrun):
+#   -e : Used to execute perl programs on the command line
+#   -p : Assumes an input loop around script. Prints every processed line.
+#   -n : Assumes an input loop around script. Does not print every line.
+#   -i : Used for in-place editing. Used for commands for find/replace.
+#   -l[octnum] : Assigns the output record separator "$/" as an octal number. If
+#        octnum is not present, sets output record separator to the current
+#        value of the input record separator "$\".
+#
+# Common perl commands found:
+# 1.  perl -pi -e 's/regex/replacement/modifiers'
+#   This command does an in-place search-and-replace. The global ("/g") modifier
+#   causes it to replace all occurrences, rather than only the first match.
+# 2.  perl -ne 'print m/regex/modifiers'
+#   This command returns the all regex matches. If the global ("/g") modifier is
+#   specified, then the capture group "()" is not necessary and it will return
+#   all matches, rather than only the first match.
+# 3.  perl -nle 'print $& while m{regex}modifiers'
+#   Similar to (2), but returns regex matches separated by newlines.
+#   The "m{regex}modifiers" is equivalent to "m/regex/modifiers" syntax.
+#
+# Additional information on regex:
+# This script makes use of some advanced regex syntax such as "capture groups"
+# and "lookaround assertions".
+# Additionally, characters are escaped from regex with a backslash "\".
+# Single quotes need to be escaped in both regex and the string, resulting in
+# '\'' being used to represent a single quote character.
+# For a reference to syntax of regular expressions in Perl, see:
+# https://perldoc.perl.org/perire
+
 #######################################
 # Logging functions.
 #######################################
@@ -98,10 +132,10 @@ step2 () {
   local filepath="$1"
 
   inf "Updating goog.provide declaration..."
-  perl -pi -e 's/^goog\.provide(\([^\)]+\)\;)/goog\.module\1\ngoog.module.declareLegacyNamespace\(\)\;/g' "${filepath}"
+  perl -pi -e 's/^goog\.provide(\([^\)]+\)\;)/goog\.module\1\ngoog.module.declareLegacyNamespace\(\)\;/' "${filepath}"
 
   inf "Extracting module name..."
-  local module_name=$(perl -nle'print $& while m{(?<=^goog\.module\('\'')([^'\'')]+)}g' "${filepath}")
+  local module_name=$(perl -ne 'print m/(?<=^goog\.module\('\'')([^'\'']+)/' "${filepath}")
   if [[ -z "${module_name}" ]]; then
     err "Could not extract module name"
     return 1
@@ -109,7 +143,7 @@ step2 () {
   inf "Extracted module name \"${module_name}\""
 
   if [[ $(grep "${module_name} = " "${filepath}") ]]; then
-    local class_name=$(echo "${module_name}" | perl -nle'print $& while m{(\w+)$}g')
+    local class_name=$(echo "${module_name}" | perl -ne 'print m/(\w+)$/')
     inf "Found class \"${class_name}\" in file."
     inf "Updating class declaration..."
     perl -pi -e 's/^('"${module_name}"') =/const '"${class_name}"' =/g' "${filepath}"
@@ -144,19 +178,19 @@ step2 () {
 #######################################
 step3() {
   inf "Extracting module name..."
-  local module_name=$(perl -nle'print $& while m{(?<=^goog\.module\('\'')([^'\'')]+)}g' "${filepath}")
+  local module_name=$(perl -ne 'print m/(?<=^goog\.module\('\'')([^'\'']+)/' "${filepath}")
   if [[ -z "${module_name}" ]]; then
     err "Could not extract module name"
     return 1
   fi
   inf "Extracted module name \"${module_name}\""
 
-  local requires=$(perl -nle'print $& while m{(?:(?<=^goog.require\('\'')|(?<=^goog.requireType\('\''))[^'\'']+}g' "${filepath}")
+  local requires=$(perl -nle 'print $& while m{(?:(?<=^goog.require\('\'')|(?<=^goog.requireType\('\''))[^'\'']+}g' "${filepath}")
 
   # Process each require
   echo "${requires}" | while read -r require; do
     inf "Processing require \"${require}\""
-    local usages=$(perl -nle'print $& while m{'"${require}"'(?!'\'')}g' "${filepath}" | wc -l)
+    local usages=$(perl -nle 'print $& while m{'"${require}"'(?!'\'')}g' "${filepath}" | wc -l)
 
     if [[ "${usages}" -eq "0" ]]; then
       warn "Unused require \"${require}\""
@@ -168,11 +202,12 @@ step3() {
     perl -pi -e 's/^(goog\.(require|requireType)\('\'"${require}"\''\);)/const '"${require_name}"' = \1/' "${filepath}"
 
     # Parse property access of module
-    local direct_access_count=$(perl -nle'print $& while m{'"${require}"'[^\.'\'']}g' "${filepath}" | wc -l)
-    local properties_accessed=$(perl -nle'print $& while m{(?<='"${require}"'\.)(?!prototype)\w+}g' "${filepath}" | tr ' ' '\n' | sort -u)
+    local direct_access_count=$(perl -nle 'print $& while m{'"${require}"'[^\.'\'']}g' "${filepath}" | wc -l)
+    local properties_accessed=$(perl -nle 'print $& while m{(?<='"${require}"'\.)(?!prototype)\w+}g' "${filepath}" | sort -u)
+
     # Detect requires overlap
     # (ex: Blockly.utils require and Blockly.utils.dom also in requires)
-    local requires_overlap=$(echo "${requires}" | perl -nle'print $& while m{(?<='"${require}"'\.)\w+}g')
+    local requires_overlap=$(echo "${requires}" | perl -nle 'print $& while m{(?<='"${require}"'\.)\w+}g')
     if [[ -n "${requires_overlap}" ]]; then
       while read -r requires_overlap_prop; do
         properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/'"${requires_overlap_prop}"'//g')
@@ -180,7 +215,7 @@ step3() {
     fi
     # Detect module name overlap
     # (ex: Blockly require and Blockly.ContextMenuItems module being converted)
-    local module_overlap=$(echo "${module_name}" | perl -nle'print $& while m{(?<='"${require}"'\.)\w+}g')
+    local module_overlap=$(echo "${module_name}" | perl -nle 'print $& while m{(?<='"${require}"'\.)\w+}g')
     if [[ -n "${module_overlap}" ]]; then
       properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/'"${module_overlap}"'//g')
     fi

From f64e8df4866056444c44505f771397e40ea0fed1 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 15:26:16 -0700
Subject: [PATCH 357/833] Update wording

---
 scripts/goog_module/convert-file.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index 9f8ea63ee..0246be0be 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -18,9 +18,10 @@
 #   This command does an in-place search-and-replace. The global ("/g") modifier
 #   causes it to replace all occurrences, rather than only the first match.
 # 2.  perl -ne 'print m/regex/modifiers'
-#   This command returns the all regex matches. If the global ("/g") modifier is
-#   specified, then the capture group "()" is not necessary and it will return
-#   all matches, rather than only the first match.
+#   This command returns a string containing the regex match. The regex must
+#   contain a capture group "()", unless the global ("\g") modifier is
+#   specified. This will return the first match, unless the global modifier is
+#   specified, in which case, it will return all matches.
 # 3.  perl -nle 'print $& while m{regex}modifiers'
 #   Similar to (2), but returns regex matches separated by newlines.
 #   The "m{regex}modifiers" is equivalent to "m/regex/modifiers" syntax.

From 3fbbedf6f1c9156b7ddfd64d4e82b8a28271c191 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 18:10:53 -0700
Subject: [PATCH 358/833] Fix typos and update wording again

---
 scripts/goog_module/convert-file.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index 0246be0be..38ac2eafb 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -4,11 +4,11 @@
 # replacing string (regex) patterns in a way that is both GNU and macOS
 # compatible.
 #
-# Common perl flags used (also decribed at https://perldoc.perl.org/perlrun):
+# Common perl flags used (also described at https://perldoc.perl.org/perlrun):
 #   -e : Used to execute perl programs on the command line
 #   -p : Assumes an input loop around script. Prints every processed line.
 #   -n : Assumes an input loop around script. Does not print every line.
-#   -i : Used for in-place editing. Used for commands for find/replace.
+#   -i : Used for in-place editing. Used in commands for find/replace.
 #   -l[octnum] : Assigns the output record separator "$/" as an octal number. If
 #        octnum is not present, sets output record separator to the current
 #        value of the input record separator "$\".
@@ -18,10 +18,11 @@
 #   This command does an in-place search-and-replace. The global ("/g") modifier
 #   causes it to replace all occurrences, rather than only the first match.
 # 2.  perl -ne 'print m/regex/modifiers'
-#   This command returns a string containing the regex match. The regex must
-#   contain a capture group "()", unless the global ("\g") modifier is
-#   specified. This will return the first match, unless the global modifier is
-#   specified, in which case, it will return all matches.
+#   This command returns a string containing the regex match (designated by the
+#   capture group "()" in the regex). This will return the first match, unless
+#   the global modifier is specified, in which case, it will return all matches.
+#   If this command is used without a capture group it returns true or false (in
+#   the form a truthy or falsey value)
 # 3.  perl -nle 'print $& while m{regex}modifiers'
 #   Similar to (2), but returns regex matches separated by newlines.
 #   The "m{regex}modifiers" is equivalent to "m/regex/modifiers" syntax.
@@ -33,7 +34,7 @@
 # Single quotes need to be escaped in both regex and the string, resulting in
 # '\'' being used to represent a single quote character.
 # For a reference to syntax of regular expressions in Perl, see:
-# https://perldoc.perl.org/perire
+# https://perldoc.perl.org/perlre
 
 #######################################
 # Logging functions.
@@ -240,7 +241,7 @@ step3() {
   missing_requires=$(echo "${missing_requires}" | tr ' ' '\n' | sort -u)
   if [[ -n "${missing_requires}" ]]; then
     # Search for the string goog.require('Blockly') or goog.requireType('Blockly')
-    local has_blockly_require=$(perl -ne'print m{goog\.(require|requireType)\('\''Blockly'\''\)}g' "${filepath}")
+    local has_blockly_require=$(perl -ne 'print m/goog\.(?:require|requireType)\('\''Blockly'\''\)/' "${filepath}")
     if [[ -n "${has_blockly_require}" ]]; then
       warn 'Blockly detected as a require.'
       warn "Potentially missing requires for:\n${missing_requires}\nPlease manually review."

From 7495fad6b3d9e489e504f66a7b19e96288df55c4 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 18:37:13 -0700
Subject: [PATCH 359/833] Add missing period and fix typo

---
 scripts/goog_module/convert-file.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index 38ac2eafb..ebf791d3b 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -22,7 +22,7 @@
 #   capture group "()" in the regex). This will return the first match, unless
 #   the global modifier is specified, in which case, it will return all matches.
 #   If this command is used without a capture group it returns true or false (in
-#   the form a truthy or falsey value)
+#   the form a truthy or falsy value).
 # 3.  perl -nle 'print $& while m{regex}modifiers'
 #   Similar to (2), but returns regex matches separated by newlines.
 #   The "m{regex}modifiers" is equivalent to "m/regex/modifiers" syntax.

From c068a3b6f9dcd304278bd5aa87a0d66460d698df Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 27 Jul 2021 14:26:04 -0700
Subject: [PATCH 360/833] Migrate core/renderers/common/path_object.js to
 goog.module

---
 core/renderers/common/path_object.js | 39 +++++++++++++++-------------
 tests/deps.js                        |  2 +-
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/core/renderers/common/path_object.js b/core/renderers/common/path_object.js
index e81b8e0e2..c6de3c492 100644
--- a/core/renderers/common/path_object.js
+++ b/core/renderers/common/path_object.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-goog.provide('Blockly.blockRendering.PathObject');
+goog.module('Blockly.blockRendering.PathObject');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.ConstantProvider');
 goog.require('Blockly.blockRendering.IPathObject');
@@ -35,7 +36,7 @@ goog.requireType('Blockly.Connection');
  * @implements {Blockly.blockRendering.IPathObject}
  * @package
  */
-Blockly.blockRendering.PathObject = function(root, style, constants) {
+const PathObject = function(root, style, constants) {
   /**
    * The renderer's constant provider.
    * @type {!Blockly.blockRendering.ConstantProvider}
@@ -83,7 +84,7 @@ Blockly.blockRendering.PathObject = function(root, style, constants) {
  * @param {string} pathString The path.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.setPath = function(pathString) {
+PathObject.prototype.setPath = function(pathString) {
   this.svgPath.setAttribute('d', pathString);
 };
 
@@ -91,7 +92,7 @@ Blockly.blockRendering.PathObject.prototype.setPath = function(pathString) {
  * Flip the SVG paths in RTL.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.flipRTL = function() {
+PathObject.prototype.flipRTL = function() {
   // Mirror the block's path.
   this.svgPath.setAttribute('transform', 'scale(-1 1)');
 };
@@ -102,7 +103,7 @@ Blockly.blockRendering.PathObject.prototype.flipRTL = function() {
  *     block SVG group.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.setCursorSvg = function(cursorSvg) {
+PathObject.prototype.setCursorSvg = function(cursorSvg) {
   if (!cursorSvg) {
     this.cursorSvg = null;
     return;
@@ -118,7 +119,7 @@ Blockly.blockRendering.PathObject.prototype.setCursorSvg = function(cursorSvg) {
  *     block SVG group.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.setMarkerSvg = function(markerSvg) {
+PathObject.prototype.setMarkerSvg = function(markerSvg) {
   if (!markerSvg) {
     this.markerSvg = null;
     return;
@@ -138,7 +139,7 @@ Blockly.blockRendering.PathObject.prototype.setMarkerSvg = function(markerSvg) {
  * @param {!Blockly.Block} block The source block.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.applyColour = function(block) {
+PathObject.prototype.applyColour = function(block) {
   this.svgPath.setAttribute('stroke', this.style.colourTertiary);
   this.svgPath.setAttribute('fill', this.style.colourPrimary);
 
@@ -151,7 +152,7 @@ Blockly.blockRendering.PathObject.prototype.applyColour = function(block) {
  * @param {!Blockly.Theme.BlockStyle} blockStyle The block style to use.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.setStyle = function(blockStyle) {
+PathObject.prototype.setStyle = function(blockStyle) {
   this.style = blockStyle;
 };
 
@@ -162,7 +163,7 @@ Blockly.blockRendering.PathObject.prototype.setStyle = function(blockStyle) {
  *     be removed.
  * @protected
  */
-Blockly.blockRendering.PathObject.prototype.setClass_ = function(
+PathObject.prototype.setClass_ = function(
     className, add) {
   if (add) {
     Blockly.utils.dom.addClass(/** @type {!Element} */ (this.svgRoot),
@@ -179,7 +180,7 @@ Blockly.blockRendering.PathObject.prototype.setClass_ = function(
  * @param {boolean} enable True if highlighted.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.updateHighlighted = function(
+PathObject.prototype.updateHighlighted = function(
     enable) {
   if (enable) {
     this.svgPath.setAttribute('filter',
@@ -194,7 +195,7 @@ Blockly.blockRendering.PathObject.prototype.updateHighlighted = function(
  * @param {boolean} shadow True if the block is a shadow block.
  * @protected
  */
-Blockly.blockRendering.PathObject.prototype.updateShadow_ = function(shadow) {
+PathObject.prototype.updateShadow_ = function(shadow) {
   if (shadow) {
     this.svgPath.setAttribute('stroke', 'none');
     this.svgPath.setAttribute('fill', this.style.colourSecondary);
@@ -206,7 +207,7 @@ Blockly.blockRendering.PathObject.prototype.updateShadow_ = function(shadow) {
  * @param {boolean} disabled True if disabled.
  * @protected
  */
-Blockly.blockRendering.PathObject.prototype.updateDisabled_ = function(
+PathObject.prototype.updateDisabled_ = function(
     disabled) {
   this.setClass_('blocklyDisabled', disabled);
   if (disabled) {
@@ -220,7 +221,7 @@ Blockly.blockRendering.PathObject.prototype.updateDisabled_ = function(
  * @param {boolean} enable True if selection is enabled, false otherwise.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.updateSelected = function(enable) {
+PathObject.prototype.updateSelected = function(enable) {
   this.setClass_('blocklySelected', enable);
 };
 
@@ -230,7 +231,7 @@ Blockly.blockRendering.PathObject.prototype.updateSelected = function(enable) {
  *     area, false otherwise.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.updateDraggingDelete = function(
+PathObject.prototype.updateDraggingDelete = function(
     enable) {
   this.setClass_('blocklyDraggingDelete', enable);
 };
@@ -241,7 +242,7 @@ Blockly.blockRendering.PathObject.prototype.updateDraggingDelete = function(
  *     otherwise.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.updateInsertionMarker = function(
+PathObject.prototype.updateInsertionMarker = function(
     enable) {
   this.setClass_('blocklyInsertionMarker', enable);
 };
@@ -251,7 +252,7 @@ Blockly.blockRendering.PathObject.prototype.updateInsertionMarker = function(
  * @param {boolean} enable True if the block is movable, false otherwise.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.updateMovable = function(enable) {
+PathObject.prototype.updateMovable = function(enable) {
   this.setClass_('blocklyDraggable', enable);
 };
 
@@ -262,7 +263,7 @@ Blockly.blockRendering.PathObject.prototype.updateMovable = function(enable) {
  * @param {boolean} enable True if styling should be added.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.updateReplacementFade =
+PathObject.prototype.updateReplacementFade =
     function(enable) {
     /* eslint-disable indent */
   this.setClass_('blocklyReplaceable', enable);
@@ -275,8 +276,10 @@ Blockly.blockRendering.PathObject.prototype.updateReplacementFade =
  * @param {boolean} _enable True if styling should be added.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.updateShapeForInputHighlight =
+PathObject.prototype.updateShapeForInputHighlight =
     function(_conn, _enable) {
     /* eslint-disable indent */
   // NOP
 }; /* eslint-enable indent */
+
+exports = PathObject;
diff --git a/tests/deps.js b/tests/deps.js
index 805416071..aa69691cb 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -126,7 +126,7 @@ goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRende
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], []);
 goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.geras.RenderInfo', 'Blockly.utils.object', 'Blockly.utils.svgPaths']);

From 027763e094ad3d68a0a78f1db485115e1c5c1cdd Mon Sep 17 00:00:00 2001
From: Maribeth Bottorff <maribethb@google.com>
Date: Tue, 27 Jul 2021 14:28:13 -0700
Subject: [PATCH 361/833] Update exports to new agreed syntax

---
 core/utils/aria.js | 11 ++++-------
 tests/deps.js      |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/core/utils/aria.js b/core/utils/aria.js
index 464ba77b0..b387b4677 100644
--- a/core/utils/aria.js
+++ b/core/utils/aria.js
@@ -69,6 +69,7 @@ const Role = {
   // ARIA role for a tree item that sometimes may be expanded or collapsed.
   TREEITEM: 'treeitem'
 };
+exports.Role = Role;
 
 /**
  * ARIA states and properties.
@@ -134,6 +135,7 @@ const State = {
   // ARIA property for slider minimum value. Value: number.
   VALUEMIN: 'valuemin'
 };
+exports.State = State;
 
 /**
  * Sets the role of an element.
@@ -146,6 +148,7 @@ const State = {
 const setRole = function(element, roleName) {
   element.setAttribute(ROLE_ATTRIBUTE, roleName);
 };
+exports.setRole = setRole;
 
 /**
  * Sets the state or property of an element.
@@ -164,10 +167,4 @@ const setState = function(element, stateName, value) {
   const attrStateName = ARIA_PREFIX + stateName;
   element.setAttribute(attrStateName, value);
 };
-
-exports = {
-  Role,
-  State,
-  setRole,
-  setState,
-};
+exports.setState = setState;
diff --git a/tests/deps.js b/tests/deps.js
index 805416071..d695aabd8 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -175,7 +175,7 @@ goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalC
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
+goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], [], {'lang': 'es6', 'module': 'goog'});

From cf3d22c4901b65894ce6a63151140139079173f2 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 27 Jul 2021 14:39:02 -0700
Subject: [PATCH 362/833] Migrate core/renderers/common/path_object.js named
 requires

---
 core/renderers/common/path_object.js | 44 +++++++++++++++-------------
 tests/deps.js                        |  2 +-
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/core/renderers/common/path_object.js b/core/renderers/common/path_object.js
index c6de3c492..bb3cca63a 100644
--- a/core/renderers/common/path_object.js
+++ b/core/renderers/common/path_object.js
@@ -14,32 +14,36 @@
 goog.module('Blockly.blockRendering.PathObject');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.ConstantProvider');
-goog.require('Blockly.blockRendering.IPathObject');
-goog.require('Blockly.Theme');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Svg');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.Connection');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+/* 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 IPathObject = goog.require('Blockly.blockRendering.IPathObject');
+const Svg = goog.require('Blockly.utils.Svg');
+/* eslint-disable-next-line no-unused-vars */
+const Theme = goog.requireType('Blockly.Theme');
+const dom = goog.require('Blockly.utils.dom');
 
 
 /**
  * An object that handles creating and setting each of the SVG elements
  * used by the renderer.
  * @param {!SVGElement} root The root SVG element.
- * @param {!Blockly.Theme.BlockStyle} style The style object to use for
+ * @param {!Theme.BlockStyle} style The style object to use for
  *     colouring.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The renderer's
+ * @param {!ConstantProvider} constants The renderer's
  *     constants.
  * @constructor
- * @implements {Blockly.blockRendering.IPathObject}
+ * @implements {IPathObject}
  * @package
  */
 const PathObject = function(root, style, constants) {
   /**
    * The renderer's constant provider.
-   * @type {!Blockly.blockRendering.ConstantProvider}
+   * @type {!ConstantProvider}
    * @package
    */
   this.constants = constants;
@@ -51,13 +55,13 @@ const PathObject = function(root, style, constants) {
    * @type {!SVGElement}
    * @package
    */
-  this.svgPath = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
+  this.svgPath = dom.createSvgElement(
+      Svg.PATH,
       {'class': 'blocklyPath'}, this.svgRoot);
 
   /**
    * The style object to use when colouring block paths.
-   * @type {!Blockly.Theme.BlockStyle}
+   * @type {!Theme.BlockStyle}
    * @package
    */
   this.style = style;
@@ -136,7 +140,7 @@ PathObject.prototype.setMarkerSvg = function(markerSvg) {
 /**
  * Apply the stored colours to the block's path, taking into account whether
  * the paths belong to a shadow block.
- * @param {!Blockly.Block} block The source block.
+ * @param {!Block} block The source block.
  * @package
  */
 PathObject.prototype.applyColour = function(block) {
@@ -149,7 +153,7 @@ PathObject.prototype.applyColour = function(block) {
 
 /**
  * Set the style.
- * @param {!Blockly.Theme.BlockStyle} blockStyle The block style to use.
+ * @param {!Theme.BlockStyle} blockStyle The block style to use.
  * @package
  */
 PathObject.prototype.setStyle = function(blockStyle) {
@@ -166,10 +170,10 @@ PathObject.prototype.setStyle = function(blockStyle) {
 PathObject.prototype.setClass_ = function(
     className, add) {
   if (add) {
-    Blockly.utils.dom.addClass(/** @type {!Element} */ (this.svgRoot),
+    dom.addClass(/** @type {!Element} */ (this.svgRoot),
         className);
   } else {
-    Blockly.utils.dom.removeClass(/** @type {!Element} */ (this.svgRoot),
+    dom.removeClass(/** @type {!Element} */ (this.svgRoot),
         className);
   }
 };
@@ -272,7 +276,7 @@ PathObject.prototype.updateReplacementFade =
 /**
  * Add or remove styling that shows that if the dragging block is dropped, this
  * block will be connected to the input.
- * @param {Blockly.Connection} _conn The connection on the input to highlight.
+ * @param {Connection} _conn The connection on the input to highlight.
  * @param {boolean} _enable True if styling should be added.
  * @package
  */
diff --git a/tests/deps.js b/tests/deps.js
index aa69691cb..8d394ea2f 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -126,7 +126,7 @@ goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRende
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], []);
 goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.geras.RenderInfo', 'Blockly.utils.object', 'Blockly.utils.svgPaths']);

From 55207a2e7fd152412d0a41740e5dfdc17201a705 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 27 Jul 2021 14:41:29 -0700
Subject: [PATCH 363/833] clang-format core/renderers/common/path_object.js

---
 core/renderers/common/path_object.js | 46 ++++++++++------------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/core/renderers/common/path_object.js b/core/renderers/common/path_object.js
index bb3cca63a..7b1f6af9d 100644
--- a/core/renderers/common/path_object.js
+++ b/core/renderers/common/path_object.js
@@ -55,9 +55,8 @@ const PathObject = function(root, style, constants) {
    * @type {!SVGElement}
    * @package
    */
-  this.svgPath = dom.createSvgElement(
-      Svg.PATH,
-      {'class': 'blocklyPath'}, this.svgRoot);
+  this.svgPath =
+      dom.createSvgElement(Svg.PATH, {'class': 'blocklyPath'}, this.svgRoot);
 
   /**
    * The style object to use when colouring block paths.
@@ -167,14 +166,11 @@ PathObject.prototype.setStyle = function(blockStyle) {
  *     be removed.
  * @protected
  */
-PathObject.prototype.setClass_ = function(
-    className, add) {
+PathObject.prototype.setClass_ = function(className, add) {
   if (add) {
-    dom.addClass(/** @type {!Element} */ (this.svgRoot),
-        className);
+    dom.addClass(/** @type {!Element} */ (this.svgRoot), className);
   } else {
-    dom.removeClass(/** @type {!Element} */ (this.svgRoot),
-        className);
+    dom.removeClass(/** @type {!Element} */ (this.svgRoot), className);
   }
 };
 
@@ -184,11 +180,10 @@ PathObject.prototype.setClass_ = function(
  * @param {boolean} enable True if highlighted.
  * @package
  */
-PathObject.prototype.updateHighlighted = function(
-    enable) {
+PathObject.prototype.updateHighlighted = function(enable) {
   if (enable) {
-    this.svgPath.setAttribute('filter',
-        'url(#' + this.constants.embossFilterId + ')');
+    this.svgPath.setAttribute(
+        'filter', 'url(#' + this.constants.embossFilterId + ')');
   } else {
     this.svgPath.setAttribute('filter', 'none');
   }
@@ -211,12 +206,11 @@ PathObject.prototype.updateShadow_ = function(shadow) {
  * @param {boolean} disabled True if disabled.
  * @protected
  */
-PathObject.prototype.updateDisabled_ = function(
-    disabled) {
+PathObject.prototype.updateDisabled_ = function(disabled) {
   this.setClass_('blocklyDisabled', disabled);
   if (disabled) {
-    this.svgPath.setAttribute('fill',
-        'url(#' + this.constants.disabledPatternId + ')');
+    this.svgPath.setAttribute(
+        'fill', 'url(#' + this.constants.disabledPatternId + ')');
   }
 };
 
@@ -235,8 +229,7 @@ PathObject.prototype.updateSelected = function(enable) {
  *     area, false otherwise.
  * @package
  */
-PathObject.prototype.updateDraggingDelete = function(
-    enable) {
+PathObject.prototype.updateDraggingDelete = function(enable) {
   this.setClass_('blocklyDraggingDelete', enable);
 };
 
@@ -246,8 +239,7 @@ PathObject.prototype.updateDraggingDelete = function(
  *     otherwise.
  * @package
  */
-PathObject.prototype.updateInsertionMarker = function(
-    enable) {
+PathObject.prototype.updateInsertionMarker = function(enable) {
   this.setClass_('blocklyInsertionMarker', enable);
 };
 
@@ -267,11 +259,9 @@ PathObject.prototype.updateMovable = function(enable) {
  * @param {boolean} enable True if styling should be added.
  * @package
  */
-PathObject.prototype.updateReplacementFade =
-    function(enable) {
-    /* eslint-disable indent */
+PathObject.prototype.updateReplacementFade = function(enable) {
   this.setClass_('blocklyReplaceable', enable);
-}; /* eslint-enable indent */
+};
 
 /**
  * Add or remove styling that shows that if the dragging block is dropped, this
@@ -280,10 +270,8 @@ PathObject.prototype.updateReplacementFade =
  * @param {boolean} _enable True if styling should be added.
  * @package
  */
-PathObject.prototype.updateShapeForInputHighlight =
-    function(_conn, _enable) {
-    /* eslint-disable indent */
+PathObject.prototype.updateShapeForInputHighlight = function(_conn, _enable) {
   // NOP
-}; /* eslint-enable indent */
+};
 
 exports = PathObject;

From e04050cd710199763591270640fefa7b3a3d6aba Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 13:54:32 -0700
Subject: [PATCH 364/833] Migrate core/warning.js to ES6 const/let

---
 core/warning.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/warning.js b/core/warning.js
index 9bbd9c91b..e596f0328 100644
--- a/core/warning.js
+++ b/core/warning.js
@@ -145,8 +145,8 @@ Blockly.Warning.prototype.setText = function(text, id) {
  * @return {string} All texts concatenated into one string.
  */
 Blockly.Warning.prototype.getText = function() {
-  var allWarnings = [];
-  for (var id in this.text_) {
+  const allWarnings = [];
+  for (let id in this.text_) {
     allWarnings.push(this.text_[id]);
   }
   return allWarnings.join('\n');

From 94b9169bf56402140a0cbcb123595fd5cabb64ab Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 13:54:52 -0700
Subject: [PATCH 365/833] Migrate core/warning.js to goog.module

---
 core/warning.js | 27 +++++++++++++++------------
 tests/deps.js   |  2 +-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/core/warning.js b/core/warning.js
index e596f0328..c39e7cad9 100644
--- a/core/warning.js
+++ b/core/warning.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Warning');
+goog.module('Blockly.Warning');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Bubble');
 goog.require('Blockly.Events');
@@ -32,25 +33,25 @@ goog.requireType('Blockly.utils.Coordinate');
  * @extends {Blockly.Icon}
  * @constructor
  */
-Blockly.Warning = function(block) {
-  Blockly.Warning.superClass_.constructor.call(this, block);
+const Warning = function(block) {
+  Warning.superClass_.constructor.call(this, block);
   this.createIcon();
   // The text_ object can contain multiple warnings.
   this.text_ = Object.create(null);
 };
-Blockly.utils.object.inherits(Blockly.Warning, Blockly.Icon);
+Blockly.utils.object.inherits(Warning, Blockly.Icon);
 
 /**
  * Does this icon get hidden when the block is collapsed.
  */
-Blockly.Warning.prototype.collapseHidden = false;
+Warning.prototype.collapseHidden = false;
 
 /**
  * Draw the warning icon.
  * @param {!Element} group The icon group.
  * @protected
  */
-Blockly.Warning.prototype.drawIcon_ = function(group) {
+Warning.prototype.drawIcon_ = function(group) {
   // Triangle with rounded corners.
   Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.PATH,
@@ -83,7 +84,7 @@ Blockly.Warning.prototype.drawIcon_ = function(group) {
  * Show or hide the warning bubble.
  * @param {boolean} visible True if the bubble should be visible.
  */
-Blockly.Warning.prototype.setVisible = function(visible) {
+Warning.prototype.setVisible = function(visible) {
   if (visible == this.isVisible()) {
     return;
   }
@@ -100,7 +101,7 @@ Blockly.Warning.prototype.setVisible = function(visible) {
  * Show the bubble.
  * @private
  */
-Blockly.Warning.prototype.createBubble_ = function() {
+Warning.prototype.createBubble_ = function() {
   this.paragraphElement_ = Blockly.Bubble.textToDom(this.getText());
   this.bubble_ = Blockly.Bubble.createNonEditableBubble(
       this.paragraphElement_, /** @type {!Blockly.BlockSvg} */ (this.block_),
@@ -112,7 +113,7 @@ Blockly.Warning.prototype.createBubble_ = function() {
  * Dispose of the bubble and references to it.
  * @private
  */
-Blockly.Warning.prototype.disposeBubble_ = function() {
+Warning.prototype.disposeBubble_ = function() {
   this.bubble_.dispose();
   this.bubble_ = null;
   this.paragraphElement_ = null;
@@ -125,7 +126,7 @@ Blockly.Warning.prototype.disposeBubble_ = function() {
  * @param {string} id An ID for this text entry to be able to maintain
  *     multiple warnings.
  */
-Blockly.Warning.prototype.setText = function(text, id) {
+Warning.prototype.setText = function(text, id) {
   if (this.text_[id] == text) {
     return;
   }
@@ -144,7 +145,7 @@ Blockly.Warning.prototype.setText = function(text, id) {
  * Get this warning's texts.
  * @return {string} All texts concatenated into one string.
  */
-Blockly.Warning.prototype.getText = function() {
+Warning.prototype.getText = function() {
   const allWarnings = [];
   for (let id in this.text_) {
     allWarnings.push(this.text_[id]);
@@ -155,7 +156,9 @@ Blockly.Warning.prototype.getText = function() {
 /**
  * Dispose of this warning.
  */
-Blockly.Warning.prototype.dispose = function() {
+Warning.prototype.dispose = function() {
   this.block_.warning = null;
   Blockly.Icon.prototype.dispose.call(this);
 };
+
+exports = Warning;
diff --git a/tests/deps.js b/tests/deps.js
index 84c1c2b48..c6ccc9bb8 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -199,7 +199,7 @@ goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Bloc
 goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils']);
 goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.xml']);
 goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml']);
-goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.utils.dom']);
 goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es5'});

From 9f3139c7520906c91ba18bc2edbcbda170414893 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 13:58:28 -0700
Subject: [PATCH 366/833] Migrate core/warning.js named requires

---
 core/warning.js | 52 +++++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/core/warning.js b/core/warning.js
index c39e7cad9..90bc15b12 100644
--- a/core/warning.js
+++ b/core/warning.js
@@ -13,24 +13,26 @@
 goog.module('Blockly.Warning');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Bubble');
-goog.require('Blockly.Events');
+/* 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 Bubble = goog.require('Blockly.Bubble');
+/* eslint-disable-next-line no-unused-vars */
+const Coordinate = goog.requireType('Blockly.utils.Coordinate');
+const Events = goog.require('Blockly.Events');
+const Icon = goog.require('Blockly.Icon');
+const Svg = goog.require('Blockly.utils.Svg');
+const dom = goog.require('Blockly.utils.dom');
+const object = goog.require('Blockly.utils.object');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BubbleOpen');
-goog.require('Blockly.Icon');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Svg');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.utils.Coordinate');
 
 
 /**
  * Class for a warning.
- * @param {!Blockly.Block} block The block associated with this warning.
- * @extends {Blockly.Icon}
+ * @param {!Block} block The block associated with this warning.
+ * @extends {Icon}
  * @constructor
  */
 const Warning = function(block) {
@@ -39,7 +41,7 @@ const Warning = function(block) {
   // The text_ object can contain multiple warnings.
   this.text_ = Object.create(null);
 };
-Blockly.utils.object.inherits(Warning, Blockly.Icon);
+object.inherits(Warning, Icon);
 
 /**
  * Does this icon get hidden when the block is collapsed.
@@ -53,8 +55,8 @@ Warning.prototype.collapseHidden = false;
  */
 Warning.prototype.drawIcon_ = function(group) {
   // Triangle with rounded corners.
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
+  dom.createSvgElement(
+      Svg.PATH,
       {
         'class': 'blocklyIconShape',
         'd': 'M2,15Q-1,15 0.5,12L6.5,1.7Q8,-1 9.5,1.7L15.5,12Q17,15 14,15z'
@@ -63,16 +65,16 @@ Warning.prototype.drawIcon_ = function(group) {
   // Can't use a real '!' text character since different browsers and operating
   // systems render it differently.
   // Body of exclamation point.
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
+  dom.createSvgElement(
+      Svg.PATH,
       {
         'class': 'blocklyIconSymbol',
         'd': 'm7,4.8v3.16l0.27,2.27h1.46l0.27,-2.27v-3.16z'
       },
       group);
   // Dot of exclamation point.
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  dom.createSvgElement(
+      Svg.RECT,
       {
         'class': 'blocklyIconSymbol',
         'x': '7', 'y': '11', 'height': '2', 'width': '2'
@@ -88,7 +90,7 @@ Warning.prototype.setVisible = function(visible) {
   if (visible == this.isVisible()) {
     return;
   }
-  Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BUBBLE_OPEN))(
+  Events.fire(new (Events.get(Events.BUBBLE_OPEN))(
       this.block_, visible, 'warning'));
   if (visible) {
     this.createBubble_();
@@ -102,10 +104,10 @@ Warning.prototype.setVisible = function(visible) {
  * @private
  */
 Warning.prototype.createBubble_ = function() {
-  this.paragraphElement_ = Blockly.Bubble.textToDom(this.getText());
-  this.bubble_ = Blockly.Bubble.createNonEditableBubble(
-      this.paragraphElement_, /** @type {!Blockly.BlockSvg} */ (this.block_),
-      /** @type {!Blockly.utils.Coordinate} */ (this.iconXY_));
+  this.paragraphElement_ = Bubble.textToDom(this.getText());
+  this.bubble_ = Bubble.createNonEditableBubble(
+      this.paragraphElement_, /** @type {!BlockSvg} */ (this.block_),
+      /** @type {!Coordinate} */ (this.iconXY_));
   this.applyColour();
 };
 
@@ -158,7 +160,7 @@ Warning.prototype.getText = function() {
  */
 Warning.prototype.dispose = function() {
   this.block_.warning = null;
-  Blockly.Icon.prototype.dispose.call(this);
+  Icon.prototype.dispose.call(this);
 };
 
 exports = Warning;

From 8056bf04845a1c6666e6db8a3f02b4f2a762b291 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 13:59:56 -0700
Subject: [PATCH 367/833] clang-format core/warning.js

---
 core/warning.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/warning.js b/core/warning.js
index 90bc15b12..e08088e94 100644
--- a/core/warning.js
+++ b/core/warning.js
@@ -56,8 +56,7 @@ Warning.prototype.collapseHidden = false;
 Warning.prototype.drawIcon_ = function(group) {
   // Triangle with rounded corners.
   dom.createSvgElement(
-      Svg.PATH,
-      {
+      Svg.PATH, {
         'class': 'blocklyIconShape',
         'd': 'M2,15Q-1,15 0.5,12L6.5,1.7Q8,-1 9.5,1.7L15.5,12Q17,15 14,15z'
       },
@@ -66,18 +65,19 @@ Warning.prototype.drawIcon_ = function(group) {
   // systems render it differently.
   // Body of exclamation point.
   dom.createSvgElement(
-      Svg.PATH,
-      {
+      Svg.PATH, {
         'class': 'blocklyIconSymbol',
         'd': 'm7,4.8v3.16l0.27,2.27h1.46l0.27,-2.27v-3.16z'
       },
       group);
   // Dot of exclamation point.
   dom.createSvgElement(
-      Svg.RECT,
-      {
+      Svg.RECT, {
         'class': 'blocklyIconSymbol',
-        'x': '7', 'y': '11', 'height': '2', 'width': '2'
+        'x': '7',
+        'y': '11',
+        'height': '2',
+        'width': '2'
       },
       group);
 };
@@ -90,8 +90,8 @@ Warning.prototype.setVisible = function(visible) {
   if (visible == this.isVisible()) {
     return;
   }
-  Events.fire(new (Events.get(Events.BUBBLE_OPEN))(
-      this.block_, visible, 'warning'));
+  Events.fire(
+      new (Events.get(Events.BUBBLE_OPEN))(this.block_, visible, 'warning'));
   if (visible) {
     this.createBubble_();
   } else {

From 284d68be805dfc891d5f12d44abf73076098e70e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 15:17:11 -0700
Subject: [PATCH 368/833] Update syntax for for..in loop

---
 core/warning.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/warning.js b/core/warning.js
index e08088e94..6ed5d0c02 100644
--- a/core/warning.js
+++ b/core/warning.js
@@ -149,7 +149,7 @@ Warning.prototype.setText = function(text, id) {
  */
 Warning.prototype.getText = function() {
   const allWarnings = [];
-  for (let id in this.text_) {
+  for (const id in this.text_) {
     allWarnings.push(this.text_[id]);
   }
   return allWarnings.join('\n');

From e6bd6cabb18a312ae9c7ba35157d28576c5bc2b3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 20 Jul 2021 16:01:01 -0700
Subject: [PATCH 369/833] Migrate core/keyboard_nav/ast_node.js to ES6
 const/let

---
 core/keyboard_nav/ast_node.js | 156 ++++++++++++++++++----------------
 1 file changed, 85 insertions(+), 71 deletions(-)

diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index d86a22a4c..115ffe2a1 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -147,7 +147,7 @@ Blockly.ASTNode.createConnectionNode = function(connection) {
   if (!connection) {
     return null;
   }
-  var type = connection.type;
+  const type = connection.type;
   if (type == Blockly.connectionTypes.INPUT_VALUE) {
     return Blockly.ASTNode.createInputNode(connection.getParentInput());
   } else if (type == Blockly.connectionTypes.NEXT_STATEMENT &&
@@ -215,7 +215,7 @@ Blockly.ASTNode.createWorkspaceNode = function(workspace, wsCoordinate) {
   if (!wsCoordinate || !workspace) {
     return null;
   }
-  var params = {
+  const params = {
     wsCoordinate: wsCoordinate
   };
   return new Blockly.ASTNode(
@@ -230,8 +230,8 @@ Blockly.ASTNode.createWorkspaceNode = function(workspace, wsCoordinate) {
  *     block.
  */
 Blockly.ASTNode.createTopNode = function(block) {
-  var astNode;
-  var topConnection = block.previousConnection || block.outputConnection;
+  let astNode;
+  const topConnection = block.previousConnection || block.outputConnection;
   if (topConnection) {
     astNode = Blockly.ASTNode.createConnectionNode(topConnection);
   } else {
@@ -302,13 +302,15 @@ Blockly.ASTNode.prototype.isConnection = function() {
  * @private
  */
 Blockly.ASTNode.prototype.findNextForInput_ = function() {
-  var location = /** @type {!Blockly.Connection} */ (this.location_);
-  var parentInput = location.getParentInput();
-  var block = parentInput.getSourceBlock();
-  var curIdx = block.inputList.indexOf(parentInput);
-  for (var i = curIdx + 1, input; (input = block.inputList[i]); i++) {
-    var fieldRow = input.fieldRow;
-    for (var j = 0, field; (field = fieldRow[j]); j++) {
+  const location = /** @type {!Blockly.Connection} */ (this.location_);
+  const parentInput = location.getParentInput();
+  const block = parentInput.getSourceBlock();
+  const curIdx = block.inputList.indexOf(parentInput);
+  let i = curIdx + 1, input;
+  for (; (input = block.inputList[i]); i++) {
+    const fieldRow = input.fieldRow;
+    let j = 0, field;
+    for (; (field = fieldRow[j]); j++) {
       if (field.isClickable() || Blockly.ASTNode.NAVIGATE_ALL_FIELDS) {
         return Blockly.ASTNode.createFieldNode(field);
       }
@@ -329,13 +331,14 @@ Blockly.ASTNode.prototype.findNextForInput_ = function() {
  * @private
  */
 Blockly.ASTNode.prototype.findNextForField_ = function() {
-  var location = /** @type {!Blockly.Field} */ (this.location_);
-  var input = location.getParentInput();
-  var block = location.getSourceBlock();
-  var curIdx = block.inputList.indexOf(/** @type {!Blockly.Input} */ (input));
-  var fieldIdx = input.fieldRow.indexOf(location) + 1;
-  for (var i = curIdx, newInput; (newInput = block.inputList[i]); i++) {
-    var fieldRow = newInput.fieldRow;
+  const location = /** @type {!Blockly.Field} */ (this.location_);
+  const input = location.getParentInput();
+  const block = location.getSourceBlock();
+  const curIdx = block.inputList.indexOf(/** @type {!Blockly.Input} */ (input));
+  let fieldIdx = input.fieldRow.indexOf(location) + 1;
+  let i = curIdx, newInput;
+  for (; (newInput = block.inputList[i]); i++) {
+    const fieldRow = newInput.fieldRow;
     while (fieldIdx < fieldRow.length) {
       if (fieldRow[fieldIdx].isClickable() || Blockly.ASTNode.NAVIGATE_ALL_FIELDS) {
         return Blockly.ASTNode.createFieldNode(fieldRow[fieldIdx]);
@@ -359,16 +362,18 @@ Blockly.ASTNode.prototype.findNextForField_ = function() {
  * @private
  */
 Blockly.ASTNode.prototype.findPrevForInput_ = function() {
-  var location = /** @type {!Blockly.Connection} */ (this.location_);
-  var parentInput = location.getParentInput();
-  var block = parentInput.getSourceBlock();
-  var curIdx = block.inputList.indexOf(parentInput);
-  for (var i = curIdx, input; (input = block.inputList[i]); i--) {
+  const location = /** @type {!Blockly.Connection} */ (this.location_);
+  const parentInput = location.getParentInput();
+  const block = parentInput.getSourceBlock();
+  const curIdx = block.inputList.indexOf(parentInput);
+  let i = curIdx, input;
+  for (; (input = block.inputList[i]); i--) {
     if (input.connection && input !== parentInput) {
       return Blockly.ASTNode.createInputNode(input);
     }
-    var fieldRow = input.fieldRow;
-    for (var j = fieldRow.length - 1, field; (field = fieldRow[j]); j--) {
+    const fieldRow = input.fieldRow;
+    let j = fieldRow.length - 1, field;
+    for (; (field = fieldRow[j]); j--) {
       if (field.isClickable() || Blockly.ASTNode.NAVIGATE_ALL_FIELDS) {
         return Blockly.ASTNode.createFieldNode(field);
       }
@@ -384,17 +389,18 @@ Blockly.ASTNode.prototype.findPrevForInput_ = function() {
  * @private
  */
 Blockly.ASTNode.prototype.findPrevForField_ = function() {
-  var location = /** @type {!Blockly.Field} */ (this.location_);
-  var parentInput = location.getParentInput();
-  var block = location.getSourceBlock();
-  var curIdx = block.inputList.indexOf(
+  const location = /** @type {!Blockly.Field} */ (this.location_);
+  const parentInput = location.getParentInput();
+  const block = location.getSourceBlock();
+  const curIdx = block.inputList.indexOf(
       /** @type {!Blockly.Input} */ (parentInput));
-  var fieldIdx = parentInput.fieldRow.indexOf(location) - 1;
-  for (var i = curIdx, input; (input = block.inputList[i]); i--) {
+  let fieldIdx = parentInput.fieldRow.indexOf(location) - 1;
+  let i = curIdx, input;
+  for (; (input = block.inputList[i]); i--) {
     if (input.connection && input !== parentInput) {
       return Blockly.ASTNode.createInputNode(input);
     }
-    var fieldRow = input.fieldRow;
+    const fieldRow = input.fieldRow;
     while (fieldIdx > -1) {
       if (fieldRow[fieldIdx].isClickable() || Blockly.ASTNode.NAVIGATE_ALL_FIELDS) {
         return Blockly.ASTNode.createFieldNode(fieldRow[fieldIdx]);
@@ -425,12 +431,13 @@ Blockly.ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
   if (!curLocation || !curLocation.workspace) {
     return null;
   }
-  var curRoot = curLocation.getRootBlock();
-  var topBlocks = curRoot.workspace.getTopBlocks(true);
-  for (var i = 0, topBlock; (topBlock = topBlocks[i]); i++) {
+  const curRoot = curLocation.getRootBlock();
+  const topBlocks = curRoot.workspace.getTopBlocks(true);
+  let i = 0, topBlock;
+  for (; (topBlock = topBlocks[i]); i++) {
     if (curRoot.id == topBlock.id) {
-      var offset = forward ? 1 : -1;
-      var resultIndex = i + offset;
+      const offset = forward ? 1 : -1;
+      const resultIndex = i + offset;
       if (resultIndex == -1 || resultIndex == topBlocks.length) {
         return null;
       }
@@ -450,7 +457,7 @@ Blockly.ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
  * @private
  */
 Blockly.ASTNode.prototype.findTopASTNodeForBlock_ = function(block) {
-  var topConnection = block.previousConnection || block.outputConnection;
+  const topConnection = block.previousConnection || block.outputConnection;
   if (topConnection) {
     return /** @type {!Blockly.ASTNode} */ (Blockly.ASTNode.createConnectionNode(
         topConnection));
@@ -472,11 +479,12 @@ Blockly.ASTNode.prototype.getOutAstNodeForBlock_ = function(block) {
   if (!block) {
     return null;
   }
-  var topBlock;
+  let topBlock;
   // If the block doesn't have a previous connection then it is the top of the
   // substack.
   topBlock = block.getTopStackBlock();
-  var topConnection = topBlock.previousConnection || topBlock.outputConnection;
+  const topConnection =
+      topBlock.previousConnection || topBlock.outputConnection;
   // If the top connection has a parentInput, create an AST node pointing to
   // that input.
   if (topConnection && topConnection.targetConnection &&
@@ -497,10 +505,12 @@ Blockly.ASTNode.prototype.getOutAstNodeForBlock_ = function(block) {
  * @private
  */
 Blockly.ASTNode.prototype.findFirstFieldOrInput_ = function(block) {
-  var inputs = block.inputList;
-  for (var i = 0, input; (input = inputs[i]); i++) {
-    var fieldRow = input.fieldRow;
-    for (var j = 0, field; (field = fieldRow[j]); j++) {
+  const inputs = block.inputList;
+  let i = 0, input;
+  for (; (input = inputs[i]); i++) {
+    const fieldRow = input.fieldRow;
+    let j = 0, field;
+    for (; (field = fieldRow[j]); j++) {
       if (field.isClickable() || Blockly.ASTNode.NAVIGATE_ALL_FIELDS) {
         return Blockly.ASTNode.createFieldNode(field);
       }
@@ -536,12 +546,13 @@ Blockly.ASTNode.prototype.getSourceBlock = function() {
  *     block, or workspace. Or null if there is no node to the right.
  */
 Blockly.ASTNode.prototype.next = function() {
+  let connection, block, nextConnection, targetConnection;
   switch (this.type_) {
     case Blockly.ASTNode.types.STACK:
       return this.navigateBetweenStacks_(true);
 
     case Blockly.ASTNode.types.OUTPUT:
-      var connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Blockly.Connection} */ (this.location_);
       return Blockly.ASTNode.createBlockNode(connection.getSourceBlock());
 
     case Blockly.ASTNode.types.FIELD:
@@ -551,17 +562,17 @@ Blockly.ASTNode.prototype.next = function() {
       return this.findNextForInput_();
 
     case Blockly.ASTNode.types.BLOCK:
-      var block = /** @type {!Blockly.Block} */ (this.location_);
-      var nextConnection = block.nextConnection;
+      block = /** @type {!Blockly.Block} */ (this.location_);
+      nextConnection = block.nextConnection;
       return Blockly.ASTNode.createConnectionNode(nextConnection);
 
     case Blockly.ASTNode.types.PREVIOUS:
-      var connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Blockly.Connection} */ (this.location_);
       return Blockly.ASTNode.createBlockNode(connection.getSourceBlock());
 
     case Blockly.ASTNode.types.NEXT:
-      var connection = /** @type {!Blockly.Connection} */ (this.location_);
-      var targetConnection = connection.targetConnection;
+      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      targetConnection = connection.targetConnection;
       return Blockly.ASTNode.createConnectionNode(targetConnection);
   }
 
@@ -575,26 +586,27 @@ Blockly.ASTNode.prototype.next = function() {
  * workspace, or block. Or null if there is nothing below this node.
  */
 Blockly.ASTNode.prototype.in = function() {
+  let workspace, topBlocks, block, connection, targetConnection;
   switch (this.type_) {
     case Blockly.ASTNode.types.WORKSPACE:
-      var workspace = /** @type {!Blockly.Workspace} */ (this.location_);
-      var topBlocks = workspace.getTopBlocks(true);
+      workspace = /** @type {!Blockly.Workspace} */ (this.location_);
+      topBlocks = workspace.getTopBlocks(true);
       if (topBlocks.length > 0) {
         return Blockly.ASTNode.createStackNode(topBlocks[0]);
       }
       break;
 
     case Blockly.ASTNode.types.STACK:
-      var block = /** @type {!Blockly.Block} */ (this.location_);
+      block = /** @type {!Blockly.Block} */ (this.location_);
       return this.findTopASTNodeForBlock_(block);
 
     case Blockly.ASTNode.types.BLOCK:
-      var block = /** @type {!Blockly.Block} */ (this.location_);
+      block = /** @type {!Blockly.Block} */ (this.location_);
       return this.findFirstFieldOrInput_(block);
 
     case Blockly.ASTNode.types.INPUT:
-      var connection = /** @type {!Blockly.Connection} */ (this.location_);
-      var targetConnection = connection.targetConnection;
+      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      targetConnection = connection.targetConnection;
       return Blockly.ASTNode.createConnectionNode(targetConnection);
   }
 
@@ -608,6 +620,7 @@ Blockly.ASTNode.prototype.in = function() {
  * null.
  */
 Blockly.ASTNode.prototype.prev = function() {
+  let block, topConnection, connection, targetConnection;
   switch (this.type_) {
     case Blockly.ASTNode.types.STACK:
       return this.navigateBetweenStacks_(false);
@@ -622,20 +635,20 @@ Blockly.ASTNode.prototype.prev = function() {
       return this.findPrevForInput_();
 
     case Blockly.ASTNode.types.BLOCK:
-      var block = /** @type {!Blockly.Block} */ (this.location_);
-      var topConnection = block.previousConnection || block.outputConnection;
+      block = /** @type {!Blockly.Block} */ (this.location_);
+      topConnection = block.previousConnection || block.outputConnection;
       return Blockly.ASTNode.createConnectionNode(topConnection);
 
     case Blockly.ASTNode.types.PREVIOUS:
-      var connection = /** @type {!Blockly.Connection} */ (this.location_);
-      var targetConnection = connection.targetConnection;
+      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      targetConnection = connection.targetConnection;
       if (targetConnection && !targetConnection.getParentInput()) {
         return Blockly.ASTNode.createConnectionNode(targetConnection);
       }
       break;
 
     case Blockly.ASTNode.types.NEXT:
-      var connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Blockly.Connection} */ (this.location_);
       return Blockly.ASTNode.createBlockNode(connection.getSourceBlock());
   }
 
@@ -649,41 +662,42 @@ Blockly.ASTNode.prototype.prev = function() {
  *     workspace or block. Or null if we are at the workspace level.
  */
 Blockly.ASTNode.prototype.out = function() {
+  let block, blockPos, wsCoordinate, connection, target, field;
   switch (this.type_) {
     case Blockly.ASTNode.types.STACK:
-      var block = /** @type {!Blockly.Block} */ (this.location_);
-      var blockPos = block.getRelativeToSurfaceXY();
+      block = /** @type {!Blockly.Block} */ (this.location_);
+      blockPos = block.getRelativeToSurfaceXY();
       // TODO: Make sure this is in the bounds of the workspace.
-      var wsCoordinate = new Blockly.utils.Coordinate(
+      wsCoordinate = new Blockly.utils.Coordinate(
           blockPos.x, blockPos.y + Blockly.ASTNode.DEFAULT_OFFSET_Y);
       return Blockly.ASTNode.createWorkspaceNode(block.workspace, wsCoordinate);
 
     case Blockly.ASTNode.types.OUTPUT:
-      var connection = /** @type {!Blockly.Connection} */ (this.location_);
-      var target = connection.targetConnection;
+      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      target = connection.targetConnection;
       if (target) {
         return Blockly.ASTNode.createConnectionNode(target);
       }
       return Blockly.ASTNode.createStackNode(connection.getSourceBlock());
 
     case Blockly.ASTNode.types.FIELD:
-      var field = /** @type {!Blockly.Field} */ (this.location_);
+      field = /** @type {!Blockly.Field} */ (this.location_);
       return Blockly.ASTNode.createBlockNode(field.getSourceBlock());
 
     case Blockly.ASTNode.types.INPUT:
-      var connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Blockly.Connection} */ (this.location_);
       return Blockly.ASTNode.createBlockNode(connection.getSourceBlock());
 
     case Blockly.ASTNode.types.BLOCK:
-      var block = /** @type {!Blockly.Block} */ (this.location_);
+      block = /** @type {!Blockly.Block} */ (this.location_);
       return this.getOutAstNodeForBlock_(block);
 
     case Blockly.ASTNode.types.PREVIOUS:
-      var connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Blockly.Connection} */ (this.location_);
       return this.getOutAstNodeForBlock_(connection.getSourceBlock());
 
     case Blockly.ASTNode.types.NEXT:
-      var connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Blockly.Connection} */ (this.location_);
       return this.getOutAstNodeForBlock_(connection.getSourceBlock());
   }
 

From ec06ea6586f06ded38c27815bdc07722406f6819 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 20 Jul 2021 16:13:39 -0700
Subject: [PATCH 370/833] Migrate core/keyboard_nav/ast_node.js to goog.module

---
 core/keyboard_nav/ast_node.js | 279 +++++++++++++++++-----------------
 tests/deps.js                 |   2 +-
 2 files changed, 142 insertions(+), 139 deletions(-)

diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index 115ffe2a1..e0a75d0c0 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.ASTNode');
+goog.module('Blockly.ASTNode');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.connectionTypes');
 goog.require('Blockly.utils.Coordinate');
@@ -29,19 +30,19 @@ goog.requireType('Blockly.Workspace');
  * It is recommended that you use one of the createNode methods instead of
  * creating a node directly.
  * @param {string} type The type of the location.
- *     Must be in Blockly.ASTNode.types.
+ *     Must be in ASTNode.types.
  * @param {!Blockly.IASTNodeLocation} location The position in the AST.
- * @param {!Blockly.ASTNode.Params=} opt_params Optional dictionary of options.
+ * @param {!ASTNode.Params=} opt_params Optional dictionary of options.
  * @constructor
  */
-Blockly.ASTNode = function(type, location, opt_params) {
+const ASTNode = function(type, location, opt_params) {
   if (!location) {
     throw Error('Cannot create a node without a location.');
   }
 
   /**
    * The type of the location.
-   * One of Blockly.ASTNode.types
+   * One of ASTNode.types
    * @type {string}
    * @private
    */
@@ -52,7 +53,7 @@ Blockly.ASTNode = function(type, location, opt_params) {
    * @type {boolean}
    * @private
    */
-  this.isConnection_ = Blockly.ASTNode.isConnectionType_(type);
+  this.isConnection_ = ASTNode.isConnectionType_(type);
 
   /**
    * The location of the AST node.
@@ -76,13 +77,13 @@ Blockly.ASTNode = function(type, location, opt_params) {
  *     wsCoordinate: Blockly.utils.Coordinate
  * }}
  */
-Blockly.ASTNode.Params;
+ASTNode.Params;
 
 /**
  * Object holding different types for an AST node.
  * @enum {string}
  */
-Blockly.ASTNode.types = {
+ASTNode.types = {
   FIELD: 'field',
   BLOCK: 'block',
   INPUT: 'input',
@@ -97,7 +98,7 @@ Blockly.ASTNode.types = {
  * True to navigate to all fields. False to only navigate to clickable fields.
  * @type {boolean}
  */
-Blockly.ASTNode.NAVIGATE_ALL_FIELDS = false;
+ASTNode.NAVIGATE_ALL_FIELDS = false;
 
 /**
  * The default y offset to use when moving the cursor from a stack to the
@@ -105,20 +106,20 @@ Blockly.ASTNode.NAVIGATE_ALL_FIELDS = false;
  * @type {number}
  * @private
  */
-Blockly.ASTNode.DEFAULT_OFFSET_Y = -20;
+ASTNode.DEFAULT_OFFSET_Y = -20;
 
 /**
  * Whether an AST node of the given type points to a connection.
- * @param {string} type The type to check.  One of Blockly.ASTNode.types.
+ * @param {string} type The type to check.  One of ASTNode.types.
  * @return {boolean} True if a node of the given type points to a connection.
  * @private
  */
-Blockly.ASTNode.isConnectionType_ = function(type) {
+ASTNode.isConnectionType_ = function(type) {
   switch (type) {
-    case Blockly.ASTNode.types.PREVIOUS:
-    case Blockly.ASTNode.types.NEXT:
-    case Blockly.ASTNode.types.INPUT:
-    case Blockly.ASTNode.types.OUTPUT:
+    case ASTNode.types.PREVIOUS:
+    case ASTNode.types.NEXT:
+    case ASTNode.types.INPUT:
+    case ASTNode.types.OUTPUT:
       return true;
   }
   return false;
@@ -127,13 +128,13 @@ Blockly.ASTNode.isConnectionType_ = function(type) {
 /**
  * Create an AST node pointing to a field.
  * @param {Blockly.Field} field The location of the AST node.
- * @return {Blockly.ASTNode} An AST node pointing to a field.
+ * @return {ASTNode} An AST node pointing to a field.
  */
-Blockly.ASTNode.createFieldNode = function(field) {
+ASTNode.createFieldNode = function(field) {
   if (!field) {
     return null;
   }
-  return new Blockly.ASTNode(Blockly.ASTNode.types.FIELD, field);
+  return new ASTNode(ASTNode.types.FIELD, field);
 };
 
 /**
@@ -141,24 +142,24 @@ Blockly.ASTNode.createFieldNode = function(field) {
  * input then create an AST node of type input that will hold the connection.
  * @param {Blockly.Connection} connection This is the connection the node will
  *     point to.
- * @return {Blockly.ASTNode} An AST node pointing to a connection.
+ * @return {ASTNode} An AST node pointing to a connection.
  */
-Blockly.ASTNode.createConnectionNode = function(connection) {
+ASTNode.createConnectionNode = function(connection) {
   if (!connection) {
     return null;
   }
   const type = connection.type;
   if (type == Blockly.connectionTypes.INPUT_VALUE) {
-    return Blockly.ASTNode.createInputNode(connection.getParentInput());
+    return ASTNode.createInputNode(connection.getParentInput());
   } else if (type == Blockly.connectionTypes.NEXT_STATEMENT &&
       connection.getParentInput()) {
-    return Blockly.ASTNode.createInputNode(connection.getParentInput());
+    return ASTNode.createInputNode(connection.getParentInput());
   } else if (type == Blockly.connectionTypes.NEXT_STATEMENT) {
-    return new Blockly.ASTNode(Blockly.ASTNode.types.NEXT, connection);
+    return new ASTNode(ASTNode.types.NEXT, connection);
   } else if (type == Blockly.connectionTypes.OUTPUT_VALUE) {
-    return new Blockly.ASTNode(Blockly.ASTNode.types.OUTPUT, connection);
+    return new ASTNode(ASTNode.types.OUTPUT, connection);
   } else if (type == Blockly.connectionTypes.PREVIOUS_STATEMENT) {
-    return new Blockly.ASTNode(Blockly.ASTNode.types.PREVIOUS, connection);
+    return new ASTNode(ASTNode.types.PREVIOUS, connection);
   }
   return null;
 };
@@ -167,25 +168,25 @@ Blockly.ASTNode.createConnectionNode = function(connection) {
  * Creates an AST node pointing to an input. Stores the input connection as the
  *     location.
  * @param {Blockly.Input} input The input used to create an AST node.
- * @return {Blockly.ASTNode} An AST node pointing to a input.
+ * @return {ASTNode} An AST node pointing to a input.
  */
-Blockly.ASTNode.createInputNode = function(input) {
+ASTNode.createInputNode = function(input) {
   if (!input || !input.connection) {
     return null;
   }
-  return new Blockly.ASTNode(Blockly.ASTNode.types.INPUT, input.connection);
+  return new ASTNode(ASTNode.types.INPUT, input.connection);
 };
 
 /**
  * Creates an AST node pointing to a block.
  * @param {Blockly.Block} block The block used to create an AST node.
- * @return {Blockly.ASTNode} An AST node pointing to a block.
+ * @return {ASTNode} An AST node pointing to a block.
  */
-Blockly.ASTNode.createBlockNode = function(block) {
+ASTNode.createBlockNode = function(block) {
   if (!block) {
     return null;
   }
-  return new Blockly.ASTNode(Blockly.ASTNode.types.BLOCK, block);
+  return new ASTNode(ASTNode.types.BLOCK, block);
 };
 
 /**
@@ -193,14 +194,14 @@ Blockly.ASTNode.createBlockNode = function(block) {
  *     the set of all blocks connected to a top block, including the top block.
  * @param {Blockly.Block} topBlock A top block has no parent and can be found
  *     in the list returned by workspace.getTopBlocks().
- * @return {Blockly.ASTNode} An AST node of type stack that points to the top
+ * @return {ASTNode} An AST node of type stack that points to the top
  *     block on the stack.
  */
-Blockly.ASTNode.createStackNode = function(topBlock) {
+ASTNode.createStackNode = function(topBlock) {
   if (!topBlock) {
     return null;
   }
-  return new Blockly.ASTNode(Blockly.ASTNode.types.STACK, topBlock);
+  return new ASTNode(ASTNode.types.STACK, topBlock);
 };
 
 /**
@@ -208,44 +209,44 @@ Blockly.ASTNode.createStackNode = function(topBlock) {
  * @param {!Blockly.Workspace} workspace The workspace that we are on.
  * @param {Blockly.utils.Coordinate} wsCoordinate The position on the workspace
  *     for this node.
- * @return {Blockly.ASTNode} An AST node pointing to a workspace and a position
+ * @return {ASTNode} An AST node pointing to a workspace and a position
  *     on the workspace.
  */
-Blockly.ASTNode.createWorkspaceNode = function(workspace, wsCoordinate) {
+ASTNode.createWorkspaceNode = function(workspace, wsCoordinate) {
   if (!wsCoordinate || !workspace) {
     return null;
   }
   const params = {
     wsCoordinate: wsCoordinate
   };
-  return new Blockly.ASTNode(
-      Blockly.ASTNode.types.WORKSPACE, workspace, params);
+  return new ASTNode(
+      ASTNode.types.WORKSPACE, workspace, params);
 };
 
 /**
  * Creates an AST node for the top position on a block.
  * This is either an output connection, previous connection, or block.
  * @param {!Blockly.Block} block The block to find the top most AST node on.
- * @return {Blockly.ASTNode} The AST node holding the top most position on the
+ * @return {ASTNode} The AST node holding the top most position on the
  *     block.
  */
-Blockly.ASTNode.createTopNode = function(block) {
+ASTNode.createTopNode = function(block) {
   let astNode;
   const topConnection = block.previousConnection || block.outputConnection;
   if (topConnection) {
-    astNode = Blockly.ASTNode.createConnectionNode(topConnection);
+    astNode = ASTNode.createConnectionNode(topConnection);
   } else {
-    astNode = Blockly.ASTNode.createBlockNode(block);
+    astNode = ASTNode.createBlockNode(block);
   }
   return astNode;
 };
 
 /**
  * Parse the optional parameters.
- * @param {?Blockly.ASTNode.Params} params The user specified parameters.
+ * @param {?ASTNode.Params} params The user specified parameters.
  * @private
  */
-Blockly.ASTNode.prototype.processParams_ = function(params) {
+ASTNode.prototype.processParams_ = function(params) {
   if (!params) {
     return;
   }
@@ -261,16 +262,16 @@ Blockly.ASTNode.prototype.processParams_ = function(params) {
  * @return {!Blockly.IASTNodeLocation} The current field, connection, workspace, or
  *     block the cursor is on.
  */
-Blockly.ASTNode.prototype.getLocation = function() {
+ASTNode.prototype.getLocation = function() {
   return this.location_;
 };
 
 /**
  * The type of the current location.
- * One of Blockly.ASTNode.types
+ * One of ASTNode.types
  * @return {string} The type of the location.
  */
-Blockly.ASTNode.prototype.getType = function() {
+ASTNode.prototype.getType = function() {
   return this.type_;
 };
 
@@ -279,7 +280,7 @@ Blockly.ASTNode.prototype.getType = function() {
  * @return {Blockly.utils.Coordinate} The workspace coordinate or null if the
  *     location is not a workspace.
  */
-Blockly.ASTNode.prototype.getWsCoordinate = function() {
+ASTNode.prototype.getWsCoordinate = function() {
   return this.wsCoordinate_;
 };
 
@@ -288,7 +289,7 @@ Blockly.ASTNode.prototype.getWsCoordinate = function() {
  * @return {boolean} [description]
  * @package
  */
-Blockly.ASTNode.prototype.isConnection = function() {
+ASTNode.prototype.isConnection = function() {
   return this.isConnection_;
 };
 
@@ -296,12 +297,12 @@ Blockly.ASTNode.prototype.isConnection = function() {
  * Given an input find the next editable field or an input with a non null
  * connection in the same block. The current location must be an input
  * connection.
- * @return {Blockly.ASTNode} The AST node holding the next field or connection
+ * @return {ASTNode} The AST node holding the next field or connection
  *     or null if there is no editable field or input connection after the given
  *     input.
  * @private
  */
-Blockly.ASTNode.prototype.findNextForInput_ = function() {
+ASTNode.prototype.findNextForInput_ = function() {
   const location = /** @type {!Blockly.Connection} */ (this.location_);
   const parentInput = location.getParentInput();
   const block = parentInput.getSourceBlock();
@@ -311,12 +312,12 @@ Blockly.ASTNode.prototype.findNextForInput_ = function() {
     const fieldRow = input.fieldRow;
     let j = 0, field;
     for (; (field = fieldRow[j]); j++) {
-      if (field.isClickable() || Blockly.ASTNode.NAVIGATE_ALL_FIELDS) {
-        return Blockly.ASTNode.createFieldNode(field);
+      if (field.isClickable() || ASTNode.NAVIGATE_ALL_FIELDS) {
+        return ASTNode.createFieldNode(field);
       }
     }
     if (input.connection) {
-      return Blockly.ASTNode.createInputNode(input);
+      return ASTNode.createInputNode(input);
     }
   }
   return null;
@@ -325,12 +326,12 @@ Blockly.ASTNode.prototype.findNextForInput_ = function() {
 /**
  * Given a field find the next editable field or an input with a non null
  * connection in the same block. The current location must be a field.
- * @return {Blockly.ASTNode} The AST node pointing to the next field or
+ * @return {ASTNode} The AST node pointing to the next field or
  *     connection or null if there is no editable field or input connection
  *     after the given input.
  * @private
  */
-Blockly.ASTNode.prototype.findNextForField_ = function() {
+ASTNode.prototype.findNextForField_ = function() {
   const location = /** @type {!Blockly.Field} */ (this.location_);
   const input = location.getParentInput();
   const block = location.getSourceBlock();
@@ -340,14 +341,14 @@ Blockly.ASTNode.prototype.findNextForField_ = function() {
   for (; (newInput = block.inputList[i]); i++) {
     const fieldRow = newInput.fieldRow;
     while (fieldIdx < fieldRow.length) {
-      if (fieldRow[fieldIdx].isClickable() || Blockly.ASTNode.NAVIGATE_ALL_FIELDS) {
-        return Blockly.ASTNode.createFieldNode(fieldRow[fieldIdx]);
+      if (fieldRow[fieldIdx].isClickable() || ASTNode.NAVIGATE_ALL_FIELDS) {
+        return ASTNode.createFieldNode(fieldRow[fieldIdx]);
       }
       fieldIdx++;
     }
     fieldIdx = 0;
     if (newInput.connection) {
-      return Blockly.ASTNode.createInputNode(newInput);
+      return ASTNode.createInputNode(newInput);
     }
   }
   return null;
@@ -357,11 +358,11 @@ Blockly.ASTNode.prototype.findNextForField_ = function() {
  * Given an input find the previous editable field or an input with a non null
  * connection in the same block. The current location must be an input
  * connection.
- * @return {Blockly.ASTNode} The AST node holding the previous field or
+ * @return {ASTNode} The AST node holding the previous field or
  *     connection.
  * @private
  */
-Blockly.ASTNode.prototype.findPrevForInput_ = function() {
+ASTNode.prototype.findPrevForInput_ = function() {
   const location = /** @type {!Blockly.Connection} */ (this.location_);
   const parentInput = location.getParentInput();
   const block = parentInput.getSourceBlock();
@@ -369,13 +370,13 @@ Blockly.ASTNode.prototype.findPrevForInput_ = function() {
   let i = curIdx, input;
   for (; (input = block.inputList[i]); i--) {
     if (input.connection && input !== parentInput) {
-      return Blockly.ASTNode.createInputNode(input);
+      return ASTNode.createInputNode(input);
     }
     const fieldRow = input.fieldRow;
     let j = fieldRow.length - 1, field;
     for (; (field = fieldRow[j]); j--) {
-      if (field.isClickable() || Blockly.ASTNode.NAVIGATE_ALL_FIELDS) {
-        return Blockly.ASTNode.createFieldNode(field);
+      if (field.isClickable() || ASTNode.NAVIGATE_ALL_FIELDS) {
+        return ASTNode.createFieldNode(field);
       }
     }
   }
@@ -385,10 +386,10 @@ Blockly.ASTNode.prototype.findPrevForInput_ = function() {
 /**
  * Given a field find the previous editable field or an input with a non null
  * connection in the same block. The current location must be a field.
- * @return {Blockly.ASTNode} The AST node holding the previous input or field.
+ * @return {ASTNode} The AST node holding the previous input or field.
  * @private
  */
-Blockly.ASTNode.prototype.findPrevForField_ = function() {
+ASTNode.prototype.findPrevForField_ = function() {
   const location = /** @type {!Blockly.Field} */ (this.location_);
   const parentInput = location.getParentInput();
   const block = location.getSourceBlock();
@@ -398,12 +399,12 @@ Blockly.ASTNode.prototype.findPrevForField_ = function() {
   let i = curIdx, input;
   for (; (input = block.inputList[i]); i--) {
     if (input.connection && input !== parentInput) {
-      return Blockly.ASTNode.createInputNode(input);
+      return ASTNode.createInputNode(input);
     }
     const fieldRow = input.fieldRow;
     while (fieldIdx > -1) {
-      if (fieldRow[fieldIdx].isClickable() || Blockly.ASTNode.NAVIGATE_ALL_FIELDS) {
-        return Blockly.ASTNode.createFieldNode(fieldRow[fieldIdx]);
+      if (fieldRow[fieldIdx].isClickable() || ASTNode.NAVIGATE_ALL_FIELDS) {
+        return ASTNode.createFieldNode(fieldRow[fieldIdx]);
       }
       fieldIdx--;
     }
@@ -418,11 +419,11 @@ Blockly.ASTNode.prototype.findPrevForField_ = function() {
 /**
  * Navigate between stacks of blocks on the workspace.
  * @param {boolean} forward True to go forward. False to go backwards.
- * @return {Blockly.ASTNode} The first block of the next stack or null if there
+ * @return {ASTNode} The first block of the next stack or null if there
  * are no blocks on the workspace.
  * @private
  */
-Blockly.ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
+ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
   var curLocation = this.getLocation();
   if (curLocation.getSourceBlock) {
     curLocation = /** @type {!Blockly.IASTNodeLocationWithBlock} */ (
@@ -441,7 +442,7 @@ Blockly.ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
       if (resultIndex == -1 || resultIndex == topBlocks.length) {
         return null;
       }
-      return Blockly.ASTNode.createStackNode(topBlocks[resultIndex]);
+      return ASTNode.createStackNode(topBlocks[resultIndex]);
     }
   }
   throw Error('Couldn\'t find ' + (forward ? 'next' : 'previous') + ' stack?!');
@@ -453,16 +454,16 @@ Blockly.ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
  * on what kind of connections the block has.
  * @param {!Blockly.Block} block The block that we want to find the top
  *     connection on.
- * @return {!Blockly.ASTNode} The AST node containing the top connection.
+ * @return {!ASTNode} The AST node containing the top connection.
  * @private
  */
-Blockly.ASTNode.prototype.findTopASTNodeForBlock_ = function(block) {
+ASTNode.prototype.findTopASTNodeForBlock_ = function(block) {
   const topConnection = block.previousConnection || block.outputConnection;
   if (topConnection) {
-    return /** @type {!Blockly.ASTNode} */ (Blockly.ASTNode.createConnectionNode(
+    return /** @type {!ASTNode} */ (ASTNode.createConnectionNode(
         topConnection));
   } else {
-    return /** @type {!Blockly.ASTNode} */ (Blockly.ASTNode.createBlockNode(
+    return /** @type {!ASTNode} */ (ASTNode.createBlockNode(
         block));
   }
 };
@@ -471,11 +472,11 @@ Blockly.ASTNode.prototype.findTopASTNodeForBlock_ = function(block) {
  * Get the AST node pointing to the input that the block is nested under or if
  * the block is not nested then get the stack AST node.
  * @param {Blockly.Block} block The source block of the current location.
- * @return {Blockly.ASTNode} The AST node pointing to the input connection or
+ * @return {ASTNode} The AST node pointing to the input connection or
  *     the top block of the stack this block is in.
  * @private
  */
-Blockly.ASTNode.prototype.getOutAstNodeForBlock_ = function(block) {
+ASTNode.prototype.getOutAstNodeForBlock_ = function(block) {
   if (!block) {
     return null;
   }
@@ -489,34 +490,34 @@ Blockly.ASTNode.prototype.getOutAstNodeForBlock_ = function(block) {
   // that input.
   if (topConnection && topConnection.targetConnection &&
       topConnection.targetConnection.getParentInput()) {
-    return Blockly.ASTNode.createInputNode(
+    return ASTNode.createInputNode(
         topConnection.targetConnection.getParentInput());
   } else {
     // Go to stack level if you are not underneath an input.
-    return Blockly.ASTNode.createStackNode(topBlock);
+    return ASTNode.createStackNode(topBlock);
   }
 };
 
 /**
  * Find the first editable field or input with a connection on a given block.
  * @param {!Blockly.Block} block The source block of the current location.
- * @return {Blockly.ASTNode} An AST node pointing to the first field or input.
+ * @return {ASTNode} An AST node pointing to the first field or input.
  * Null if there are no editable fields or inputs with connections on the block.
  * @private
  */
-Blockly.ASTNode.prototype.findFirstFieldOrInput_ = function(block) {
+ASTNode.prototype.findFirstFieldOrInput_ = function(block) {
   const inputs = block.inputList;
   let i = 0, input;
   for (; (input = inputs[i]); i++) {
     const fieldRow = input.fieldRow;
     let j = 0, field;
     for (; (field = fieldRow[j]); j++) {
-      if (field.isClickable() || Blockly.ASTNode.NAVIGATE_ALL_FIELDS) {
-        return Blockly.ASTNode.createFieldNode(field);
+      if (field.isClickable() || ASTNode.NAVIGATE_ALL_FIELDS) {
+        return ASTNode.createFieldNode(field);
       }
     }
     if (input.connection) {
-      return Blockly.ASTNode.createInputNode(input);
+      return ASTNode.createInputNode(input);
     }
   }
   return null;
@@ -527,12 +528,12 @@ Blockly.ASTNode.prototype.findFirstFieldOrInput_ = function(block) {
  * @return {Blockly.Block} The source block of the location, or null if the node
  * is of type workspace.
  */
-Blockly.ASTNode.prototype.getSourceBlock = function() {
-  if (this.getType() === Blockly.ASTNode.types.BLOCK) {
+ASTNode.prototype.getSourceBlock = function() {
+  if (this.getType() === ASTNode.types.BLOCK) {
     return /** @type {Blockly.Block} */ (this.getLocation());
-  } else if (this.getType() === Blockly.ASTNode.types.STACK) {
+  } else if (this.getType() === ASTNode.types.STACK) {
     return /** @type {Blockly.Block} */ (this.getLocation());
-  } else if (this.getType() === Blockly.ASTNode.types.WORKSPACE) {
+  } else if (this.getType() === ASTNode.types.WORKSPACE) {
     return null;
   } else {
     return /** @type {Blockly.IASTNodeLocationWithBlock} */ (
@@ -542,38 +543,38 @@ Blockly.ASTNode.prototype.getSourceBlock = function() {
 
 /**
  * Find the element to the right of the current element in the AST.
- * @return {Blockly.ASTNode} An AST node that wraps the next field, connection,
+ * @return {ASTNode} An AST node that wraps the next field, connection,
  *     block, or workspace. Or null if there is no node to the right.
  */
-Blockly.ASTNode.prototype.next = function() {
+ASTNode.prototype.next = function() {
   let connection, block, nextConnection, targetConnection;
   switch (this.type_) {
-    case Blockly.ASTNode.types.STACK:
+    case ASTNode.types.STACK:
       return this.navigateBetweenStacks_(true);
 
-    case Blockly.ASTNode.types.OUTPUT:
+    case ASTNode.types.OUTPUT:
       connection = /** @type {!Blockly.Connection} */ (this.location_);
-      return Blockly.ASTNode.createBlockNode(connection.getSourceBlock());
+      return ASTNode.createBlockNode(connection.getSourceBlock());
 
-    case Blockly.ASTNode.types.FIELD:
+    case ASTNode.types.FIELD:
       return this.findNextForField_();
 
-    case Blockly.ASTNode.types.INPUT:
+    case ASTNode.types.INPUT:
       return this.findNextForInput_();
 
-    case Blockly.ASTNode.types.BLOCK:
+    case ASTNode.types.BLOCK:
       block = /** @type {!Blockly.Block} */ (this.location_);
       nextConnection = block.nextConnection;
-      return Blockly.ASTNode.createConnectionNode(nextConnection);
+      return ASTNode.createConnectionNode(nextConnection);
 
-    case Blockly.ASTNode.types.PREVIOUS:
+    case ASTNode.types.PREVIOUS:
       connection = /** @type {!Blockly.Connection} */ (this.location_);
-      return Blockly.ASTNode.createBlockNode(connection.getSourceBlock());
+      return ASTNode.createBlockNode(connection.getSourceBlock());
 
-    case Blockly.ASTNode.types.NEXT:
+    case ASTNode.types.NEXT:
       connection = /** @type {!Blockly.Connection} */ (this.location_);
       targetConnection = connection.targetConnection;
-      return Blockly.ASTNode.createConnectionNode(targetConnection);
+      return ASTNode.createConnectionNode(targetConnection);
   }
 
   return null;
@@ -582,32 +583,32 @@ Blockly.ASTNode.prototype.next = function() {
 /**
  * Find the element one level below and all the way to the left of the current
  * location.
- * @return {Blockly.ASTNode} An AST node that wraps the next field, connection,
+ * @return {ASTNode} An AST node that wraps the next field, connection,
  * workspace, or block. Or null if there is nothing below this node.
  */
-Blockly.ASTNode.prototype.in = function() {
+ASTNode.prototype.in = function() {
   let workspace, topBlocks, block, connection, targetConnection;
   switch (this.type_) {
-    case Blockly.ASTNode.types.WORKSPACE:
+    case ASTNode.types.WORKSPACE:
       workspace = /** @type {!Blockly.Workspace} */ (this.location_);
       topBlocks = workspace.getTopBlocks(true);
       if (topBlocks.length > 0) {
-        return Blockly.ASTNode.createStackNode(topBlocks[0]);
+        return ASTNode.createStackNode(topBlocks[0]);
       }
       break;
 
-    case Blockly.ASTNode.types.STACK:
+    case ASTNode.types.STACK:
       block = /** @type {!Blockly.Block} */ (this.location_);
       return this.findTopASTNodeForBlock_(block);
 
-    case Blockly.ASTNode.types.BLOCK:
+    case ASTNode.types.BLOCK:
       block = /** @type {!Blockly.Block} */ (this.location_);
       return this.findFirstFieldOrInput_(block);
 
-    case Blockly.ASTNode.types.INPUT:
+    case ASTNode.types.INPUT:
       connection = /** @type {!Blockly.Connection} */ (this.location_);
       targetConnection = connection.targetConnection;
-      return Blockly.ASTNode.createConnectionNode(targetConnection);
+      return ASTNode.createConnectionNode(targetConnection);
   }
 
   return null;
@@ -615,41 +616,41 @@ Blockly.ASTNode.prototype.in = function() {
 
 /**
  * Find the element to the left of the current element in the AST.
- * @return {Blockly.ASTNode} An AST node that wraps the previous field,
+ * @return {ASTNode} An AST node that wraps the previous field,
  * connection, workspace or block. Or null if no node exists to the left.
  * null.
  */
-Blockly.ASTNode.prototype.prev = function() {
+ASTNode.prototype.prev = function() {
   let block, topConnection, connection, targetConnection;
   switch (this.type_) {
-    case Blockly.ASTNode.types.STACK:
+    case ASTNode.types.STACK:
       return this.navigateBetweenStacks_(false);
 
-    case Blockly.ASTNode.types.OUTPUT:
+    case ASTNode.types.OUTPUT:
       return null;
 
-    case Blockly.ASTNode.types.FIELD:
+    case ASTNode.types.FIELD:
       return this.findPrevForField_();
 
-    case Blockly.ASTNode.types.INPUT:
+    case ASTNode.types.INPUT:
       return this.findPrevForInput_();
 
-    case Blockly.ASTNode.types.BLOCK:
+    case ASTNode.types.BLOCK:
       block = /** @type {!Blockly.Block} */ (this.location_);
       topConnection = block.previousConnection || block.outputConnection;
-      return Blockly.ASTNode.createConnectionNode(topConnection);
+      return ASTNode.createConnectionNode(topConnection);
 
-    case Blockly.ASTNode.types.PREVIOUS:
+    case ASTNode.types.PREVIOUS:
       connection = /** @type {!Blockly.Connection} */ (this.location_);
       targetConnection = connection.targetConnection;
       if (targetConnection && !targetConnection.getParentInput()) {
-        return Blockly.ASTNode.createConnectionNode(targetConnection);
+        return ASTNode.createConnectionNode(targetConnection);
       }
       break;
 
-    case Blockly.ASTNode.types.NEXT:
+    case ASTNode.types.NEXT:
       connection = /** @type {!Blockly.Connection} */ (this.location_);
-      return Blockly.ASTNode.createBlockNode(connection.getSourceBlock());
+      return ASTNode.createBlockNode(connection.getSourceBlock());
   }
 
   return null;
@@ -658,48 +659,50 @@ Blockly.ASTNode.prototype.prev = function() {
 /**
  * Find the next element that is one position above and all the way to the left
  * of the current location.
- * @return {Blockly.ASTNode} An AST node that wraps the next field, connection,
+ * @return {ASTNode} An AST node that wraps the next field, connection,
  *     workspace or block. Or null if we are at the workspace level.
  */
-Blockly.ASTNode.prototype.out = function() {
+ASTNode.prototype.out = function() {
   let block, blockPos, wsCoordinate, connection, target, field;
   switch (this.type_) {
-    case Blockly.ASTNode.types.STACK:
+    case ASTNode.types.STACK:
       block = /** @type {!Blockly.Block} */ (this.location_);
       blockPos = block.getRelativeToSurfaceXY();
       // TODO: Make sure this is in the bounds of the workspace.
       wsCoordinate = new Blockly.utils.Coordinate(
-          blockPos.x, blockPos.y + Blockly.ASTNode.DEFAULT_OFFSET_Y);
-      return Blockly.ASTNode.createWorkspaceNode(block.workspace, wsCoordinate);
+          blockPos.x, blockPos.y + ASTNode.DEFAULT_OFFSET_Y);
+      return ASTNode.createWorkspaceNode(block.workspace, wsCoordinate);
 
-    case Blockly.ASTNode.types.OUTPUT:
+    case ASTNode.types.OUTPUT:
       connection = /** @type {!Blockly.Connection} */ (this.location_);
       target = connection.targetConnection;
       if (target) {
-        return Blockly.ASTNode.createConnectionNode(target);
+        return ASTNode.createConnectionNode(target);
       }
-      return Blockly.ASTNode.createStackNode(connection.getSourceBlock());
+      return ASTNode.createStackNode(connection.getSourceBlock());
 
-    case Blockly.ASTNode.types.FIELD:
+    case ASTNode.types.FIELD:
       field = /** @type {!Blockly.Field} */ (this.location_);
-      return Blockly.ASTNode.createBlockNode(field.getSourceBlock());
+      return ASTNode.createBlockNode(field.getSourceBlock());
 
-    case Blockly.ASTNode.types.INPUT:
+    case ASTNode.types.INPUT:
       connection = /** @type {!Blockly.Connection} */ (this.location_);
-      return Blockly.ASTNode.createBlockNode(connection.getSourceBlock());
+      return ASTNode.createBlockNode(connection.getSourceBlock());
 
-    case Blockly.ASTNode.types.BLOCK:
+    case ASTNode.types.BLOCK:
       block = /** @type {!Blockly.Block} */ (this.location_);
       return this.getOutAstNodeForBlock_(block);
 
-    case Blockly.ASTNode.types.PREVIOUS:
+    case ASTNode.types.PREVIOUS:
       connection = /** @type {!Blockly.Connection} */ (this.location_);
       return this.getOutAstNodeForBlock_(connection.getSourceBlock());
 
-    case Blockly.ASTNode.types.NEXT:
+    case ASTNode.types.NEXT:
       connection = /** @type {!Blockly.Connection} */ (this.location_);
       return this.getOutAstNodeForBlock_(connection.getSourceBlock());
   }
 
   return null;
 };
+
+exports = ASTNode;
diff --git a/tests/deps.js b/tests/deps.js
index c6ccc9bb8..957896ec3 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -102,7 +102,7 @@ goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'
 goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], ['Blockly.IRegistrable'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.IToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstants'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.utils.Coordinate'], {'lang': 'es5'});
+goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], ['Blockly.ASTNode']);

From e79faf4147255a29982e12b95d3d6bb3bfc36939 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 21 Jul 2021 17:16:02 -0700
Subject: [PATCH 371/833] Migrate core/keyboard_nav/ast_node.js named requires

---
 core/keyboard_nav/ast_node.js | 123 +++++++++++++++++-----------------
 1 file changed, 61 insertions(+), 62 deletions(-)

diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index e0a75d0c0..09a63b3a2 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -13,16 +13,15 @@
 goog.module('Blockly.ASTNode');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.connectionTypes');
-goog.require('Blockly.utils.Coordinate');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.Connection');
-goog.requireType('Blockly.Field');
-goog.requireType('Blockly.IASTNodeLocation');
-goog.requireType('Blockly.IASTNodeLocationWithBlock');
-goog.requireType('Blockly.Input');
-goog.requireType('Blockly.Workspace');
+const Block = goog.requireType('Blockly.Block');
+const Connection = goog.requireType('Blockly.Connection');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Field = goog.requireType('Blockly.Field');
+const IASTNodeLocation = goog.requireType('Blockly.IASTNodeLocation');
+const IASTNodeLocationWithBlock = goog.requireType('Blockly.IASTNodeLocationWithBlock');
+const Input = goog.requireType('Blockly.Input');
+const Workspace = goog.requireType('Blockly.Workspace');
+const connectionTypes = goog.require('Blockly.connectionTypes');
 
 
 /**
@@ -31,7 +30,7 @@ goog.requireType('Blockly.Workspace');
  * creating a node directly.
  * @param {string} type The type of the location.
  *     Must be in ASTNode.types.
- * @param {!Blockly.IASTNodeLocation} location The position in the AST.
+ * @param {!IASTNodeLocation} location The position in the AST.
  * @param {!ASTNode.Params=} opt_params Optional dictionary of options.
  * @constructor
  */
@@ -57,14 +56,14 @@ const ASTNode = function(type, location, opt_params) {
 
   /**
    * The location of the AST node.
-   * @type {!Blockly.IASTNodeLocation}
+   * @type {!IASTNodeLocation}
    * @private
    */
   this.location_ = location;
 
   /**
    * The coordinate on the workspace.
-   * @type {Blockly.utils.Coordinate}
+   * @type {Coordinate}
    * @private
    */
   this.wsCoordinate_ = null;
@@ -74,7 +73,7 @@ const ASTNode = function(type, location, opt_params) {
 
 /**
  * @typedef {{
- *     wsCoordinate: Blockly.utils.Coordinate
+ *     wsCoordinate: Coordinate
  * }}
  */
 ASTNode.Params;
@@ -127,7 +126,7 @@ ASTNode.isConnectionType_ = function(type) {
 
 /**
  * Create an AST node pointing to a field.
- * @param {Blockly.Field} field The location of the AST node.
+ * @param {Field} field The location of the AST node.
  * @return {ASTNode} An AST node pointing to a field.
  */
 ASTNode.createFieldNode = function(field) {
@@ -140,7 +139,7 @@ ASTNode.createFieldNode = function(field) {
 /**
  * Creates an AST node pointing to a connection. If the connection has a parent
  * input then create an AST node of type input that will hold the connection.
- * @param {Blockly.Connection} connection This is the connection the node will
+ * @param {Connection} connection This is the connection the node will
  *     point to.
  * @return {ASTNode} An AST node pointing to a connection.
  */
@@ -149,16 +148,16 @@ ASTNode.createConnectionNode = function(connection) {
     return null;
   }
   const type = connection.type;
-  if (type == Blockly.connectionTypes.INPUT_VALUE) {
+  if (type == connectionTypes.INPUT_VALUE) {
     return ASTNode.createInputNode(connection.getParentInput());
-  } else if (type == Blockly.connectionTypes.NEXT_STATEMENT &&
+  } else if (type == connectionTypes.NEXT_STATEMENT &&
       connection.getParentInput()) {
     return ASTNode.createInputNode(connection.getParentInput());
-  } else if (type == Blockly.connectionTypes.NEXT_STATEMENT) {
+  } else if (type == connectionTypes.NEXT_STATEMENT) {
     return new ASTNode(ASTNode.types.NEXT, connection);
-  } else if (type == Blockly.connectionTypes.OUTPUT_VALUE) {
+  } else if (type == connectionTypes.OUTPUT_VALUE) {
     return new ASTNode(ASTNode.types.OUTPUT, connection);
-  } else if (type == Blockly.connectionTypes.PREVIOUS_STATEMENT) {
+  } else if (type == connectionTypes.PREVIOUS_STATEMENT) {
     return new ASTNode(ASTNode.types.PREVIOUS, connection);
   }
   return null;
@@ -167,7 +166,7 @@ ASTNode.createConnectionNode = function(connection) {
 /**
  * Creates an AST node pointing to an input. Stores the input connection as the
  *     location.
- * @param {Blockly.Input} input The input used to create an AST node.
+ * @param {Input} input The input used to create an AST node.
  * @return {ASTNode} An AST node pointing to a input.
  */
 ASTNode.createInputNode = function(input) {
@@ -179,7 +178,7 @@ ASTNode.createInputNode = function(input) {
 
 /**
  * Creates an AST node pointing to a block.
- * @param {Blockly.Block} block The block used to create an AST node.
+ * @param {Block} block The block used to create an AST node.
  * @return {ASTNode} An AST node pointing to a block.
  */
 ASTNode.createBlockNode = function(block) {
@@ -192,7 +191,7 @@ ASTNode.createBlockNode = function(block) {
 /**
  * Create an AST node of type stack. A stack, represented by its top block, is
  *     the set of all blocks connected to a top block, including the top block.
- * @param {Blockly.Block} topBlock A top block has no parent and can be found
+ * @param {Block} topBlock A top block has no parent and can be found
  *     in the list returned by workspace.getTopBlocks().
  * @return {ASTNode} An AST node of type stack that points to the top
  *     block on the stack.
@@ -206,8 +205,8 @@ ASTNode.createStackNode = function(topBlock) {
 
 /**
  * Creates an AST node pointing to a workspace.
- * @param {!Blockly.Workspace} workspace The workspace that we are on.
- * @param {Blockly.utils.Coordinate} wsCoordinate The position on the workspace
+ * @param {!Workspace} workspace The workspace that we are on.
+ * @param {Coordinate} wsCoordinate The position on the workspace
  *     for this node.
  * @return {ASTNode} An AST node pointing to a workspace and a position
  *     on the workspace.
@@ -226,7 +225,7 @@ ASTNode.createWorkspaceNode = function(workspace, wsCoordinate) {
 /**
  * Creates an AST node for the top position on a block.
  * This is either an output connection, previous connection, or block.
- * @param {!Blockly.Block} block The block to find the top most AST node on.
+ * @param {!Block} block The block to find the top most AST node on.
  * @return {ASTNode} The AST node holding the top most position on the
  *     block.
  */
@@ -259,7 +258,7 @@ ASTNode.prototype.processParams_ = function(params) {
  * Gets the value pointed to by this node.
  * It is the callers responsibility to check the node type to figure out what
  * type of object they get back from this.
- * @return {!Blockly.IASTNodeLocation} The current field, connection, workspace, or
+ * @return {!IASTNodeLocation} The current field, connection, workspace, or
  *     block the cursor is on.
  */
 ASTNode.prototype.getLocation = function() {
@@ -277,7 +276,7 @@ ASTNode.prototype.getType = function() {
 
 /**
  * The coordinate on the workspace.
- * @return {Blockly.utils.Coordinate} The workspace coordinate or null if the
+ * @return {Coordinate} The workspace coordinate or null if the
  *     location is not a workspace.
  */
 ASTNode.prototype.getWsCoordinate = function() {
@@ -303,7 +302,7 @@ ASTNode.prototype.isConnection = function() {
  * @private
  */
 ASTNode.prototype.findNextForInput_ = function() {
-  const location = /** @type {!Blockly.Connection} */ (this.location_);
+  const location = /** @type {!Connection} */ (this.location_);
   const parentInput = location.getParentInput();
   const block = parentInput.getSourceBlock();
   const curIdx = block.inputList.indexOf(parentInput);
@@ -332,10 +331,10 @@ ASTNode.prototype.findNextForInput_ = function() {
  * @private
  */
 ASTNode.prototype.findNextForField_ = function() {
-  const location = /** @type {!Blockly.Field} */ (this.location_);
+  const location = /** @type {!Field} */ (this.location_);
   const input = location.getParentInput();
   const block = location.getSourceBlock();
-  const curIdx = block.inputList.indexOf(/** @type {!Blockly.Input} */ (input));
+  const curIdx = block.inputList.indexOf(/** @type {!Input} */ (input));
   let fieldIdx = input.fieldRow.indexOf(location) + 1;
   let i = curIdx, newInput;
   for (; (newInput = block.inputList[i]); i++) {
@@ -363,7 +362,7 @@ ASTNode.prototype.findNextForField_ = function() {
  * @private
  */
 ASTNode.prototype.findPrevForInput_ = function() {
-  const location = /** @type {!Blockly.Connection} */ (this.location_);
+  const location = /** @type {!Connection} */ (this.location_);
   const parentInput = location.getParentInput();
   const block = parentInput.getSourceBlock();
   const curIdx = block.inputList.indexOf(parentInput);
@@ -390,11 +389,11 @@ ASTNode.prototype.findPrevForInput_ = function() {
  * @private
  */
 ASTNode.prototype.findPrevForField_ = function() {
-  const location = /** @type {!Blockly.Field} */ (this.location_);
+  const location = /** @type {!Field} */ (this.location_);
   const parentInput = location.getParentInput();
   const block = location.getSourceBlock();
   const curIdx = block.inputList.indexOf(
-      /** @type {!Blockly.Input} */ (parentInput));
+      /** @type {!Input} */ (parentInput));
   let fieldIdx = parentInput.fieldRow.indexOf(location) - 1;
   let i = curIdx, input;
   for (; (input = block.inputList[i]); i--) {
@@ -426,7 +425,7 @@ ASTNode.prototype.findPrevForField_ = function() {
 ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
   var curLocation = this.getLocation();
   if (curLocation.getSourceBlock) {
-    curLocation = /** @type {!Blockly.IASTNodeLocationWithBlock} */ (
+    curLocation = /** @type {!IASTNodeLocationWithBlock} */ (
       curLocation).getSourceBlock();
   }
   if (!curLocation || !curLocation.workspace) {
@@ -452,7 +451,7 @@ ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
  * Finds the top most AST node for a given block.
  * This is either the previous connection, output connection or block depending
  * on what kind of connections the block has.
- * @param {!Blockly.Block} block The block that we want to find the top
+ * @param {!Block} block The block that we want to find the top
  *     connection on.
  * @return {!ASTNode} The AST node containing the top connection.
  * @private
@@ -471,7 +470,7 @@ ASTNode.prototype.findTopASTNodeForBlock_ = function(block) {
 /**
  * Get the AST node pointing to the input that the block is nested under or if
  * the block is not nested then get the stack AST node.
- * @param {Blockly.Block} block The source block of the current location.
+ * @param {Block} block The source block of the current location.
  * @return {ASTNode} The AST node pointing to the input connection or
  *     the top block of the stack this block is in.
  * @private
@@ -500,7 +499,7 @@ ASTNode.prototype.getOutAstNodeForBlock_ = function(block) {
 
 /**
  * Find the first editable field or input with a connection on a given block.
- * @param {!Blockly.Block} block The source block of the current location.
+ * @param {!Block} block The source block of the current location.
  * @return {ASTNode} An AST node pointing to the first field or input.
  * Null if there are no editable fields or inputs with connections on the block.
  * @private
@@ -525,18 +524,18 @@ ASTNode.prototype.findFirstFieldOrInput_ = function(block) {
 
 /**
  * Finds the source block of the location of this node.
- * @return {Blockly.Block} The source block of the location, or null if the node
+ * @return {Block} The source block of the location, or null if the node
  * is of type workspace.
  */
 ASTNode.prototype.getSourceBlock = function() {
   if (this.getType() === ASTNode.types.BLOCK) {
-    return /** @type {Blockly.Block} */ (this.getLocation());
+    return /** @type {Block} */ (this.getLocation());
   } else if (this.getType() === ASTNode.types.STACK) {
-    return /** @type {Blockly.Block} */ (this.getLocation());
+    return /** @type {Block} */ (this.getLocation());
   } else if (this.getType() === ASTNode.types.WORKSPACE) {
     return null;
   } else {
-    return /** @type {Blockly.IASTNodeLocationWithBlock} */ (
+    return /** @type {IASTNodeLocationWithBlock} */ (
       this.getLocation()).getSourceBlock();
   }
 };
@@ -553,7 +552,7 @@ ASTNode.prototype.next = function() {
       return this.navigateBetweenStacks_(true);
 
     case ASTNode.types.OUTPUT:
-      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Connection} */ (this.location_);
       return ASTNode.createBlockNode(connection.getSourceBlock());
 
     case ASTNode.types.FIELD:
@@ -563,16 +562,16 @@ ASTNode.prototype.next = function() {
       return this.findNextForInput_();
 
     case ASTNode.types.BLOCK:
-      block = /** @type {!Blockly.Block} */ (this.location_);
+      block = /** @type {!Block} */ (this.location_);
       nextConnection = block.nextConnection;
       return ASTNode.createConnectionNode(nextConnection);
 
     case ASTNode.types.PREVIOUS:
-      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Connection} */ (this.location_);
       return ASTNode.createBlockNode(connection.getSourceBlock());
 
     case ASTNode.types.NEXT:
-      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Connection} */ (this.location_);
       targetConnection = connection.targetConnection;
       return ASTNode.createConnectionNode(targetConnection);
   }
@@ -590,7 +589,7 @@ ASTNode.prototype.in = function() {
   let workspace, topBlocks, block, connection, targetConnection;
   switch (this.type_) {
     case ASTNode.types.WORKSPACE:
-      workspace = /** @type {!Blockly.Workspace} */ (this.location_);
+      workspace = /** @type {!Workspace} */ (this.location_);
       topBlocks = workspace.getTopBlocks(true);
       if (topBlocks.length > 0) {
         return ASTNode.createStackNode(topBlocks[0]);
@@ -598,15 +597,15 @@ ASTNode.prototype.in = function() {
       break;
 
     case ASTNode.types.STACK:
-      block = /** @type {!Blockly.Block} */ (this.location_);
+      block = /** @type {!Block} */ (this.location_);
       return this.findTopASTNodeForBlock_(block);
 
     case ASTNode.types.BLOCK:
-      block = /** @type {!Blockly.Block} */ (this.location_);
+      block = /** @type {!Block} */ (this.location_);
       return this.findFirstFieldOrInput_(block);
 
     case ASTNode.types.INPUT:
-      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Connection} */ (this.location_);
       targetConnection = connection.targetConnection;
       return ASTNode.createConnectionNode(targetConnection);
   }
@@ -636,12 +635,12 @@ ASTNode.prototype.prev = function() {
       return this.findPrevForInput_();
 
     case ASTNode.types.BLOCK:
-      block = /** @type {!Blockly.Block} */ (this.location_);
+      block = /** @type {!Block} */ (this.location_);
       topConnection = block.previousConnection || block.outputConnection;
       return ASTNode.createConnectionNode(topConnection);
 
     case ASTNode.types.PREVIOUS:
-      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Connection} */ (this.location_);
       targetConnection = connection.targetConnection;
       if (targetConnection && !targetConnection.getParentInput()) {
         return ASTNode.createConnectionNode(targetConnection);
@@ -649,7 +648,7 @@ ASTNode.prototype.prev = function() {
       break;
 
     case ASTNode.types.NEXT:
-      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Connection} */ (this.location_);
       return ASTNode.createBlockNode(connection.getSourceBlock());
   }
 
@@ -666,15 +665,15 @@ ASTNode.prototype.out = function() {
   let block, blockPos, wsCoordinate, connection, target, field;
   switch (this.type_) {
     case ASTNode.types.STACK:
-      block = /** @type {!Blockly.Block} */ (this.location_);
+      block = /** @type {!Block} */ (this.location_);
       blockPos = block.getRelativeToSurfaceXY();
       // TODO: Make sure this is in the bounds of the workspace.
-      wsCoordinate = new Blockly.utils.Coordinate(
+      wsCoordinate = new Coordinate(
           blockPos.x, blockPos.y + ASTNode.DEFAULT_OFFSET_Y);
       return ASTNode.createWorkspaceNode(block.workspace, wsCoordinate);
 
     case ASTNode.types.OUTPUT:
-      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Connection} */ (this.location_);
       target = connection.targetConnection;
       if (target) {
         return ASTNode.createConnectionNode(target);
@@ -682,23 +681,23 @@ ASTNode.prototype.out = function() {
       return ASTNode.createStackNode(connection.getSourceBlock());
 
     case ASTNode.types.FIELD:
-      field = /** @type {!Blockly.Field} */ (this.location_);
+      field = /** @type {!Field} */ (this.location_);
       return ASTNode.createBlockNode(field.getSourceBlock());
 
     case ASTNode.types.INPUT:
-      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Connection} */ (this.location_);
       return ASTNode.createBlockNode(connection.getSourceBlock());
 
     case ASTNode.types.BLOCK:
-      block = /** @type {!Blockly.Block} */ (this.location_);
+      block = /** @type {!Block} */ (this.location_);
       return this.getOutAstNodeForBlock_(block);
 
     case ASTNode.types.PREVIOUS:
-      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Connection} */ (this.location_);
       return this.getOutAstNodeForBlock_(connection.getSourceBlock());
 
     case ASTNode.types.NEXT:
-      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Connection} */ (this.location_);
       return this.getOutAstNodeForBlock_(connection.getSourceBlock());
   }
 

From c19ce37a4accf24f1f044691bcf68af1d19c1938 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 22 Jul 2021 10:29:05 -0700
Subject: [PATCH 372/833] clang-format core/keyboard_nav/ast_node.js

---
 core/keyboard_nav/ast_node.js | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index 09a63b3a2..0c349bbd0 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -150,8 +150,8 @@ ASTNode.createConnectionNode = function(connection) {
   const type = connection.type;
   if (type == connectionTypes.INPUT_VALUE) {
     return ASTNode.createInputNode(connection.getParentInput());
-  } else if (type == connectionTypes.NEXT_STATEMENT &&
-      connection.getParentInput()) {
+  } else if (
+      type == connectionTypes.NEXT_STATEMENT && connection.getParentInput()) {
     return ASTNode.createInputNode(connection.getParentInput());
   } else if (type == connectionTypes.NEXT_STATEMENT) {
     return new ASTNode(ASTNode.types.NEXT, connection);
@@ -215,11 +215,8 @@ ASTNode.createWorkspaceNode = function(workspace, wsCoordinate) {
   if (!wsCoordinate || !workspace) {
     return null;
   }
-  const params = {
-    wsCoordinate: wsCoordinate
-  };
-  return new ASTNode(
-      ASTNode.types.WORKSPACE, workspace, params);
+  const params = {wsCoordinate: wsCoordinate};
+  return new ASTNode(ASTNode.types.WORKSPACE, workspace, params);
 };
 
 /**
@@ -425,8 +422,8 @@ ASTNode.prototype.findPrevForField_ = function() {
 ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
   var curLocation = this.getLocation();
   if (curLocation.getSourceBlock) {
-    curLocation = /** @type {!IASTNodeLocationWithBlock} */ (
-      curLocation).getSourceBlock();
+    curLocation = /** @type {!IASTNodeLocationWithBlock} */ (curLocation)
+                      .getSourceBlock();
   }
   if (!curLocation || !curLocation.workspace) {
     return null;
@@ -459,11 +456,10 @@ ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
 ASTNode.prototype.findTopASTNodeForBlock_ = function(block) {
   const topConnection = block.previousConnection || block.outputConnection;
   if (topConnection) {
-    return /** @type {!ASTNode} */ (ASTNode.createConnectionNode(
-        topConnection));
+    return /** @type {!ASTNode} */ (
+        ASTNode.createConnectionNode(topConnection));
   } else {
-    return /** @type {!ASTNode} */ (ASTNode.createBlockNode(
-        block));
+    return /** @type {!ASTNode} */ (ASTNode.createBlockNode(block));
   }
 };
 
@@ -535,8 +531,8 @@ ASTNode.prototype.getSourceBlock = function() {
   } else if (this.getType() === ASTNode.types.WORKSPACE) {
     return null;
   } else {
-    return /** @type {IASTNodeLocationWithBlock} */ (
-      this.getLocation()).getSourceBlock();
+    return /** @type {IASTNodeLocationWithBlock} */ (this.getLocation())
+        .getSourceBlock();
   }
 };
 
@@ -668,8 +664,8 @@ ASTNode.prototype.out = function() {
       block = /** @type {!Block} */ (this.location_);
       blockPos = block.getRelativeToSurfaceXY();
       // TODO: Make sure this is in the bounds of the workspace.
-      wsCoordinate = new Coordinate(
-          blockPos.x, blockPos.y + ASTNode.DEFAULT_OFFSET_Y);
+      wsCoordinate =
+          new Coordinate(blockPos.x, blockPos.y + ASTNode.DEFAULT_OFFSET_Y);
       return ASTNode.createWorkspaceNode(block.workspace, wsCoordinate);
 
     case ASTNode.types.OUTPUT:

From 02f1055c445fb3db78a1dd30695dc2802f94c523 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 23 Jul 2021 19:05:24 -0700
Subject: [PATCH 373/833] Add eslint disable lines to
 core/keyboard_nav/ast_node.js

---
 core/keyboard_nav/ast_node.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index 0c349bbd0..c1323099f 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -13,13 +13,20 @@
 goog.module('Blockly.ASTNode');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const Block = goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
 const Connection = goog.requireType('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.requireType('Blockly.IASTNodeLocation');
+/* eslint-disable-next-line no-unused-vars */
 const IASTNodeLocationWithBlock = goog.requireType('Blockly.IASTNodeLocationWithBlock');
+/* eslint-disable-next-line no-unused-vars */
 const Input = goog.requireType('Blockly.Input');
+/* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
 const connectionTypes = goog.require('Blockly.connectionTypes');
 

From d9edeca432351250bf2077c4b2ffd8ba3b91eba6 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 23 Jul 2021 19:19:13 -0700
Subject: [PATCH 374/833] Update for loop syntax in
 core/keyboard_nav/ast_node.js

---
 core/keyboard_nav/ast_node.js | 36 +++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index c1323099f..11405bc22 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -310,11 +310,11 @@ ASTNode.prototype.findNextForInput_ = function() {
   const parentInput = location.getParentInput();
   const block = parentInput.getSourceBlock();
   const curIdx = block.inputList.indexOf(parentInput);
-  let i = curIdx + 1, input;
-  for (; (input = block.inputList[i]); i++) {
+  for (let i = curIdx + 1; i < block.inputList.length; i++) {
+    const input = block.inputList[i];
     const fieldRow = input.fieldRow;
-    let j = 0, field;
-    for (; (field = fieldRow[j]); j++) {
+    for (let j = 0; j < fieldRow.length; j++) {
+      const field = fieldRow[j];
       if (field.isClickable() || ASTNode.NAVIGATE_ALL_FIELDS) {
         return ASTNode.createFieldNode(field);
       }
@@ -340,8 +340,8 @@ ASTNode.prototype.findNextForField_ = function() {
   const block = location.getSourceBlock();
   const curIdx = block.inputList.indexOf(/** @type {!Input} */ (input));
   let fieldIdx = input.fieldRow.indexOf(location) + 1;
-  let i = curIdx, newInput;
-  for (; (newInput = block.inputList[i]); i++) {
+  for (let i = curIdx; i < block.inputList.length; i++) {
+    const newInput = block.inputList[i];
     const fieldRow = newInput.fieldRow;
     while (fieldIdx < fieldRow.length) {
       if (fieldRow[fieldIdx].isClickable() || ASTNode.NAVIGATE_ALL_FIELDS) {
@@ -370,14 +370,14 @@ ASTNode.prototype.findPrevForInput_ = function() {
   const parentInput = location.getParentInput();
   const block = parentInput.getSourceBlock();
   const curIdx = block.inputList.indexOf(parentInput);
-  let i = curIdx, input;
-  for (; (input = block.inputList[i]); i--) {
+  for (let i = curIdx; i >= 0; i--) {
+    const input = block.inputList[i];
     if (input.connection && input !== parentInput) {
       return ASTNode.createInputNode(input);
     }
     const fieldRow = input.fieldRow;
-    let j = fieldRow.length - 1, field;
-    for (; (field = fieldRow[j]); j--) {
+    for (let j = fieldRow.length - 1; j >= 0; j--) {
+      const field = fieldRow[j];
       if (field.isClickable() || ASTNode.NAVIGATE_ALL_FIELDS) {
         return ASTNode.createFieldNode(field);
       }
@@ -399,8 +399,8 @@ ASTNode.prototype.findPrevForField_ = function() {
   const curIdx = block.inputList.indexOf(
       /** @type {!Input} */ (parentInput));
   let fieldIdx = parentInput.fieldRow.indexOf(location) - 1;
-  let i = curIdx, input;
-  for (; (input = block.inputList[i]); i--) {
+  for (let i = curIdx; i >= 0; i--) {
+    const input = block.inputList[i];
     if (input.connection && input !== parentInput) {
       return ASTNode.createInputNode(input);
     }
@@ -437,8 +437,8 @@ ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
   }
   const curRoot = curLocation.getRootBlock();
   const topBlocks = curRoot.workspace.getTopBlocks(true);
-  let i = 0, topBlock;
-  for (; (topBlock = topBlocks[i]); i++) {
+  for (let i = 0; i < topBlocks.length; i++) {
+    const topBlock = topBlocks[i];
     if (curRoot.id == topBlock.id) {
       const offset = forward ? 1 : -1;
       const resultIndex = i + offset;
@@ -509,11 +509,11 @@ ASTNode.prototype.getOutAstNodeForBlock_ = function(block) {
  */
 ASTNode.prototype.findFirstFieldOrInput_ = function(block) {
   const inputs = block.inputList;
-  let i = 0, input;
-  for (; (input = inputs[i]); i++) {
+  for (let i = 0; i < inputs.length; i++) {
+    const input = inputs[i];
     const fieldRow = input.fieldRow;
-    let j = 0, field;
-    for (; (field = fieldRow[j]); j++) {
+    for (let j = 0; j < fieldRow.length; j++) {
+      const field = fieldRow[j];
       if (field.isClickable() || ASTNode.NAVIGATE_ALL_FIELDS) {
         return ASTNode.createFieldNode(field);
       }

From fabba95beb07a268b81e2a5e7f408aa20555e917 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 23 Jul 2021 19:26:15 -0700
Subject: [PATCH 375/833] Adding blocks to case statements in
 core/keyboard_nav/ast_node.js

---
 core/keyboard_nav/ast_node.js | 126 +++++++++++++++++-----------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index 11405bc22..b52ca1b18 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -549,34 +549,34 @@ ASTNode.prototype.getSourceBlock = function() {
  *     block, or workspace. Or null if there is no node to the right.
  */
 ASTNode.prototype.next = function() {
-  let connection, block, nextConnection, targetConnection;
   switch (this.type_) {
     case ASTNode.types.STACK:
       return this.navigateBetweenStacks_(true);
 
-    case ASTNode.types.OUTPUT:
-      connection = /** @type {!Connection} */ (this.location_);
+    case ASTNode.types.OUTPUT: {
+      const connection = /** @type {!Connection} */ (this.location_);
       return ASTNode.createBlockNode(connection.getSourceBlock());
-
+    }
     case ASTNode.types.FIELD:
       return this.findNextForField_();
 
     case ASTNode.types.INPUT:
       return this.findNextForInput_();
 
-    case ASTNode.types.BLOCK:
-      block = /** @type {!Block} */ (this.location_);
-      nextConnection = block.nextConnection;
+    case ASTNode.types.BLOCK: {
+      const block = /** @type {!Block} */ (this.location_);
+      const nextConnection = block.nextConnection;
       return ASTNode.createConnectionNode(nextConnection);
-
-    case ASTNode.types.PREVIOUS:
-      connection = /** @type {!Connection} */ (this.location_);
+    }
+    case ASTNode.types.PREVIOUS: {
+      const connection = /** @type {!Connection} */ (this.location_);
       return ASTNode.createBlockNode(connection.getSourceBlock());
-
-    case ASTNode.types.NEXT:
-      connection = /** @type {!Connection} */ (this.location_);
-      targetConnection = connection.targetConnection;
+    }
+    case ASTNode.types.NEXT: {
+      const connection = /** @type {!Connection} */ (this.location_);
+      const targetConnection = connection.targetConnection;
       return ASTNode.createConnectionNode(targetConnection);
+    }
   }
 
   return null;
@@ -589,28 +589,28 @@ ASTNode.prototype.next = function() {
  * workspace, or block. Or null if there is nothing below this node.
  */
 ASTNode.prototype.in = function() {
-  let workspace, topBlocks, block, connection, targetConnection;
   switch (this.type_) {
-    case ASTNode.types.WORKSPACE:
-      workspace = /** @type {!Workspace} */ (this.location_);
-      topBlocks = workspace.getTopBlocks(true);
+    case ASTNode.types.WORKSPACE: {
+      const workspace = /** @type {!Workspace} */ (this.location_);
+      const topBlocks = workspace.getTopBlocks(true);
       if (topBlocks.length > 0) {
         return ASTNode.createStackNode(topBlocks[0]);
       }
       break;
-
-    case ASTNode.types.STACK:
-      block = /** @type {!Block} */ (this.location_);
+    }
+    case ASTNode.types.STACK: {
+      const block = /** @type {!Block} */ (this.location_);
       return this.findTopASTNodeForBlock_(block);
-
-    case ASTNode.types.BLOCK:
-      block = /** @type {!Block} */ (this.location_);
+    }
+    case ASTNode.types.BLOCK: {
+      const block = /** @type {!Block} */ (this.location_);
       return this.findFirstFieldOrInput_(block);
-
-    case ASTNode.types.INPUT:
-      connection = /** @type {!Connection} */ (this.location_);
-      targetConnection = connection.targetConnection;
+    }
+    case ASTNode.types.INPUT: {
+      const connection = /** @type {!Connection} */ (this.location_);
+      const targetConnection = connection.targetConnection;
       return ASTNode.createConnectionNode(targetConnection);
+    }
   }
 
   return null;
@@ -623,7 +623,6 @@ ASTNode.prototype.in = function() {
  * null.
  */
 ASTNode.prototype.prev = function() {
-  let block, topConnection, connection, targetConnection;
   switch (this.type_) {
     case ASTNode.types.STACK:
       return this.navigateBetweenStacks_(false);
@@ -637,22 +636,23 @@ ASTNode.prototype.prev = function() {
     case ASTNode.types.INPUT:
       return this.findPrevForInput_();
 
-    case ASTNode.types.BLOCK:
-      block = /** @type {!Block} */ (this.location_);
-      topConnection = block.previousConnection || block.outputConnection;
+    case ASTNode.types.BLOCK: {
+      const block = /** @type {!Block} */ (this.location_);
+      const topConnection = block.previousConnection || block.outputConnection;
       return ASTNode.createConnectionNode(topConnection);
-
-    case ASTNode.types.PREVIOUS:
-      connection = /** @type {!Connection} */ (this.location_);
-      targetConnection = connection.targetConnection;
+    }
+    case ASTNode.types.PREVIOUS: {
+      const connection = /** @type {!Connection} */ (this.location_);
+      const targetConnection = connection.targetConnection;
       if (targetConnection && !targetConnection.getParentInput()) {
         return ASTNode.createConnectionNode(targetConnection);
       }
       break;
-
-    case ASTNode.types.NEXT:
-      connection = /** @type {!Connection} */ (this.location_);
+    }
+    case ASTNode.types.NEXT: {
+      const connection = /** @type {!Connection} */ (this.location_);
       return ASTNode.createBlockNode(connection.getSourceBlock());
+    }
   }
 
   return null;
@@ -665,43 +665,43 @@ ASTNode.prototype.prev = function() {
  *     workspace or block. Or null if we are at the workspace level.
  */
 ASTNode.prototype.out = function() {
-  let block, blockPos, wsCoordinate, connection, target, field;
   switch (this.type_) {
-    case ASTNode.types.STACK:
-      block = /** @type {!Block} */ (this.location_);
-      blockPos = block.getRelativeToSurfaceXY();
+    case ASTNode.types.STACK: {
+      const block = /** @type {!Block} */ (this.location_);
+      const blockPos = block.getRelativeToSurfaceXY();
       // TODO: Make sure this is in the bounds of the workspace.
-      wsCoordinate =
+      const wsCoordinate =
           new Coordinate(blockPos.x, blockPos.y + ASTNode.DEFAULT_OFFSET_Y);
       return ASTNode.createWorkspaceNode(block.workspace, wsCoordinate);
-
-    case ASTNode.types.OUTPUT:
-      connection = /** @type {!Connection} */ (this.location_);
-      target = connection.targetConnection;
+    }
+    case ASTNode.types.OUTPUT: {
+      const connection = /** @type {!Connection} */ (this.location_);
+      const target = connection.targetConnection;
       if (target) {
         return ASTNode.createConnectionNode(target);
       }
       return ASTNode.createStackNode(connection.getSourceBlock());
-
-    case ASTNode.types.FIELD:
-      field = /** @type {!Field} */ (this.location_);
+    }
+    case ASTNode.types.FIELD: {
+      const field = /** @type {!Field} */ (this.location_);
       return ASTNode.createBlockNode(field.getSourceBlock());
-
-    case ASTNode.types.INPUT:
-      connection = /** @type {!Connection} */ (this.location_);
+    }
+    case ASTNode.types.INPUT: {
+      const connection = /** @type {!Connection} */ (this.location_);
       return ASTNode.createBlockNode(connection.getSourceBlock());
-
-    case ASTNode.types.BLOCK:
-      block = /** @type {!Block} */ (this.location_);
+    }
+    case ASTNode.types.BLOCK: {
+      const block = /** @type {!Block} */ (this.location_);
       return this.getOutAstNodeForBlock_(block);
-
-    case ASTNode.types.PREVIOUS:
-      connection = /** @type {!Connection} */ (this.location_);
+    }
+    case ASTNode.types.PREVIOUS: {
+      const connection = /** @type {!Connection} */ (this.location_);
       return this.getOutAstNodeForBlock_(connection.getSourceBlock());
-
-    case ASTNode.types.NEXT:
-      connection = /** @type {!Connection} */ (this.location_);
+    }
+    case ASTNode.types.NEXT: {
+      const connection = /** @type {!Connection} */ (this.location_);
       return this.getOutAstNodeForBlock_(connection.getSourceBlock());
+    }
   }
 
   return null;

From 6787624e3ef9cb748b3d8e1f534b3ece46d483e1 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 14:46:10 -0700
Subject: [PATCH 376/833] Migrate core/workspace_audio.js to ES6 const/let

---
 core/workspace_audio.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/core/workspace_audio.js b/core/workspace_audio.js
index 378c19287..1ca2a2255 100644
--- a/core/workspace_audio.js
+++ b/core/workspace_audio.js
@@ -71,17 +71,18 @@ Blockly.WorkspaceAudio.prototype.load = function(filenames, name) {
   if (!filenames.length) {
     return;
   }
+  let audioTest;
   try {
-    var audioTest = new Blockly.utils.global['Audio']();
+    audioTest = new Blockly.utils.global['Audio']();
   } catch (e) {
     // No browser support for Audio.
     // IE can throw an error even if the Audio object exists.
     return;
   }
-  var sound;
-  for (var i = 0; i < filenames.length; i++) {
-    var filename = filenames[i];
-    var ext = filename.match(/\.(\w+)$/);
+  let sound;
+  for (let i = 0; i < filenames.length; i++) {
+    const filename = filenames[i];
+    const ext = filename.match(/\.(\w+)$/);
     if (ext && audioTest.canPlayType('audio/' + ext[1])) {
       // Found an audio format we can play.
       sound = new Blockly.utils.global['Audio'](filename);
@@ -98,10 +99,10 @@ Blockly.WorkspaceAudio.prototype.load = function(filenames, name) {
  * @package
  */
 Blockly.WorkspaceAudio.prototype.preload = function() {
-  for (var name in this.SOUNDS_) {
-    var sound = this.SOUNDS_[name];
+  for (let name in this.SOUNDS_) {
+    const sound = this.SOUNDS_[name];
     sound.volume = 0.01;
-    var playPromise = sound.play();
+    const playPromise = sound.play();
     // Edge does not return a promise, so we need to check.
     if (playPromise !== undefined) {
       // If we don't wait for the play request to complete before calling pause()
@@ -129,16 +130,16 @@ Blockly.WorkspaceAudio.prototype.preload = function() {
  * @param {number=} opt_volume Volume of sound (0-1).
  */
 Blockly.WorkspaceAudio.prototype.play = function(name, opt_volume) {
-  var sound = this.SOUNDS_[name];
+  const sound = this.SOUNDS_[name];
   if (sound) {
     // Don't play one sound on top of another.
-    var now = new Date;
+    const now = new Date;
     if (this.lastSound_ != null &&
         now - this.lastSound_ < Blockly.internalConstants.SOUND_LIMIT) {
       return;
     }
     this.lastSound_ = now;
-    var mySound;
+    let mySound;
     if (Blockly.utils.userAgent.IPAD || Blockly.utils.userAgent.ANDROID) {
       // Creating a new audio node causes lag in Android and iPad.  Android
       // refetches the file from the server, iPad uses a singleton audio

From f7c88bfcd91bb2168137358e91ce01ae17036bee Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 14:46:27 -0700
Subject: [PATCH 377/833] Migrate core/workspace_audio.js to goog.module

---
 core/workspace_audio.js | 18 ++++++++++--------
 tests/deps.js           |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/core/workspace_audio.js b/core/workspace_audio.js
index 1ca2a2255..72e66d952 100644
--- a/core/workspace_audio.js
+++ b/core/workspace_audio.js
@@ -11,10 +11,10 @@
  */
 'use strict';
 
-goog.provide('Blockly.WorkspaceAudio');
+goog.module('Blockly.WorkspaceAudio');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.internalConstants');
-goog.require('Blockly.utils');
 goog.require('Blockly.utils.global');
 goog.require('Blockly.utils.userAgent');
 
@@ -27,7 +27,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  *     this audio object belongs to, or null.
  * @constructor
  */
-Blockly.WorkspaceAudio = function(parentWorkspace) {
+const WorkspaceAudio = function(parentWorkspace) {
 
   /**
    * The parent of the workspace this object belongs to, or null.  May be
@@ -49,13 +49,13 @@ Blockly.WorkspaceAudio = function(parentWorkspace) {
  * @type {Date}
  * @private
  */
-Blockly.WorkspaceAudio.prototype.lastSound_ = null;
+WorkspaceAudio.prototype.lastSound_ = null;
 
 /**
  * Dispose of this audio manager.
  * @package
  */
-Blockly.WorkspaceAudio.prototype.dispose = function() {
+WorkspaceAudio.prototype.dispose = function() {
   this.parentWorkspace_ = null;
   this.SOUNDS_ = null;
 };
@@ -67,7 +67,7 @@ Blockly.WorkspaceAudio.prototype.dispose = function() {
  *   Filenames include path from Blockly's root.  File extensions matter.
  * @param {string} name Name of sound.
  */
-Blockly.WorkspaceAudio.prototype.load = function(filenames, name) {
+WorkspaceAudio.prototype.load = function(filenames, name) {
   if (!filenames.length) {
     return;
   }
@@ -98,7 +98,7 @@ Blockly.WorkspaceAudio.prototype.load = function(filenames, name) {
  * Preload all the audio files so that they play quickly when asked for.
  * @package
  */
-Blockly.WorkspaceAudio.prototype.preload = function() {
+WorkspaceAudio.prototype.preload = function() {
   for (let name in this.SOUNDS_) {
     const sound = this.SOUNDS_[name];
     sound.volume = 0.01;
@@ -129,7 +129,7 @@ Blockly.WorkspaceAudio.prototype.preload = function() {
  * @param {string} name Name of sound.
  * @param {number=} opt_volume Volume of sound (0-1).
  */
-Blockly.WorkspaceAudio.prototype.play = function(name, opt_volume) {
+WorkspaceAudio.prototype.play = function(name, opt_volume) {
   const sound = this.SOUNDS_[name];
   if (sound) {
     // Don't play one sound on top of another.
@@ -155,3 +155,5 @@ Blockly.WorkspaceAudio.prototype.play = function(name, opt_volume) {
     this.parentWorkspace_.getAudioManager().play(name, opt_volume);
   }
 };
+
+exports = WorkspaceAudio;
diff --git a/tests/deps.js b/tests/deps.js
index 957896ec3..0018d3a1d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -202,7 +202,7 @@ goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic
 goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.utils.dom']);
 goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);
-goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es5'});
+goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml']);
 goog.addDependency('../../core/workspace_comment_render_svg.js', ['Blockly.WorkspaceCommentSvg.render'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.WorkspaceComment', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);

From 5f819cd0fe949c619b1d333492ad074e3e51e38d Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 14:48:10 -0700
Subject: [PATCH 378/833] Migrate core/workspace_audio.js named requires

---
 core/workspace_audio.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/workspace_audio.js b/core/workspace_audio.js
index 72e66d952..7a6acde4f 100644
--- a/core/workspace_audio.js
+++ b/core/workspace_audio.js
@@ -14,16 +14,16 @@
 goog.module('Blockly.WorkspaceAudio');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.utils.global');
-goog.require('Blockly.utils.userAgent');
-
-goog.requireType('Blockly.WorkspaceSvg');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const global = goog.require('Blockly.utils.global');
+const internalConstants = goog.require('Blockly.internalConstants');
+const userAgent = goog.require('Blockly.utils.userAgent');
 
 
 /**
  * Class for loading, storing, and playing audio for a workspace.
- * @param {Blockly.WorkspaceSvg} parentWorkspace The parent of the workspace
+ * @param {WorkspaceSvg} parentWorkspace The parent of the workspace
  *     this audio object belongs to, or null.
  * @constructor
  */
@@ -32,7 +32,7 @@ const WorkspaceAudio = function(parentWorkspace) {
   /**
    * The parent of the workspace this object belongs to, or null.  May be
    * checked for sounds that this object can't find.
-   * @type {Blockly.WorkspaceSvg}
+   * @type {WorkspaceSvg}
    * @private
    */
   this.parentWorkspace_ = parentWorkspace;
@@ -73,7 +73,7 @@ WorkspaceAudio.prototype.load = function(filenames, name) {
   }
   let audioTest;
   try {
-    audioTest = new Blockly.utils.global['Audio']();
+    audioTest = new global['Audio']();
   } catch (e) {
     // No browser support for Audio.
     // IE can throw an error even if the Audio object exists.
@@ -85,7 +85,7 @@ WorkspaceAudio.prototype.load = function(filenames, name) {
     const ext = filename.match(/\.(\w+)$/);
     if (ext && audioTest.canPlayType('audio/' + ext[1])) {
       // Found an audio format we can play.
-      sound = new Blockly.utils.global['Audio'](filename);
+      sound = new global['Audio'](filename);
       break;
     }
   }
@@ -117,7 +117,7 @@ WorkspaceAudio.prototype.preload = function() {
 
     // iOS can only process one sound at a time.  Trying to load more than one
     // corrupts the earlier ones.  Just load one and leave the others uncached.
-    if (Blockly.utils.userAgent.IPAD || Blockly.utils.userAgent.IPHONE) {
+    if (userAgent.IPAD || userAgent.IPHONE) {
       break;
     }
   }
@@ -135,12 +135,12 @@ WorkspaceAudio.prototype.play = function(name, opt_volume) {
     // Don't play one sound on top of another.
     const now = new Date;
     if (this.lastSound_ != null &&
-        now - this.lastSound_ < Blockly.internalConstants.SOUND_LIMIT) {
+        now - this.lastSound_ < internalConstants.SOUND_LIMIT) {
       return;
     }
     this.lastSound_ = now;
     let mySound;
-    if (Blockly.utils.userAgent.IPAD || Blockly.utils.userAgent.ANDROID) {
+    if (userAgent.IPAD || userAgent.ANDROID) {
       // Creating a new audio node causes lag in Android and iPad.  Android
       // refetches the file from the server, iPad uses a singleton audio
       // node which must be deleted and recreated for each new audio tag.

From 813f27706f4ce84db3d54ac8d1e41341e35559a2 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 14:50:13 -0700
Subject: [PATCH 379/833] clang-format core/workspace_audio.js

---
 core/workspace_audio.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/workspace_audio.js b/core/workspace_audio.js
index 7a6acde4f..11f16b8b1 100644
--- a/core/workspace_audio.js
+++ b/core/workspace_audio.js
@@ -28,7 +28,6 @@ const userAgent = goog.require('Blockly.utils.userAgent');
  * @constructor
  */
 const WorkspaceAudio = function(parentWorkspace) {
-
   /**
    * The parent of the workspace this object belongs to, or null.  May be
    * checked for sounds that this object can't find.
@@ -105,9 +104,10 @@ WorkspaceAudio.prototype.preload = function() {
     const playPromise = sound.play();
     // Edge does not return a promise, so we need to check.
     if (playPromise !== undefined) {
-      // If we don't wait for the play request to complete before calling pause()
-      // we will get an exception: (DOMException: The play() request was interrupted)
-      // See more: https://developers.google.com/web/updates/2017/06/play-request-was-interrupted
+      // If we don't wait for the play request to complete before calling
+      // pause() we will get an exception: (DOMException: The play() request was
+      // interrupted) See more:
+      // https://developers.google.com/web/updates/2017/06/play-request-was-interrupted
       playPromise.then(sound.pause).catch(function() {
         // Play without user interaction was prevented.
       });

From 4e147b2593befd887a06c5dae91583019c4cbc00 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 15:32:42 -0700
Subject: [PATCH 380/833] Update syntax for for..in loop

---
 core/workspace_audio.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/workspace_audio.js b/core/workspace_audio.js
index 11f16b8b1..ba1da0c95 100644
--- a/core/workspace_audio.js
+++ b/core/workspace_audio.js
@@ -98,7 +98,7 @@ WorkspaceAudio.prototype.load = function(filenames, name) {
  * @package
  */
 WorkspaceAudio.prototype.preload = function() {
-  for (let name in this.SOUNDS_) {
+  for (const name in this.SOUNDS_) {
     const sound = this.SOUNDS_[name];
     sound.volume = 0.01;
     const playPromise = sound.play();

From 887e9d79cd6dc2f7c682340e629fa163750e2e71 Mon Sep 17 00:00:00 2001
From: Maribeth Bottorff <maribethb@google.com>
Date: Tue, 27 Jul 2021 16:01:18 -0700
Subject: [PATCH 381/833] Migrate core/bubble.js to ES6 const/let

---
 core/bubble.js | 170 ++++++++++++++++++++++++-------------------------
 1 file changed, 84 insertions(+), 86 deletions(-)

diff --git a/core/bubble.js b/core/bubble.js
index 161b2fb29..f1b5b6318 100644
--- a/core/bubble.js
+++ b/core/bubble.js
@@ -87,18 +87,18 @@ Blockly.Bubble = function(
    */
   this.disposed = false;
 
-  var angle = Blockly.Bubble.ARROW_ANGLE;
+  let angle = Blockly.Bubble.ARROW_ANGLE;
   if (this.workspace_.RTL) {
     angle = -angle;
   }
   this.arrow_radians_ = Blockly.utils.math.toRadians(angle);
 
-  var canvas = workspace.getBubbleCanvas();
+  const canvas = workspace.getBubbleCanvas();
   canvas.appendChild(this.createDom_(content, !!(bubbleWidth && bubbleHeight)));
 
   this.setAnchorLocation(anchorXY);
   if (!bubbleWidth || !bubbleHeight) {
-    var bBox = /** @type {SVGLocatable} */ (this.content_).getBBox();
+    const bBox = /** @type {SVGLocatable} */ (this.content_).getBBox();
     bubbleWidth = bBox.width + 2 * Blockly.Bubble.BORDER_WIDTH;
     bubbleHeight = bBox.height + 2 * Blockly.Bubble.BORDER_WIDTH;
   }
@@ -245,7 +245,7 @@ Blockly.Bubble.prototype.createDom_ = function(content, hasResize) {
   */
   this.bubbleGroup_ =
       Blockly.utils.dom.createSvgElement(Blockly.utils.Svg.G, {}, null);
-  var filter = {
+  let filter = {
     'filter': 'url(#' +
         this.workspace_.getRenderer().getConstants().embossFilterId + ')'
   };
@@ -254,7 +254,7 @@ Blockly.Bubble.prototype.createDom_ = function(content, hasResize) {
     // https://github.com/google/blockly/issues/99
     filter = {};
   }
-  var bubbleEmboss = Blockly.utils.dom.createSvgElement(
+  const bubbleEmboss = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.G, filter, this.bubbleGroup_);
   this.bubbleArrow_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.PATH, {}, bubbleEmboss);
@@ -272,7 +272,7 @@ Blockly.Bubble.prototype.createDom_ = function(content, hasResize) {
         Blockly.utils.Svg.G,
         {'class': this.workspace_.RTL ? 'blocklyResizeSW' : 'blocklyResizeSE'},
         this.bubbleGroup_);
-    var resizeSize = 2 * Blockly.Bubble.BORDER_WIDTH;
+    const resizeSize = 2 * Blockly.Bubble.BORDER_WIDTH;
     Blockly.utils.dom.createSvgElement(
         Blockly.utils.Svg.POLYGON,
         {'points': '0,x x,x x,0'.replace(/x/g, resizeSize.toString())},
@@ -335,7 +335,7 @@ Blockly.Bubble.prototype.setSvgId = function(id) {
  * @private
  */
 Blockly.Bubble.prototype.bubbleMouseDown_ = function(e) {
-  var gesture = this.workspace_.getGesture(e);
+  const gesture = this.workspace_.getGesture(e);
   if (gesture) {
     gesture.handleBubbleStart(e, this);
   }
@@ -404,7 +404,7 @@ Blockly.Bubble.prototype.resizeMouseDown_ = function(e) {
  */
 Blockly.Bubble.prototype.resizeMouseMove_ = function(e) {
   this.autoLayout_ = false;
-  var newXY = this.workspace_.moveDrag(e);
+  const newXY = this.workspace_.moveDrag(e);
   this.setBubbleSize(this.workspace_.RTL ? -newXY.x : newXY.x, newXY.y);
   if (this.workspace_.RTL) {
     // RTL requires the bubble to move its left edge.
@@ -434,7 +434,7 @@ Blockly.Bubble.prototype.registerMoveEvent = function(callback) {
  * @package
  */
 Blockly.Bubble.prototype.promote = function() {
-  var svgGroup = this.bubbleGroup_.parentNode;
+  const svgGroup = this.bubbleGroup_.parentNode;
   if (svgGroup.lastChild !== this.bubbleGroup_) {
     svgGroup.appendChild(this.bubbleGroup_);
     return true;
@@ -460,32 +460,32 @@ Blockly.Bubble.prototype.setAnchorLocation = function(xy) {
  */
 Blockly.Bubble.prototype.layoutBubble_ = function() {
   // Get the metrics in workspace units.
-  var viewMetrics = this.workspace_.getMetricsManager().getViewMetrics(true);
+  const viewMetrics = this.workspace_.getMetricsManager().getViewMetrics(true);
 
-  var optimalLeft = this.getOptimalRelativeLeft_(viewMetrics);
-  var optimalTop = this.getOptimalRelativeTop_(viewMetrics);
-  var bbox = this.shape_.getBBox();
+  const optimalLeft = this.getOptimalRelativeLeft_(viewMetrics);
+  const optimalTop = this.getOptimalRelativeTop_(viewMetrics);
+  const bbox = this.shape_.getBBox();
 
-  var topPosition = {
+  const topPosition = {
     x: optimalLeft,
     y: -this.height_ -
         this.workspace_.getRenderer().getConstants().MIN_BLOCK_HEIGHT
   };
-  var startPosition = {x: -this.width_ - 30, y: optimalTop};
-  var endPosition = {x: bbox.width, y: optimalTop};
-  var bottomPosition = {x: optimalLeft, y: bbox.height};
+  const startPosition = {x: -this.width_ - 30, y: optimalTop};
+  const endPosition = {x: bbox.width, y: optimalTop};
+  const bottomPosition = {x: optimalLeft, y: bbox.height};
 
-  var closerPosition = bbox.width < bbox.height ? endPosition : bottomPosition;
-  var fartherPosition = bbox.width < bbox.height ? bottomPosition : endPosition;
+  const closerPosition = bbox.width < bbox.height ? endPosition : bottomPosition;
+  const fartherPosition = bbox.width < bbox.height ? bottomPosition : endPosition;
 
-  var topPositionOverlap = this.getOverlap_(topPosition, viewMetrics);
-  var startPositionOverlap = this.getOverlap_(startPosition, viewMetrics);
-  var closerPositionOverlap = this.getOverlap_(closerPosition, viewMetrics);
-  var fartherPositionOverlap = this.getOverlap_(fartherPosition, viewMetrics);
+  const topPositionOverlap = this.getOverlap_(topPosition, viewMetrics);
+  const startPositionOverlap = this.getOverlap_(startPosition, viewMetrics);
+  const closerPositionOverlap = this.getOverlap_(closerPosition, viewMetrics);
+  const fartherPositionOverlap = this.getOverlap_(fartherPosition, viewMetrics);
 
   // Set the position to whichever position shows the most of the bubble,
   // with tiebreaks going in the order: top > start > close > far.
-  var mostOverlap = Math.max(
+  const mostOverlap = Math.max(
       topPositionOverlap, startPositionOverlap, closerPositionOverlap,
       fartherPositionOverlap);
   if (topPositionOverlap == mostOverlap) {
@@ -522,13 +522,13 @@ Blockly.Bubble.prototype.layoutBubble_ = function() {
  */
 Blockly.Bubble.prototype.getOverlap_ = function(relativeMin, viewMetrics) {
   // The position of the top-left corner of the bubble in workspace units.
-  var bubbleMin = {
+  const bubbleMin = {
     x: this.workspace_.RTL ? (this.anchorXY_.x - relativeMin.x - this.width_) :
                              (relativeMin.x + this.anchorXY_.x),
     y: relativeMin.y + this.anchorXY_.y
   };
   // The position of the bottom-right corner of the bubble in workspace units.
-  var bubbleMax = {x: bubbleMin.x + this.width_, y: bubbleMin.y + this.height_};
+  const bubbleMax = {x: bubbleMin.x + this.width_, y: bubbleMin.y + this.height_};
 
   // We could adjust these values to account for the scrollbars, but the
   // bubbles should have been adjusted to not collide with them anyway, so
@@ -536,16 +536,16 @@ Blockly.Bubble.prototype.getOverlap_ = function(relativeMin, viewMetrics) {
   // calculation.
 
   // The position of the top-left corner of the workspace.
-  var workspaceMin = {x: viewMetrics.left, y: viewMetrics.top};
+  const workspaceMin = {x: viewMetrics.left, y: viewMetrics.top};
   // The position of the bottom-right corner of the workspace.
-  var workspaceMax = {
+  const workspaceMax = {
     x: viewMetrics.left + viewMetrics.width,
     y: viewMetrics.top + viewMetrics.height
   };
 
-  var overlapWidth = Math.min(bubbleMax.x, workspaceMax.x) -
+  const overlapWidth = Math.min(bubbleMax.x, workspaceMax.x) -
       Math.max(bubbleMin.x, workspaceMin.x);
-  var overlapHeight = Math.min(bubbleMax.y, workspaceMax.y) -
+  const overlapHeight = Math.min(bubbleMax.y, workspaceMax.y) -
       Math.max(bubbleMin.y, workspaceMin.y);
   return Math.max(
       0,
@@ -564,7 +564,7 @@ Blockly.Bubble.prototype.getOverlap_ = function(relativeMin, viewMetrics) {
  * @private
  */
 Blockly.Bubble.prototype.getOptimalRelativeLeft_ = function(viewMetrics) {
-  var relativeLeft = -this.width_ / 4;
+  let relativeLeft = -this.width_ / 4;
 
   // No amount of sliding left or right will give us a better overlap.
   if (this.width_ > viewMetrics.width) {
@@ -573,24 +573,14 @@ Blockly.Bubble.prototype.getOptimalRelativeLeft_ = function(viewMetrics) {
 
   if (this.workspace_.RTL) {
     // Bubble coordinates are flipped in RTL.
-    var bubbleRight = this.anchorXY_.x - relativeLeft;
-    var bubbleLeft = bubbleRight - this.width_;
+    const bubbleRight = this.anchorXY_.x - relativeLeft;
+    const bubbleLeft = bubbleRight - this.width_;
 
-    var workspaceRight = viewMetrics.left + viewMetrics.width;
-    var workspaceLeft = viewMetrics.left +
+    const workspaceRight = viewMetrics.left + viewMetrics.width;
+    const workspaceLeft = viewMetrics.left +
         // Thickness in workspace units.
         (Blockly.Scrollbar.scrollbarThickness / this.workspace_.scale);
-  } else {
-    var bubbleLeft = relativeLeft + this.anchorXY_.x;
-    var bubbleRight = bubbleLeft + this.width_;
 
-    var workspaceLeft = viewMetrics.left;
-    var workspaceRight = viewMetrics.left + viewMetrics.width -
-        // Thickness in workspace units.
-        (Blockly.Scrollbar.scrollbarThickness / this.workspace_.scale);
-  }
-
-  if (this.workspace_.RTL) {
     if (bubbleLeft < workspaceLeft) {
       // Slide the bubble right until it is onscreen.
       relativeLeft = -(workspaceLeft - this.anchorXY_.x + this.width_);
@@ -599,6 +589,14 @@ Blockly.Bubble.prototype.getOptimalRelativeLeft_ = function(viewMetrics) {
       relativeLeft = -(workspaceRight - this.anchorXY_.x);
     }
   } else {
+    const bubbleLeft = relativeLeft + this.anchorXY_.x;
+    const bubbleRight = bubbleLeft + this.width_;
+
+    const workspaceLeft = viewMetrics.left;
+    const workspaceRight = viewMetrics.left + viewMetrics.width -
+        // Thickness in workspace units.
+        (Blockly.Scrollbar.scrollbarThickness / this.workspace_.scale);
+
     if (bubbleLeft < workspaceLeft) {
       // Slide the bubble right until it is onscreen.
       relativeLeft = workspaceLeft - this.anchorXY_.x;
@@ -622,21 +620,21 @@ Blockly.Bubble.prototype.getOptimalRelativeLeft_ = function(viewMetrics) {
  * @private
  */
 Blockly.Bubble.prototype.getOptimalRelativeTop_ = function(viewMetrics) {
-  var relativeTop = -this.height_ / 4;
+  let relativeTop = -this.height_ / 4;
 
   // No amount of sliding up or down will give us a better overlap.
   if (this.height_ > viewMetrics.height) {
     return relativeTop;
   }
 
-  var bubbleTop = this.anchorXY_.y + relativeTop;
-  var bubbleBottom = bubbleTop + this.height_;
-  var workspaceTop = viewMetrics.top;
-  var workspaceBottom = viewMetrics.top + viewMetrics.height -
+  const bubbleTop = this.anchorXY_.y + relativeTop;
+  const bubbleBottom = bubbleTop + this.height_;
+  const workspaceTop = viewMetrics.top;
+  const workspaceBottom = viewMetrics.top + viewMetrics.height -
       // Thickness in workspace units.
       (Blockly.Scrollbar.scrollbarThickness / this.workspace_.scale);
 
-  var anchorY = this.anchorXY_.y;
+  const anchorY = this.anchorXY_.y;
   if (bubbleTop < workspaceTop) {
     // Slide the bubble down until it is onscreen.
     relativeTop = workspaceTop - anchorY;
@@ -653,13 +651,13 @@ Blockly.Bubble.prototype.getOptimalRelativeTop_ = function(viewMetrics) {
  * @private
  */
 Blockly.Bubble.prototype.positionBubble_ = function() {
-  var left = this.anchorXY_.x;
+  let left = this.anchorXY_.x;
   if (this.workspace_.RTL) {
     left -= this.relativeLeft_ + this.width_;
   } else {
     left += this.relativeLeft_;
   }
-  var top = this.relativeTop_ + this.anchorXY_.y;
+  const top = this.relativeTop_ + this.anchorXY_.y;
   this.moveTo(left, top);
 };
 
@@ -698,7 +696,7 @@ Blockly.Bubble.prototype.getBubbleSize = function() {
  * @param {number} height Height of the bubble.
  */
 Blockly.Bubble.prototype.setBubbleSize = function(width, height) {
-  var doubleBorderWidth = 2 * Blockly.Bubble.BORDER_WIDTH;
+  const doubleBorderWidth = 2 * Blockly.Bubble.BORDER_WIDTH;
   // Minimum size of a bubble.
   width = Math.max(width, doubleBorderWidth + 45);
   height = Math.max(height, doubleBorderWidth + 20);
@@ -709,7 +707,7 @@ Blockly.Bubble.prototype.setBubbleSize = function(width, height) {
   if (this.resizeGroup_) {
     if (this.workspace_.RTL) {
       // Mirror the resize group.
-      var resizeSize = 2 * Blockly.Bubble.BORDER_WIDTH;
+      const resizeSize = 2 * Blockly.Bubble.BORDER_WIDTH;
       this.resizeGroup_.setAttribute(
           'transform',
           'translate(' + resizeSize + ',' + (height - doubleBorderWidth) +
@@ -738,62 +736,62 @@ Blockly.Bubble.prototype.setBubbleSize = function(width, height) {
  * @private
  */
 Blockly.Bubble.prototype.renderArrow_ = function() {
-  var steps = [];
+  const steps = [];
   // Find the relative coordinates of the center of the bubble.
-  var relBubbleX = this.width_ / 2;
-  var relBubbleY = this.height_ / 2;
+  const relBubbleX = this.width_ / 2;
+  const relBubbleY = this.height_ / 2;
   // Find the relative coordinates of the center of the anchor.
-  var relAnchorX = -this.relativeLeft_;
-  var relAnchorY = -this.relativeTop_;
+  let relAnchorX = -this.relativeLeft_;
+  let relAnchorY = -this.relativeTop_;
   if (relBubbleX == relAnchorX && relBubbleY == relAnchorY) {
     // Null case.  Bubble is directly on top of the anchor.
     // Short circuit this rather than wade through divide by zeros.
     steps.push('M ' + relBubbleX + ',' + relBubbleY);
   } else {
     // Compute the angle of the arrow's line.
-    var rise = relAnchorY - relBubbleY;
-    var run = relAnchorX - relBubbleX;
+    const rise = relAnchorY - relBubbleY;
+    let run = relAnchorX - relBubbleX;
     if (this.workspace_.RTL) {
       run *= -1;
     }
-    var hypotenuse = Math.sqrt(rise * rise + run * run);
-    var angle = Math.acos(run / hypotenuse);
+    const hypotenuse = Math.sqrt(rise * rise + run * run);
+    let angle = Math.acos(run / hypotenuse);
     if (rise < 0) {
       angle = 2 * Math.PI - angle;
     }
     // Compute a line perpendicular to the arrow.
-    var rightAngle = angle + Math.PI / 2;
+    let rightAngle = angle + Math.PI / 2;
     if (rightAngle > Math.PI * 2) {
       rightAngle -= Math.PI * 2;
     }
-    var rightRise = Math.sin(rightAngle);
-    var rightRun = Math.cos(rightAngle);
+    const rightRise = Math.sin(rightAngle);
+    const rightRun = Math.cos(rightAngle);
 
     // Calculate the thickness of the base of the arrow.
-    var bubbleSize = this.getBubbleSize();
-    var thickness =
+    const bubbleSize = this.getBubbleSize();
+    let thickness =
         (bubbleSize.width + bubbleSize.height) / Blockly.Bubble.ARROW_THICKNESS;
     thickness = Math.min(thickness, bubbleSize.width, bubbleSize.height) / 4;
 
     // Back the tip of the arrow off of the anchor.
-    var backoffRatio = 1 - Blockly.Bubble.ANCHOR_RADIUS / hypotenuse;
+    const backoffRatio = 1 - Blockly.Bubble.ANCHOR_RADIUS / hypotenuse;
     relAnchorX = relBubbleX + backoffRatio * run;
     relAnchorY = relBubbleY + backoffRatio * rise;
 
     // Coordinates for the base of the arrow.
-    var baseX1 = relBubbleX + thickness * rightRun;
-    var baseY1 = relBubbleY + thickness * rightRise;
-    var baseX2 = relBubbleX - thickness * rightRun;
-    var baseY2 = relBubbleY - thickness * rightRise;
+    const baseX1 = relBubbleX + thickness * rightRun;
+    const baseY1 = relBubbleY + thickness * rightRise;
+    const baseX2 = relBubbleX - thickness * rightRun;
+    const baseY2 = relBubbleY - thickness * rightRise;
 
     // Distortion to curve the arrow.
-    var swirlAngle = angle + this.arrow_radians_;
+    let swirlAngle = angle + this.arrow_radians_;
     if (swirlAngle > Math.PI * 2) {
       swirlAngle -= Math.PI * 2;
     }
-    var swirlRise =
+    const swirlRise =
         Math.sin(swirlAngle) * hypotenuse / Blockly.Bubble.ARROW_BEND;
-    var swirlRun =
+    const swirlRun =
         Math.cos(swirlAngle) * hypotenuse / Blockly.Bubble.ARROW_BEND;
 
     steps.push('M' + baseX1 + ',' + baseY1);
@@ -888,18 +886,18 @@ Blockly.Bubble.prototype.setAutoLayout = function(enable) {
  * @package
  */
 Blockly.Bubble.textToDom = function(text) {
-  var paragraph = Blockly.utils.dom.createSvgElement(
+  const paragraph = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.TEXT, {
         'class': 'blocklyText blocklyBubbleText blocklyNoPointerEvents',
         'y': Blockly.Bubble.BORDER_WIDTH
       },
       null);
-  var lines = text.split('\n');
-  for (var i = 0; i < lines.length; i++) {
-    var tspanElement = Blockly.utils.dom.createSvgElement(
+  const lines = text.split('\n');
+  for (let i = 0; i < lines.length; i++) {
+    const tspanElement = Blockly.utils.dom.createSvgElement(
         Blockly.utils.Svg.TSPAN,
         {'dy': '1em', 'x': Blockly.Bubble.BORDER_WIDTH}, paragraph);
-    var textNode = document.createTextNode(lines[i]);
+    const textNode = document.createTextNode(lines[i]);
     tspanElement.appendChild(textNode);
   }
   return paragraph;
@@ -916,7 +914,7 @@ Blockly.Bubble.textToDom = function(text) {
  */
 Blockly.Bubble.createNonEditableBubble = function(
     paragraphElement, block, iconXY) {
-  var bubble = new Blockly.Bubble(
+  const bubble = new Blockly.Bubble(
       /** @type {!Blockly.WorkspaceSvg} */ (block.workspace), paragraphElement,
       block.pathObject.svgPath,
       /** @type {!Blockly.utils.Coordinate} */ (iconXY), null, null);
@@ -925,9 +923,9 @@ Blockly.Bubble.createNonEditableBubble = function(
   if (block.RTL) {
     // Right-align the paragraph.
     // This cannot be done until the bubble is rendered on screen.
-    var maxWidth = paragraphElement.getBBox().width;
-    for (var i = 0, textElement; (textElement = paragraphElement.childNodes[i]);
-      i++) {
+    const maxWidth = paragraphElement.getBBox().width;
+    for (let i = 0, textElement; (textElement = paragraphElement.childNodes[i]);
+         i++) {
       textElement.setAttribute('text-anchor', 'end');
       textElement.setAttribute('x', maxWidth + Blockly.Bubble.BORDER_WIDTH);
     }

From 79bcdb015266d43a1eec1e12f18b77e879f1b41c Mon Sep 17 00:00:00 2001
From: Maribeth Bottorff <maribethb@google.com>
Date: Tue, 27 Jul 2021 16:04:14 -0700
Subject: [PATCH 382/833] Migrate core/bubble.js to goog.module

---
 core/bubble.js | 157 +++++++++++++++++++++++++------------------------
 tests/deps.js  |   2 +-
 2 files changed, 81 insertions(+), 78 deletions(-)

diff --git a/core/bubble.js b/core/bubble.js
index f1b5b6318..aeae81769 100644
--- a/core/bubble.js
+++ b/core/bubble.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Bubble');
+goog.module('Blockly.Bubble');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.IBubble');
@@ -45,7 +46,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @implements {Blockly.IBubble}
  * @constructor
  */
-Blockly.Bubble = function(
+const Bubble = function(
     workspace, content, shape, anchorXY, bubbleWidth, bubbleHeight) {
   this.workspace_ = workspace;
   this.content_ = content;
@@ -87,7 +88,7 @@ Blockly.Bubble = function(
    */
   this.disposed = false;
 
-  let angle = Blockly.Bubble.ARROW_ANGLE;
+  let angle = Bubble.ARROW_ANGLE;
   if (this.workspace_.RTL) {
     angle = -angle;
   }
@@ -99,8 +100,8 @@ Blockly.Bubble = function(
   this.setAnchorLocation(anchorXY);
   if (!bubbleWidth || !bubbleHeight) {
     const bBox = /** @type {SVGLocatable} */ (this.content_).getBBox();
-    bubbleWidth = bBox.width + 2 * Blockly.Bubble.BORDER_WIDTH;
-    bubbleHeight = bBox.height + 2 * Blockly.Bubble.BORDER_WIDTH;
+    bubbleWidth = bBox.width + 2 * Bubble.BORDER_WIDTH;
+    bubbleHeight = bBox.height + 2 * Bubble.BORDER_WIDTH;
   }
   this.setBubbleSize(bubbleWidth, bubbleHeight);
 
@@ -113,55 +114,55 @@ Blockly.Bubble = function(
 /**
  * Width of the border around the bubble.
  */
-Blockly.Bubble.BORDER_WIDTH = 6;
+Bubble.BORDER_WIDTH = 6;
 
 /**
  * Determines the thickness of the base of the arrow in relation to the size
  * of the bubble.  Higher numbers result in thinner arrows.
  */
-Blockly.Bubble.ARROW_THICKNESS = 5;
+Bubble.ARROW_THICKNESS = 5;
 
 /**
  * The number of degrees that the arrow bends counter-clockwise.
  */
-Blockly.Bubble.ARROW_ANGLE = 20;
+Bubble.ARROW_ANGLE = 20;
 
 /**
  * The sharpness of the arrow's bend.  Higher numbers result in smoother arrows.
  */
-Blockly.Bubble.ARROW_BEND = 4;
+Bubble.ARROW_BEND = 4;
 
 /**
  * Distance between arrow point and anchor point.
  */
-Blockly.Bubble.ANCHOR_RADIUS = 8;
+Bubble.ANCHOR_RADIUS = 8;
 
 /**
  * Mouse up event data.
  * @type {?Blockly.browserEvents.Data}
  * @private
  */
-Blockly.Bubble.onMouseUpWrapper_ = null;
+Bubble.onMouseUpWrapper_ = null;
 
 /**
  * Mouse move event data.
  * @type {?Blockly.browserEvents.Data}
  * @private
  */
-Blockly.Bubble.onMouseMoveWrapper_ = null;
+Bubble.onMouseMoveWrapper_ = null;
 
 /**
  * Stop binding to the global mouseup and mousemove events.
  * @private
  */
-Blockly.Bubble.unbindDragEvents_ = function() {
-  if (Blockly.Bubble.onMouseUpWrapper_) {
-    Blockly.browserEvents.unbind(Blockly.Bubble.onMouseUpWrapper_);
-    Blockly.Bubble.onMouseUpWrapper_ = null;
+Bubble.unbindDragEvents_ = function() {
+  if (Bubble.onMouseUpWrapper_) {
+    Blockly.browserEvents.unbind(Bubble.onMouseUpWrapper_);
+    Bubble.onMouseUpWrapper_ = null;
   }
-  if (Blockly.Bubble.onMouseMoveWrapper_) {
-    Blockly.browserEvents.unbind(Blockly.Bubble.onMouseMoveWrapper_);
-    Blockly.Bubble.onMouseMoveWrapper_ = null;
+  if (Bubble.onMouseMoveWrapper_) {
+    Blockly.browserEvents.unbind(Bubble.onMouseMoveWrapper_);
+    Bubble.onMouseMoveWrapper_ = null;
   }
 };
 
@@ -170,23 +171,23 @@ Blockly.Bubble.unbindDragEvents_ = function() {
  * @param {!Event} _e Mouse up event.
  * @private
  */
-Blockly.Bubble.bubbleMouseUp_ = function(_e) {
+Bubble.bubbleMouseUp_ = function(_e) {
   Blockly.Touch.clearTouchIdentifier();
-  Blockly.Bubble.unbindDragEvents_();
+  Bubble.unbindDragEvents_();
 };
 
 /**
  * Flag to stop incremental rendering during construction.
  * @private
  */
-Blockly.Bubble.prototype.rendered_ = false;
+Bubble.prototype.rendered_ = false;
 
 /**
  * Absolute coordinate of anchor point, in workspace coordinates.
  * @type {Blockly.utils.Coordinate}
  * @private
  */
-Blockly.Bubble.prototype.anchorXY_ = null;
+Bubble.prototype.anchorXY_ = null;
 
 /**
  * Relative X coordinate of bubble with respect to the anchor's centre,
@@ -194,32 +195,32 @@ Blockly.Bubble.prototype.anchorXY_ = null;
  * In RTL mode the initial value is negated.
  * @private
  */
-Blockly.Bubble.prototype.relativeLeft_ = 0;
+Bubble.prototype.relativeLeft_ = 0;
 
 /**
  * Relative Y coordinate of bubble with respect to the anchor's centre, in
  * workspace units.
  * @private
  */
-Blockly.Bubble.prototype.relativeTop_ = 0;
+Bubble.prototype.relativeTop_ = 0;
 
 /**
  * Width of bubble, in workspace units.
  * @private
  */
-Blockly.Bubble.prototype.width_ = 0;
+Bubble.prototype.width_ = 0;
 
 /**
  * Height of bubble, in workspace units.
  * @private
  */
-Blockly.Bubble.prototype.height_ = 0;
+Bubble.prototype.height_ = 0;
 
 /**
  * Automatically position and reposition the bubble.
  * @private
  */
-Blockly.Bubble.prototype.autoLayout_ = true;
+Bubble.prototype.autoLayout_ = true;
 
 /**
  * Create the bubble's DOM.
@@ -228,7 +229,7 @@ Blockly.Bubble.prototype.autoLayout_ = true;
  * @return {!SVGElement} The bubble's SVG group.
  * @private
  */
-Blockly.Bubble.prototype.createDom_ = function(content, hasResize) {
+Bubble.prototype.createDom_ = function(content, hasResize) {
   /* Create the bubble.  Here's the markup that will be generated:
   <g>
     <g filter="url(#blocklyEmbossFilter837493)">
@@ -263,8 +264,8 @@ Blockly.Bubble.prototype.createDom_ = function(content, hasResize) {
         'class': 'blocklyDraggable',
         'x': 0,
         'y': 0,
-        'rx': Blockly.Bubble.BORDER_WIDTH,
-        'ry': Blockly.Bubble.BORDER_WIDTH
+        'rx': Bubble.BORDER_WIDTH,
+        'ry': Bubble.BORDER_WIDTH
       },
       bubbleEmboss);
   if (hasResize) {
@@ -272,7 +273,7 @@ Blockly.Bubble.prototype.createDom_ = function(content, hasResize) {
         Blockly.utils.Svg.G,
         {'class': this.workspace_.RTL ? 'blocklyResizeSW' : 'blocklyResizeSE'},
         this.bubbleGroup_);
-    const resizeSize = 2 * Blockly.Bubble.BORDER_WIDTH;
+    const resizeSize = 2 * Bubble.BORDER_WIDTH;
     Blockly.utils.dom.createSvgElement(
         Blockly.utils.Svg.POLYGON,
         {'points': '0,x x,x x,0'.replace(/x/g, resizeSize.toString())},
@@ -315,7 +316,7 @@ Blockly.Bubble.prototype.createDom_ = function(content, hasResize) {
  * Return the root node of the bubble's SVG group.
  * @return {!SVGElement} The root SVG node of the bubble's group.
  */
-Blockly.Bubble.prototype.getSvgRoot = function() {
+Bubble.prototype.getSvgRoot = function() {
   return this.bubbleGroup_;
 };
 
@@ -323,7 +324,7 @@ Blockly.Bubble.prototype.getSvgRoot = function() {
  * Expose the block's ID on the bubble's top-level SVG group.
  * @param {string} id ID of block.
  */
-Blockly.Bubble.prototype.setSvgId = function(id) {
+Bubble.prototype.setSvgId = function(id) {
   if (this.bubbleGroup_.dataset) {
     this.bubbleGroup_.dataset['blockId'] = id;
   }
@@ -334,7 +335,7 @@ Blockly.Bubble.prototype.setSvgId = function(id) {
  * @param {!Event} e Mouse down event.
  * @private
  */
-Blockly.Bubble.prototype.bubbleMouseDown_ = function(e) {
+Bubble.prototype.bubbleMouseDown_ = function(e) {
   const gesture = this.workspace_.getGesture(e);
   if (gesture) {
     gesture.handleBubbleStart(e, this);
@@ -346,7 +347,7 @@ Blockly.Bubble.prototype.bubbleMouseDown_ = function(e) {
  * @param {!Event} _e Mouse event.
  * @package
  */
-Blockly.Bubble.prototype.showContextMenu = function(_e) {
+Bubble.prototype.showContextMenu = function(_e) {
   // NOP on bubbles, but used by the bubble dragger to pass events to
   // workspace comments.
 };
@@ -356,7 +357,7 @@ Blockly.Bubble.prototype.showContextMenu = function(_e) {
  * @return {boolean} True if deletable.
  * @package
  */
-Blockly.Bubble.prototype.isDeletable = function() {
+Bubble.prototype.isDeletable = function() {
   return false;
 };
 
@@ -365,7 +366,7 @@ Blockly.Bubble.prototype.isDeletable = function() {
  * @param {boolean} _enable True if the bubble is about to be deleted, false
  *     otherwise.
  */
-Blockly.Bubble.prototype.setDeleteStyle = function(_enable) {
+Bubble.prototype.setDeleteStyle = function(_enable) {
   // NOP if bubble is not deletable.
 };
 
@@ -374,9 +375,9 @@ Blockly.Bubble.prototype.setDeleteStyle = function(_enable) {
  * @param {!Event} e Mouse down event.
  * @private
  */
-Blockly.Bubble.prototype.resizeMouseDown_ = function(e) {
+Bubble.prototype.resizeMouseDown_ = function(e) {
   this.promote();
-  Blockly.Bubble.unbindDragEvents_();
+  Bubble.unbindDragEvents_();
   if (Blockly.utils.isRightButton(e)) {
     // No right-click.
     e.stopPropagation();
@@ -388,9 +389,9 @@ Blockly.Bubble.prototype.resizeMouseDown_ = function(e) {
       new Blockly.utils.Coordinate(
           this.workspace_.RTL ? -this.width_ : this.width_, this.height_));
 
-  Blockly.Bubble.onMouseUpWrapper_ = Blockly.browserEvents.conditionalBind(
-      document, 'mouseup', this, Blockly.Bubble.bubbleMouseUp_);
-  Blockly.Bubble.onMouseMoveWrapper_ = Blockly.browserEvents.conditionalBind(
+  Bubble.onMouseUpWrapper_ = Blockly.browserEvents.conditionalBind(
+      document, 'mouseup', this, Bubble.bubbleMouseUp_);
+  Bubble.onMouseMoveWrapper_ = Blockly.browserEvents.conditionalBind(
       document, 'mousemove', this, this.resizeMouseMove_);
   Blockly.hideChaff();
   // This event has been handled.  No need to bubble up to the document.
@@ -402,7 +403,7 @@ Blockly.Bubble.prototype.resizeMouseDown_ = function(e) {
  * @param {!Event} e Mouse move event.
  * @private
  */
-Blockly.Bubble.prototype.resizeMouseMove_ = function(e) {
+Bubble.prototype.resizeMouseMove_ = function(e) {
   this.autoLayout_ = false;
   const newXY = this.workspace_.moveDrag(e);
   this.setBubbleSize(this.workspace_.RTL ? -newXY.x : newXY.x, newXY.y);
@@ -416,7 +417,7 @@ Blockly.Bubble.prototype.resizeMouseMove_ = function(e) {
  * Register a function as a callback event for when the bubble is resized.
  * @param {!Function} callback The function to call on resize.
  */
-Blockly.Bubble.prototype.registerResizeEvent = function(callback) {
+Bubble.prototype.registerResizeEvent = function(callback) {
   this.resizeCallback_ = callback;
 };
 
@@ -424,7 +425,7 @@ Blockly.Bubble.prototype.registerResizeEvent = function(callback) {
  * Register a function as a callback event for when the bubble is moved.
  * @param {!Function} callback The function to call on move.
  */
-Blockly.Bubble.prototype.registerMoveEvent = function(callback) {
+Bubble.prototype.registerMoveEvent = function(callback) {
   this.moveCallback_ = callback;
 };
 
@@ -433,7 +434,7 @@ Blockly.Bubble.prototype.registerMoveEvent = function(callback) {
  * @return {boolean} Whether or not the bubble has been moved.
  * @package
  */
-Blockly.Bubble.prototype.promote = function() {
+Bubble.prototype.promote = function() {
   const svgGroup = this.bubbleGroup_.parentNode;
   if (svgGroup.lastChild !== this.bubbleGroup_) {
     svgGroup.appendChild(this.bubbleGroup_);
@@ -447,7 +448,7 @@ Blockly.Bubble.prototype.promote = function() {
  * Update the arrow and bubble accordingly.
  * @param {!Blockly.utils.Coordinate} xy Absolute location.
  */
-Blockly.Bubble.prototype.setAnchorLocation = function(xy) {
+Bubble.prototype.setAnchorLocation = function(xy) {
   this.anchorXY_ = xy;
   if (this.rendered_) {
     this.positionBubble_();
@@ -458,7 +459,7 @@ Blockly.Bubble.prototype.setAnchorLocation = function(xy) {
  * Position the bubble so that it does not fall off-screen.
  * @private
  */
-Blockly.Bubble.prototype.layoutBubble_ = function() {
+Bubble.prototype.layoutBubble_ = function() {
   // Get the metrics in workspace units.
   const viewMetrics = this.workspace_.getMetricsManager().getViewMetrics(true);
 
@@ -520,7 +521,7 @@ Blockly.Bubble.prototype.layoutBubble_ = function() {
  * @return {number} The percentage of the bubble that is visible.
  * @private
  */
-Blockly.Bubble.prototype.getOverlap_ = function(relativeMin, viewMetrics) {
+Bubble.prototype.getOverlap_ = function(relativeMin, viewMetrics) {
   // The position of the top-left corner of the bubble in workspace units.
   const bubbleMin = {
     x: this.workspace_.RTL ? (this.anchorXY_.x - relativeMin.x - this.width_) :
@@ -563,7 +564,7 @@ Blockly.Bubble.prototype.getOverlap_ = function(relativeMin, viewMetrics) {
  *     of the bubble.
  * @private
  */
-Blockly.Bubble.prototype.getOptimalRelativeLeft_ = function(viewMetrics) {
+Bubble.prototype.getOptimalRelativeLeft_ = function(viewMetrics) {
   let relativeLeft = -this.width_ / 4;
 
   // No amount of sliding left or right will give us a better overlap.
@@ -619,7 +620,7 @@ Blockly.Bubble.prototype.getOptimalRelativeLeft_ = function(viewMetrics) {
  *     of the bubble.
  * @private
  */
-Blockly.Bubble.prototype.getOptimalRelativeTop_ = function(viewMetrics) {
+Bubble.prototype.getOptimalRelativeTop_ = function(viewMetrics) {
   let relativeTop = -this.height_ / 4;
 
   // No amount of sliding up or down will give us a better overlap.
@@ -650,7 +651,7 @@ Blockly.Bubble.prototype.getOptimalRelativeTop_ = function(viewMetrics) {
  * Move the bubble to a location relative to the anchor's centre.
  * @private
  */
-Blockly.Bubble.prototype.positionBubble_ = function() {
+Bubble.prototype.positionBubble_ = function() {
   let left = this.anchorXY_.x;
   if (this.workspace_.RTL) {
     left -= this.relativeLeft_ + this.width_;
@@ -667,7 +668,7 @@ Blockly.Bubble.prototype.positionBubble_ = function() {
  * @param {number} y The y position to move to.
  * @package
  */
-Blockly.Bubble.prototype.moveTo = function(x, y) {
+Bubble.prototype.moveTo = function(x, y) {
   this.bubbleGroup_.setAttribute('transform', 'translate(' + x + ',' + y + ')');
 };
 
@@ -676,7 +677,7 @@ Blockly.Bubble.prototype.moveTo = function(x, y) {
  * @param {boolean} adding True if adding, false if removing.
  * @package
  */
-Blockly.Bubble.prototype.setDragging = function(adding) {
+Bubble.prototype.setDragging = function(adding) {
   if (!adding && this.moveCallback_) {
     this.moveCallback_();
   }
@@ -686,7 +687,7 @@ Blockly.Bubble.prototype.setDragging = function(adding) {
  * Get the dimensions of this bubble.
  * @return {!Blockly.utils.Size} The height and width of the bubble.
  */
-Blockly.Bubble.prototype.getBubbleSize = function() {
+Bubble.prototype.getBubbleSize = function() {
   return new Blockly.utils.Size(this.width_, this.height_);
 };
 
@@ -695,8 +696,8 @@ Blockly.Bubble.prototype.getBubbleSize = function() {
  * @param {number} width Width of the bubble.
  * @param {number} height Height of the bubble.
  */
-Blockly.Bubble.prototype.setBubbleSize = function(width, height) {
-  const doubleBorderWidth = 2 * Blockly.Bubble.BORDER_WIDTH;
+Bubble.prototype.setBubbleSize = function(width, height) {
+  const doubleBorderWidth = 2 * Bubble.BORDER_WIDTH;
   // Minimum size of a bubble.
   width = Math.max(width, doubleBorderWidth + 45);
   height = Math.max(height, doubleBorderWidth + 20);
@@ -707,7 +708,7 @@ Blockly.Bubble.prototype.setBubbleSize = function(width, height) {
   if (this.resizeGroup_) {
     if (this.workspace_.RTL) {
       // Mirror the resize group.
-      const resizeSize = 2 * Blockly.Bubble.BORDER_WIDTH;
+      const resizeSize = 2 * Bubble.BORDER_WIDTH;
       this.resizeGroup_.setAttribute(
           'transform',
           'translate(' + resizeSize + ',' + (height - doubleBorderWidth) +
@@ -735,7 +736,7 @@ Blockly.Bubble.prototype.setBubbleSize = function(width, height) {
  * Draw the arrow between the bubble and the origin.
  * @private
  */
-Blockly.Bubble.prototype.renderArrow_ = function() {
+Bubble.prototype.renderArrow_ = function() {
   const steps = [];
   // Find the relative coordinates of the center of the bubble.
   const relBubbleX = this.width_ / 2;
@@ -770,11 +771,11 @@ Blockly.Bubble.prototype.renderArrow_ = function() {
     // Calculate the thickness of the base of the arrow.
     const bubbleSize = this.getBubbleSize();
     let thickness =
-        (bubbleSize.width + bubbleSize.height) / Blockly.Bubble.ARROW_THICKNESS;
+        (bubbleSize.width + bubbleSize.height) / Bubble.ARROW_THICKNESS;
     thickness = Math.min(thickness, bubbleSize.width, bubbleSize.height) / 4;
 
     // Back the tip of the arrow off of the anchor.
-    const backoffRatio = 1 - Blockly.Bubble.ANCHOR_RADIUS / hypotenuse;
+    const backoffRatio = 1 - Bubble.ANCHOR_RADIUS / hypotenuse;
     relAnchorX = relBubbleX + backoffRatio * run;
     relAnchorY = relBubbleY + backoffRatio * rise;
 
@@ -790,9 +791,9 @@ Blockly.Bubble.prototype.renderArrow_ = function() {
       swirlAngle -= Math.PI * 2;
     }
     const swirlRise =
-        Math.sin(swirlAngle) * hypotenuse / Blockly.Bubble.ARROW_BEND;
+        Math.sin(swirlAngle) * hypotenuse / Bubble.ARROW_BEND;
     const swirlRun =
-        Math.cos(swirlAngle) * hypotenuse / Blockly.Bubble.ARROW_BEND;
+        Math.cos(swirlAngle) * hypotenuse / Bubble.ARROW_BEND;
 
     steps.push('M' + baseX1 + ',' + baseY1);
     steps.push(
@@ -810,7 +811,7 @@ Blockly.Bubble.prototype.renderArrow_ = function() {
  * Change the colour of a bubble.
  * @param {string} hexColour Hex code of colour.
  */
-Blockly.Bubble.prototype.setColour = function(hexColour) {
+Bubble.prototype.setColour = function(hexColour) {
   this.bubbleBack_.setAttribute('fill', hexColour);
   this.bubbleArrow_.setAttribute('fill', hexColour);
 };
@@ -818,14 +819,14 @@ Blockly.Bubble.prototype.setColour = function(hexColour) {
 /**
  * Dispose of this bubble.
  */
-Blockly.Bubble.prototype.dispose = function() {
+Bubble.prototype.dispose = function() {
   if (this.onMouseDownBubbleWrapper_) {
     Blockly.browserEvents.unbind(this.onMouseDownBubbleWrapper_);
   }
   if (this.onMouseDownResizeWrapper_) {
     Blockly.browserEvents.unbind(this.onMouseDownResizeWrapper_);
   }
-  Blockly.Bubble.unbindDragEvents_();
+  Bubble.unbindDragEvents_();
   Blockly.utils.dom.removeNode(this.bubbleGroup_);
   this.disposed = true;
 };
@@ -839,7 +840,7 @@ Blockly.Bubble.prototype.dispose = function() {
  *     workspace coordinates.
  * @package
  */
-Blockly.Bubble.prototype.moveDuringDrag = function(dragSurface, newLoc) {
+Bubble.prototype.moveDuringDrag = function(dragSurface, newLoc) {
   if (dragSurface) {
     dragSurface.translateSurface(newLoc.x, newLoc.y);
   } else {
@@ -859,7 +860,7 @@ Blockly.Bubble.prototype.moveDuringDrag = function(dragSurface, newLoc) {
  * to the drawing surface's origin (0,0), in workspace units.
  * @return {!Blockly.utils.Coordinate} Object with .x and .y properties.
  */
-Blockly.Bubble.prototype.getRelativeToSurfaceXY = function() {
+Bubble.prototype.getRelativeToSurfaceXY = function() {
   return new Blockly.utils.Coordinate(
       this.workspace_.RTL ?
           -this.relativeLeft_ + this.anchorXY_.x - this.width_ :
@@ -875,7 +876,7 @@ Blockly.Bubble.prototype.getRelativeToSurfaceXY = function() {
  *     otherwise.
  * @package
  */
-Blockly.Bubble.prototype.setAutoLayout = function(enable) {
+Bubble.prototype.setAutoLayout = function(enable) {
   this.autoLayout_ = enable;
 };
 
@@ -885,18 +886,18 @@ Blockly.Bubble.prototype.setAutoLayout = function(enable) {
  * @return {!SVGTextElement} The top-level node of the text.
  * @package
  */
-Blockly.Bubble.textToDom = function(text) {
+Bubble.textToDom = function(text) {
   const paragraph = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.TEXT, {
         'class': 'blocklyText blocklyBubbleText blocklyNoPointerEvents',
-        'y': Blockly.Bubble.BORDER_WIDTH
+        'y': Bubble.BORDER_WIDTH
       },
       null);
   const lines = text.split('\n');
   for (let i = 0; i < lines.length; i++) {
     const tspanElement = Blockly.utils.dom.createSvgElement(
         Blockly.utils.Svg.TSPAN,
-        {'dy': '1em', 'x': Blockly.Bubble.BORDER_WIDTH}, paragraph);
+        {'dy': '1em', 'x': Bubble.BORDER_WIDTH}, paragraph);
     const textNode = document.createTextNode(lines[i]);
     tspanElement.appendChild(textNode);
   }
@@ -909,12 +910,12 @@ Blockly.Bubble.textToDom = function(text) {
  *     editable bubble.
  * @param {!Blockly.BlockSvg} block The block that the bubble is attached to.
  * @param {!Blockly.utils.Coordinate} iconXY The coordinate of the icon.
- * @return {!Blockly.Bubble} The non editable bubble.
+ * @return {!Bubble} The non editable bubble.
  * @package
  */
-Blockly.Bubble.createNonEditableBubble = function(
+Bubble.createNonEditableBubble = function(
     paragraphElement, block, iconXY) {
-  const bubble = new Blockly.Bubble(
+  const bubble = new Bubble(
       /** @type {!Blockly.WorkspaceSvg} */ (block.workspace), paragraphElement,
       block.pathObject.svgPath,
       /** @type {!Blockly.utils.Coordinate} */ (iconXY), null, null);
@@ -927,8 +928,10 @@ Blockly.Bubble.createNonEditableBubble = function(
     for (let i = 0, textElement; (textElement = paragraphElement.childNodes[i]);
          i++) {
       textElement.setAttribute('text-anchor', 'end');
-      textElement.setAttribute('x', maxWidth + Blockly.Bubble.BORDER_WIDTH);
+      textElement.setAttribute('x', maxWidth + Bubble.BORDER_WIDTH);
     }
   }
   return bubble;
 };
+
+exports = Bubble;
diff --git a/tests/deps.js b/tests/deps.js
index 805416071..684fe3598 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -15,7 +15,7 @@ goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.AS
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global']);
-goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], [], {'lang': 'es6', 'module': 'goog'});

From a6a10ee9459b83fc43e03a11bc91c3f795a10e8a Mon Sep 17 00:00:00 2001
From: Maribeth Bottorff <maribethb@google.com>
Date: Tue, 27 Jul 2021 16:31:02 -0700
Subject: [PATCH 383/833] Migrate core/bubble.js to named requires

---
 core/bubble.js | 155 ++++++++++++++++++++++++++-----------------------
 1 file changed, 82 insertions(+), 73 deletions(-)

diff --git a/core/bubble.js b/core/bubble.js
index aeae81769..b1b70da4c 100644
--- a/core/bubble.js
+++ b/core/bubble.js
@@ -13,37 +13,46 @@
 goog.module('Blockly.Bubble');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.IBubble');
-goog.require('Blockly.Scrollbar');
-goog.require('Blockly.Touch');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.math');
-goog.require('Blockly.utils.Size');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.userAgent');
+// TODO(#5073): Fix Blockly requires for Blockly.hideChaff()
+// const Blockly = goog.require('Blockly');
+/* eslint-disable-next-line no-unused-vars */
+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');
+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');
+const userAgent = goog.require('Blockly.utils.userAgent');
+const utils = goog.require('Blockly.utils');
+
 /** @suppress {extraRequire} */
 goog.require('Blockly.Workspace');
 
-goog.requireType('Blockly.BlockDragSurfaceSvg');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.MetricsManager');
-goog.requireType('Blockly.WorkspaceSvg');
+
 
 
 /**
  * Class for UI bubble.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace on which to draw the
+ * @param {!WorkspaceSvg} workspace The workspace on which to draw the
  *     bubble.
  * @param {!Element} content SVG content for the bubble.
  * @param {!Element} shape SVG element to avoid eclipsing.
- * @param {!Blockly.utils.Coordinate} anchorXY Absolute position of bubble's
+ * @param {!Coordinate} anchorXY Absolute position of bubble's
  *     anchor point.
  * @param {?number} bubbleWidth Width of bubble, or null if not resizable.
  * @param {?number} bubbleHeight Height of bubble, or null if not resizable.
- * @implements {Blockly.IBubble}
+ * @implements {IBubble}
  * @constructor
  */
 const Bubble = function(
@@ -68,14 +77,14 @@ const Bubble = function(
 
   /**
    * Mouse down on bubbleBack_ event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onMouseDownBubbleWrapper_ = null;
 
   /**
    * Mouse down on resizeGroup_ event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onMouseDownResizeWrapper_ = null;
@@ -92,7 +101,7 @@ const Bubble = function(
   if (this.workspace_.RTL) {
     angle = -angle;
   }
-  this.arrow_radians_ = Blockly.utils.math.toRadians(angle);
+  this.arrow_radians_ = math.toRadians(angle);
 
   const canvas = workspace.getBubbleCanvas();
   canvas.appendChild(this.createDom_(content, !!(bubbleWidth && bubbleHeight)));
@@ -139,14 +148,14 @@ Bubble.ANCHOR_RADIUS = 8;
 
 /**
  * Mouse up event data.
- * @type {?Blockly.browserEvents.Data}
+ * @type {?browserEvents.Data}
  * @private
  */
 Bubble.onMouseUpWrapper_ = null;
 
 /**
  * Mouse move event data.
- * @type {?Blockly.browserEvents.Data}
+ * @type {?browserEvents.Data}
  * @private
  */
 Bubble.onMouseMoveWrapper_ = null;
@@ -157,11 +166,11 @@ Bubble.onMouseMoveWrapper_ = null;
  */
 Bubble.unbindDragEvents_ = function() {
   if (Bubble.onMouseUpWrapper_) {
-    Blockly.browserEvents.unbind(Bubble.onMouseUpWrapper_);
+    browserEvents.unbind(Bubble.onMouseUpWrapper_);
     Bubble.onMouseUpWrapper_ = null;
   }
   if (Bubble.onMouseMoveWrapper_) {
-    Blockly.browserEvents.unbind(Bubble.onMouseMoveWrapper_);
+    browserEvents.unbind(Bubble.onMouseMoveWrapper_);
     Bubble.onMouseMoveWrapper_ = null;
   }
 };
@@ -172,7 +181,7 @@ Bubble.unbindDragEvents_ = function() {
  * @private
  */
 Bubble.bubbleMouseUp_ = function(_e) {
-  Blockly.Touch.clearTouchIdentifier();
+  Touch.clearTouchIdentifier();
   Bubble.unbindDragEvents_();
 };
 
@@ -184,7 +193,7 @@ Bubble.prototype.rendered_ = false;
 
 /**
  * Absolute coordinate of anchor point, in workspace coordinates.
- * @type {Blockly.utils.Coordinate}
+ * @type {Coordinate}
  * @private
  */
 Bubble.prototype.anchorXY_ = null;
@@ -245,22 +254,22 @@ Bubble.prototype.createDom_ = function(content, hasResize) {
   </g>
   */
   this.bubbleGroup_ =
-      Blockly.utils.dom.createSvgElement(Blockly.utils.Svg.G, {}, null);
+      dom.createSvgElement(Svg.G, {}, null);
   let filter = {
     'filter': 'url(#' +
         this.workspace_.getRenderer().getConstants().embossFilterId + ')'
   };
-  if (Blockly.utils.userAgent.JAVA_FX) {
+  if (userAgent.JAVA_FX) {
     // Multiple reports that JavaFX can't handle filters.
     // https://github.com/google/blockly/issues/99
     filter = {};
   }
-  const bubbleEmboss = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G, filter, this.bubbleGroup_);
-  this.bubbleArrow_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH, {}, bubbleEmboss);
-  this.bubbleBack_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT, {
+  const bubbleEmboss = dom.createSvgElement(
+      Svg.G, filter, this.bubbleGroup_);
+  this.bubbleArrow_ = dom.createSvgElement(
+      Svg.PATH, {}, bubbleEmboss);
+  this.bubbleBack_ = dom.createSvgElement(
+      Svg.RECT, {
         'class': 'blocklyDraggable',
         'x': 0,
         'y': 0,
@@ -269,17 +278,17 @@ Bubble.prototype.createDom_ = function(content, hasResize) {
       },
       bubbleEmboss);
   if (hasResize) {
-    this.resizeGroup_ = Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.G,
+    this.resizeGroup_ = dom.createSvgElement(
+        Svg.G,
         {'class': this.workspace_.RTL ? 'blocklyResizeSW' : 'blocklyResizeSE'},
         this.bubbleGroup_);
     const resizeSize = 2 * Bubble.BORDER_WIDTH;
-    Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.POLYGON,
+    dom.createSvgElement(
+        Svg.POLYGON,
         {'points': '0,x x,x x,0'.replace(/x/g, resizeSize.toString())},
         this.resizeGroup_);
-    Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.LINE, {
+    dom.createSvgElement(
+        Svg.LINE, {
           'class': 'blocklyResizeLine',
           'x1': resizeSize / 3,
           'y1': resizeSize - 1,
@@ -287,8 +296,8 @@ Bubble.prototype.createDom_ = function(content, hasResize) {
           'y2': resizeSize / 3
         },
         this.resizeGroup_);
-    Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.LINE, {
+    dom.createSvgElement(
+        Svg.LINE, {
           'class': 'blocklyResizeLine',
           'x1': resizeSize * 2 / 3,
           'y1': resizeSize - 1,
@@ -301,10 +310,10 @@ Bubble.prototype.createDom_ = function(content, hasResize) {
   }
 
   if (!this.workspace_.options.readOnly) {
-    this.onMouseDownBubbleWrapper_ = Blockly.browserEvents.conditionalBind(
+    this.onMouseDownBubbleWrapper_ = browserEvents.conditionalBind(
         this.bubbleBack_, 'mousedown', this, this.bubbleMouseDown_);
     if (this.resizeGroup_) {
-      this.onMouseDownResizeWrapper_ = Blockly.browserEvents.conditionalBind(
+      this.onMouseDownResizeWrapper_ = browserEvents.conditionalBind(
           this.resizeGroup_, 'mousedown', this, this.resizeMouseDown_);
     }
   }
@@ -378,7 +387,7 @@ Bubble.prototype.setDeleteStyle = function(_enable) {
 Bubble.prototype.resizeMouseDown_ = function(e) {
   this.promote();
   Bubble.unbindDragEvents_();
-  if (Blockly.utils.isRightButton(e)) {
+  if (utils.isRightButton(e)) {
     // No right-click.
     e.stopPropagation();
     return;
@@ -386,12 +395,12 @@ Bubble.prototype.resizeMouseDown_ = function(e) {
   // Left-click (or middle click)
   this.workspace_.startDrag(
       e,
-      new Blockly.utils.Coordinate(
+      new Coordinate(
           this.workspace_.RTL ? -this.width_ : this.width_, this.height_));
 
-  Bubble.onMouseUpWrapper_ = Blockly.browserEvents.conditionalBind(
+  Bubble.onMouseUpWrapper_ = browserEvents.conditionalBind(
       document, 'mouseup', this, Bubble.bubbleMouseUp_);
-  Bubble.onMouseMoveWrapper_ = Blockly.browserEvents.conditionalBind(
+  Bubble.onMouseMoveWrapper_ = browserEvents.conditionalBind(
       document, 'mousemove', this, this.resizeMouseMove_);
   Blockly.hideChaff();
   // This event has been handled.  No need to bubble up to the document.
@@ -446,7 +455,7 @@ Bubble.prototype.promote = function() {
 /**
  * Notification that the anchor has moved.
  * Update the arrow and bubble accordingly.
- * @param {!Blockly.utils.Coordinate} xy Absolute location.
+ * @param {!Coordinate} xy Absolute location.
  */
 Bubble.prototype.setAnchorLocation = function(xy) {
   this.anchorXY_ = xy;
@@ -516,7 +525,7 @@ Bubble.prototype.layoutBubble_ = function() {
  * workspace (what percentage of the bubble is visible).
  * @param {!{x: number, y: number}} relativeMin The position of the top-left
  *     corner of the bubble relative to the anchor point.
- * @param {!Blockly.MetricsManager.ContainerRegion} viewMetrics The view metrics
+ * @param {!MetricsManager.ContainerRegion} viewMetrics The view metrics
  *     of the workspace the bubble will appear in.
  * @return {number} The percentage of the bubble that is visible.
  * @private
@@ -558,7 +567,7 @@ Bubble.prototype.getOverlap_ = function(relativeMin, viewMetrics) {
  * Calculate what the optimal horizontal position of the top-left corner of the
  * bubble is (relative to the anchor point) so that the most area of the
  * bubble is shown.
- * @param {!Blockly.MetricsManager.ContainerRegion} viewMetrics The view metrics
+ * @param {!MetricsManager.ContainerRegion} viewMetrics The view metrics
  *     of the workspace the bubble will appear in.
  * @return {number} The optimal horizontal position of the top-left corner
  *     of the bubble.
@@ -580,7 +589,7 @@ Bubble.prototype.getOptimalRelativeLeft_ = function(viewMetrics) {
     const workspaceRight = viewMetrics.left + viewMetrics.width;
     const workspaceLeft = viewMetrics.left +
         // Thickness in workspace units.
-        (Blockly.Scrollbar.scrollbarThickness / this.workspace_.scale);
+        (Scrollbar.scrollbarThickness / this.workspace_.scale);
 
     if (bubbleLeft < workspaceLeft) {
       // Slide the bubble right until it is onscreen.
@@ -596,7 +605,7 @@ Bubble.prototype.getOptimalRelativeLeft_ = function(viewMetrics) {
     const workspaceLeft = viewMetrics.left;
     const workspaceRight = viewMetrics.left + viewMetrics.width -
         // Thickness in workspace units.
-        (Blockly.Scrollbar.scrollbarThickness / this.workspace_.scale);
+        (Scrollbar.scrollbarThickness / this.workspace_.scale);
 
     if (bubbleLeft < workspaceLeft) {
       // Slide the bubble right until it is onscreen.
@@ -614,7 +623,7 @@ Bubble.prototype.getOptimalRelativeLeft_ = function(viewMetrics) {
  * Calculate what the optimal vertical position of the top-left corner of
  * the bubble is (relative to the anchor point) so that the most area of the
  * bubble is shown.
- * @param {!Blockly.MetricsManager.ContainerRegion} viewMetrics The view metrics
+ * @param {!MetricsManager.ContainerRegion} viewMetrics The view metrics
  *     of the workspace the bubble will appear in.
  * @return {number} The optimal vertical position of the top-left corner
  *     of the bubble.
@@ -633,7 +642,7 @@ Bubble.prototype.getOptimalRelativeTop_ = function(viewMetrics) {
   const workspaceTop = viewMetrics.top;
   const workspaceBottom = viewMetrics.top + viewMetrics.height -
       // Thickness in workspace units.
-      (Blockly.Scrollbar.scrollbarThickness / this.workspace_.scale);
+      (Scrollbar.scrollbarThickness / this.workspace_.scale);
 
   const anchorY = this.anchorXY_.y;
   if (bubbleTop < workspaceTop) {
@@ -685,10 +694,10 @@ Bubble.prototype.setDragging = function(adding) {
 
 /**
  * Get the dimensions of this bubble.
- * @return {!Blockly.utils.Size} The height and width of the bubble.
+ * @return {!Size} The height and width of the bubble.
  */
 Bubble.prototype.getBubbleSize = function() {
-  return new Blockly.utils.Size(this.width_, this.height_);
+  return new Size(this.width_, this.height_);
 };
 
 /**
@@ -821,22 +830,22 @@ Bubble.prototype.setColour = function(hexColour) {
  */
 Bubble.prototype.dispose = function() {
   if (this.onMouseDownBubbleWrapper_) {
-    Blockly.browserEvents.unbind(this.onMouseDownBubbleWrapper_);
+    browserEvents.unbind(this.onMouseDownBubbleWrapper_);
   }
   if (this.onMouseDownResizeWrapper_) {
-    Blockly.browserEvents.unbind(this.onMouseDownResizeWrapper_);
+    browserEvents.unbind(this.onMouseDownResizeWrapper_);
   }
   Bubble.unbindDragEvents_();
-  Blockly.utils.dom.removeNode(this.bubbleGroup_);
+  dom.removeNode(this.bubbleGroup_);
   this.disposed = true;
 };
 
 /**
  * Move this bubble during a drag, taking into account whether or not there is
  * a drag surface.
- * @param {Blockly.BlockDragSurfaceSvg} dragSurface The surface that carries
+ * @param {BlockDragSurfaceSvg} dragSurface The surface that carries
  *     rendered items during a drag, or null if no drag surface is in use.
- * @param {!Blockly.utils.Coordinate} newLoc The location to translate to, in
+ * @param {!Coordinate} newLoc The location to translate to, in
  *     workspace coordinates.
  * @package
  */
@@ -858,10 +867,10 @@ Bubble.prototype.moveDuringDrag = function(dragSurface, newLoc) {
 /**
  * Return the coordinates of the top-left corner of this bubble's body relative
  * to the drawing surface's origin (0,0), in workspace units.
- * @return {!Blockly.utils.Coordinate} Object with .x and .y properties.
+ * @return {!Coordinate} Object with .x and .y properties.
  */
 Bubble.prototype.getRelativeToSurfaceXY = function() {
-  return new Blockly.utils.Coordinate(
+  return new Coordinate(
       this.workspace_.RTL ?
           -this.relativeLeft_ + this.anchorXY_.x - this.width_ :
           this.anchorXY_.x + this.relativeLeft_,
@@ -887,16 +896,16 @@ Bubble.prototype.setAutoLayout = function(enable) {
  * @package
  */
 Bubble.textToDom = function(text) {
-  const paragraph = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.TEXT, {
+  const paragraph = dom.createSvgElement(
+      Svg.TEXT, {
         'class': 'blocklyText blocklyBubbleText blocklyNoPointerEvents',
         'y': Bubble.BORDER_WIDTH
       },
       null);
   const lines = text.split('\n');
   for (let i = 0; i < lines.length; i++) {
-    const tspanElement = Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.TSPAN,
+    const tspanElement = dom.createSvgElement(
+        Svg.TSPAN,
         {'dy': '1em', 'x': Bubble.BORDER_WIDTH}, paragraph);
     const textNode = document.createTextNode(lines[i]);
     tspanElement.appendChild(textNode);
@@ -908,17 +917,17 @@ Bubble.textToDom = function(text) {
  * Creates a bubble that can not be edited.
  * @param {!SVGTextElement} paragraphElement The text element for the non
  *     editable bubble.
- * @param {!Blockly.BlockSvg} block The block that the bubble is attached to.
- * @param {!Blockly.utils.Coordinate} iconXY The coordinate of the icon.
+ * @param {!BlockSvg} block The block that the bubble is attached to.
+ * @param {!Coordinate} iconXY The coordinate of the icon.
  * @return {!Bubble} The non editable bubble.
  * @package
  */
 Bubble.createNonEditableBubble = function(
     paragraphElement, block, iconXY) {
   const bubble = new Bubble(
-      /** @type {!Blockly.WorkspaceSvg} */ (block.workspace), paragraphElement,
+      /** @type {!WorkspaceSvg} */ (block.workspace), paragraphElement,
       block.pathObject.svgPath,
-      /** @type {!Blockly.utils.Coordinate} */ (iconXY), null, null);
+      /** @type {!Coordinate} */ (iconXY), null, null);
   // Expose this bubble's block's ID on its top-level SVG group.
   bubble.setSvgId(block.id);
   if (block.RTL) {

From e1f06ca8a43bc7a82d717cee6251c9fc07738fe5 Mon Sep 17 00:00:00 2001
From: Maribeth Bottorff <maribethb@google.com>
Date: Tue, 27 Jul 2021 16:34:32 -0700
Subject: [PATCH 384/833] clang-format core/bubble.js

---
 core/bubble.js | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/core/bubble.js b/core/bubble.js
index b1b70da4c..a31d16a90 100644
--- a/core/bubble.js
+++ b/core/bubble.js
@@ -41,7 +41,6 @@ goog.require('Blockly.Workspace');
 
 
 
-
 /**
  * Class for UI bubble.
  * @param {!WorkspaceSvg} workspace The workspace on which to draw the
@@ -253,8 +252,7 @@ Bubble.prototype.createDom_ = function(content, hasResize) {
     [...content goes here...]
   </g>
   */
-  this.bubbleGroup_ =
-      dom.createSvgElement(Svg.G, {}, null);
+  this.bubbleGroup_ = dom.createSvgElement(Svg.G, {}, null);
   let filter = {
     'filter': 'url(#' +
         this.workspace_.getRenderer().getConstants().embossFilterId + ')'
@@ -264,10 +262,8 @@ Bubble.prototype.createDom_ = function(content, hasResize) {
     // https://github.com/google/blockly/issues/99
     filter = {};
   }
-  const bubbleEmboss = dom.createSvgElement(
-      Svg.G, filter, this.bubbleGroup_);
-  this.bubbleArrow_ = dom.createSvgElement(
-      Svg.PATH, {}, bubbleEmboss);
+  const bubbleEmboss = dom.createSvgElement(Svg.G, filter, this.bubbleGroup_);
+  this.bubbleArrow_ = dom.createSvgElement(Svg.PATH, {}, bubbleEmboss);
   this.bubbleBack_ = dom.createSvgElement(
       Svg.RECT, {
         'class': 'blocklyDraggable',
@@ -485,8 +481,10 @@ Bubble.prototype.layoutBubble_ = function() {
   const endPosition = {x: bbox.width, y: optimalTop};
   const bottomPosition = {x: optimalLeft, y: bbox.height};
 
-  const closerPosition = bbox.width < bbox.height ? endPosition : bottomPosition;
-  const fartherPosition = bbox.width < bbox.height ? bottomPosition : endPosition;
+  const closerPosition =
+      bbox.width < bbox.height ? endPosition : bottomPosition;
+  const fartherPosition =
+      bbox.width < bbox.height ? bottomPosition : endPosition;
 
   const topPositionOverlap = this.getOverlap_(topPosition, viewMetrics);
   const startPositionOverlap = this.getOverlap_(startPosition, viewMetrics);
@@ -538,7 +536,10 @@ Bubble.prototype.getOverlap_ = function(relativeMin, viewMetrics) {
     y: relativeMin.y + this.anchorXY_.y
   };
   // The position of the bottom-right corner of the bubble in workspace units.
-  const bubbleMax = {x: bubbleMin.x + this.width_, y: bubbleMin.y + this.height_};
+  const bubbleMax = {
+    x: bubbleMin.x + this.width_,
+    y: bubbleMin.y + this.height_
+  };
 
   // We could adjust these values to account for the scrollbars, but the
   // bubbles should have been adjusted to not collide with them anyway, so
@@ -799,10 +800,8 @@ Bubble.prototype.renderArrow_ = function() {
     if (swirlAngle > Math.PI * 2) {
       swirlAngle -= Math.PI * 2;
     }
-    const swirlRise =
-        Math.sin(swirlAngle) * hypotenuse / Bubble.ARROW_BEND;
-    const swirlRun =
-        Math.cos(swirlAngle) * hypotenuse / Bubble.ARROW_BEND;
+    const swirlRise = Math.sin(swirlAngle) * hypotenuse / Bubble.ARROW_BEND;
+    const swirlRun = Math.cos(swirlAngle) * hypotenuse / Bubble.ARROW_BEND;
 
     steps.push('M' + baseX1 + ',' + baseY1);
     steps.push(
@@ -905,8 +904,7 @@ Bubble.textToDom = function(text) {
   const lines = text.split('\n');
   for (let i = 0; i < lines.length; i++) {
     const tspanElement = dom.createSvgElement(
-        Svg.TSPAN,
-        {'dy': '1em', 'x': Bubble.BORDER_WIDTH}, paragraph);
+        Svg.TSPAN, {'dy': '1em', 'x': Bubble.BORDER_WIDTH}, paragraph);
     const textNode = document.createTextNode(lines[i]);
     tspanElement.appendChild(textNode);
   }
@@ -922,8 +920,7 @@ Bubble.textToDom = function(text) {
  * @return {!Bubble} The non editable bubble.
  * @package
  */
-Bubble.createNonEditableBubble = function(
-    paragraphElement, block, iconXY) {
+Bubble.createNonEditableBubble = function(paragraphElement, block, iconXY) {
   const bubble = new Bubble(
       /** @type {!WorkspaceSvg} */ (block.workspace), paragraphElement,
       block.pathObject.svgPath,

From adc4c02abfd85b4d60a064d94b433e52ed56f787 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 27 Jul 2021 16:39:44 -0700
Subject: [PATCH 385/833] Fix lint

---
 core/field_variable.js | 3 +++
 core/gesture.js        | 2 ++
 core/zoom_controls.js  | 8 ++++----
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/field_variable.js b/core/field_variable.js
index f700d4a99..f4ae38a51 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -13,9 +13,12 @@
 goog.module('Blockly.FieldVariable');
 goog.module.declareLegacyNamespace();
 
+/* 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 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');
diff --git a/core/gesture.js b/core/gesture.js
index 933930e44..a1ef6ca91 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -22,6 +22,7 @@ const BubbleDragger = goog.require('Blockly.BubbleDragger');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 /* eslint-disable-next-line no-unused-vars */
 const Events = goog.require('Blockly.Events');
+/* 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');
@@ -33,6 +34,7 @@ const Tooltip = goog.require('Blockly.Tooltip');
 const Touch = goog.require('Blockly.Touch');
 /* eslint-disable-next-line no-unused-vars */
 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');
diff --git a/core/zoom_controls.js b/core/zoom_controls.js
index 37c1cb17d..1b7a568cc 100644
--- a/core/zoom_controls.js
+++ b/core/zoom_controls.js
@@ -13,10 +13,10 @@
 goog.module('Blockly.ZoomControls');
 goog.module.declareLegacyNamespace();
 
-const Blockly = goog.require('Blockly');
 const ComponentManager = goog.require('Blockly.ComponentManager');
 const Css = goog.require('Blockly.Css');
 const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
 const IPositionable = goog.require('Blockly.IPositionable');
 const Rect = goog.require('Blockly.utils.Rect');
 const Svg = goog.require('Blockly.utils.Svg');
@@ -54,7 +54,7 @@ const ZoomControls = function(workspace) {
 
   /**
    * A handle to use to unbind the mouse down event handler for zoom reset
-   *    button. Opaque data returned from Blockly.bindEventWithChecks_.
+   *    button. Opaque data returned from browserEvents.conditionalBind.
    * @type {?browserEvents.Data}
    * @private
    */
@@ -62,7 +62,7 @@ const ZoomControls = function(workspace) {
 
   /**
    * A handle to use to unbind the mouse down event handler for zoom in button.
-   * Opaque data returned from Blockly.bindEventWithChecks_.
+   * Opaque data returned from browserEvents.conditionalBind.
    * @type {?browserEvents.Data}
    * @private
    */
@@ -70,7 +70,7 @@ const ZoomControls = function(workspace) {
 
   /**
    * A handle to use to unbind the mouse down event handler for zoom out button.
-   * Opaque data returned from Blockly.bindEventWithChecks_.
+   * Opaque data returned from browserEvents.conditionalBind.
    * @type {?browserEvents.Data}
    * @private
    */

From 4c6b2bae3985979c565d83af4622c1d01adb7c1f Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 27 Jul 2021 16:45:05 -0700
Subject: [PATCH 386/833] Rebuild

---
 tests/deps.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/deps.js b/tests/deps.js
index 0018d3a1d..0820fc9e1 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -210,6 +210,6 @@ goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.Workspa
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate']);
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
-goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);
 

From 38374405647c789c4e74eafae77f578e5a92177f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 19 Jul 2021 11:27:57 -0700
Subject: [PATCH 387/833] Migrate core/keyboard_nav/marker.js to ES6 const/let

---
 core/keyboard_nav/marker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/keyboard_nav/marker.js b/core/keyboard_nav/marker.js
index de31d6084..555bf7c97 100644
--- a/core/keyboard_nav/marker.js
+++ b/core/keyboard_nav/marker.js
@@ -85,7 +85,7 @@ Blockly.Marker.prototype.getCurNode = function() {
  * @param {Blockly.ASTNode} newNode The new location of the marker.
  */
 Blockly.Marker.prototype.setCurNode = function(newNode) {
-  var oldNode = this.curNode_;
+  const oldNode = this.curNode_;
   this.curNode_ = newNode;
   if (this.drawer_) {
     this.drawer_.draw(oldNode, this.curNode_);

From 014316431e848ff549352d1f5ba4e491219199a3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 19 Jul 2021 11:28:11 -0700
Subject: [PATCH 388/833] Migrate core/keyboard_nav/marker.js to goog.module

---
 core/keyboard_nav/marker.js | 21 ++++++++++++---------
 tests/deps.js               |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/core/keyboard_nav/marker.js b/core/keyboard_nav/marker.js
index 555bf7c97..115a1f861 100644
--- a/core/keyboard_nav/marker.js
+++ b/core/keyboard_nav/marker.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Marker');
+goog.module('Blockly.Marker');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.ASTNode');
 
@@ -23,7 +24,7 @@ goog.requireType('Blockly.blockRendering.MarkerSvg');
  * This is used in keyboard navigation to save a location in the Blockly AST.
  * @constructor
  */
-Blockly.Marker = function() {
+const Marker = function() {
   /**
    * The colour of the marker.
    * @type {?string}
@@ -56,7 +57,7 @@ Blockly.Marker = function() {
  * @param {Blockly.blockRendering.MarkerSvg} drawer The object in charge of
  *     drawing the marker.
  */
-Blockly.Marker.prototype.setDrawer = function(drawer) {
+Marker.prototype.setDrawer = function(drawer) {
   this.drawer_ = drawer;
 };
 
@@ -65,7 +66,7 @@ Blockly.Marker.prototype.setDrawer = function(drawer) {
  * @return {Blockly.blockRendering.MarkerSvg} The object in charge of drawing
  *     the marker.
  */
-Blockly.Marker.prototype.getDrawer = function() {
+Marker.prototype.getDrawer = function() {
   return this.drawer_;
 };
 
@@ -74,7 +75,7 @@ Blockly.Marker.prototype.getDrawer = function() {
  * @return {Blockly.ASTNode} The current field, connection, or block the marker
  *     is on.
  */
-Blockly.Marker.prototype.getCurNode = function() {
+Marker.prototype.getCurNode = function() {
   return this.curNode_;
 };
 
@@ -84,7 +85,7 @@ Blockly.Marker.prototype.getCurNode = function() {
  * output or previous connection on a stack.
  * @param {Blockly.ASTNode} newNode The new location of the marker.
  */
-Blockly.Marker.prototype.setCurNode = function(newNode) {
+Marker.prototype.setCurNode = function(newNode) {
   const oldNode = this.curNode_;
   this.curNode_ = newNode;
   if (this.drawer_) {
@@ -96,7 +97,7 @@ Blockly.Marker.prototype.setCurNode = function(newNode) {
  * Redraw the current marker.
  * @package
  */
-Blockly.Marker.prototype.draw = function() {
+Marker.prototype.draw = function() {
   if (this.drawer_) {
     this.drawer_.draw(this.curNode_, this.curNode_);
   }
@@ -105,7 +106,7 @@ Blockly.Marker.prototype.draw = function() {
 /**
  * Hide the marker SVG.
  */
-Blockly.Marker.prototype.hide = function() {
+Marker.prototype.hide = function() {
   if (this.drawer_) {
     this.drawer_.hide();
   }
@@ -114,8 +115,10 @@ Blockly.Marker.prototype.hide = function() {
 /**
  * Dispose of this marker.
  */
-Blockly.Marker.prototype.dispose = function() {
+Marker.prototype.dispose = function() {
   if (this.getDrawer()) {
     this.getDrawer().dispose();
   }
 };
+
+exports = Marker;
diff --git a/tests/deps.js b/tests/deps.js
index 759caeae4..8d3102c14 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -105,7 +105,7 @@ goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstan
 goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], ['Blockly.ASTNode']);
+goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], ['Blockly.ASTNode'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], [], {'lang': 'es6', 'module': 'goog'});
 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'});

From 50f7293f2d4b16eda5c72cf3e4d9e1c275991d5e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 22 Jul 2021 10:34:35 -0700
Subject: [PATCH 389/833] Migrate core/keyboard_nav/marker.js named requires

---
 core/keyboard_nav/marker.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/core/keyboard_nav/marker.js b/core/keyboard_nav/marker.js
index 115a1f861..28f905949 100644
--- a/core/keyboard_nav/marker.js
+++ b/core/keyboard_nav/marker.js
@@ -14,9 +14,8 @@
 goog.module('Blockly.Marker');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.ASTNode');
-
-goog.requireType('Blockly.blockRendering.MarkerSvg');
+const ASTNode = goog.require('Blockly.ASTNode');
+const MarkerSvg = goog.requireType('Blockly.blockRendering.MarkerSvg');
 
 
 /**
@@ -33,14 +32,14 @@ const Marker = function() {
 
   /**
    * The current location of the marker.
-   * @type {Blockly.ASTNode}
+   * @type {ASTNode}
    * @private
    */
   this.curNode_ = null;
 
   /**
    * The object in charge of drawing the visual representation of the current node.
-   * @type {Blockly.blockRendering.MarkerSvg}
+   * @type {MarkerSvg}
    * @private
    */
   this.drawer_ = null;
@@ -54,7 +53,7 @@ const Marker = function() {
 
 /**
  * Sets the object in charge of drawing the marker.
- * @param {Blockly.blockRendering.MarkerSvg} drawer The object in charge of
+ * @param {MarkerSvg} drawer The object in charge of
  *     drawing the marker.
  */
 Marker.prototype.setDrawer = function(drawer) {
@@ -63,7 +62,7 @@ Marker.prototype.setDrawer = function(drawer) {
 
 /**
  * Get the current drawer for the marker.
- * @return {Blockly.blockRendering.MarkerSvg} The object in charge of drawing
+ * @return {MarkerSvg} The object in charge of drawing
  *     the marker.
  */
 Marker.prototype.getDrawer = function() {
@@ -72,7 +71,7 @@ Marker.prototype.getDrawer = function() {
 
 /**
  * Gets the current location of the marker.
- * @return {Blockly.ASTNode} The current field, connection, or block the marker
+ * @return {ASTNode} The current field, connection, or block the marker
  *     is on.
  */
 Marker.prototype.getCurNode = function() {
@@ -83,7 +82,7 @@ Marker.prototype.getCurNode = function() {
  * Set the location of the marker and call the update method.
  * Setting isStack to true will only work if the newLocation is the top most
  * output or previous connection on a stack.
- * @param {Blockly.ASTNode} newNode The new location of the marker.
+ * @param {ASTNode} newNode The new location of the marker.
  */
 Marker.prototype.setCurNode = function(newNode) {
   const oldNode = this.curNode_;

From 1a83b7584680f48a226d40cc87780d50eeec127c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 22 Jul 2021 10:34:44 -0700
Subject: [PATCH 390/833] clang-format core/keyboard_nav/marker.js

---
 core/keyboard_nav/marker.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/keyboard_nav/marker.js b/core/keyboard_nav/marker.js
index 28f905949..654703f7b 100644
--- a/core/keyboard_nav/marker.js
+++ b/core/keyboard_nav/marker.js
@@ -38,7 +38,8 @@ const Marker = function() {
   this.curNode_ = null;
 
   /**
-   * The object in charge of drawing the visual representation of the current node.
+   * The object in charge of drawing the visual representation of the current
+   * node.
    * @type {MarkerSvg}
    * @private
    */

From 667048b3f52262e8f1e0ff3c78a0bf411b20be4d Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 23 Jul 2021 19:29:17 -0700
Subject: [PATCH 391/833] Add eslint disable and make ASTNode a requireType

---
 core/keyboard_nav/marker.js | 4 +++-
 tests/deps.js               | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/keyboard_nav/marker.js b/core/keyboard_nav/marker.js
index 654703f7b..4b6f341bb 100644
--- a/core/keyboard_nav/marker.js
+++ b/core/keyboard_nav/marker.js
@@ -14,7 +14,9 @@
 goog.module('Blockly.Marker');
 goog.module.declareLegacyNamespace();
 
-const ASTNode = goog.require('Blockly.ASTNode');
+/* 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');
 
 
diff --git a/tests/deps.js b/tests/deps.js
index 8d3102c14..6666e9369 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -105,7 +105,7 @@ goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstan
 goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], ['Blockly.ASTNode'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], [], {'lang': 'es6', 'module': 'goog'});
 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'});

From 961254663d1a0347e664638c077af54d3fbc6002 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Wed, 28 Jul 2021 11:57:24 -0700
Subject: [PATCH 392/833] Move clipboard functions to a separate namespace

---
 core/blockly.js                       |  50 ++----------
 core/clipboard.js                     | 106 ++++++++++++++++++++++++++
 core/contextmenu_items.js             |   4 +-
 core/shortcut_items.js                |   7 +-
 tests/deps.js                         |   7 +-
 tests/mocha/contextmenu_items_test.js |  10 +--
 tests/mocha/keydown_test.js           |   2 +-
 7 files changed, 129 insertions(+), 57 deletions(-)
 create mode 100644 core/clipboard.js

diff --git a/core/blockly.js b/core/blockly.js
index 94f485c99..808c035b0 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -17,6 +17,7 @@
 goog.provide('Blockly');
 
 goog.require('Blockly.browserEvents');
+goog.require('Blockly.clipboard');
 goog.require('Blockly.ComponentManager');
 goog.require('Blockly.connectionTypes');
 goog.require('Blockly.constants');
@@ -96,21 +97,21 @@ Blockly.draggingConnections = [];
  * @type {Element}
  * @private
  */
-Blockly.clipboardXml_ = null;
+Blockly.clipboardXml_ = Blockly.clipboard.xml;
 
 /**
  * Source of the local clipboard.
  * @type {Blockly.WorkspaceSvg}
  * @private
  */
-Blockly.clipboardSource_ = null;
+Blockly.clipboardSource_ = Blockly.clipboard.source;
 
 /**
  * Map of types to type counts for the clipboard object and descendants.
  * @type {Object}
  * @private
  */
-Blockly.clipboardTypeCounts_ = null;
+Blockly.clipboardTypeCounts_ = Blockly.clipboard.typeCounts;
 
 /**
  * Cached value for whether 3D is supported.
@@ -234,39 +235,14 @@ Blockly.deleteBlock = function(selected) {
  * @param {!Blockly.ICopyable} toCopy Block or Workspace Comment to be copied.
  * @package
  */
-Blockly.copy = function(toCopy) {
-  var data = toCopy.toCopyData();
-  if (data) {
-    Blockly.clipboardXml_ = data.xml;
-    Blockly.clipboardSource_ = data.source;
-    Blockly.clipboardTypeCounts_ = data.typeCounts;
-  }
-};
+Blockly.copy = Blockly.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 = function() {
-  if (!Blockly.clipboardXml_) {
-    return false;
-  }
-  // Pasting always pastes to the main workspace, even if the copy
-  // started in a flyout workspace.
-  var workspace = Blockly.clipboardSource_;
-  if (workspace.isFlyout) {
-    workspace = workspace.targetWorkspace;
-  }
-  if (Blockly.clipboardTypeCounts_ &&
-      workspace.isCapacityAvailable(Blockly.clipboardTypeCounts_)) {
-    Blockly.Events.setGroup(true);
-    workspace.paste(Blockly.clipboardXml_);
-    Blockly.Events.setGroup(false);
-    return true;
-  }
-  return false;
-};
+Blockly.paste = Blockly.clipboard.paste;
 
 /**
  * Duplicate this block and its children, or a workspace comment.
@@ -274,19 +250,7 @@ Blockly.paste = function() {
  *     copied.
  * @package
  */
-Blockly.duplicate = function(toDuplicate) {
-  // Save the clipboard.
-  var clipboardXml = Blockly.clipboardXml_;
-  var clipboardSource = Blockly.clipboardSource_;
-
-  // Create a duplicate via a copy/paste operation.
-  Blockly.copy(toDuplicate);
-  toDuplicate.workspace.paste(Blockly.clipboardXml_);
-
-  // Restore the clipboard.
-  Blockly.clipboardXml_ = clipboardXml;
-  Blockly.clipboardSource_ = clipboardSource;
-};
+Blockly.duplicate = Blockly.clipboard.duplicate;
 
 /**
  * Cancel the native context menu, unless the focus is on an HTML input widget.
diff --git a/core/clipboard.js b/core/clipboard.js
new file mode 100644
index 000000000..887346a58
--- /dev/null
+++ b/core/clipboard.js
@@ -0,0 +1,106 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Blockly's internal clipboard for managing copy-paste.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.module('Blockly.clipboard');
+goog.module.declareLegacyNamespace();
+
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const ICopyable = goog.requireType('Blockly.ICopyable');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+
+
+/**
+ * Contents of the local clipboard.
+ * @type {Element}
+ * @private
+ */
+let xml = null;
+exports.xml = xml;
+
+/**
+ * Source of the local clipboard.
+ * @type {WorkspaceSvg}
+ * @private
+ */
+let source = null;
+exports.source = source;
+
+/**
+ * Map of types to type counts for the clipboard object and descendants.
+ * @type {Object}
+ * @private
+ */
+let typeCounts = null;
+exports.typeCounts = typeCounts;
+
+/**
+ * Copy a block or workspace comment onto the local clipboard.
+ * @param {!ICopyable} toCopy Block or Workspace Comment to be copied.
+ * @package
+ */
+const copy = function(toCopy) {
+  var data = toCopy.toCopyData();
+  if (data) {
+    xml = data.xml;
+    source = data.source;
+    typeCounts = data.typeCounts;
+  }
+};
+exports.copy = copy;
+
+/**
+ * Paste a block or workspace comment on to the main workspace.
+ * @return {boolean} True if the paste was successful, false otherwise.
+ * @package
+ */
+const paste = function() {
+  if (!xml) {
+    return false;
+  }
+  // Pasting always pastes to the main workspace, even if the copy
+  // started in a flyout workspace.
+  var workspace = source;
+  if (workspace.isFlyout) {
+    workspace = workspace.targetWorkspace;
+  }
+  if (typeCounts && workspace.isCapacityAvailable(typeCounts)) {
+    Events.setGroup(true);
+    workspace.paste(xml);
+    Events.setGroup(false);
+    return true;
+  }
+  return false;
+};
+exports.paste = paste;
+
+/**
+ * Duplicate this block and its children, or a workspace comment.
+ * @param {!ICopyable} toDuplicate Block or Workspace Comment to be
+ *     copied.
+ * @package
+ */
+const duplicate = function(toDuplicate) {
+  // Save the clipboard.
+  const oldXml = xml;
+  const oldSource = source;
+
+  // Create a duplicate via a copy/paste operation.
+  copy(toDuplicate);
+  toDuplicate.workspace.paste(xml);
+
+  // Restore the clipboard.
+  xml = oldXml;
+  source = oldSource;
+};
+exports.duplicate = duplicate;
diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js
index dffd4a83d..e985a8e5c 100644
--- a/core/contextmenu_items.js
+++ b/core/contextmenu_items.js
@@ -15,7 +15,7 @@
  * @namespace
  */
 goog.provide('Blockly.ContextMenuItems');
-
+goog.require('Blockly.clipboard');
 /** @suppress {extraRequire} */
 goog.require('Blockly.constants');
 goog.require('Blockly.ContextMenuRegistry');
@@ -316,7 +316,7 @@ Blockly.ContextMenuItems.registerDuplicate = function() {
     },
     callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
       if (scope.block) {
-        Blockly.duplicate(scope.block);
+        Blockly.clipboard.duplicate(scope.block);
       }
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
diff --git a/core/shortcut_items.js b/core/shortcut_items.js
index ef1cb07fc..494b64bfe 100644
--- a/core/shortcut_items.js
+++ b/core/shortcut_items.js
@@ -16,6 +16,7 @@
  */
 goog.provide('Blockly.ShortcutItems');
 
+goog.require('Blockly.clipboard');
 goog.require('Blockly.Gesture');
 goog.require('Blockly.ShortcutRegistry');
 goog.require('Blockly.utils.KeyCodes');
@@ -104,7 +105,7 @@ Blockly.ShortcutItems.registerCopy = function() {
       // an error due to the lack of a selection.
       e.preventDefault();
       Blockly.hideChaff();
-      Blockly.copy(/** @type {!Blockly.ICopyable} */ (Blockly.selected));
+      Blockly.clipboard.copy(/** @type {!Blockly.ICopyable} */ (Blockly.selected));
       return true;
     }
   };
@@ -137,7 +138,7 @@ Blockly.ShortcutItems.registerCut = function() {
         !Blockly.selected.workspace.isFlyout;
     },
     callback: function() {
-      Blockly.copy(/** @type {!Blockly.ICopyable} */ (Blockly.selected));
+      Blockly.clipboard.copy(/** @type {!Blockly.ICopyable} */ (Blockly.selected));
       Blockly.deleteBlock(/** @type {!Blockly.BlockSvg} */ (Blockly.selected));
       return true;
     }
@@ -167,7 +168,7 @@ Blockly.ShortcutItems.registerPaste = function() {
       return !workspace.options.readOnly && !Blockly.Gesture.inProgress();
     },
     callback: function() {
-      return Blockly.paste();
+      return Blockly.clipboard.paste();
     }
   };
 
diff --git a/tests/deps.js b/tests/deps.js
index b28f86da2..44b852995 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -12,11 +12,12 @@ 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.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', '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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', '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']);
-goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global']);
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
@@ -25,7 +26,7 @@ goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Bl
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es5'});
+goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.clipboard', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es5'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es5'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -159,7 +160,7 @@ goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo']);
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar', 'Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.utils.KeyCodes']);
+goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.utils.KeyCodes']);
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils', 'Blockly.utils.object']);
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);
diff --git a/tests/mocha/contextmenu_items_test.js b/tests/mocha/contextmenu_items_test.js
index 62dd6f9ea..0d69fa77e 100644
--- a/tests/mocha/contextmenu_items_test.js
+++ b/tests/mocha/contextmenu_items_test.js
@@ -17,11 +17,11 @@ suite('Context Menu Items', function() {
     Blockly.ContextMenuItems.registerDefaultOptions();
     this.registry = Blockly.ContextMenuRegistry.registry;
   });
-  
+
   teardown(function() {
     sharedTestTeardown.call(this);
   });
-  
+
   suite('Workspace Items', function() {
     setup(function() {
       this.scope = {workspace: this.workspace};
@@ -328,12 +328,12 @@ suite('Context Menu Items', function() {
       });
 
       test('Calls duplicate', function() {
-        var stub = sinon.stub(Blockly, 'duplicate');
+        var spy = sinon.spy(Blockly.clipboard, 'duplicate');
 
         this.duplicateOption.callback(this.scope);
 
-        sinon.assert.calledOnce(stub);
-        sinon.assert.calledWith(stub, this.block);
+        sinon.assert.calledOnce(spy);
+        sinon.assert.calledWith(spy, this.block);
       });
 
       test('Has correct label', function() {
diff --git a/tests/mocha/keydown_test.js b/tests/mocha/keydown_test.js
index aec646111..22fdbf96e 100644
--- a/tests/mocha/keydown_test.js
+++ b/tests/mocha/keydown_test.js
@@ -93,7 +93,7 @@ suite('Key Down', function() {
   suite('Copy', function() {
     setup(function() {
       setSelectedBlock(this.workspace);
-      this.copySpy = sinon.spy(Blockly, 'copy');
+      this.copySpy = sinon.spy(Blockly.clipboard, 'copy');
       this.hideChaffSpy = sinon.spy(Blockly, 'hideChaff');
     });
     var testCases = [

From 311373230fed2adb4cdfd103a87d412902f574e3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 28 Jul 2021 14:48:08 -0700
Subject: [PATCH 393/833] Fix help log

---
 scripts/goog_module/convert-file.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index ebf791d3b..a412a7933 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -312,8 +312,8 @@ help() {
   echo ""
   echo "Usage: $0 [-h] [-c <step> <filepath>|-s <step> <filepath>]"
   echo "  -h                    Display help and exit"
-  echo "  -c <step> <filepath>  Create a commit for the specified step [2-4]"
-  echo "  -s <step> <filepath>  Run the specified step [1-4]"
+  echo "  -c <step> <filepath>  Create a commit for the specified step [1-4]"
+  echo "  -s <step> <filepath>  Run the specified step [2-4]"
 }
 
 #######################################

From 87a714fff8d10073f813a9afce8aceda6060c2f9 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 28 Jul 2021 14:47:25 -0700
Subject: [PATCH 394/833] Add handling for modules that are not leaf nodes

---
 scripts/goog_module/convert-file.sh | 85 ++++++++++++++++++++++++-----
 1 file changed, 71 insertions(+), 14 deletions(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index a412a7933..1c5b92fc8 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -125,6 +125,59 @@ commit-step() {
   success "created commit with message: \"${message}\""
 }
 
+#######################################
+# Extracts a list of properties that are accessed on the specified module name.
+# Excludes any matches
+# Arguments:
+#   The module name to find properties accessed for.
+#   The modules required by the specified module as a single string.
+#   The filepath to extract requires from.
+#   Optional: The top-level module.
+# Outputs:
+#   Writes list of properties to stdout as items separated by spaces.
+#######################################
+getPropertiesAccessed() {
+  local module_name="$1"
+  local requires="$2"
+  local filepath="$3"
+  local top_module_name="$4"
+  # Get any strings that follow "$module_name.", excluding matches for
+  # "$module_name.prototype" and remove list item duplicates (sort -u).
+  local properties_accessed=$(perl -nle 'print $& while m{(?<='"${module_name}"'\.)(?!prototype)\w+}g' "${filepath}" | sort -u)
+
+  # Get a list of any requires that are a child of $module_name.
+  # Ex: Blockly.utils.dom is a child of Blockly.utils, this would return "dom"
+  local requires_overlap=$(echo "${requires}" | perl -nle 'print $& while m{(?<='"${module_name}"'\.)\w+}g')
+  # Detect if there was any overlap.
+  if [[ -n "${requires_overlap}" ]]; then
+    while read -r requires_overlap_prop; do
+      properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/'"${requires_overlap_prop}"'//g')
+    done <<<"${requires_overlap}"
+  fi
+
+  # Fix formatting (remove extra whitespace) and delimit the list with spaces.
+  properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/\s+/ /g' | xargs)
+
+  echo "${properties_accessed}"
+}
+
+#######################################
+# Extracts a list of requires defined in the file in the form of a single string
+# of items separated by newlines.
+# Arguments:
+#   The filepath to extract requires from.
+# Outputs:
+#   Writes list of requires to stdout as items separated by newlines.
+#######################################
+getRequires() {
+  local filepath="$1"
+  # Extracts all strings that start with goog.require(' or goog.requireType('
+  # up until the ending single quote.
+  # Ex: "goog.require('Blockly.utils')" would extract "Blockly.utils"
+  local requires=$(perl -nle 'print $& while m{(?:(?<=^goog.require\('\'')|(?<=^goog.requireType\('\''))[^'\'']+}g' "${filepath}")
+  echo "${requires}"
+}
+
 #######################################
 # Runs step 2 of the automated conversion.
 # Arguments:
@@ -166,8 +219,18 @@ step2 () {
   # No top level class.
   inf 'Updating top-level property declarations...'
   perl -pi -e 's/^'"${module_name}"'\.([^ ]+) =/const \1 =/g' "${filepath}"
+
+  # Extract specific properties accessed so that properties from requires that
+  # are children of the module aren't changed.
+  # Ex: The module Blockly.utils shouldn't update Blockly.utils.dom (since it is
+  # a require from another module.
+  local requires=$(getRequires "${filepath}")
+  local properties_accessed=$(getPropertiesAccessed "${module_name}" "${requires}" "${filepath}")
   inf "Updating local references to module..."
-  perl -pi -e 's/'"${module_name}"'\.([^ ]+)/\1/g' "${filepath}"
+  for property in $(echo "${properties_accessed}"); do
+    inf "Updating references of ${module_name}.${property} to ${property}..."
+    perl -pi -e 's/'"${module_name}"'\.'"${property}"'(?!\w)/'"${property}"'/g' "${filepath}"
+  done
 
   npm run build:deps
   success "Completed automation for step 2. Please manually review and add exports for non-private top-level functions."
@@ -187,7 +250,7 @@ step3() {
   fi
   inf "Extracted module name \"${module_name}\""
 
-  local requires=$(perl -nle 'print $& while m{(?:(?<=^goog.require\('\'')|(?<=^goog.requireType\('\''))[^'\'']+}g' "${filepath}")
+  local requires=$(getRequires "${filepath}")
 
   # Process each require
   echo "${requires}" | while read -r require; do
@@ -205,23 +268,17 @@ step3() {
 
     # Parse property access of module
     local direct_access_count=$(perl -nle 'print $& while m{'"${require}"'[^\.'\'']}g' "${filepath}" | wc -l)
-    local properties_accessed=$(perl -nle 'print $& while m{(?<='"${require}"'\.)(?!prototype)\w+}g' "${filepath}" | sort -u)
+    local properties_accessed=$(getPropertiesAccessed "${require}" "${requires}" "${filepath}")
 
-    # Detect requires overlap
-    # (ex: Blockly.utils require and Blockly.utils.dom also in requires)
-    local requires_overlap=$(echo "${requires}" | perl -nle 'print $& while m{(?<='"${require}"'\.)\w+}g')
-    if [[ -n "${requires_overlap}" ]]; then
-      while read -r requires_overlap_prop; do
-        properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/'"${requires_overlap_prop}"'//g')
-      done <<<"${requires_overlap}"
-    fi
-    # Detect module name overlap
-    # (ex: Blockly require and Blockly.ContextMenuItems module being converted)
+    # Remove $module_name in case it is a child of $require.
+    # Ex: Blockly.utils.dom would be a child of Blockly, module_overlap would be
+    # "utils"
     local module_overlap=$(echo "${module_name}" | perl -nle 'print $& while m{(?<='"${require}"'\.)\w+}g')
     if [[ -n "${module_overlap}" ]]; then
       properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/'"${module_overlap}"'//g')
+      # Trim any extra whitespace created.
+      properties_accessed=$(echo "${properties_accessed}" | xargs)
     fi
-    properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/\s+/ /g' | xargs)
 
     if [[ -n "${properties_accessed}" ]]; then
       local comma_properties=$(echo "${properties_accessed}" | perl -pe 's/\s+/, /g' | perl -pe 's/, $//')

From 8372ecb2125e75e35ec532fa40b46fa4f10fb34d Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 29 Jul 2021 12:05:40 -0700
Subject: [PATCH 395/833] Include full namespace in error message

---
 core/registry.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/registry.js b/core/registry.js
index 1be9b2a2b..5752702ae 100644
--- a/core/registry.js
+++ b/core/registry.js
@@ -137,7 +137,7 @@ const register = function(type, name, registryItem, opt_allowOverrides) {
       String(type).trim() == '') {
     throw Error(
         'Invalid type "' + type + '". The type must be a' +
-        ' non-empty string or a Type.');
+        ' non-empty string or a Blockly.registry.Type.');
   }
   type = String(type).toLowerCase();
 

From 0f193f1f5a9c502824fb7987f494062ee39ca1cf Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 29 Jul 2021 12:17:57 -0700
Subject: [PATCH 396/833] Migrate core/trashcan.js to ES6 const/let

---
 core/trashcan.js | 62 ++++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/core/trashcan.js b/core/trashcan.js
index 619299b21..dea20acd2 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -80,7 +80,7 @@ Blockly.Trashcan = function(workspace) {
     return;
   }
   // Create flyout options.
-  var flyoutWorkspaceOptions = new Blockly.Options(
+  const flyoutWorkspaceOptions = new Blockly.Options(
       /** @type {!Blockly.BlocklyOptions} */
       ({
         'scrollbars': true,
@@ -98,7 +98,7 @@ Blockly.Trashcan = function(workspace) {
     flyoutWorkspaceOptions.toolboxPosition =
         this.workspace_.toolboxPosition == Blockly.utils.toolbox.Position.TOP ?
         Blockly.utils.toolbox.Position.BOTTOM : Blockly.utils.toolbox.Position.TOP;
-    var HorizontalFlyout = Blockly.registry.getClassFromOptions(
+    const HorizontalFlyout = Blockly.registry.getClassFromOptions(
         Blockly.registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX,
         this.workspace_.options, true);
     this.flyout = new HorizontalFlyout(flyoutWorkspaceOptions);
@@ -106,7 +106,7 @@ Blockly.Trashcan = function(workspace) {
     flyoutWorkspaceOptions.toolboxPosition =
       this.workspace_.toolboxPosition == Blockly.utils.toolbox.Position.RIGHT ?
         Blockly.utils.toolbox.Position.LEFT : Blockly.utils.toolbox.Position.RIGHT;
-    var VerticalFlyout = Blockly.registry.getClassFromOptions(
+    const VerticalFlyout = Blockly.registry.getClassFromOptions(
         Blockly.registry.Type.FLYOUTS_VERTICAL_TOOLBOX,
         this.workspace_.options, true);
     this.flyout = new VerticalFlyout(flyoutWorkspaceOptions);
@@ -300,8 +300,8 @@ Blockly.Trashcan.prototype.createDom = function() {
   this.svgGroup_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.G,
       {'class': 'blocklyTrash'}, null);
-  var clip;
-  var rnd = String(Math.random()).substring(2);
+  let clip;
+  const rnd = String(Math.random()).substring(2);
   clip = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.CLIPPATH,
       {'id': 'blocklyTrashBodyClipPath' + rnd},
@@ -314,7 +314,7 @@ Blockly.Trashcan.prototype.createDom = function() {
         'y': this.LID_HEIGHT_
       },
       clip);
-  var body = Blockly.utils.dom.createSvgElement(
+  const body = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.IMAGE, {
         'width': Blockly.internalConstants.SPRITE.width,
         'x': -this.SPRITE_LEFT_,
@@ -427,7 +427,7 @@ Blockly.Trashcan.prototype.openFlyout = function() {
   if (this.contentsIsOpen()) {
     return;
   }
-  var xml = this.contents_.map(Blockly.Xml.textToDom);
+  const xml = this.contents_.map(Blockly.Xml.textToDom);
   this.flyout.show(xml);
   this.fireUiEvent_(true);
 };
@@ -483,20 +483,20 @@ Blockly.Trashcan.prototype.position = function(metrics, savedPositions) {
     return;
   }
 
-  var cornerPosition =
+  const cornerPosition =
       Blockly.uiPosition.getCornerOppositeToolbox(this.workspace_, metrics);
 
-  var height = this.BODY_HEIGHT_ + this.LID_HEIGHT_;
-  var startRect = Blockly.uiPosition.getStartPositionRect(
+  const height = this.BODY_HEIGHT_ + this.LID_HEIGHT_;
+  const startRect = Blockly.uiPosition.getStartPositionRect(
       cornerPosition, new Blockly.utils.Size(this.WIDTH_, height),
       this.MARGIN_HORIZONTAL_, this.MARGIN_VERTICAL_, metrics, this.workspace_);
 
-  var verticalPosition = cornerPosition.vertical;
-  var bumpDirection =
+  const verticalPosition = cornerPosition.vertical;
+  const bumpDirection =
       verticalPosition === Blockly.uiPosition.verticalPosition.TOP ?
           Blockly.uiPosition.bumpDirection.DOWN :
           Blockly.uiPosition.bumpDirection.UP;
-  var positionRect = Blockly.uiPosition.bumpPositionRect(
+  const positionRect = Blockly.uiPosition.bumpPositionRect(
       startRect, this.MARGIN_VERTICAL_, bumpDirection, savedPositions);
 
   this.top_ = positionRect.top;
@@ -512,8 +512,8 @@ Blockly.Trashcan.prototype.position = function(metrics, savedPositions) {
  *   bounding box should be ignored by other UI elements.
  */
 Blockly.Trashcan.prototype.getBoundingRectangle = function() {
-  var bottom = this.top_ + this.BODY_HEIGHT_ + this.LID_HEIGHT_;
-  var right = this.left_ + this.WIDTH_;
+  const bottom = this.top_ + this.BODY_HEIGHT_ + this.LID_HEIGHT_;
+  const right = this.left_ + this.WIDTH_;
   return new Blockly.utils.Rect(this.top_, bottom, this.left_, right);
 };
 
@@ -528,12 +528,12 @@ Blockly.Trashcan.prototype.getClientRect = function() {
     return null;
   }
 
-  var trashRect = this.svgGroup_.getBoundingClientRect();
-  var top = trashRect.top + this.SPRITE_TOP_ - this.MARGIN_HOTSPOT_;
-  var bottom = top + this.LID_HEIGHT_ + this.BODY_HEIGHT_ +
+  const trashRect = this.svgGroup_.getBoundingClientRect();
+  const top = trashRect.top + this.SPRITE_TOP_ - this.MARGIN_HOTSPOT_;
+  const bottom = top + this.LID_HEIGHT_ + this.BODY_HEIGHT_ +
       2 * this.MARGIN_HOTSPOT_;
-  var left = trashRect.left + this.SPRITE_LEFT_ - this.MARGIN_HOTSPOT_;
-  var right = left + this.WIDTH_ + 2 * this.MARGIN_HOTSPOT_;
+  const left = trashRect.left + this.SPRITE_LEFT_ - this.MARGIN_HOTSPOT_;
+  const right = left + this.WIDTH_ + 2 * this.MARGIN_HOTSPOT_;
   return new Blockly.utils.Rect(top, bottom, left, right);
 };
 
@@ -588,18 +588,18 @@ Blockly.Trashcan.prototype.setLidOpen = function(state) {
  * @private
  */
 Blockly.Trashcan.prototype.animateLid_ = function() {
-  var frames = Blockly.Trashcan.ANIMATION_FRAMES_;
+  const frames = Blockly.Trashcan.ANIMATION_FRAMES_;
 
-  var delta = 1 / (frames + 1);
+  const delta = 1 / (frames + 1);
   this.lidOpen_ += this.isLidOpen ? delta : -delta;
   this.lidOpen_ = Math.min(Math.max(this.lidOpen_, this.minOpenness_), 1);
 
   this.setLidAngle_(this.lidOpen_ * Blockly.Trashcan.MAX_LID_ANGLE_);
 
-  var minOpacity = Blockly.Trashcan.OPACITY_MIN_;
-  var maxOpacity = Blockly.Trashcan.OPACITY_MAX_;
+  const minOpacity = Blockly.Trashcan.OPACITY_MIN_;
+  const maxOpacity = Blockly.Trashcan.OPACITY_MAX_;
   // Linear interpolation between min and max.
-  var opacity = minOpacity + this.lidOpen_ * (maxOpacity - minOpacity);
+  const opacity = minOpacity + this.lidOpen_ * (maxOpacity - minOpacity);
   this.svgGroup_.style.opacity = opacity;
 
   if (this.lidOpen_ > this.minOpenness_ && this.lidOpen_ < 1) {
@@ -614,7 +614,7 @@ Blockly.Trashcan.prototype.animateLid_ = function() {
  * @private
  */
 Blockly.Trashcan.prototype.setLidAngle_ = function(lidAngle) {
-  var openAtRight =
+  const openAtRight =
       this.workspace_.toolboxPosition == Blockly.utils.toolbox.Position.RIGHT ||
       (this.workspace_.horizontalLayout && this.workspace_.RTL);
   this.svgLid_.setAttribute('transform', 'rotate(' +
@@ -661,7 +661,7 @@ Blockly.Trashcan.prototype.click = function() {
  * @private
  */
 Blockly.Trashcan.prototype.fireUiEvent_ = function(trashcanOpen) {
-  var uiEvent = new (Blockly.Events.get(Blockly.Events.TRASHCAN_OPEN))(
+  const uiEvent = new (Blockly.Events.get(Blockly.Events.TRASHCAN_OPEN))(
       trashcanOpen,this.workspace_.id);
   Blockly.Events.fire(uiEvent);
 };
@@ -710,7 +710,7 @@ Blockly.Trashcan.prototype.onDelete_ = function(event) {
   // Must check that the tagName exists since oldXml can be a DocumentFragment.
   if (event.type == Blockly.Events.BLOCK_DELETE && event.oldXml.tagName &&
       event.oldXml.tagName.toLowerCase() != 'shadow') {
-    var cleanedXML = this.cleanBlockXML_(event.oldXml);
+    const cleanedXML = this.cleanBlockXML_(event.oldXml);
     if (this.contents_.indexOf(cleanedXML) != -1) {
       return;
     }
@@ -734,8 +734,8 @@ Blockly.Trashcan.prototype.onDelete_ = function(event) {
  * @private
  */
 Blockly.Trashcan.prototype.cleanBlockXML_ = function(xml) {
-  var xmlBlock = xml.cloneNode(true);
-  var node = xmlBlock;
+  const xmlBlock = xml.cloneNode(true);
+  let node = xmlBlock;
   while (node) {
     // Things like text inside tags are still treated as nodes, but they
     // don't have attributes (or the removeAttribute function) so we can
@@ -753,7 +753,7 @@ Blockly.Trashcan.prototype.cleanBlockXML_ = function(xml) {
     }
 
     // Try to go down the tree
-    var nextNode = node.firstChild || node.nextSibling;
+    let nextNode = node.firstChild || node.nextSibling;
     // If we can't go down, try to go back up the tree.
     if (!nextNode) {
       nextNode = node.parentNode;

From 1d9c9359f959d931668ef625ad0a7bdb36fc74cb Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 29 Jul 2021 12:30:44 -0700
Subject: [PATCH 397/833] Migrate core/variable_map.js to ES6 const/let

---
 core/variable_map.js | 98 ++++++++++++++++++++++----------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/core/variable_map.js b/core/variable_map.js
index 34fa926ec..3cbe5d561 100644
--- a/core/variable_map.js
+++ b/core/variable_map.js
@@ -66,9 +66,9 @@ Blockly.VariableMap.prototype.clear = function() {
  * @package
  */
 Blockly.VariableMap.prototype.renameVariable = function(variable, newName) {
-  var type = variable.type;
-  var conflictVar = this.getVariable(newName, type);
-  var blocks = this.workspace.getAllBlocks(false);
+  const type = variable.type;
+  const conflictVar = this.getVariable(newName, type);
+  const blocks = this.workspace.getAllBlocks(false);
   Blockly.Events.setGroup(true);
   try {
     // The IDs may match if the rename is a simple case change (name1 -> Name1).
@@ -89,7 +89,7 @@ Blockly.VariableMap.prototype.renameVariable = function(variable, newName) {
  * @param {string} newName New variable name.
  */
 Blockly.VariableMap.prototype.renameVariableById = function(id, newName) {
-  var variable = this.getVariableById(id);
+  const variable = this.getVariableById(id);
   if (!variable) {
     throw Error('Tried to rename a variable that didn\'t exist. ID: ' + id);
   }
@@ -111,7 +111,7 @@ Blockly.VariableMap.prototype.renameVariableAndUses_ = function(variable,
   Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.VAR_RENAME))(
       variable, newName));
   variable.name = newName;
-  for (var i = 0; i < blocks.length; i++) {
+  for (let i = 0; i < blocks.length; i++) {
     blocks[i].updateVarName(variable);
   }
 };
@@ -131,8 +131,8 @@ Blockly.VariableMap.prototype.renameVariableAndUses_ = function(variable,
  */
 Blockly.VariableMap.prototype.renameVariableWithConflict_ = function(variable,
     newName, conflictVar, blocks) {
-  var type = variable.type;
-  var oldCase = conflictVar.name;
+  const type = variable.type;
+  const oldCase = conflictVar.name;
 
   if (newName != oldCase) {
     // Simple rename to change the case and update references.
@@ -141,7 +141,7 @@ Blockly.VariableMap.prototype.renameVariableWithConflict_ = function(variable,
 
   // These blocks now refer to a different variable.
   // These will fire change events.
-  for (var i = 0; i < blocks.length; i++) {
+  for (let i = 0; i < blocks.length; i++) {
     blocks[i].renameVarById(variable.getId(), conflictVar.getId());
   }
 
@@ -149,8 +149,8 @@ Blockly.VariableMap.prototype.renameVariableWithConflict_ = function(variable,
   Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.VAR_DELETE))(
       variable));
   // And remove it from the list.
-  var variableList = this.getVariablesOfType(type);
-  var variableIndex = variableList.indexOf(variable);
+  const variableList = this.getVariablesOfType(type);
+  const variableIndex = variableList.indexOf(variable);
   this.variableMap_[type].splice(variableIndex, 1);
 
 };
@@ -170,7 +170,7 @@ Blockly.VariableMap.prototype.renameVariableWithConflict_ = function(variable,
  */
 Blockly.VariableMap.prototype.createVariable = function(name,
     opt_type, opt_id) {
-  var variable = this.getVariable(name, opt_type);
+  let variable = this.getVariable(name, opt_type);
   if (variable) {
     if (opt_id && variable.getId() != opt_id) {
       throw Error('Variable "' + name + '" is already in use and its id is "' +
@@ -183,11 +183,11 @@ Blockly.VariableMap.prototype.createVariable = function(name,
   if (opt_id && this.getVariableById(opt_id)) {
     throw Error('Variable id, "' + opt_id + '", is already in use.');
   }
-  var id = opt_id || Blockly.utils.genUid();
-  var type = opt_type || '';
+  const id = opt_id || Blockly.utils.genUid();
+  const type = opt_type || '';
   variable = new Blockly.VariableModel(this.workspace, name, type, id);
 
-  var variables = this.variableMap_[type] || [];
+  const variables = this.variableMap_[type] || [];
   variables.push(variable);
   // Delete the list of variables of this type, and re-add it so that
   // the most recent addition is at the end.
@@ -205,8 +205,8 @@ Blockly.VariableMap.prototype.createVariable = function(name,
  * @param {!Blockly.VariableModel} variable Variable to delete.
  */
 Blockly.VariableMap.prototype.deleteVariable = function(variable) {
-  var variableList = this.variableMap_[variable.type];
-  for (var i = 0, tempVar; (tempVar = variableList[i]); i++) {
+  const variableList = this.variableMap_[variable.type];
+  for (let i = 0, tempVar; (tempVar = variableList[i]); i++) {
     if (tempVar.getId() == variable.getId()) {
       variableList.splice(i, 1);
       Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.VAR_DELETE))(
@@ -222,16 +222,16 @@ Blockly.VariableMap.prototype.deleteVariable = function(variable) {
  * @param {string} id ID of variable to delete.
  */
 Blockly.VariableMap.prototype.deleteVariableById = function(id) {
-  var variable = this.getVariableById(id);
+  const variable = this.getVariableById(id);
   if (variable) {
     // Check whether this variable is a function parameter before deleting.
-    var variableName = variable.name;
-    var uses = this.getVariableUsesById(id);
-    for (var i = 0, block; (block = uses[i]); i++) {
+    const variableName = variable.name;
+    const uses = this.getVariableUsesById(id);
+    for (let i = 0, block; (block = uses[i]); i++) {
       if (block.type == 'procedures_defnoreturn' ||
         block.type == 'procedures_defreturn') {
-        var procedureName = block.getFieldValue('NAME');
-        var deleteText = Blockly.Msg['CANNOT_DELETE_VARIABLE_PROCEDURE'].
+        const procedureName = block.getFieldValue('NAME');
+        const deleteText = Blockly.Msg['CANNOT_DELETE_VARIABLE_PROCEDURE'].
             replace('%1', variableName).
             replace('%2', procedureName);
         Blockly.alert(deleteText);
@@ -239,10 +239,10 @@ Blockly.VariableMap.prototype.deleteVariableById = function(id) {
       }
     }
 
-    var map = this;
+    const map = this;
     if (uses.length > 1) {
       // Confirm before deleting multiple blocks.
-      var confirmText = Blockly.Msg['DELETE_VARIABLE_CONFIRMATION'].
+      const confirmText = Blockly.Msg['DELETE_VARIABLE_CONFIRMATION'].
           replace('%1', String(uses.length)).
           replace('%2', variableName);
       Blockly.confirm(confirmText,
@@ -269,12 +269,12 @@ Blockly.VariableMap.prototype.deleteVariableById = function(id) {
  */
 Blockly.VariableMap.prototype.deleteVariableInternal = function(variable,
     uses) {
-  var existingGroup = Blockly.Events.getGroup();
+  const existingGroup = Blockly.Events.getGroup();
   if (!existingGroup) {
     Blockly.Events.setGroup(true);
   }
   try {
-    for (var i = 0; i < uses.length; i++) {
+    for (let i = 0; i < uses.length; i++) {
       uses[i].dispose(true);
     }
     this.deleteVariable(variable);
@@ -297,10 +297,10 @@ Blockly.VariableMap.prototype.deleteVariableInternal = function(variable,
  *     it was not found.
  */
 Blockly.VariableMap.prototype.getVariable = function(name, opt_type) {
-  var type = opt_type || '';
-  var list = this.variableMap_[type];
+  const type = opt_type || '';
+  const list = this.variableMap_[type];
   if (list) {
-    for (var j = 0, variable; (variable = list[j]); j++) {
+    for (let j = 0, variable; (variable = list[j]); j++) {
       if (Blockly.Names.equals(variable.name, name)) {
         return variable;
       }
@@ -315,10 +315,10 @@ Blockly.VariableMap.prototype.getVariable = function(name, opt_type) {
  * @return {?Blockly.VariableModel} The variable with the given ID.
  */
 Blockly.VariableMap.prototype.getVariableById = function(id) {
-  var keys = Object.keys(this.variableMap_);
-  for (var i = 0; i < keys.length; i++) {
-    var key = keys[i];
-    for (var j = 0, variable; (variable = this.variableMap_[key][j]); j++) {
+  const keys = Object.keys(this.variableMap_);
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i];
+    for (let j = 0, variable; (variable = this.variableMap_[key][j]); j++) {
       if (variable.getId() == id) {
         return variable;
       }
@@ -336,7 +336,7 @@ Blockly.VariableMap.prototype.getVariableById = function(id) {
  */
 Blockly.VariableMap.prototype.getVariablesOfType = function(type) {
   type = type || '';
-  var variable_list = this.variableMap_[type];
+  const variable_list = this.variableMap_[type];
   if (variable_list) {
     return variable_list.slice();
   }
@@ -353,15 +353,15 @@ Blockly.VariableMap.prototype.getVariablesOfType = function(type) {
  * @package
  */
 Blockly.VariableMap.prototype.getVariableTypes = function(ws) {
-  var variableMap = {};
+  const variableMap = {};
   Blockly.utils.object.mixin(variableMap, this.variableMap_);
   if (ws && ws.getPotentialVariableMap()) {
     Blockly.utils.object.mixin(variableMap,
         ws.getPotentialVariableMap().variableMap_);
   }
-  var types = Object.keys(variableMap);
-  var hasEmpty = false;
-  for (var i = 0; i < types.length; i++) {
+  const types = Object.keys(variableMap);
+  let hasEmpty = false;
+  for (let i = 0; i < types.length; i++) {
     if (types[i] == '') {
       hasEmpty = true;
     }
@@ -377,8 +377,8 @@ Blockly.VariableMap.prototype.getVariableTypes = function(ws) {
  * @return {!Array<!Blockly.VariableModel>} List of variable models.
  */
 Blockly.VariableMap.prototype.getAllVariables = function() {
-  var all_variables = [];
-  for (var key in this.variableMap_) {
+  let all_variables = [];
+  for (const key in this.variableMap_) {
     all_variables = all_variables.concat(this.variableMap_[key]);
   }
   return all_variables;
@@ -389,10 +389,10 @@ Blockly.VariableMap.prototype.getAllVariables = function() {
  * @return {!Array<string>} All of the variable names of all types.
  */
 Blockly.VariableMap.prototype.getAllVariableNames = function() {
-  var allNames = [];
-  for (var key in this.variableMap_) {
-    var variables = this.variableMap_[key];
-    for (var i = 0, variable; (variable = variables[i]); i++) {
+  const allNames = [];
+  for (const key in this.variableMap_) {
+    const variables = this.variableMap_[key];
+    for (let i = 0, variable; (variable = variables[i]); i++) {
       allNames.push(variable.name);
     }
   }
@@ -405,13 +405,13 @@ Blockly.VariableMap.prototype.getAllVariableNames = function() {
  * @return {!Array<!Blockly.Block>} Array of block usages.
  */
 Blockly.VariableMap.prototype.getVariableUsesById = function(id) {
-  var uses = [];
-  var blocks = this.workspace.getAllBlocks(false);
+  const uses = [];
+  const blocks = this.workspace.getAllBlocks(false);
   // Iterate through every block and check the name.
-  for (var i = 0; i < blocks.length; i++) {
-    var blockVariables = blocks[i].getVarModels();
+  for (let i = 0; i < blocks.length; i++) {
+    const blockVariables = blocks[i].getVarModels();
     if (blockVariables) {
-      for (var j = 0; j < blockVariables.length; j++) {
+      for (let j = 0; j < blockVariables.length; j++) {
         if (blockVariables[j].getId() == id) {
           uses.push(blocks[i]);
         }

From 959d976723edc29c9caecfdb648c7975b0d39f64 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 29 Jul 2021 12:34:37 -0700
Subject: [PATCH 398/833] Migrate core/variable_map.js to goog.module

---
 core/variable_map.js | 39 +++++++++++++++++++++------------------
 tests/deps.js        |  2 +-
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/core/variable_map.js b/core/variable_map.js
index 3cbe5d561..22eb11c9c 100644
--- a/core/variable_map.js
+++ b/core/variable_map.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.VariableMap');
+goog.module('Blockly.VariableMap');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
@@ -33,7 +34,7 @@ goog.requireType('Blockly.Workspace');
  * @param {!Blockly.Workspace} workspace The workspace this map belongs to.
  * @constructor
  */
-Blockly.VariableMap = function(workspace) {
+const VariableMap = function(workspace) {
   /**
    * A map from variable type to list of variable names.  The lists contain all
    * of the named variables in the workspace, including variables
@@ -53,7 +54,7 @@ Blockly.VariableMap = function(workspace) {
 /**
  * Clear the variable map.
  */
-Blockly.VariableMap.prototype.clear = function() {
+VariableMap.prototype.clear = function() {
   this.variableMap_ = Object.create(null);
 };
 
@@ -65,7 +66,7 @@ Blockly.VariableMap.prototype.clear = function() {
  * @param {string} newName New variable name.
  * @package
  */
-Blockly.VariableMap.prototype.renameVariable = function(variable, newName) {
+VariableMap.prototype.renameVariable = function(variable, newName) {
   const type = variable.type;
   const conflictVar = this.getVariable(newName, type);
   const blocks = this.workspace.getAllBlocks(false);
@@ -88,7 +89,7 @@ Blockly.VariableMap.prototype.renameVariable = function(variable, newName) {
  * @param {string} id ID of the variable to rename.
  * @param {string} newName New variable name.
  */
-Blockly.VariableMap.prototype.renameVariableById = function(id, newName) {
+VariableMap.prototype.renameVariableById = function(id, newName) {
   const variable = this.getVariableById(id);
   if (!variable) {
     throw Error('Tried to rename a variable that didn\'t exist. ID: ' + id);
@@ -106,7 +107,7 @@ Blockly.VariableMap.prototype.renameVariableById = function(id, newName) {
  *     workspace.
  * @private
  */
-Blockly.VariableMap.prototype.renameVariableAndUses_ = function(variable,
+VariableMap.prototype.renameVariableAndUses_ = function(variable,
     newName, blocks) {
   Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.VAR_RENAME))(
       variable, newName));
@@ -129,7 +130,7 @@ Blockly.VariableMap.prototype.renameVariableAndUses_ = function(variable,
  *     workspace.
  * @private
  */
-Blockly.VariableMap.prototype.renameVariableWithConflict_ = function(variable,
+VariableMap.prototype.renameVariableWithConflict_ = function(variable,
     newName, conflictVar, blocks) {
   const type = variable.type;
   const oldCase = conflictVar.name;
@@ -168,7 +169,7 @@ Blockly.VariableMap.prototype.renameVariableWithConflict_ = function(variable,
  *     a UUID.
  * @return {!Blockly.VariableModel} The newly created variable.
  */
-Blockly.VariableMap.prototype.createVariable = function(name,
+VariableMap.prototype.createVariable = function(name,
     opt_type, opt_id) {
   let variable = this.getVariable(name, opt_type);
   if (variable) {
@@ -204,7 +205,7 @@ Blockly.VariableMap.prototype.createVariable = function(name,
  * Delete a variable.
  * @param {!Blockly.VariableModel} variable Variable to delete.
  */
-Blockly.VariableMap.prototype.deleteVariable = function(variable) {
+VariableMap.prototype.deleteVariable = function(variable) {
   const variableList = this.variableMap_[variable.type];
   for (let i = 0, tempVar; (tempVar = variableList[i]); i++) {
     if (tempVar.getId() == variable.getId()) {
@@ -221,7 +222,7 @@ Blockly.VariableMap.prototype.deleteVariable = function(variable) {
  * workspace. May prompt the user for confirmation.
  * @param {string} id ID of variable to delete.
  */
-Blockly.VariableMap.prototype.deleteVariableById = function(id) {
+VariableMap.prototype.deleteVariableById = function(id) {
   const variable = this.getVariableById(id);
   if (variable) {
     // Check whether this variable is a function parameter before deleting.
@@ -267,7 +268,7 @@ Blockly.VariableMap.prototype.deleteVariableById = function(id) {
  * @param {!Array<!Blockly.Block>} uses An array of uses of the variable.
  * @package
  */
-Blockly.VariableMap.prototype.deleteVariableInternal = function(variable,
+VariableMap.prototype.deleteVariableInternal = function(variable,
     uses) {
   const existingGroup = Blockly.Events.getGroup();
   if (!existingGroup) {
@@ -296,7 +297,7 @@ Blockly.VariableMap.prototype.deleteVariableInternal = function(variable,
  * @return {?Blockly.VariableModel} The variable with the given name, or null if
  *     it was not found.
  */
-Blockly.VariableMap.prototype.getVariable = function(name, opt_type) {
+VariableMap.prototype.getVariable = function(name, opt_type) {
   const type = opt_type || '';
   const list = this.variableMap_[type];
   if (list) {
@@ -314,7 +315,7 @@ Blockly.VariableMap.prototype.getVariable = function(name, opt_type) {
  * @param {string} id The ID to check for.
  * @return {?Blockly.VariableModel} The variable with the given ID.
  */
-Blockly.VariableMap.prototype.getVariableById = function(id) {
+VariableMap.prototype.getVariableById = function(id) {
   const keys = Object.keys(this.variableMap_);
   for (let i = 0; i < keys.length; i++) {
     const key = keys[i];
@@ -334,7 +335,7 @@ Blockly.VariableMap.prototype.getVariableById = function(id) {
  * @return {!Array<!Blockly.VariableModel>} The sought after variables of the
  *     passed in type. An empty array if none are found.
  */
-Blockly.VariableMap.prototype.getVariablesOfType = function(type) {
+VariableMap.prototype.getVariablesOfType = function(type) {
   type = type || '';
   const variable_list = this.variableMap_[type];
   if (variable_list) {
@@ -352,7 +353,7 @@ Blockly.VariableMap.prototype.getVariablesOfType = function(type) {
  * @return {!Array<string>} List of variable types.
  * @package
  */
-Blockly.VariableMap.prototype.getVariableTypes = function(ws) {
+VariableMap.prototype.getVariableTypes = function(ws) {
   const variableMap = {};
   Blockly.utils.object.mixin(variableMap, this.variableMap_);
   if (ws && ws.getPotentialVariableMap()) {
@@ -376,7 +377,7 @@ Blockly.VariableMap.prototype.getVariableTypes = function(ws) {
  * Return all variables of all types.
  * @return {!Array<!Blockly.VariableModel>} List of variable models.
  */
-Blockly.VariableMap.prototype.getAllVariables = function() {
+VariableMap.prototype.getAllVariables = function() {
   let all_variables = [];
   for (const key in this.variableMap_) {
     all_variables = all_variables.concat(this.variableMap_[key]);
@@ -388,7 +389,7 @@ Blockly.VariableMap.prototype.getAllVariables = function() {
  * Returns all of the variable names of all types.
  * @return {!Array<string>} All of the variable names of all types.
  */
-Blockly.VariableMap.prototype.getAllVariableNames = function() {
+VariableMap.prototype.getAllVariableNames = function() {
   const allNames = [];
   for (const key in this.variableMap_) {
     const variables = this.variableMap_[key];
@@ -404,7 +405,7 @@ Blockly.VariableMap.prototype.getAllVariableNames = function() {
  * @param {string} id ID of the variable to find.
  * @return {!Array<!Blockly.Block>} Array of block usages.
  */
-Blockly.VariableMap.prototype.getVariableUsesById = function(id) {
+VariableMap.prototype.getVariableUsesById = function(id) {
   const uses = [];
   const blocks = this.workspace.getAllBlocks(false);
   // Iterate through every block and check the name.
@@ -420,3 +421,5 @@ Blockly.VariableMap.prototype.getVariableUsesById = function(id) {
   }
   return uses;
 };
+
+exports = VariableMap;
diff --git a/tests/deps.js b/tests/deps.js
index 20fb4e48e..d4217d539 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -195,7 +195,7 @@ goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'],
 goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global']);
 goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
-goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.utils', 'Blockly.utils.object']);
+goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils']);
 goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.xml']);
 goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml']);

From 9847b8c027c6581246616d6554eb1e6c541eb6fc Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 29 Jul 2021 12:39:58 -0700
Subject: [PATCH 399/833] Migrate core/variable_map.js to named requires

---
 core/variable_map.js | 86 ++++++++++++++++++++++----------------------
 tests/deps.js        |  2 +-
 2 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/core/variable_map.js b/core/variable_map.js
index 22eb11c9c..e2c371149 100644
--- a/core/variable_map.js
+++ b/core/variable_map.js
@@ -13,25 +13,27 @@
 goog.module('Blockly.VariableMap');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const Events = goog.require('Blockly.Events');
+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 */
+const Workspace = goog.requireType('Blockly.Workspace');
+const object = goog.require('Blockly.utils.object');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.VarDelete');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.VarRename');
-goog.require('Blockly.Msg');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.VariableModel');
-goog.requireType('Blockly.Workspace');
 
 
 /**
  * Class for a variable map.  This contains a dictionary data structure with
  * variable types as keys and lists of variables as values.  The list of
  * variables are the type indicated by the key.
- * @param {!Blockly.Workspace} workspace The workspace this map belongs to.
+ * @param {!Workspace} workspace The workspace this map belongs to.
  * @constructor
  */
 const VariableMap = function(workspace) {
@@ -39,14 +41,14 @@ const VariableMap = function(workspace) {
    * A map from variable type to list of variable names.  The lists contain all
    * of the named variables in the workspace, including variables
    * that are not currently in use.
-   * @type {!Object<string, !Array<Blockly.VariableModel>>}
+   * @type {!Object<string, !Array<VariableModel>>}
    * @private
    */
   this.variableMap_ = Object.create(null);
 
   /**
    * The workspace this map belongs to.
-   * @type {!Blockly.Workspace}
+   * @type {!Workspace}
    */
   this.workspace = workspace;
 };
@@ -62,7 +64,7 @@ VariableMap.prototype.clear = function() {
 
 /**
  * Rename the given variable by updating its name in the variable map.
- * @param {!Blockly.VariableModel} variable Variable to rename.
+ * @param {!VariableModel} variable Variable to rename.
  * @param {string} newName New variable name.
  * @package
  */
@@ -70,7 +72,7 @@ VariableMap.prototype.renameVariable = function(variable, newName) {
   const type = variable.type;
   const conflictVar = this.getVariable(newName, type);
   const blocks = this.workspace.getAllBlocks(false);
-  Blockly.Events.setGroup(true);
+  Events.setGroup(true);
   try {
     // The IDs may match if the rename is a simple case change (name1 -> Name1).
     if (!conflictVar || conflictVar.getId() == variable.getId()) {
@@ -79,7 +81,7 @@ VariableMap.prototype.renameVariable = function(variable, newName) {
       this.renameVariableWithConflict_(variable, newName, conflictVar, blocks);
     }
   } finally {
-    Blockly.Events.setGroup(false);
+    Events.setGroup(false);
   }
 };
 
@@ -101,15 +103,15 @@ VariableMap.prototype.renameVariableById = function(id, newName) {
 /**
  * Update the name of the given variable and refresh all references to it.
  * The new name must not conflict with any existing variable names.
- * @param {!Blockly.VariableModel} variable Variable to rename.
+ * @param {!VariableModel} variable Variable to rename.
  * @param {string} newName New variable name.
- * @param {!Array<!Blockly.Block>} blocks The list of all blocks in the
+ * @param {!Array<!Block>} blocks The list of all blocks in the
  *     workspace.
  * @private
  */
 VariableMap.prototype.renameVariableAndUses_ = function(variable,
     newName, blocks) {
-  Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.VAR_RENAME))(
+  Events.fire(new (Events.get(Events.VAR_RENAME))(
       variable, newName));
   variable.name = newName;
   for (let i = 0; i < blocks.length; i++) {
@@ -122,11 +124,11 @@ VariableMap.prototype.renameVariableAndUses_ = function(variable,
  * variable.  The two variables are coalesced into a single variable with the ID
  * of the existing variable that was already using newName.
  * Refresh all references to the variable.
- * @param {!Blockly.VariableModel} variable Variable to rename.
+ * @param {!VariableModel} variable Variable to rename.
  * @param {string} newName New variable name.
- * @param {!Blockly.VariableModel} conflictVar The variable that was already
+ * @param {!VariableModel} conflictVar The variable that was already
  *     using newName.
- * @param {!Array<!Blockly.Block>} blocks The list of all blocks in the
+ * @param {!Array<!Block>} blocks The list of all blocks in the
  *     workspace.
  * @private
  */
@@ -147,7 +149,7 @@ VariableMap.prototype.renameVariableWithConflict_ = function(variable,
   }
 
   // Finally delete the original variable, which is now unreferenced.
-  Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.VAR_DELETE))(
+  Events.fire(new (Events.get(Events.VAR_DELETE))(
       variable));
   // And remove it from the list.
   const variableList = this.getVariablesOfType(type);
@@ -167,7 +169,7 @@ VariableMap.prototype.renameVariableWithConflict_ = function(variable,
  *     their type. This will default to '' which is a specific type.
  * @param {?string=} opt_id The unique ID of the variable. This will default to
  *     a UUID.
- * @return {!Blockly.VariableModel} The newly created variable.
+ * @return {!VariableModel} The newly created variable.
  */
 VariableMap.prototype.createVariable = function(name,
     opt_type, opt_id) {
@@ -184,9 +186,9 @@ VariableMap.prototype.createVariable = function(name,
   if (opt_id && this.getVariableById(opt_id)) {
     throw Error('Variable id, "' + opt_id + '", is already in use.');
   }
-  const id = opt_id || Blockly.utils.genUid();
+  const id = opt_id || utils.genUid();
   const type = opt_type || '';
-  variable = new Blockly.VariableModel(this.workspace, name, type, id);
+  variable = new VariableModel(this.workspace, name, type, id);
 
   const variables = this.variableMap_[type] || [];
   variables.push(variable);
@@ -203,14 +205,14 @@ VariableMap.prototype.createVariable = function(name,
 
 /**
  * Delete a variable.
- * @param {!Blockly.VariableModel} variable Variable to delete.
+ * @param {!VariableModel} variable Variable to delete.
  */
 VariableMap.prototype.deleteVariable = function(variable) {
   const variableList = this.variableMap_[variable.type];
   for (let i = 0, tempVar; (tempVar = variableList[i]); i++) {
     if (tempVar.getId() == variable.getId()) {
       variableList.splice(i, 1);
-      Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.VAR_DELETE))(
+      Events.fire(new (Events.get(Events.VAR_DELETE))(
           variable));
       return;
     }
@@ -232,7 +234,7 @@ VariableMap.prototype.deleteVariableById = function(id) {
       if (block.type == 'procedures_defnoreturn' ||
         block.type == 'procedures_defreturn') {
         const procedureName = block.getFieldValue('NAME');
-        const deleteText = Blockly.Msg['CANNOT_DELETE_VARIABLE_PROCEDURE'].
+        const deleteText = Msg['CANNOT_DELETE_VARIABLE_PROCEDURE'].
             replace('%1', variableName).
             replace('%2', procedureName);
         Blockly.alert(deleteText);
@@ -243,7 +245,7 @@ VariableMap.prototype.deleteVariableById = function(id) {
     const map = this;
     if (uses.length > 1) {
       // Confirm before deleting multiple blocks.
-      const confirmText = Blockly.Msg['DELETE_VARIABLE_CONFIRMATION'].
+      const confirmText = Msg['DELETE_VARIABLE_CONFIRMATION'].
           replace('%1', String(uses.length)).
           replace('%2', variableName);
       Blockly.confirm(confirmText,
@@ -264,15 +266,15 @@ VariableMap.prototype.deleteVariableById = function(id) {
 /**
  * Deletes a variable and all of its uses from this workspace without asking the
  * user for confirmation.
- * @param {!Blockly.VariableModel} variable Variable to delete.
- * @param {!Array<!Blockly.Block>} uses An array of uses of the variable.
+ * @param {!VariableModel} variable Variable to delete.
+ * @param {!Array<!Block>} uses An array of uses of the variable.
  * @package
  */
 VariableMap.prototype.deleteVariableInternal = function(variable,
     uses) {
-  const existingGroup = Blockly.Events.getGroup();
+  const existingGroup = Events.getGroup();
   if (!existingGroup) {
-    Blockly.Events.setGroup(true);
+    Events.setGroup(true);
   }
   try {
     for (let i = 0; i < uses.length; i++) {
@@ -281,7 +283,7 @@ VariableMap.prototype.deleteVariableInternal = function(variable,
     this.deleteVariable(variable);
   } finally {
     if (!existingGroup) {
-      Blockly.Events.setGroup(false);
+      Events.setGroup(false);
     }
   }
 };
@@ -294,7 +296,7 @@ VariableMap.prototype.deleteVariableInternal = function(variable,
  * @param {string} name The name to check for.
  * @param {?string=} opt_type The type of the variable.  If not provided it
  *     defaults to the empty string, which is a specific type.
- * @return {?Blockly.VariableModel} The variable with the given name, or null if
+ * @return {?VariableModel} The variable with the given name, or null if
  *     it was not found.
  */
 VariableMap.prototype.getVariable = function(name, opt_type) {
@@ -302,7 +304,7 @@ VariableMap.prototype.getVariable = function(name, opt_type) {
   const list = this.variableMap_[type];
   if (list) {
     for (let j = 0, variable; (variable = list[j]); j++) {
-      if (Blockly.Names.equals(variable.name, name)) {
+      if (Names.equals(variable.name, name)) {
         return variable;
       }
     }
@@ -313,7 +315,7 @@ VariableMap.prototype.getVariable = function(name, opt_type) {
 /**
  * Find the variable by the given ID and return it.  Return null if not found.
  * @param {string} id The ID to check for.
- * @return {?Blockly.VariableModel} The variable with the given ID.
+ * @return {?VariableModel} The variable with the given ID.
  */
 VariableMap.prototype.getVariableById = function(id) {
   const keys = Object.keys(this.variableMap_);
@@ -332,7 +334,7 @@ VariableMap.prototype.getVariableById = function(id) {
  * Get a list containing all of the variables of a specified type. If type is
  *     null, return list of variables with empty string type.
  * @param {?string} type Type of the variables to find.
- * @return {!Array<!Blockly.VariableModel>} The sought after variables of the
+ * @return {!Array<!VariableModel>} The sought after variables of the
  *     passed in type. An empty array if none are found.
  */
 VariableMap.prototype.getVariablesOfType = function(type) {
@@ -347,7 +349,7 @@ VariableMap.prototype.getVariablesOfType = function(type) {
 /**
  * Return all variable and potential variable types.  This list always contains
  * the empty string.
- * @param {?Blockly.Workspace} ws The workspace used to look for potential
+ * @param {?Workspace} ws The workspace used to look for potential
  * variables. This can be different than the workspace stored on this object
  * if the passed in ws is a flyout workspace.
  * @return {!Array<string>} List of variable types.
@@ -355,9 +357,9 @@ VariableMap.prototype.getVariablesOfType = function(type) {
  */
 VariableMap.prototype.getVariableTypes = function(ws) {
   const variableMap = {};
-  Blockly.utils.object.mixin(variableMap, this.variableMap_);
+  object.mixin(variableMap, this.variableMap_);
   if (ws && ws.getPotentialVariableMap()) {
-    Blockly.utils.object.mixin(variableMap,
+    object.mixin(variableMap,
         ws.getPotentialVariableMap().variableMap_);
   }
   const types = Object.keys(variableMap);
@@ -375,7 +377,7 @@ VariableMap.prototype.getVariableTypes = function(ws) {
 
 /**
  * Return all variables of all types.
- * @return {!Array<!Blockly.VariableModel>} List of variable models.
+ * @return {!Array<!VariableModel>} List of variable models.
  */
 VariableMap.prototype.getAllVariables = function() {
   let all_variables = [];
@@ -403,7 +405,7 @@ VariableMap.prototype.getAllVariableNames = function() {
 /**
  * Find all the uses of a named variable.
  * @param {string} id ID of the variable to find.
- * @return {!Array<!Blockly.Block>} Array of block usages.
+ * @return {!Array<!Block>} Array of block usages.
  */
 VariableMap.prototype.getVariableUsesById = function(id) {
   const uses = [];
diff --git a/tests/deps.js b/tests/deps.js
index d4217d539..fa4d62a5c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -195,7 +195,7 @@ goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'],
 goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global']);
 goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
-goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils']);
 goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.xml']);
 goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml']);

From d58a878fad99b4eedc4db2f09d6ee1820cb0c110 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Thu, 29 Jul 2021 12:43:49 -0700
Subject: [PATCH 400/833] Switch to getter for keyboard contents.

---
 core/blockly.js   | 34 +++++++++-------------------------
 core/clipboard.js | 21 ++++++++++++++-------
 2 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index 808c035b0..ab82638fe 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -93,25 +93,12 @@ Blockly.selected = null;
 Blockly.draggingConnections = [];
 
 /**
- * Contents of the local clipboard.
- * @type {Element}
- * @private
+ * Get the current contents of the clipboard and associated metadata.
+ * @return {{xml: Element, source: WorkspaceSvg, typeCounts: Object}} An object
+ *     containing the clipboard contents and associated metadata.
+ * @public
  */
-Blockly.clipboardXml_ = Blockly.clipboard.xml;
-
-/**
- * Source of the local clipboard.
- * @type {Blockly.WorkspaceSvg}
- * @private
- */
-Blockly.clipboardSource_ = Blockly.clipboard.source;
-
-/**
- * Map of types to type counts for the clipboard object and descendants.
- * @type {Object}
- * @private
- */
-Blockly.clipboardTypeCounts_ = Blockly.clipboard.typeCounts;
+Blockly.getClipboardInfo = Blockly.common.getClipboardInfo;
 
 /**
  * Cached value for whether 3D is supported.
@@ -137,9 +124,7 @@ Blockly.svgSize = function(svg) {
   // When removing this function, remove svg.cachedWidth_ and svg.cachedHeight_
   // from setCachedParentSvgSize.
   Blockly.utils.deprecation.warn(
-      'Blockly.svgSize',
-      'March 2021',
-      'March 2022',
+      'Blockly.svgSize', 'March 2021', 'March 2022',
       'workspace.getCachedParentSvgSize');
   svg = /** @type {?} */ (svg);
   return new Blockly.utils.Size(svg.cachedWidth_, svg.cachedHeight_);
@@ -221,7 +206,8 @@ Blockly.deleteBlock = function(selected) {
     Blockly.Events.setGroup(true);
     Blockly.hideChaff();
     if (selected.outputConnection) {
-      // Do not attempt to heal rows (https://github.com/google/blockly/issues/4832)
+      // Do not attempt to heal rows
+      // (https://github.com/google/blockly/issues/4832)
       selected.dispose(false, true);
     } else {
       selected.dispose(/* heal */ true, true);
@@ -366,9 +352,7 @@ 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: Blockly.jsonInitFactory_(elem)};
       }
     }
   }
diff --git a/core/clipboard.js b/core/clipboard.js
index 887346a58..b93f92530 100644
--- a/core/clipboard.js
+++ b/core/clipboard.js
@@ -26,7 +26,6 @@ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
  * @private
  */
 let xml = null;
-exports.xml = xml;
 
 /**
  * Source of the local clipboard.
@@ -34,7 +33,6 @@ exports.xml = xml;
  * @private
  */
 let source = null;
-exports.source = source;
 
 /**
  * Map of types to type counts for the clipboard object and descendants.
@@ -42,12 +40,20 @@ exports.source = source;
  * @private
  */
 let typeCounts = null;
-exports.typeCounts = typeCounts;
+
+/**
+ * Get the current contents of the clipboard and associated metadata.
+ * @return {{xml: Element, source: WorkspaceSvg, typeCounts: Object}} An object
+ *     containing the clipboard contents and associated metadata.
+ */
+const getClipboardInfo = function() {
+  return {xml: xml, source: source, typeCounts: typeCounts};
+};
+exports.getClipboardInfo = getClipboardInfo;
 
 /**
  * Copy a block or workspace comment onto the local clipboard.
  * @param {!ICopyable} toCopy Block or Workspace Comment to be copied.
- * @package
  */
 const copy = function(toCopy) {
   var data = toCopy.toCopyData();
@@ -57,12 +63,12 @@ const copy = function(toCopy) {
     typeCounts = data.typeCounts;
   }
 };
+/** @package */
 exports.copy = copy;
 
 /**
  * Paste a block or workspace comment on to the main workspace.
  * @return {boolean} True if the paste was successful, false otherwise.
- * @package
  */
 const paste = function() {
   if (!xml) {
@@ -82,13 +88,13 @@ const paste = function() {
   }
   return false;
 };
+/** @package */
 exports.paste = paste;
 
 /**
  * Duplicate this block and its children, or a workspace comment.
  * @param {!ICopyable} toDuplicate Block or Workspace Comment to be
- *     copied.
- * @package
+ *     duplicated.
  */
 const duplicate = function(toDuplicate) {
   // Save the clipboard.
@@ -103,4 +109,5 @@ const duplicate = function(toDuplicate) {
   xml = oldXml;
   source = oldSource;
 };
+/** @package */
 exports.duplicate = duplicate;

From 78646eae51980af96b9e97add9a13d8978773595 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 29 Jul 2021 12:47:51 -0700
Subject: [PATCH 401/833] clang-format core/variable_map.js

---
 core/variable_map.js | 57 +++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 32 deletions(-)

diff --git a/core/variable_map.js b/core/variable_map.js
index e2c371149..a22ab75d5 100644
--- a/core/variable_map.js
+++ b/core/variable_map.js
@@ -109,10 +109,9 @@ VariableMap.prototype.renameVariableById = function(id, newName) {
  *     workspace.
  * @private
  */
-VariableMap.prototype.renameVariableAndUses_ = function(variable,
-    newName, blocks) {
-  Events.fire(new (Events.get(Events.VAR_RENAME))(
-      variable, newName));
+VariableMap.prototype.renameVariableAndUses_ = function(
+    variable, newName, blocks) {
+  Events.fire(new (Events.get(Events.VAR_RENAME))(variable, newName));
   variable.name = newName;
   for (let i = 0; i < blocks.length; i++) {
     blocks[i].updateVarName(variable);
@@ -132,8 +131,8 @@ VariableMap.prototype.renameVariableAndUses_ = function(variable,
  *     workspace.
  * @private
  */
-VariableMap.prototype.renameVariableWithConflict_ = function(variable,
-    newName, conflictVar, blocks) {
+VariableMap.prototype.renameVariableWithConflict_ = function(
+    variable, newName, conflictVar, blocks) {
   const type = variable.type;
   const oldCase = conflictVar.name;
 
@@ -149,13 +148,11 @@ VariableMap.prototype.renameVariableWithConflict_ = function(variable,
   }
 
   // Finally delete the original variable, which is now unreferenced.
-  Events.fire(new (Events.get(Events.VAR_DELETE))(
-      variable));
+  Events.fire(new (Events.get(Events.VAR_DELETE))(variable));
   // And remove it from the list.
   const variableList = this.getVariablesOfType(type);
   const variableIndex = variableList.indexOf(variable);
   this.variableMap_[type].splice(variableIndex, 1);
-
 };
 
 /* End functions for renaming variables. */
@@ -171,12 +168,12 @@ VariableMap.prototype.renameVariableWithConflict_ = function(variable,
  *     a UUID.
  * @return {!VariableModel} The newly created variable.
  */
-VariableMap.prototype.createVariable = function(name,
-    opt_type, opt_id) {
+VariableMap.prototype.createVariable = function(name, opt_type, opt_id) {
   let variable = this.getVariable(name, opt_type);
   if (variable) {
     if (opt_id && variable.getId() != opt_id) {
-      throw Error('Variable "' + name + '" is already in use and its id is "' +
+      throw Error(
+          'Variable "' + name + '" is already in use and its id is "' +
           variable.getId() + '" which conflicts with the passed in ' +
           'id, "' + opt_id + '".');
     }
@@ -212,8 +209,7 @@ VariableMap.prototype.deleteVariable = function(variable) {
   for (let i = 0, tempVar; (tempVar = variableList[i]); i++) {
     if (tempVar.getId() == variable.getId()) {
       variableList.splice(i, 1);
-      Events.fire(new (Events.get(Events.VAR_DELETE))(
-          variable));
+      Events.fire(new (Events.get(Events.VAR_DELETE))(variable));
       return;
     }
   }
@@ -232,11 +228,11 @@ VariableMap.prototype.deleteVariableById = function(id) {
     const uses = this.getVariableUsesById(id);
     for (let i = 0, block; (block = uses[i]); i++) {
       if (block.type == 'procedures_defnoreturn' ||
-        block.type == 'procedures_defreturn') {
+          block.type == 'procedures_defreturn') {
         const procedureName = block.getFieldValue('NAME');
-        const deleteText = Msg['CANNOT_DELETE_VARIABLE_PROCEDURE'].
-            replace('%1', variableName).
-            replace('%2', procedureName);
+        const deleteText = Msg['CANNOT_DELETE_VARIABLE_PROCEDURE']
+                               .replace('%1', variableName)
+                               .replace('%2', procedureName);
         Blockly.alert(deleteText);
         return;
       }
@@ -245,21 +241,20 @@ VariableMap.prototype.deleteVariableById = function(id) {
     const map = this;
     if (uses.length > 1) {
       // Confirm before deleting multiple blocks.
-      const confirmText = Msg['DELETE_VARIABLE_CONFIRMATION'].
-          replace('%1', String(uses.length)).
-          replace('%2', variableName);
-      Blockly.confirm(confirmText,
-          function(ok) {
-            if (ok && variable) {
-              map.deleteVariableInternal(variable, uses);
-            }
-          });
+      const confirmText = Msg['DELETE_VARIABLE_CONFIRMATION']
+                              .replace('%1', String(uses.length))
+                              .replace('%2', variableName);
+      Blockly.confirm(confirmText, function(ok) {
+        if (ok && variable) {
+          map.deleteVariableInternal(variable, uses);
+        }
+      });
     } else {
       // No confirmation necessary for a single block.
       map.deleteVariableInternal(variable, uses);
     }
   } else {
-    console.warn("Can't delete non-existent variable: " + id);
+    console.warn('Can\'t delete non-existent variable: ' + id);
   }
 };
 
@@ -270,8 +265,7 @@ VariableMap.prototype.deleteVariableById = function(id) {
  * @param {!Array<!Block>} uses An array of uses of the variable.
  * @package
  */
-VariableMap.prototype.deleteVariableInternal = function(variable,
-    uses) {
+VariableMap.prototype.deleteVariableInternal = function(variable, uses) {
   const existingGroup = Events.getGroup();
   if (!existingGroup) {
     Events.setGroup(true);
@@ -359,8 +353,7 @@ VariableMap.prototype.getVariableTypes = function(ws) {
   const variableMap = {};
   object.mixin(variableMap, this.variableMap_);
   if (ws && ws.getPotentialVariableMap()) {
-    object.mixin(variableMap,
-        ws.getPotentialVariableMap().variableMap_);
+    object.mixin(variableMap, ws.getPotentialVariableMap().variableMap_);
   }
   const types = Object.keys(variableMap);
   let hasEmpty = false;

From dc4a719e2f507468b303ed228381dc7d033cdd57 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 29 Jul 2021 12:50:42 -0700
Subject: [PATCH 402/833] Migrate core/variable_model.js to goog.module

---
 core/variable_model.js | 15 +++++++++------
 tests/deps.js          |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/variable_model.js b/core/variable_model.js
index bc097da8a..ce4c37c66 100644
--- a/core/variable_model.js
+++ b/core/variable_model.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.VariableModel');
+goog.module('Blockly.VariableModel');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
@@ -34,7 +35,7 @@ goog.requireType('Blockly.Workspace');
  * @see {Blockly.FieldVariable}
  * @constructor
  */
-Blockly.VariableModel = function(workspace, name, opt_type, opt_id) {
+const VariableModel = function(workspace, name, opt_type, opt_id) {
   /**
    * The workspace the variable is in.
    * @type {!Blockly.Workspace}
@@ -73,18 +74,20 @@ Blockly.VariableModel = function(workspace, name, opt_type, opt_id) {
 /**
  * @return {string} The ID for the variable.
  */
-Blockly.VariableModel.prototype.getId = function() {
+VariableModel.prototype.getId = function() {
   return this.id_;
 };
 
 /**
  * A custom compare function for the VariableModel objects.
- * @param {Blockly.VariableModel} var1 First variable to compare.
- * @param {Blockly.VariableModel} var2 Second variable to compare.
+ * @param {VariableModel} var1 First variable to compare.
+ * @param {VariableModel} var2 Second variable to compare.
  * @return {number} -1 if name of var1 is less than name of var2, 0 if equal,
  *     and 1 if greater.
  * @package
  */
-Blockly.VariableModel.compareByName = function(var1, var2) {
+VariableModel.compareByName = function(var1, var2) {
   return var1.name.localeCompare(var2.name, undefined, {sensitivity: 'base'});
 };
+
+exports = VariableModel;
diff --git a/tests/deps.js b/tests/deps.js
index 20fb4e48e..0e0a7f034 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -196,7 +196,7 @@ goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['B
 goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global']);
 goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
 goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.utils', 'Blockly.utils.object']);
-goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils']);
+goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.xml']);
 goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml']);
 goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 714bb6120f9caebc04dc6707d300f784924b33b7 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Thu, 29 Jul 2021 12:52:14 -0700
Subject: [PATCH 403/833] Fix annotations

---
 core/blockly.js   |  6 +++---
 core/clipboard.js | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index ab82638fe..9fae4e84a 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -94,11 +94,11 @@ Blockly.draggingConnections = [];
 
 /**
  * Get the current contents of the clipboard and associated metadata.
- * @return {{xml: Element, source: WorkspaceSvg, typeCounts: Object}} An object
- *     containing the clipboard contents and associated metadata.
+ * @return {{xml: ?Element, source: ?Blockly.WorkspaceSvg, typeCounts: ?Object}}
+ *     An object containing the clipboard contents and associated metadata.
  * @public
  */
-Blockly.getClipboardInfo = Blockly.common.getClipboardInfo;
+Blockly.getClipboardInfo = Blockly.clipboard.getClipboardInfo;
 
 /**
  * Cached value for whether 3D is supported.
diff --git a/core/clipboard.js b/core/clipboard.js
index b93f92530..9f7097f71 100644
--- a/core/clipboard.js
+++ b/core/clipboard.js
@@ -22,29 +22,29 @@ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 
 /**
  * Contents of the local clipboard.
- * @type {Element}
+ * @type {?Element}
  * @private
  */
 let xml = null;
 
 /**
  * Source of the local clipboard.
- * @type {WorkspaceSvg}
+ * @type {?WorkspaceSvg}
  * @private
  */
 let source = null;
 
 /**
  * Map of types to type counts for the clipboard object and descendants.
- * @type {Object}
+ * @type {?Object}
  * @private
  */
 let typeCounts = null;
 
 /**
  * Get the current contents of the clipboard and associated metadata.
- * @return {{xml: Element, source: WorkspaceSvg, typeCounts: Object}} An object
- *     containing the clipboard contents and associated metadata.
+ * @return {{xml: ?Element, source: ?WorkspaceSvg, typeCounts: ?Object}} An
+ *     object containing the clipboard contents and associated metadata.
  */
 const getClipboardInfo = function() {
   return {xml: xml, source: source, typeCounts: typeCounts};

From 0a6893706f2c2a64b6865ab68c4bc62ce625a2ff Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 29 Jul 2021 12:55:26 -0700
Subject: [PATCH 404/833] Migrate core/variable_model.js to named requires

---
 core/variable_model.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/variable_model.js b/core/variable_model.js
index ce4c37c66..74bc2b578 100644
--- a/core/variable_model.js
+++ b/core/variable_model.js
@@ -13,18 +13,18 @@
 goog.module('Blockly.VariableModel');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.VarCreate');
-goog.require('Blockly.utils');
-
-goog.requireType('Blockly.Workspace');
 
 
 /**
  * Class for a variable model.
  * Holds information for the variable including name, ID, and type.
- * @param {!Blockly.Workspace} workspace The variable's workspace.
+ * @param {!Workspace} workspace The variable's workspace.
  * @param {string} name The name of the variable.  This is the user-visible name
  *     (e.g. 'my var' or '私の変数'), not the generated name.
  * @param {string=} opt_type The type of the variable like 'int' or 'string'.
@@ -38,7 +38,7 @@ goog.requireType('Blockly.Workspace');
 const VariableModel = function(workspace, name, opt_type, opt_id) {
   /**
    * The workspace the variable is in.
-   * @type {!Blockly.Workspace}
+   * @type {!Workspace}
    */
   this.workspace = workspace;
 
@@ -65,9 +65,9 @@ const VariableModel = function(workspace, name, opt_type, opt_id) {
    * @type {string}
    * @private
    */
-  this.id_ = opt_id || Blockly.utils.genUid();
+  this.id_ = opt_id || utils.genUid();
 
-  Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.VAR_CREATE))(
+  Events.fire(new (Events.get(Events.VAR_CREATE))(
       this));
 };
 

From 6eb8667c3ccb5c9a4d613a881f0711a845cec533 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 29 Jul 2021 12:55:46 -0700
Subject: [PATCH 405/833] clang-format core/variable_model.js

---
 core/variable_model.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/variable_model.js b/core/variable_model.js
index 74bc2b578..2f5936f4e 100644
--- a/core/variable_model.js
+++ b/core/variable_model.js
@@ -67,8 +67,7 @@ const VariableModel = function(workspace, name, opt_type, opt_id) {
    */
   this.id_ = opt_id || utils.genUid();
 
-  Events.fire(new (Events.get(Events.VAR_CREATE))(
-      this));
+  Events.fire(new (Events.get(Events.VAR_CREATE))(this));
 };
 
 /**

From 34042519f47492a9041e071556a18b8999858cbc Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:00:44 -0700
Subject: [PATCH 406/833] Add regex lookarounds to check for require overlaps

---
 scripts/goog_module/convert-file.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index 1c5b92fc8..4f433e428 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -151,7 +151,12 @@ getPropertiesAccessed() {
   # Detect if there was any overlap.
   if [[ -n "${requires_overlap}" ]]; then
     while read -r requires_overlap_prop; do
-      properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/'"${requires_overlap_prop}"'//g')
+      # Replace any instances of $requires_overlap_prop. Includes regex
+      # lookarounds so that it does not simply match string contains.
+      # Ex: if $requires_overlap is "Svg", then it would update the list
+      # "isTargetInput mouseToSvg noEvent Svg" to
+      # "isTargetInput mouseToSvg noEvent " (note that mouseToSvg is unchanged).
+      properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/(?<!\w)'"${requires_overlap_prop}"'(?!\w)//g')
     done <<<"${requires_overlap}"
   fi
 

From c74c1bf4165a77fa0578492717560b2f1907deec Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:18:15 -0700
Subject: [PATCH 407/833] wording update

---
 scripts/goog_module/convert-file.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index 4f433e428..4d6c13345 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -151,7 +151,7 @@ getPropertiesAccessed() {
   # Detect if there was any overlap.
   if [[ -n "${requires_overlap}" ]]; then
     while read -r requires_overlap_prop; do
-      # Replace any instances of $requires_overlap_prop. Includes regex
+      # Removes any instances of $requires_overlap_prop. Includes regex
       # lookarounds so that it does not simply match string contains.
       # Ex: if $requires_overlap is "Svg", then it would update the list
       # "isTargetInput mouseToSvg noEvent Svg" to

From b3bbd70280d2ddab3844ea918800c5c9922b056e Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 29 Jul 2021 15:57:08 -0700
Subject: [PATCH 408/833] Migrate core/trashcan.js to goog.module

---
 core/trashcan.js | 195 ++++++++++++++++++++---------------------------
 tests/deps.js    |   2 +-
 2 files changed, 85 insertions(+), 112 deletions(-)

diff --git a/core/trashcan.js b/core/trashcan.js
index dea20acd2..7771deba0 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Trashcan');
+goog.module('Blockly.Trashcan');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.ComponentManager');
@@ -46,8 +47,8 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @implements {Blockly.IPositionable}
  * @extends {Blockly.DeleteArea}
  */
-Blockly.Trashcan = function(workspace) {
-  Blockly.Trashcan.superClass_.constructor.call(this);
+const Trashcan = function(workspace) {
+  Trashcan.superClass_.constructor.call(this);
   /**
    * The workspace the trashcan sits in.
    * @type {!Blockly.WorkspaceSvg}
@@ -113,113 +114,85 @@ Blockly.Trashcan = function(workspace) {
   }
   this.workspace_.addChangeListener(this.onDelete_.bind(this));
 };
-Blockly.utils.object.inherits(Blockly.Trashcan, Blockly.DeleteArea);
+Blockly.utils.object.inherits(Trashcan, Blockly.DeleteArea);
 
 /**
  * Width of both the trash can and lid images.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.prototype.WIDTH_ = 47;
+const WIDTH = 47;
 
 /**
  * Height of the trashcan image (minus lid).
- * @const {number}
- * @private
  */
-Blockly.Trashcan.prototype.BODY_HEIGHT_ = 44;
+const BODY_HEIGHT = 44;
 
 /**
  * Height of the lid image.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.prototype.LID_HEIGHT_ = 16;
+const LID_HEIGHT = 16;
 
 /**
  * Distance between trashcan and bottom or top edge of workspace.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.prototype.MARGIN_VERTICAL_ = 20;
+const MARGIN_VERTICAL = 20;
 
 /**
  * Distance between trashcan and right or left edge of workspace.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.prototype.MARGIN_HORIZONTAL_ = 20;
+const MARGIN_HORIZONTAL = 20;
 
 /**
  * Extent of hotspot on all sides beyond the size of the image.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.prototype.MARGIN_HOTSPOT_ = 10;
+const MARGIN_HOTSPOT = 10;
 
 /**
  * Location of trashcan in sprite image.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.prototype.SPRITE_LEFT_ = 0;
+const SPRITE_LEFT = 0;
 
 /**
  * Location of trashcan in sprite image.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.prototype.SPRITE_TOP_ = 32;
+const SPRITE_TOP = 32;
 
 /**
  * The openness of the lid when the trashcan contains blocks.
  *    (0.0 = closed, 1.0 = open)
- * @const {number}
- * @private
  */
-Blockly.Trashcan.prototype.HAS_BLOCKS_LID_ANGLE_ = 0.1;
+const HAS_BLOCKS_LID_ANGLE = 0.1;
 
 /**
  * The length of the lid open/close animation in milliseconds.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.ANIMATION_LENGTH_ = 80;
+const ANIMATION_LENGTH = 80;
 
 /**
  * The number of frames in the animation.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.ANIMATION_FRAMES_ = 4;
+const ANIMATION_FRAMES = 4;
 
 /**
  * The minimum (resting) opacity of the trashcan and lid.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.OPACITY_MIN_ = 0.4;
+const OPACITY_MIN = 0.4;
 
 /**
  * The maximum (hovered) opacity of the trashcan and lid.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.OPACITY_MAX_ = 0.8;
+const OPACITY_MAX = 0.8;
 
 /**
  * The maximum angle the trashcan lid can opens to. At the end of the open
  * animation the lid will be open to this angle.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.MAX_LID_ANGLE_ = 45;
+const MAX_LID_ANGLE = 45;
 
 /**
  * Current open/close state of the lid.
  * @type {boolean}
  */
-Blockly.Trashcan.prototype.isLidOpen = false;
+Trashcan.prototype.isLidOpen = false;
 
 /**
  * The minimum openness of the lid. Used to indicate if the trashcan contains
@@ -227,62 +200,62 @@ Blockly.Trashcan.prototype.isLidOpen = false;
  * @type {number}
  * @private
  */
-Blockly.Trashcan.prototype.minOpenness_ = 0;
+Trashcan.prototype.minOpenness_ = 0;
 
 /**
  * The SVG group containing the trash can.
  * @type {SVGElement}
  * @private
  */
-Blockly.Trashcan.prototype.svgGroup_ = null;
+Trashcan.prototype.svgGroup_ = null;
 
 /**
  * The SVG image element of the trash can lid.
  * @type {SVGElement}
  * @private
  */
-Blockly.Trashcan.prototype.svgLid_ = null;
+Trashcan.prototype.svgLid_ = null;
 
 /**
  * Task ID of opening/closing animation.
  * @type {number}
  * @private
  */
-Blockly.Trashcan.prototype.lidTask_ = 0;
+Trashcan.prototype.lidTask_ = 0;
 
 /**
  * Current state of lid opening (0.0 = closed, 1.0 = open).
  * @type {number}
  * @private
  */
-Blockly.Trashcan.prototype.lidOpen_ = 0;
+Trashcan.prototype.lidOpen_ = 0;
 
 /**
  * Left coordinate of the trash can.
  * @type {number}
  * @private
  */
-Blockly.Trashcan.prototype.left_ = 0;
+Trashcan.prototype.left_ = 0;
 
 /**
  * Top coordinate of the trash can.
  * @type {number}
  * @private
  */
-Blockly.Trashcan.prototype.top_ = 0;
+Trashcan.prototype.top_ = 0;
 
 /**
  * Whether this has been initialized.
  * @type {boolean}
  * @private
  */
-Blockly.Trashcan.prototype.initialized_ = false;
+Trashcan.prototype.initialized_ = false;
 
 /**
  * Create the trash can elements.
  * @return {!SVGElement} The trash can's SVG group.
  */
-Blockly.Trashcan.prototype.createDom = function() {
+Trashcan.prototype.createDom = function() {
   /* Here's the markup that will be generated:
   <g class="blocklyTrash">
     <clippath id="blocklyTrashBodyClipPath837493">
@@ -309,17 +282,17 @@ Blockly.Trashcan.prototype.createDom = function() {
   Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.RECT,
       {
-        'width': this.WIDTH_,
-        'height': this.BODY_HEIGHT_,
-        'y': this.LID_HEIGHT_
+        'width': WIDTH,
+        'height': BODY_HEIGHT,
+        'y': LID_HEIGHT
       },
       clip);
   const body = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.IMAGE, {
         'width': Blockly.internalConstants.SPRITE.width,
-        'x': -this.SPRITE_LEFT_,
+        'x': -SPRITE_LEFT,
         'height': Blockly.internalConstants.SPRITE.height,
-        'y': -this.SPRITE_TOP_,
+        'y': -SPRITE_TOP,
         'clip-path': 'url(#blocklyTrashBodyClipPath' + rnd + ')'
       },
       this.svgGroup_);
@@ -334,13 +307,13 @@ Blockly.Trashcan.prototype.createDom = function() {
       this.svgGroup_);
   Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.RECT,
-      {'width': this.WIDTH_, 'height': this.LID_HEIGHT_}, clip);
+      {'width': WIDTH, 'height': LID_HEIGHT}, clip);
   this.svgLid_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.IMAGE, {
         'width': Blockly.internalConstants.SPRITE.width,
-        'x': -this.SPRITE_LEFT_,
+        'x': -SPRITE_LEFT,
         'height': Blockly.internalConstants.SPRITE.height,
-        'y': -this.SPRITE_TOP_,
+        'y': -SPRITE_TOP,
         'clip-path': 'url(#blocklyTrashLidClipPath' + rnd + ')'
       },
       this.svgGroup_);
@@ -366,7 +339,7 @@ Blockly.Trashcan.prototype.createDom = function() {
 /**
  * Initializes the trash can.
  */
-Blockly.Trashcan.prototype.init = function() {
+Trashcan.prototype.init = function() {
   if (this.workspace_.options.maxTrashcanContents > 0) {
     Blockly.utils.dom.insertAfter(
         this.flyout.createDom(Blockly.utils.Svg.SVG),
@@ -392,7 +365,7 @@ Blockly.Trashcan.prototype.init = function() {
  * Unlink from all DOM elements to prevent memory leaks.
  * @suppress {checkTypes}
  */
-Blockly.Trashcan.prototype.dispose = function() {
+Trashcan.prototype.dispose = function() {
   this.workspace_.getComponentManager().removeComponent('trashcan');
   if (this.svgGroup_) {
     Blockly.utils.dom.removeNode(this.svgGroup_);
@@ -408,7 +381,7 @@ Blockly.Trashcan.prototype.dispose = function() {
  * @return {boolean} True if the trashcan has contents.
  * @private
  */
-Blockly.Trashcan.prototype.hasContents_ = function() {
+Trashcan.prototype.hasContents_ = function() {
   return !!this.contents_.length;
 };
 
@@ -416,14 +389,14 @@ Blockly.Trashcan.prototype.hasContents_ = function() {
  * Returns true if the trashcan contents-flyout is currently open.
  * @return {boolean} True if the trashcan contents-flyout is currently open.
  */
-Blockly.Trashcan.prototype.contentsIsOpen = function() {
+Trashcan.prototype.contentsIsOpen = function() {
   return this.flyout.isVisible();
 };
 
 /**
  * Opens the trashcan flyout.
  */
-Blockly.Trashcan.prototype.openFlyout = function() {
+Trashcan.prototype.openFlyout = function() {
   if (this.contentsIsOpen()) {
     return;
   }
@@ -435,7 +408,7 @@ Blockly.Trashcan.prototype.openFlyout = function() {
 /**
  * Closes the trashcan flyout.
  */
-Blockly.Trashcan.prototype.closeFlyout = function() {
+Trashcan.prototype.closeFlyout = function() {
   if (!this.contentsIsOpen()) {
     return;
   }
@@ -448,7 +421,7 @@ Blockly.Trashcan.prototype.closeFlyout = function() {
  * @param {boolean} onlyClosePopups Whether only popups should be closed.
  *     Flyouts should not be closed if this is true.
  */
-Blockly.Trashcan.prototype.autoHide = function(onlyClosePopups) {
+Trashcan.prototype.autoHide = function(onlyClosePopups) {
   // For now the trashcan flyout always autocloses because it overlays the
   // trashcan UI (no trashcan to click to close it).
   if (!onlyClosePopups && this.flyout) {
@@ -460,7 +433,7 @@ Blockly.Trashcan.prototype.autoHide = function(onlyClosePopups) {
  * Empties the trashcan's contents. If the contents-flyout is currently open
  * it will be closed.
  */
-Blockly.Trashcan.prototype.emptyContents = function() {
+Trashcan.prototype.emptyContents = function() {
   if (!this.hasContents_()) {
     return;
   }
@@ -477,7 +450,7 @@ Blockly.Trashcan.prototype.emptyContents = function() {
  * @param {!Array<!Blockly.utils.Rect>} savedPositions List of rectangles that
  *     are already on the workspace.
  */
-Blockly.Trashcan.prototype.position = function(metrics, savedPositions) {
+Trashcan.prototype.position = function(metrics, savedPositions) {
   // Not yet initialized.
   if (!this.initialized_) {
     return;
@@ -486,10 +459,10 @@ Blockly.Trashcan.prototype.position = function(metrics, savedPositions) {
   const cornerPosition =
       Blockly.uiPosition.getCornerOppositeToolbox(this.workspace_, metrics);
 
-  const height = this.BODY_HEIGHT_ + this.LID_HEIGHT_;
+  const height = BODY_HEIGHT + LID_HEIGHT;
   const startRect = Blockly.uiPosition.getStartPositionRect(
-      cornerPosition, new Blockly.utils.Size(this.WIDTH_, height),
-      this.MARGIN_HORIZONTAL_, this.MARGIN_VERTICAL_, metrics, this.workspace_);
+      cornerPosition, new Blockly.utils.Size(WIDTH, height),
+      MARGIN_HORIZONTAL, MARGIN_VERTICAL, metrics, this.workspace_);
 
   const verticalPosition = cornerPosition.vertical;
   const bumpDirection =
@@ -497,7 +470,7 @@ Blockly.Trashcan.prototype.position = function(metrics, savedPositions) {
           Blockly.uiPosition.bumpDirection.DOWN :
           Blockly.uiPosition.bumpDirection.UP;
   const positionRect = Blockly.uiPosition.bumpPositionRect(
-      startRect, this.MARGIN_VERTICAL_, bumpDirection, savedPositions);
+      startRect, MARGIN_VERTICAL, bumpDirection, savedPositions);
 
   this.top_ = positionRect.top;
   this.left_ = positionRect.left;
@@ -511,9 +484,9 @@ Blockly.Trashcan.prototype.position = function(metrics, savedPositions) {
  * @return {?Blockly.utils.Rect} The UI elements’s bounding box. Null if
  *   bounding box should be ignored by other UI elements.
  */
-Blockly.Trashcan.prototype.getBoundingRectangle = function() {
-  const bottom = this.top_ + this.BODY_HEIGHT_ + this.LID_HEIGHT_;
-  const right = this.left_ + this.WIDTH_;
+Trashcan.prototype.getBoundingRectangle = function() {
+  const bottom = this.top_ + BODY_HEIGHT + LID_HEIGHT;
+  const right = this.left_ + WIDTH;
   return new Blockly.utils.Rect(this.top_, bottom, this.left_, right);
 };
 
@@ -523,17 +496,17 @@ Blockly.Trashcan.prototype.getBoundingRectangle = function() {
  * @return {?Blockly.utils.Rect} The component's bounding box. Null if drag
  *   target area should be ignored.
  */
-Blockly.Trashcan.prototype.getClientRect = function() {
+Trashcan.prototype.getClientRect = function() {
   if (!this.svgGroup_) {
     return null;
   }
 
   const trashRect = this.svgGroup_.getBoundingClientRect();
-  const top = trashRect.top + this.SPRITE_TOP_ - this.MARGIN_HOTSPOT_;
-  const bottom = top + this.LID_HEIGHT_ + this.BODY_HEIGHT_ +
-      2 * this.MARGIN_HOTSPOT_;
-  const left = trashRect.left + this.SPRITE_LEFT_ - this.MARGIN_HOTSPOT_;
-  const right = left + this.WIDTH_ + 2 * this.MARGIN_HOTSPOT_;
+  const top = trashRect.top + SPRITE_TOP - MARGIN_HOTSPOT;
+  const bottom = top + LID_HEIGHT + BODY_HEIGHT +
+      2 * MARGIN_HOTSPOT;
+  const left = trashRect.left + SPRITE_LEFT - MARGIN_HOTSPOT;
+  const right = left + WIDTH + 2 * MARGIN_HOTSPOT;
   return new Blockly.utils.Rect(top, bottom, left, right);
 };
 
@@ -544,7 +517,7 @@ Blockly.Trashcan.prototype.getClientRect = function() {
  *   dragged.
  * @override
  */
-Blockly.Trashcan.prototype.onDragOver = function(_dragElement) {
+Trashcan.prototype.onDragOver = function(_dragElement) {
   this.setLidOpen(this.wouldDelete_);
 };
 
@@ -554,7 +527,7 @@ Blockly.Trashcan.prototype.onDragOver = function(_dragElement) {
  *   dragged.
  * @override
  */
-Blockly.Trashcan.prototype.onDragExit = function(_dragElement) {
+Trashcan.prototype.onDragExit = function(_dragElement) {
   this.setLidOpen(false);
 };
 
@@ -565,7 +538,7 @@ Blockly.Trashcan.prototype.onDragExit = function(_dragElement) {
  *   dragged.
  * @override
  */
-Blockly.Trashcan.prototype.onDrop = function(_dragElement) {
+Trashcan.prototype.onDrop = function(_dragElement) {
   setTimeout(this.setLidOpen.bind(this, false), 100);
 };
 
@@ -574,7 +547,7 @@ Blockly.Trashcan.prototype.onDrop = function(_dragElement) {
  * @param {boolean} state True if open.
  * @package
  */
-Blockly.Trashcan.prototype.setLidOpen = function(state) {
+Trashcan.prototype.setLidOpen = function(state) {
   if (this.isLidOpen == state) {
     return;
   }
@@ -587,24 +560,22 @@ Blockly.Trashcan.prototype.setLidOpen = function(state) {
  * Rotate the lid open or closed by one step.  Then wait and recurse.
  * @private
  */
-Blockly.Trashcan.prototype.animateLid_ = function() {
-  const frames = Blockly.Trashcan.ANIMATION_FRAMES_;
+Trashcan.prototype.animateLid_ = function() {
+  const frames = ANIMATION_FRAMES;
 
   const delta = 1 / (frames + 1);
   this.lidOpen_ += this.isLidOpen ? delta : -delta;
   this.lidOpen_ = Math.min(Math.max(this.lidOpen_, this.minOpenness_), 1);
 
-  this.setLidAngle_(this.lidOpen_ * Blockly.Trashcan.MAX_LID_ANGLE_);
+  this.setLidAngle_(this.lidOpen_ * MAX_LID_ANGLE);
 
-  const minOpacity = Blockly.Trashcan.OPACITY_MIN_;
-  const maxOpacity = Blockly.Trashcan.OPACITY_MAX_;
   // Linear interpolation between min and max.
-  const opacity = minOpacity + this.lidOpen_ * (maxOpacity - minOpacity);
+  const opacity = OPACITY_MIN + this.lidOpen_ * (OPACITY_MAX - OPACITY_MIN);
   this.svgGroup_.style.opacity = opacity;
 
   if (this.lidOpen_ > this.minOpenness_ && this.lidOpen_ < 1) {
     this.lidTask_ = setTimeout(this.animateLid_.bind(this),
-        Blockly.Trashcan.ANIMATION_LENGTH_ / frames);
+        ANIMATION_LENGTH / frames);
   }
 };
 
@@ -613,14 +584,14 @@ Blockly.Trashcan.prototype.animateLid_ = function() {
  * @param {number} lidAngle The angle at which to set the lid.
  * @private
  */
-Blockly.Trashcan.prototype.setLidAngle_ = function(lidAngle) {
+Trashcan.prototype.setLidAngle_ = function(lidAngle) {
   const openAtRight =
       this.workspace_.toolboxPosition == Blockly.utils.toolbox.Position.RIGHT ||
       (this.workspace_.horizontalLayout && this.workspace_.RTL);
   this.svgLid_.setAttribute('transform', 'rotate(' +
       (openAtRight ? -lidAngle : lidAngle) + ',' +
-      (openAtRight ? 4 : this.WIDTH_ - 4) + ',' +
-      (this.LID_HEIGHT_ - 2) + ')');
+      (openAtRight ? 4 : WIDTH - 4) + ',' +
+      (LID_HEIGHT - 2) + ')');
 };
 
 /**
@@ -630,10 +601,10 @@ Blockly.Trashcan.prototype.setLidAngle_ = function(lidAngle) {
  *     0 and 1.
  * @private
  */
-Blockly.Trashcan.prototype.setMinOpenness_ = function(newMin) {
+Trashcan.prototype.setMinOpenness_ = function(newMin) {
   this.minOpenness_ = newMin;
   if (!this.isLidOpen) {
-    this.setLidAngle_(newMin * Blockly.Trashcan.MAX_LID_ANGLE_);
+    this.setLidAngle_(newMin * MAX_LID_ANGLE);
   }
 };
 
@@ -641,14 +612,14 @@ Blockly.Trashcan.prototype.setMinOpenness_ = function(newMin) {
  * Flip the lid shut.
  * Called externally after a drag.
  */
-Blockly.Trashcan.prototype.closeLid = function() {
+Trashcan.prototype.closeLid = function() {
   this.setLidOpen(false);
 };
 
 /**
  * Inspect the contents of the trash.
  */
-Blockly.Trashcan.prototype.click = function() {
+Trashcan.prototype.click = function() {
   if (!this.hasContents_()) {
     return;
   }
@@ -660,7 +631,7 @@ Blockly.Trashcan.prototype.click = function() {
  * @param {boolean} trashcanOpen Whether the flyout is opening.
  * @private
  */
-Blockly.Trashcan.prototype.fireUiEvent_ = function(trashcanOpen) {
+Trashcan.prototype.fireUiEvent_ = function(trashcanOpen) {
   const uiEvent = new (Blockly.Events.get(Blockly.Events.TRASHCAN_OPEN))(
       trashcanOpen,this.workspace_.id);
   Blockly.Events.fire(uiEvent);
@@ -671,7 +642,7 @@ Blockly.Trashcan.prototype.fireUiEvent_ = function(trashcanOpen) {
  * @param {!Event} e A mouse down event.
  * @private
  */
-Blockly.Trashcan.prototype.blockMouseDownWhenOpenable_ = function(e) {
+Trashcan.prototype.blockMouseDownWhenOpenable_ = function(e) {
   if (!this.contentsIsOpen() && this.hasContents_()) {
     e.stopPropagation();  // Don't start a workspace scroll.
   }
@@ -681,7 +652,7 @@ Blockly.Trashcan.prototype.blockMouseDownWhenOpenable_ = function(e) {
  * Indicate that the trashcan can be clicked (by opening it) if it has blocks.
  * @private
  */
-Blockly.Trashcan.prototype.mouseOver_ = function() {
+Trashcan.prototype.mouseOver_ = function() {
   if (this.hasContents_()) {
     this.setLidOpen(true);
   }
@@ -692,7 +663,7 @@ Blockly.Trashcan.prototype.mouseOver_ = function() {
  *    blocks).
  * @private
  */
-Blockly.Trashcan.prototype.mouseOut_ = function() {
+Trashcan.prototype.mouseOut_ = function() {
   // No need to do a .hasBlocks check here because if it doesn't the trashcan
   // won't be open in the first place, and setOpen won't run.
   this.setLidOpen(false);
@@ -703,7 +674,7 @@ Blockly.Trashcan.prototype.mouseOut_ = function() {
  * @param {!Blockly.Events.Abstract} event Workspace event.
  * @private
  */
-Blockly.Trashcan.prototype.onDelete_ = function(event) {
+Trashcan.prototype.onDelete_ = function(event) {
   if (this.workspace_.options.maxTrashcanContents <= 0) {
     return;
   }
@@ -720,7 +691,7 @@ Blockly.Trashcan.prototype.onDelete_ = function(event) {
       this.contents_.pop();
     }
 
-    this.setMinOpenness_(this.HAS_BLOCKS_LID_ANGLE_);
+    this.setMinOpenness_(HAS_BLOCKS_LID_ANGLE);
   }
 };
 
@@ -733,7 +704,7 @@ Blockly.Trashcan.prototype.onDelete_ = function(event) {
  * attributes.
  * @private
  */
-Blockly.Trashcan.prototype.cleanBlockXML_ = function(xml) {
+Trashcan.prototype.cleanBlockXML_ = function(xml) {
   const xmlBlock = xml.cloneNode(true);
   let node = xmlBlock;
   while (node) {
@@ -772,3 +743,5 @@ Blockly.Trashcan.prototype.cleanBlockXML_ = function(xml) {
   }
   return Blockly.Xml.domToText(xmlBlock);
 };
+
+exports = Trashcan;
diff --git a/tests/deps.js b/tests/deps.js
index 20fb4e48e..ed128d55c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -173,7 +173,7 @@ goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem']
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
-goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], [], {'lang': 'es6', 'module': 'goog'});

From 787145acf46c6feae193b521477d25c402b0ebca Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 16:40:48 -0700
Subject: [PATCH 409/833] Migrate core/toolbox/collapsible_category.js to ES6
 const/let

---
 core/toolbox/collapsible_category.js | 36 +++++++++++++++-------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/core/toolbox/collapsible_category.js b/core/toolbox/collapsible_category.js
index 979931848..4bf907278 100644
--- a/core/toolbox/collapsible_category.js
+++ b/core/toolbox/collapsible_category.js
@@ -92,7 +92,8 @@ Blockly.CollapsibleToolboxCategory.registrationName = 'collapsibleCategory';
  * @override
  */
 Blockly.CollapsibleToolboxCategory.prototype.makeDefaultCssConfig_ = function() {
-  var cssConfig = Blockly.CollapsibleToolboxCategory.superClass_.makeDefaultCssConfig_.call(this);
+  const cssConfig = Blockly.CollapsibleToolboxCategory.superClass_.makeDefaultCssConfig_.call(
+      this);
   cssConfig['contents'] = 'blocklyToolboxContents';
   return cssConfig;
 };
@@ -101,19 +102,20 @@ Blockly.CollapsibleToolboxCategory.prototype.makeDefaultCssConfig_ = function()
  * @override
  */
 Blockly.CollapsibleToolboxCategory.prototype.parseContents_ = function(categoryDef) {
-  var contents = categoryDef['contents'];
-  var prevIsFlyoutItem = true;
+  const contents = categoryDef['contents'];
+  let prevIsFlyoutItem = true;
 
   if (categoryDef['custom']) {
     this.flyoutItems_ = categoryDef['custom'];
   } else if (contents) {
-    for (var i = 0, itemDef; (itemDef = contents[i]); i++) {
+    for (let i = 0; i < contents.length; i++) {
+      const itemDef = contents[i];
       // Separators can exist as either a flyout item or a toolbox item so
       // decide where it goes based on the type of the previous item.
       if (!Blockly.registry.hasItem(Blockly.registry.Type.TOOLBOX_ITEM, itemDef['kind']) ||
           (itemDef['kind'].toLowerCase() == Blockly.ToolboxSeparator.registrationName &&
           prevIsFlyoutItem)) {
-        var flyoutItem = /** @type {Blockly.utils.toolbox.FlyoutItemInfo} */ (itemDef);
+        const flyoutItem = /** @type {Blockly.utils.toolbox.FlyoutItemInfo} */ (itemDef);
         this.flyoutItems_.push(flyoutItem);
         prevIsFlyoutItem = true;
       } else {
@@ -131,8 +133,8 @@ Blockly.CollapsibleToolboxCategory.prototype.parseContents_ = function(categoryD
  * @private
  */
 Blockly.CollapsibleToolboxCategory.prototype.createToolboxItem_ = function(itemDef) {
-  var registryName = itemDef['kind'];
-  var categoryDef = /** @type {!Blockly.utils.toolbox.CategoryInfo} */ (itemDef);
+  let registryName = itemDef['kind'];
+  const categoryDef = /** @type {!Blockly.utils.toolbox.CategoryInfo} */ (itemDef);
 
   // Categories that are collapsible are created using a class registered under
   // a diffferent name.
@@ -140,9 +142,9 @@ Blockly.CollapsibleToolboxCategory.prototype.createToolboxItem_ = function(itemD
       Blockly.utils.toolbox.isCategoryCollapsible(categoryDef)) {
     registryName = Blockly.CollapsibleToolboxCategory.registrationName;
   }
-  var ToolboxItemClass = Blockly.registry.getClass(
+  const ToolboxItemClass = Blockly.registry.getClass(
       Blockly.registry.Type.TOOLBOX_ITEM, registryName);
-  var toolboxItem = new ToolboxItemClass(itemDef, this.parentToolbox_, this);
+  const toolboxItem = new ToolboxItemClass(itemDef, this.parentToolbox_, this);
   this.toolboxItems_.push(toolboxItem);
 };
 
@@ -162,7 +164,7 @@ Blockly.CollapsibleToolboxCategory.prototype.init = function() {
 Blockly.CollapsibleToolboxCategory.prototype.createDom_ = function() {
   Blockly.CollapsibleToolboxCategory.superClass_.createDom_.call(this);
 
-  var subCategories = this.getChildToolboxItems();
+  const subCategories = this.getChildToolboxItems();
   this.subcategoriesDiv_ = this.createSubCategoriesDom_(subCategories);
   Blockly.utils.aria.setRole(this.subcategoriesDiv_,
       Blockly.utils.aria.Role.GROUP);
@@ -175,7 +177,7 @@ Blockly.CollapsibleToolboxCategory.prototype.createDom_ = function() {
  * @override
  */
 Blockly.CollapsibleToolboxCategory.prototype.createIconDom_ = function() {
-  var toolboxIcon = document.createElement('span');
+  const toolboxIcon = document.createElement('span');
   if (!this.parentToolbox_.isHorizontal()) {
     Blockly.utils.dom.addClass(toolboxIcon, this.cssConfig_['icon']);
     toolboxIcon.style.visibility = 'visible';
@@ -192,13 +194,13 @@ Blockly.CollapsibleToolboxCategory.prototype.createIconDom_ = function() {
  * @protected
  */
 Blockly.CollapsibleToolboxCategory.prototype.createSubCategoriesDom_ = function(subcategories) {
-  var contentsContainer = document.createElement('div');
+  const contentsContainer = document.createElement('div');
   Blockly.utils.dom.addClass(contentsContainer, this.cssConfig_['contents']);
 
-  for (var i = 0; i < subcategories.length; i++) {
-    var newCategory = subcategories[i];
+  for (let i = 0; i < subcategories.length; i++) {
+    const newCategory = subcategories[i];
     newCategory.init();
-    var newCategoryDiv = newCategory.getDiv();
+    const newCategoryDiv = newCategory.getDiv();
     contentsContainer.appendChild(newCategoryDiv);
     if (newCategory.getClickTarget) {
       newCategory.getClickTarget().setAttribute('id', newCategory.getId());
@@ -236,7 +238,9 @@ Blockly.CollapsibleToolboxCategory.prototype.setExpanded = function(isExpanded)
  */
 Blockly.CollapsibleToolboxCategory.prototype.setVisible_ = function(isVisible) {
   this.htmlDiv_.style.display = isVisible ? 'block' : 'none';
-  for (var i = 0, child; (child = this.getChildToolboxItems()[i]); i++) {
+  const childToolboxItems = this.getChildToolboxItems();
+  for (let i = 0; i < childToolboxItems.length; i++) {
+    const child = childToolboxItems[i];
     child.setVisible_(isVisible);
   }
   this.isHidden_ = !isVisible;

From 41b53c50cd4c0e0c83a1d6cb0a28a8a4173048ff Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 16:41:01 -0700
Subject: [PATCH 410/833] Migrate core/toolbox/collapsible_category.js to
 goog.module

---
 core/toolbox/collapsible_category.js | 55 +++++++++++++++-------------
 tests/deps.js                        |  2 +-
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/core/toolbox/collapsible_category.js b/core/toolbox/collapsible_category.js
index 4bf907278..50c0a2d5d 100644
--- a/core/toolbox/collapsible_category.js
+++ b/core/toolbox/collapsible_category.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.CollapsibleToolboxCategory');
+goog.module('Blockly.CollapsibleToolboxCategory');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.ICollapsibleToolboxItem');
 goog.require('Blockly.registry');
@@ -37,7 +38,7 @@ goog.requireType('Blockly.IToolboxItem');
  * @extends {Blockly.ToolboxCategory}
  * @implements {Blockly.ICollapsibleToolboxItem}
  */
-Blockly.CollapsibleToolboxCategory = function(categoryDef, toolbox, opt_parent) {
+const CollapsibleToolboxCategory = function(categoryDef, toolbox, opt_parent) {
   /**
    * Container for any child categories.
    * @type {?Element}
@@ -59,11 +60,11 @@ Blockly.CollapsibleToolboxCategory = function(categoryDef, toolbox, opt_parent)
    */
   this.toolboxItems_ = [];
 
-  Blockly.CollapsibleToolboxCategory.superClass_.constructor.call(
+  CollapsibleToolboxCategory.superClass_.constructor.call(
       this, categoryDef, toolbox, opt_parent);
 };
 
-Blockly.utils.object.inherits(Blockly.CollapsibleToolboxCategory, Blockly.ToolboxCategory);
+Blockly.utils.object.inherits(CollapsibleToolboxCategory, Blockly.ToolboxCategory);
 
 /**
  * All the CSS class names that are used to create a collapsible
@@ -80,19 +81,19 @@ Blockly.utils.object.inherits(Blockly.CollapsibleToolboxCategory, Blockly.Toolbo
  *            contents:?string
  *          }}
  */
-Blockly.CollapsibleToolboxCategory.CssConfig;
+CollapsibleToolboxCategory.CssConfig;
 
 /**
  * Name used for registering a collapsible toolbox category.
  * @const {string}
  */
-Blockly.CollapsibleToolboxCategory.registrationName = 'collapsibleCategory';
+CollapsibleToolboxCategory.registrationName = 'collapsibleCategory';
 
 /**
  * @override
  */
-Blockly.CollapsibleToolboxCategory.prototype.makeDefaultCssConfig_ = function() {
-  const cssConfig = Blockly.CollapsibleToolboxCategory.superClass_.makeDefaultCssConfig_.call(
+CollapsibleToolboxCategory.prototype.makeDefaultCssConfig_ = function() {
+  const cssConfig = CollapsibleToolboxCategory.superClass_.makeDefaultCssConfig_.call(
       this);
   cssConfig['contents'] = 'blocklyToolboxContents';
   return cssConfig;
@@ -101,7 +102,7 @@ Blockly.CollapsibleToolboxCategory.prototype.makeDefaultCssConfig_ = function()
 /**
  * @override
  */
-Blockly.CollapsibleToolboxCategory.prototype.parseContents_ = function(categoryDef) {
+CollapsibleToolboxCategory.prototype.parseContents_ = function(categoryDef) {
   const contents = categoryDef['contents'];
   let prevIsFlyoutItem = true;
 
@@ -132,7 +133,7 @@ Blockly.CollapsibleToolboxCategory.prototype.parseContents_ = function(categoryD
  *     to create a toolbox item.
  * @private
  */
-Blockly.CollapsibleToolboxCategory.prototype.createToolboxItem_ = function(itemDef) {
+CollapsibleToolboxCategory.prototype.createToolboxItem_ = function(itemDef) {
   let registryName = itemDef['kind'];
   const categoryDef = /** @type {!Blockly.utils.toolbox.CategoryInfo} */ (itemDef);
 
@@ -140,7 +141,7 @@ Blockly.CollapsibleToolboxCategory.prototype.createToolboxItem_ = function(itemD
   // a diffferent name.
   if (registryName.toUpperCase() == 'CATEGORY' &&
       Blockly.utils.toolbox.isCategoryCollapsible(categoryDef)) {
-    registryName = Blockly.CollapsibleToolboxCategory.registrationName;
+    registryName = CollapsibleToolboxCategory.registrationName;
   }
   const ToolboxItemClass = Blockly.registry.getClass(
       Blockly.registry.Type.TOOLBOX_ITEM, registryName);
@@ -151,8 +152,8 @@ Blockly.CollapsibleToolboxCategory.prototype.createToolboxItem_ = function(itemD
 /**
  * @override
  */
-Blockly.CollapsibleToolboxCategory.prototype.init = function() {
-  Blockly.CollapsibleToolboxCategory.superClass_.init.call(this);
+CollapsibleToolboxCategory.prototype.init = function() {
+  CollapsibleToolboxCategory.superClass_.init.call(this);
 
   this.setExpanded(this.toolboxItemDef_['expanded'] == 'true' ||
       this.toolboxItemDef_['expanded']);
@@ -161,8 +162,8 @@ Blockly.CollapsibleToolboxCategory.prototype.init = function() {
 /**
  * @override
  */
-Blockly.CollapsibleToolboxCategory.prototype.createDom_ = function() {
-  Blockly.CollapsibleToolboxCategory.superClass_.createDom_.call(this);
+CollapsibleToolboxCategory.prototype.createDom_ = function() {
+  CollapsibleToolboxCategory.superClass_.createDom_.call(this);
 
   const subCategories = this.getChildToolboxItems();
   this.subcategoriesDiv_ = this.createSubCategoriesDom_(subCategories);
@@ -176,7 +177,7 @@ Blockly.CollapsibleToolboxCategory.prototype.createDom_ = function() {
 /**
  * @override
  */
-Blockly.CollapsibleToolboxCategory.prototype.createIconDom_ = function() {
+CollapsibleToolboxCategory.prototype.createIconDom_ = function() {
   const toolboxIcon = document.createElement('span');
   if (!this.parentToolbox_.isHorizontal()) {
     Blockly.utils.dom.addClass(toolboxIcon, this.cssConfig_['icon']);
@@ -193,7 +194,7 @@ Blockly.CollapsibleToolboxCategory.prototype.createIconDom_ = function() {
  * @return {!Element} The div holding all the subcategories.
  * @protected
  */
-Blockly.CollapsibleToolboxCategory.prototype.createSubCategoriesDom_ = function(subcategories) {
+CollapsibleToolboxCategory.prototype.createSubCategoriesDom_ = function(subcategories) {
   const contentsContainer = document.createElement('div');
   Blockly.utils.dom.addClass(contentsContainer, this.cssConfig_['contents']);
 
@@ -215,7 +216,7 @@ Blockly.CollapsibleToolboxCategory.prototype.createSubCategoriesDom_ = function(
  * @param {boolean} isExpanded True to expand the category, false to close.
  * @public
  */
-Blockly.CollapsibleToolboxCategory.prototype.setExpanded = function(isExpanded) {
+CollapsibleToolboxCategory.prototype.setExpanded = function(isExpanded) {
   if (this.expanded_ == isExpanded) {
     return;
   }
@@ -236,7 +237,7 @@ Blockly.CollapsibleToolboxCategory.prototype.setExpanded = function(isExpanded)
 /**
  * @override
  */
-Blockly.CollapsibleToolboxCategory.prototype.setVisible_ = function(isVisible) {
+CollapsibleToolboxCategory.prototype.setVisible_ = function(isVisible) {
   this.htmlDiv_.style.display = isVisible ? 'block' : 'none';
   const childToolboxItems = this.getChildToolboxItems();
   for (let i = 0; i < childToolboxItems.length; i++) {
@@ -256,21 +257,21 @@ Blockly.CollapsibleToolboxCategory.prototype.setVisible_ = function(isVisible) {
  *     is collapsed.
  * @public
  */
-Blockly.CollapsibleToolboxCategory.prototype.isExpanded = function() {
+CollapsibleToolboxCategory.prototype.isExpanded = function() {
   return this.expanded_;
 };
 
 /**
  * @override
  */
-Blockly.CollapsibleToolboxCategory.prototype.isCollapsible = function() {
+CollapsibleToolboxCategory.prototype.isCollapsible = function() {
   return true;
 };
 
 /**
  * @override
  */
-Blockly.CollapsibleToolboxCategory.prototype.onClick = function(_e) {
+CollapsibleToolboxCategory.prototype.onClick = function(_e) {
   this.toggleExpanded();
 };
 
@@ -278,14 +279,14 @@ Blockly.CollapsibleToolboxCategory.prototype.onClick = function(_e) {
  * Toggles whether or not the category is expanded.
  * @public
  */
-Blockly.CollapsibleToolboxCategory.prototype.toggleExpanded = function() {
+CollapsibleToolboxCategory.prototype.toggleExpanded = function() {
   this.setExpanded(!this.expanded_);
 };
 
 /**
  * @override
  */
-Blockly.CollapsibleToolboxCategory.prototype.getDiv = function() {
+CollapsibleToolboxCategory.prototype.getDiv = function() {
   return this.htmlDiv_;
 };
 
@@ -293,10 +294,12 @@ Blockly.CollapsibleToolboxCategory.prototype.getDiv = function() {
  * Gets any children toolbox items. (ex. Gets the subcategories)
  * @return {!Array<!Blockly.IToolboxItem>} The child toolbox items.
  */
-Blockly.CollapsibleToolboxCategory.prototype.getChildToolboxItems = function() {
+CollapsibleToolboxCategory.prototype.getChildToolboxItems = function() {
   return this.toolboxItems_;
 };
 
 
 Blockly.registry.register(Blockly.registry.Type.TOOLBOX_ITEM,
-    Blockly.CollapsibleToolboxCategory.registrationName, Blockly.CollapsibleToolboxCategory);
+    CollapsibleToolboxCategory.registrationName, CollapsibleToolboxCategory);
+
+exports = CollapsibleToolboxCategory;
diff --git a/tests/deps.js b/tests/deps.js
index 20fb4e48e..46ca32e0a 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -166,7 +166,7 @@ goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
-goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.IToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem']);

From d7a864a498677c2cf733b0845f86c17c88bfd6e3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 16:42:18 -0700
Subject: [PATCH 411/833] Migrate core/toolbox/collapsible_category.js named
 requires

---
 core/toolbox/collapsible_category.js | 71 ++++++++++++++--------------
 1 file changed, 35 insertions(+), 36 deletions(-)

diff --git a/core/toolbox/collapsible_category.js b/core/toolbox/collapsible_category.js
index 50c0a2d5d..a35220fb8 100644
--- a/core/toolbox/collapsible_category.js
+++ b/core/toolbox/collapsible_category.js
@@ -13,30 +13,29 @@
 goog.module('Blockly.CollapsibleToolboxCategory');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.ICollapsibleToolboxItem');
-goog.require('Blockly.registry');
-goog.require('Blockly.ToolboxCategory');
-goog.require('Blockly.ToolboxItem');
-goog.require('Blockly.ToolboxSeparator');
-goog.require('Blockly.utils.aria');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.toolbox');
-
-goog.requireType('Blockly.IToolbox');
-goog.requireType('Blockly.IToolboxItem');
+const ICollapsibleToolboxItem = goog.require('Blockly.ICollapsibleToolboxItem');
+const IToolbox = goog.requireType('Blockly.IToolbox');
+const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
+const ToolboxCategory = goog.require('Blockly.ToolboxCategory');
+const ToolboxItem = goog.require('Blockly.ToolboxItem');
+const ToolboxSeparator = goog.require('Blockly.ToolboxSeparator');
+const aria = goog.require('Blockly.utils.aria');
+const dom = goog.require('Blockly.utils.dom');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
+const toolbox = goog.require('Blockly.utils.toolbox');
 
 
 /**
  * Class for a category in a toolbox that can be collapsed.
- * @param {!Blockly.utils.toolbox.CategoryInfo} categoryDef The information needed
+ * @param {!toolbox.CategoryInfo} categoryDef The information needed
  *     to create a category in the toolbox.
- * @param {!Blockly.IToolbox} toolbox The parent toolbox for the category.
- * @param {Blockly.ICollapsibleToolboxItem=} opt_parent The parent category or null if
+ * @param {!IToolbox} toolbox The parent toolbox for the category.
+ * @param {ICollapsibleToolboxItem=} opt_parent The parent category or null if
  *     the category does not have a parent.
  * @constructor
- * @extends {Blockly.ToolboxCategory}
- * @implements {Blockly.ICollapsibleToolboxItem}
+ * @extends {ToolboxCategory}
+ * @implements {ICollapsibleToolboxItem}
  */
 const CollapsibleToolboxCategory = function(categoryDef, toolbox, opt_parent) {
   /**
@@ -55,7 +54,7 @@ const CollapsibleToolboxCategory = function(categoryDef, toolbox, opt_parent) {
 
   /**
    * The child toolbox items for this category.
-   * @type {!Array<!Blockly.ToolboxItem>}
+   * @type {!Array<!ToolboxItem>}
    * @protected
    */
   this.toolboxItems_ = [];
@@ -64,7 +63,7 @@ const CollapsibleToolboxCategory = function(categoryDef, toolbox, opt_parent) {
       this, categoryDef, toolbox, opt_parent);
 };
 
-Blockly.utils.object.inherits(CollapsibleToolboxCategory, Blockly.ToolboxCategory);
+object.inherits(CollapsibleToolboxCategory, ToolboxCategory);
 
 /**
  * All the CSS class names that are used to create a collapsible
@@ -113,10 +112,10 @@ CollapsibleToolboxCategory.prototype.parseContents_ = function(categoryDef) {
       const itemDef = contents[i];
       // Separators can exist as either a flyout item or a toolbox item so
       // decide where it goes based on the type of the previous item.
-      if (!Blockly.registry.hasItem(Blockly.registry.Type.TOOLBOX_ITEM, itemDef['kind']) ||
-          (itemDef['kind'].toLowerCase() == Blockly.ToolboxSeparator.registrationName &&
+      if (!registry.hasItem(registry.Type.TOOLBOX_ITEM, itemDef['kind']) ||
+          (itemDef['kind'].toLowerCase() == ToolboxSeparator.registrationName &&
           prevIsFlyoutItem)) {
-        const flyoutItem = /** @type {Blockly.utils.toolbox.FlyoutItemInfo} */ (itemDef);
+        const flyoutItem = /** @type {toolbox.FlyoutItemInfo} */ (itemDef);
         this.flyoutItems_.push(flyoutItem);
         prevIsFlyoutItem = true;
       } else {
@@ -129,22 +128,22 @@ CollapsibleToolboxCategory.prototype.parseContents_ = function(categoryDef) {
 
 /**
  * Creates a toolbox item and adds it to the list of toolbox items.
- * @param {!Blockly.utils.toolbox.ToolboxItemInfo} itemDef The information needed
+ * @param {!toolbox.ToolboxItemInfo} itemDef The information needed
  *     to create a toolbox item.
  * @private
  */
 CollapsibleToolboxCategory.prototype.createToolboxItem_ = function(itemDef) {
   let registryName = itemDef['kind'];
-  const categoryDef = /** @type {!Blockly.utils.toolbox.CategoryInfo} */ (itemDef);
+  const categoryDef = /** @type {!toolbox.CategoryInfo} */ (itemDef);
 
   // Categories that are collapsible are created using a class registered under
   // a diffferent name.
   if (registryName.toUpperCase() == 'CATEGORY' &&
-      Blockly.utils.toolbox.isCategoryCollapsible(categoryDef)) {
+      toolbox.isCategoryCollapsible(categoryDef)) {
     registryName = CollapsibleToolboxCategory.registrationName;
   }
-  const ToolboxItemClass = Blockly.registry.getClass(
-      Blockly.registry.Type.TOOLBOX_ITEM, registryName);
+  const ToolboxItemClass = registry.getClass(
+      registry.Type.TOOLBOX_ITEM, registryName);
   const toolboxItem = new ToolboxItemClass(itemDef, this.parentToolbox_, this);
   this.toolboxItems_.push(toolboxItem);
 };
@@ -167,8 +166,8 @@ CollapsibleToolboxCategory.prototype.createDom_ = function() {
 
   const subCategories = this.getChildToolboxItems();
   this.subcategoriesDiv_ = this.createSubCategoriesDom_(subCategories);
-  Blockly.utils.aria.setRole(this.subcategoriesDiv_,
-      Blockly.utils.aria.Role.GROUP);
+  aria.setRole(this.subcategoriesDiv_,
+      aria.Role.GROUP);
   this.htmlDiv_.appendChild(this.subcategoriesDiv_);
 
   return this.htmlDiv_;
@@ -180,7 +179,7 @@ CollapsibleToolboxCategory.prototype.createDom_ = function() {
 CollapsibleToolboxCategory.prototype.createIconDom_ = function() {
   const toolboxIcon = document.createElement('span');
   if (!this.parentToolbox_.isHorizontal()) {
-    Blockly.utils.dom.addClass(toolboxIcon, this.cssConfig_['icon']);
+    dom.addClass(toolboxIcon, this.cssConfig_['icon']);
     toolboxIcon.style.visibility = 'visible';
   }
 
@@ -190,13 +189,13 @@ CollapsibleToolboxCategory.prototype.createIconDom_ = function() {
 
 /**
  * Create the DOM for all subcategories.
- * @param {!Array<!Blockly.ToolboxItem>} subcategories The subcategories.
+ * @param {!Array<!ToolboxItem>} subcategories The subcategories.
  * @return {!Element} The div holding all the subcategories.
  * @protected
  */
 CollapsibleToolboxCategory.prototype.createSubCategoriesDom_ = function(subcategories) {
   const contentsContainer = document.createElement('div');
-  Blockly.utils.dom.addClass(contentsContainer, this.cssConfig_['contents']);
+  dom.addClass(contentsContainer, this.cssConfig_['contents']);
 
   for (let i = 0; i < subcategories.length; i++) {
     const newCategory = subcategories[i];
@@ -228,8 +227,8 @@ CollapsibleToolboxCategory.prototype.setExpanded = function(isExpanded) {
     this.subcategoriesDiv_.style.display = 'none';
     this.closeIcon_(this.iconDom_);
   }
-  Blockly.utils.aria.setState(/** @type {!Element} */ (this.htmlDiv_),
-      Blockly.utils.aria.State.EXPANDED, isExpanded);
+  aria.setState(/** @type {!Element} */ (this.htmlDiv_),
+      aria.State.EXPANDED, isExpanded);
 
   this.parentToolbox_.handleToolboxItemResize();
 };
@@ -292,14 +291,14 @@ CollapsibleToolboxCategory.prototype.getDiv = function() {
 
 /**
  * Gets any children toolbox items. (ex. Gets the subcategories)
- * @return {!Array<!Blockly.IToolboxItem>} The child toolbox items.
+ * @return {!Array<!IToolboxItem>} The child toolbox items.
  */
 CollapsibleToolboxCategory.prototype.getChildToolboxItems = function() {
   return this.toolboxItems_;
 };
 
 
-Blockly.registry.register(Blockly.registry.Type.TOOLBOX_ITEM,
+registry.register(registry.Type.TOOLBOX_ITEM,
     CollapsibleToolboxCategory.registrationName, CollapsibleToolboxCategory);
 
 exports = CollapsibleToolboxCategory;

From c3521b7eb479781c371d5facd3837964ef4115d1 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 16:42:23 -0700
Subject: [PATCH 412/833] clang-format core/toolbox/collapsible_category.js

---
 core/toolbox/collapsible_category.js | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/core/toolbox/collapsible_category.js b/core/toolbox/collapsible_category.js
index a35220fb8..fde610f0c 100644
--- a/core/toolbox/collapsible_category.js
+++ b/core/toolbox/collapsible_category.js
@@ -92,8 +92,8 @@ CollapsibleToolboxCategory.registrationName = 'collapsibleCategory';
  * @override
  */
 CollapsibleToolboxCategory.prototype.makeDefaultCssConfig_ = function() {
-  const cssConfig = CollapsibleToolboxCategory.superClass_.makeDefaultCssConfig_.call(
-      this);
+  const cssConfig =
+      CollapsibleToolboxCategory.superClass_.makeDefaultCssConfig_.call(this);
   cssConfig['contents'] = 'blocklyToolboxContents';
   return cssConfig;
 };
@@ -114,7 +114,7 @@ CollapsibleToolboxCategory.prototype.parseContents_ = function(categoryDef) {
       // decide where it goes based on the type of the previous item.
       if (!registry.hasItem(registry.Type.TOOLBOX_ITEM, itemDef['kind']) ||
           (itemDef['kind'].toLowerCase() == ToolboxSeparator.registrationName &&
-          prevIsFlyoutItem)) {
+           prevIsFlyoutItem)) {
         const flyoutItem = /** @type {toolbox.FlyoutItemInfo} */ (itemDef);
         this.flyoutItems_.push(flyoutItem);
         prevIsFlyoutItem = true;
@@ -142,8 +142,8 @@ CollapsibleToolboxCategory.prototype.createToolboxItem_ = function(itemDef) {
       toolbox.isCategoryCollapsible(categoryDef)) {
     registryName = CollapsibleToolboxCategory.registrationName;
   }
-  const ToolboxItemClass = registry.getClass(
-      registry.Type.TOOLBOX_ITEM, registryName);
+  const ToolboxItemClass =
+      registry.getClass(registry.Type.TOOLBOX_ITEM, registryName);
   const toolboxItem = new ToolboxItemClass(itemDef, this.parentToolbox_, this);
   this.toolboxItems_.push(toolboxItem);
 };
@@ -154,7 +154,8 @@ CollapsibleToolboxCategory.prototype.createToolboxItem_ = function(itemDef) {
 CollapsibleToolboxCategory.prototype.init = function() {
   CollapsibleToolboxCategory.superClass_.init.call(this);
 
-  this.setExpanded(this.toolboxItemDef_['expanded'] == 'true' ||
+  this.setExpanded(
+      this.toolboxItemDef_['expanded'] == 'true' ||
       this.toolboxItemDef_['expanded']);
 };
 
@@ -166,8 +167,7 @@ CollapsibleToolboxCategory.prototype.createDom_ = function() {
 
   const subCategories = this.getChildToolboxItems();
   this.subcategoriesDiv_ = this.createSubCategoriesDom_(subCategories);
-  aria.setRole(this.subcategoriesDiv_,
-      aria.Role.GROUP);
+  aria.setRole(this.subcategoriesDiv_, aria.Role.GROUP);
   this.htmlDiv_.appendChild(this.subcategoriesDiv_);
 
   return this.htmlDiv_;
@@ -193,7 +193,8 @@ CollapsibleToolboxCategory.prototype.createIconDom_ = function() {
  * @return {!Element} The div holding all the subcategories.
  * @protected
  */
-CollapsibleToolboxCategory.prototype.createSubCategoriesDom_ = function(subcategories) {
+CollapsibleToolboxCategory.prototype.createSubCategoriesDom_ = function(
+    subcategories) {
   const contentsContainer = document.createElement('div');
   dom.addClass(contentsContainer, this.cssConfig_['contents']);
 
@@ -227,8 +228,8 @@ CollapsibleToolboxCategory.prototype.setExpanded = function(isExpanded) {
     this.subcategoriesDiv_.style.display = 'none';
     this.closeIcon_(this.iconDom_);
   }
-  aria.setState(/** @type {!Element} */ (this.htmlDiv_),
-      aria.State.EXPANDED, isExpanded);
+  aria.setState(
+      /** @type {!Element} */ (this.htmlDiv_), aria.State.EXPANDED, isExpanded);
 
   this.parentToolbox_.handleToolboxItemResize();
 };
@@ -298,7 +299,8 @@ CollapsibleToolboxCategory.prototype.getChildToolboxItems = function() {
 };
 
 
-registry.register(registry.Type.TOOLBOX_ITEM,
-    CollapsibleToolboxCategory.registrationName, CollapsibleToolboxCategory);
+registry.register(
+    registry.Type.TOOLBOX_ITEM, CollapsibleToolboxCategory.registrationName,
+    CollapsibleToolboxCategory);
 
 exports = CollapsibleToolboxCategory;

From 17bc528039beb9a6d11d2a3f66c3bdc107e883d4 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 16:52:03 -0700
Subject: [PATCH 413/833] Add eslint disable for requireType in
 core/toolbox/collapsible_category.js

---
 core/toolbox/collapsible_category.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/toolbox/collapsible_category.js b/core/toolbox/collapsible_category.js
index fde610f0c..bc6ea253d 100644
--- a/core/toolbox/collapsible_category.js
+++ b/core/toolbox/collapsible_category.js
@@ -14,7 +14,9 @@ goog.module('Blockly.CollapsibleToolboxCategory');
 goog.module.declareLegacyNamespace();
 
 const ICollapsibleToolboxItem = goog.require('Blockly.ICollapsibleToolboxItem');
+/* eslint-disable-next-line no-unused-vars */
 const IToolbox = goog.requireType('Blockly.IToolbox');
+/* eslint-disable-next-line no-unused-vars */
 const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 const ToolboxCategory = goog.require('Blockly.ToolboxCategory');
 const ToolboxItem = goog.require('Blockly.ToolboxItem');

From 7f5ec67860777ec680e61555e4b919ae079b52d2 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:50:38 -0700
Subject: [PATCH 414/833] Fix lint warnings in
 core/toolbox/collapsible_category.js

---
 core/toolbox/collapsible_category.js | 6 +++---
 tests/deps.js                        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/toolbox/collapsible_category.js b/core/toolbox/collapsible_category.js
index bc6ea253d..ae243f1e6 100644
--- a/core/toolbox/collapsible_category.js
+++ b/core/toolbox/collapsible_category.js
@@ -13,13 +13,13 @@
 goog.module('Blockly.CollapsibleToolboxCategory');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const ICollapsibleToolboxItem = goog.require('Blockly.ICollapsibleToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
 const IToolbox = goog.requireType('Blockly.IToolbox');
 /* eslint-disable-next-line no-unused-vars */
 const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 const ToolboxCategory = goog.require('Blockly.ToolboxCategory');
-const ToolboxItem = goog.require('Blockly.ToolboxItem');
 const ToolboxSeparator = goog.require('Blockly.ToolboxSeparator');
 const aria = goog.require('Blockly.utils.aria');
 const dom = goog.require('Blockly.utils.dom');
@@ -56,7 +56,7 @@ const CollapsibleToolboxCategory = function(categoryDef, toolbox, opt_parent) {
 
   /**
    * The child toolbox items for this category.
-   * @type {!Array<!ToolboxItem>}
+   * @type {!Array<!IToolboxItem>}
    * @protected
    */
   this.toolboxItems_ = [];
@@ -191,7 +191,7 @@ CollapsibleToolboxCategory.prototype.createIconDom_ = function() {
 
 /**
  * Create the DOM for all subcategories.
- * @param {!Array<!ToolboxItem>} subcategories The subcategories.
+ * @param {!Array<!IToolboxItem>} subcategories The subcategories.
  * @return {!Element} The div holding all the subcategories.
  * @protected
  */
diff --git a/tests/deps.js b/tests/deps.js
index 46ca32e0a..613a2793d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -166,7 +166,7 @@ goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
-goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.IToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem']);

From 9f83ade1e7ba6413c6c32d7e0d623a4d36a64893 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 14:12:17 -0700
Subject: [PATCH 415/833] Migrate core/workspace_comment.js to ES6 const/let

---
 core/workspace_comment.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/workspace_comment.js b/core/workspace_comment.js
index 5399dbe39..d71b60c60 100644
--- a/core/workspace_comment.js
+++ b/core/workspace_comment.js
@@ -185,7 +185,7 @@ Blockly.WorkspaceComment.prototype.getXY = function() {
  * @package
  */
 Blockly.WorkspaceComment.prototype.moveBy = function(dx, dy) {
-  var event = new (Blockly.Events.get(Blockly.Events.COMMENT_MOVE))(this);
+  const event = new (Blockly.Events.get(Blockly.Events.COMMENT_MOVE))(this);
   this.xy_.translate(dx, dy);
   event.recordNew();
   Blockly.Events.fire(event);
@@ -275,7 +275,7 @@ Blockly.WorkspaceComment.prototype.setContent = function(content) {
  * @package
  */
 Blockly.WorkspaceComment.prototype.toXmlWithXY = function(opt_noId) {
-  var element = this.toXml(opt_noId);
+  const element = this.toXml(opt_noId);
   element.setAttribute('x', Math.round(this.xy_.x));
   element.setAttribute('y', Math.round(this.xy_.y));
   element.setAttribute('h', this.height_);
@@ -292,7 +292,7 @@ Blockly.WorkspaceComment.prototype.toXmlWithXY = function(opt_noId) {
  * @package
  */
 Blockly.WorkspaceComment.prototype.toXml = function(opt_noId) {
-  var commentElement = Blockly.utils.xml.createElement('comment');
+  const commentElement = Blockly.utils.xml.createElement('comment');
   if (!opt_noId) {
     commentElement.id = this.id;
   }
@@ -307,7 +307,7 @@ Blockly.WorkspaceComment.prototype.toXml = function(opt_noId) {
  */
 Blockly.WorkspaceComment.fireCreateEvent = function(comment) {
   if (Blockly.Events.isEnabled()) {
-    var existingGroup = Blockly.Events.getGroup();
+    const existingGroup = Blockly.Events.getGroup();
     if (!existingGroup) {
       Blockly.Events.setGroup(true);
     }
@@ -330,13 +330,13 @@ Blockly.WorkspaceComment.fireCreateEvent = function(comment) {
  * @package
  */
 Blockly.WorkspaceComment.fromXml = function(xmlComment, workspace) {
-  var info = Blockly.WorkspaceComment.parseAttributes(xmlComment);
+  const info = Blockly.WorkspaceComment.parseAttributes(xmlComment);
 
-  var comment = new Blockly.WorkspaceComment(
+  const comment = new Blockly.WorkspaceComment(
       workspace, info.content, info.h, info.w, info.id);
 
-  var commentX = parseInt(xmlComment.getAttribute('x'), 10);
-  var commentY = parseInt(xmlComment.getAttribute('y'), 10);
+  const commentX = parseInt(xmlComment.getAttribute('x'), 10);
+  const commentY = parseInt(xmlComment.getAttribute('y'), 10);
   if (!isNaN(commentX) && !isNaN(commentY)) {
     comment.moveBy(commentX, commentY);
   }
@@ -353,8 +353,8 @@ Blockly.WorkspaceComment.fromXml = function(xmlComment, workspace) {
  * @package
  */
 Blockly.WorkspaceComment.parseAttributes = function(xml) {
-  var xmlH = xml.getAttribute('h');
-  var xmlW = xml.getAttribute('w');
+  const xmlH = xml.getAttribute('h');
+  const xmlW = xml.getAttribute('w');
 
   return {
     // @type {string}

From 2b6f5ba31a399d9a93711a6e8cb878480342dd4b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 14:12:28 -0700
Subject: [PATCH 416/833] Migrate core/workspace_comment.js to goog.module

---
 core/workspace_comment.js | 61 +++++++++++++++++++++------------------
 tests/deps.js             |  2 +-
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/core/workspace_comment.js b/core/workspace_comment.js
index d71b60c60..874877a89 100644
--- a/core/workspace_comment.js
+++ b/core/workspace_comment.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.WorkspaceComment');
+goog.module('Blockly.WorkspaceComment');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
@@ -25,6 +26,8 @@ goog.require('Blockly.utils');
 goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.xml');
 
+goog.requireType('Blockly.Workspace');
+
 
 /**
  * Class for a workspace comment.
@@ -36,7 +39,7 @@ goog.require('Blockly.utils.xml');
  *     create a new ID.
  * @constructor
  */
-Blockly.WorkspaceComment = function(workspace, content, height, width, opt_id) {
+const WorkspaceComment = function(workspace, content, height, width, opt_id) {
   /** @type {string} */
   this.id = (opt_id && !workspace.getCommentById(opt_id)) ?
       opt_id : Blockly.utils.genUid();
@@ -106,14 +109,14 @@ Blockly.WorkspaceComment = function(workspace, content, height, width, opt_id) {
    */
   this.isComment = true;
 
-  Blockly.WorkspaceComment.fireCreateEvent(this);
+  WorkspaceComment.fireCreateEvent(this);
 };
 
 /**
  * Dispose of this comment.
  * @package
  */
-Blockly.WorkspaceComment.prototype.dispose = function() {
+WorkspaceComment.prototype.dispose = function() {
   if (!this.workspace) {
     // The comment has already been deleted.
     return;
@@ -137,7 +140,7 @@ Blockly.WorkspaceComment.prototype.dispose = function() {
  * @return {number} Comment height.
  * @package
  */
-Blockly.WorkspaceComment.prototype.getHeight = function() {
+WorkspaceComment.prototype.getHeight = function() {
   return this.height_;
 };
 
@@ -146,7 +149,7 @@ Blockly.WorkspaceComment.prototype.getHeight = function() {
  * @param {number} height Comment height.
  * @package
  */
-Blockly.WorkspaceComment.prototype.setHeight = function(height) {
+WorkspaceComment.prototype.setHeight = function(height) {
   this.height_ = height;
 };
 
@@ -155,7 +158,7 @@ Blockly.WorkspaceComment.prototype.setHeight = function(height) {
  * @return {number} Comment width.
  * @package
  */
-Blockly.WorkspaceComment.prototype.getWidth = function() {
+WorkspaceComment.prototype.getWidth = function() {
   return this.width_;
 };
 
@@ -164,7 +167,7 @@ Blockly.WorkspaceComment.prototype.getWidth = function() {
  * @param {number} width comment width.
  * @package
  */
-Blockly.WorkspaceComment.prototype.setWidth = function(width) {
+WorkspaceComment.prototype.setWidth = function(width) {
   this.width_ = width;
 };
 
@@ -174,7 +177,7 @@ Blockly.WorkspaceComment.prototype.setWidth = function(width) {
  *   This is not valid if the comment is currently being dragged.
  * @package
  */
-Blockly.WorkspaceComment.prototype.getXY = function() {
+WorkspaceComment.prototype.getXY = function() {
   return new Blockly.utils.Coordinate(this.xy_.x, this.xy_.y);
 };
 
@@ -184,7 +187,7 @@ Blockly.WorkspaceComment.prototype.getXY = function() {
  * @param {number} dy Vertical offset, in workspace units.
  * @package
  */
-Blockly.WorkspaceComment.prototype.moveBy = function(dx, dy) {
+WorkspaceComment.prototype.moveBy = function(dx, dy) {
   const event = new (Blockly.Events.get(Blockly.Events.COMMENT_MOVE))(this);
   this.xy_.translate(dx, dy);
   event.recordNew();
@@ -196,7 +199,7 @@ Blockly.WorkspaceComment.prototype.moveBy = function(dx, dy) {
  * @return {boolean} True if deletable.
  * @package
  */
-Blockly.WorkspaceComment.prototype.isDeletable = function() {
+WorkspaceComment.prototype.isDeletable = function() {
   return this.deletable_ &&
       !(this.workspace && this.workspace.options.readOnly);
 };
@@ -206,7 +209,7 @@ Blockly.WorkspaceComment.prototype.isDeletable = function() {
  * @param {boolean} deletable True if deletable.
  * @package
  */
-Blockly.WorkspaceComment.prototype.setDeletable = function(deletable) {
+WorkspaceComment.prototype.setDeletable = function(deletable) {
   this.deletable_ = deletable;
 };
 
@@ -215,7 +218,7 @@ Blockly.WorkspaceComment.prototype.setDeletable = function(deletable) {
  * @return {boolean} True if movable.
  * @package
  */
-Blockly.WorkspaceComment.prototype.isMovable = function() {
+WorkspaceComment.prototype.isMovable = function() {
   return this.movable_ &&
       !(this.workspace && this.workspace.options.readOnly);
 };
@@ -225,7 +228,7 @@ Blockly.WorkspaceComment.prototype.isMovable = function() {
  * @param {boolean} movable True if movable.
  * @package
  */
-Blockly.WorkspaceComment.prototype.setMovable = function(movable) {
+WorkspaceComment.prototype.setMovable = function(movable) {
   this.movable_ = movable;
 };
 
@@ -233,7 +236,7 @@ Blockly.WorkspaceComment.prototype.setMovable = function(movable) {
  * Get whether this comment is editable or not.
  * @return {boolean} True if editable.
  */
-Blockly.WorkspaceComment.prototype.isEditable = function() {
+WorkspaceComment.prototype.isEditable = function() {
   return this.editable_ &&
       !(this.workspace && this.workspace.options.readOnly);
 };
@@ -242,7 +245,7 @@ Blockly.WorkspaceComment.prototype.isEditable = function() {
  * Set whether this comment is editable or not.
  * @param {boolean} editable True if editable.
  */
-Blockly.WorkspaceComment.prototype.setEditable = function(editable) {
+WorkspaceComment.prototype.setEditable = function(editable) {
   this.editable_ = editable;
 };
 
@@ -251,7 +254,7 @@ Blockly.WorkspaceComment.prototype.setEditable = function(editable) {
  * @return {string} Comment text.
  * @package
  */
-Blockly.WorkspaceComment.prototype.getContent = function() {
+WorkspaceComment.prototype.getContent = function() {
   return this.content_;
 };
 
@@ -260,7 +263,7 @@ Blockly.WorkspaceComment.prototype.getContent = function() {
  * @param {string} content Comment content.
  * @package
  */
-Blockly.WorkspaceComment.prototype.setContent = function(content) {
+WorkspaceComment.prototype.setContent = function(content) {
   if (this.content_ != content) {
     Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.COMMENT_CHANGE))(
         this, this.content_, content));
@@ -274,7 +277,7 @@ Blockly.WorkspaceComment.prototype.setContent = function(content) {
  * @return {!Element} Tree of XML elements.
  * @package
  */
-Blockly.WorkspaceComment.prototype.toXmlWithXY = function(opt_noId) {
+WorkspaceComment.prototype.toXmlWithXY = function(opt_noId) {
   const element = this.toXml(opt_noId);
   element.setAttribute('x', Math.round(this.xy_.x));
   element.setAttribute('y', Math.round(this.xy_.y));
@@ -291,7 +294,7 @@ Blockly.WorkspaceComment.prototype.toXmlWithXY = function(opt_noId) {
  * @return {!Element} Tree of XML elements.
  * @package
  */
-Blockly.WorkspaceComment.prototype.toXml = function(opt_noId) {
+WorkspaceComment.prototype.toXml = function(opt_noId) {
   const commentElement = Blockly.utils.xml.createElement('comment');
   if (!opt_noId) {
     commentElement.id = this.id;
@@ -302,10 +305,10 @@ Blockly.WorkspaceComment.prototype.toXml = function(opt_noId) {
 
 /**
  * Fire a create event for the given workspace comment, if comments are enabled.
- * @param {!Blockly.WorkspaceComment} comment The comment that was just created.
+ * @param {!WorkspaceComment} comment The comment that was just created.
  * @package
  */
-Blockly.WorkspaceComment.fireCreateEvent = function(comment) {
+WorkspaceComment.fireCreateEvent = function(comment) {
   if (Blockly.Events.isEnabled()) {
     const existingGroup = Blockly.Events.getGroup();
     if (!existingGroup) {
@@ -326,13 +329,13 @@ Blockly.WorkspaceComment.fireCreateEvent = function(comment) {
  * Decode an XML comment tag and create a comment on the workspace.
  * @param {!Element} xmlComment XML comment element.
  * @param {!Blockly.Workspace} workspace The workspace.
- * @return {!Blockly.WorkspaceComment} The created workspace comment.
+ * @return {!WorkspaceComment} The created workspace comment.
  * @package
  */
-Blockly.WorkspaceComment.fromXml = function(xmlComment, workspace) {
-  const info = Blockly.WorkspaceComment.parseAttributes(xmlComment);
+WorkspaceComment.fromXml = function(xmlComment, workspace) {
+  const info = WorkspaceComment.parseAttributes(xmlComment);
 
-  const comment = new Blockly.WorkspaceComment(
+  const comment = new WorkspaceComment(
       workspace, info.content, info.h, info.w, info.id);
 
   const commentX = parseInt(xmlComment.getAttribute('x'), 10);
@@ -341,7 +344,7 @@ Blockly.WorkspaceComment.fromXml = function(xmlComment, workspace) {
     comment.moveBy(commentX, commentY);
   }
 
-  Blockly.WorkspaceComment.fireCreateEvent(comment);
+  WorkspaceComment.fireCreateEvent(comment);
   return comment;
 };
 
@@ -352,7 +355,7 @@ Blockly.WorkspaceComment.fromXml = function(xmlComment, workspace) {
  *     object containing the id, size, position, and comment string.
  * @package
  */
-Blockly.WorkspaceComment.parseAttributes = function(xml) {
+WorkspaceComment.parseAttributes = function(xml) {
   const xmlH = xml.getAttribute('h');
   const xmlW = xml.getAttribute('w');
 
@@ -377,3 +380,5 @@ Blockly.WorkspaceComment.parseAttributes = function(xml) {
     content: xml.textContent
   };
 };
+
+exports = WorkspaceComment;
diff --git a/tests/deps.js b/tests/deps.js
index 613a2793d..f17d995b9 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -203,7 +203,7 @@ goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubbl
 goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.utils.dom']);
 goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml']);
+goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment_render_svg.js', ['Blockly.WorkspaceCommentSvg.render'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.WorkspaceComment', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom']);

From b159c382a0ddfe5466a7f919b03b8fcd0d57cd0e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 14:15:33 -0700
Subject: [PATCH 417/833] Migrate core/workspace_comment.js named requires

---
 core/workspace_comment.js | 54 +++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/core/workspace_comment.js b/core/workspace_comment.js
index 874877a89..971cbd0a7 100644
--- a/core/workspace_comment.js
+++ b/core/workspace_comment.js
@@ -13,7 +13,12 @@
 goog.module('Blockly.WorkspaceComment');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+const utils = goog.require('Blockly.utils');
+const xml = goog.require('Blockly.utils.xml');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.CommentChange');
 /** @suppress {extraRequire} */
@@ -22,16 +27,11 @@ goog.require('Blockly.Events.CommentCreate');
 goog.require('Blockly.Events.CommentDelete');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.CommentMove');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.xml');
-
-goog.requireType('Blockly.Workspace');
 
 
 /**
  * Class for a workspace comment.
- * @param {!Blockly.Workspace} workspace The block's workspace.
+ * @param {!Workspace} workspace The block's workspace.
  * @param {string} content The content of this workspace comment.
  * @param {number} height Height of the comment.
  * @param {number} width Width of the comment.
@@ -42,17 +42,17 @@ goog.requireType('Blockly.Workspace');
 const WorkspaceComment = function(workspace, content, height, width, opt_id) {
   /** @type {string} */
   this.id = (opt_id && !workspace.getCommentById(opt_id)) ?
-      opt_id : Blockly.utils.genUid();
+      opt_id : utils.genUid();
 
   workspace.addTopComment(this);
 
   /**
    * The comment's position in workspace units.  (0, 0) is at the workspace's
    * origin; scale does not change this value.
-   * @type {!Blockly.utils.Coordinate}
+   * @type {!Coordinate}
    * @protected
    */
-  this.xy_ = new Blockly.utils.Coordinate(0, 0);
+  this.xy_ = new Coordinate(0, 0);
 
   /**
    * The comment's height in workspace units.  Scale does not change this value.
@@ -69,7 +69,7 @@ const WorkspaceComment = function(workspace, content, height, width, opt_id) {
   this.width_ = width;
 
   /**
-   * @type {!Blockly.Workspace}
+   * @type {!Workspace}
    */
   this.workspace = workspace;
 
@@ -122,9 +122,9 @@ WorkspaceComment.prototype.dispose = function() {
     return;
   }
 
-  if (Blockly.Events.isEnabled()) {
-    Blockly.Events.fire(
-        new (Blockly.Events.get(Blockly.Events.COMMENT_DELETE))(this));
+  if (Events.isEnabled()) {
+    Events.fire(
+        new (Events.get(Events.COMMENT_DELETE))(this));
   }
 
   // Remove from the list of top comments and the comment database.
@@ -173,12 +173,12 @@ WorkspaceComment.prototype.setWidth = function(width) {
 
 /**
  * Get stored location.
- * @return {!Blockly.utils.Coordinate} The comment's stored location.
+ * @return {!Coordinate} The comment's stored location.
  *   This is not valid if the comment is currently being dragged.
  * @package
  */
 WorkspaceComment.prototype.getXY = function() {
-  return new Blockly.utils.Coordinate(this.xy_.x, this.xy_.y);
+  return new Coordinate(this.xy_.x, this.xy_.y);
 };
 
 /**
@@ -188,10 +188,10 @@ WorkspaceComment.prototype.getXY = function() {
  * @package
  */
 WorkspaceComment.prototype.moveBy = function(dx, dy) {
-  const event = new (Blockly.Events.get(Blockly.Events.COMMENT_MOVE))(this);
+  const event = new (Events.get(Events.COMMENT_MOVE))(this);
   this.xy_.translate(dx, dy);
   event.recordNew();
-  Blockly.Events.fire(event);
+  Events.fire(event);
 };
 
 /**
@@ -265,7 +265,7 @@ WorkspaceComment.prototype.getContent = function() {
  */
 WorkspaceComment.prototype.setContent = function(content) {
   if (this.content_ != content) {
-    Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.COMMENT_CHANGE))(
+    Events.fire(new (Events.get(Events.COMMENT_CHANGE))(
         this, this.content_, content));
     this.content_ = content;
   }
@@ -295,7 +295,7 @@ WorkspaceComment.prototype.toXmlWithXY = function(opt_noId) {
  * @package
  */
 WorkspaceComment.prototype.toXml = function(opt_noId) {
-  const commentElement = Blockly.utils.xml.createElement('comment');
+  const commentElement = xml.createElement('comment');
   if (!opt_noId) {
     commentElement.id = this.id;
   }
@@ -309,17 +309,17 @@ WorkspaceComment.prototype.toXml = function(opt_noId) {
  * @package
  */
 WorkspaceComment.fireCreateEvent = function(comment) {
-  if (Blockly.Events.isEnabled()) {
-    const existingGroup = Blockly.Events.getGroup();
+  if (Events.isEnabled()) {
+    const existingGroup = Events.getGroup();
     if (!existingGroup) {
-      Blockly.Events.setGroup(true);
+      Events.setGroup(true);
     }
     try {
-      Blockly.Events.fire(
-          new (Blockly.Events.get(Blockly.Events.COMMENT_CREATE))(comment));
+      Events.fire(
+          new (Events.get(Events.COMMENT_CREATE))(comment));
     } finally {
       if (!existingGroup) {
-        Blockly.Events.setGroup(false);
+        Events.setGroup(false);
       }
     }
   }
@@ -328,7 +328,7 @@ WorkspaceComment.fireCreateEvent = function(comment) {
 /**
  * Decode an XML comment tag and create a comment on the workspace.
  * @param {!Element} xmlComment XML comment element.
- * @param {!Blockly.Workspace} workspace The workspace.
+ * @param {!Workspace} workspace The workspace.
  * @return {!WorkspaceComment} The created workspace comment.
  * @package
  */

From 568c5cb40f6af9d661d6965befa090a15535a721 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 14:16:47 -0700
Subject: [PATCH 418/833] clang-format core/workspace_comment.js

---
 core/workspace_comment.js | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/core/workspace_comment.js b/core/workspace_comment.js
index 971cbd0a7..8d9009f94 100644
--- a/core/workspace_comment.js
+++ b/core/workspace_comment.js
@@ -41,8 +41,8 @@ goog.require('Blockly.Events.CommentMove');
  */
 const WorkspaceComment = function(workspace, content, height, width, opt_id) {
   /** @type {string} */
-  this.id = (opt_id && !workspace.getCommentById(opt_id)) ?
-      opt_id : utils.genUid();
+  this.id =
+      (opt_id && !workspace.getCommentById(opt_id)) ? opt_id : utils.genUid();
 
   workspace.addTopComment(this);
 
@@ -123,8 +123,7 @@ WorkspaceComment.prototype.dispose = function() {
   }
 
   if (Events.isEnabled()) {
-    Events.fire(
-        new (Events.get(Events.COMMENT_DELETE))(this));
+    Events.fire(new (Events.get(Events.COMMENT_DELETE))(this));
   }
 
   // Remove from the list of top comments and the comment database.
@@ -219,8 +218,7 @@ WorkspaceComment.prototype.setDeletable = function(deletable) {
  * @package
  */
 WorkspaceComment.prototype.isMovable = function() {
-  return this.movable_ &&
-      !(this.workspace && this.workspace.options.readOnly);
+  return this.movable_ && !(this.workspace && this.workspace.options.readOnly);
 };
 
 /**
@@ -237,8 +235,7 @@ WorkspaceComment.prototype.setMovable = function(movable) {
  * @return {boolean} True if editable.
  */
 WorkspaceComment.prototype.isEditable = function() {
-  return this.editable_ &&
-      !(this.workspace && this.workspace.options.readOnly);
+  return this.editable_ && !(this.workspace && this.workspace.options.readOnly);
 };
 
 /**
@@ -265,8 +262,8 @@ WorkspaceComment.prototype.getContent = function() {
  */
 WorkspaceComment.prototype.setContent = function(content) {
   if (this.content_ != content) {
-    Events.fire(new (Events.get(Events.COMMENT_CHANGE))(
-        this, this.content_, content));
+    Events.fire(
+        new (Events.get(Events.COMMENT_CHANGE))(this, this.content_, content));
     this.content_ = content;
   }
 };
@@ -315,8 +312,7 @@ WorkspaceComment.fireCreateEvent = function(comment) {
       Events.setGroup(true);
     }
     try {
-      Events.fire(
-          new (Events.get(Events.COMMENT_CREATE))(comment));
+      Events.fire(new (Events.get(Events.COMMENT_CREATE))(comment));
     } finally {
       if (!existingGroup) {
         Events.setGroup(false);
@@ -335,8 +331,8 @@ WorkspaceComment.fireCreateEvent = function(comment) {
 WorkspaceComment.fromXml = function(xmlComment, workspace) {
   const info = WorkspaceComment.parseAttributes(xmlComment);
 
-  const comment = new WorkspaceComment(
-      workspace, info.content, info.h, info.w, info.id);
+  const comment =
+      new WorkspaceComment(workspace, info.content, info.h, info.w, info.id);
 
   const commentX = parseInt(xmlComment.getAttribute('x'), 10);
   const commentY = parseInt(xmlComment.getAttribute('y'), 10);

From beff5e19bf5e8fab93a7fac6d5f76a34e6ee0c3b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 15:41:33 -0700
Subject: [PATCH 419/833] Combine workspace_comment_render_svg.js with
 workspace_comment_svg.js

---
 core/requires.js                           |   1 -
 core/workspace_comment_render_svg.js       | 463 ---------------------
 core/workspace_comment_svg.js              | 450 ++++++++++++++++++++
 tests/deps.js                              |   3 +-
 tests/playground.html                      |   1 -
 tests/playgrounds/advanced_playground.html |   1 -
 6 files changed, 451 insertions(+), 468 deletions(-)
 delete mode 100644 core/workspace_comment_render_svg.js

diff --git a/core/requires.js b/core/requires.js
index 2ca295441..cc67f564a 100644
--- a/core/requires.js
+++ b/core/requires.js
@@ -42,7 +42,6 @@ goog.require('Blockly.Trashcan');
 goog.require('Blockly.VariablesDynamic');
 // Only need to require these two if you're using workspace comments.
 // goog.require('Blockly.WorkspaceCommentSvg');
-// goog.require('Blockly.WorkspaceCommentSvg.render');
 // If zoom controls aren't required, then Blockly.inject's
 // "zoom"/"controls" configuration must be false.
 goog.require('Blockly.ZoomControls');
diff --git a/core/workspace_comment_render_svg.js b/core/workspace_comment_render_svg.js
deleted file mode 100644
index 5097f0c92..000000000
--- a/core/workspace_comment_render_svg.js
+++ /dev/null
@@ -1,463 +0,0 @@
-/**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Methods for rendering a workspace comment as SVG
- * @author fenichel@google.com (Rachel Fenichel)
- */
-'use strict';
-
-goog.provide('Blockly.WorkspaceCommentSvg.render');
-
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Svg');
-
-
-/**
- * Size of the resize icon.
- * @type {number}
- * @const
- * @private
- */
-Blockly.WorkspaceCommentSvg.RESIZE_SIZE = 8;
-
-/**
- * Radius of the border around the comment.
- * @type {number}
- * @const
- * @private
- */
-Blockly.WorkspaceCommentSvg.BORDER_RADIUS = 3;
-
-/**
- * Offset from the foreignobject edge to the textarea edge.
- * @type {number}
- * @const
- * @private
- */
-Blockly.WorkspaceCommentSvg.TEXTAREA_OFFSET = 2;
-
-/**
- * Offset from the top to make room for a top bar.
- * @type {number}
- * @const
- * @private
- */
-Blockly.WorkspaceCommentSvg.TOP_OFFSET = 10;
-
-/**
- * Returns a bounding box describing the dimensions of this comment.
- * @return {!{height: number, width: number}} Object with height and width
- *     properties in workspace units.
- * @package
- */
-Blockly.WorkspaceCommentSvg.prototype.getHeightWidth = function() {
-  return { width: this.getWidth(), height: this.getHeight() };
-};
-
-/**
- * Renders the workspace comment.
- * @package
- */
-Blockly.WorkspaceCommentSvg.prototype.render = function() {
-  if (this.rendered_) {
-    return;
-  }
-
-  var size = this.getHeightWidth();
-
-  // Add text area
-  this.createEditor_();
-  this.svgGroup_.appendChild(this.foreignObject_);
-
-  this.svgHandleTarget_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
-      {
-        'class': 'blocklyCommentHandleTarget',
-        'x': 0,
-        'y': 0
-      });
-  this.svgGroup_.appendChild(this.svgHandleTarget_);
-  this.svgRectTarget_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
-      {
-        'class': 'blocklyCommentTarget',
-        'x': 0,
-        'y': 0,
-        'rx': Blockly.WorkspaceCommentSvg.BORDER_RADIUS,
-        'ry': Blockly.WorkspaceCommentSvg.BORDER_RADIUS
-      });
-  this.svgGroup_.appendChild(this.svgRectTarget_);
-
-  // Add the resize icon
-  this.addResizeDom_();
-  if (this.isDeletable()) {
-    // Add the delete icon
-    this.addDeleteDom_();
-  }
-
-  this.setSize_(size.width, size.height);
-
-  // Set the content
-  this.textarea_.value = this.content_;
-
-  this.rendered_ = true;
-
-  if (this.resizeGroup_) {
-    Blockly.browserEvents.conditionalBind(
-        this.resizeGroup_, 'mousedown', this, this.resizeMouseDown_);
-  }
-
-  if (this.isDeletable()) {
-    Blockly.browserEvents.conditionalBind(
-        this.deleteGroup_, 'mousedown', this, this.deleteMouseDown_);
-    Blockly.browserEvents.conditionalBind(
-        this.deleteGroup_, 'mouseout', this, this.deleteMouseOut_);
-    Blockly.browserEvents.conditionalBind(
-        this.deleteGroup_, 'mouseup', this, this.deleteMouseUp_);
-  }
-};
-
-/**
- * Create the text area for the comment.
- * @return {!Element} The top-level node of the editor.
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.createEditor_ = function() {
-  /* Create the editor.  Here's the markup that will be generated:
-    <foreignObject class="blocklyCommentForeignObject" x="0" y="10" width="164" height="164">
-      <body xmlns="http://www.w3.org/1999/xhtml" class="blocklyMinimalBody">
-        <textarea xmlns="http://www.w3.org/1999/xhtml"
-            class="blocklyCommentTextarea"
-            style="height: 164px; width: 164px;"></textarea>
-      </body>
-    </foreignObject>
-  */
-  this.foreignObject_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FOREIGNOBJECT,
-      {
-        'x': 0,
-        'y': Blockly.WorkspaceCommentSvg.TOP_OFFSET,
-        'class': 'blocklyCommentForeignObject'
-      },
-      null);
-  var body = document.createElementNS(Blockly.utils.dom.HTML_NS, 'body');
-  body.setAttribute('xmlns', Blockly.utils.dom.HTML_NS);
-  body.className = 'blocklyMinimalBody';
-  var textarea = document.createElementNS(Blockly.utils.dom.HTML_NS, 'textarea');
-  textarea.className = 'blocklyCommentTextarea';
-  textarea.setAttribute('dir', this.RTL ? 'RTL' : 'LTR');
-  textarea.readOnly = !this.isEditable();
-  body.appendChild(textarea);
-  this.textarea_ = textarea;
-  this.foreignObject_.appendChild(body);
-  // Don't zoom with mousewheel.
-  Blockly.browserEvents.conditionalBind(textarea, 'wheel', this, function(e) {
-    e.stopPropagation();
-  });
-  Blockly.browserEvents.conditionalBind(
-      textarea, 'change', this,
-      function(
-          /* eslint-disable no-unused-vars */ e
-          /* eslint-enable no-unused-vars */) {
-        this.setContent(textarea.value);
-      });
-  return this.foreignObject_;
-};
-
-/**
- * Add the resize icon to the DOM
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
-  this.resizeGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
-      {
-        'class': this.RTL ? 'blocklyResizeSW' : 'blocklyResizeSE'
-      },
-      this.svgGroup_);
-  var resizeSize = Blockly.WorkspaceCommentSvg.RESIZE_SIZE;
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.POLYGON,
-      {'points': '0,x x,x x,0'.replace(/x/g, resizeSize.toString())},
-      this.resizeGroup_);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.LINE,
-      {
-        'class': 'blocklyResizeLine',
-        'x1': resizeSize / 3, 'y1': resizeSize - 1,
-        'x2': resizeSize - 1, 'y2': resizeSize / 3
-      }, this.resizeGroup_);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.LINE,
-      {
-        'class': 'blocklyResizeLine',
-        'x1': resizeSize * 2 / 3, 'y1': resizeSize - 1,
-        'x2': resizeSize - 1, 'y2': resizeSize * 2 / 3
-      }, this.resizeGroup_);
-};
-
-/**
- * Add the delete icon to the DOM
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.addDeleteDom_ = function() {
-  this.deleteGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
-      {
-        'class': 'blocklyCommentDeleteIcon'
-      },
-      this.svgGroup_);
-  this.deleteIconBorder_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.CIRCLE,
-      {
-        'class': 'blocklyDeleteIconShape',
-        'r': '7',
-        'cx': '7.5',
-        'cy': '7.5'
-      },
-      this.deleteGroup_);
-  // x icon.
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.LINE,
-      {
-        'x1': '5', 'y1': '10',
-        'x2': '10', 'y2': '5',
-        'stroke': '#fff',
-        'stroke-width': '2'
-      },
-      this.deleteGroup_);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.LINE,
-      {
-        'x1': '5', 'y1': '5',
-        'x2': '10', 'y2': '10',
-        'stroke': '#fff',
-        'stroke-width': '2'
-      },
-      this.deleteGroup_);
-};
-
-/**
- * Handle a mouse-down on comment's resize corner.
- * @param {!Event} e Mouse down event.
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.resizeMouseDown_ = function(e) {
-  this.unbindDragEvents_();
-  if (Blockly.utils.isRightButton(e)) {
-    // No right-click.
-    e.stopPropagation();
-    return;
-  }
-  // Left-click (or middle click)
-  this.workspace.startDrag(e, new Blockly.utils.Coordinate(
-    this.workspace.RTL ? -this.width_ : this.width_, this.height_));
-
-  this.onMouseUpWrapper_ = Blockly.browserEvents.conditionalBind(
-      document, 'mouseup', this, this.resizeMouseUp_);
-  this.onMouseMoveWrapper_ = Blockly.browserEvents.conditionalBind(
-      document, 'mousemove', this, this.resizeMouseMove_);
-  Blockly.hideChaff();
-  // This event has been handled.  No need to bubble up to the document.
-  e.stopPropagation();
-};
-
-/**
- * Handle a mouse-down on comment's delete icon.
- * @param {!Event} e Mouse down event.
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.deleteMouseDown_ = function(e) {
-  // Highlight the delete icon.
-  Blockly.utils.dom.addClass(
-      /** @type {!Element} */ (this.deleteIconBorder_),
-      'blocklyDeleteIconHighlighted');
-  // This event has been handled.  No need to bubble up to the document.
-  e.stopPropagation();
-};
-
-/**
- * Handle a mouse-out on comment's delete icon.
- * @param {!Event} _e Mouse out event.
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.deleteMouseOut_ = function(_e) {
-  // Restore highlight on the delete icon.
-  Blockly.utils.dom.removeClass(
-      /** @type {!Element} */ (this.deleteIconBorder_),
-      'blocklyDeleteIconHighlighted');
-};
-
-/**
- * Handle a mouse-up on comment's delete icon.
- * @param {!Event} e Mouse up event.
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.deleteMouseUp_ = function(e) {
-  // Delete this comment.
-  this.dispose(true, true);
-  // This event has been handled.  No need to bubble up to the document.
-  e.stopPropagation();
-};
-
-/**
- * Stop binding to the global mouseup and mousemove events.
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.unbindDragEvents_ = function() {
-  if (this.onMouseUpWrapper_) {
-    Blockly.browserEvents.unbind(this.onMouseUpWrapper_);
-    this.onMouseUpWrapper_ = null;
-  }
-  if (this.onMouseMoveWrapper_) {
-    Blockly.browserEvents.unbind(this.onMouseMoveWrapper_);
-    this.onMouseMoveWrapper_ = null;
-  }
-};
-
-/**
- * Handle a mouse-up event while dragging a comment's border or resize handle.
- * @param {!Event} e Mouse up event.
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.resizeMouseUp_ = function(/* e */) {
-  Blockly.Touch.clearTouchIdentifier();
-  this.unbindDragEvents_();
-};
-
-/**
- * Resize this comment to follow the mouse.
- * @param {!Event} e Mouse move event.
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.resizeMouseMove_ = function(e) {
-  this.autoLayout_ = false;
-  var newXY = this.workspace.moveDrag(e);
-  this.setSize_(this.RTL ? -newXY.x : newXY.x, newXY.y);
-};
-
-/**
- * Callback function triggered when the comment has resized.
- * Resize the text area accordingly.
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.resizeComment_ = function() {
-  var size = this.getHeightWidth();
-  var topOffset = Blockly.WorkspaceCommentSvg.TOP_OFFSET;
-  var textOffset = Blockly.WorkspaceCommentSvg.TEXTAREA_OFFSET * 2;
-
-  this.foreignObject_.setAttribute('width', size.width);
-  this.foreignObject_.setAttribute('height', size.height - topOffset);
-  if (this.RTL) {
-    this.foreignObject_.setAttribute('x', -size.width);
-  }
-  this.textarea_.style.width = (size.width - textOffset) + 'px';
-  this.textarea_.style.height = (size.height - textOffset - topOffset) + 'px';
-};
-
-/**
- * Set size
- * @param {number} width width of the container
- * @param {number} height height of the container
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.setSize_ = function(width, height) {
-  // Minimum size of a comment.
-  width = Math.max(width, 45);
-  height = Math.max(height, 20 + Blockly.WorkspaceCommentSvg.TOP_OFFSET);
-  this.width_ = width;
-  this.height_ = height;
-  this.svgRect_.setAttribute('width', width);
-  this.svgRect_.setAttribute('height', height);
-  this.svgRectTarget_.setAttribute('width', width);
-  this.svgRectTarget_.setAttribute('height', height);
-  this.svgHandleTarget_.setAttribute('width', width);
-  this.svgHandleTarget_.setAttribute('height',
-      Blockly.WorkspaceCommentSvg.TOP_OFFSET);
-  if (this.RTL) {
-    this.svgRect_.setAttribute('transform', 'scale(-1 1)');
-    this.svgRectTarget_.setAttribute('transform', 'scale(-1 1)');
-  }
-
-  var resizeSize = Blockly.WorkspaceCommentSvg.RESIZE_SIZE;
-  if (this.resizeGroup_) {
-    if (this.RTL) {
-      // Mirror the resize group.
-      this.resizeGroup_.setAttribute('transform', 'translate(' +
-        (-width + resizeSize) + ',' + (height - resizeSize) + ') scale(-1 1)');
-      this.deleteGroup_.setAttribute('transform', 'translate(' +
-        (-width + resizeSize) + ',' + (-resizeSize) + ') scale(-1 1)');
-    } else {
-      this.resizeGroup_.setAttribute('transform', 'translate(' +
-        (width - resizeSize) + ',' +
-        (height - resizeSize) + ')');
-      this.deleteGroup_.setAttribute('transform', 'translate(' +
-        (width - resizeSize) + ',' +
-        (-resizeSize) + ')');
-    }
-  }
-
-  // Allow the contents to resize.
-  this.resizeComment_();
-};
-
-/**
- * Dispose of any rendered comment components.
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.disposeInternal_ = function() {
-  this.textarea_ = null;
-  this.foreignObject_ = null;
-  this.svgRectTarget_ = null;
-  this.svgHandleTarget_ = null;
-  this.disposed_ = true;
-};
-
-/**
- * Set the focus on the text area.
- * @package
- */
-Blockly.WorkspaceCommentSvg.prototype.setFocus = function() {
-  var comment = this;
-  this.focused_ = true;
-  // Defer CSS changes.
-  setTimeout(function() {
-    if (comment.disposed_) {
-      return;
-    }
-    comment.textarea_.focus();
-    comment.addFocus();
-    Blockly.utils.dom.addClass(
-        comment.svgRectTarget_, 'blocklyCommentTargetFocused');
-    Blockly.utils.dom.addClass(
-        comment.svgHandleTarget_, 'blocklyCommentHandleTargetFocused');
-  }, 0);
-};
-
-/**
- * Remove focus from the text area.
- * @package
- */
-Blockly.WorkspaceCommentSvg.prototype.blurFocus = function() {
-  var comment = this;
-  this.focused_ = false;
-  // Defer CSS changes.
-  setTimeout(function() {
-    if (comment.disposed_) {
-      return;
-    }
-
-    comment.textarea_.blur();
-    comment.removeFocus();
-    Blockly.utils.dom.removeClass(
-        comment.svgRectTarget_, 'blocklyCommentTargetFocused');
-    Blockly.utils.dom.removeClass(
-        comment.svgHandleTarget_, 'blocklyCommentHandleTargetFocused');
-  }, 0);
-};
diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 401b840e1..84864422b 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -12,6 +12,9 @@
 
 goog.provide('Blockly.WorkspaceCommentSvg');
 
+goog.require('Blockly');
+goog.require('Blockly.browserEvents');
+goog.require('Blockly.ContextMenu');
 goog.require('Blockly.Css');
 goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
@@ -22,6 +25,7 @@ goog.require('Blockly.Events.CommentDelete');
 goog.require('Blockly.Events.CommentMove');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.Selected');
+goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.dom');
@@ -30,9 +34,11 @@ goog.require('Blockly.utils.Rect');
 goog.require('Blockly.utils.Svg');
 goog.require('Blockly.WorkspaceComment');
 
+goog.requireType('Blockly.BlockDragSurfaceSvg');
 goog.requireType('Blockly.IBoundedElement');
 goog.requireType('Blockly.IBubble');
 goog.requireType('Blockly.ICopyable');
+goog.requireType('Blockly.Workspace');
 
 
 /**
@@ -116,6 +122,38 @@ Blockly.utils.object.inherits(
  */
 Blockly.WorkspaceCommentSvg.DEFAULT_SIZE = 100;
 
+/**
+ * Size of the resize icon.
+ * @type {number}
+ * @const
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.RESIZE_SIZE = 8;
+
+/**
+ * Radius of the border around the comment.
+ * @type {number}
+ * @const
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.BORDER_RADIUS = 3;
+
+/**
+ * Offset from the foreignobject edge to the textarea edge.
+ * @type {number}
+ * @const
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.TEXTAREA_OFFSET = 2;
+
+/**
+ * Offset from the top to make room for a top bar.
+ * @type {number}
+ * @const
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.TOP_OFFSET = 10;
+
 /**
  * Dispose of this comment.
  * @package
@@ -646,6 +684,418 @@ Blockly.WorkspaceCommentSvg.prototype.toCopyData = function() {
   return {xml: this.toXmlWithXY(), source: this.workspace, typeCounts: null};
 };
 
+/**
+ * Returns a bounding box describing the dimensions of this comment.
+ * @return {!{height: number, width: number}} Object with height and width
+ *     properties in workspace units.
+ * @package
+ */
+Blockly.WorkspaceCommentSvg.prototype.getHeightWidth = function() {
+  return { width: this.getWidth(), height: this.getHeight() };
+};
+
+/**
+ * Renders the workspace comment.
+ * @package
+ */
+Blockly.WorkspaceCommentSvg.prototype.render = function() {
+  if (this.rendered_) {
+    return;
+  }
+
+  var size = this.getHeightWidth();
+
+  // Add text area
+  this.createEditor_();
+  this.svgGroup_.appendChild(this.foreignObject_);
+
+  this.svgHandleTarget_ = Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.RECT,
+      {
+        'class': 'blocklyCommentHandleTarget',
+        'x': 0,
+        'y': 0
+      });
+  this.svgGroup_.appendChild(this.svgHandleTarget_);
+  this.svgRectTarget_ = Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.RECT,
+      {
+        'class': 'blocklyCommentTarget',
+        'x': 0,
+        'y': 0,
+        'rx': Blockly.WorkspaceCommentSvg.BORDER_RADIUS,
+        'ry': Blockly.WorkspaceCommentSvg.BORDER_RADIUS
+      });
+  this.svgGroup_.appendChild(this.svgRectTarget_);
+
+  // Add the resize icon
+  this.addResizeDom_();
+  if (this.isDeletable()) {
+    // Add the delete icon
+    this.addDeleteDom_();
+  }
+
+  this.setSize_(size.width, size.height);
+
+  // Set the content
+  this.textarea_.value = this.content_;
+
+  this.rendered_ = true;
+
+  if (this.resizeGroup_) {
+    Blockly.browserEvents.conditionalBind(
+        this.resizeGroup_, 'mousedown', this, this.resizeMouseDown_);
+  }
+
+  if (this.isDeletable()) {
+    Blockly.browserEvents.conditionalBind(
+        this.deleteGroup_, 'mousedown', this, this.deleteMouseDown_);
+    Blockly.browserEvents.conditionalBind(
+        this.deleteGroup_, 'mouseout', this, this.deleteMouseOut_);
+    Blockly.browserEvents.conditionalBind(
+        this.deleteGroup_, 'mouseup', this, this.deleteMouseUp_);
+  }
+};
+
+/**
+ * Create the text area for the comment.
+ * @return {!Element} The top-level node of the editor.
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.createEditor_ = function() {
+  /* Create the editor.  Here's the markup that will be generated:
+    <foreignObject class="blocklyCommentForeignObject" x="0" y="10" width="164" height="164">
+      <body xmlns="http://www.w3.org/1999/xhtml" class="blocklyMinimalBody">
+        <textarea xmlns="http://www.w3.org/1999/xhtml"
+            class="blocklyCommentTextarea"
+            style="height: 164px; width: 164px;"></textarea>
+      </body>
+    </foreignObject>
+  */
+  this.foreignObject_ = Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.FOREIGNOBJECT,
+      {
+        'x': 0,
+        'y': Blockly.WorkspaceCommentSvg.TOP_OFFSET,
+        'class': 'blocklyCommentForeignObject'
+      },
+      null);
+  var body = document.createElementNS(Blockly.utils.dom.HTML_NS, 'body');
+  body.setAttribute('xmlns', Blockly.utils.dom.HTML_NS);
+  body.className = 'blocklyMinimalBody';
+  var textarea = document.createElementNS(Blockly.utils.dom.HTML_NS, 'textarea');
+  textarea.className = 'blocklyCommentTextarea';
+  textarea.setAttribute('dir', this.RTL ? 'RTL' : 'LTR');
+  textarea.readOnly = !this.isEditable();
+  body.appendChild(textarea);
+  this.textarea_ = textarea;
+  this.foreignObject_.appendChild(body);
+  // Don't zoom with mousewheel.
+  Blockly.browserEvents.conditionalBind(textarea, 'wheel', this, function(e) {
+    e.stopPropagation();
+  });
+  Blockly.browserEvents.conditionalBind(
+      textarea, 'change', this,
+      function(
+          /* eslint-disable no-unused-vars */ e
+          /* eslint-enable no-unused-vars */) {
+        this.setContent(textarea.value);
+      });
+  return this.foreignObject_;
+};
+
+/**
+ * Add the resize icon to the DOM
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
+  this.resizeGroup_ = Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.G,
+      {
+        'class': this.RTL ? 'blocklyResizeSW' : 'blocklyResizeSE'
+      },
+      this.svgGroup_);
+  var resizeSize = Blockly.WorkspaceCommentSvg.RESIZE_SIZE;
+  Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.POLYGON,
+      {'points': '0,x x,x x,0'.replace(/x/g, resizeSize.toString())},
+      this.resizeGroup_);
+  Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.LINE,
+      {
+        'class': 'blocklyResizeLine',
+        'x1': resizeSize / 3, 'y1': resizeSize - 1,
+        'x2': resizeSize - 1, 'y2': resizeSize / 3
+      }, this.resizeGroup_);
+  Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.LINE,
+      {
+        'class': 'blocklyResizeLine',
+        'x1': resizeSize * 2 / 3, 'y1': resizeSize - 1,
+        'x2': resizeSize - 1, 'y2': resizeSize * 2 / 3
+      }, this.resizeGroup_);
+};
+
+/**
+ * Add the delete icon to the DOM
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.addDeleteDom_ = function() {
+  this.deleteGroup_ = Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.G,
+      {
+        'class': 'blocklyCommentDeleteIcon'
+      },
+      this.svgGroup_);
+  this.deleteIconBorder_ = Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.CIRCLE,
+      {
+        'class': 'blocklyDeleteIconShape',
+        'r': '7',
+        'cx': '7.5',
+        'cy': '7.5'
+      },
+      this.deleteGroup_);
+  // x icon.
+  Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.LINE,
+      {
+        'x1': '5', 'y1': '10',
+        'x2': '10', 'y2': '5',
+        'stroke': '#fff',
+        'stroke-width': '2'
+      },
+      this.deleteGroup_);
+  Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.LINE,
+      {
+        'x1': '5', 'y1': '5',
+        'x2': '10', 'y2': '10',
+        'stroke': '#fff',
+        'stroke-width': '2'
+      },
+      this.deleteGroup_);
+};
+
+/**
+ * Handle a mouse-down on comment's resize corner.
+ * @param {!Event} e Mouse down event.
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.resizeMouseDown_ = function(e) {
+  this.unbindDragEvents_();
+  if (Blockly.utils.isRightButton(e)) {
+    // No right-click.
+    e.stopPropagation();
+    return;
+  }
+  // Left-click (or middle click)
+  this.workspace.startDrag(e, new Blockly.utils.Coordinate(
+      this.workspace.RTL ? -this.width_ : this.width_, this.height_));
+
+  this.onMouseUpWrapper_ = Blockly.browserEvents.conditionalBind(
+      document, 'mouseup', this, this.resizeMouseUp_);
+  this.onMouseMoveWrapper_ = Blockly.browserEvents.conditionalBind(
+      document, 'mousemove', this, this.resizeMouseMove_);
+  Blockly.hideChaff();
+  // This event has been handled.  No need to bubble up to the document.
+  e.stopPropagation();
+};
+
+/**
+ * Handle a mouse-down on comment's delete icon.
+ * @param {!Event} e Mouse down event.
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.deleteMouseDown_ = function(e) {
+  // Highlight the delete icon.
+  Blockly.utils.dom.addClass(
+      /** @type {!Element} */ (this.deleteIconBorder_),
+      'blocklyDeleteIconHighlighted');
+  // This event has been handled.  No need to bubble up to the document.
+  e.stopPropagation();
+};
+
+/**
+ * Handle a mouse-out on comment's delete icon.
+ * @param {!Event} _e Mouse out event.
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.deleteMouseOut_ = function(_e) {
+  // Restore highlight on the delete icon.
+  Blockly.utils.dom.removeClass(
+      /** @type {!Element} */ (this.deleteIconBorder_),
+      'blocklyDeleteIconHighlighted');
+};
+
+/**
+ * Handle a mouse-up on comment's delete icon.
+ * @param {!Event} e Mouse up event.
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.deleteMouseUp_ = function(e) {
+  // Delete this comment.
+  this.dispose(true, true);
+  // This event has been handled.  No need to bubble up to the document.
+  e.stopPropagation();
+};
+
+/**
+ * Stop binding to the global mouseup and mousemove events.
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.unbindDragEvents_ = function() {
+  if (this.onMouseUpWrapper_) {
+    Blockly.browserEvents.unbind(this.onMouseUpWrapper_);
+    this.onMouseUpWrapper_ = null;
+  }
+  if (this.onMouseMoveWrapper_) {
+    Blockly.browserEvents.unbind(this.onMouseMoveWrapper_);
+    this.onMouseMoveWrapper_ = null;
+  }
+};
+
+/**
+ * Handle a mouse-up event while dragging a comment's border or resize handle.
+ * @param {!Event} e Mouse up event.
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.resizeMouseUp_ = function(/* e */) {
+  Blockly.Touch.clearTouchIdentifier();
+  this.unbindDragEvents_();
+};
+
+/**
+ * Resize this comment to follow the mouse.
+ * @param {!Event} e Mouse move event.
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.resizeMouseMove_ = function(e) {
+  this.autoLayout_ = false;
+  var newXY = this.workspace.moveDrag(e);
+  this.setSize_(this.RTL ? -newXY.x : newXY.x, newXY.y);
+};
+
+/**
+ * Callback function triggered when the comment has resized.
+ * Resize the text area accordingly.
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.resizeComment_ = function() {
+  var size = this.getHeightWidth();
+  var topOffset = Blockly.WorkspaceCommentSvg.TOP_OFFSET;
+  var textOffset = Blockly.WorkspaceCommentSvg.TEXTAREA_OFFSET * 2;
+
+  this.foreignObject_.setAttribute('width', size.width);
+  this.foreignObject_.setAttribute('height', size.height - topOffset);
+  if (this.RTL) {
+    this.foreignObject_.setAttribute('x', -size.width);
+  }
+  this.textarea_.style.width = (size.width - textOffset) + 'px';
+  this.textarea_.style.height = (size.height - textOffset - topOffset) + 'px';
+};
+
+/**
+ * Set size
+ * @param {number} width width of the container
+ * @param {number} height height of the container
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.setSize_ = function(width, height) {
+  // Minimum size of a comment.
+  width = Math.max(width, 45);
+  height = Math.max(height, 20 + Blockly.WorkspaceCommentSvg.TOP_OFFSET);
+  this.width_ = width;
+  this.height_ = height;
+  this.svgRect_.setAttribute('width', width);
+  this.svgRect_.setAttribute('height', height);
+  this.svgRectTarget_.setAttribute('width', width);
+  this.svgRectTarget_.setAttribute('height', height);
+  this.svgHandleTarget_.setAttribute('width', width);
+  this.svgHandleTarget_.setAttribute('height',
+      Blockly.WorkspaceCommentSvg.TOP_OFFSET);
+  if (this.RTL) {
+    this.svgRect_.setAttribute('transform', 'scale(-1 1)');
+    this.svgRectTarget_.setAttribute('transform', 'scale(-1 1)');
+  }
+
+  var resizeSize = Blockly.WorkspaceCommentSvg.RESIZE_SIZE;
+  if (this.resizeGroup_) {
+    if (this.RTL) {
+      // Mirror the resize group.
+      this.resizeGroup_.setAttribute('transform', 'translate(' +
+          (-width + resizeSize) + ',' + (height - resizeSize) + ') scale(-1 1)');
+      this.deleteGroup_.setAttribute('transform', 'translate(' +
+          (-width + resizeSize) + ',' + (-resizeSize) + ') scale(-1 1)');
+    } else {
+      this.resizeGroup_.setAttribute('transform', 'translate(' +
+          (width - resizeSize) + ',' +
+          (height - resizeSize) + ')');
+      this.deleteGroup_.setAttribute('transform', 'translate(' +
+          (width - resizeSize) + ',' +
+          (-resizeSize) + ')');
+    }
+  }
+
+  // Allow the contents to resize.
+  this.resizeComment_();
+};
+
+/**
+ * Dispose of any rendered comment components.
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.disposeInternal_ = function() {
+  this.textarea_ = null;
+  this.foreignObject_ = null;
+  this.svgRectTarget_ = null;
+  this.svgHandleTarget_ = null;
+  this.disposed_ = true;
+};
+
+/**
+ * Set the focus on the text area.
+ * @package
+ */
+Blockly.WorkspaceCommentSvg.prototype.setFocus = function() {
+  var comment = this;
+  this.focused_ = true;
+  // Defer CSS changes.
+  setTimeout(function() {
+    if (comment.disposed_) {
+      return;
+    }
+    comment.textarea_.focus();
+    comment.addFocus();
+    Blockly.utils.dom.addClass(
+        comment.svgRectTarget_, 'blocklyCommentTargetFocused');
+    Blockly.utils.dom.addClass(
+        comment.svgHandleTarget_, 'blocklyCommentHandleTargetFocused');
+  }, 0);
+};
+
+/**
+ * Remove focus from the text area.
+ * @package
+ */
+Blockly.WorkspaceCommentSvg.prototype.blurFocus = function() {
+  var comment = this;
+  this.focused_ = false;
+  // Defer CSS changes.
+  setTimeout(function() {
+    if (comment.disposed_) {
+      return;
+    }
+
+    comment.textarea_.blur();
+    comment.removeFocus();
+    Blockly.utils.dom.removeClass(
+        comment.svgRectTarget_, 'blocklyCommentTargetFocused');
+    Blockly.utils.dom.removeClass(
+        comment.svgHandleTarget_, 'blocklyCommentHandleTargetFocused');
+  }, 0);
+};
+
 /**
  * CSS for workspace comment.  See css.js for use.
  */
diff --git a/tests/deps.js b/tests/deps.js
index f17d995b9..a729ae7b9 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -204,8 +204,7 @@ goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.u
 goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment_render_svg.js', ['Blockly.WorkspaceCommentSvg.render'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.WorkspaceComment', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate']);
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
diff --git a/tests/playground.html b/tests/playground.html
index 11179a0db..b53e76ea8 100644
--- a/tests/playground.html
+++ b/tests/playground.html
@@ -71,7 +71,6 @@
 <script>
 // Custom requires for the playground.
 goog.require('Blockly.WorkspaceCommentSvg');
-goog.require('Blockly.WorkspaceCommentSvg.render');
 </script>
 <script>
 'use strict';
diff --git a/tests/playgrounds/advanced_playground.html b/tests/playgrounds/advanced_playground.html
index 6be7c1e42..bd7b1b7fc 100644
--- a/tests/playgrounds/advanced_playground.html
+++ b/tests/playgrounds/advanced_playground.html
@@ -77,7 +77,6 @@ goog.require('Blockly.Themes.Zelos');
 
 // Other.
 goog.require('Blockly.WorkspaceCommentSvg');
-goog.require('Blockly.WorkspaceCommentSvg.render');
 </script>
 <script>
 'use strict';

From 4afb5580d71c878697039b9d02ff545f31c37c3a Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 15:51:05 -0700
Subject: [PATCH 420/833] Migrate core/workspace_comment_svg.js to ES6
 const/let

---
 core/workspace_comment_svg.js | 80 ++++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 38 deletions(-)

diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 84864422b..e1df37c4b 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -222,7 +222,7 @@ Blockly.WorkspaceCommentSvg.prototype.initSvg = function(opt_noSelect) {
  * @private
  */
 Blockly.WorkspaceCommentSvg.prototype.pathMouseDown_ = function(e) {
-  var gesture = this.workspace.getGesture(e);
+  const gesture = this.workspace.getGesture(e);
   if (gesture) {
     gesture.handleBubbleStart(e, this);
   }
@@ -238,8 +238,8 @@ Blockly.WorkspaceCommentSvg.prototype.showContextMenu = function(e) {
     return;
   }
   // Save the current workspace comment in a variable for use in closures.
-  var comment = this;
-  var menuOptions = [];
+  const comment = this;
+  const menuOptions = [];
 
   if (this.isDeletable() && this.isMovable()) {
     menuOptions.push(Blockly.ContextMenu.commentDuplicateOption(comment));
@@ -257,7 +257,7 @@ Blockly.WorkspaceCommentSvg.prototype.select = function() {
   if (Blockly.selected == this) {
     return;
   }
-  var oldId = null;
+  let oldId = null;
   if (Blockly.selected) {
     oldId = Blockly.selected.id;
     // Unselect any previously selected block.
@@ -268,7 +268,8 @@ Blockly.WorkspaceCommentSvg.prototype.select = function() {
       Blockly.Events.enable();
     }
   }
-  var event = new (Blockly.Events.get(Blockly.Events.SELECTED))(oldId, this.id,
+  const event = new (Blockly.Events.get(Blockly.Events.SELECTED))(oldId,
+      this.id,
       this.workspace.id);
   Blockly.Events.fire(event);
   Blockly.selected = this;
@@ -283,7 +284,7 @@ Blockly.WorkspaceCommentSvg.prototype.unselect = function() {
   if (Blockly.selected != this) {
     return;
   }
-  var event = new (Blockly.Events.get(Blockly.Events.SELECTED))(this.id, null,
+  const event = new (Blockly.Events.get(Blockly.Events.SELECTED))(this.id, null,
       this.workspace.id);
   Blockly.Events.fire(event);
   Blockly.selected = null;
@@ -340,24 +341,24 @@ Blockly.WorkspaceCommentSvg.prototype.removeFocus = function() {
  * @package
  */
 Blockly.WorkspaceCommentSvg.prototype.getRelativeToSurfaceXY = function() {
-  var x = 0;
-  var y = 0;
+  let x = 0;
+  let y = 0;
 
-  var dragSurfaceGroup =
+  const dragSurfaceGroup =
       this.useDragSurface_ ? this.workspace.blockDragSurface_.getGroup() : null;
 
-  var element = this.getSvgRoot();
+  let element = this.getSvgRoot();
   if (element) {
     do {
       // Loop through this comment and every parent.
-      var xy = Blockly.utils.getRelativeXY(element);
+      const xy = Blockly.utils.getRelativeXY(element);
       x += xy.x;
       y += xy.y;
       // If this element is the current element on the drag surface, include
       // the translation of the drag surface itself.
       if (this.useDragSurface_ &&
           this.workspace.blockDragSurface_.getCurrentBlock() == element) {
-        var surfaceTranslation =
+        const surfaceTranslation =
             this.workspace.blockDragSurface_.getSurfaceTranslation();
         x += surfaceTranslation.x;
         y += surfaceTranslation.y;
@@ -377,9 +378,9 @@ Blockly.WorkspaceCommentSvg.prototype.getRelativeToSurfaceXY = function() {
  * @package
  */
 Blockly.WorkspaceCommentSvg.prototype.moveBy = function(dx, dy) {
-  var event = new (Blockly.Events.get(Blockly.Events.COMMENT_MOVE))(this);
+  const event = new (Blockly.Events.get(Blockly.Events.COMMENT_MOVE))(this);
   // TODO: Do I need to look up the relative to surface XY position here?
-  var xy = this.getRelativeToSurfaceXY();
+  const xy = this.getRelativeToSurfaceXY();
   this.translate(xy.x + dx, xy.y + dy);
   this.xy_ = new Blockly.utils.Coordinate(xy.x + dx, xy.y + dy);
   event.recordNew();
@@ -413,7 +414,7 @@ Blockly.WorkspaceCommentSvg.prototype.moveToDragSurface = function() {
   // is equal to the current relative-to-surface position,
   // to keep the position in sync as it move on/off the surface.
   // This is in workspace coordinates.
-  var xy = this.getRelativeToSurfaceXY();
+  const xy = this.getRelativeToSurfaceXY();
   this.clearTransformAttributes_();
   this.workspace.blockDragSurface_.translateSurface(xy.x, xy.y);
   // Execute the move on the top-level SVG component
@@ -484,11 +485,12 @@ Blockly.WorkspaceCommentSvg.prototype.clearTransformAttributes_ = function() {
  * @package
  */
 Blockly.WorkspaceCommentSvg.prototype.getBoundingRectangle = function() {
-  var blockXY = this.getRelativeToSurfaceXY();
-  var commentBounds = this.getHeightWidth();
-  var top = blockXY.y;
-  var bottom = blockXY.y + commentBounds.height;
-  var left, right;
+  const blockXY = this.getRelativeToSurfaceXY();
+  const commentBounds = this.getHeightWidth();
+  const top = blockXY.y;
+  const bottom = blockXY.y + commentBounds.height;
+  let left;
+  let right;
   if (this.RTL) {
     left = blockXY.x - commentBounds.width;
     // Add the width of the tab/puzzle piece knob to the x coordinate
@@ -545,7 +547,7 @@ Blockly.WorkspaceCommentSvg.prototype.setEditable = function(editable) {
  */
 Blockly.WorkspaceCommentSvg.prototype.setDragging = function(adding) {
   if (adding) {
-    var group = this.getSvgRoot();
+    const group = this.getSvgRoot();
     group.translate_ = '';
     group.skew_ = '';
     Blockly.utils.dom.addClass(
@@ -626,10 +628,11 @@ Blockly.WorkspaceCommentSvg.prototype.setAutoLayout = function(_enable) {
 Blockly.WorkspaceCommentSvg.fromXml = function(
     xmlComment, workspace, opt_wsWidth) {
   Blockly.Events.disable();
+  let comment;
   try {
-    var info = Blockly.WorkspaceComment.parseAttributes(xmlComment);
+    const info = Blockly.WorkspaceComment.parseAttributes(xmlComment);
 
-    var comment = new Blockly.WorkspaceCommentSvg(
+    comment = new Blockly.WorkspaceCommentSvg(
         workspace, info.content, info.h, info.w, info.id);
     if (workspace.rendered) {
       comment.initSvg(true);
@@ -639,7 +642,7 @@ Blockly.WorkspaceCommentSvg.fromXml = function(
     // rendered RTL workspace.
     if (!isNaN(info.x) && !isNaN(info.y)) {
       if (workspace.RTL) {
-        var wsWidth = opt_wsWidth || workspace.getWidth();
+        const wsWidth = opt_wsWidth || workspace.getWidth();
         comment.moveBy(wsWidth - info.x, info.y);
       } else {
         comment.moveBy(info.x, info.y);
@@ -660,13 +663,13 @@ Blockly.WorkspaceCommentSvg.fromXml = function(
  * @package
  */
 Blockly.WorkspaceCommentSvg.prototype.toXmlWithXY = function(opt_noId) {
-  var width;  // Not used in LTR.
+  let width;  // Not used in LTR.
   if (this.workspace.RTL) {
     // Here be performance dragons: This calls getMetrics().
     width = this.workspace.getWidth();
   }
-  var element = this.toXml(opt_noId);
-  var xy = this.getRelativeToSurfaceXY();
+  const element = this.toXml(opt_noId);
+  const xy = this.getRelativeToSurfaceXY();
   element.setAttribute(
       'x', Math.round(this.workspace.RTL ? width - xy.x : xy.x));
   element.setAttribute('y', Math.round(xy.y));
@@ -703,7 +706,7 @@ Blockly.WorkspaceCommentSvg.prototype.render = function() {
     return;
   }
 
-  var size = this.getHeightWidth();
+  const size = this.getHeightWidth();
 
   // Add text area
   this.createEditor_();
@@ -780,10 +783,11 @@ Blockly.WorkspaceCommentSvg.prototype.createEditor_ = function() {
         'class': 'blocklyCommentForeignObject'
       },
       null);
-  var body = document.createElementNS(Blockly.utils.dom.HTML_NS, 'body');
+  const body = document.createElementNS(Blockly.utils.dom.HTML_NS, 'body');
   body.setAttribute('xmlns', Blockly.utils.dom.HTML_NS);
   body.className = 'blocklyMinimalBody';
-  var textarea = document.createElementNS(Blockly.utils.dom.HTML_NS, 'textarea');
+  const textarea = document.createElementNS(Blockly.utils.dom.HTML_NS,
+      'textarea');
   textarea.className = 'blocklyCommentTextarea';
   textarea.setAttribute('dir', this.RTL ? 'RTL' : 'LTR');
   textarea.readOnly = !this.isEditable();
@@ -815,7 +819,7 @@ Blockly.WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
         'class': this.RTL ? 'blocklyResizeSW' : 'blocklyResizeSE'
       },
       this.svgGroup_);
-  var resizeSize = Blockly.WorkspaceCommentSvg.RESIZE_SIZE;
+  const resizeSize = Blockly.WorkspaceCommentSvg.RESIZE_SIZE;
   Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.POLYGON,
       {'points': '0,x x,x x,0'.replace(/x/g, resizeSize.toString())},
@@ -972,7 +976,7 @@ Blockly.WorkspaceCommentSvg.prototype.resizeMouseUp_ = function(/* e */) {
  */
 Blockly.WorkspaceCommentSvg.prototype.resizeMouseMove_ = function(e) {
   this.autoLayout_ = false;
-  var newXY = this.workspace.moveDrag(e);
+  const newXY = this.workspace.moveDrag(e);
   this.setSize_(this.RTL ? -newXY.x : newXY.x, newXY.y);
 };
 
@@ -982,9 +986,9 @@ Blockly.WorkspaceCommentSvg.prototype.resizeMouseMove_ = function(e) {
  * @private
  */
 Blockly.WorkspaceCommentSvg.prototype.resizeComment_ = function() {
-  var size = this.getHeightWidth();
-  var topOffset = Blockly.WorkspaceCommentSvg.TOP_OFFSET;
-  var textOffset = Blockly.WorkspaceCommentSvg.TEXTAREA_OFFSET * 2;
+  const size = this.getHeightWidth();
+  const topOffset = Blockly.WorkspaceCommentSvg.TOP_OFFSET;
+  const textOffset = Blockly.WorkspaceCommentSvg.TEXTAREA_OFFSET * 2;
 
   this.foreignObject_.setAttribute('width', size.width);
   this.foreignObject_.setAttribute('height', size.height - topOffset);
@@ -1019,7 +1023,7 @@ Blockly.WorkspaceCommentSvg.prototype.setSize_ = function(width, height) {
     this.svgRectTarget_.setAttribute('transform', 'scale(-1 1)');
   }
 
-  var resizeSize = Blockly.WorkspaceCommentSvg.RESIZE_SIZE;
+  const resizeSize = Blockly.WorkspaceCommentSvg.RESIZE_SIZE;
   if (this.resizeGroup_) {
     if (this.RTL) {
       // Mirror the resize group.
@@ -1058,7 +1062,7 @@ Blockly.WorkspaceCommentSvg.prototype.disposeInternal_ = function() {
  * @package
  */
 Blockly.WorkspaceCommentSvg.prototype.setFocus = function() {
-  var comment = this;
+  const comment = this;
   this.focused_ = true;
   // Defer CSS changes.
   setTimeout(function() {
@@ -1079,7 +1083,7 @@ Blockly.WorkspaceCommentSvg.prototype.setFocus = function() {
  * @package
  */
 Blockly.WorkspaceCommentSvg.prototype.blurFocus = function() {
-  var comment = this;
+  const comment = this;
   this.focused_ = false;
   // Defer CSS changes.
   setTimeout(function() {

From 0e5a4a947a1d89844a18b1663da5f7a756401142 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 15:51:18 -0700
Subject: [PATCH 421/833] Migrate core/workspace_comment_svg.js to goog.module

---
 core/workspace_comment_svg.js | 151 +++++++++++++++++-----------------
 tests/deps.js                 |   2 +-
 2 files changed, 78 insertions(+), 75 deletions(-)

diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index e1df37c4b..1127167ba 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.WorkspaceCommentSvg');
+goog.module('Blockly.WorkspaceCommentSvg');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly');
 goog.require('Blockly.browserEvents');
@@ -55,7 +56,7 @@ goog.requireType('Blockly.Workspace');
  * @implements {Blockly.ICopyable}
  * @constructor
  */
-Blockly.WorkspaceCommentSvg = function(
+const WorkspaceCommentSvg = function(
     workspace, content, height, width, opt_id) {
   /**
    * Mouse up event data.
@@ -85,8 +86,8 @@ Blockly.WorkspaceCommentSvg = function(
         'class': 'blocklyCommentRect',
         'x': 0,
         'y': 0,
-        'rx': Blockly.WorkspaceCommentSvg.BORDER_RADIUS,
-        'ry': Blockly.WorkspaceCommentSvg.BORDER_RADIUS
+        'rx': WorkspaceCommentSvg.BORDER_RADIUS,
+        'ry': WorkspaceCommentSvg.BORDER_RADIUS
       });
   this.svgGroup_.appendChild(this.svgRect_);
 
@@ -106,13 +107,13 @@ Blockly.WorkspaceCommentSvg = function(
   this.useDragSurface_ =
       Blockly.utils.is3dSupported() && !!workspace.blockDragSurface_;
 
-  Blockly.WorkspaceCommentSvg.superClass_.constructor.call(
+  WorkspaceCommentSvg.superClass_.constructor.call(
       this, workspace, content, height, width, opt_id);
 
   this.render();
 };
 Blockly.utils.object.inherits(
-    Blockly.WorkspaceCommentSvg, Blockly.WorkspaceComment);
+    WorkspaceCommentSvg, Blockly.WorkspaceComment);
 
 /**
  * The width and height to use to size a workspace comment when it is first
@@ -120,7 +121,7 @@ Blockly.utils.object.inherits(
  * @type {number}
  * @package
  */
-Blockly.WorkspaceCommentSvg.DEFAULT_SIZE = 100;
+WorkspaceCommentSvg.DEFAULT_SIZE = 100;
 
 /**
  * Size of the resize icon.
@@ -128,7 +129,7 @@ Blockly.WorkspaceCommentSvg.DEFAULT_SIZE = 100;
  * @const
  * @private
  */
-Blockly.WorkspaceCommentSvg.RESIZE_SIZE = 8;
+WorkspaceCommentSvg.RESIZE_SIZE = 8;
 
 /**
  * Radius of the border around the comment.
@@ -136,7 +137,7 @@ Blockly.WorkspaceCommentSvg.RESIZE_SIZE = 8;
  * @const
  * @private
  */
-Blockly.WorkspaceCommentSvg.BORDER_RADIUS = 3;
+WorkspaceCommentSvg.BORDER_RADIUS = 3;
 
 /**
  * Offset from the foreignobject edge to the textarea edge.
@@ -144,7 +145,7 @@ Blockly.WorkspaceCommentSvg.BORDER_RADIUS = 3;
  * @const
  * @private
  */
-Blockly.WorkspaceCommentSvg.TEXTAREA_OFFSET = 2;
+WorkspaceCommentSvg.TEXTAREA_OFFSET = 2;
 
 /**
  * Offset from the top to make room for a top bar.
@@ -152,13 +153,13 @@ Blockly.WorkspaceCommentSvg.TEXTAREA_OFFSET = 2;
  * @const
  * @private
  */
-Blockly.WorkspaceCommentSvg.TOP_OFFSET = 10;
+WorkspaceCommentSvg.TOP_OFFSET = 10;
 
 /**
  * Dispose of this comment.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.dispose = function() {
+WorkspaceCommentSvg.prototype.dispose = function() {
   if (!this.workspace) {
     // The comment has already been deleted.
     return;
@@ -182,7 +183,7 @@ Blockly.WorkspaceCommentSvg.prototype.dispose = function() {
   this.disposeInternal_();
 
   Blockly.Events.disable();
-  Blockly.WorkspaceCommentSvg.superClass_.dispose.call(this);
+  WorkspaceCommentSvg.superClass_.dispose.call(this);
   Blockly.Events.enable();
 };
 
@@ -194,7 +195,7 @@ Blockly.WorkspaceCommentSvg.prototype.dispose = function() {
  *
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.initSvg = function(opt_noSelect) {
+WorkspaceCommentSvg.prototype.initSvg = function(opt_noSelect) {
   if (!this.workspace.rendered) {
     throw TypeError('Workspace is headless.');
   }
@@ -221,7 +222,7 @@ Blockly.WorkspaceCommentSvg.prototype.initSvg = function(opt_noSelect) {
  * @param {!Event} e Mouse down event or touch start event.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.pathMouseDown_ = function(e) {
+WorkspaceCommentSvg.prototype.pathMouseDown_ = function(e) {
   const gesture = this.workspace.getGesture(e);
   if (gesture) {
     gesture.handleBubbleStart(e, this);
@@ -233,7 +234,7 @@ Blockly.WorkspaceCommentSvg.prototype.pathMouseDown_ = function(e) {
  * @param {!Event} e Mouse event.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.showContextMenu = function(e) {
+WorkspaceCommentSvg.prototype.showContextMenu = function(e) {
   if (this.workspace.options.readOnly) {
     return;
   }
@@ -253,7 +254,7 @@ Blockly.WorkspaceCommentSvg.prototype.showContextMenu = function(e) {
  * Select this comment.  Highlight it visually.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.select = function() {
+WorkspaceCommentSvg.prototype.select = function() {
   if (Blockly.selected == this) {
     return;
   }
@@ -280,7 +281,7 @@ Blockly.WorkspaceCommentSvg.prototype.select = function() {
  * Unselect this comment.  Remove its highlighting.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.unselect = function() {
+WorkspaceCommentSvg.prototype.unselect = function() {
   if (Blockly.selected != this) {
     return;
   }
@@ -296,7 +297,7 @@ Blockly.WorkspaceCommentSvg.prototype.unselect = function() {
  * Select this comment.  Highlight it visually.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.addSelect = function() {
+WorkspaceCommentSvg.prototype.addSelect = function() {
   Blockly.utils.dom.addClass(
       /** @type {!Element} */ (this.svgGroup_), 'blocklySelected');
   this.setFocus();
@@ -306,7 +307,7 @@ Blockly.WorkspaceCommentSvg.prototype.addSelect = function() {
  * Unselect this comment.  Remove its highlighting.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.removeSelect = function() {
+WorkspaceCommentSvg.prototype.removeSelect = function() {
   Blockly.utils.dom.removeClass(
       /** @type {!Element} */ (this.svgGroup_), 'blocklySelected');
   this.blurFocus();
@@ -316,7 +317,7 @@ Blockly.WorkspaceCommentSvg.prototype.removeSelect = function() {
  * Focus this comment.  Highlight it visually.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.addFocus = function() {
+WorkspaceCommentSvg.prototype.addFocus = function() {
   Blockly.utils.dom.addClass(
       /** @type {!Element} */ (this.svgGroup_), 'blocklyFocused');
 };
@@ -325,7 +326,7 @@ Blockly.WorkspaceCommentSvg.prototype.addFocus = function() {
  * Unfocus this comment.  Remove its highlighting.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.removeFocus = function() {
+WorkspaceCommentSvg.prototype.removeFocus = function() {
   Blockly.utils.dom.removeClass(
       /** @type {!Element} */ (this.svgGroup_), 'blocklyFocused');
 };
@@ -340,7 +341,7 @@ Blockly.WorkspaceCommentSvg.prototype.removeFocus = function() {
  *     workspace coordinates.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.getRelativeToSurfaceXY = function() {
+WorkspaceCommentSvg.prototype.getRelativeToSurfaceXY = function() {
   let x = 0;
   let y = 0;
 
@@ -377,7 +378,7 @@ Blockly.WorkspaceCommentSvg.prototype.getRelativeToSurfaceXY = function() {
  * @param {number} dy Vertical offset, in workspace units.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.moveBy = function(dx, dy) {
+WorkspaceCommentSvg.prototype.moveBy = function(dx, dy) {
   const event = new (Blockly.Events.get(Blockly.Events.COMMENT_MOVE))(this);
   // TODO: Do I need to look up the relative to surface XY position here?
   const xy = this.getRelativeToSurfaceXY();
@@ -395,7 +396,7 @@ Blockly.WorkspaceCommentSvg.prototype.moveBy = function(dx, dy) {
  * @param {number} y The y coordinate of the translation in workspace units.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.translate = function(x, y) {
+WorkspaceCommentSvg.prototype.translate = function(x, y) {
   this.xy_ = new Blockly.utils.Coordinate(x, y);
   this.getSvgRoot().setAttribute('transform', 'translate(' + x + ',' + y + ')');
 };
@@ -406,7 +407,7 @@ Blockly.WorkspaceCommentSvg.prototype.translate = function(x, y) {
  * setDragging(true).  Does nothing if useDragSurface_ is false.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.moveToDragSurface = function() {
+WorkspaceCommentSvg.prototype.moveToDragSurface = function() {
   if (!this.useDragSurface_) {
     return;
   }
@@ -429,7 +430,7 @@ Blockly.WorkspaceCommentSvg.prototype.moveToDragSurface = function() {
  *     on on the workspace canvas, in workspace coordinates.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.moveOffDragSurface = function(newXY) {
+WorkspaceCommentSvg.prototype.moveOffDragSurface = function(newXY) {
   if (!this.useDragSurface_) {
     return;
   }
@@ -447,7 +448,7 @@ Blockly.WorkspaceCommentSvg.prototype.moveOffDragSurface = function(newXY) {
  *     workspace coordinates.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.moveDuringDrag = function(
+WorkspaceCommentSvg.prototype.moveDuringDrag = function(
     dragSurface, newLoc) {
   if (dragSurface) {
     dragSurface.translateSurface(newLoc.x, newLoc.y);
@@ -464,7 +465,7 @@ Blockly.WorkspaceCommentSvg.prototype.moveDuringDrag = function(
  * @param {number} y The y position to move to.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.moveTo = function(x, y) {
+WorkspaceCommentSvg.prototype.moveTo = function(x, y) {
   this.translate(x, y);
 };
 
@@ -473,7 +474,7 @@ Blockly.WorkspaceCommentSvg.prototype.moveTo = function(x, y) {
  * Used when the comment is switching from 3d to 2d transform or vice versa.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.clearTransformAttributes_ = function() {
+WorkspaceCommentSvg.prototype.clearTransformAttributes_ = function() {
   this.getSvgRoot().removeAttribute('transform');
 };
 
@@ -484,7 +485,7 @@ Blockly.WorkspaceCommentSvg.prototype.clearTransformAttributes_ = function() {
  * @return {!Blockly.utils.Rect} Object with coordinates of the bounding box.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.getBoundingRectangle = function() {
+WorkspaceCommentSvg.prototype.getBoundingRectangle = function() {
   const blockXY = this.getRelativeToSurfaceXY();
   const commentBounds = this.getHeightWidth();
   const top = blockXY.y;
@@ -509,7 +510,7 @@ Blockly.WorkspaceCommentSvg.prototype.getBoundingRectangle = function() {
  * Add or remove the UI indicating if this comment is movable or not.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.updateMovable = function() {
+WorkspaceCommentSvg.prototype.updateMovable = function() {
   if (this.isMovable()) {
     Blockly.utils.dom.addClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDraggable');
@@ -524,8 +525,8 @@ Blockly.WorkspaceCommentSvg.prototype.updateMovable = function() {
  * @param {boolean} movable True if movable.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.setMovable = function(movable) {
-  Blockly.WorkspaceCommentSvg.superClass_.setMovable.call(this, movable);
+WorkspaceCommentSvg.prototype.setMovable = function(movable) {
+  WorkspaceCommentSvg.superClass_.setMovable.call(this, movable);
   this.updateMovable();
 };
 
@@ -533,8 +534,8 @@ Blockly.WorkspaceCommentSvg.prototype.setMovable = function(movable) {
  * Set whether this comment is editable or not.
  * @param {boolean} editable True if editable.
  */
-Blockly.WorkspaceCommentSvg.prototype.setEditable = function(editable) {
-  Blockly.WorkspaceCommentSvg.superClass_.setEditable.call(this, editable);
+WorkspaceCommentSvg.prototype.setEditable = function(editable) {
+  WorkspaceCommentSvg.superClass_.setEditable.call(this, editable);
   if (this.textarea_) {
     this.textarea_.readOnly = !editable;
   }
@@ -545,7 +546,7 @@ Blockly.WorkspaceCommentSvg.prototype.setEditable = function(editable) {
  * @param {boolean} adding True if adding, false if removing.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.setDragging = function(adding) {
+WorkspaceCommentSvg.prototype.setDragging = function(adding) {
   if (adding) {
     const group = this.getSvgRoot();
     group.translate_ = '';
@@ -563,7 +564,7 @@ Blockly.WorkspaceCommentSvg.prototype.setDragging = function(adding) {
  * @return {!SVGElement} The root SVG node (probably a group).
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.getSvgRoot = function() {
+WorkspaceCommentSvg.prototype.getSvgRoot = function() {
   return this.svgGroup_;
 };
 
@@ -572,7 +573,7 @@ Blockly.WorkspaceCommentSvg.prototype.getSvgRoot = function() {
  * @return {string} Comment text.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.getContent = function() {
+WorkspaceCommentSvg.prototype.getContent = function() {
   return this.textarea_ ? this.textarea_.value : this.content_;
 };
 
@@ -581,8 +582,8 @@ Blockly.WorkspaceCommentSvg.prototype.getContent = function() {
  * @param {string} content Comment content.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.setContent = function(content) {
-  Blockly.WorkspaceCommentSvg.superClass_.setContent.call(this, content);
+WorkspaceCommentSvg.prototype.setContent = function(content) {
+  WorkspaceCommentSvg.superClass_.setContent.call(this, content);
   if (this.textarea_) {
     this.textarea_.value = content;
   }
@@ -594,7 +595,7 @@ Blockly.WorkspaceCommentSvg.prototype.setContent = function(content) {
  *     otherwise.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.setDeleteStyle = function(enable) {
+WorkspaceCommentSvg.prototype.setDeleteStyle = function(enable) {
   if (enable) {
     Blockly.utils.dom.addClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDraggingDelete');
@@ -612,7 +613,7 @@ Blockly.WorkspaceCommentSvg.prototype.setDeleteStyle = function(enable) {
  *     otherwise.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.setAutoLayout = function(_enable) {
+WorkspaceCommentSvg.prototype.setAutoLayout = function(_enable) {
   // NOP for compatibility with the bubble dragger.
 };
 
@@ -622,17 +623,17 @@ Blockly.WorkspaceCommentSvg.prototype.setAutoLayout = function(_enable) {
  * @param {!Blockly.Workspace} workspace The workspace.
  * @param {number=} opt_wsWidth The width of the workspace, which is used to
  *     position comments correctly in RTL.
- * @return {!Blockly.WorkspaceCommentSvg} The created workspace comment.
+ * @return {!WorkspaceCommentSvg} The created workspace comment.
  * @package
  */
-Blockly.WorkspaceCommentSvg.fromXml = function(
+WorkspaceCommentSvg.fromXml = function(
     xmlComment, workspace, opt_wsWidth) {
   Blockly.Events.disable();
   let comment;
   try {
     const info = Blockly.WorkspaceComment.parseAttributes(xmlComment);
 
-    comment = new Blockly.WorkspaceCommentSvg(
+    comment = new WorkspaceCommentSvg(
         workspace, info.content, info.h, info.w, info.id);
     if (workspace.rendered) {
       comment.initSvg(true);
@@ -662,7 +663,7 @@ Blockly.WorkspaceCommentSvg.fromXml = function(
  * @return {!Element} Tree of XML elements.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.toXmlWithXY = function(opt_noId) {
+WorkspaceCommentSvg.prototype.toXmlWithXY = function(opt_noId) {
   let width;  // Not used in LTR.
   if (this.workspace.RTL) {
     // Here be performance dragons: This calls getMetrics().
@@ -683,7 +684,7 @@ Blockly.WorkspaceCommentSvg.prototype.toXmlWithXY = function(opt_noId) {
  * @return {!Blockly.ICopyable.CopyData} Copy metadata.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.toCopyData = function() {
+WorkspaceCommentSvg.prototype.toCopyData = function() {
   return {xml: this.toXmlWithXY(), source: this.workspace, typeCounts: null};
 };
 
@@ -693,7 +694,7 @@ Blockly.WorkspaceCommentSvg.prototype.toCopyData = function() {
  *     properties in workspace units.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.getHeightWidth = function() {
+WorkspaceCommentSvg.prototype.getHeightWidth = function() {
   return { width: this.getWidth(), height: this.getHeight() };
 };
 
@@ -701,7 +702,7 @@ Blockly.WorkspaceCommentSvg.prototype.getHeightWidth = function() {
  * Renders the workspace comment.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.render = function() {
+WorkspaceCommentSvg.prototype.render = function() {
   if (this.rendered_) {
     return;
   }
@@ -726,8 +727,8 @@ Blockly.WorkspaceCommentSvg.prototype.render = function() {
         'class': 'blocklyCommentTarget',
         'x': 0,
         'y': 0,
-        'rx': Blockly.WorkspaceCommentSvg.BORDER_RADIUS,
-        'ry': Blockly.WorkspaceCommentSvg.BORDER_RADIUS
+        'rx': WorkspaceCommentSvg.BORDER_RADIUS,
+        'ry': WorkspaceCommentSvg.BORDER_RADIUS
       });
   this.svgGroup_.appendChild(this.svgRectTarget_);
 
@@ -765,7 +766,7 @@ Blockly.WorkspaceCommentSvg.prototype.render = function() {
  * @return {!Element} The top-level node of the editor.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.createEditor_ = function() {
+WorkspaceCommentSvg.prototype.createEditor_ = function() {
   /* Create the editor.  Here's the markup that will be generated:
     <foreignObject class="blocklyCommentForeignObject" x="0" y="10" width="164" height="164">
       <body xmlns="http://www.w3.org/1999/xhtml" class="blocklyMinimalBody">
@@ -779,7 +780,7 @@ Blockly.WorkspaceCommentSvg.prototype.createEditor_ = function() {
       Blockly.utils.Svg.FOREIGNOBJECT,
       {
         'x': 0,
-        'y': Blockly.WorkspaceCommentSvg.TOP_OFFSET,
+        'y': WorkspaceCommentSvg.TOP_OFFSET,
         'class': 'blocklyCommentForeignObject'
       },
       null);
@@ -812,14 +813,14 @@ Blockly.WorkspaceCommentSvg.prototype.createEditor_ = function() {
  * Add the resize icon to the DOM
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
+WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
   this.resizeGroup_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.G,
       {
         'class': this.RTL ? 'blocklyResizeSW' : 'blocklyResizeSE'
       },
       this.svgGroup_);
-  const resizeSize = Blockly.WorkspaceCommentSvg.RESIZE_SIZE;
+  const resizeSize = WorkspaceCommentSvg.RESIZE_SIZE;
   Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.POLYGON,
       {'points': '0,x x,x x,0'.replace(/x/g, resizeSize.toString())},
@@ -844,7 +845,7 @@ Blockly.WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
  * Add the delete icon to the DOM
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.addDeleteDom_ = function() {
+WorkspaceCommentSvg.prototype.addDeleteDom_ = function() {
   this.deleteGroup_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.G,
       {
@@ -886,7 +887,7 @@ Blockly.WorkspaceCommentSvg.prototype.addDeleteDom_ = function() {
  * @param {!Event} e Mouse down event.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.resizeMouseDown_ = function(e) {
+WorkspaceCommentSvg.prototype.resizeMouseDown_ = function(e) {
   this.unbindDragEvents_();
   if (Blockly.utils.isRightButton(e)) {
     // No right-click.
@@ -911,7 +912,7 @@ Blockly.WorkspaceCommentSvg.prototype.resizeMouseDown_ = function(e) {
  * @param {!Event} e Mouse down event.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.deleteMouseDown_ = function(e) {
+WorkspaceCommentSvg.prototype.deleteMouseDown_ = function(e) {
   // Highlight the delete icon.
   Blockly.utils.dom.addClass(
       /** @type {!Element} */ (this.deleteIconBorder_),
@@ -925,7 +926,7 @@ Blockly.WorkspaceCommentSvg.prototype.deleteMouseDown_ = function(e) {
  * @param {!Event} _e Mouse out event.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.deleteMouseOut_ = function(_e) {
+WorkspaceCommentSvg.prototype.deleteMouseOut_ = function(_e) {
   // Restore highlight on the delete icon.
   Blockly.utils.dom.removeClass(
       /** @type {!Element} */ (this.deleteIconBorder_),
@@ -937,7 +938,7 @@ Blockly.WorkspaceCommentSvg.prototype.deleteMouseOut_ = function(_e) {
  * @param {!Event} e Mouse up event.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.deleteMouseUp_ = function(e) {
+WorkspaceCommentSvg.prototype.deleteMouseUp_ = function(e) {
   // Delete this comment.
   this.dispose(true, true);
   // This event has been handled.  No need to bubble up to the document.
@@ -948,7 +949,7 @@ Blockly.WorkspaceCommentSvg.prototype.deleteMouseUp_ = function(e) {
  * Stop binding to the global mouseup and mousemove events.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.unbindDragEvents_ = function() {
+WorkspaceCommentSvg.prototype.unbindDragEvents_ = function() {
   if (this.onMouseUpWrapper_) {
     Blockly.browserEvents.unbind(this.onMouseUpWrapper_);
     this.onMouseUpWrapper_ = null;
@@ -964,7 +965,7 @@ Blockly.WorkspaceCommentSvg.prototype.unbindDragEvents_ = function() {
  * @param {!Event} e Mouse up event.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.resizeMouseUp_ = function(/* e */) {
+WorkspaceCommentSvg.prototype.resizeMouseUp_ = function(/* e */) {
   Blockly.Touch.clearTouchIdentifier();
   this.unbindDragEvents_();
 };
@@ -974,7 +975,7 @@ Blockly.WorkspaceCommentSvg.prototype.resizeMouseUp_ = function(/* e */) {
  * @param {!Event} e Mouse move event.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.resizeMouseMove_ = function(e) {
+WorkspaceCommentSvg.prototype.resizeMouseMove_ = function(e) {
   this.autoLayout_ = false;
   const newXY = this.workspace.moveDrag(e);
   this.setSize_(this.RTL ? -newXY.x : newXY.x, newXY.y);
@@ -985,10 +986,10 @@ Blockly.WorkspaceCommentSvg.prototype.resizeMouseMove_ = function(e) {
  * Resize the text area accordingly.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.resizeComment_ = function() {
+WorkspaceCommentSvg.prototype.resizeComment_ = function() {
   const size = this.getHeightWidth();
-  const topOffset = Blockly.WorkspaceCommentSvg.TOP_OFFSET;
-  const textOffset = Blockly.WorkspaceCommentSvg.TEXTAREA_OFFSET * 2;
+  const topOffset = WorkspaceCommentSvg.TOP_OFFSET;
+  const textOffset = WorkspaceCommentSvg.TEXTAREA_OFFSET * 2;
 
   this.foreignObject_.setAttribute('width', size.width);
   this.foreignObject_.setAttribute('height', size.height - topOffset);
@@ -1005,10 +1006,10 @@ Blockly.WorkspaceCommentSvg.prototype.resizeComment_ = function() {
  * @param {number} height height of the container
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.setSize_ = function(width, height) {
+WorkspaceCommentSvg.prototype.setSize_ = function(width, height) {
   // Minimum size of a comment.
   width = Math.max(width, 45);
-  height = Math.max(height, 20 + Blockly.WorkspaceCommentSvg.TOP_OFFSET);
+  height = Math.max(height, 20 + WorkspaceCommentSvg.TOP_OFFSET);
   this.width_ = width;
   this.height_ = height;
   this.svgRect_.setAttribute('width', width);
@@ -1017,13 +1018,13 @@ Blockly.WorkspaceCommentSvg.prototype.setSize_ = function(width, height) {
   this.svgRectTarget_.setAttribute('height', height);
   this.svgHandleTarget_.setAttribute('width', width);
   this.svgHandleTarget_.setAttribute('height',
-      Blockly.WorkspaceCommentSvg.TOP_OFFSET);
+      WorkspaceCommentSvg.TOP_OFFSET);
   if (this.RTL) {
     this.svgRect_.setAttribute('transform', 'scale(-1 1)');
     this.svgRectTarget_.setAttribute('transform', 'scale(-1 1)');
   }
 
-  const resizeSize = Blockly.WorkspaceCommentSvg.RESIZE_SIZE;
+  const resizeSize = WorkspaceCommentSvg.RESIZE_SIZE;
   if (this.resizeGroup_) {
     if (this.RTL) {
       // Mirror the resize group.
@@ -1049,7 +1050,7 @@ Blockly.WorkspaceCommentSvg.prototype.setSize_ = function(width, height) {
  * Dispose of any rendered comment components.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.disposeInternal_ = function() {
+WorkspaceCommentSvg.prototype.disposeInternal_ = function() {
   this.textarea_ = null;
   this.foreignObject_ = null;
   this.svgRectTarget_ = null;
@@ -1061,7 +1062,7 @@ Blockly.WorkspaceCommentSvg.prototype.disposeInternal_ = function() {
  * Set the focus on the text area.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.setFocus = function() {
+WorkspaceCommentSvg.prototype.setFocus = function() {
   const comment = this;
   this.focused_ = true;
   // Defer CSS changes.
@@ -1082,7 +1083,7 @@ Blockly.WorkspaceCommentSvg.prototype.setFocus = function() {
  * Remove focus from the text area.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.blurFocus = function() {
+WorkspaceCommentSvg.prototype.blurFocus = function() {
   const comment = this;
   this.focused_ = false;
   // Defer CSS changes.
@@ -1166,3 +1167,5 @@ Blockly.Css.register([
   /* eslint-enable indent */
   // clang-format on
 ]);
+
+exports = WorkspaceCommentSvg;
diff --git a/tests/deps.js b/tests/deps.js
index a729ae7b9..6e85f213e 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -204,7 +204,7 @@ goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.u
 goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate']);
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});

From b8de423feaeb48f67530a669d820934496089f20 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 15:53:19 -0700
Subject: [PATCH 422/833] Migrate core/workspace_comment_svg.js named requires

---
 core/workspace_comment_svg.js | 245 +++++++++++++++++-----------------
 1 file changed, 122 insertions(+), 123 deletions(-)

diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 1127167ba..aa47c777a 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -13,11 +13,24 @@
 goog.module('Blockly.WorkspaceCommentSvg');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly');
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.ContextMenu');
-goog.require('Blockly.Css');
-goog.require('Blockly.Events');
+const BlockDragSurfaceSvg = goog.requireType('Blockly.BlockDragSurfaceSvg');
+const Blockly = goog.require('Blockly');
+const ContextMenu = goog.require('Blockly.ContextMenu');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Css = goog.require('Blockly.Css');
+const Events = goog.require('Blockly.Events');
+const IBoundedElement = goog.requireType('Blockly.IBoundedElement');
+const IBubble = goog.requireType('Blockly.IBubble');
+const ICopyable = goog.requireType('Blockly.ICopyable');
+const Rect = goog.require('Blockly.utils.Rect');
+const Svg = goog.require('Blockly.utils.Svg');
+const Touch = goog.require('Blockly.Touch');
+const Workspace = goog.requireType('Blockly.Workspace');
+const WorkspaceComment = goog.require('Blockly.WorkspaceComment');
+const browserEvents = goog.require('Blockly.browserEvents');
+const dom = goog.require('Blockly.utils.dom');
+const object = goog.require('Blockly.utils.object');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.CommentCreate');
 /** @suppress {extraRequire} */
@@ -26,48 +39,34 @@ goog.require('Blockly.Events.CommentDelete');
 goog.require('Blockly.Events.CommentMove');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.Selected');
-goog.require('Blockly.Touch');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Rect');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.WorkspaceComment');
-
-goog.requireType('Blockly.BlockDragSurfaceSvg');
-goog.requireType('Blockly.IBoundedElement');
-goog.requireType('Blockly.IBubble');
-goog.requireType('Blockly.ICopyable');
-goog.requireType('Blockly.Workspace');
 
 
 /**
  * Class for a workspace comment's SVG representation.
- * @param {!Blockly.Workspace} workspace The block's workspace.
+ * @param {!Workspace} workspace The block's workspace.
  * @param {string} content The content of this workspace comment.
  * @param {number} height Height of the comment.
  * @param {number} width Width of the comment.
  * @param {string=} opt_id Optional ID.  Use this ID if provided, otherwise
  *     create a new ID.
- * @extends {Blockly.WorkspaceComment}
- * @implements {Blockly.IBoundedElement}
- * @implements {Blockly.IBubble}
- * @implements {Blockly.ICopyable}
+ * @extends {WorkspaceComment}
+ * @implements {IBoundedElement}
+ * @implements {IBubble}
+ * @implements {ICopyable}
  * @constructor
  */
 const WorkspaceCommentSvg = function(
     workspace, content, height, width, opt_id) {
   /**
    * Mouse up event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onMouseUpWrapper_ = null;
 
   /**
    * Mouse move event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onMouseMoveWrapper_ = null;
@@ -77,12 +76,12 @@ const WorkspaceCommentSvg = function(
    * @type {!SVGElement}
    * @private
    */
-  this.svgGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G, {'class': 'blocklyComment'}, null);
+  this.svgGroup_ = dom.createSvgElement(
+      Svg.G, {'class': 'blocklyComment'}, null);
   this.svgGroup_.translate_ = '';
 
-  this.svgRect_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT, {
+  this.svgRect_ = dom.createSvgElement(
+      Svg.RECT, {
         'class': 'blocklyCommentRect',
         'x': 0,
         'y': 0,
@@ -105,15 +104,15 @@ const WorkspaceCommentSvg = function(
    * @private
    */
   this.useDragSurface_ =
-      Blockly.utils.is3dSupported() && !!workspace.blockDragSurface_;
+      utils.is3dSupported() && !!workspace.blockDragSurface_;
 
   WorkspaceCommentSvg.superClass_.constructor.call(
       this, workspace, content, height, width, opt_id);
 
   this.render();
 };
-Blockly.utils.object.inherits(
-    WorkspaceCommentSvg, Blockly.WorkspaceComment);
+object.inherits(
+    WorkspaceCommentSvg, WorkspaceComment);
 
 /**
  * The width and height to use to size a workspace comment when it is first
@@ -170,21 +169,21 @@ WorkspaceCommentSvg.prototype.dispose = function() {
     this.workspace.cancelCurrentGesture();
   }
 
-  if (Blockly.Events.isEnabled()) {
-    Blockly.Events.fire(
-        new (Blockly.Events.get(Blockly.Events.COMMENT_DELETE))(this));
+  if (Events.isEnabled()) {
+    Events.fire(
+        new (Events.get(Events.COMMENT_DELETE))(this));
   }
 
-  Blockly.utils.dom.removeNode(this.svgGroup_);
+  dom.removeNode(this.svgGroup_);
   // Sever JavaScript to DOM connections.
   this.svgGroup_ = null;
   this.svgRect_ = null;
   // Dispose of any rendered components
   this.disposeInternal_();
 
-  Blockly.Events.disable();
+  Events.disable();
   WorkspaceCommentSvg.superClass_.dispose.call(this);
-  Blockly.Events.enable();
+  Events.enable();
 };
 
 /**
@@ -200,9 +199,9 @@ WorkspaceCommentSvg.prototype.initSvg = function(opt_noSelect) {
     throw TypeError('Workspace is headless.');
   }
   if (!this.workspace.options.readOnly && !this.eventsInit_) {
-    Blockly.browserEvents.conditionalBind(
+    browserEvents.conditionalBind(
         this.svgRectTarget_, 'mousedown', this, this.pathMouseDown_);
-    Blockly.browserEvents.conditionalBind(
+    browserEvents.conditionalBind(
         this.svgHandleTarget_, 'mousedown', this, this.pathMouseDown_);
   }
   this.eventsInit_ = true;
@@ -243,11 +242,11 @@ WorkspaceCommentSvg.prototype.showContextMenu = function(e) {
   const menuOptions = [];
 
   if (this.isDeletable() && this.isMovable()) {
-    menuOptions.push(Blockly.ContextMenu.commentDuplicateOption(comment));
-    menuOptions.push(Blockly.ContextMenu.commentDeleteOption(comment));
+    menuOptions.push(ContextMenu.commentDuplicateOption(comment));
+    menuOptions.push(ContextMenu.commentDeleteOption(comment));
   }
 
-  Blockly.ContextMenu.show(e, menuOptions, this.RTL);
+  ContextMenu.show(e, menuOptions, this.RTL);
 };
 
 /**
@@ -262,17 +261,17 @@ WorkspaceCommentSvg.prototype.select = function() {
   if (Blockly.selected) {
     oldId = Blockly.selected.id;
     // Unselect any previously selected block.
-    Blockly.Events.disable();
+    Events.disable();
     try {
       Blockly.selected.unselect();
     } finally {
-      Blockly.Events.enable();
+      Events.enable();
     }
   }
-  const event = new (Blockly.Events.get(Blockly.Events.SELECTED))(oldId,
+  const event = new (Events.get(Events.SELECTED))(oldId,
       this.id,
       this.workspace.id);
-  Blockly.Events.fire(event);
+  Events.fire(event);
   Blockly.selected = this;
   this.addSelect();
 };
@@ -285,9 +284,9 @@ WorkspaceCommentSvg.prototype.unselect = function() {
   if (Blockly.selected != this) {
     return;
   }
-  const event = new (Blockly.Events.get(Blockly.Events.SELECTED))(this.id, null,
+  const event = new (Events.get(Events.SELECTED))(this.id, null,
       this.workspace.id);
-  Blockly.Events.fire(event);
+  Events.fire(event);
   Blockly.selected = null;
   this.removeSelect();
   this.blurFocus();
@@ -298,7 +297,7 @@ WorkspaceCommentSvg.prototype.unselect = function() {
  * @package
  */
 WorkspaceCommentSvg.prototype.addSelect = function() {
-  Blockly.utils.dom.addClass(
+  dom.addClass(
       /** @type {!Element} */ (this.svgGroup_), 'blocklySelected');
   this.setFocus();
 };
@@ -308,7 +307,7 @@ WorkspaceCommentSvg.prototype.addSelect = function() {
  * @package
  */
 WorkspaceCommentSvg.prototype.removeSelect = function() {
-  Blockly.utils.dom.removeClass(
+  dom.removeClass(
       /** @type {!Element} */ (this.svgGroup_), 'blocklySelected');
   this.blurFocus();
 };
@@ -318,7 +317,7 @@ WorkspaceCommentSvg.prototype.removeSelect = function() {
  * @package
  */
 WorkspaceCommentSvg.prototype.addFocus = function() {
-  Blockly.utils.dom.addClass(
+  dom.addClass(
       /** @type {!Element} */ (this.svgGroup_), 'blocklyFocused');
 };
 
@@ -327,7 +326,7 @@ WorkspaceCommentSvg.prototype.addFocus = function() {
  * @package
  */
 WorkspaceCommentSvg.prototype.removeFocus = function() {
-  Blockly.utils.dom.removeClass(
+  dom.removeClass(
       /** @type {!Element} */ (this.svgGroup_), 'blocklyFocused');
 };
 
@@ -337,7 +336,7 @@ WorkspaceCommentSvg.prototype.removeFocus = function() {
  * If the comment is on the workspace, (0, 0) is the origin of the workspace
  * coordinate system.
  * This does not change with workspace scale.
- * @return {!Blockly.utils.Coordinate} Object with .x and .y properties in
+ * @return {!Coordinate} Object with .x and .y properties in
  *     workspace coordinates.
  * @package
  */
@@ -352,7 +351,7 @@ WorkspaceCommentSvg.prototype.getRelativeToSurfaceXY = function() {
   if (element) {
     do {
       // Loop through this comment and every parent.
-      const xy = Blockly.utils.getRelativeXY(element);
+      const xy = utils.getRelativeXY(element);
       x += xy.x;
       y += xy.y;
       // If this element is the current element on the drag surface, include
@@ -368,7 +367,7 @@ WorkspaceCommentSvg.prototype.getRelativeToSurfaceXY = function() {
     } while (element && element != this.workspace.getBubbleCanvas() &&
              element != dragSurfaceGroup);
   }
-  this.xy_ = new Blockly.utils.Coordinate(x, y);
+  this.xy_ = new Coordinate(x, y);
   return this.xy_;
 };
 
@@ -379,13 +378,13 @@ WorkspaceCommentSvg.prototype.getRelativeToSurfaceXY = function() {
  * @package
  */
 WorkspaceCommentSvg.prototype.moveBy = function(dx, dy) {
-  const event = new (Blockly.Events.get(Blockly.Events.COMMENT_MOVE))(this);
+  const event = new (Events.get(Events.COMMENT_MOVE))(this);
   // TODO: Do I need to look up the relative to surface XY position here?
   const xy = this.getRelativeToSurfaceXY();
   this.translate(xy.x + dx, xy.y + dy);
-  this.xy_ = new Blockly.utils.Coordinate(xy.x + dx, xy.y + dy);
+  this.xy_ = new Coordinate(xy.x + dx, xy.y + dy);
   event.recordNew();
-  Blockly.Events.fire(event);
+  Events.fire(event);
   this.workspace.resizeContents();
 };
 
@@ -397,7 +396,7 @@ WorkspaceCommentSvg.prototype.moveBy = function(dx, dy) {
  * @package
  */
 WorkspaceCommentSvg.prototype.translate = function(x, y) {
-  this.xy_ = new Blockly.utils.Coordinate(x, y);
+  this.xy_ = new Coordinate(x, y);
   this.getSvgRoot().setAttribute('transform', 'translate(' + x + ',' + y + ')');
 };
 
@@ -426,7 +425,7 @@ WorkspaceCommentSvg.prototype.moveToDragSurface = function() {
  * Move this comment back to the workspace block canvas.
  * Generally should be called at the same time as setDragging(false).
  * Does nothing if useDragSurface_ is false.
- * @param {!Blockly.utils.Coordinate} newXY The position the comment should take
+ * @param {!Coordinate} newXY The position the comment should take
  *     on on the workspace canvas, in workspace coordinates.
  * @private
  */
@@ -442,9 +441,9 @@ WorkspaceCommentSvg.prototype.moveOffDragSurface = function(newXY) {
 /**
  * Move this comment during a drag, taking into account whether we are using a
  * drag surface to translate blocks.
- * @param {Blockly.BlockDragSurfaceSvg} dragSurface The surface that carries
+ * @param {BlockDragSurfaceSvg} dragSurface The surface that carries
  *     rendered items during a drag, or null if no drag surface is in use.
- * @param {!Blockly.utils.Coordinate} newLoc The location to translate to, in
+ * @param {!Coordinate} newLoc The location to translate to, in
  *     workspace coordinates.
  * @package
  */
@@ -482,7 +481,7 @@ WorkspaceCommentSvg.prototype.clearTransformAttributes_ = function() {
  * Returns the coordinates of a bounding box describing the dimensions of this
  * comment.
  * Coordinate system: workspace coordinates.
- * @return {!Blockly.utils.Rect} Object with coordinates of the bounding box.
+ * @return {!Rect} Object with coordinates of the bounding box.
  * @package
  */
 WorkspaceCommentSvg.prototype.getBoundingRectangle = function() {
@@ -503,7 +502,7 @@ WorkspaceCommentSvg.prototype.getBoundingRectangle = function() {
     left = blockXY.x;
     right = blockXY.x + commentBounds.width;
   }
-  return new Blockly.utils.Rect(top, bottom, left, right);
+  return new Rect(top, bottom, left, right);
 };
 
 /**
@@ -512,10 +511,10 @@ WorkspaceCommentSvg.prototype.getBoundingRectangle = function() {
  */
 WorkspaceCommentSvg.prototype.updateMovable = function() {
   if (this.isMovable()) {
-    Blockly.utils.dom.addClass(
+    dom.addClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDraggable');
   } else {
-    Blockly.utils.dom.removeClass(
+    dom.removeClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDraggable');
   }
 };
@@ -551,10 +550,10 @@ WorkspaceCommentSvg.prototype.setDragging = function(adding) {
     const group = this.getSvgRoot();
     group.translate_ = '';
     group.skew_ = '';
-    Blockly.utils.dom.addClass(
+    dom.addClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDragging');
   } else {
-    Blockly.utils.dom.removeClass(
+    dom.removeClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDragging');
   }
 };
@@ -597,10 +596,10 @@ WorkspaceCommentSvg.prototype.setContent = function(content) {
  */
 WorkspaceCommentSvg.prototype.setDeleteStyle = function(enable) {
   if (enable) {
-    Blockly.utils.dom.addClass(
+    dom.addClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDraggingDelete');
   } else {
-    Blockly.utils.dom.removeClass(
+    dom.removeClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDraggingDelete');
   }
 };
@@ -620,7 +619,7 @@ WorkspaceCommentSvg.prototype.setAutoLayout = function(_enable) {
 /**
  * Decode an XML comment tag and create a rendered comment on the workspace.
  * @param {!Element} xmlComment XML comment element.
- * @param {!Blockly.Workspace} workspace The workspace.
+ * @param {!Workspace} workspace The workspace.
  * @param {number=} opt_wsWidth The width of the workspace, which is used to
  *     position comments correctly in RTL.
  * @return {!WorkspaceCommentSvg} The created workspace comment.
@@ -628,10 +627,10 @@ WorkspaceCommentSvg.prototype.setAutoLayout = function(_enable) {
  */
 WorkspaceCommentSvg.fromXml = function(
     xmlComment, workspace, opt_wsWidth) {
-  Blockly.Events.disable();
+  Events.disable();
   let comment;
   try {
-    const info = Blockly.WorkspaceComment.parseAttributes(xmlComment);
+    const info = WorkspaceComment.parseAttributes(xmlComment);
 
     comment = new WorkspaceCommentSvg(
         workspace, info.content, info.h, info.w, info.id);
@@ -650,9 +649,9 @@ WorkspaceCommentSvg.fromXml = function(
       }
     }
   } finally {
-    Blockly.Events.enable();
+    Events.enable();
   }
-  Blockly.WorkspaceComment.fireCreateEvent(comment);
+  WorkspaceComment.fireCreateEvent(comment);
 
   return comment;
 };
@@ -681,7 +680,7 @@ WorkspaceCommentSvg.prototype.toXmlWithXY = function(opt_noId) {
 
 /**
  * Encode a comment for copying.
- * @return {!Blockly.ICopyable.CopyData} Copy metadata.
+ * @return {!ICopyable.CopyData} Copy metadata.
  * @package
  */
 WorkspaceCommentSvg.prototype.toCopyData = function() {
@@ -713,16 +712,16 @@ WorkspaceCommentSvg.prototype.render = function() {
   this.createEditor_();
   this.svgGroup_.appendChild(this.foreignObject_);
 
-  this.svgHandleTarget_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  this.svgHandleTarget_ = dom.createSvgElement(
+      Svg.RECT,
       {
         'class': 'blocklyCommentHandleTarget',
         'x': 0,
         'y': 0
       });
   this.svgGroup_.appendChild(this.svgHandleTarget_);
-  this.svgRectTarget_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  this.svgRectTarget_ = dom.createSvgElement(
+      Svg.RECT,
       {
         'class': 'blocklyCommentTarget',
         'x': 0,
@@ -747,16 +746,16 @@ WorkspaceCommentSvg.prototype.render = function() {
   this.rendered_ = true;
 
   if (this.resizeGroup_) {
-    Blockly.browserEvents.conditionalBind(
+    browserEvents.conditionalBind(
         this.resizeGroup_, 'mousedown', this, this.resizeMouseDown_);
   }
 
   if (this.isDeletable()) {
-    Blockly.browserEvents.conditionalBind(
+    browserEvents.conditionalBind(
         this.deleteGroup_, 'mousedown', this, this.deleteMouseDown_);
-    Blockly.browserEvents.conditionalBind(
+    browserEvents.conditionalBind(
         this.deleteGroup_, 'mouseout', this, this.deleteMouseOut_);
-    Blockly.browserEvents.conditionalBind(
+    browserEvents.conditionalBind(
         this.deleteGroup_, 'mouseup', this, this.deleteMouseUp_);
   }
 };
@@ -776,18 +775,18 @@ WorkspaceCommentSvg.prototype.createEditor_ = function() {
       </body>
     </foreignObject>
   */
-  this.foreignObject_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FOREIGNOBJECT,
+  this.foreignObject_ = dom.createSvgElement(
+      Svg.FOREIGNOBJECT,
       {
         'x': 0,
         'y': WorkspaceCommentSvg.TOP_OFFSET,
         'class': 'blocklyCommentForeignObject'
       },
       null);
-  const body = document.createElementNS(Blockly.utils.dom.HTML_NS, 'body');
-  body.setAttribute('xmlns', Blockly.utils.dom.HTML_NS);
+  const body = document.createElementNS(dom.HTML_NS, 'body');
+  body.setAttribute('xmlns', dom.HTML_NS);
   body.className = 'blocklyMinimalBody';
-  const textarea = document.createElementNS(Blockly.utils.dom.HTML_NS,
+  const textarea = document.createElementNS(dom.HTML_NS,
       'textarea');
   textarea.className = 'blocklyCommentTextarea';
   textarea.setAttribute('dir', this.RTL ? 'RTL' : 'LTR');
@@ -796,10 +795,10 @@ WorkspaceCommentSvg.prototype.createEditor_ = function() {
   this.textarea_ = textarea;
   this.foreignObject_.appendChild(body);
   // Don't zoom with mousewheel.
-  Blockly.browserEvents.conditionalBind(textarea, 'wheel', this, function(e) {
+  browserEvents.conditionalBind(textarea, 'wheel', this, function(e) {
     e.stopPropagation();
   });
-  Blockly.browserEvents.conditionalBind(
+  browserEvents.conditionalBind(
       textarea, 'change', this,
       function(
           /* eslint-disable no-unused-vars */ e
@@ -814,26 +813,26 @@ WorkspaceCommentSvg.prototype.createEditor_ = function() {
  * @private
  */
 WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
-  this.resizeGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
+  this.resizeGroup_ = dom.createSvgElement(
+      Svg.G,
       {
         'class': this.RTL ? 'blocklyResizeSW' : 'blocklyResizeSE'
       },
       this.svgGroup_);
   const resizeSize = WorkspaceCommentSvg.RESIZE_SIZE;
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.POLYGON,
+  dom.createSvgElement(
+      Svg.POLYGON,
       {'points': '0,x x,x x,0'.replace(/x/g, resizeSize.toString())},
       this.resizeGroup_);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.LINE,
+  dom.createSvgElement(
+      Svg.LINE,
       {
         'class': 'blocklyResizeLine',
         'x1': resizeSize / 3, 'y1': resizeSize - 1,
         'x2': resizeSize - 1, 'y2': resizeSize / 3
       }, this.resizeGroup_);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.LINE,
+  dom.createSvgElement(
+      Svg.LINE,
       {
         'class': 'blocklyResizeLine',
         'x1': resizeSize * 2 / 3, 'y1': resizeSize - 1,
@@ -846,14 +845,14 @@ WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
  * @private
  */
 WorkspaceCommentSvg.prototype.addDeleteDom_ = function() {
-  this.deleteGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
+  this.deleteGroup_ = dom.createSvgElement(
+      Svg.G,
       {
         'class': 'blocklyCommentDeleteIcon'
       },
       this.svgGroup_);
-  this.deleteIconBorder_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.CIRCLE,
+  this.deleteIconBorder_ = dom.createSvgElement(
+      Svg.CIRCLE,
       {
         'class': 'blocklyDeleteIconShape',
         'r': '7',
@@ -862,8 +861,8 @@ WorkspaceCommentSvg.prototype.addDeleteDom_ = function() {
       },
       this.deleteGroup_);
   // x icon.
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.LINE,
+  dom.createSvgElement(
+      Svg.LINE,
       {
         'x1': '5', 'y1': '10',
         'x2': '10', 'y2': '5',
@@ -871,8 +870,8 @@ WorkspaceCommentSvg.prototype.addDeleteDom_ = function() {
         'stroke-width': '2'
       },
       this.deleteGroup_);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.LINE,
+  dom.createSvgElement(
+      Svg.LINE,
       {
         'x1': '5', 'y1': '5',
         'x2': '10', 'y2': '10',
@@ -889,18 +888,18 @@ WorkspaceCommentSvg.prototype.addDeleteDom_ = function() {
  */
 WorkspaceCommentSvg.prototype.resizeMouseDown_ = function(e) {
   this.unbindDragEvents_();
-  if (Blockly.utils.isRightButton(e)) {
+  if (utils.isRightButton(e)) {
     // No right-click.
     e.stopPropagation();
     return;
   }
   // Left-click (or middle click)
-  this.workspace.startDrag(e, new Blockly.utils.Coordinate(
+  this.workspace.startDrag(e, new Coordinate(
       this.workspace.RTL ? -this.width_ : this.width_, this.height_));
 
-  this.onMouseUpWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onMouseUpWrapper_ = browserEvents.conditionalBind(
       document, 'mouseup', this, this.resizeMouseUp_);
-  this.onMouseMoveWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onMouseMoveWrapper_ = browserEvents.conditionalBind(
       document, 'mousemove', this, this.resizeMouseMove_);
   Blockly.hideChaff();
   // This event has been handled.  No need to bubble up to the document.
@@ -914,7 +913,7 @@ WorkspaceCommentSvg.prototype.resizeMouseDown_ = function(e) {
  */
 WorkspaceCommentSvg.prototype.deleteMouseDown_ = function(e) {
   // Highlight the delete icon.
-  Blockly.utils.dom.addClass(
+  dom.addClass(
       /** @type {!Element} */ (this.deleteIconBorder_),
       'blocklyDeleteIconHighlighted');
   // This event has been handled.  No need to bubble up to the document.
@@ -928,7 +927,7 @@ WorkspaceCommentSvg.prototype.deleteMouseDown_ = function(e) {
  */
 WorkspaceCommentSvg.prototype.deleteMouseOut_ = function(_e) {
   // Restore highlight on the delete icon.
-  Blockly.utils.dom.removeClass(
+  dom.removeClass(
       /** @type {!Element} */ (this.deleteIconBorder_),
       'blocklyDeleteIconHighlighted');
 };
@@ -951,11 +950,11 @@ WorkspaceCommentSvg.prototype.deleteMouseUp_ = function(e) {
  */
 WorkspaceCommentSvg.prototype.unbindDragEvents_ = function() {
   if (this.onMouseUpWrapper_) {
-    Blockly.browserEvents.unbind(this.onMouseUpWrapper_);
+    browserEvents.unbind(this.onMouseUpWrapper_);
     this.onMouseUpWrapper_ = null;
   }
   if (this.onMouseMoveWrapper_) {
-    Blockly.browserEvents.unbind(this.onMouseMoveWrapper_);
+    browserEvents.unbind(this.onMouseMoveWrapper_);
     this.onMouseMoveWrapper_ = null;
   }
 };
@@ -966,7 +965,7 @@ WorkspaceCommentSvg.prototype.unbindDragEvents_ = function() {
  * @private
  */
 WorkspaceCommentSvg.prototype.resizeMouseUp_ = function(/* e */) {
-  Blockly.Touch.clearTouchIdentifier();
+  Touch.clearTouchIdentifier();
   this.unbindDragEvents_();
 };
 
@@ -1072,9 +1071,9 @@ WorkspaceCommentSvg.prototype.setFocus = function() {
     }
     comment.textarea_.focus();
     comment.addFocus();
-    Blockly.utils.dom.addClass(
+    dom.addClass(
         comment.svgRectTarget_, 'blocklyCommentTargetFocused');
-    Blockly.utils.dom.addClass(
+    dom.addClass(
         comment.svgHandleTarget_, 'blocklyCommentHandleTargetFocused');
   }, 0);
 };
@@ -1094,9 +1093,9 @@ WorkspaceCommentSvg.prototype.blurFocus = function() {
 
     comment.textarea_.blur();
     comment.removeFocus();
-    Blockly.utils.dom.removeClass(
+    dom.removeClass(
         comment.svgRectTarget_, 'blocklyCommentTargetFocused');
-    Blockly.utils.dom.removeClass(
+    dom.removeClass(
         comment.svgHandleTarget_, 'blocklyCommentHandleTargetFocused');
   }, 0);
 };
@@ -1104,7 +1103,7 @@ WorkspaceCommentSvg.prototype.blurFocus = function() {
 /**
  * CSS for workspace comment.  See css.js for use.
  */
-Blockly.Css.register([
+Css.register([
   // clang-format off
   /* eslint-disable indent */
   '.blocklyCommentForeignObject {',

From e8d1097a59d7a083b90cc9bdc4ca585a577e0a98 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 15:53:31 -0700
Subject: [PATCH 423/833] clang-format core/workspace_comment_svg.js

---
 core/workspace_comment_svg.js | 186 +++++++++++++++-------------------
 1 file changed, 84 insertions(+), 102 deletions(-)

diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index aa47c777a..0b5041648 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -76,18 +76,17 @@ const WorkspaceCommentSvg = function(
    * @type {!SVGElement}
    * @private
    */
-  this.svgGroup_ = dom.createSvgElement(
-      Svg.G, {'class': 'blocklyComment'}, null);
+  this.svgGroup_ =
+      dom.createSvgElement(Svg.G, {'class': 'blocklyComment'}, null);
   this.svgGroup_.translate_ = '';
 
-  this.svgRect_ = dom.createSvgElement(
-      Svg.RECT, {
-        'class': 'blocklyCommentRect',
-        'x': 0,
-        'y': 0,
-        'rx': WorkspaceCommentSvg.BORDER_RADIUS,
-        'ry': WorkspaceCommentSvg.BORDER_RADIUS
-      });
+  this.svgRect_ = dom.createSvgElement(Svg.RECT, {
+    'class': 'blocklyCommentRect',
+    'x': 0,
+    'y': 0,
+    'rx': WorkspaceCommentSvg.BORDER_RADIUS,
+    'ry': WorkspaceCommentSvg.BORDER_RADIUS
+  });
   this.svgGroup_.appendChild(this.svgRect_);
 
   /**
@@ -103,16 +102,14 @@ const WorkspaceCommentSvg = function(
    * @type {boolean}
    * @private
    */
-  this.useDragSurface_ =
-      utils.is3dSupported() && !!workspace.blockDragSurface_;
+  this.useDragSurface_ = utils.is3dSupported() && !!workspace.blockDragSurface_;
 
   WorkspaceCommentSvg.superClass_.constructor.call(
       this, workspace, content, height, width, opt_id);
 
   this.render();
 };
-object.inherits(
-    WorkspaceCommentSvg, WorkspaceComment);
+object.inherits(WorkspaceCommentSvg, WorkspaceComment);
 
 /**
  * The width and height to use to size a workspace comment when it is first
@@ -170,8 +167,7 @@ WorkspaceCommentSvg.prototype.dispose = function() {
   }
 
   if (Events.isEnabled()) {
-    Events.fire(
-        new (Events.get(Events.COMMENT_DELETE))(this));
+    Events.fire(new (Events.get(Events.COMMENT_DELETE))(this));
   }
 
   dom.removeNode(this.svgGroup_);
@@ -190,7 +186,8 @@ WorkspaceCommentSvg.prototype.dispose = function() {
  * Create and initialize the SVG representation of a workspace comment.
  * May be called more than once.
  *
- * @param {boolean=} opt_noSelect Text inside text area will be selected if false
+ * @param {boolean=} opt_noSelect Text inside text area will be selected if
+ *     false
  *
  * @package
  */
@@ -268,9 +265,8 @@ WorkspaceCommentSvg.prototype.select = function() {
       Events.enable();
     }
   }
-  const event = new (Events.get(Events.SELECTED))(oldId,
-      this.id,
-      this.workspace.id);
+  const event =
+      new (Events.get(Events.SELECTED))(oldId, this.id, this.workspace.id);
   Events.fire(event);
   Blockly.selected = this;
   this.addSelect();
@@ -284,8 +280,8 @@ WorkspaceCommentSvg.prototype.unselect = function() {
   if (Blockly.selected != this) {
     return;
   }
-  const event = new (Events.get(Events.SELECTED))(this.id, null,
-      this.workspace.id);
+  const event =
+      new (Events.get(Events.SELECTED))(this.id, null, this.workspace.id);
   Events.fire(event);
   Blockly.selected = null;
   this.removeSelect();
@@ -447,8 +443,7 @@ WorkspaceCommentSvg.prototype.moveOffDragSurface = function(newXY) {
  *     workspace coordinates.
  * @package
  */
-WorkspaceCommentSvg.prototype.moveDuringDrag = function(
-    dragSurface, newLoc) {
+WorkspaceCommentSvg.prototype.moveDuringDrag = function(dragSurface, newLoc) {
   if (dragSurface) {
     dragSurface.translateSurface(newLoc.x, newLoc.y);
   } else {
@@ -625,8 +620,7 @@ WorkspaceCommentSvg.prototype.setAutoLayout = function(_enable) {
  * @return {!WorkspaceCommentSvg} The created workspace comment.
  * @package
  */
-WorkspaceCommentSvg.fromXml = function(
-    xmlComment, workspace, opt_wsWidth) {
+WorkspaceCommentSvg.fromXml = function(xmlComment, workspace, opt_wsWidth) {
   Events.disable();
   let comment;
   try {
@@ -694,7 +688,7 @@ WorkspaceCommentSvg.prototype.toCopyData = function() {
  * @package
  */
 WorkspaceCommentSvg.prototype.getHeightWidth = function() {
-  return { width: this.getWidth(), height: this.getHeight() };
+  return {width: this.getWidth(), height: this.getHeight()};
 };
 
 /**
@@ -713,22 +707,15 @@ WorkspaceCommentSvg.prototype.render = function() {
   this.svgGroup_.appendChild(this.foreignObject_);
 
   this.svgHandleTarget_ = dom.createSvgElement(
-      Svg.RECT,
-      {
-        'class': 'blocklyCommentHandleTarget',
-        'x': 0,
-        'y': 0
-      });
+      Svg.RECT, {'class': 'blocklyCommentHandleTarget', 'x': 0, 'y': 0});
   this.svgGroup_.appendChild(this.svgHandleTarget_);
-  this.svgRectTarget_ = dom.createSvgElement(
-      Svg.RECT,
-      {
-        'class': 'blocklyCommentTarget',
-        'x': 0,
-        'y': 0,
-        'rx': WorkspaceCommentSvg.BORDER_RADIUS,
-        'ry': WorkspaceCommentSvg.BORDER_RADIUS
-      });
+  this.svgRectTarget_ = dom.createSvgElement(Svg.RECT, {
+    'class': 'blocklyCommentTarget',
+    'x': 0,
+    'y': 0,
+    'rx': WorkspaceCommentSvg.BORDER_RADIUS,
+    'ry': WorkspaceCommentSvg.BORDER_RADIUS
+  });
   this.svgGroup_.appendChild(this.svgRectTarget_);
 
   // Add the resize icon
@@ -767,17 +754,16 @@ WorkspaceCommentSvg.prototype.render = function() {
  */
 WorkspaceCommentSvg.prototype.createEditor_ = function() {
   /* Create the editor.  Here's the markup that will be generated:
-    <foreignObject class="blocklyCommentForeignObject" x="0" y="10" width="164" height="164">
-      <body xmlns="http://www.w3.org/1999/xhtml" class="blocklyMinimalBody">
-        <textarea xmlns="http://www.w3.org/1999/xhtml"
+    <foreignObject class="blocklyCommentForeignObject" x="0" y="10" width="164"
+    height="164"> <body xmlns="http://www.w3.org/1999/xhtml"
+    class="blocklyMinimalBody"> <textarea xmlns="http://www.w3.org/1999/xhtml"
             class="blocklyCommentTextarea"
             style="height: 164px; width: 164px;"></textarea>
       </body>
     </foreignObject>
   */
   this.foreignObject_ = dom.createSvgElement(
-      Svg.FOREIGNOBJECT,
-      {
+      Svg.FOREIGNOBJECT, {
         'x': 0,
         'y': WorkspaceCommentSvg.TOP_OFFSET,
         'class': 'blocklyCommentForeignObject'
@@ -786,8 +772,7 @@ WorkspaceCommentSvg.prototype.createEditor_ = function() {
   const body = document.createElementNS(dom.HTML_NS, 'body');
   body.setAttribute('xmlns', dom.HTML_NS);
   body.className = 'blocklyMinimalBody';
-  const textarea = document.createElementNS(dom.HTML_NS,
-      'textarea');
+  const textarea = document.createElementNS(dom.HTML_NS, 'textarea');
   textarea.className = 'blocklyCommentTextarea';
   textarea.setAttribute('dir', this.RTL ? 'RTL' : 'LTR');
   textarea.readOnly = !this.isEditable();
@@ -814,10 +799,7 @@ WorkspaceCommentSvg.prototype.createEditor_ = function() {
  */
 WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
   this.resizeGroup_ = dom.createSvgElement(
-      Svg.G,
-      {
-        'class': this.RTL ? 'blocklyResizeSW' : 'blocklyResizeSE'
-      },
+      Svg.G, {'class': this.RTL ? 'blocklyResizeSW' : 'blocklyResizeSE'},
       this.svgGroup_);
   const resizeSize = WorkspaceCommentSvg.RESIZE_SIZE;
   dom.createSvgElement(
@@ -825,19 +807,23 @@ WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
       {'points': '0,x x,x x,0'.replace(/x/g, resizeSize.toString())},
       this.resizeGroup_);
   dom.createSvgElement(
-      Svg.LINE,
-      {
+      Svg.LINE, {
         'class': 'blocklyResizeLine',
-        'x1': resizeSize / 3, 'y1': resizeSize - 1,
-        'x2': resizeSize - 1, 'y2': resizeSize / 3
-      }, this.resizeGroup_);
+        'x1': resizeSize / 3,
+        'y1': resizeSize - 1,
+        'x2': resizeSize - 1,
+        'y2': resizeSize / 3
+      },
+      this.resizeGroup_);
   dom.createSvgElement(
-      Svg.LINE,
-      {
+      Svg.LINE, {
         'class': 'blocklyResizeLine',
-        'x1': resizeSize * 2 / 3, 'y1': resizeSize - 1,
-        'x2': resizeSize - 1, 'y2': resizeSize * 2 / 3
-      }, this.resizeGroup_);
+        'x1': resizeSize * 2 / 3,
+        'y1': resizeSize - 1,
+        'x2': resizeSize - 1,
+        'y2': resizeSize * 2 / 3
+      },
+      this.resizeGroup_);
 };
 
 /**
@@ -846,35 +832,28 @@ WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
  */
 WorkspaceCommentSvg.prototype.addDeleteDom_ = function() {
   this.deleteGroup_ = dom.createSvgElement(
-      Svg.G,
-      {
-        'class': 'blocklyCommentDeleteIcon'
-      },
-      this.svgGroup_);
+      Svg.G, {'class': 'blocklyCommentDeleteIcon'}, this.svgGroup_);
   this.deleteIconBorder_ = dom.createSvgElement(
       Svg.CIRCLE,
-      {
-        'class': 'blocklyDeleteIconShape',
-        'r': '7',
-        'cx': '7.5',
-        'cy': '7.5'
-      },
+      {'class': 'blocklyDeleteIconShape', 'r': '7', 'cx': '7.5', 'cy': '7.5'},
       this.deleteGroup_);
   // x icon.
   dom.createSvgElement(
-      Svg.LINE,
-      {
-        'x1': '5', 'y1': '10',
-        'x2': '10', 'y2': '5',
+      Svg.LINE, {
+        'x1': '5',
+        'y1': '10',
+        'x2': '10',
+        'y2': '5',
         'stroke': '#fff',
         'stroke-width': '2'
       },
       this.deleteGroup_);
   dom.createSvgElement(
-      Svg.LINE,
-      {
-        'x1': '5', 'y1': '5',
-        'x2': '10', 'y2': '10',
+      Svg.LINE, {
+        'x1': '5',
+        'y1': '5',
+        'x2': '10',
+        'y2': '10',
         'stroke': '#fff',
         'stroke-width': '2'
       },
@@ -894,8 +873,10 @@ WorkspaceCommentSvg.prototype.resizeMouseDown_ = function(e) {
     return;
   }
   // Left-click (or middle click)
-  this.workspace.startDrag(e, new Coordinate(
-      this.workspace.RTL ? -this.width_ : this.width_, this.height_));
+  this.workspace.startDrag(
+      e,
+      new Coordinate(
+          this.workspace.RTL ? -this.width_ : this.width_, this.height_));
 
   this.onMouseUpWrapper_ = browserEvents.conditionalBind(
       document, 'mouseup', this, this.resizeMouseUp_);
@@ -1016,8 +997,7 @@ WorkspaceCommentSvg.prototype.setSize_ = function(width, height) {
   this.svgRectTarget_.setAttribute('width', width);
   this.svgRectTarget_.setAttribute('height', height);
   this.svgHandleTarget_.setAttribute('width', width);
-  this.svgHandleTarget_.setAttribute('height',
-      WorkspaceCommentSvg.TOP_OFFSET);
+  this.svgHandleTarget_.setAttribute('height', WorkspaceCommentSvg.TOP_OFFSET);
   if (this.RTL) {
     this.svgRect_.setAttribute('transform', 'scale(-1 1)');
     this.svgRectTarget_.setAttribute('transform', 'scale(-1 1)');
@@ -1027,17 +1007,22 @@ WorkspaceCommentSvg.prototype.setSize_ = function(width, height) {
   if (this.resizeGroup_) {
     if (this.RTL) {
       // Mirror the resize group.
-      this.resizeGroup_.setAttribute('transform', 'translate(' +
-          (-width + resizeSize) + ',' + (height - resizeSize) + ') scale(-1 1)');
-      this.deleteGroup_.setAttribute('transform', 'translate(' +
-          (-width + resizeSize) + ',' + (-resizeSize) + ') scale(-1 1)');
+      this.resizeGroup_.setAttribute(
+          'transform',
+          'translate(' + (-width + resizeSize) + ',' + (height - resizeSize) +
+              ') scale(-1 1)');
+      this.deleteGroup_.setAttribute(
+          'transform',
+          'translate(' + (-width + resizeSize) + ',' + (-resizeSize) +
+              ') scale(-1 1)');
     } else {
-      this.resizeGroup_.setAttribute('transform', 'translate(' +
-          (width - resizeSize) + ',' +
-          (height - resizeSize) + ')');
-      this.deleteGroup_.setAttribute('transform', 'translate(' +
-          (width - resizeSize) + ',' +
-          (-resizeSize) + ')');
+      this.resizeGroup_.setAttribute(
+          'transform',
+          'translate(' + (width - resizeSize) + ',' + (height - resizeSize) +
+              ')');
+      this.deleteGroup_.setAttribute(
+          'transform',
+          'translate(' + (width - resizeSize) + ',' + (-resizeSize) + ')');
     }
   }
 
@@ -1071,10 +1056,8 @@ WorkspaceCommentSvg.prototype.setFocus = function() {
     }
     comment.textarea_.focus();
     comment.addFocus();
-    dom.addClass(
-        comment.svgRectTarget_, 'blocklyCommentTargetFocused');
-    dom.addClass(
-        comment.svgHandleTarget_, 'blocklyCommentHandleTargetFocused');
+    dom.addClass(comment.svgRectTarget_, 'blocklyCommentTargetFocused');
+    dom.addClass(comment.svgHandleTarget_, 'blocklyCommentHandleTargetFocused');
   }, 0);
 };
 
@@ -1093,8 +1076,7 @@ WorkspaceCommentSvg.prototype.blurFocus = function() {
 
     comment.textarea_.blur();
     comment.removeFocus();
-    dom.removeClass(
-        comment.svgRectTarget_, 'blocklyCommentTargetFocused');
+    dom.removeClass(comment.svgRectTarget_, 'blocklyCommentTargetFocused');
     dom.removeClass(
         comment.svgHandleTarget_, 'blocklyCommentHandleTargetFocused');
   }, 0);

From d985696bb5d14bb7841818207d49ec21f58060c3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 16:57:59 -0700
Subject: [PATCH 424/833] Update interfaces implemented to require from
 requireType and add eslint disable

---
 core/workspace_comment_svg.js | 11 ++++++++---
 tests/deps.js                 |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 0b5041648..dae62f573 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -13,18 +13,23 @@
 goog.module('Blockly.WorkspaceCommentSvg');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const BlockDragSurfaceSvg = goog.requireType('Blockly.BlockDragSurfaceSvg');
 const Blockly = goog.require('Blockly');
 const ContextMenu = goog.require('Blockly.ContextMenu');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Css = goog.require('Blockly.Css');
 const Events = goog.require('Blockly.Events');
-const IBoundedElement = goog.requireType('Blockly.IBoundedElement');
-const IBubble = goog.requireType('Blockly.IBubble');
-const ICopyable = goog.requireType('Blockly.ICopyable');
+/* eslint-disable-next-line no-unused-vars */
+const IBoundedElement = goog.require('Blockly.IBoundedElement');
+/* eslint-disable-next-line no-unused-vars */
+const IBubble = goog.require('Blockly.IBubble');
+/* eslint-disable-next-line no-unused-vars */
+const ICopyable = goog.require('Blockly.ICopyable');
 const Rect = goog.require('Blockly.utils.Rect');
 const Svg = goog.require('Blockly.utils.Svg');
 const Touch = goog.require('Blockly.Touch');
+/* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
 const WorkspaceComment = goog.require('Blockly.WorkspaceComment');
 const browserEvents = goog.require('Blockly.browserEvents');
diff --git a/tests/deps.js b/tests/deps.js
index 6e85f213e..97b955145 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -204,7 +204,7 @@ goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.u
 goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICopyable', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate']);
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});

From 4df6111b8e52bb74bd3312c8cc9e4dfa206fcd7b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 28 Jul 2021 12:08:18 -0700
Subject: [PATCH 425/833] Update declaration of private consts in
 core/workspace_comment_svg.js

---
 core/workspace_comment_svg.js | 86 +++++++++++++++++------------------
 1 file changed, 42 insertions(+), 44 deletions(-)

diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index dae62f573..5b54be75d 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -46,6 +46,30 @@ goog.require('Blockly.Events.CommentMove');
 goog.require('Blockly.Events.Selected');
 
 
+/**
+ * Size of the resize icon.
+ * @type {number}
+ * @const
+ * @private
+ */
+const RESIZE_SIZE = 8;
+
+/**
+ * Radius of the border around the comment.
+ * @type {number}
+ * @const
+ * @private
+ */
+const BORDER_RADIUS = 3;
+
+/**
+ * Offset from the foreignobject edge to the textarea edge.
+ * @type {number}
+ * @const
+ * @private
+ */
+const TEXTAREA_OFFSET = 2;
+
 /**
  * Class for a workspace comment's SVG representation.
  * @param {!Workspace} workspace The block's workspace.
@@ -89,8 +113,8 @@ const WorkspaceCommentSvg = function(
     'class': 'blocklyCommentRect',
     'x': 0,
     'y': 0,
-    'rx': WorkspaceCommentSvg.BORDER_RADIUS,
-    'ry': WorkspaceCommentSvg.BORDER_RADIUS
+    'rx': BORDER_RADIUS,
+    'ry': BORDER_RADIUS
   });
   this.svgGroup_.appendChild(this.svgRect_);
 
@@ -124,30 +148,6 @@ object.inherits(WorkspaceCommentSvg, WorkspaceComment);
  */
 WorkspaceCommentSvg.DEFAULT_SIZE = 100;
 
-/**
- * Size of the resize icon.
- * @type {number}
- * @const
- * @private
- */
-WorkspaceCommentSvg.RESIZE_SIZE = 8;
-
-/**
- * Radius of the border around the comment.
- * @type {number}
- * @const
- * @private
- */
-WorkspaceCommentSvg.BORDER_RADIUS = 3;
-
-/**
- * Offset from the foreignobject edge to the textarea edge.
- * @type {number}
- * @const
- * @private
- */
-WorkspaceCommentSvg.TEXTAREA_OFFSET = 2;
-
 /**
  * Offset from the top to make room for a top bar.
  * @type {number}
@@ -718,8 +718,8 @@ WorkspaceCommentSvg.prototype.render = function() {
     'class': 'blocklyCommentTarget',
     'x': 0,
     'y': 0,
-    'rx': WorkspaceCommentSvg.BORDER_RADIUS,
-    'ry': WorkspaceCommentSvg.BORDER_RADIUS
+    'rx': BORDER_RADIUS,
+    'ry': BORDER_RADIUS
   });
   this.svgGroup_.appendChild(this.svgRectTarget_);
 
@@ -806,27 +806,26 @@ WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
   this.resizeGroup_ = dom.createSvgElement(
       Svg.G, {'class': this.RTL ? 'blocklyResizeSW' : 'blocklyResizeSE'},
       this.svgGroup_);
-  const resizeSize = WorkspaceCommentSvg.RESIZE_SIZE;
   dom.createSvgElement(
       Svg.POLYGON,
-      {'points': '0,x x,x x,0'.replace(/x/g, resizeSize.toString())},
+      {'points': '0,x x,x x,0'.replace(/x/g, RESIZE_SIZE.toString())},
       this.resizeGroup_);
   dom.createSvgElement(
       Svg.LINE, {
         'class': 'blocklyResizeLine',
-        'x1': resizeSize / 3,
-        'y1': resizeSize - 1,
-        'x2': resizeSize - 1,
-        'y2': resizeSize / 3
+        'x1': RESIZE_SIZE / 3,
+        'y1': RESIZE_SIZE - 1,
+        'x2': RESIZE_SIZE - 1,
+        'y2': RESIZE_SIZE / 3
       },
       this.resizeGroup_);
   dom.createSvgElement(
       Svg.LINE, {
         'class': 'blocklyResizeLine',
-        'x1': resizeSize * 2 / 3,
-        'y1': resizeSize - 1,
-        'x2': resizeSize - 1,
-        'y2': resizeSize * 2 / 3
+        'x1': RESIZE_SIZE * 2 / 3,
+        'y1': RESIZE_SIZE - 1,
+        'x2': RESIZE_SIZE - 1,
+        'y2': RESIZE_SIZE * 2 / 3
       },
       this.resizeGroup_);
 };
@@ -974,7 +973,7 @@ WorkspaceCommentSvg.prototype.resizeMouseMove_ = function(e) {
 WorkspaceCommentSvg.prototype.resizeComment_ = function() {
   const size = this.getHeightWidth();
   const topOffset = WorkspaceCommentSvg.TOP_OFFSET;
-  const textOffset = WorkspaceCommentSvg.TEXTAREA_OFFSET * 2;
+  const textOffset = TEXTAREA_OFFSET * 2;
 
   this.foreignObject_.setAttribute('width', size.width);
   this.foreignObject_.setAttribute('height', size.height - topOffset);
@@ -1008,26 +1007,25 @@ WorkspaceCommentSvg.prototype.setSize_ = function(width, height) {
     this.svgRectTarget_.setAttribute('transform', 'scale(-1 1)');
   }
 
-  const resizeSize = WorkspaceCommentSvg.RESIZE_SIZE;
   if (this.resizeGroup_) {
     if (this.RTL) {
       // Mirror the resize group.
       this.resizeGroup_.setAttribute(
           'transform',
-          'translate(' + (-width + resizeSize) + ',' + (height - resizeSize) +
+          'translate(' + (-width + RESIZE_SIZE) + ',' + (height - RESIZE_SIZE) +
               ') scale(-1 1)');
       this.deleteGroup_.setAttribute(
           'transform',
-          'translate(' + (-width + resizeSize) + ',' + (-resizeSize) +
+          'translate(' + (-width + RESIZE_SIZE) + ',' + (-RESIZE_SIZE) +
               ') scale(-1 1)');
     } else {
       this.resizeGroup_.setAttribute(
           'transform',
-          'translate(' + (width - resizeSize) + ',' + (height - resizeSize) +
+          'translate(' + (width - RESIZE_SIZE) + ',' + (height - RESIZE_SIZE) +
               ')');
       this.deleteGroup_.setAttribute(
           'transform',
-          'translate(' + (width - resizeSize) + ',' + (-resizeSize) + ')');
+          'translate(' + (width - RESIZE_SIZE) + ',' + (-RESIZE_SIZE) + ')');
     }
   }
 

From 9b1deb8711fd0d4f226f0ccc8ab4ff46aea13fd6 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:53:35 -0700
Subject: [PATCH 426/833] Remove unecessary private annotations

---
 core/workspace_comment_svg.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 5b54be75d..77e8c713d 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -50,7 +50,6 @@ goog.require('Blockly.Events.Selected');
  * Size of the resize icon.
  * @type {number}
  * @const
- * @private
  */
 const RESIZE_SIZE = 8;
 
@@ -58,7 +57,6 @@ const RESIZE_SIZE = 8;
  * Radius of the border around the comment.
  * @type {number}
  * @const
- * @private
  */
 const BORDER_RADIUS = 3;
 
@@ -66,7 +64,6 @@ const BORDER_RADIUS = 3;
  * Offset from the foreignobject edge to the textarea edge.
  * @type {number}
  * @const
- * @private
  */
 const TEXTAREA_OFFSET = 2;
 

From f7549f73a6c39f4136617bdfda33da496371236e Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Thu, 29 Jul 2021 17:09:47 -0700
Subject: [PATCH 427/833] Use CopyData type

---
 core/blockly.js   |  8 -------
 core/clipboard.js | 53 ++++++++++++++---------------------------------
 2 files changed, 15 insertions(+), 46 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index 9fae4e84a..91c643e39 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -92,14 +92,6 @@ Blockly.selected = null;
  */
 Blockly.draggingConnections = [];
 
-/**
- * Get the current contents of the clipboard and associated metadata.
- * @return {{xml: ?Element, source: ?Blockly.WorkspaceSvg, typeCounts: ?Object}}
- *     An object containing the clipboard contents and associated metadata.
- * @public
- */
-Blockly.getClipboardInfo = Blockly.clipboard.getClipboardInfo;
-
 /**
  * Cached value for whether 3D is supported.
  * @type {?boolean}
diff --git a/core/clipboard.js b/core/clipboard.js
index 9f7097f71..c6a9bb8a0 100644
--- a/core/clipboard.js
+++ b/core/clipboard.js
@@ -16,38 +16,20 @@ goog.module.declareLegacyNamespace();
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const ICopyable = goog.requireType('Blockly.ICopyable');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
-
 
 /**
- * Contents of the local clipboard.
- * @type {?Element}
- * @private
+ * Metadata about the object that is currently on the clipboard.
+ * @type {?ICopyable.CopyData}
  */
-let xml = null;
-
-/**
- * Source of the local clipboard.
- * @type {?WorkspaceSvg}
- * @private
- */
-let source = null;
-
-/**
- * Map of types to type counts for the clipboard object and descendants.
- * @type {?Object}
- * @private
- */
-let typeCounts = null;
+let copyData = null;
 
 /**
  * Get the current contents of the clipboard and associated metadata.
- * @return {{xml: ?Element, source: ?WorkspaceSvg, typeCounts: ?Object}} An
+ * @return {?ICopyable.CopyData} An
  *     object containing the clipboard contents and associated metadata.
  */
 const getClipboardInfo = function() {
-  return {xml: xml, source: source, typeCounts: typeCounts};
+  return copyData;
 };
 exports.getClipboardInfo = getClipboardInfo;
 
@@ -56,12 +38,7 @@ exports.getClipboardInfo = getClipboardInfo;
  * @param {!ICopyable} toCopy Block or Workspace Comment to be copied.
  */
 const copy = function(toCopy) {
-  var data = toCopy.toCopyData();
-  if (data) {
-    xml = data.xml;
-    source = data.source;
-    typeCounts = data.typeCounts;
-  }
+  copyData = toCopy.toCopyData();
 };
 /** @package */
 exports.copy = copy;
@@ -71,18 +48,19 @@ exports.copy = copy;
  * @return {boolean} True if the paste was successful, false otherwise.
  */
 const paste = function() {
-  if (!xml) {
+  if (!copyData.xml) {
     return false;
   }
   // Pasting always pastes to the main workspace, even if the copy
   // started in a flyout workspace.
-  var workspace = source;
+  var workspace = copyData.source;
   if (workspace.isFlyout) {
     workspace = workspace.targetWorkspace;
   }
-  if (typeCounts && workspace.isCapacityAvailable(typeCounts)) {
+  if (copyData.typeCounts &&
+      workspace.isCapacityAvailable(copyData.typeCounts)) {
     Events.setGroup(true);
-    workspace.paste(xml);
+    workspace.paste(copyData.xml);
     Events.setGroup(false);
     return true;
   }
@@ -98,16 +76,15 @@ exports.paste = paste;
  */
 const duplicate = function(toDuplicate) {
   // Save the clipboard.
-  const oldXml = xml;
-  const oldSource = source;
+  const oldCopyData = copyData;
 
   // Create a duplicate via a copy/paste operation.
   copy(toDuplicate);
-  toDuplicate.workspace.paste(xml);
+  // copy() replaced the value of copyData.
+  toDuplicate.workspace.paste(copyData.xml);
 
   // Restore the clipboard.
-  xml = oldXml;
-  source = oldSource;
+  copyData = oldCopyData;
 };
 /** @package */
 exports.duplicate = duplicate;

From f72c5cea805a3f4f02670b3e43f106b26721c86d Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Thu, 29 Jul 2021 17:19:57 -0700
Subject: [PATCH 428/833] Remove getClipboardInfo

---
 core/clipboard.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/core/clipboard.js b/core/clipboard.js
index c6a9bb8a0..9810836f9 100644
--- a/core/clipboard.js
+++ b/core/clipboard.js
@@ -23,16 +23,6 @@ const ICopyable = goog.requireType('Blockly.ICopyable');
  */
 let copyData = null;
 
-/**
- * Get the current contents of the clipboard and associated metadata.
- * @return {?ICopyable.CopyData} An
- *     object containing the clipboard contents and associated metadata.
- */
-const getClipboardInfo = function() {
-  return copyData;
-};
-exports.getClipboardInfo = getClipboardInfo;
-
 /**
  * Copy a block or workspace comment onto the local clipboard.
  * @param {!ICopyable} toCopy Block or Workspace Comment to be copied.

From 99dfd267f1937cdb1ac8a6c5e62dbc98109d3283 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 30 Jul 2021 08:50:34 -0700
Subject: [PATCH 429/833] Migrate core/trashcan.js to named requires

---
 core/trashcan.js | 196 ++++++++++++++++++++++++-----------------------
 1 file changed, 102 insertions(+), 94 deletions(-)

diff --git a/core/trashcan.js b/core/trashcan.js
index 7771deba0..85337ceef 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -13,45 +13,53 @@
 goog.module('Blockly.Trashcan');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.ComponentManager');
-goog.require('Blockly.DeleteArea');
-goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Abstract = goog.requireType('Blockly.Events.Abstract');
+/* eslint-disable-next-line no-unused-vars */
+const Blockly = goog.requireType('Blockly');
+const ComponentManager = goog.require('Blockly.ComponentManager');
+const DeleteArea = goog.require('Blockly.DeleteArea');
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const IAutoHideable = goog.require('Blockly.IAutoHideable');
+/* eslint-disable-next-line no-unused-vars */
+const IDraggable = goog.requireType('Blockly.IDraggable');
+/* eslint-disable-next-line no-unused-vars */
+const IFlyout = goog.requireType('Blockly.IFlyout');
+/* eslint-disable-next-line no-unused-vars */
+const IPositionable = goog.require('Blockly.IPositionable');
+/* eslint-disable-next-line no-unused-vars */
+const MetricsManager = goog.requireType('Blockly.MetricsManager');
+const Options = goog.require('Blockly.Options');
+const Rect = goog.require('Blockly.utils.Rect');
+const Svg = goog.require('Blockly.utils.Svg');
+/* 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 internalConstants = goog.require('Blockly.internalConstants');
+const registry = goog.require('Blockly.registry');
+const toolbox = goog.require('Blockly.utils.toolbox');
+const uiPosition = goog.require('Blockly.uiPosition');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.TrashcanOpen');
-goog.require('Blockly.IAutoHideable');
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.IPositionable');
-goog.require('Blockly.Options');
-goog.require('Blockly.registry');
-goog.require('Blockly.uiPosition');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Rect');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.toolbox');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.Events.Abstract');
-goog.requireType('Blockly.IDraggable');
-goog.requireType('Blockly.IFlyout');
-goog.requireType('Blockly.utils.Rect');
-goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
  * Class for a trash can.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace to sit in.
+ * @param {!WorkspaceSvg} workspace The workspace to sit in.
  * @constructor
- * @implements {Blockly.IAutoHideable}
- * @implements {Blockly.IPositionable}
- * @extends {Blockly.DeleteArea}
+ * @implements {IAutoHideable}
+ * @implements {IPositionable}
+ * @extends {DeleteArea}
  */
 const Trashcan = function(workspace) {
   Trashcan.superClass_.constructor.call(this);
   /**
    * The workspace the trashcan sits in.
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @private
    */
   this.workspace_ = workspace;
@@ -72,7 +80,7 @@ const Trashcan = function(workspace) {
 
   /**
    * The trashcan flyout.
-   * @type {Blockly.IFlyout}
+   * @type {IFlyout}
    * @package
    */
   this.flyout = null;
@@ -81,7 +89,7 @@ const Trashcan = function(workspace) {
     return;
   }
   // Create flyout options.
-  const flyoutWorkspaceOptions = new Blockly.Options(
+  const flyoutWorkspaceOptions = new Options(
       /** @type {!Blockly.BlocklyOptions} */
       ({
         'scrollbars': true,
@@ -97,24 +105,24 @@ const Trashcan = function(workspace) {
   // Create vertical or horizontal flyout.
   if (this.workspace_.horizontalLayout) {
     flyoutWorkspaceOptions.toolboxPosition =
-        this.workspace_.toolboxPosition == Blockly.utils.toolbox.Position.TOP ?
-        Blockly.utils.toolbox.Position.BOTTOM : Blockly.utils.toolbox.Position.TOP;
-    const HorizontalFlyout = Blockly.registry.getClassFromOptions(
-        Blockly.registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX,
+        this.workspace_.toolboxPosition == toolbox.Position.TOP ?
+        toolbox.Position.BOTTOM : toolbox.Position.TOP;
+    const HorizontalFlyout = registry.getClassFromOptions(
+        registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX,
         this.workspace_.options, true);
     this.flyout = new HorizontalFlyout(flyoutWorkspaceOptions);
   } else {
     flyoutWorkspaceOptions.toolboxPosition =
-      this.workspace_.toolboxPosition == Blockly.utils.toolbox.Position.RIGHT ?
-        Blockly.utils.toolbox.Position.LEFT : Blockly.utils.toolbox.Position.RIGHT;
-    const VerticalFlyout = Blockly.registry.getClassFromOptions(
-        Blockly.registry.Type.FLYOUTS_VERTICAL_TOOLBOX,
+      this.workspace_.toolboxPosition == toolbox.Position.RIGHT ?
+        toolbox.Position.LEFT : toolbox.Position.RIGHT;
+    const VerticalFlyout = registry.getClassFromOptions(
+        registry.Type.FLYOUTS_VERTICAL_TOOLBOX,
         this.workspace_.options, true);
     this.flyout = new VerticalFlyout(flyoutWorkspaceOptions);
   }
   this.workspace_.addChangeListener(this.onDelete_.bind(this));
 };
-Blockly.utils.object.inherits(Trashcan, Blockly.DeleteArea);
+utils.object.inherits(Trashcan, DeleteArea);
 
 /**
  * Width of both the trash can and lid images.
@@ -270,68 +278,68 @@ Trashcan.prototype.createDom = function() {
         clip-path="url(#blocklyTrashLidClipPath837493)"></image>
   </g>
   */
-  this.svgGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
+  this.svgGroup_ = dom.createSvgElement(
+      Svg.G,
       {'class': 'blocklyTrash'}, null);
   let clip;
   const rnd = String(Math.random()).substring(2);
-  clip = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.CLIPPATH,
+  clip = dom.createSvgElement(
+      Svg.CLIPPATH,
       {'id': 'blocklyTrashBodyClipPath' + rnd},
       this.svgGroup_);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  dom.createSvgElement(
+      Svg.RECT,
       {
         'width': WIDTH,
         'height': BODY_HEIGHT,
         'y': LID_HEIGHT
       },
       clip);
-  const body = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.IMAGE, {
-        'width': Blockly.internalConstants.SPRITE.width,
+  const body = dom.createSvgElement(
+      Svg.IMAGE, {
+        'width': internalConstants.SPRITE.width,
         'x': -SPRITE_LEFT,
-        'height': Blockly.internalConstants.SPRITE.height,
+        'height': internalConstants.SPRITE.height,
         'y': -SPRITE_TOP,
         'clip-path': 'url(#blocklyTrashBodyClipPath' + rnd + ')'
       },
       this.svgGroup_);
   body.setAttributeNS(
-      Blockly.utils.dom.XLINK_NS, 'xlink:href',
+      dom.XLINK_NS, 'xlink:href',
       this.workspace_.options.pathToMedia +
-          Blockly.internalConstants.SPRITE.url);
+          internalConstants.SPRITE.url);
 
-  clip = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.CLIPPATH,
+  clip = dom.createSvgElement(
+      Svg.CLIPPATH,
       {'id': 'blocklyTrashLidClipPath' + rnd},
       this.svgGroup_);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  dom.createSvgElement(
+      Svg.RECT,
       {'width': WIDTH, 'height': LID_HEIGHT}, clip);
-  this.svgLid_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.IMAGE, {
-        'width': Blockly.internalConstants.SPRITE.width,
+  this.svgLid_ = dom.createSvgElement(
+      Svg.IMAGE, {
+        'width': internalConstants.SPRITE.width,
         'x': -SPRITE_LEFT,
-        'height': Blockly.internalConstants.SPRITE.height,
+        'height': internalConstants.SPRITE.height,
         'y': -SPRITE_TOP,
         'clip-path': 'url(#blocklyTrashLidClipPath' + rnd + ')'
       },
       this.svgGroup_);
   this.svgLid_.setAttributeNS(
-      Blockly.utils.dom.XLINK_NS, 'xlink:href',
+      dom.XLINK_NS, 'xlink:href',
       this.workspace_.options.pathToMedia +
-          Blockly.internalConstants.SPRITE.url);
+          internalConstants.SPRITE.url);
 
   // bindEventWithChecks_ quashes events too aggressively. See:
   // https://groups.google.com/forum/#!topic/blockly/QF4yB9Wx00s
   // Using bindEventWithChecks_ for blocking mousedown causes issue in mobile.
   // See #4303
-  Blockly.browserEvents.bind(
+  browserEvents.bind(
       this.svgGroup_, 'mousedown', this, this.blockMouseDownWhenOpenable_);
-  Blockly.browserEvents.bind(this.svgGroup_, 'mouseup', this, this.click);
+  browserEvents.bind(this.svgGroup_, 'mouseup', this, this.click);
   // Bind to body instead of this.svgGroup_ so that we don't get lid jitters
-  Blockly.browserEvents.bind(body, 'mouseover', this, this.mouseOver_);
-  Blockly.browserEvents.bind(body, 'mouseout', this, this.mouseOut_);
+  browserEvents.bind(body, 'mouseover', this, this.mouseOver_);
+  browserEvents.bind(body, 'mouseout', this, this.mouseOut_);
   this.animateLid_();
   return this.svgGroup_;
 };
@@ -341,8 +349,8 @@ Trashcan.prototype.createDom = function() {
  */
 Trashcan.prototype.init = function() {
   if (this.workspace_.options.maxTrashcanContents > 0) {
-    Blockly.utils.dom.insertAfter(
-        this.flyout.createDom(Blockly.utils.Svg.SVG),
+    dom.insertAfter(
+        this.flyout.createDom(Svg.SVG),
         this.workspace_.getParentSvg());
     this.flyout.init(this.workspace_);
   }
@@ -350,10 +358,10 @@ Trashcan.prototype.init = function() {
     component: this,
     weight: 1,
     capabilities: [
-      Blockly.ComponentManager.Capability.AUTOHIDEABLE,
-      Blockly.ComponentManager.Capability.DELETE_AREA,
-      Blockly.ComponentManager.Capability.DRAG_TARGET,
-      Blockly.ComponentManager.Capability.POSITIONABLE
+      ComponentManager.Capability.AUTOHIDEABLE,
+      ComponentManager.Capability.DELETE_AREA,
+      ComponentManager.Capability.DRAG_TARGET,
+      ComponentManager.Capability.POSITIONABLE
     ]
   });
   this.initialized_ = true;
@@ -368,7 +376,7 @@ Trashcan.prototype.init = function() {
 Trashcan.prototype.dispose = function() {
   this.workspace_.getComponentManager().removeComponent('trashcan');
   if (this.svgGroup_) {
-    Blockly.utils.dom.removeNode(this.svgGroup_);
+    dom.removeNode(this.svgGroup_);
     this.svgGroup_ = null;
   }
   this.svgLid_ = null;
@@ -400,7 +408,7 @@ Trashcan.prototype.openFlyout = function() {
   if (this.contentsIsOpen()) {
     return;
   }
-  const xml = this.contents_.map(Blockly.Xml.textToDom);
+  const xml = this.contents_.map(Xml.textToDom);
   this.flyout.show(xml);
   this.fireUiEvent_(true);
 };
@@ -446,8 +454,8 @@ Trashcan.prototype.emptyContents = function() {
  * Positions the trashcan.
  * It is positioned in the opposite corner to the corner the
  * categories/toolbox starts at.
- * @param {!Blockly.MetricsManager.UiMetrics} metrics The workspace metrics.
- * @param {!Array<!Blockly.utils.Rect>} savedPositions List of rectangles that
+ * @param {!MetricsManager.UiMetrics} metrics The workspace metrics.
+ * @param {!Array<!Rect>} savedPositions List of rectangles that
  *     are already on the workspace.
  */
 Trashcan.prototype.position = function(metrics, savedPositions) {
@@ -457,19 +465,19 @@ Trashcan.prototype.position = function(metrics, savedPositions) {
   }
 
   const cornerPosition =
-      Blockly.uiPosition.getCornerOppositeToolbox(this.workspace_, metrics);
+      uiPosition.getCornerOppositeToolbox(this.workspace_, metrics);
 
   const height = BODY_HEIGHT + LID_HEIGHT;
-  const startRect = Blockly.uiPosition.getStartPositionRect(
-      cornerPosition, new Blockly.utils.Size(WIDTH, height),
+  const startRect = uiPosition.getStartPositionRect(
+      cornerPosition, new utils.Size(WIDTH, height),
       MARGIN_HORIZONTAL, MARGIN_VERTICAL, metrics, this.workspace_);
 
   const verticalPosition = cornerPosition.vertical;
   const bumpDirection =
-      verticalPosition === Blockly.uiPosition.verticalPosition.TOP ?
-          Blockly.uiPosition.bumpDirection.DOWN :
-          Blockly.uiPosition.bumpDirection.UP;
-  const positionRect = Blockly.uiPosition.bumpPositionRect(
+      verticalPosition === uiPosition.verticalPosition.TOP ?
+          uiPosition.bumpDirection.DOWN :
+          uiPosition.bumpDirection.UP;
+  const positionRect = uiPosition.bumpPositionRect(
       startRect, MARGIN_VERTICAL, bumpDirection, savedPositions);
 
   this.top_ = positionRect.top;
@@ -481,19 +489,19 @@ Trashcan.prototype.position = function(metrics, savedPositions) {
 /**
  * Returns the bounding rectangle of the UI element in pixel units relative to
  * the Blockly injection div.
- * @return {?Blockly.utils.Rect} The UI elements’s bounding box. Null if
+ * @return {?Rect} The UI elements’s bounding box. Null if
  *   bounding box should be ignored by other UI elements.
  */
 Trashcan.prototype.getBoundingRectangle = function() {
   const bottom = this.top_ + BODY_HEIGHT + LID_HEIGHT;
   const right = this.left_ + WIDTH;
-  return new Blockly.utils.Rect(this.top_, bottom, this.left_, right);
+  return new Rect(this.top_, bottom, this.left_, right);
 };
 
 /**
  * Returns the bounding rectangle of the drag target area in pixel units
  * relative to viewport.
- * @return {?Blockly.utils.Rect} The component's bounding box. Null if drag
+ * @return {?Rect} The component's bounding box. Null if drag
  *   target area should be ignored.
  */
 Trashcan.prototype.getClientRect = function() {
@@ -507,13 +515,13 @@ Trashcan.prototype.getClientRect = function() {
       2 * MARGIN_HOTSPOT;
   const left = trashRect.left + SPRITE_LEFT - MARGIN_HOTSPOT;
   const right = left + WIDTH + 2 * MARGIN_HOTSPOT;
-  return new Blockly.utils.Rect(top, bottom, left, right);
+  return new Rect(top, bottom, left, right);
 };
 
 /**
  * Handles when a cursor with a block or bubble is dragged over this drag
  * target.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  * @override
  */
@@ -523,7 +531,7 @@ Trashcan.prototype.onDragOver = function(_dragElement) {
 
 /**
  * Handles when a cursor with a block or bubble exits this drag target.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  * @override
  */
@@ -534,7 +542,7 @@ Trashcan.prototype.onDragExit = function(_dragElement) {
 /**
  * Handles when a block or bubble is dropped on this component.
  * Should not handle delete here.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  * @override
  */
@@ -586,7 +594,7 @@ Trashcan.prototype.animateLid_ = function() {
  */
 Trashcan.prototype.setLidAngle_ = function(lidAngle) {
   const openAtRight =
-      this.workspace_.toolboxPosition == Blockly.utils.toolbox.Position.RIGHT ||
+      this.workspace_.toolboxPosition == toolbox.Position.RIGHT ||
       (this.workspace_.horizontalLayout && this.workspace_.RTL);
   this.svgLid_.setAttribute('transform', 'rotate(' +
       (openAtRight ? -lidAngle : lidAngle) + ',' +
@@ -632,9 +640,9 @@ Trashcan.prototype.click = function() {
  * @private
  */
 Trashcan.prototype.fireUiEvent_ = function(trashcanOpen) {
-  const uiEvent = new (Blockly.Events.get(Blockly.Events.TRASHCAN_OPEN))(
+  const uiEvent = new (Events.get(Events.TRASHCAN_OPEN))(
       trashcanOpen,this.workspace_.id);
-  Blockly.Events.fire(uiEvent);
+  Events.fire(uiEvent);
 };
 
 /**
@@ -671,7 +679,7 @@ Trashcan.prototype.mouseOut_ = function() {
 
 /**
  * Handle a BLOCK_DELETE event. Adds deleted blocks oldXml to the content array.
- * @param {!Blockly.Events.Abstract} event Workspace event.
+ * @param {!Abstract} event Workspace event.
  * @private
  */
 Trashcan.prototype.onDelete_ = function(event) {
@@ -679,7 +687,7 @@ Trashcan.prototype.onDelete_ = function(event) {
     return;
   }
   // Must check that the tagName exists since oldXml can be a DocumentFragment.
-  if (event.type == Blockly.Events.BLOCK_DELETE && event.oldXml.tagName &&
+  if (event.type == Events.BLOCK_DELETE && event.oldXml.tagName &&
       event.oldXml.tagName.toLowerCase() != 'shadow') {
     const cleanedXML = this.cleanBlockXML_(event.oldXml);
     if (this.contents_.indexOf(cleanedXML) != -1) {
@@ -741,7 +749,7 @@ Trashcan.prototype.cleanBlockXML_ = function(xml) {
     }
     node = nextNode;
   }
-  return Blockly.Xml.domToText(xmlBlock);
+  return Xml.domToText(xmlBlock);
 };
 
 exports = Trashcan;

From 8860db1fd2f531b1c308f873b209550e75c59ae1 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 30 Jul 2021 08:51:51 -0700
Subject: [PATCH 430/833] clang-format core/trashcan.js

---
 core/trashcan.js | 84 +++++++++++++++++++-----------------------------
 1 file changed, 33 insertions(+), 51 deletions(-)

diff --git a/core/trashcan.js b/core/trashcan.js
index 85337ceef..fb60ca3a1 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -106,18 +106,19 @@ const Trashcan = function(workspace) {
   if (this.workspace_.horizontalLayout) {
     flyoutWorkspaceOptions.toolboxPosition =
         this.workspace_.toolboxPosition == toolbox.Position.TOP ?
-        toolbox.Position.BOTTOM : toolbox.Position.TOP;
+        toolbox.Position.BOTTOM :
+        toolbox.Position.TOP;
     const HorizontalFlyout = registry.getClassFromOptions(
-        registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX,
-        this.workspace_.options, true);
+        registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX, this.workspace_.options,
+        true);
     this.flyout = new HorizontalFlyout(flyoutWorkspaceOptions);
   } else {
     flyoutWorkspaceOptions.toolboxPosition =
-      this.workspace_.toolboxPosition == toolbox.Position.RIGHT ?
-        toolbox.Position.LEFT : toolbox.Position.RIGHT;
+        this.workspace_.toolboxPosition == toolbox.Position.RIGHT ?
+        toolbox.Position.LEFT :
+        toolbox.Position.RIGHT;
     const VerticalFlyout = registry.getClassFromOptions(
-        registry.Type.FLYOUTS_VERTICAL_TOOLBOX,
-        this.workspace_.options, true);
+        registry.Type.FLYOUTS_VERTICAL_TOOLBOX, this.workspace_.options, true);
     this.flyout = new VerticalFlyout(flyoutWorkspaceOptions);
   }
   this.workspace_.addChangeListener(this.onDelete_.bind(this));
@@ -278,23 +279,13 @@ Trashcan.prototype.createDom = function() {
         clip-path="url(#blocklyTrashLidClipPath837493)"></image>
   </g>
   */
-  this.svgGroup_ = dom.createSvgElement(
-      Svg.G,
-      {'class': 'blocklyTrash'}, null);
+  this.svgGroup_ = dom.createSvgElement(Svg.G, {'class': 'blocklyTrash'}, null);
   let clip;
   const rnd = String(Math.random()).substring(2);
   clip = dom.createSvgElement(
-      Svg.CLIPPATH,
-      {'id': 'blocklyTrashBodyClipPath' + rnd},
-      this.svgGroup_);
+      Svg.CLIPPATH, {'id': 'blocklyTrashBodyClipPath' + rnd}, this.svgGroup_);
   dom.createSvgElement(
-      Svg.RECT,
-      {
-        'width': WIDTH,
-        'height': BODY_HEIGHT,
-        'y': LID_HEIGHT
-      },
-      clip);
+      Svg.RECT, {'width': WIDTH, 'height': BODY_HEIGHT, 'y': LID_HEIGHT}, clip);
   const body = dom.createSvgElement(
       Svg.IMAGE, {
         'width': internalConstants.SPRITE.width,
@@ -306,16 +297,11 @@ Trashcan.prototype.createDom = function() {
       this.svgGroup_);
   body.setAttributeNS(
       dom.XLINK_NS, 'xlink:href',
-      this.workspace_.options.pathToMedia +
-          internalConstants.SPRITE.url);
+      this.workspace_.options.pathToMedia + internalConstants.SPRITE.url);
 
   clip = dom.createSvgElement(
-      Svg.CLIPPATH,
-      {'id': 'blocklyTrashLidClipPath' + rnd},
-      this.svgGroup_);
-  dom.createSvgElement(
-      Svg.RECT,
-      {'width': WIDTH, 'height': LID_HEIGHT}, clip);
+      Svg.CLIPPATH, {'id': 'blocklyTrashLidClipPath' + rnd}, this.svgGroup_);
+  dom.createSvgElement(Svg.RECT, {'width': WIDTH, 'height': LID_HEIGHT}, clip);
   this.svgLid_ = dom.createSvgElement(
       Svg.IMAGE, {
         'width': internalConstants.SPRITE.width,
@@ -327,8 +313,7 @@ Trashcan.prototype.createDom = function() {
       this.svgGroup_);
   this.svgLid_.setAttributeNS(
       dom.XLINK_NS, 'xlink:href',
-      this.workspace_.options.pathToMedia +
-          internalConstants.SPRITE.url);
+      this.workspace_.options.pathToMedia + internalConstants.SPRITE.url);
 
   // bindEventWithChecks_ quashes events too aggressively. See:
   // https://groups.google.com/forum/#!topic/blockly/QF4yB9Wx00s
@@ -350,8 +335,7 @@ Trashcan.prototype.createDom = function() {
 Trashcan.prototype.init = function() {
   if (this.workspace_.options.maxTrashcanContents > 0) {
     dom.insertAfter(
-        this.flyout.createDom(Svg.SVG),
-        this.workspace_.getParentSvg());
+        this.flyout.createDom(Svg.SVG), this.workspace_.getParentSvg());
     this.flyout.init(this.workspace_);
   }
   this.workspace_.getComponentManager().addComponent({
@@ -469,21 +453,20 @@ Trashcan.prototype.position = function(metrics, savedPositions) {
 
   const height = BODY_HEIGHT + LID_HEIGHT;
   const startRect = uiPosition.getStartPositionRect(
-      cornerPosition, new utils.Size(WIDTH, height),
-      MARGIN_HORIZONTAL, MARGIN_VERTICAL, metrics, this.workspace_);
+      cornerPosition, new utils.Size(WIDTH, height), MARGIN_HORIZONTAL,
+      MARGIN_VERTICAL, metrics, this.workspace_);
 
   const verticalPosition = cornerPosition.vertical;
-  const bumpDirection =
-      verticalPosition === uiPosition.verticalPosition.TOP ?
-          uiPosition.bumpDirection.DOWN :
-          uiPosition.bumpDirection.UP;
+  const bumpDirection = verticalPosition === uiPosition.verticalPosition.TOP ?
+      uiPosition.bumpDirection.DOWN :
+      uiPosition.bumpDirection.UP;
   const positionRect = uiPosition.bumpPositionRect(
       startRect, MARGIN_VERTICAL, bumpDirection, savedPositions);
 
   this.top_ = positionRect.top;
   this.left_ = positionRect.left;
-  this.svgGroup_.setAttribute('transform',
-      'translate(' + this.left_ + ',' + this.top_ + ')');
+  this.svgGroup_.setAttribute(
+      'transform', 'translate(' + this.left_ + ',' + this.top_ + ')');
 };
 
 /**
@@ -511,8 +494,7 @@ Trashcan.prototype.getClientRect = function() {
 
   const trashRect = this.svgGroup_.getBoundingClientRect();
   const top = trashRect.top + SPRITE_TOP - MARGIN_HOTSPOT;
-  const bottom = top + LID_HEIGHT + BODY_HEIGHT +
-      2 * MARGIN_HOTSPOT;
+  const bottom = top + LID_HEIGHT + BODY_HEIGHT + 2 * MARGIN_HOTSPOT;
   const left = trashRect.left + SPRITE_LEFT - MARGIN_HOTSPOT;
   const right = left + WIDTH + 2 * MARGIN_HOTSPOT;
   return new Rect(top, bottom, left, right);
@@ -582,8 +564,8 @@ Trashcan.prototype.animateLid_ = function() {
   this.svgGroup_.style.opacity = opacity;
 
   if (this.lidOpen_ > this.minOpenness_ && this.lidOpen_ < 1) {
-    this.lidTask_ = setTimeout(this.animateLid_.bind(this),
-        ANIMATION_LENGTH / frames);
+    this.lidTask_ =
+        setTimeout(this.animateLid_.bind(this), ANIMATION_LENGTH / frames);
   }
 };
 
@@ -596,10 +578,10 @@ Trashcan.prototype.setLidAngle_ = function(lidAngle) {
   const openAtRight =
       this.workspace_.toolboxPosition == toolbox.Position.RIGHT ||
       (this.workspace_.horizontalLayout && this.workspace_.RTL);
-  this.svgLid_.setAttribute('transform', 'rotate(' +
-      (openAtRight ? -lidAngle : lidAngle) + ',' +
-      (openAtRight ? 4 : WIDTH - 4) + ',' +
-      (LID_HEIGHT - 2) + ')');
+  this.svgLid_.setAttribute(
+      'transform',
+      'rotate(' + (openAtRight ? -lidAngle : lidAngle) + ',' +
+          (openAtRight ? 4 : WIDTH - 4) + ',' + (LID_HEIGHT - 2) + ')');
 };
 
 /**
@@ -640,8 +622,8 @@ Trashcan.prototype.click = function() {
  * @private
  */
 Trashcan.prototype.fireUiEvent_ = function(trashcanOpen) {
-  const uiEvent = new (Events.get(Events.TRASHCAN_OPEN))(
-      trashcanOpen,this.workspace_.id);
+  const uiEvent =
+      new (Events.get(Events.TRASHCAN_OPEN))(trashcanOpen, this.workspace_.id);
   Events.fire(uiEvent);
 };
 
@@ -695,7 +677,7 @@ Trashcan.prototype.onDelete_ = function(event) {
     }
     this.contents_.unshift(cleanedXML);
     while (this.contents_.length >
-        this.workspace_.options.maxTrashcanContents) {
+           this.workspace_.options.maxTrashcanContents) {
       this.contents_.pop();
     }
 

From 800f8784fd87a49cf52f8cbe40df5346861e6cdb Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:33:51 -0700
Subject: [PATCH 431/833] Fix eslint warning from dom.js

---
 core/utils/dom.js | 3 ++-
 tests/deps.js     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/utils/dom.js b/core/utils/dom.js
index 5ec684acf..f226cf406 100644
--- a/core/utils/dom.js
+++ b/core/utils/dom.js
@@ -19,7 +19,8 @@
 goog.module('Blockly.utils.dom');
 goog.module.declareLegacyNamespace();
 
-const Svg = goog.require('Blockly.utils.Svg');
+/* eslint-disable-next-line no-unused-vars */
+const Svg = goog.requireType('Blockly.utils.Svg');
 const userAgent = goog.require('Blockly.utils.userAgent');
 
 
diff --git a/tests/deps.js b/tests/deps.js
index 1bb9bf742..cea1839b0 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -179,7 +179,7 @@ goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.Svg', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], []);
 goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.IdGenerator'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], [], {'lang': 'es6', 'module': 'goog'});

From a86f1484d228790868f9830038ca96f3c6ed798d Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Wed, 28 Jul 2021 20:27:41 -0700
Subject: [PATCH 432/833] Move main workspace to a new file, common.js

---
 core/blockly.js | 20 +++++++++++---------
 core/common.js  | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/deps.js   |  5 +++++
 3 files changed, 62 insertions(+), 9 deletions(-)
 create mode 100644 core/common.js

diff --git a/core/blockly.js b/core/blockly.js
index 91c643e39..0b6011e07 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -18,6 +18,7 @@ goog.provide('Blockly');
 
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.clipboard');
+goog.require('Blockly.common');
 goog.require('Blockly.ComponentManager');
 goog.require('Blockly.connectionTypes');
 goog.require('Blockly.constants');
@@ -72,12 +73,15 @@ goog.requireType('Blockly.Workspace');
  */
 Blockly.VERSION = 'uncompiled';
 
-/**
- * The main workspace most recently used.
- * Set by Blockly.WorkspaceSvg.prototype.markFocused
- * @type {Blockly.Workspace}
- */
-Blockly.mainWorkspace = null;
+// Add a getter and setter pair for Blockly.mainWorkspace, for legacy reasons.
+Object.defineProperty(Blockly, 'mainWorkspace', {
+  set: function(x) {
+    Blockly.common.setMainWorkspace(x);
+  },
+  get: function() {
+    return Blockly.common.getMainWorkspace();
+  }
+});
 
 /**
  * Currently selected block.
@@ -266,9 +270,7 @@ Blockly.hideChaff = function(opt_onlyClosePopups) {
  * Blockly instances on a page.
  * @return {!Blockly.Workspace} The main workspace.
  */
-Blockly.getMainWorkspace = function() {
-  return /** @type {!Blockly.Workspace} */ (Blockly.mainWorkspace);
-};
+Blockly.getMainWorkspace = Blockly.common.getMainWorkspace;
 
 /**
  * Wrapper to window.alert() that app developers may override to
diff --git a/core/common.js b/core/common.js
new file mode 100644
index 000000000..d9a6b9638
--- /dev/null
+++ b/core/common.js
@@ -0,0 +1,46 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Common functions used both internally and externally, but which
+ * must not be at the top level to avoid circular dependencies.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.module('Blockly.common');
+goog.module.declareLegacyNamespace();
+
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+
+
+/**
+ * The main workspace most recently used.
+ * Set by Blockly.WorkspaceSvg.prototype.markFocused
+ * @type {!Workspace}
+ */
+let mainWorkspace;
+
+/**
+ * Returns the last used top level workspace (based on focus).  Try not to use
+ * this function, particularly if there are multiple Blockly instances on a
+ * page.
+ * @return {!Workspace} The main workspace.
+ */
+const getMainWorkspace = function() {
+  return mainWorkspace;
+};
+exports.getMainWorkspace = getMainWorkspace;
+
+/**
+ * Sets last used main workspace.
+ * @param {!Workspace} workspace The most recently used top level workspace.
+ */
+const setMainWorkspace = function(workspace) {
+  mainWorkspace = workspace;
+};
+exports.setMainWorkspace = setMainWorkspace;
diff --git a/tests/deps.js b/tests/deps.js
index b0c73600a..c83f1782a 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -12,13 +12,18 @@ 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.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', '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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', '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']);
+<<<<<<< HEAD
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
+=======
+goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
+>>>>>>> 2c0751ed (Move main workspace to a new file, common.js)
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global']);
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});

From 2e30bbe7ce1be467672d03bedc7d716bee7b4db3 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Wed, 28 Jul 2021 20:51:46 -0700
Subject: [PATCH 433/833] Update uses of mainWorkspace in core

---
 core/blockly.js       |  4 ++--
 core/dropdowndiv.js   |  5 +++--
 core/generator.js     |  4 ++--
 core/gesture.js       |  2 +-
 core/inject.js        |  7 ++++---
 core/widgetdiv.js     |  5 +++--
 core/workspace_svg.js |  3 ++-
 tests/deps.js         | 10 +++++-----
 8 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index 0b6011e07..7ad87be94 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -177,7 +177,7 @@ Blockly.svgResize = function(workspace) {
 // TODO (https://github.com/google/blockly/issues/1998) handle cases where there
 // are multiple workspaces and non-main workspaces are able to accept input.
 Blockly.onKeyDown = function(e) {
-  var mainWorkspace = Blockly.mainWorkspace;
+  var mainWorkspace = Blockly.common.getMainWorkspace();
   if (!mainWorkspace) {
     return;
   }
@@ -256,7 +256,7 @@ Blockly.hideChaff = function(opt_onlyClosePopups) {
   Blockly.DropDownDiv.hideWithoutAnimation();
 
   var onlyClosePopups = !!opt_onlyClosePopups;
-  var workspace = Blockly.getMainWorkspace();
+  var workspace = Blockly.common.getMainWorkspace();
   var autoHideables = workspace.getComponentManager().getComponents(
       Blockly.ComponentManager.Capability.AUTOHIDEABLE, true);
   autoHideables.forEach(function(autoHideable) {
diff --git a/core/dropdowndiv.js b/core/dropdowndiv.js
index 68698371e..bf5eddb69 100644
--- a/core/dropdowndiv.js
+++ b/core/dropdowndiv.js
@@ -15,6 +15,7 @@
 
 goog.provide('Blockly.DropDownDiv');
 
+goog.require('Blockly.common');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.math');
 goog.require('Blockly.utils.Rect');
@@ -381,7 +382,7 @@ Blockly.DropDownDiv.show = function(owner, rtl, primaryX, primaryY,
   div.style.direction = rtl ? 'rtl' : 'ltr';
 
   var mainWorkspace =
-    /** @type {!Blockly.WorkspaceSvg} */ (Blockly.getMainWorkspace());
+    /** @type {!Blockly.WorkspaceSvg} */ (Blockly.common.getMainWorkspace());
   Blockly.DropDownDiv.rendererClassName_ =
       mainWorkspace.getRenderer().getClassName();
   Blockly.DropDownDiv.themeClassName_ = mainWorkspace.getTheme().getClassName();
@@ -694,7 +695,7 @@ Blockly.DropDownDiv.hideWithoutAnimation = function() {
     Blockly.DropDownDiv.themeClassName_ = '';
   }
   (/** @type {!Blockly.WorkspaceSvg} */ (
-    Blockly.getMainWorkspace())).markFocused();
+    Blockly.common.getMainWorkspace())).markFocused();
 };
 
 /**
diff --git a/core/generator.js b/core/generator.js
index 112c2f8a1..ecff99c09 100644
--- a/core/generator.js
+++ b/core/generator.js
@@ -16,13 +16,13 @@ goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Block = goog.requireType('Blockly.Block');
+const common = goog.require('Blockly.common');
 /* 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 internalConstants = goog.require('Blockly.internalConstants');
 const deprecation = goog.require('Blockly.utils.deprecation');
-const {getMainWorkspace} = goog.require('Blockly');
 
 
 /**
@@ -98,7 +98,7 @@ Generator.prototype.workspaceToCode = function(workspace) {
   if (!workspace) {
     // Backwards compatibility from before there could be multiple workspaces.
     console.warn('No workspace specified in workspaceToCode call.  Guessing.');
-    workspace = getMainWorkspace();
+    workspace = common.getMainWorkspace();
   }
   let code = [];
   this.init(workspace);
diff --git a/core/gesture.js b/core/gesture.js
index a1ef6ca91..5d77d4e0a 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -115,7 +115,7 @@ const Gesture = function(e, creatorWorkspace) {
   /**
    * The workspace that the gesture started on.  There may be multiple
    * workspaces on a page; this is more accurate than using
-   * Blockly.getMainWorkspace().
+   * Blockly.common.getMainWorkspace().
    * @type {WorkspaceSvg}
    * @protected
    */
diff --git a/core/inject.js b/core/inject.js
index 0b7590824..6bb3e6077 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -14,6 +14,7 @@ goog.provide('Blockly.inject');
 
 goog.require('Blockly.BlockDragSurfaceSvg');
 goog.require('Blockly.browserEvents');
+goog.require('Blockly.common');
 goog.require('Blockly.Css');
 goog.require('Blockly.DropDownDiv');
 goog.require('Blockly.Events');
@@ -77,12 +78,12 @@ Blockly.inject = function(container, opt_options) {
   Blockly.init_(workspace);
 
   // Keep focus on the first workspace so entering keyboard navigation looks correct.
-  Blockly.mainWorkspace = workspace;
+  Blockly.common.setMainWorkspace(workspace);
 
   Blockly.svgResize(workspace);
 
   subContainer.addEventListener('focusin', function() {
-    Blockly.mainWorkspace = workspace;
+    Blockly.common.setMainWorkspace(workspace);
   });
 
   return workspace;
@@ -439,7 +440,7 @@ Blockly.inject.bindDocumentEvents_ = function() {
           window, 'orientationchange', document, function() {
             // TODO (#397): Fix for multiple Blockly workspaces.
             Blockly.svgResize(/** @type {!Blockly.WorkspaceSvg} */
-                (Blockly.getMainWorkspace()));
+                (Blockly.common.getMainWorkspace()));
           });
     }
   }
diff --git a/core/widgetdiv.js b/core/widgetdiv.js
index 316e78b61..8b7de7dac 100644
--- a/core/widgetdiv.js
+++ b/core/widgetdiv.js
@@ -18,6 +18,7 @@
  */
 goog.provide('Blockly.WidgetDiv');
 
+goog.require('Blockly.common');
 goog.require('Blockly.utils.dom');
 
 goog.requireType('Blockly.utils.Rect');
@@ -85,7 +86,7 @@ Blockly.WidgetDiv.show = function(newOwner, rtl, dispose) {
   div.style.direction = rtl ? 'rtl' : 'ltr';
   div.style.display = 'block';
   var mainWorkspace =
-    /** @type {!Blockly.WorkspaceSvg} */ (Blockly.getMainWorkspace());
+    /** @type {!Blockly.WorkspaceSvg} */ (Blockly.common.getMainWorkspace());
   Blockly.WidgetDiv.rendererClassName_ =
       mainWorkspace.getRenderer().getClassName();
   Blockly.WidgetDiv.themeClassName_ = mainWorkspace.getTheme().getClassName();
@@ -119,7 +120,7 @@ Blockly.WidgetDiv.hide = function() {
     Blockly.WidgetDiv.themeClassName_ = '';
   }
   (/** @type {!Blockly.WorkspaceSvg} */ (
-    Blockly.getMainWorkspace())).markFocused();
+    Blockly.common.getMainWorkspace())).markFocused();
 };
 
 /**
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 1c3cee44f..81536d5e6 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -15,6 +15,7 @@ goog.provide('Blockly.WorkspaceSvg');
 goog.require('Blockly.blockRendering');
 goog.require('Blockly.BlockSvg');
 goog.require('Blockly.browserEvents');
+goog.require('Blockly.common');
 goog.require('Blockly.ComponentManager');
 goog.require('Blockly.ConnectionDB');
 goog.require('Blockly.ContextMenu');
@@ -1953,7 +1954,7 @@ Blockly.WorkspaceSvg.prototype.markFocused = function() {
   if (this.options.parentWorkspace) {
     this.options.parentWorkspace.markFocused();
   } else {
-    Blockly.mainWorkspace = this;
+    Blockly.common.setMainWorkspace(this);
     // We call e.preventDefault in many event handlers which means we
     // need to explicitly grab focus (e.g from a textarea) because
     // the browser will not do it for us.  How to do this is browser dependent.
diff --git a/tests/deps.js b/tests/deps.js
index c83f1782a..b460273f4 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -36,7 +36,7 @@ goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRe
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style']);
+goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style']);
 goog.addDependency('../../core/events/block_events.js', ['Blockly.Events.BlockBase', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Events.Change', 'Blockly.Events.Create', 'Blockly.Events.Delete', 'Blockly.Events.Move'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils']);
 goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events']);
@@ -71,11 +71,11 @@ goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly',
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.common', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.Connection', 'Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes']);
 goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.internalConstants'], {'lang': 'es5'});
@@ -206,14 +206,14 @@ goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['
 goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.xml']);
 goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml']);
 goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.utils.dom']);
+goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.common', 'Blockly.utils.dom']);
 goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICopyable', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate']);
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);

From dc4fd5987596e69981c3af3031d7ab81884e8a04 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Wed, 28 Jul 2021 20:53:37 -0700
Subject: [PATCH 434/833] Reorder requires

---
 core/generator.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/generator.js b/core/generator.js
index ecff99c09..9984f186f 100644
--- a/core/generator.js
+++ b/core/generator.js
@@ -16,13 +16,13 @@ goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Block = goog.requireType('Blockly.Block');
-const common = goog.require('Blockly.common');
 /* 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 internalConstants = goog.require('Blockly.internalConstants');
+const common = goog.require('Blockly.common');
 const deprecation = goog.require('Blockly.utils.deprecation');
+const internalConstants = goog.require('Blockly.internalConstants');
 
 
 /**

From 9bd97e51318c5cfcddfc4a9e4e3487c29befc3a5 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 30 Jul 2021 11:34:18 -0700
Subject: [PATCH 435/833] Rebuild

---
 tests/deps.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tests/deps.js b/tests/deps.js
index b460273f4..0b767b0b9 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -12,11 +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.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', '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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', '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']);
-<<<<<<< HEAD
-goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
-=======
-goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
->>>>>>> 2c0751ed (Move main workspace to a new file, common.js)
+goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global']);
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);

From 6faf3dbc46f581391ae5eff73283587c3fa9a808 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 30 Jul 2021 12:25:50 -0700
Subject: [PATCH 436/833] Migrate core/variables_dynamic.js to ES6 const/let

---
 core/variables_dynamic.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/variables_dynamic.js b/core/variables_dynamic.js
index 630064eeb..4dfeec4b3 100644
--- a/core/variables_dynamic.js
+++ b/core/variables_dynamic.js
@@ -41,8 +41,8 @@ Blockly.VariablesDynamic.onCreateVariableButtonClick_Colour = function(button) {
  * @return {!Array<!Element>} Array of XML elements.
  */
 Blockly.VariablesDynamic.flyoutCategory = function(workspace) {
-  var xmlList = [];
-  var button = document.createElement('button');
+  let xmlList = [];
+  let button = document.createElement('button');
   button.setAttribute('text', Blockly.Msg['NEW_STRING_VARIABLE']);
   button.setAttribute('callbackKey', 'CREATE_VARIABLE_STRING');
   xmlList.push(button);
@@ -63,7 +63,7 @@ Blockly.VariablesDynamic.flyoutCategory = function(workspace) {
       Blockly.VariablesDynamic.onCreateVariableButtonClick_Colour);
 
 
-  var blockList = Blockly.VariablesDynamic.flyoutCategoryBlocks(workspace);
+  const blockList = Blockly.VariablesDynamic.flyoutCategoryBlocks(workspace);
   xmlList = xmlList.concat(blockList);
   return xmlList;
 };
@@ -74,13 +74,13 @@ Blockly.VariablesDynamic.flyoutCategory = function(workspace) {
  * @return {!Array<!Element>} Array of XML block elements.
  */
 Blockly.VariablesDynamic.flyoutCategoryBlocks = function(workspace) {
-  var variableModelList = workspace.getAllVariables();
+  const variableModelList = workspace.getAllVariables();
 
-  var xmlList = [];
+  const xmlList = [];
   if (variableModelList.length > 0) {
     if (Blockly.Blocks['variables_set_dynamic']) {
-      var firstVariable = variableModelList[variableModelList.length - 1];
-      var block = Blockly.utils.xml.createElement('block');
+      const firstVariable = variableModelList[variableModelList.length - 1];
+      const block = Blockly.utils.xml.createElement('block');
       block.setAttribute('type', 'variables_set_dynamic');
       block.setAttribute('gap', 24);
       block.appendChild(
@@ -89,8 +89,8 @@ Blockly.VariablesDynamic.flyoutCategoryBlocks = function(workspace) {
     }
     if (Blockly.Blocks['variables_get_dynamic']) {
       variableModelList.sort(Blockly.VariableModel.compareByName);
-      for (var i = 0, variable; (variable = variableModelList[i]); i++) {
-        var block = Blockly.utils.xml.createElement('block');
+      for (let i = 0, variable; (variable = variableModelList[i]); i++) {
+        const block = Blockly.utils.xml.createElement('block');
         block.setAttribute('type', 'variables_get_dynamic');
         block.setAttribute('gap', 8);
         block.appendChild(Blockly.Variables.generateVariableFieldDom(variable));

From 99b8abfeb2f7141a83b0853b85ed95004aee53fb Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 30 Jul 2021 12:29:15 -0700
Subject: [PATCH 437/833] Migrate core/variables_dynamic.js to goog.module

---
 core/variables_dynamic.js | 29 +++++++++++++++++++----------
 tests/deps.js             |  2 +-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/core/variables_dynamic.js b/core/variables_dynamic.js
index 4dfeec4b3..6b855c06f 100644
--- a/core/variables_dynamic.js
+++ b/core/variables_dynamic.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.VariablesDynamic');
+goog.module('Blockly.VariablesDynamic');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Blocks');
 goog.require('Blockly.Msg');
@@ -22,25 +23,31 @@ goog.require('Blockly.Variables');
 goog.requireType('Blockly.Workspace');
 
 
-Blockly.VariablesDynamic.onCreateVariableButtonClick_String = function(button) {
+const onCreateVariableButtonClick_String = function(button) {
   Blockly.Variables.createVariableButtonHandler(button.getTargetWorkspace(),
       undefined, 'String');
 };
-Blockly.VariablesDynamic.onCreateVariableButtonClick_Number = function(button) {
+exports.onCreateVariableButtonClick_String = onCreateVariableButtonClick_String;
+
+const onCreateVariableButtonClick_Number = function(button) {
   Blockly.Variables.createVariableButtonHandler(button.getTargetWorkspace(),
       undefined, 'Number');
 };
-Blockly.VariablesDynamic.onCreateVariableButtonClick_Colour = function(button) {
+exports.onCreateVariableButtonClick_Number = onCreateVariableButtonClick_Number;
+
+const onCreateVariableButtonClick_Colour = function(button) {
   Blockly.Variables.createVariableButtonHandler(button.getTargetWorkspace(),
       undefined, 'Colour');
 };
+exports.onCreateVariableButtonClick_Colour = onCreateVariableButtonClick_Colour;
+
 /**
  * Construct the elements (blocks and button) required by the flyout for the
  * variable category.
  * @param {!Blockly.Workspace} workspace The workspace containing variables.
  * @return {!Array<!Element>} Array of XML elements.
  */
-Blockly.VariablesDynamic.flyoutCategory = function(workspace) {
+const flyoutCategory = function(workspace) {
   let xmlList = [];
   let button = document.createElement('button');
   button.setAttribute('text', Blockly.Msg['NEW_STRING_VARIABLE']);
@@ -56,24 +63,25 @@ Blockly.VariablesDynamic.flyoutCategory = function(workspace) {
   xmlList.push(button);
 
   workspace.registerButtonCallback('CREATE_VARIABLE_STRING',
-      Blockly.VariablesDynamic.onCreateVariableButtonClick_String);
+      onCreateVariableButtonClick_String);
   workspace.registerButtonCallback('CREATE_VARIABLE_NUMBER',
-      Blockly.VariablesDynamic.onCreateVariableButtonClick_Number);
+      onCreateVariableButtonClick_Number);
   workspace.registerButtonCallback('CREATE_VARIABLE_COLOUR',
-      Blockly.VariablesDynamic.onCreateVariableButtonClick_Colour);
+      onCreateVariableButtonClick_Colour);
 
 
-  const blockList = Blockly.VariablesDynamic.flyoutCategoryBlocks(workspace);
+  const blockList = flyoutCategoryBlocks(workspace);
   xmlList = xmlList.concat(blockList);
   return xmlList;
 };
+exports.flyoutCategory = flyoutCategory;
 
 /**
  * Construct the blocks required by the flyout for the variable category.
  * @param {!Blockly.Workspace} workspace The workspace containing variables.
  * @return {!Array<!Element>} Array of XML block elements.
  */
-Blockly.VariablesDynamic.flyoutCategoryBlocks = function(workspace) {
+const flyoutCategoryBlocks = function(workspace) {
   const variableModelList = workspace.getAllVariables();
 
   const xmlList = [];
@@ -100,3 +108,4 @@ Blockly.VariablesDynamic.flyoutCategoryBlocks = function(workspace) {
   }
   return xmlList;
 };
+exports.flyoutCategoryBlocks = flyoutCategoryBlocks;
diff --git a/tests/deps.js b/tests/deps.js
index b0c73600a..ac9faa543 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -199,7 +199,7 @@ goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
 goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.utils', 'Blockly.utils.object']);
 goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.xml']);
-goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml']);
+goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.utils.dom']);
 goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);

From 8ded269a15c46094206c7e233d933e3e90fdf4c3 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 30 Jul 2021 12:32:01 -0700
Subject: [PATCH 438/833] Migrate core/variables_dynamic.js to named requires

---
 core/variables_dynamic.js | 44 +++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/core/variables_dynamic.js b/core/variables_dynamic.js
index 6b855c06f..bc70dd16e 100644
--- a/core/variables_dynamic.js
+++ b/core/variables_dynamic.js
@@ -14,29 +14,29 @@
 goog.module('Blockly.VariablesDynamic');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Blocks');
-goog.require('Blockly.Msg');
-goog.require('Blockly.utils.xml');
-goog.require('Blockly.VariableModel');
-goog.require('Blockly.Variables');
-
-goog.requireType('Blockly.Workspace');
+const Blocks = goog.require('Blockly.Blocks');
+const Msg = goog.require('Blockly.Msg');
+const VariableModel = goog.require('Blockly.VariableModel');
+const Variables = goog.require('Blockly.Variables');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+const xml = goog.require('Blockly.utils.xml');
 
 
 const onCreateVariableButtonClick_String = function(button) {
-  Blockly.Variables.createVariableButtonHandler(button.getTargetWorkspace(),
+  Variables.createVariableButtonHandler(button.getTargetWorkspace(),
       undefined, 'String');
 };
 exports.onCreateVariableButtonClick_String = onCreateVariableButtonClick_String;
 
 const onCreateVariableButtonClick_Number = function(button) {
-  Blockly.Variables.createVariableButtonHandler(button.getTargetWorkspace(),
+  Variables.createVariableButtonHandler(button.getTargetWorkspace(),
       undefined, 'Number');
 };
 exports.onCreateVariableButtonClick_Number = onCreateVariableButtonClick_Number;
 
 const onCreateVariableButtonClick_Colour = function(button) {
-  Blockly.Variables.createVariableButtonHandler(button.getTargetWorkspace(),
+  Variables.createVariableButtonHandler(button.getTargetWorkspace(),
       undefined, 'Colour');
 };
 exports.onCreateVariableButtonClick_Colour = onCreateVariableButtonClick_Colour;
@@ -44,21 +44,21 @@ exports.onCreateVariableButtonClick_Colour = onCreateVariableButtonClick_Colour;
 /**
  * Construct the elements (blocks and button) required by the flyout for the
  * variable category.
- * @param {!Blockly.Workspace} workspace The workspace containing variables.
+ * @param {!Workspace} workspace The workspace containing variables.
  * @return {!Array<!Element>} Array of XML elements.
  */
 const flyoutCategory = function(workspace) {
   let xmlList = [];
   let button = document.createElement('button');
-  button.setAttribute('text', Blockly.Msg['NEW_STRING_VARIABLE']);
+  button.setAttribute('text', Msg['NEW_STRING_VARIABLE']);
   button.setAttribute('callbackKey', 'CREATE_VARIABLE_STRING');
   xmlList.push(button);
   button = document.createElement('button');
-  button.setAttribute('text', Blockly.Msg['NEW_NUMBER_VARIABLE']);
+  button.setAttribute('text', Msg['NEW_NUMBER_VARIABLE']);
   button.setAttribute('callbackKey', 'CREATE_VARIABLE_NUMBER');
   xmlList.push(button);
   button = document.createElement('button');
-  button.setAttribute('text', Blockly.Msg['NEW_COLOUR_VARIABLE']);
+  button.setAttribute('text', Msg['NEW_COLOUR_VARIABLE']);
   button.setAttribute('callbackKey', 'CREATE_VARIABLE_COLOUR');
   xmlList.push(button);
 
@@ -78,7 +78,7 @@ exports.flyoutCategory = flyoutCategory;
 
 /**
  * Construct the blocks required by the flyout for the variable category.
- * @param {!Blockly.Workspace} workspace The workspace containing variables.
+ * @param {!Workspace} workspace The workspace containing variables.
  * @return {!Array<!Element>} Array of XML block elements.
  */
 const flyoutCategoryBlocks = function(workspace) {
@@ -86,22 +86,22 @@ const flyoutCategoryBlocks = function(workspace) {
 
   const xmlList = [];
   if (variableModelList.length > 0) {
-    if (Blockly.Blocks['variables_set_dynamic']) {
+    if (Blocks['variables_set_dynamic']) {
       const firstVariable = variableModelList[variableModelList.length - 1];
-      const block = Blockly.utils.xml.createElement('block');
+      const block = xml.createElement('block');
       block.setAttribute('type', 'variables_set_dynamic');
       block.setAttribute('gap', 24);
       block.appendChild(
-          Blockly.Variables.generateVariableFieldDom(firstVariable));
+          Variables.generateVariableFieldDom(firstVariable));
       xmlList.push(block);
     }
-    if (Blockly.Blocks['variables_get_dynamic']) {
-      variableModelList.sort(Blockly.VariableModel.compareByName);
+    if (Blocks['variables_get_dynamic']) {
+      variableModelList.sort(VariableModel.compareByName);
       for (let i = 0, variable; (variable = variableModelList[i]); i++) {
-        const block = Blockly.utils.xml.createElement('block');
+        const block = xml.createElement('block');
         block.setAttribute('type', 'variables_get_dynamic');
         block.setAttribute('gap', 8);
-        block.appendChild(Blockly.Variables.generateVariableFieldDom(variable));
+        block.appendChild(Variables.generateVariableFieldDom(variable));
         xmlList.push(block);
       }
     }

From ad66c531bd635bd0c5799225183cd49f05e8afad Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 30 Jul 2021 12:32:38 -0700
Subject: [PATCH 439/833] clang-format core/variables_dynamic.js

---
 core/variables_dynamic.js | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/core/variables_dynamic.js b/core/variables_dynamic.js
index bc70dd16e..e982d733e 100644
--- a/core/variables_dynamic.js
+++ b/core/variables_dynamic.js
@@ -24,20 +24,20 @@ const xml = goog.require('Blockly.utils.xml');
 
 
 const onCreateVariableButtonClick_String = function(button) {
-  Variables.createVariableButtonHandler(button.getTargetWorkspace(),
-      undefined, 'String');
+  Variables.createVariableButtonHandler(
+      button.getTargetWorkspace(), undefined, 'String');
 };
 exports.onCreateVariableButtonClick_String = onCreateVariableButtonClick_String;
 
 const onCreateVariableButtonClick_Number = function(button) {
-  Variables.createVariableButtonHandler(button.getTargetWorkspace(),
-      undefined, 'Number');
+  Variables.createVariableButtonHandler(
+      button.getTargetWorkspace(), undefined, 'Number');
 };
 exports.onCreateVariableButtonClick_Number = onCreateVariableButtonClick_Number;
 
 const onCreateVariableButtonClick_Colour = function(button) {
-  Variables.createVariableButtonHandler(button.getTargetWorkspace(),
-      undefined, 'Colour');
+  Variables.createVariableButtonHandler(
+      button.getTargetWorkspace(), undefined, 'Colour');
 };
 exports.onCreateVariableButtonClick_Colour = onCreateVariableButtonClick_Colour;
 
@@ -62,12 +62,12 @@ const flyoutCategory = function(workspace) {
   button.setAttribute('callbackKey', 'CREATE_VARIABLE_COLOUR');
   xmlList.push(button);
 
-  workspace.registerButtonCallback('CREATE_VARIABLE_STRING',
-      onCreateVariableButtonClick_String);
-  workspace.registerButtonCallback('CREATE_VARIABLE_NUMBER',
-      onCreateVariableButtonClick_Number);
-  workspace.registerButtonCallback('CREATE_VARIABLE_COLOUR',
-      onCreateVariableButtonClick_Colour);
+  workspace.registerButtonCallback(
+      'CREATE_VARIABLE_STRING', onCreateVariableButtonClick_String);
+  workspace.registerButtonCallback(
+      'CREATE_VARIABLE_NUMBER', onCreateVariableButtonClick_Number);
+  workspace.registerButtonCallback(
+      'CREATE_VARIABLE_COLOUR', onCreateVariableButtonClick_Colour);
 
 
   const blockList = flyoutCategoryBlocks(workspace);
@@ -91,8 +91,7 @@ const flyoutCategoryBlocks = function(workspace) {
       const block = xml.createElement('block');
       block.setAttribute('type', 'variables_set_dynamic');
       block.setAttribute('gap', 24);
-      block.appendChild(
-          Variables.generateVariableFieldDom(firstVariable));
+      block.appendChild(Variables.generateVariableFieldDom(firstVariable));
       xmlList.push(block);
     }
     if (Blocks['variables_get_dynamic']) {

From 3aae7ffbde2a161b8ee60aa7bd3bcf78e054b0f8 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:22:37 -0700
Subject: [PATCH 440/833] Migrate core/renderers/common/i_path_object.js to
 goog.module

---
 core/renderers/common/i_path_object.js | 41 ++++++++++++++------------
 tests/deps.js                          |  2 +-
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/core/renderers/common/i_path_object.js b/core/renderers/common/i_path_object.js
index 6a7dfc2b7..01a279e03 100644
--- a/core/renderers/common/i_path_object.js
+++ b/core/renderers/common/i_path_object.js
@@ -12,7 +12,8 @@
 
 'use strict';
 
-goog.provide('Blockly.blockRendering.IPathObject');
+goog.module('Blockly.blockRendering.IPathObject');
+goog.module.declareLegacyNamespace();
 
 goog.requireType('Blockly.Block');
 goog.requireType('Blockly.blockRendering.ConstantProvider');
@@ -26,46 +27,46 @@ goog.requireType('Blockly.Theme');
  *     constants.
  * @interface
  */
-Blockly.blockRendering.IPathObject = function(_root, _constants) {};
+const IPathObject = function(_root, _constants) {};
 
 /**
  * The primary path of the block.
  * @type {!SVGElement}
  */
-Blockly.blockRendering.IPathObject.prototype.svgPath;
+IPathObject.prototype.svgPath;
 
 /**
  * The renderer's constant provider.
  * @type {!Blockly.blockRendering.ConstantProvider}
  */
-Blockly.blockRendering.IPathObject.prototype.constants;
+IPathObject.prototype.constants;
 
 /**
  * The primary path of the block.
  * @type {!Blockly.Theme.BlockStyle}
  */
-Blockly.blockRendering.IPathObject.prototype.style;
+IPathObject.prototype.style;
 
 /**
  * Holds the cursors SVG element when the cursor is attached to the block.
  * This is null if there is no cursor on the block.
  * @type {SVGElement}
  */
-Blockly.blockRendering.IPathObject.prototype.cursorSvg;
+IPathObject.prototype.cursorSvg;
 
 /**
  * Holds the markers SVG element when the marker is attached to the block.
  * This is null if there is no marker on the block.
  * @type {SVGElement}
  */
-Blockly.blockRendering.IPathObject.prototype.markerSvg;
+IPathObject.prototype.markerSvg;
 
 /**
  * Set the path generated by the renderer onto the respective SVG element.
  * @param {string} pathString The path.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.setPath;
+IPathObject.prototype.setPath;
 
 /**
  * Apply the stored colours to the block's path, taking into account whether
@@ -73,20 +74,20 @@ Blockly.blockRendering.IPathObject.prototype.setPath;
  * @param {!Blockly.Block} block The source block.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.applyColour;
+IPathObject.prototype.applyColour;
 
 /**
  * Update the style.
  * @param {!Blockly.Theme.BlockStyle} blockStyle The block style to use.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.setStyle;
+IPathObject.prototype.setStyle;
 
 /**
  * Flip the SVG paths in RTL.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.flipRTL;
+IPathObject.prototype.flipRTL;
 
 /**
  * Add the cursor SVG to this block's SVG group.
@@ -94,7 +95,7 @@ Blockly.blockRendering.IPathObject.prototype.flipRTL;
  *     block SVG group.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.setCursorSvg;
+IPathObject.prototype.setCursorSvg;
 
 /**
  * Add the marker SVG to this block's SVG group.
@@ -102,7 +103,7 @@ Blockly.blockRendering.IPathObject.prototype.setCursorSvg;
  *     block SVG group.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.setMarkerSvg;
+IPathObject.prototype.setMarkerSvg;
 
 /**
  * Set whether the block shows a highlight or not.  Block highlighting is
@@ -110,14 +111,14 @@ Blockly.blockRendering.IPathObject.prototype.setMarkerSvg;
  * @param {boolean} highlighted True if highlighted.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.updateHighlighted;
+IPathObject.prototype.updateHighlighted;
 
 /**
  * Add or remove styling showing that a block is selected.
  * @param {boolean} enable True if selection is enabled, false otherwise.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.updateSelected;
+IPathObject.prototype.updateSelected;
 
 /**
  * Add or remove styling showing that a block is dragged over a delete area.
@@ -125,7 +126,7 @@ Blockly.blockRendering.IPathObject.prototype.updateSelected;
  *     area, false otherwise.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.updateDraggingDelete;
+IPathObject.prototype.updateDraggingDelete;
 
 /**
  * Add or remove styling showing that a block is an insertion marker.
@@ -133,14 +134,14 @@ Blockly.blockRendering.IPathObject.prototype.updateDraggingDelete;
  *     otherwise.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.updateInsertionMarker;
+IPathObject.prototype.updateInsertionMarker;
 
 /**
  * Add or remove styling showing that a block is movable.
  * @param {boolean} enable True if the block is movable, false otherwise.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.updateMovable;
+IPathObject.prototype.updateMovable;
 
 /**
  * Add or remove styling that shows that if the dragging block is dropped, this
@@ -149,4 +150,6 @@ Blockly.blockRendering.IPathObject.prototype.updateMovable;
  * @param {boolean} enable True if styling should be added.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.updateReplacementFade;
+IPathObject.prototype.updateReplacementFade;
+
+exports = IPathObject;
diff --git a/tests/deps.js b/tests/deps.js
index 3eaba3083..64c88377b 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -125,7 +125,7 @@ goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.b
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], []);
+goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});

From 31b10f1489013df91b6ba81dd61e85385987f420 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:22:44 -0700
Subject: [PATCH 441/833] Migrate core/renderers/common/i_path_object.js named
 requires

---
 core/renderers/common/i_path_object.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/renderers/common/i_path_object.js b/core/renderers/common/i_path_object.js
index 01a279e03..84e25b6ed 100644
--- a/core/renderers/common/i_path_object.js
+++ b/core/renderers/common/i_path_object.js
@@ -15,15 +15,15 @@
 goog.module('Blockly.blockRendering.IPathObject');
 goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.Theme');
+const Block = goog.requireType('Blockly.Block');
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const Theme = goog.requireType('Blockly.Theme');
 
 
 /**
  * An interface for a block's path object.
  * @param {!SVGElement} _root The root SVG element.
- * @param {!Blockly.blockRendering.ConstantProvider} _constants The renderer's
+ * @param {!ConstantProvider} _constants The renderer's
  *     constants.
  * @interface
  */
@@ -37,13 +37,13 @@ IPathObject.prototype.svgPath;
 
 /**
  * The renderer's constant provider.
- * @type {!Blockly.blockRendering.ConstantProvider}
+ * @type {!ConstantProvider}
  */
 IPathObject.prototype.constants;
 
 /**
  * The primary path of the block.
- * @type {!Blockly.Theme.BlockStyle}
+ * @type {!Theme.BlockStyle}
  */
 IPathObject.prototype.style;
 
@@ -71,14 +71,14 @@ IPathObject.prototype.setPath;
 /**
  * Apply the stored colours to the block's path, taking into account whether
  * the paths belong to a shadow block.
- * @param {!Blockly.Block} block The source block.
+ * @param {!Block} block The source block.
  * @package
  */
 IPathObject.prototype.applyColour;
 
 /**
  * Update the style.
- * @param {!Blockly.Theme.BlockStyle} blockStyle The block style to use.
+ * @param {!Theme.BlockStyle} blockStyle The block style to use.
  * @package
  */
 IPathObject.prototype.setStyle;

From 03de38c41af1745476d3045ef2aefd99a5922ec7 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 30 Jul 2021 15:07:04 -0700
Subject: [PATCH 442/833] Add eslint disable

---
 core/renderers/common/i_path_object.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/renderers/common/i_path_object.js b/core/renderers/common/i_path_object.js
index 84e25b6ed..0b0362ff3 100644
--- a/core/renderers/common/i_path_object.js
+++ b/core/renderers/common/i_path_object.js
@@ -15,7 +15,9 @@
 goog.module('Blockly.blockRendering.IPathObject');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const Block = goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
 const Theme = goog.requireType('Blockly.Theme');
 

From bf831dd83e098460cdfb080690d14b796468c066 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:52:54 -0700
Subject: [PATCH 443/833] Migrate core/workspace_dragger.js to ES6 const/let

---
 core/workspace_dragger.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/workspace_dragger.js b/core/workspace_dragger.js
index 3ad07a20e..a0a6eef16 100644
--- a/core/workspace_dragger.js
+++ b/core/workspace_dragger.js
@@ -96,7 +96,7 @@ Blockly.WorkspaceDragger.prototype.endDrag = function(currentDragDeltaXY) {
  * @package
  */
 Blockly.WorkspaceDragger.prototype.drag = function(currentDragDeltaXY) {
-  var newXY = Blockly.utils.Coordinate.sum(this.startScrollXY_, currentDragDeltaXY);
+  const newXY = Blockly.utils.Coordinate.sum(this.startScrollXY_, currentDragDeltaXY);
 
   if (this.horizontalScrollEnabled_ && this.verticalScrollEnabled_) {
     this.workspace_.scroll(newXY.x, newXY.y);

From 423fa02e8f4ff8fe655073c13279a5506775cecb Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:54:59 -0700
Subject: [PATCH 444/833] Migrate core/workspace_dragger.js to goog.module

---
 core/workspace_dragger.js | 15 +++++++++------
 tests/deps.js             |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/workspace_dragger.js b/core/workspace_dragger.js
index a0a6eef16..90aade9f3 100644
--- a/core/workspace_dragger.js
+++ b/core/workspace_dragger.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.WorkspaceDragger');
+goog.module('Blockly.WorkspaceDragger');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.utils.Coordinate');
 
@@ -26,7 +27,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @param {!Blockly.WorkspaceSvg} workspace The workspace to drag.
  * @constructor
  */
-Blockly.WorkspaceDragger = function(workspace) {
+const WorkspaceDragger = function(workspace) {
   /**
    * @type {!Blockly.WorkspaceSvg}
    * @private
@@ -62,7 +63,7 @@ Blockly.WorkspaceDragger = function(workspace) {
  * @package
  * @suppress {checkTypes}
  */
-Blockly.WorkspaceDragger.prototype.dispose = function() {
+WorkspaceDragger.prototype.dispose = function() {
   this.workspace_ = null;
 };
 
@@ -70,7 +71,7 @@ Blockly.WorkspaceDragger.prototype.dispose = function() {
  * Start dragging the workspace.
  * @package
  */
-Blockly.WorkspaceDragger.prototype.startDrag = function() {
+WorkspaceDragger.prototype.startDrag = function() {
   if (Blockly.selected) {
     Blockly.selected.unselect();
   }
@@ -83,7 +84,7 @@ Blockly.WorkspaceDragger.prototype.startDrag = function() {
  *     moved from the position at the start of the drag, in pixel coordinates.
  * @package
  */
-Blockly.WorkspaceDragger.prototype.endDrag = function(currentDragDeltaXY) {
+WorkspaceDragger.prototype.endDrag = function(currentDragDeltaXY) {
   // Make sure everything is up to date.
   this.drag(currentDragDeltaXY);
   this.workspace_.resetDragSurface();
@@ -95,7 +96,7 @@ Blockly.WorkspaceDragger.prototype.endDrag = function(currentDragDeltaXY) {
  *     moved from the position at the start of the drag, in pixel coordinates.
  * @package
  */
-Blockly.WorkspaceDragger.prototype.drag = function(currentDragDeltaXY) {
+WorkspaceDragger.prototype.drag = function(currentDragDeltaXY) {
   const newXY = Blockly.utils.Coordinate.sum(this.startScrollXY_, currentDragDeltaXY);
 
   if (this.horizontalScrollEnabled_ && this.verticalScrollEnabled_) {
@@ -108,3 +109,5 @@ Blockly.WorkspaceDragger.prototype.drag = function(currentDragDeltaXY) {
     throw new TypeError('Invalid state.');
   }
 };
+
+exports = WorkspaceDragger;
diff --git a/tests/deps.js b/tests/deps.js
index 64c88377b..bd2e81f5b 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -208,7 +208,7 @@ goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'],
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICopyable', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate']);
+goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});

From 75a98e6204042079fc32a2d8e64267677fb9940d Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:56:08 -0700
Subject: [PATCH 445/833] Migrate core/workspace_dragger.js named requires

---
 core/workspace_dragger.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/core/workspace_dragger.js b/core/workspace_dragger.js
index 90aade9f3..f936a3eb5 100644
--- a/core/workspace_dragger.js
+++ b/core/workspace_dragger.js
@@ -13,9 +13,11 @@
 goog.module('Blockly.WorkspaceDragger');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.utils.Coordinate');
-
-goog.requireType('Blockly.WorkspaceSvg');
+// TODO(#5073): Add Blockly require after fixing circular dependency.
+// goog.require('Blockly');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
@@ -24,12 +26,12 @@ goog.requireType('Blockly.WorkspaceSvg');
  * Note that the workspace itself manages whether or not it has a drag surface
  * and how to do translations based on that.  This simply passes the right
  * commands based on events.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace to drag.
+ * @param {!WorkspaceSvg} workspace The workspace to drag.
  * @constructor
  */
 const WorkspaceDragger = function(workspace) {
   /**
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @private
    */
   this.workspace_ = workspace;
@@ -51,10 +53,10 @@ const WorkspaceDragger = function(workspace) {
   /**
    * The scroll position of the workspace at the beginning of the drag.
    * Coordinate system: pixel coordinates.
-   * @type {!Blockly.utils.Coordinate}
+   * @type {!Coordinate}
    * @protected
    */
-  this.startScrollXY_ = new Blockly.utils.Coordinate(
+  this.startScrollXY_ = new Coordinate(
       workspace.scrollX, workspace.scrollY);
 };
 
@@ -80,7 +82,7 @@ WorkspaceDragger.prototype.startDrag = function() {
 
 /**
  * Finish dragging the workspace and put everything back where it belongs.
- * @param {!Blockly.utils.Coordinate} currentDragDeltaXY How far the pointer has
+ * @param {!Coordinate} currentDragDeltaXY How far the pointer has
  *     moved from the position at the start of the drag, in pixel coordinates.
  * @package
  */
@@ -92,12 +94,12 @@ WorkspaceDragger.prototype.endDrag = function(currentDragDeltaXY) {
 
 /**
  * Move the workspace based on the most recent mouse movements.
- * @param {!Blockly.utils.Coordinate} currentDragDeltaXY How far the pointer has
+ * @param {!Coordinate} currentDragDeltaXY How far the pointer has
  *     moved from the position at the start of the drag, in pixel coordinates.
  * @package
  */
 WorkspaceDragger.prototype.drag = function(currentDragDeltaXY) {
-  const newXY = Blockly.utils.Coordinate.sum(this.startScrollXY_, currentDragDeltaXY);
+  const newXY = Coordinate.sum(this.startScrollXY_, currentDragDeltaXY);
 
   if (this.horizontalScrollEnabled_ && this.verticalScrollEnabled_) {
     this.workspace_.scroll(newXY.x, newXY.y);

From b7b428919bab2b1179966dd62d2c0021213198f5 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:56:13 -0700
Subject: [PATCH 446/833] clang-format core/workspace_dragger.js

---
 core/workspace_dragger.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/workspace_dragger.js b/core/workspace_dragger.js
index f936a3eb5..0b056a3f3 100644
--- a/core/workspace_dragger.js
+++ b/core/workspace_dragger.js
@@ -56,8 +56,7 @@ const WorkspaceDragger = function(workspace) {
    * @type {!Coordinate}
    * @protected
    */
-  this.startScrollXY_ = new Coordinate(
-      workspace.scrollX, workspace.scrollY);
+  this.startScrollXY_ = new Coordinate(workspace.scrollX, workspace.scrollY);
 };
 
 /**

From 2ccf3cb17d5486531996607c29aaec3268596921 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 12:50:44 -0700
Subject: [PATCH 447/833] Migrate core/browser_events.js to ES6 const/let

---
 core/browser_events.js | 46 ++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/core/browser_events.js b/core/browser_events.js
index 3a251637b..6cc9dda80 100644
--- a/core/browser_events.js
+++ b/core/browser_events.js
@@ -47,13 +47,14 @@ Blockly.browserEvents.Data;
 Blockly.browserEvents.conditionalBind = function(
     node, name, thisObject, func, opt_noCaptureIdentifier,
     opt_noPreventDefault) {
-  var handled = false;
-  var wrapFunc = function(e) {
-    var captureIdentifier = !opt_noCaptureIdentifier;
+  const handled = false;
+  const wrapFunc = function (e) {
+    const captureIdentifier = !opt_noCaptureIdentifier;
     // Handle each touch point separately.  If the event was a mouse event, this
     // will hand back an array with one element, which we're fine handling.
-    var events = Blockly.Touch.splitEventByTouches(e);
-    for (var i = 0, event; (event = events[i]); i++) {
+    const events = Blockly.Touch.splitEventByTouches(e);
+    for (let i = 0; i < events.length; i++) {
+      const event = events[i];
       if (captureIdentifier && !Blockly.Touch.shouldHandleEvent(event)) {
         continue;
       }
@@ -67,10 +68,11 @@ Blockly.browserEvents.conditionalBind = function(
     }
   };
 
-  var bindData = [];
+  const bindData = [];
   if (Blockly.utils.global['PointerEvent'] &&
       (name in Blockly.Touch.TOUCH_MAP)) {
-    for (var i = 0, type; (type = Blockly.Touch.TOUCH_MAP[name][i]); i++) {
+    for (let i = 0; i < Blockly.Touch.TOUCH_MAP[name].length; i++) {
+      const type = Blockly.Touch.TOUCH_MAP[name][i];
       node.addEventListener(type, wrapFunc, false);
       bindData.push([node, type, wrapFunc]);
     }
@@ -80,16 +82,17 @@ Blockly.browserEvents.conditionalBind = function(
 
     // Add equivalent touch event.
     if (name in Blockly.Touch.TOUCH_MAP) {
-      var touchWrapFunc = function(e) {
+      const touchWrapFunc = function (e) {
         wrapFunc(e);
         // Calling preventDefault stops the browser from scrolling/zooming the
         // page.
-        var preventDef = !opt_noPreventDefault;
+        const preventDef = !opt_noPreventDefault;
         if (handled && preventDef) {
           e.preventDefault();
         }
       };
-      for (var i = 0, type; (type = Blockly.Touch.TOUCH_MAP[name][i]); i++) {
+      for (let i = 0; i < Blockly.Touch.TOUCH_MAP[name].length; i++) {
+        const type = Blockly.Touch.TOUCH_MAP[name][i];
         node.addEventListener(type, touchWrapFunc, false);
         bindData.push([node, type, touchWrapFunc]);
       }
@@ -113,7 +116,7 @@ Blockly.browserEvents.conditionalBind = function(
  * @public
  */
 Blockly.browserEvents.bind = function(node, name, thisObject, func) {
-  var wrapFunc = function(e) {
+  const wrapFunc = function (e) {
     if (thisObject) {
       func.call(thisObject, e);
     } else {
@@ -121,10 +124,11 @@ Blockly.browserEvents.bind = function(node, name, thisObject, func) {
     }
   };
 
-  var bindData = [];
+  const bindData = [];
   if (Blockly.utils.global['PointerEvent'] &&
       (name in Blockly.Touch.TOUCH_MAP)) {
-    for (var i = 0, type; (type = Blockly.Touch.TOUCH_MAP[name][i]); i++) {
+    for (let i = 0; i < Blockly.Touch.TOUCH_MAP[name].length; i++) {
+      const type = Blockly.Touch.TOUCH_MAP[name][i];
       node.addEventListener(type, wrapFunc, false);
       bindData.push([node, type, wrapFunc]);
     }
@@ -134,11 +138,11 @@ Blockly.browserEvents.bind = function(node, name, thisObject, func) {
 
     // Add equivalent touch event.
     if (name in Blockly.Touch.TOUCH_MAP) {
-      var touchWrapFunc = function(e) {
+      const touchWrapFunc = function (e) {
         // Punt on multitouch events.
         if (e.changedTouches && e.changedTouches.length == 1) {
           // Map the touch event's properties to the event.
-          var touchPoint = e.changedTouches[0];
+          const touchPoint = e.changedTouches[0];
           e.clientX = touchPoint.clientX;
           e.clientY = touchPoint.clientY;
         }
@@ -147,7 +151,8 @@ Blockly.browserEvents.bind = function(node, name, thisObject, func) {
         // Stop the browser from scrolling/zooming the page.
         e.preventDefault();
       };
-      for (var i = 0, type; (type = Blockly.Touch.TOUCH_MAP[name][i]); i++) {
+      for (let i = 0; i < Blockly.Touch.TOUCH_MAP[name].length; i++) {
+        const type = Blockly.Touch.TOUCH_MAP[name][i];
         node.addEventListener(type, touchWrapFunc, false);
         bindData.push([node, type, touchWrapFunc]);
       }
@@ -164,11 +169,12 @@ Blockly.browserEvents.bind = function(node, name, thisObject, func) {
  * @public
  */
 Blockly.browserEvents.unbind = function(bindData) {
+  let func;
   while (bindData.length) {
-    var bindDatum = bindData.pop();
-    var node = bindDatum[0];
-    var name = bindDatum[1];
-    var func = bindDatum[2];
+    const bindDatum = bindData.pop();
+    const node = bindDatum[0];
+    const name = bindDatum[1];
+    func = bindDatum[2];
     node.removeEventListener(name, func, false);
   }
   return func;

From b28591fa5f3ff3962f807f08ede151401852d4af Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 12:50:58 -0700
Subject: [PATCH 448/833] Migrate core/browser_events.js to goog.module

---
 core/browser_events.js | 27 ++++++++++++++++-----------
 tests/deps.js          |  2 +-
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/core/browser_events.js b/core/browser_events.js
index 6cc9dda80..9134cc57e 100644
--- a/core/browser_events.js
+++ b/core/browser_events.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.browserEvents');
+goog.module('Blockly.browserEvents');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils.global');
@@ -18,11 +19,12 @@ goog.require('Blockly.utils.global');
 
 /**
  * Blockly opaque event data used to unbind events when using
- * `Blockly.browserEvents.bind` and
- * `Blockly.browserEvents.conditionalBind`.
+ * `bind` and
+ * `conditionalBind`.
  * @typedef {!Array<!Array>}
  */
-Blockly.browserEvents.Data;
+let Data;
+exports.Data = Data;
 
 /**
  * Bind an event handler that can be ignored if it is not part of the active
@@ -40,14 +42,14 @@ Blockly.browserEvents.Data;
  *     should prevent the default handler.  False by default.  If
  *     opt_noPreventDefault is provided, opt_noCaptureIdentifier must also be
  *     provided.
- * @return {!Blockly.browserEvents.Data} Opaque data that can be passed to
+ * @return {!Data} Opaque data that can be passed to
  *     unbindEvent_.
  * @public
  */
-Blockly.browserEvents.conditionalBind = function(
+const conditionalBind = function(
     node, name, thisObject, func, opt_noCaptureIdentifier,
     opt_noPreventDefault) {
-  const handled = false;
+  let handled = false;
   const wrapFunc = function (e) {
     const captureIdentifier = !opt_noCaptureIdentifier;
     // Handle each touch point separately.  If the event was a mouse event, this
@@ -100,6 +102,7 @@ Blockly.browserEvents.conditionalBind = function(
   }
   return bindData;
 };
+exports.conditionalBind = conditionalBind;
 
 
 /**
@@ -111,11 +114,11 @@ Blockly.browserEvents.conditionalBind = function(
  * @param {string} name Event name to listen to (e.g. 'mousedown').
  * @param {?Object} thisObject The value of 'this' in the function.
  * @param {!Function} func Function to call when event is triggered.
- * @return {!Blockly.browserEvents.Data} Opaque data that can be passed to
+ * @return {!Data} Opaque data that can be passed to
  *     unbindEvent_.
  * @public
  */
-Blockly.browserEvents.bind = function(node, name, thisObject, func) {
+const bind = function(node, name, thisObject, func) {
   const wrapFunc = function (e) {
     if (thisObject) {
       func.call(thisObject, e);
@@ -160,15 +163,16 @@ Blockly.browserEvents.bind = function(node, name, thisObject, func) {
   }
   return bindData;
 };
+exports.bind = bind;
 
 /**
  * Unbind one or more events event from a function call.
- * @param {!Blockly.browserEvents.Data} bindData Opaque data from bindEvent_.
+ * @param {!Data} bindData Opaque data from bindEvent_.
  *     This list is emptied during the course of calling this function.
  * @return {!Function} The function call.
  * @public
  */
-Blockly.browserEvents.unbind = function(bindData) {
+const unbind = function(bindData) {
   let func;
   while (bindData.length) {
     const bindDatum = bindData.pop();
@@ -179,3 +183,4 @@ Blockly.browserEvents.unbind = function(bindData) {
   }
   return func;
 };
+exports.unbind = unbind;
diff --git a/tests/deps.js b/tests/deps.js
index bd2e81f5b..abf82c44d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -14,7 +14,7 @@ goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Bl
 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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', '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']);
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global']);
+goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});

From bd5c6864d6ccaf360e5ca5031b42c239f93a8351 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 12:57:24 -0700
Subject: [PATCH 449/833] Migrate core/browser_events.js named requires

---
 core/browser_events.js | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/core/browser_events.js b/core/browser_events.js
index 9134cc57e..c5168a707 100644
--- a/core/browser_events.js
+++ b/core/browser_events.js
@@ -13,8 +13,8 @@
 goog.module('Blockly.browserEvents');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Touch');
-goog.require('Blockly.utils.global');
+const Touch = goog.require('Blockly.Touch');
+const global = goog.require('Blockly.utils.global');
 
 
 /**
@@ -54,13 +54,13 @@ const conditionalBind = function(
     const captureIdentifier = !opt_noCaptureIdentifier;
     // Handle each touch point separately.  If the event was a mouse event, this
     // will hand back an array with one element, which we're fine handling.
-    const events = Blockly.Touch.splitEventByTouches(e);
+    const events = Touch.splitEventByTouches(e);
     for (let i = 0; i < events.length; i++) {
       const event = events[i];
-      if (captureIdentifier && !Blockly.Touch.shouldHandleEvent(event)) {
+      if (captureIdentifier && !Touch.shouldHandleEvent(event)) {
         continue;
       }
-      Blockly.Touch.setClientFromTouch(event);
+      Touch.setClientFromTouch(event);
       if (thisObject) {
         func.call(thisObject, event);
       } else {
@@ -71,10 +71,10 @@ const conditionalBind = function(
   };
 
   const bindData = [];
-  if (Blockly.utils.global['PointerEvent'] &&
-      (name in Blockly.Touch.TOUCH_MAP)) {
-    for (let i = 0; i < Blockly.Touch.TOUCH_MAP[name].length; i++) {
-      const type = Blockly.Touch.TOUCH_MAP[name][i];
+  if (global['PointerEvent'] &&
+      (name in Touch.TOUCH_MAP)) {
+    for (let i = 0; i < Touch.TOUCH_MAP[name].length; i++) {
+      const type = Touch.TOUCH_MAP[name][i];
       node.addEventListener(type, wrapFunc, false);
       bindData.push([node, type, wrapFunc]);
     }
@@ -83,7 +83,7 @@ const conditionalBind = function(
     bindData.push([node, name, wrapFunc]);
 
     // Add equivalent touch event.
-    if (name in Blockly.Touch.TOUCH_MAP) {
+    if (name in Touch.TOUCH_MAP) {
       const touchWrapFunc = function (e) {
         wrapFunc(e);
         // Calling preventDefault stops the browser from scrolling/zooming the
@@ -93,8 +93,8 @@ const conditionalBind = function(
           e.preventDefault();
         }
       };
-      for (let i = 0; i < Blockly.Touch.TOUCH_MAP[name].length; i++) {
-        const type = Blockly.Touch.TOUCH_MAP[name][i];
+      for (let i = 0; i < Touch.TOUCH_MAP[name].length; i++) {
+        const type = Touch.TOUCH_MAP[name][i];
         node.addEventListener(type, touchWrapFunc, false);
         bindData.push([node, type, touchWrapFunc]);
       }
@@ -128,10 +128,10 @@ const bind = function(node, name, thisObject, func) {
   };
 
   const bindData = [];
-  if (Blockly.utils.global['PointerEvent'] &&
-      (name in Blockly.Touch.TOUCH_MAP)) {
-    for (let i = 0; i < Blockly.Touch.TOUCH_MAP[name].length; i++) {
-      const type = Blockly.Touch.TOUCH_MAP[name][i];
+  if (global['PointerEvent'] &&
+      (name in Touch.TOUCH_MAP)) {
+    for (let i = 0; i < Touch.TOUCH_MAP[name].length; i++) {
+      const type = Touch.TOUCH_MAP[name][i];
       node.addEventListener(type, wrapFunc, false);
       bindData.push([node, type, wrapFunc]);
     }
@@ -140,7 +140,7 @@ const bind = function(node, name, thisObject, func) {
     bindData.push([node, name, wrapFunc]);
 
     // Add equivalent touch event.
-    if (name in Blockly.Touch.TOUCH_MAP) {
+    if (name in Touch.TOUCH_MAP) {
       const touchWrapFunc = function (e) {
         // Punt on multitouch events.
         if (e.changedTouches && e.changedTouches.length == 1) {
@@ -154,8 +154,8 @@ const bind = function(node, name, thisObject, func) {
         // Stop the browser from scrolling/zooming the page.
         e.preventDefault();
       };
-      for (let i = 0; i < Blockly.Touch.TOUCH_MAP[name].length; i++) {
-        const type = Blockly.Touch.TOUCH_MAP[name][i];
+      for (let i = 0; i < Touch.TOUCH_MAP[name].length; i++) {
+        const type = Touch.TOUCH_MAP[name][i];
         node.addEventListener(type, touchWrapFunc, false);
         bindData.push([node, type, touchWrapFunc]);
       }

From 96f8b1d482749296c0864393b8a18185eb4fe446 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 12:57:34 -0700
Subject: [PATCH 450/833] clang-format core/browser_events.js

---
 core/browser_events.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/core/browser_events.js b/core/browser_events.js
index c5168a707..91e84f914 100644
--- a/core/browser_events.js
+++ b/core/browser_events.js
@@ -50,7 +50,7 @@ const conditionalBind = function(
     node, name, thisObject, func, opt_noCaptureIdentifier,
     opt_noPreventDefault) {
   let handled = false;
-  const wrapFunc = function (e) {
+  const wrapFunc = function(e) {
     const captureIdentifier = !opt_noCaptureIdentifier;
     // Handle each touch point separately.  If the event was a mouse event, this
     // will hand back an array with one element, which we're fine handling.
@@ -71,8 +71,7 @@ const conditionalBind = function(
   };
 
   const bindData = [];
-  if (global['PointerEvent'] &&
-      (name in Touch.TOUCH_MAP)) {
+  if (global['PointerEvent'] && (name in Touch.TOUCH_MAP)) {
     for (let i = 0; i < Touch.TOUCH_MAP[name].length; i++) {
       const type = Touch.TOUCH_MAP[name][i];
       node.addEventListener(type, wrapFunc, false);
@@ -84,7 +83,7 @@ const conditionalBind = function(
 
     // Add equivalent touch event.
     if (name in Touch.TOUCH_MAP) {
-      const touchWrapFunc = function (e) {
+      const touchWrapFunc = function(e) {
         wrapFunc(e);
         // Calling preventDefault stops the browser from scrolling/zooming the
         // page.
@@ -119,7 +118,7 @@ exports.conditionalBind = conditionalBind;
  * @public
  */
 const bind = function(node, name, thisObject, func) {
-  const wrapFunc = function (e) {
+  const wrapFunc = function(e) {
     if (thisObject) {
       func.call(thisObject, e);
     } else {
@@ -128,8 +127,7 @@ const bind = function(node, name, thisObject, func) {
   };
 
   const bindData = [];
-  if (global['PointerEvent'] &&
-      (name in Touch.TOUCH_MAP)) {
+  if (global['PointerEvent'] && (name in Touch.TOUCH_MAP)) {
     for (let i = 0; i < Touch.TOUCH_MAP[name].length; i++) {
       const type = Touch.TOUCH_MAP[name][i];
       node.addEventListener(type, wrapFunc, false);
@@ -141,7 +139,7 @@ const bind = function(node, name, thisObject, func) {
 
     // Add equivalent touch event.
     if (name in Touch.TOUCH_MAP) {
-      const touchWrapFunc = function (e) {
+      const touchWrapFunc = function(e) {
         // Punt on multitouch events.
         if (e.changedTouches && e.changedTouches.length == 1) {
           // Map the touch event's properties to the event.

From 2d6ec617fe6bb1ca41e72e1147caaa91cbce0d0b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 30 Jul 2021 15:27:12 -0700
Subject: [PATCH 451/833] Address PR comments

---
 core/browser_events.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/core/browser_events.js b/core/browser_events.js
index 91e84f914..b7ce3a61e 100644
--- a/core/browser_events.js
+++ b/core/browser_events.js
@@ -19,8 +19,7 @@ const global = goog.require('Blockly.utils.global');
 
 /**
  * Blockly opaque event data used to unbind events when using
- * `bind` and
- * `conditionalBind`.
+ * `bind` and `conditionalBind`.
  * @typedef {!Array<!Array>}
  */
 let Data;
@@ -44,7 +43,6 @@ exports.Data = Data;
  *     provided.
  * @return {!Data} Opaque data that can be passed to
  *     unbindEvent_.
- * @public
  */
 const conditionalBind = function(
     node, name, thisObject, func, opt_noCaptureIdentifier,
@@ -115,7 +113,6 @@ exports.conditionalBind = conditionalBind;
  * @param {!Function} func Function to call when event is triggered.
  * @return {!Data} Opaque data that can be passed to
  *     unbindEvent_.
- * @public
  */
 const bind = function(node, name, thisObject, func) {
   const wrapFunc = function(e) {
@@ -168,7 +165,6 @@ exports.bind = bind;
  * @param {!Data} bindData Opaque data from bindEvent_.
  *     This list is emptied during the course of calling this function.
  * @return {!Function} The function call.
- * @public
  */
 const unbind = function(bindData) {
   let func;

From 8f54b7832f92c3792ecee529d3ff459978e1f881 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 20 Jul 2021 17:04:30 -0700
Subject: [PATCH 452/833] Migrate core/contextmenu_items.js to ES6 const/let

---
 core/contextmenu_items.js | 245 ++++++++++++++++++++++----------------
 1 file changed, 144 insertions(+), 101 deletions(-)

diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js
index e985a8e5c..10eee45c7 100644
--- a/core/contextmenu_items.js
+++ b/core/contextmenu_items.js
@@ -28,17 +28,19 @@ goog.requireType('Blockly.BlockSvg');
 /** Option to undo previous action. */
 Blockly.ContextMenuItems.registerUndo = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var undoOption = {
-    displayText: function() {
+  const undoOption = {
+    displayText: function () {
       return Blockly.Msg['UNDO'];
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (scope.workspace.getUndoStack().length > 0) {
         return 'enabled';
       }
       return 'disabled';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       scope.workspace.undo(false);
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
@@ -51,15 +53,19 @@ Blockly.ContextMenuItems.registerUndo = function() {
 /** Option to redo previous action. */
 Blockly.ContextMenuItems.registerRedo = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var redoOption = {
-    displayText: function() { return Blockly.Msg['REDO']; },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+  const redoOption = {
+    displayText: function () {
+      return Blockly.Msg['REDO'];
+    },
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (scope.workspace.getRedoStack().length > 0) {
         return 'enabled';
       }
       return 'disabled';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       scope.workspace.undo(true);
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
@@ -72,11 +78,12 @@ Blockly.ContextMenuItems.registerRedo = function() {
 /** Option to clean up blocks. */
 Blockly.ContextMenuItems.registerCleanup = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var cleanOption = {
-    displayText: function() {
+  const cleanOption = {
+    displayText: function () {
       return Blockly.Msg['CLEAN_UP'];
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (scope.workspace.isMovable()) {
         if (scope.workspace.getTopBlocks(false).length > 1) {
           return 'enabled';
@@ -85,7 +92,8 @@ Blockly.ContextMenuItems.registerCleanup = function() {
       }
       return 'hidden';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       scope.workspace.cleanUp();
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
@@ -102,10 +110,10 @@ Blockly.ContextMenuItems.registerCleanup = function() {
  * @private
  */
 Blockly.ContextMenuItems.toggleOption_ = function(shouldCollapse, topBlocks) {
-  var DELAY = 10;
-  var ms = 0;
-  for (var i = 0; i < topBlocks.length; i++) {
-    var block = topBlocks[i];
+  const DELAY = 10;
+  let ms = 0;
+  for (let i = 0; i < topBlocks.length; i++) {
+    let block = topBlocks[i];
     while (block) {
       setTimeout(block.setCollapsed.bind(block, shouldCollapse), ms);
       block = block.getNextBlock();
@@ -117,15 +125,16 @@ Blockly.ContextMenuItems.toggleOption_ = function(shouldCollapse, topBlocks) {
 /** Option to collapse all blocks. */
 Blockly.ContextMenuItems.registerCollapse = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var collapseOption = {
-    displayText:  function() {
+  const collapseOption = {
+    displayText: function () {
       return Blockly.Msg['COLLAPSE_ALL'];
     },
-    preconditionFn:  function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (scope.workspace.options.collapse) {
-        var topBlocks = scope.workspace.getTopBlocks(false);
-        for (var i = 0; i < topBlocks.length; i++) {
-          var block = topBlocks[i];
+        const topBlocks = scope.workspace.getTopBlocks(false);
+        for (let i = 0; i < topBlocks.length; i++) {
+          let block = topBlocks[i];
           while (block) {
             if (!block.isCollapsed()) {
               return 'enabled';
@@ -137,12 +146,14 @@ Blockly.ContextMenuItems.registerCollapse = function() {
       }
       return 'hidden';
     },
-    callback:  function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      Blockly.ContextMenuItems.toggleOption_(true, scope.workspace.getTopBlocks(true));
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      Blockly.ContextMenuItems.toggleOption_(true,
+          scope.workspace.getTopBlocks(true));
     },
-    scopeType:  Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
-    id:  'collapseWorkspace',
-    weight:  4,
+    scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
+    id: 'collapseWorkspace',
+    weight: 4,
   };
   Blockly.ContextMenuRegistry.registry.register(collapseOption);
 };
@@ -150,15 +161,16 @@ Blockly.ContextMenuItems.registerCollapse = function() {
 /** Option to expand all blocks. */
 Blockly.ContextMenuItems.registerExpand = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var expandOption = {
-    displayText: function() {
+  const expandOption = {
+    displayText: function () {
       return Blockly.Msg['EXPAND_ALL'];
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (scope.workspace.options.collapse) {
-        var topBlocks = scope.workspace.getTopBlocks(false);
-        for (var i = 0; i < topBlocks.length; i++) {
-          var block = topBlocks[i];
+        const topBlocks = scope.workspace.getTopBlocks(false);
+        for (let i = 0; i < topBlocks.length; i++) {
+          let block = topBlocks[i];
           while (block) {
             if (block.isCollapsed()) {
               return 'enabled';
@@ -170,8 +182,10 @@ Blockly.ContextMenuItems.registerExpand = function() {
       }
       return 'hidden';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      Blockly.ContextMenuItems.toggleOption_(false, scope.workspace.getTopBlocks(true));
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      Blockly.ContextMenuItems.toggleOption_(false,
+          scope.workspace.getTopBlocks(true));
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
     id: 'expandWorkspace',
@@ -191,9 +205,9 @@ Blockly.ContextMenuItems.addDeletableBlocks_ = function(block, deleteList) {
   if (block.isDeletable()) {
     Array.prototype.push.apply(deleteList, block.getDescendants(false));
   } else {
-    var children =  /* eslint-disable-next-line indent */
+    const children =  /* eslint-disable-next-line indent */
         /** @type {!Array<!Blockly.BlockSvg>} */ (block.getChildren(false));
-    for (var i = 0; i < children.length; i++) {
+    for (let i = 0; i < children.length; i++) {
       Blockly.ContextMenuItems.addDeletableBlocks_(children[i], deleteList);
     }
   }
@@ -206,9 +220,9 @@ Blockly.ContextMenuItems.addDeletableBlocks_ = function(block, deleteList) {
  * @private
  */
 Blockly.ContextMenuItems.getDeletableBlocks_ = function(workspace) {
-  var deleteList = [];
-  var topBlocks = workspace.getTopBlocks(true);
-  for (var i = 0; i < topBlocks.length; i++) {
+  const deleteList = [];
+  const topBlocks = workspace.getTopBlocks(true);
+  for (let i = 0; i < topBlocks.length; i++) {
     Blockly.ContextMenuItems.addDeletableBlocks_(topBlocks[i], deleteList);
   }
   return deleteList;
@@ -220,9 +234,9 @@ Blockly.ContextMenuItems.getDeletableBlocks_ = function(workspace) {
  * @private
  */
 Blockly.ContextMenuItems.deleteNext_ = function(deleteList, eventGroup) {
-  var DELAY = 10;
+  const DELAY = 10;
   Blockly.Events.setGroup(eventGroup);
-  var block = deleteList.shift();
+  const block = deleteList.shift();
   if (block) {
     if (block.workspace) {
       block.dispose(false, true);
@@ -237,42 +251,49 @@ Blockly.ContextMenuItems.deleteNext_ = function(deleteList, eventGroup) {
 /** Option to delete all blocks. */
 Blockly.ContextMenuItems.registerDeleteAll = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var deleteOption = {
-    displayText: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+  const deleteOption = {
+    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (!scope.workspace) {
         return;
       }
-      var deletableBlocksLength =
+      const deletableBlocksLength =
           Blockly.ContextMenuItems.getDeletableBlocks_(scope.workspace).length;
       if (deletableBlocksLength == 1) {
         return Blockly.Msg['DELETE_BLOCK'];
       } else {
-        return Blockly.Msg['DELETE_X_BLOCKS'].replace('%1', String(deletableBlocksLength));
+        return Blockly.Msg['DELETE_X_BLOCKS'].replace('%1',
+            String(deletableBlocksLength));
       }
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (!scope.workspace) {
         return;
       }
-      var deletableBlocksLength =
-         Blockly.ContextMenuItems.getDeletableBlocks_(scope.workspace).length;
+      const deletableBlocksLength =
+          Blockly.ContextMenuItems.getDeletableBlocks_(scope.workspace).length;
       return deletableBlocksLength > 0 ? 'enabled' : 'disabled';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (!scope.workspace) {
         return;
       }
       scope.workspace.cancelCurrentGesture();
-      var deletableBlocks = Blockly.ContextMenuItems.getDeletableBlocks_(scope.workspace);
-      var eventGroup = Blockly.utils.genUid();
+      const deletableBlocks = Blockly.ContextMenuItems.getDeletableBlocks_(
+          scope.workspace);
+      const eventGroup = Blockly.utils.genUid();
       if (deletableBlocks.length < 2) {
         Blockly.ContextMenuItems.deleteNext_(deletableBlocks, eventGroup);
       } else {
         Blockly.confirm(
-            Blockly.Msg['DELETE_ALL_BLOCKS'].replace('%1', deletableBlocks.length),
-            function(ok) {
+            Blockly.Msg['DELETE_ALL_BLOCKS'].replace('%1',
+                deletableBlocks.length),
+            function (ok) {
               if (ok) {
-                Blockly.ContextMenuItems.deleteNext_(deletableBlocks, eventGroup);
+                Blockly.ContextMenuItems.deleteNext_(deletableBlocks,
+                    eventGroup);
               }
             });
       }
@@ -300,12 +321,13 @@ Blockly.ContextMenuItems.registerWorkspaceOptions_ = function() {
 /** Option to duplicate a block. */
 Blockly.ContextMenuItems.registerDuplicate = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var duplicateOption = {
-    displayText: function() {
+  const duplicateOption = {
+    displayText: function () {
       return Blockly.Msg['DUPLICATE_BLOCK'];
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      var block = scope.block;
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      const block = scope.block;
       if (!block.isInFlyout && block.isDeletable() && block.isMovable()) {
         if (block.isDuplicatable()) {
           return 'enabled';
@@ -314,7 +336,8 @@ Blockly.ContextMenuItems.registerDuplicate = function() {
       }
       return 'hidden';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (scope.block) {
         Blockly.clipboard.duplicate(scope.block);
       }
@@ -329,8 +352,9 @@ Blockly.ContextMenuItems.registerDuplicate = function() {
 /** Option to add or remove block-level comment. */
 Blockly.ContextMenuItems.registerComment = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var commentOption = {
-    displayText: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+  const commentOption = {
+    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (scope.block.getCommentIcon()) {
         // If there's already a comment,  option is to remove.
         return Blockly.Msg['REMOVE_COMMENT'];
@@ -338,17 +362,20 @@ Blockly.ContextMenuItems.registerComment = function() {
       // If there's no comment yet, option is to add.
       return Blockly.Msg['ADD_COMMENT'];
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      var block = scope.block;
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      const block = scope.block;
       // IE doesn't support necessary features for comment editing.
-      if (!Blockly.utils.userAgent.IE && !block.isInFlyout && block.workspace.options.comments &&
-        !block.isCollapsed() && block.isEditable()) {
+      if (!Blockly.utils.userAgent.IE && !block.isInFlyout
+          && block.workspace.options.comments &&
+          !block.isCollapsed() && block.isEditable()) {
         return 'enabled';
       }
       return 'hidden';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      var block = scope.block;
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      const block = scope.block;
       if (block.getCommentIcon()) {
         block.setCommentText(null);
       } else {
@@ -365,15 +392,17 @@ Blockly.ContextMenuItems.registerComment = function() {
 /** Option to inline variables. */
 Blockly.ContextMenuItems.registerInline = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var inlineOption = {
-    displayText: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+  const inlineOption = {
+    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       return (scope.block.getInputsInline()) ?
           Blockly.Msg['EXTERNAL_INPUTS'] : Blockly.Msg['INLINE_INPUTS'];
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      var block = scope.block;
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      const block = scope.block;
       if (!block.isInFlyout && block.isMovable() && !block.isCollapsed()) {
-        for (var i = 1; i < block.inputList.length; i++) {
+        for (let i = 1; i < block.inputList.length; i++) {
           // Only display this option if there are two value or dummy inputs next to each other.
           if (block.inputList[i - 1].type != Blockly.inputTypes.STATEMENT &&
               block.inputList[i].type != Blockly.inputTypes.STATEMENT) {
@@ -383,7 +412,8 @@ Blockly.ContextMenuItems.registerInline = function() {
       }
       return 'hidden';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       scope.block.setInputsInline(!scope.block.getInputsInline());
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
@@ -396,19 +426,23 @@ Blockly.ContextMenuItems.registerInline = function() {
 /** Option to collapse or expand a block. */
 Blockly.ContextMenuItems.registerCollapseExpandBlock = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var collapseExpandOption = {
-    displayText: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+  const collapseExpandOption = {
+    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       return scope.block.isCollapsed() ?
           Blockly.Msg['EXPAND_BLOCK'] : Blockly.Msg['COLLAPSE_BLOCK'];
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      var block = scope.block;
-      if (!block.isInFlyout && block.isMovable() && block.workspace.options.collapse) {
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      const block = scope.block;
+      if (!block.isInFlyout && block.isMovable()
+          && block.workspace.options.collapse) {
         return 'enabled';
       }
       return 'hidden';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       scope.block.setCollapsed(!scope.block.isCollapsed());
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
@@ -421,14 +455,17 @@ Blockly.ContextMenuItems.registerCollapseExpandBlock = function() {
 /** Option to disable or enable a block. */
 Blockly.ContextMenuItems.registerDisable = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var disableOption = {
-    displayText: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+  const disableOption = {
+    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       return (scope.block.isEnabled()) ?
           Blockly.Msg['DISABLE_BLOCK'] : Blockly.Msg['ENABLE_BLOCK'];
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      var block = scope.block;
-      if (!block.isInFlyout && block.workspace.options.disable && block.isEditable()) {
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      const block = scope.block;
+      if (!block.isInFlyout && block.workspace.options.disable
+          && block.isEditable()) {
         if (block.getInheritedDisabled()) {
           return 'disabled';
         }
@@ -436,9 +473,10 @@ Blockly.ContextMenuItems.registerDisable = function() {
       }
       return 'hidden';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      var block = scope.block;
-      var group = Blockly.Events.getGroup();
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      const block = scope.block;
+      const group = Blockly.Events.getGroup();
       if (!group) {
         Blockly.Events.setGroup(true);
       }
@@ -457,12 +495,13 @@ Blockly.ContextMenuItems.registerDisable = function() {
 /** Option to delete a block. */
 Blockly.ContextMenuItems.registerDelete = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var deleteOption = {
-    displayText: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      var block = scope.block;
+  const deleteOption = {
+    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      const block = scope.block;
       // Count the number of blocks that are nested in this block.
-      var descendantCount = block.getDescendants(false).length;
-      var nextBlock = block.getNextBlock();
+      let descendantCount = block.getDescendants(false).length;
+      const nextBlock = block.getNextBlock();
       if (nextBlock) {
         // Blocks in the current stack would survive this block's deletion.
         descendantCount -= nextBlock.getDescendants(false).length;
@@ -470,13 +509,15 @@ Blockly.ContextMenuItems.registerDelete = function() {
       return (descendantCount == 1) ? Blockly.Msg['DELETE_BLOCK'] :
           Blockly.Msg['DELETE_X_BLOCKS'].replace('%1', String(descendantCount));
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (!scope.block.isInFlyout && scope.block.isDeletable()) {
         return 'enabled';
       }
       return 'hidden';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       Blockly.Events.setGroup(true);
       if (scope.block) {
         Blockly.deleteBlock(scope.block);
@@ -493,20 +534,22 @@ Blockly.ContextMenuItems.registerDelete = function() {
 /** Option to open help for a block. */
 Blockly.ContextMenuItems.registerHelp = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var helpOption = {
-    displayText: function() {
+  const helpOption = {
+    displayText: function () {
       return Blockly.Msg['HELP'];
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      var block = scope.block;
-      var url = (typeof block.helpUrl == 'function') ?
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      const block = scope.block;
+      const url = (typeof block.helpUrl == 'function') ?
           block.helpUrl() : block.helpUrl;
       if (url) {
         return 'enabled';
       }
       return 'hidden';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       scope.block.showHelp();
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,

From 246bacd11703ee9fe275c95d058060099b111ab3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 20 Jul 2021 17:05:08 -0700
Subject: [PATCH 453/833] Migrate core/contextmenu_items.js to goog.module

---
 core/contextmenu_items.js | 120 ++++++++++++++++++++++----------------
 tests/deps.js             |   2 +-
 2 files changed, 70 insertions(+), 52 deletions(-)

diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js
index 10eee45c7..c894c989a 100644
--- a/core/contextmenu_items.js
+++ b/core/contextmenu_items.js
@@ -14,19 +14,23 @@
  * @name Blockly.ContextMenuItems
  * @namespace
  */
-goog.provide('Blockly.ContextMenuItems');
+goog.module('Blockly.ContextMenuItems');
+goog.module.declareLegacyNamespace();
+
+goog.require('Blockly');
 goog.require('Blockly.clipboard');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.ContextMenuRegistry');
 goog.require('Blockly.Events');
 goog.require('Blockly.inputTypes');
-
+goog.require('Blockly.Msg');
+goog.require('Blockly.utils');
+goog.require('Blockly.utils.userAgent');
+goog.requireType('Blockly.WorkspaceSvg');
 goog.requireType('Blockly.BlockSvg');
 
 
 /** Option to undo previous action. */
-Blockly.ContextMenuItems.registerUndo = function() {
+const registerUndo = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const undoOption = {
     displayText: function () {
@@ -49,9 +53,10 @@ Blockly.ContextMenuItems.registerUndo = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(undoOption);
 };
+exports.registerUndo = registerUndo;
 
 /** Option to redo previous action. */
-Blockly.ContextMenuItems.registerRedo = function() {
+const registerRedo = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const redoOption = {
     displayText: function () {
@@ -74,9 +79,10 @@ Blockly.ContextMenuItems.registerRedo = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(redoOption);
 };
+exports.registerRedo = registerRedo;
 
 /** Option to clean up blocks. */
-Blockly.ContextMenuItems.registerCleanup = function() {
+const registerCleanup = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const cleanOption = {
     displayText: function () {
@@ -102,6 +108,7 @@ Blockly.ContextMenuItems.registerCleanup = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(cleanOption);
 };
+exports.registerCleanup = registerCleanup;
 
 /**
  * Creates a callback to collapse or expand top blocks.
@@ -109,7 +116,7 @@ Blockly.ContextMenuItems.registerCleanup = function() {
  * @param {!Array<Blockly.BlockSvg>} topBlocks Top blocks in the workspace.
  * @private
  */
-Blockly.ContextMenuItems.toggleOption_ = function(shouldCollapse, topBlocks) {
+const toggleOption_ = function(shouldCollapse, topBlocks) {
   const DELAY = 10;
   let ms = 0;
   for (let i = 0; i < topBlocks.length; i++) {
@@ -123,7 +130,7 @@ Blockly.ContextMenuItems.toggleOption_ = function(shouldCollapse, topBlocks) {
 };
 
 /** Option to collapse all blocks. */
-Blockly.ContextMenuItems.registerCollapse = function() {
+const registerCollapse = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const collapseOption = {
     displayText: function () {
@@ -148,7 +155,7 @@ Blockly.ContextMenuItems.registerCollapse = function() {
     },
     callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
         scope) {
-      Blockly.ContextMenuItems.toggleOption_(true,
+      toggleOption_(true,
           scope.workspace.getTopBlocks(true));
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
@@ -157,9 +164,10 @@ Blockly.ContextMenuItems.registerCollapse = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(collapseOption);
 };
+exports.registerCollapse = registerCollapse;
 
 /** Option to expand all blocks. */
-Blockly.ContextMenuItems.registerExpand = function() {
+const registerExpand = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const expandOption = {
     displayText: function () {
@@ -184,7 +192,7 @@ Blockly.ContextMenuItems.registerExpand = function() {
     },
     callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
         scope) {
-      Blockly.ContextMenuItems.toggleOption_(false,
+      toggleOption_(false,
           scope.workspace.getTopBlocks(true));
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
@@ -193,6 +201,7 @@ Blockly.ContextMenuItems.registerExpand = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(expandOption);
 };
+exports.registerExpand = registerExpand;
 
 /**
  * Adds a block and its children to a list of deletable blocks.
@@ -201,14 +210,14 @@ Blockly.ContextMenuItems.registerExpand = function() {
  *    modifed in place with the given block and its descendants.
  * @private
  */
-Blockly.ContextMenuItems.addDeletableBlocks_ = function(block, deleteList) {
+const addDeletableBlocks_ = function(block, deleteList) {
   if (block.isDeletable()) {
     Array.prototype.push.apply(deleteList, block.getDescendants(false));
   } else {
     const children =  /* eslint-disable-next-line indent */
         /** @type {!Array<!Blockly.BlockSvg>} */ (block.getChildren(false));
     for (let i = 0; i < children.length; i++) {
-      Blockly.ContextMenuItems.addDeletableBlocks_(children[i], deleteList);
+      addDeletableBlocks_(children[i], deleteList);
     }
   }
 };
@@ -219,11 +228,11 @@ Blockly.ContextMenuItems.addDeletableBlocks_ = function(block, deleteList) {
  * @return {!Array<!Blockly.BlockSvg>} list of blocks to delete.
  * @private
  */
-Blockly.ContextMenuItems.getDeletableBlocks_ = function(workspace) {
+const getDeletableBlocks_ = function(workspace) {
   const deleteList = [];
   const topBlocks = workspace.getTopBlocks(true);
   for (let i = 0; i < topBlocks.length; i++) {
-    Blockly.ContextMenuItems.addDeletableBlocks_(topBlocks[i], deleteList);
+    addDeletableBlocks_(topBlocks[i], deleteList);
   }
   return deleteList;
 };
@@ -233,23 +242,23 @@ Blockly.ContextMenuItems.getDeletableBlocks_ = function(workspace) {
  * @param {string} eventGroup event group ID with which all delete events should be associated.
  * @private
  */
-Blockly.ContextMenuItems.deleteNext_ = function(deleteList, eventGroup) {
+const deleteNext_ = function(deleteList, eventGroup) {
   const DELAY = 10;
   Blockly.Events.setGroup(eventGroup);
   const block = deleteList.shift();
   if (block) {
     if (block.workspace) {
       block.dispose(false, true);
-      setTimeout(Blockly.ContextMenuItems.deleteNext_, DELAY, deleteList, eventGroup);
+      setTimeout(deleteNext_, DELAY, deleteList, eventGroup);
     } else {
-      Blockly.ContextMenuItems.deleteNext_(deleteList, eventGroup);
+      deleteNext_(deleteList, eventGroup);
     }
   }
   Blockly.Events.setGroup(false);
 };
 
 /** Option to delete all blocks. */
-Blockly.ContextMenuItems.registerDeleteAll = function() {
+const registerDeleteAll = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const deleteOption = {
     displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
@@ -258,7 +267,7 @@ Blockly.ContextMenuItems.registerDeleteAll = function() {
         return;
       }
       const deletableBlocksLength =
-          Blockly.ContextMenuItems.getDeletableBlocks_(scope.workspace).length;
+          getDeletableBlocks_(scope.workspace).length;
       if (deletableBlocksLength == 1) {
         return Blockly.Msg['DELETE_BLOCK'];
       } else {
@@ -272,7 +281,7 @@ Blockly.ContextMenuItems.registerDeleteAll = function() {
         return;
       }
       const deletableBlocksLength =
-          Blockly.ContextMenuItems.getDeletableBlocks_(scope.workspace).length;
+          getDeletableBlocks_(scope.workspace).length;
       return deletableBlocksLength > 0 ? 'enabled' : 'disabled';
     },
     callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
@@ -281,18 +290,18 @@ Blockly.ContextMenuItems.registerDeleteAll = function() {
         return;
       }
       scope.workspace.cancelCurrentGesture();
-      const deletableBlocks = Blockly.ContextMenuItems.getDeletableBlocks_(
+      const deletableBlocks = getDeletableBlocks_(
           scope.workspace);
       const eventGroup = Blockly.utils.genUid();
       if (deletableBlocks.length < 2) {
-        Blockly.ContextMenuItems.deleteNext_(deletableBlocks, eventGroup);
+        deleteNext_(deletableBlocks, eventGroup);
       } else {
         Blockly.confirm(
             Blockly.Msg['DELETE_ALL_BLOCKS'].replace('%1',
                 deletableBlocks.length),
             function (ok) {
               if (ok) {
-                Blockly.ContextMenuItems.deleteNext_(deletableBlocks,
+                deleteNext_(deletableBlocks,
                     eventGroup);
               }
             });
@@ -304,22 +313,23 @@ Blockly.ContextMenuItems.registerDeleteAll = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(deleteOption);
 };
+exports.registerDeleteAll = registerDeleteAll;
 
 /**
  * Registers all workspace-scoped context menu items.
  * @private
  */
-Blockly.ContextMenuItems.registerWorkspaceOptions_ = function() {
-  Blockly.ContextMenuItems.registerUndo();
-  Blockly.ContextMenuItems.registerRedo();
-  Blockly.ContextMenuItems.registerCleanup();
-  Blockly.ContextMenuItems.registerCollapse();
-  Blockly.ContextMenuItems.registerExpand();
-  Blockly.ContextMenuItems.registerDeleteAll();
+const registerWorkspaceOptions_ = function() {
+  registerUndo();
+  registerRedo();
+  registerCleanup();
+  registerCollapse();
+  registerExpand();
+  registerDeleteAll();
 };
 
 /** Option to duplicate a block. */
-Blockly.ContextMenuItems.registerDuplicate = function() {
+const registerDuplicate = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const duplicateOption = {
     displayText: function () {
@@ -348,9 +358,10 @@ Blockly.ContextMenuItems.registerDuplicate = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(duplicateOption);
 };
+exports.registerDuplicate = registerDuplicate;
 
 /** Option to add or remove block-level comment. */
-Blockly.ContextMenuItems.registerComment = function() {
+const registerComment = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const commentOption = {
     displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
@@ -388,9 +399,10 @@ Blockly.ContextMenuItems.registerComment = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(commentOption);
 };
+exports.registerComment = registerComment;
 
 /** Option to inline variables. */
-Blockly.ContextMenuItems.registerInline = function() {
+const registerInline = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const inlineOption = {
     displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
@@ -422,9 +434,10 @@ Blockly.ContextMenuItems.registerInline = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(inlineOption);
 };
+exports.registerInline = registerInline;
 
 /** Option to collapse or expand a block. */
-Blockly.ContextMenuItems.registerCollapseExpandBlock = function() {
+const registerCollapseExpandBlock = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const collapseExpandOption = {
     displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
@@ -451,9 +464,10 @@ Blockly.ContextMenuItems.registerCollapseExpandBlock = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(collapseExpandOption);
 };
+exports.registerCollapseExpandBlock = registerCollapseExpandBlock;
 
 /** Option to disable or enable a block. */
-Blockly.ContextMenuItems.registerDisable = function() {
+const registerDisable = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const disableOption = {
     displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
@@ -491,9 +505,10 @@ Blockly.ContextMenuItems.registerDisable = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(disableOption);
 };
+exports.registerDisable = registerDisable;
 
 /** Option to delete a block. */
-Blockly.ContextMenuItems.registerDelete = function() {
+const registerDelete = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const deleteOption = {
     displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
@@ -530,9 +545,10 @@ Blockly.ContextMenuItems.registerDelete = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(deleteOption);
 };
+exports.registerDelete = registerDelete;
 
 /** Option to open help for a block. */
-Blockly.ContextMenuItems.registerHelp = function() {
+const registerHelp = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const helpOption = {
     displayText: function () {
@@ -558,19 +574,20 @@ Blockly.ContextMenuItems.registerHelp = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(helpOption);
 };
+exports.registerHelp = registerHelp;
 
 /**
  * Registers all block-scoped context menu items.
  * @private
  */
-Blockly.ContextMenuItems.registerBlockOptions_ = function() {
-  Blockly.ContextMenuItems.registerDuplicate();
-  Blockly.ContextMenuItems.registerComment();
-  Blockly.ContextMenuItems.registerInline();
-  Blockly.ContextMenuItems.registerCollapseExpandBlock();
-  Blockly.ContextMenuItems.registerDisable();
-  Blockly.ContextMenuItems.registerDelete();
-  Blockly.ContextMenuItems.registerHelp();
+const registerBlockOptions_ = function() {
+  registerDuplicate();
+  registerComment();
+  registerInline();
+  registerCollapseExpandBlock();
+  registerDisable();
+  registerDelete();
+  registerHelp();
 };
 
 /**
@@ -578,9 +595,10 @@ Blockly.ContextMenuItems.registerBlockOptions_ = function() {
  * ContextMenuRegistry.
  * @package
  */
-Blockly.ContextMenuItems.registerDefaultOptions = function() {
-  Blockly.ContextMenuItems.registerWorkspaceOptions_();
-  Blockly.ContextMenuItems.registerBlockOptions_();
+const registerDefaultOptions = function() {
+  registerWorkspaceOptions_();
+  registerBlockOptions_();
 };
+exports.registerDefaultOptions = registerDefaultOptions;
 
-Blockly.ContextMenuItems.registerDefaultOptions();
+registerDefaultOptions();
diff --git a/tests/deps.js b/tests/deps.js
index abf82c44d..07f8193b2 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -27,7 +27,7 @@ goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Bl
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.clipboard', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es5'});
+goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es5'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From d54f46a280f47458c2c66942c46a0d1cbdc7bb76 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 23 Jul 2021 18:16:16 -0700
Subject: [PATCH 454/833] Migrate core/contextmenu_items.js named requires

---
 core/contextmenu_items.js | 240 +++++++++++++++++++-------------------
 1 file changed, 119 insertions(+), 121 deletions(-)

diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js
index c894c989a..99cf79e9c 100644
--- a/core/contextmenu_items.js
+++ b/core/contextmenu_items.js
@@ -10,85 +10,83 @@
  */
 'use strict';
 
-/**
- * @name Blockly.ContextMenuItems
- * @namespace
- */
 goog.module('Blockly.ContextMenuItems');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly');
-goog.require('Blockly.clipboard');
-goog.require('Blockly.ContextMenuRegistry');
-goog.require('Blockly.Events');
-goog.require('Blockly.inputTypes');
-goog.require('Blockly.Msg');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.userAgent');
-goog.requireType('Blockly.WorkspaceSvg');
-goog.requireType('Blockly.BlockSvg');
+const Blockly = goog.require('Blockly');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+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 inputTypes = goog.require('Blockly.inputTypes');
+const userAgent = goog.require('Blockly.utils.userAgent');
+const utils = goog.require('Blockly.utils');
 
 
 /** Option to undo previous action. */
 const registerUndo = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const undoOption = {
     displayText: function () {
-      return Blockly.Msg['UNDO'];
+      return Msg['UNDO'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (scope.workspace.getUndoStack().length > 0) {
         return 'enabled';
       }
       return 'disabled';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       scope.workspace.undo(false);
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
+    scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
     id: 'undoWorkspace',
     weight: 1,
   };
-  Blockly.ContextMenuRegistry.registry.register(undoOption);
+  ContextMenuRegistry.registry.register(undoOption);
 };
 exports.registerUndo = registerUndo;
 
 /** Option to redo previous action. */
 const registerRedo = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const redoOption = {
     displayText: function () {
-      return Blockly.Msg['REDO'];
+      return Msg['REDO'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (scope.workspace.getRedoStack().length > 0) {
         return 'enabled';
       }
       return 'disabled';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       scope.workspace.undo(true);
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
+    scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
     id: 'redoWorkspace',
     weight: 2,
   };
-  Blockly.ContextMenuRegistry.registry.register(redoOption);
+  ContextMenuRegistry.registry.register(redoOption);
 };
 exports.registerRedo = registerRedo;
 
 /** Option to clean up blocks. */
 const registerCleanup = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const cleanOption = {
     displayText: function () {
-      return Blockly.Msg['CLEAN_UP'];
+      return Msg['CLEAN_UP'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (scope.workspace.isMovable()) {
         if (scope.workspace.getTopBlocks(false).length > 1) {
@@ -98,22 +96,22 @@ const registerCleanup = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       scope.workspace.cleanUp();
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
+    scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
     id: 'cleanWorkspace',
     weight: 3,
   };
-  Blockly.ContextMenuRegistry.registry.register(cleanOption);
+  ContextMenuRegistry.registry.register(cleanOption);
 };
 exports.registerCleanup = registerCleanup;
 
 /**
  * Creates a callback to collapse or expand top blocks.
  * @param {boolean} shouldCollapse Whether a block should collapse.
- * @param {!Array<Blockly.BlockSvg>} topBlocks Top blocks in the workspace.
+ * @param {!Array<BlockSvg>} topBlocks Top blocks in the workspace.
  * @private
  */
 const toggleOption_ = function(shouldCollapse, topBlocks) {
@@ -131,12 +129,12 @@ const toggleOption_ = function(shouldCollapse, topBlocks) {
 
 /** Option to collapse all blocks. */
 const registerCollapse = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const collapseOption = {
     displayText: function () {
-      return Blockly.Msg['COLLAPSE_ALL'];
+      return Msg['COLLAPSE_ALL'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (scope.workspace.options.collapse) {
         const topBlocks = scope.workspace.getTopBlocks(false);
@@ -153,27 +151,27 @@ const registerCollapse = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       toggleOption_(true,
           scope.workspace.getTopBlocks(true));
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
+    scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
     id: 'collapseWorkspace',
     weight: 4,
   };
-  Blockly.ContextMenuRegistry.registry.register(collapseOption);
+  ContextMenuRegistry.registry.register(collapseOption);
 };
 exports.registerCollapse = registerCollapse;
 
 /** Option to expand all blocks. */
 const registerExpand = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const expandOption = {
     displayText: function () {
-      return Blockly.Msg['EXPAND_ALL'];
+      return Msg['EXPAND_ALL'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (scope.workspace.options.collapse) {
         const topBlocks = scope.workspace.getTopBlocks(false);
@@ -190,23 +188,23 @@ const registerExpand = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       toggleOption_(false,
           scope.workspace.getTopBlocks(true));
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
+    scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
     id: 'expandWorkspace',
     weight: 5,
   };
-  Blockly.ContextMenuRegistry.registry.register(expandOption);
+  ContextMenuRegistry.registry.register(expandOption);
 };
 exports.registerExpand = registerExpand;
 
 /**
  * Adds a block and its children to a list of deletable blocks.
- * @param {!Blockly.BlockSvg} block to delete.
- * @param {!Array<!Blockly.BlockSvg>} deleteList list of blocks that can be deleted. This will be
+ * @param {!BlockSvg} block to delete.
+ * @param {!Array<!BlockSvg>} deleteList list of blocks that can be deleted. This will be
  *    modifed in place with the given block and its descendants.
  * @private
  */
@@ -215,7 +213,7 @@ const addDeletableBlocks_ = function(block, deleteList) {
     Array.prototype.push.apply(deleteList, block.getDescendants(false));
   } else {
     const children =  /* eslint-disable-next-line indent */
-        /** @type {!Array<!Blockly.BlockSvg>} */ (block.getChildren(false));
+        /** @type {!Array<!BlockSvg>} */ (block.getChildren(false));
     for (let i = 0; i < children.length; i++) {
       addDeletableBlocks_(children[i], deleteList);
     }
@@ -224,8 +222,8 @@ const addDeletableBlocks_ = function(block, deleteList) {
 
 /**
  * Constructs a list of blocks that can be deleted in the given workspace.
- * @param {!Blockly.WorkspaceSvg} workspace to delete all blocks from.
- * @return {!Array<!Blockly.BlockSvg>} list of blocks to delete.
+ * @param {!WorkspaceSvg} workspace to delete all blocks from.
+ * @return {!Array<!BlockSvg>} list of blocks to delete.
  * @private
  */
 const getDeletableBlocks_ = function(workspace) {
@@ -238,13 +236,13 @@ const getDeletableBlocks_ = function(workspace) {
 };
 
 /** Deletes the given blocks. Used to delete all blocks in the workspace.
- * @param {!Array<!Blockly.BlockSvg>} deleteList list of blocks to delete.
+ * @param {!Array<!BlockSvg>} deleteList list of blocks to delete.
  * @param {string} eventGroup event group ID with which all delete events should be associated.
  * @private
  */
 const deleteNext_ = function(deleteList, eventGroup) {
   const DELAY = 10;
-  Blockly.Events.setGroup(eventGroup);
+  Events.setGroup(eventGroup);
   const block = deleteList.shift();
   if (block) {
     if (block.workspace) {
@@ -254,14 +252,14 @@ const deleteNext_ = function(deleteList, eventGroup) {
       deleteNext_(deleteList, eventGroup);
     }
   }
-  Blockly.Events.setGroup(false);
+  Events.setGroup(false);
 };
 
 /** Option to delete all blocks. */
 const registerDeleteAll = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const deleteOption = {
-    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (!scope.workspace) {
         return;
@@ -269,13 +267,13 @@ const registerDeleteAll = function() {
       const deletableBlocksLength =
           getDeletableBlocks_(scope.workspace).length;
       if (deletableBlocksLength == 1) {
-        return Blockly.Msg['DELETE_BLOCK'];
+        return Msg['DELETE_BLOCK'];
       } else {
-        return Blockly.Msg['DELETE_X_BLOCKS'].replace('%1',
+        return Msg['DELETE_X_BLOCKS'].replace('%1',
             String(deletableBlocksLength));
       }
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (!scope.workspace) {
         return;
@@ -284,7 +282,7 @@ const registerDeleteAll = function() {
           getDeletableBlocks_(scope.workspace).length;
       return deletableBlocksLength > 0 ? 'enabled' : 'disabled';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (!scope.workspace) {
         return;
@@ -292,12 +290,12 @@ const registerDeleteAll = function() {
       scope.workspace.cancelCurrentGesture();
       const deletableBlocks = getDeletableBlocks_(
           scope.workspace);
-      const eventGroup = Blockly.utils.genUid();
+      const eventGroup = utils.genUid();
       if (deletableBlocks.length < 2) {
         deleteNext_(deletableBlocks, eventGroup);
       } else {
         Blockly.confirm(
-            Blockly.Msg['DELETE_ALL_BLOCKS'].replace('%1',
+            Msg['DELETE_ALL_BLOCKS'].replace('%1',
                 deletableBlocks.length),
             function (ok) {
               if (ok) {
@@ -307,11 +305,11 @@ const registerDeleteAll = function() {
             });
       }
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
+    scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
     id: 'workspaceDelete',
     weight: 6,
   };
-  Blockly.ContextMenuRegistry.registry.register(deleteOption);
+  ContextMenuRegistry.registry.register(deleteOption);
 };
 exports.registerDeleteAll = registerDeleteAll;
 
@@ -330,12 +328,12 @@ const registerWorkspaceOptions_ = function() {
 
 /** Option to duplicate a block. */
 const registerDuplicate = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const duplicateOption = {
     displayText: function () {
-      return Blockly.Msg['DUPLICATE_BLOCK'];
+      return Msg['DUPLICATE_BLOCK'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       const block = scope.block;
       if (!block.isInFlyout && block.isDeletable() && block.isMovable()) {
@@ -346,45 +344,45 @@ const registerDuplicate = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (scope.block) {
-        Blockly.clipboard.duplicate(scope.block);
+        clipboard.duplicate(scope.block);
       }
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
+    scopeType: ContextMenuRegistry.ScopeType.BLOCK,
     id: 'blockDuplicate',
     weight: 1,
   };
-  Blockly.ContextMenuRegistry.registry.register(duplicateOption);
+  ContextMenuRegistry.registry.register(duplicateOption);
 };
 exports.registerDuplicate = registerDuplicate;
 
 /** Option to add or remove block-level comment. */
 const registerComment = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const commentOption = {
-    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (scope.block.getCommentIcon()) {
         // If there's already a comment,  option is to remove.
-        return Blockly.Msg['REMOVE_COMMENT'];
+        return Msg['REMOVE_COMMENT'];
       }
       // If there's no comment yet, option is to add.
-      return Blockly.Msg['ADD_COMMENT'];
+      return Msg['ADD_COMMENT'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       const block = scope.block;
       // IE doesn't support necessary features for comment editing.
-      if (!Blockly.utils.userAgent.IE && !block.isInFlyout
+      if (!userAgent.IE && !block.isInFlyout
           && block.workspace.options.comments &&
           !block.isCollapsed() && block.isEditable()) {
         return 'enabled';
       }
       return 'hidden';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       const block = scope.block;
       if (block.getCommentIcon()) {
@@ -393,59 +391,59 @@ const registerComment = function() {
         block.setCommentText('');
       }
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
+    scopeType: ContextMenuRegistry.ScopeType.BLOCK,
     id: 'blockComment',
     weight: 2,
   };
-  Blockly.ContextMenuRegistry.registry.register(commentOption);
+  ContextMenuRegistry.registry.register(commentOption);
 };
 exports.registerComment = registerComment;
 
 /** Option to inline variables. */
 const registerInline = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const inlineOption = {
-    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       return (scope.block.getInputsInline()) ?
-          Blockly.Msg['EXTERNAL_INPUTS'] : Blockly.Msg['INLINE_INPUTS'];
+          Msg['EXTERNAL_INPUTS'] : Msg['INLINE_INPUTS'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       const block = scope.block;
       if (!block.isInFlyout && block.isMovable() && !block.isCollapsed()) {
         for (let i = 1; i < block.inputList.length; i++) {
           // Only display this option if there are two value or dummy inputs next to each other.
-          if (block.inputList[i - 1].type != Blockly.inputTypes.STATEMENT &&
-              block.inputList[i].type != Blockly.inputTypes.STATEMENT) {
+          if (block.inputList[i - 1].type != inputTypes.STATEMENT &&
+              block.inputList[i].type != inputTypes.STATEMENT) {
             return 'enabled';
           }
         }
       }
       return 'hidden';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       scope.block.setInputsInline(!scope.block.getInputsInline());
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
+    scopeType: ContextMenuRegistry.ScopeType.BLOCK,
     id: 'blockInline',
     weight: 3,
   };
-  Blockly.ContextMenuRegistry.registry.register(inlineOption);
+  ContextMenuRegistry.registry.register(inlineOption);
 };
 exports.registerInline = registerInline;
 
 /** Option to collapse or expand a block. */
 const registerCollapseExpandBlock = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const collapseExpandOption = {
-    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       return scope.block.isCollapsed() ?
-          Blockly.Msg['EXPAND_BLOCK'] : Blockly.Msg['COLLAPSE_BLOCK'];
+          Msg['EXPAND_BLOCK'] : Msg['COLLAPSE_BLOCK'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       const block = scope.block;
       if (!block.isInFlyout && block.isMovable()
@@ -454,28 +452,28 @@ const registerCollapseExpandBlock = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       scope.block.setCollapsed(!scope.block.isCollapsed());
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
+    scopeType: ContextMenuRegistry.ScopeType.BLOCK,
     id: 'blockCollapseExpand',
     weight: 4,
   };
-  Blockly.ContextMenuRegistry.registry.register(collapseExpandOption);
+  ContextMenuRegistry.registry.register(collapseExpandOption);
 };
 exports.registerCollapseExpandBlock = registerCollapseExpandBlock;
 
 /** Option to disable or enable a block. */
 const registerDisable = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const disableOption = {
-    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       return (scope.block.isEnabled()) ?
-          Blockly.Msg['DISABLE_BLOCK'] : Blockly.Msg['ENABLE_BLOCK'];
+          Msg['DISABLE_BLOCK'] : Msg['ENABLE_BLOCK'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       const block = scope.block;
       if (!block.isInFlyout && block.workspace.options.disable
@@ -487,31 +485,31 @@ const registerDisable = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       const block = scope.block;
-      const group = Blockly.Events.getGroup();
+      const group = Events.getGroup();
       if (!group) {
-        Blockly.Events.setGroup(true);
+        Events.setGroup(true);
       }
       block.setEnabled(!block.isEnabled());
       if (!group) {
-        Blockly.Events.setGroup(false);
+        Events.setGroup(false);
       }
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
+    scopeType: ContextMenuRegistry.ScopeType.BLOCK,
     id: 'blockDisable',
     weight: 5,
   };
-  Blockly.ContextMenuRegistry.registry.register(disableOption);
+  ContextMenuRegistry.registry.register(disableOption);
 };
 exports.registerDisable = registerDisable;
 
 /** Option to delete a block. */
 const registerDelete = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const deleteOption = {
-    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       const block = scope.block;
       // Count the number of blocks that are nested in this block.
@@ -521,40 +519,40 @@ const registerDelete = function() {
         // Blocks in the current stack would survive this block's deletion.
         descendantCount -= nextBlock.getDescendants(false).length;
       }
-      return (descendantCount == 1) ? Blockly.Msg['DELETE_BLOCK'] :
-          Blockly.Msg['DELETE_X_BLOCKS'].replace('%1', String(descendantCount));
+      return (descendantCount == 1) ? Msg['DELETE_BLOCK'] :
+          Msg['DELETE_X_BLOCKS'].replace('%1', String(descendantCount));
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (!scope.block.isInFlyout && scope.block.isDeletable()) {
         return 'enabled';
       }
       return 'hidden';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
-      Blockly.Events.setGroup(true);
+      Events.setGroup(true);
       if (scope.block) {
         Blockly.deleteBlock(scope.block);
       }
-      Blockly.Events.setGroup(false);
+      Events.setGroup(false);
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
+    scopeType: ContextMenuRegistry.ScopeType.BLOCK,
     id: 'blockDelete',
     weight: 6,
   };
-  Blockly.ContextMenuRegistry.registry.register(deleteOption);
+  ContextMenuRegistry.registry.register(deleteOption);
 };
 exports.registerDelete = registerDelete;
 
 /** Option to open help for a block. */
 const registerHelp = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const helpOption = {
     displayText: function () {
-      return Blockly.Msg['HELP'];
+      return Msg['HELP'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       const block = scope.block;
       const url = (typeof block.helpUrl == 'function') ?
@@ -564,15 +562,15 @@ const registerHelp = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       scope.block.showHelp();
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
+    scopeType: ContextMenuRegistry.ScopeType.BLOCK,
     id: 'blockHelp',
     weight: 7,
   };
-  Blockly.ContextMenuRegistry.registry.register(helpOption);
+  ContextMenuRegistry.registry.register(helpOption);
 };
 exports.registerHelp = registerHelp;
 

From d4543374d64c65e7d4bf1de7c3d6d9648d0979f6 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 23 Jul 2021 18:17:08 -0700
Subject: [PATCH 455/833] clang-format core/contextmenu_items.js

---
 core/contextmenu_items.js | 220 +++++++++++++++++++-------------------
 1 file changed, 109 insertions(+), 111 deletions(-)

diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js
index 99cf79e9c..35cb5eddc 100644
--- a/core/contextmenu_items.js
+++ b/core/contextmenu_items.js
@@ -31,18 +31,18 @@ const utils = goog.require('Blockly.utils');
 const registerUndo = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const undoOption = {
-    displayText: function () {
+    displayText: function() {
       return Msg['UNDO'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       if (scope.workspace.getUndoStack().length > 0) {
         return 'enabled';
       }
       return 'disabled';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       scope.workspace.undo(false);
     },
     scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
@@ -57,18 +57,18 @@ exports.registerUndo = registerUndo;
 const registerRedo = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const redoOption = {
-    displayText: function () {
+    displayText: function() {
       return Msg['REDO'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       if (scope.workspace.getRedoStack().length > 0) {
         return 'enabled';
       }
       return 'disabled';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       scope.workspace.undo(true);
     },
     scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
@@ -83,11 +83,11 @@ exports.registerRedo = registerRedo;
 const registerCleanup = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const cleanOption = {
-    displayText: function () {
+    displayText: function() {
       return Msg['CLEAN_UP'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       if (scope.workspace.isMovable()) {
         if (scope.workspace.getTopBlocks(false).length > 1) {
           return 'enabled';
@@ -96,8 +96,8 @@ const registerCleanup = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       scope.workspace.cleanUp();
     },
     scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
@@ -131,11 +131,11 @@ const toggleOption_ = function(shouldCollapse, topBlocks) {
 const registerCollapse = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const collapseOption = {
-    displayText: function () {
+    displayText: function() {
       return Msg['COLLAPSE_ALL'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       if (scope.workspace.options.collapse) {
         const topBlocks = scope.workspace.getTopBlocks(false);
         for (let i = 0; i < topBlocks.length; i++) {
@@ -151,10 +151,9 @@ const registerCollapse = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
-      toggleOption_(true,
-          scope.workspace.getTopBlocks(true));
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
+      toggleOption_(true, scope.workspace.getTopBlocks(true));
     },
     scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
     id: 'collapseWorkspace',
@@ -168,11 +167,11 @@ exports.registerCollapse = registerCollapse;
 const registerExpand = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const expandOption = {
-    displayText: function () {
+    displayText: function() {
       return Msg['EXPAND_ALL'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       if (scope.workspace.options.collapse) {
         const topBlocks = scope.workspace.getTopBlocks(false);
         for (let i = 0; i < topBlocks.length; i++) {
@@ -188,10 +187,9 @@ const registerExpand = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
-      toggleOption_(false,
-          scope.workspace.getTopBlocks(true));
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
+      toggleOption_(false, scope.workspace.getTopBlocks(true));
     },
     scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
     id: 'expandWorkspace',
@@ -204,7 +202,8 @@ exports.registerExpand = registerExpand;
 /**
  * Adds a block and its children to a list of deletable blocks.
  * @param {!BlockSvg} block to delete.
- * @param {!Array<!BlockSvg>} deleteList list of blocks that can be deleted. This will be
+ * @param {!Array<!BlockSvg>} deleteList list of blocks that can be deleted.
+ *     This will be
  *    modifed in place with the given block and its descendants.
  * @private
  */
@@ -212,7 +211,7 @@ const addDeletableBlocks_ = function(block, deleteList) {
   if (block.isDeletable()) {
     Array.prototype.push.apply(deleteList, block.getDescendants(false));
   } else {
-    const children =  /* eslint-disable-next-line indent */
+    const children = /* eslint-disable-next-line indent */
         /** @type {!Array<!BlockSvg>} */ (block.getChildren(false));
     for (let i = 0; i < children.length; i++) {
       addDeletableBlocks_(children[i], deleteList);
@@ -235,9 +234,11 @@ const getDeletableBlocks_ = function(workspace) {
   return deleteList;
 };
 
-/** Deletes the given blocks. Used to delete all blocks in the workspace.
+/**
+ * Deletes the given blocks. Used to delete all blocks in the workspace.
  * @param {!Array<!BlockSvg>} deleteList list of blocks to delete.
- * @param {string} eventGroup event group ID with which all delete events should be associated.
+ * @param {string} eventGroup event group ID with which all delete events should
+ *     be associated.
  * @private
  */
 const deleteNext_ = function(deleteList, eventGroup) {
@@ -259,48 +260,43 @@ const deleteNext_ = function(deleteList, eventGroup) {
 const registerDeleteAll = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const deleteOption = {
-    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    displayText: function(/** @type {!ContextMenuRegistry.Scope} */
+                          scope) {
       if (!scope.workspace) {
         return;
       }
-      const deletableBlocksLength =
-          getDeletableBlocks_(scope.workspace).length;
+      const deletableBlocksLength = getDeletableBlocks_(scope.workspace).length;
       if (deletableBlocksLength == 1) {
         return Msg['DELETE_BLOCK'];
       } else {
-        return Msg['DELETE_X_BLOCKS'].replace('%1',
-            String(deletableBlocksLength));
+        return Msg['DELETE_X_BLOCKS'].replace(
+            '%1', String(deletableBlocksLength));
       }
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       if (!scope.workspace) {
         return;
       }
-      const deletableBlocksLength =
-          getDeletableBlocks_(scope.workspace).length;
+      const deletableBlocksLength = getDeletableBlocks_(scope.workspace).length;
       return deletableBlocksLength > 0 ? 'enabled' : 'disabled';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       if (!scope.workspace) {
         return;
       }
       scope.workspace.cancelCurrentGesture();
-      const deletableBlocks = getDeletableBlocks_(
-          scope.workspace);
+      const deletableBlocks = getDeletableBlocks_(scope.workspace);
       const eventGroup = utils.genUid();
       if (deletableBlocks.length < 2) {
         deleteNext_(deletableBlocks, eventGroup);
       } else {
         Blockly.confirm(
-            Msg['DELETE_ALL_BLOCKS'].replace('%1',
-                deletableBlocks.length),
-            function (ok) {
+            Msg['DELETE_ALL_BLOCKS'].replace('%1', deletableBlocks.length),
+            function(ok) {
               if (ok) {
-                deleteNext_(deletableBlocks,
-                    eventGroup);
+                deleteNext_(deletableBlocks, eventGroup);
               }
             });
       }
@@ -330,11 +326,11 @@ const registerWorkspaceOptions_ = function() {
 const registerDuplicate = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const duplicateOption = {
-    displayText: function () {
+    displayText: function() {
       return Msg['DUPLICATE_BLOCK'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       const block = scope.block;
       if (!block.isInFlyout && block.isDeletable() && block.isMovable()) {
         if (block.isDuplicatable()) {
@@ -344,8 +340,8 @@ const registerDuplicate = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       if (scope.block) {
         clipboard.duplicate(scope.block);
       }
@@ -362,8 +358,8 @@ exports.registerDuplicate = registerDuplicate;
 const registerComment = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const commentOption = {
-    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    displayText: function(/** @type {!ContextMenuRegistry.Scope} */
+                          scope) {
       if (scope.block.getCommentIcon()) {
         // If there's already a comment,  option is to remove.
         return Msg['REMOVE_COMMENT'];
@@ -371,19 +367,19 @@ const registerComment = function() {
       // If there's no comment yet, option is to add.
       return Msg['ADD_COMMENT'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       const block = scope.block;
       // IE doesn't support necessary features for comment editing.
-      if (!userAgent.IE && !block.isInFlyout
-          && block.workspace.options.comments &&
-          !block.isCollapsed() && block.isEditable()) {
+      if (!userAgent.IE && !block.isInFlyout &&
+          block.workspace.options.comments && !block.isCollapsed() &&
+          block.isEditable()) {
         return 'enabled';
       }
       return 'hidden';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       const block = scope.block;
       if (block.getCommentIcon()) {
         block.setCommentText(null);
@@ -403,17 +399,18 @@ exports.registerComment = registerComment;
 const registerInline = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const inlineOption = {
-    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
-      return (scope.block.getInputsInline()) ?
-          Msg['EXTERNAL_INPUTS'] : Msg['INLINE_INPUTS'];
+    displayText: function(/** @type {!ContextMenuRegistry.Scope} */
+                          scope) {
+      return (scope.block.getInputsInline()) ? Msg['EXTERNAL_INPUTS'] :
+                                               Msg['INLINE_INPUTS'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       const block = scope.block;
       if (!block.isInFlyout && block.isMovable() && !block.isCollapsed()) {
         for (let i = 1; i < block.inputList.length; i++) {
-          // Only display this option if there are two value or dummy inputs next to each other.
+          // Only display this option if there are two value or dummy inputs
+          // next to each other.
           if (block.inputList[i - 1].type != inputTypes.STATEMENT &&
               block.inputList[i].type != inputTypes.STATEMENT) {
             return 'enabled';
@@ -422,8 +419,8 @@ const registerInline = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       scope.block.setInputsInline(!scope.block.getInputsInline());
     },
     scopeType: ContextMenuRegistry.ScopeType.BLOCK,
@@ -438,22 +435,22 @@ exports.registerInline = registerInline;
 const registerCollapseExpandBlock = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const collapseExpandOption = {
-    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
-      return scope.block.isCollapsed() ?
-          Msg['EXPAND_BLOCK'] : Msg['COLLAPSE_BLOCK'];
+    displayText: function(/** @type {!ContextMenuRegistry.Scope} */
+                          scope) {
+      return scope.block.isCollapsed() ? Msg['EXPAND_BLOCK'] :
+                                         Msg['COLLAPSE_BLOCK'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       const block = scope.block;
-      if (!block.isInFlyout && block.isMovable()
-          && block.workspace.options.collapse) {
+      if (!block.isInFlyout && block.isMovable() &&
+          block.workspace.options.collapse) {
         return 'enabled';
       }
       return 'hidden';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       scope.block.setCollapsed(!scope.block.isCollapsed());
     },
     scopeType: ContextMenuRegistry.ScopeType.BLOCK,
@@ -468,16 +465,16 @@ exports.registerCollapseExpandBlock = registerCollapseExpandBlock;
 const registerDisable = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const disableOption = {
-    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
-      return (scope.block.isEnabled()) ?
-          Msg['DISABLE_BLOCK'] : Msg['ENABLE_BLOCK'];
+    displayText: function(/** @type {!ContextMenuRegistry.Scope} */
+                          scope) {
+      return (scope.block.isEnabled()) ? Msg['DISABLE_BLOCK'] :
+                                         Msg['ENABLE_BLOCK'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       const block = scope.block;
-      if (!block.isInFlyout && block.workspace.options.disable
-          && block.isEditable()) {
+      if (!block.isInFlyout && block.workspace.options.disable &&
+          block.isEditable()) {
         if (block.getInheritedDisabled()) {
           return 'disabled';
         }
@@ -485,8 +482,8 @@ const registerDisable = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       const block = scope.block;
       const group = Events.getGroup();
       if (!group) {
@@ -509,8 +506,8 @@ exports.registerDisable = registerDisable;
 const registerDelete = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const deleteOption = {
-    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    displayText: function(/** @type {!ContextMenuRegistry.Scope} */
+                          scope) {
       const block = scope.block;
       // Count the number of blocks that are nested in this block.
       let descendantCount = block.getDescendants(false).length;
@@ -519,18 +516,19 @@ const registerDelete = function() {
         // Blocks in the current stack would survive this block's deletion.
         descendantCount -= nextBlock.getDescendants(false).length;
       }
-      return (descendantCount == 1) ? Msg['DELETE_BLOCK'] :
+      return (descendantCount == 1) ?
+          Msg['DELETE_BLOCK'] :
           Msg['DELETE_X_BLOCKS'].replace('%1', String(descendantCount));
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       if (!scope.block.isInFlyout && scope.block.isDeletable()) {
         return 'enabled';
       }
       return 'hidden';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       Events.setGroup(true);
       if (scope.block) {
         Blockly.deleteBlock(scope.block);
@@ -549,21 +547,21 @@ exports.registerDelete = registerDelete;
 const registerHelp = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const helpOption = {
-    displayText: function () {
+    displayText: function() {
       return Msg['HELP'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       const block = scope.block;
-      const url = (typeof block.helpUrl == 'function') ?
-          block.helpUrl() : block.helpUrl;
+      const url = (typeof block.helpUrl == 'function') ? block.helpUrl() :
+                                                         block.helpUrl;
       if (url) {
         return 'enabled';
       }
       return 'hidden';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       scope.block.showHelp();
     },
     scopeType: ContextMenuRegistry.ScopeType.BLOCK,
@@ -589,8 +587,8 @@ const registerBlockOptions_ = function() {
 };
 
 /**
- * Registers all default context menu items. This should be called once per instance of
- * ContextMenuRegistry.
+ * Registers all default context menu items. This should be called once per
+ * instance of ContextMenuRegistry.
  * @package
  */
 const registerDefaultOptions = function() {

From 3d8a79fe962ecaa705139374c82dedd2b6a6a299 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 30 Jul 2021 15:42:53 -0700
Subject: [PATCH 456/833] Add missing eslint disable to
 core/renderers/common/i_path_object.js

---
 core/renderers/common/i_path_object.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/renderers/common/i_path_object.js b/core/renderers/common/i_path_object.js
index 0b0362ff3..1a8deb11e 100644
--- a/core/renderers/common/i_path_object.js
+++ b/core/renderers/common/i_path_object.js
@@ -19,6 +19,7 @@ goog.module.declareLegacyNamespace();
 const Block = goog.requireType('Blockly.Block');
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
 const Theme = goog.requireType('Blockly.Theme');
 
 

From 4b2e48134036b0369dda00a322335b688a9910ee Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 14:32:53 -0700
Subject: [PATCH 457/833] Split core/scrollbar.js into 2 files

---
 core/scrollbar.js      | 304 +--------------------------------------
 core/scrollbar_pair.js | 319 +++++++++++++++++++++++++++++++++++++++++
 tests/deps.js          |   3 +-
 3 files changed, 323 insertions(+), 303 deletions(-)
 create mode 100644 core/scrollbar_pair.js

diff --git a/core/scrollbar.js b/core/scrollbar.js
index aab3852f2..25bdef776 100644
--- a/core/scrollbar.js
+++ b/core/scrollbar.js
@@ -5,16 +5,14 @@
  */
 
 /**
- * @fileoverview Library for creating scrollbars.
+ * @fileoverview Object representing a scrollbar.
  * @author fraser@google.com (Neil Fraser)
  */
 'use strict';
 
 goog.provide('Blockly.Scrollbar');
-goog.provide('Blockly.ScrollbarPair');
 
 goog.require('Blockly.browserEvents');
-goog.require('Blockly.Events');
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.Coordinate');
@@ -30,304 +28,6 @@ goog.requireType('Blockly.WorkspaceSvg');
  * scrollbar is in a mutator.
  */
 
-/**
- * Class for a pair of scrollbars.  Horizontal and vertical.
- * @param {!Blockly.WorkspaceSvg} workspace Workspace to bind the scrollbars to.
- * @param {boolean=} addHorizontal Whether to add a horizontal scrollbar.
- *    Defaults to true.
- * @param {boolean=} addVertical Whether to add a vertical scrollbar. Defaults
- *    to true.
- * @param {string=} opt_class A class to be applied to these scrollbars.
- * @param {number=} opt_margin The margin to apply to these scrollbars.
- * @constructor
- */
-Blockly.ScrollbarPair = function(
-    workspace, addHorizontal, addVertical, opt_class, opt_margin) {
-  /**
-   * The workspace this scrollbar pair is bound to.
-   * @type {!Blockly.WorkspaceSvg}
-   * @private
-   */
-  this.workspace_ = workspace;
-
-  addHorizontal = addHorizontal === undefined ? true : addHorizontal;
-  addVertical = addVertical === undefined ? true : addVertical;
-  var isPair = addHorizontal && addVertical;
-
-  if (addHorizontal) {
-    this.hScroll = new Blockly.Scrollbar(
-        workspace, true, isPair, opt_class, opt_margin);
-  }
-  if (addVertical) {
-    this.vScroll = new Blockly.Scrollbar(
-        workspace, false, isPair, opt_class, opt_margin);
-  }
-
-  if (isPair) {
-    this.corner_ = Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.RECT,
-        {
-          'height': Blockly.Scrollbar.scrollbarThickness,
-          'width': Blockly.Scrollbar.scrollbarThickness,
-          'class': 'blocklyScrollbarBackground'
-        },
-        null);
-    Blockly.utils.dom.insertAfter(this.corner_, workspace.getBubbleCanvas());
-  }
-
-  /**
-   * Previously recorded metrics from the workspace.
-   * @type {?Blockly.utils.Metrics}
-   * @private
-   */
-  this.oldHostMetrics_ = null;
-};
-
-/**
- * Dispose of this pair of scrollbars.
- * Unlink from all DOM elements to prevent memory leaks.
- * @suppress {checkTypes}
- */
-Blockly.ScrollbarPair.prototype.dispose = function() {
-  Blockly.utils.dom.removeNode(this.corner_);
-  this.corner_ = null;
-  this.workspace_ = null;
-  this.oldHostMetrics_ = null;
-  if (this.hScroll) {
-    this.hScroll.dispose();
-    this.hScroll = null;
-  }
-  if (this.vScroll) {
-    this.vScroll.dispose();
-    this.vScroll = null;
-  }
-};
-
-/**
- * Recalculate both of the scrollbars' locations and lengths.
- * Also reposition the corner rectangle.
- */
-Blockly.ScrollbarPair.prototype.resize = function() {
-  // Look up the host metrics once, and use for both scrollbars.
-  var hostMetrics = this.workspace_.getMetrics();
-  if (!hostMetrics) {
-    // Host element is likely not visible.
-    return;
-  }
-
-  // Only change the scrollbars if there has been a change in metrics.
-  var resizeH = false;
-  var resizeV = false;
-  if (!this.oldHostMetrics_ ||
-      this.oldHostMetrics_.viewWidth != hostMetrics.viewWidth ||
-      this.oldHostMetrics_.viewHeight != hostMetrics.viewHeight ||
-      this.oldHostMetrics_.absoluteTop != hostMetrics.absoluteTop ||
-      this.oldHostMetrics_.absoluteLeft != hostMetrics.absoluteLeft) {
-    // The window has been resized or repositioned.
-    resizeH = true;
-    resizeV = true;
-  } else {
-    // Has the content been resized or moved?
-    if (!this.oldHostMetrics_ ||
-        this.oldHostMetrics_.scrollWidth != hostMetrics.scrollWidth ||
-        this.oldHostMetrics_.viewLeft != hostMetrics.viewLeft ||
-        this.oldHostMetrics_.scrollLeft != hostMetrics.scrollLeft) {
-      resizeH = true;
-    }
-    if (!this.oldHostMetrics_ ||
-        this.oldHostMetrics_.scrollHeight != hostMetrics.scrollHeight ||
-        this.oldHostMetrics_.viewTop != hostMetrics.viewTop ||
-        this.oldHostMetrics_.scrollTop != hostMetrics.scrollTop) {
-      resizeV = true;
-    }
-  }
-
-  if (resizeH || resizeV) {
-    try {
-      Blockly.Events.disable();
-      if (this.hScroll && resizeH) {
-        this.hScroll.resize(hostMetrics);
-      }
-      if (this.vScroll && resizeV) {
-        this.vScroll.resize(hostMetrics);
-      }
-    } finally {
-      Blockly.Events.enable();
-    }
-    this.workspace_.maybeFireViewportChangeEvent();
-  }
-
-  if (this.hScroll && this.vScroll) {
-    // Reposition the corner square.
-    if (!this.oldHostMetrics_ ||
-        this.oldHostMetrics_.viewWidth != hostMetrics.viewWidth ||
-        this.oldHostMetrics_.absoluteLeft != hostMetrics.absoluteLeft) {
-      this.corner_.setAttribute('x', this.vScroll.position.x);
-    }
-    if (!this.oldHostMetrics_ ||
-        this.oldHostMetrics_.viewHeight != hostMetrics.viewHeight ||
-        this.oldHostMetrics_.absoluteTop != hostMetrics.absoluteTop) {
-      this.corner_.setAttribute('y', this.hScroll.position.y);
-    }
-  }
-
-  // Cache the current metrics to potentially short-cut the next resize event.
-  this.oldHostMetrics_ = hostMetrics;
-};
-
-/**
- * Returns whether scrolling horizontally is enabled.
- * @return {boolean} True if horizontal scroll is enabled.
- */
-Blockly.ScrollbarPair.prototype.canScrollHorizontally = function() {
-  return !!this.hScroll;
-};
-
-/**
- * Returns whether scrolling vertically is enabled.
- * @return {boolean} True if vertical scroll is enabled.
- */
-Blockly.ScrollbarPair.prototype.canScrollVertically = function() {
-  return !!this.vScroll;
-};
-
-/**
- * Record the origin of the workspace that the scrollbar is in, in pixels
- * relative to the injection div origin. This is for times when the scrollbar is
- * used in an object whose origin isn't the same as the main workspace
- * (e.g. in a flyout.)
- * @param {number} x The x coordinate of the scrollbar's origin, in CSS pixels.
- * @param {number} y The y coordinate of the scrollbar's origin, in CSS pixels.
- * @package
- */
-Blockly.ScrollbarPair.prototype.setOrigin = function(x, y) {
-  if (this.hScroll) {
-    this.hScroll.setOrigin(x, y);
-  }
-  if (this.vScroll) {
-    this.vScroll.setOrigin(x, y);
-  }
-};
-
-/**
- * Set the handles of both scrollbars.
- * @param {number} x The horizontal content displacement, relative to the view
- *    in pixels.
- * @param {number} y The vertical content displacement, relative to the view in
- *    pixels.
- * @param {boolean} updateMetrics Whether to update metrics on this set call.
- *    Defaults to true.
- */
-Blockly.ScrollbarPair.prototype.set = function(x, y, updateMetrics) {
-  // This function is equivalent to:
-  //   this.hScroll.set(x);
-  //   this.vScroll.set(y);
-  // However, that calls setMetrics twice which causes a chain of
-  // getAttribute->setAttribute->getAttribute resulting in an extra layout pass.
-  // Combining them speeds up rendering.
-  if (this.hScroll) {
-    this.hScroll.set(x, false);
-  }
-  if (this.vScroll) {
-    this.vScroll.set(y, false);
-  }
-
-  if (updateMetrics || updateMetrics === undefined) {
-    // Update metrics.
-    var xyRatio = {};
-    if (this.hScroll) {
-      xyRatio.x = this.hScroll.getRatio_();
-    }
-    if (this.vScroll) {
-      xyRatio.y = this.vScroll.getRatio_();
-    }
-    this.workspace_.setMetrics(xyRatio);
-  }
-};
-
-/**
- * Set the handle of the horizontal scrollbar to be at a certain position in
- *    CSS pixels relative to its parents.
- * @param {number} x Horizontal scroll value.
- */
-Blockly.ScrollbarPair.prototype.setX = function(x) {
-  if (this.hScroll) {
-    this.hScroll.set(x, true);
-  }
-};
-
-/**
- * Set the handle of the vertical scrollbar to be at a certain position in
- *    CSS pixels relative to its parents.
- * @param {number} y Vertical scroll value.
- */
-Blockly.ScrollbarPair.prototype.setY = function(y) {
-  if (this.vScroll) {
-    this.vScroll.set(y, true);
-  }
-};
-
-/**
- * Set whether this scrollbar's container is visible.
- * @param {boolean} visible Whether the container is visible.
- */
-Blockly.ScrollbarPair.prototype.setContainerVisible = function(visible) {
-  if (this.hScroll) {
-    this.hScroll.setContainerVisible(visible);
-  }
-  if (this.vScroll) {
-    this.vScroll.setContainerVisible(visible);
-  }
-};
-
-/**
- * If any of the scrollbars are visible. Non-paired scrollbars may disappear
- * when they aren't needed.
- * @return {boolean} True if visible.
- */
-Blockly.ScrollbarPair.prototype.isVisible = function() {
-  var isVisible = false;
-  if (this.hScroll) {
-    isVisible = this.hScroll.isVisible();
-  }
-  if (this.vScroll) {
-    isVisible = isVisible || this.vScroll.isVisible();
-  }
-  return isVisible;
-};
-
-/**
- * Recalculates the scrollbars' locations within their path and length.
- * This should be called when the contents of the workspace have changed.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
- *     the required dimensions, possibly fetched from the host object.
- */
-Blockly.ScrollbarPair.prototype.resizeContent = function(hostMetrics) {
-  if (this.hScroll) {
-    this.hScroll.resizeContentHorizontal(hostMetrics);
-  }
-  if (this.vScroll) {
-    this.vScroll.resizeContentVertical(hostMetrics);
-  }
-};
-
-/**
- * Recalculates the scrollbars' locations on the screen and path length.
- * This should be called when the layout or size of the window has changed.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
- *     the required dimensions, possibly fetched from the host object.
- */
-Blockly.ScrollbarPair.prototype.resizeView = function(hostMetrics) {
-  if (this.hScroll) {
-    this.hScroll.resizeViewHorizontal(hostMetrics);
-  }
-  if (this.vScroll) {
-    this.vScroll.resizeViewVertical(hostMetrics);
-  }
-};
-
-// --------------------------------------------------------------------
-
 /**
  * Class for a pure SVG scrollbar.
  * This technique offers a scrollbar that is guaranteed to work, but may not
@@ -1094,7 +794,7 @@ Blockly.Scrollbar.prototype.cleanUp_ = function() {
 /**
  * Helper to calculate the ratio of handle position to scrollbar view size.
  * @return {number} Ratio.
- * @protected
+ * @package
  */
 Blockly.Scrollbar.prototype.getRatio_ = function() {
   var scrollHandleRange = this.scrollbarLength_ - this.handleLength_;
diff --git a/core/scrollbar_pair.js b/core/scrollbar_pair.js
new file mode 100644
index 000000000..3caf986e7
--- /dev/null
+++ b/core/scrollbar_pair.js
@@ -0,0 +1,319 @@
+/**
+ * @license
+ * Copyright 2011 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Object representing a pair of scrollbars.
+ * @author fraser@google.com (Neil Fraser)
+ */
+'use strict';
+
+goog.provide('Blockly.ScrollbarPair');
+
+goog.require('Blockly.Events');
+goog.require('Blockly.Scrollbar');
+goog.require('Blockly.utils');
+goog.require('Blockly.utils.dom');
+goog.require('Blockly.utils.Metrics');
+goog.require('Blockly.utils.Svg');
+
+goog.requireType('Blockly.WorkspaceSvg');
+
+
+/**
+ * Class for a pair of scrollbars.  Horizontal and vertical.
+ * @param {!Blockly.WorkspaceSvg} workspace Workspace to bind the scrollbars to.
+ * @param {boolean=} addHorizontal Whether to add a horizontal scrollbar.
+ *    Defaults to true.
+ * @param {boolean=} addVertical Whether to add a vertical scrollbar. Defaults
+ *    to true.
+ * @param {string=} opt_class A class to be applied to these scrollbars.
+ * @param {number=} opt_margin The margin to apply to these scrollbars.
+ * @constructor
+ */
+Blockly.ScrollbarPair = function(
+    workspace, addHorizontal, addVertical, opt_class, opt_margin) {
+  /**
+   * The workspace this scrollbar pair is bound to.
+   * @type {!Blockly.WorkspaceSvg}
+   * @private
+   */
+  this.workspace_ = workspace;
+
+  addHorizontal = addHorizontal === undefined ? true : addHorizontal;
+  addVertical = addVertical === undefined ? true : addVertical;
+  var isPair = addHorizontal && addVertical;
+
+  if (addHorizontal) {
+    this.hScroll = new Blockly.Scrollbar(
+        workspace, true, isPair, opt_class, opt_margin);
+  }
+  if (addVertical) {
+    this.vScroll = new Blockly.Scrollbar(
+        workspace, false, isPair, opt_class, opt_margin);
+  }
+
+  if (isPair) {
+    this.corner_ = Blockly.utils.dom.createSvgElement(
+        Blockly.utils.Svg.RECT,
+        {
+          'height': Blockly.Scrollbar.scrollbarThickness,
+          'width': Blockly.Scrollbar.scrollbarThickness,
+          'class': 'blocklyScrollbarBackground'
+        },
+        null);
+    Blockly.utils.dom.insertAfter(this.corner_, workspace.getBubbleCanvas());
+  }
+
+  /**
+   * Previously recorded metrics from the workspace.
+   * @type {?Blockly.utils.Metrics}
+   * @private
+   */
+  this.oldHostMetrics_ = null;
+};
+
+/**
+ * Dispose of this pair of scrollbars.
+ * Unlink from all DOM elements to prevent memory leaks.
+ * @suppress {checkTypes}
+ */
+Blockly.ScrollbarPair.prototype.dispose = function() {
+  Blockly.utils.dom.removeNode(this.corner_);
+  this.corner_ = null;
+  this.workspace_ = null;
+  this.oldHostMetrics_ = null;
+  if (this.hScroll) {
+    this.hScroll.dispose();
+    this.hScroll = null;
+  }
+  if (this.vScroll) {
+    this.vScroll.dispose();
+    this.vScroll = null;
+  }
+};
+
+/**
+ * Recalculate both of the scrollbars' locations and lengths.
+ * Also reposition the corner rectangle.
+ */
+Blockly.ScrollbarPair.prototype.resize = function() {
+  // Look up the host metrics once, and use for both scrollbars.
+  var hostMetrics = this.workspace_.getMetrics();
+  if (!hostMetrics) {
+    // Host element is likely not visible.
+    return;
+  }
+
+  // Only change the scrollbars if there has been a change in metrics.
+  var resizeH = false;
+  var resizeV = false;
+  if (!this.oldHostMetrics_ ||
+      this.oldHostMetrics_.viewWidth != hostMetrics.viewWidth ||
+      this.oldHostMetrics_.viewHeight != hostMetrics.viewHeight ||
+      this.oldHostMetrics_.absoluteTop != hostMetrics.absoluteTop ||
+      this.oldHostMetrics_.absoluteLeft != hostMetrics.absoluteLeft) {
+    // The window has been resized or repositioned.
+    resizeH = true;
+    resizeV = true;
+  } else {
+    // Has the content been resized or moved?
+    if (!this.oldHostMetrics_ ||
+        this.oldHostMetrics_.scrollWidth != hostMetrics.scrollWidth ||
+        this.oldHostMetrics_.viewLeft != hostMetrics.viewLeft ||
+        this.oldHostMetrics_.scrollLeft != hostMetrics.scrollLeft) {
+      resizeH = true;
+    }
+    if (!this.oldHostMetrics_ ||
+        this.oldHostMetrics_.scrollHeight != hostMetrics.scrollHeight ||
+        this.oldHostMetrics_.viewTop != hostMetrics.viewTop ||
+        this.oldHostMetrics_.scrollTop != hostMetrics.scrollTop) {
+      resizeV = true;
+    }
+  }
+
+  if (resizeH || resizeV) {
+    try {
+      Blockly.Events.disable();
+      if (this.hScroll && resizeH) {
+        this.hScroll.resize(hostMetrics);
+      }
+      if (this.vScroll && resizeV) {
+        this.vScroll.resize(hostMetrics);
+      }
+    } finally {
+      Blockly.Events.enable();
+    }
+    this.workspace_.maybeFireViewportChangeEvent();
+  }
+
+  if (this.hScroll && this.vScroll) {
+    // Reposition the corner square.
+    if (!this.oldHostMetrics_ ||
+        this.oldHostMetrics_.viewWidth != hostMetrics.viewWidth ||
+        this.oldHostMetrics_.absoluteLeft != hostMetrics.absoluteLeft) {
+      this.corner_.setAttribute('x', this.vScroll.position.x);
+    }
+    if (!this.oldHostMetrics_ ||
+        this.oldHostMetrics_.viewHeight != hostMetrics.viewHeight ||
+        this.oldHostMetrics_.absoluteTop != hostMetrics.absoluteTop) {
+      this.corner_.setAttribute('y', this.hScroll.position.y);
+    }
+  }
+
+  // Cache the current metrics to potentially short-cut the next resize event.
+  this.oldHostMetrics_ = hostMetrics;
+};
+
+/**
+ * Returns whether scrolling horizontally is enabled.
+ * @return {boolean} True if horizontal scroll is enabled.
+ */
+Blockly.ScrollbarPair.prototype.canScrollHorizontally = function() {
+  return !!this.hScroll;
+};
+
+/**
+ * Returns whether scrolling vertically is enabled.
+ * @return {boolean} True if vertical scroll is enabled.
+ */
+Blockly.ScrollbarPair.prototype.canScrollVertically = function() {
+  return !!this.vScroll;
+};
+
+/**
+ * Record the origin of the workspace that the scrollbar is in, in pixels
+ * relative to the injection div origin. This is for times when the scrollbar is
+ * used in an object whose origin isn't the same as the main workspace
+ * (e.g. in a flyout.)
+ * @param {number} x The x coordinate of the scrollbar's origin, in CSS pixels.
+ * @param {number} y The y coordinate of the scrollbar's origin, in CSS pixels.
+ * @package
+ */
+Blockly.ScrollbarPair.prototype.setOrigin = function(x, y) {
+  if (this.hScroll) {
+    this.hScroll.setOrigin(x, y);
+  }
+  if (this.vScroll) {
+    this.vScroll.setOrigin(x, y);
+  }
+};
+
+/**
+ * Set the handles of both scrollbars.
+ * @param {number} x The horizontal content displacement, relative to the view
+ *    in pixels.
+ * @param {number} y The vertical content displacement, relative to the view in
+ *    pixels.
+ * @param {boolean} updateMetrics Whether to update metrics on this set call.
+ *    Defaults to true.
+ */
+Blockly.ScrollbarPair.prototype.set = function(x, y, updateMetrics) {
+  // This function is equivalent to:
+  //   this.hScroll.set(x);
+  //   this.vScroll.set(y);
+  // However, that calls setMetrics twice which causes a chain of
+  // getAttribute->setAttribute->getAttribute resulting in an extra layout pass.
+  // Combining them speeds up rendering.
+  if (this.hScroll) {
+    this.hScroll.set(x, false);
+  }
+  if (this.vScroll) {
+    this.vScroll.set(y, false);
+  }
+
+  if (updateMetrics || updateMetrics === undefined) {
+    // Update metrics.
+    var xyRatio = {};
+    if (this.hScroll) {
+      xyRatio.x = this.hScroll.getRatio_();
+    }
+    if (this.vScroll) {
+      xyRatio.y = this.vScroll.getRatio_();
+    }
+    this.workspace_.setMetrics(xyRatio);
+  }
+};
+
+/**
+ * Set the handle of the horizontal scrollbar to be at a certain position in
+ *    CSS pixels relative to its parents.
+ * @param {number} x Horizontal scroll value.
+ */
+Blockly.ScrollbarPair.prototype.setX = function(x) {
+  if (this.hScroll) {
+    this.hScroll.set(x, true);
+  }
+};
+
+/**
+ * Set the handle of the vertical scrollbar to be at a certain position in
+ *    CSS pixels relative to its parents.
+ * @param {number} y Vertical scroll value.
+ */
+Blockly.ScrollbarPair.prototype.setY = function(y) {
+  if (this.vScroll) {
+    this.vScroll.set(y, true);
+  }
+};
+
+/**
+ * Set whether this scrollbar's container is visible.
+ * @param {boolean} visible Whether the container is visible.
+ */
+Blockly.ScrollbarPair.prototype.setContainerVisible = function(visible) {
+  if (this.hScroll) {
+    this.hScroll.setContainerVisible(visible);
+  }
+  if (this.vScroll) {
+    this.vScroll.setContainerVisible(visible);
+  }
+};
+
+/**
+ * If any of the scrollbars are visible. Non-paired scrollbars may disappear
+ * when they aren't needed.
+ * @return {boolean} True if visible.
+ */
+Blockly.ScrollbarPair.prototype.isVisible = function() {
+  var isVisible = false;
+  if (this.hScroll) {
+    isVisible = this.hScroll.isVisible();
+  }
+  if (this.vScroll) {
+    isVisible = isVisible || this.vScroll.isVisible();
+  }
+  return isVisible;
+};
+
+/**
+ * Recalculates the scrollbars' locations within their path and length.
+ * This should be called when the contents of the workspace have changed.
+ * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ *     the required dimensions, possibly fetched from the host object.
+ */
+Blockly.ScrollbarPair.prototype.resizeContent = function(hostMetrics) {
+  if (this.hScroll) {
+    this.hScroll.resizeContentHorizontal(hostMetrics);
+  }
+  if (this.vScroll) {
+    this.vScroll.resizeContentVertical(hostMetrics);
+  }
+};
+
+/**
+ * Recalculates the scrollbars' locations on the screen and path length.
+ * This should be called when the layout or size of the window has changed.
+ * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ *     the required dimensions, possibly fetched from the host object.
+ */
+Blockly.ScrollbarPair.prototype.resizeView = function(hostMetrics) {
+  if (this.hScroll) {
+    this.hScroll.resizeViewHorizontal(hostMetrics);
+  }
+  if (this.vScroll) {
+    this.vScroll.resizeViewVertical(hostMetrics);
+  }
+};
diff --git a/tests/deps.js b/tests/deps.js
index 07f8193b2..c03fb93f0 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -160,7 +160,8 @@ goog.addDependency('../../core/renderers/zelos/measurables/rows.js', ['Blockly.z
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider']);
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo']);
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
-goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar', 'Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.utils.KeyCodes']);
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 308d03bd5011990be0da6de996bf22bf4dda60e1 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:24:11 -0700
Subject: [PATCH 458/833] Migrate core/scrollbar.js and core/scrollbar_pair.js
 to ES6 const/let

---
 core/scrollbar.js      | 84 +++++++++++++++++++++---------------------
 core/scrollbar_pair.js | 12 +++---
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/core/scrollbar.js b/core/scrollbar.js
index 25bdef776..45f7e17e6 100644
--- a/core/scrollbar.js
+++ b/core/scrollbar.js
@@ -93,7 +93,7 @@ Blockly.Scrollbar = function(
   this.position = new Blockly.utils.Coordinate(0, 0);
 
   // Store the thickness in a temp variable for readability.
-  var scrollbarThickness = Blockly.Scrollbar.scrollbarThickness;
+  const scrollbarThickness = Blockly.Scrollbar.scrollbarThickness;
   if (horizontal) {
     this.svgBackground_.setAttribute('height', scrollbarThickness);
     this.outerSvg_.setAttribute('height', scrollbarThickness);
@@ -111,7 +111,7 @@ Blockly.Scrollbar = function(
     this.lengthAttribute_ = 'height';
     this.positionAttribute_ = 'y';
   }
-  var scrollbar = this;
+  const scrollbar = this;
   this.onMouseDownBarWrapper_ = Blockly.browserEvents.conditionalBind(
       this.svgBackground_, 'mousedown', scrollbar, scrollbar.onMouseDownBar_);
   this.onMouseDownHandleWrapper_ = Blockly.browserEvents.conditionalBind(
@@ -318,9 +318,9 @@ Blockly.Scrollbar.prototype.setPosition = function(x, y) {
   this.position.x = x;
   this.position.y = y;
 
-  var tempX = this.position.x + this.origin_.x;
-  var tempY = this.position.y + this.origin_.y;
-  var transform = 'translate(' + tempX + 'px,' + tempY + 'px)';
+  const tempX = this.position.x + this.origin_.x;
+  const tempY = this.position.y + this.origin_.y;
+  const transform = 'translate(' + tempX + 'px,' + tempY + 'px)';
   Blockly.utils.dom.setCssTransform(this.outerSvg_, transform);
 };
 
@@ -332,7 +332,7 @@ Blockly.Scrollbar.prototype.setPosition = function(x, y) {
  */
 Blockly.Scrollbar.prototype.resize = function(opt_metrics) {
   // Determine the location, height and width of the host element.
-  var hostMetrics = opt_metrics;
+  let hostMetrics = opt_metrics;
   if (!hostMetrics) {
     hostMetrics = this.workspace_.getMetrics();
     if (!hostMetrics) {
@@ -397,21 +397,21 @@ Blockly.Scrollbar.prototype.resizeHorizontal_ = function(hostMetrics) {
  *     the required dimensions, possibly fetched from the host object.
  */
 Blockly.Scrollbar.prototype.resizeViewHorizontal = function(hostMetrics) {
-  var viewSize = hostMetrics.viewWidth - this.margin_ * 2;
+  let viewSize = hostMetrics.viewWidth - this.margin_ * 2;
   if (this.pair_) {
     // Shorten the scrollbar to make room for the corner square.
     viewSize -= Blockly.Scrollbar.scrollbarThickness;
   }
   this.setScrollbarLength_(Math.max(0, viewSize));
 
-  var xCoordinate =
+  let xCoordinate =
       hostMetrics.absoluteLeft + this.margin_;
   if (this.pair_ && this.workspace_.RTL) {
     xCoordinate += Blockly.Scrollbar.scrollbarThickness;
   }
 
   // Horizontal toolbar should always be just above the bottom of the workspace.
-  var yCoordinate = hostMetrics.absoluteTop + hostMetrics.viewHeight -
+  const yCoordinate = hostMetrics.absoluteTop + hostMetrics.viewHeight -
       Blockly.Scrollbar.scrollbarThickness - this.margin_;
   this.setPosition(xCoordinate, yCoordinate);
 
@@ -445,7 +445,7 @@ Blockly.Scrollbar.prototype.resizeContentHorizontal = function(hostMetrics) {
   }
 
   // Resize the handle.
-  var handleLength =
+  let handleLength =
       this.scrollbarLength_ * hostMetrics.viewWidth / hostMetrics.scrollWidth;
   handleLength = this.constrainHandleLength_(handleLength);
   this.setHandleLength_(handleLength);
@@ -459,13 +459,13 @@ Blockly.Scrollbar.prototype.resizeContentHorizontal = function(hostMetrics) {
   //     then viewLeft = scrollLeft + scrollWidth - viewWidth
   //     then the offset should be max offset
 
-  var maxScrollDistance = hostMetrics.scrollWidth - hostMetrics.viewWidth;
-  var contentDisplacement = hostMetrics.viewLeft - hostMetrics.scrollLeft;
+  const maxScrollDistance = hostMetrics.scrollWidth - hostMetrics.viewWidth;
+  const contentDisplacement = hostMetrics.viewLeft - hostMetrics.scrollLeft;
   // Percent of content to the left of our current position.
-  var offsetRatio = contentDisplacement / maxScrollDistance;
+  const offsetRatio = contentDisplacement / maxScrollDistance;
   // Area available to scroll * percent to the left
-  var maxHandleOffset = this.scrollbarLength_ - this.handleLength_;
-  var handleOffset = maxHandleOffset * offsetRatio;
+  const maxHandleOffset = this.scrollbarLength_ - this.handleLength_;
+  let handleOffset = maxHandleOffset * offsetRatio;
   handleOffset = this.constrainHandlePosition_(handleOffset);
   this.setHandlePosition(handleOffset);
 
@@ -494,19 +494,19 @@ Blockly.Scrollbar.prototype.resizeVertical_ = function(hostMetrics) {
  *     the required dimensions, possibly fetched from the host object.
  */
 Blockly.Scrollbar.prototype.resizeViewVertical = function(hostMetrics) {
-  var viewSize = hostMetrics.viewHeight - this.margin_ * 2;
+  let viewSize = hostMetrics.viewHeight - this.margin_ * 2;
   if (this.pair_) {
     // Shorten the scrollbar to make room for the corner square.
     viewSize -= Blockly.Scrollbar.scrollbarThickness;
   }
   this.setScrollbarLength_(Math.max(0, viewSize));
 
-  var xCoordinate = this.workspace_.RTL ?
+  const xCoordinate = this.workspace_.RTL ?
       hostMetrics.absoluteLeft + this.margin_ :
       hostMetrics.absoluteLeft + hostMetrics.viewWidth -
       Blockly.Scrollbar.scrollbarThickness - this.margin_;
 
-  var yCoordinate = hostMetrics.absoluteTop + this.margin_;
+  const yCoordinate = hostMetrics.absoluteTop + this.margin_;
   this.setPosition(xCoordinate, yCoordinate);
 
   // If the view has been resized, a content resize will also be necessary.  The
@@ -539,7 +539,7 @@ Blockly.Scrollbar.prototype.resizeContentVertical = function(hostMetrics) {
   }
 
   // Resize the handle.
-  var handleLength =
+  let handleLength =
       this.scrollbarLength_ * hostMetrics.viewHeight / hostMetrics.scrollHeight;
   handleLength = this.constrainHandleLength_(handleLength);
   this.setHandleLength_(handleLength);
@@ -553,13 +553,13 @@ Blockly.Scrollbar.prototype.resizeContentVertical = function(hostMetrics) {
   //     then viewTop = scrollTop + scrollHeight - viewHeight
   //     then the offset should be max offset
 
-  var maxScrollDistance = hostMetrics.scrollHeight - hostMetrics.viewHeight;
-  var contentDisplacement = hostMetrics.viewTop - hostMetrics.scrollTop;
+  const maxScrollDistance = hostMetrics.scrollHeight - hostMetrics.viewHeight;
+  const contentDisplacement = hostMetrics.viewTop - hostMetrics.scrollTop;
   // Percent of content to the left of our current position.
-  var offsetRatio = contentDisplacement / maxScrollDistance;
+  const offsetRatio = contentDisplacement / maxScrollDistance;
   // Area available to scroll * percent to the left
-  var maxHandleOffset = this.scrollbarLength_ - this.handleLength_;
-  var handleOffset = maxHandleOffset * offsetRatio;
+  const maxHandleOffset = this.scrollbarLength_ - this.handleLength_;
+  let handleOffset = maxHandleOffset * offsetRatio;
   handleOffset = this.constrainHandlePosition_(handleOffset);
   this.setHandlePosition(handleOffset);
 
@@ -582,7 +582,7 @@ Blockly.Scrollbar.prototype.createDom_ = function(opt_class) {
     </g>
   </svg>
   */
-  var className = 'blocklyScrollbar' +
+  let className = 'blocklyScrollbar' +
       (this.horizontal_ ? 'Horizontal' : 'Vertical');
   if (opt_class) {
     className += ' ' + opt_class;
@@ -595,7 +595,7 @@ Blockly.Scrollbar.prototype.createDom_ = function(opt_class) {
       Blockly.utils.Svg.RECT, {
         'class': 'blocklyScrollbarBackground'
       }, this.svgGroup_);
-  var radius = Math.floor((Blockly.Scrollbar.scrollbarThickness - 5) / 2);
+  const radius = Math.floor((Blockly.Scrollbar.scrollbarThickness - 5) / 2);
   this.svgHandle_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.RECT,
       {
@@ -627,7 +627,7 @@ Blockly.Scrollbar.prototype.isVisible = function() {
  * @param {boolean} visible Whether the container is visible
  */
 Blockly.Scrollbar.prototype.setContainerVisible = function(visible) {
-  var visibilityChanged = (visible != this.containerVisible_);
+  const visibilityChanged = (visible != this.containerVisible_);
 
   this.containerVisible_ = visible;
   if (visibilityChanged) {
@@ -641,7 +641,7 @@ Blockly.Scrollbar.prototype.setContainerVisible = function(visible) {
  * @param {boolean} visible True if visible.
  */
 Blockly.Scrollbar.prototype.setVisible = function(visible) {
-  var visibilityChanged = (visible != this.isVisible());
+  const visibilityChanged = (visible != this.isVisible());
 
   // Ideally this would also apply to scrollbar pairs, but that's a bigger
   // headache (due to interactions with the corner square).
@@ -661,7 +661,7 @@ Blockly.Scrollbar.prototype.setVisible = function(visible) {
  * because it is not necessarily our parent in the DOM.
  */
 Blockly.Scrollbar.prototype.updateDisplay_ = function() {
-  var show = true;
+  let show = true;
   // Check whether our parent/container is visible.
   if (!this.containerVisible_) {
     show = false;
@@ -691,16 +691,16 @@ Blockly.Scrollbar.prototype.onMouseDownBar_ = function(e) {
     e.stopPropagation();
     return;
   }
-  var mouseXY = Blockly.utils.mouseToSvg(e,
+  const mouseXY = Blockly.utils.mouseToSvg(e,
       this.workspace_.getParentSvg(),
       this.workspace_.getInverseScreenCTM());
-  var mouseLocation = this.horizontal_ ? mouseXY.x : mouseXY.y;
+  const mouseLocation = this.horizontal_ ? mouseXY.x : mouseXY.y;
 
-  var handleXY = Blockly.utils.getInjectionDivXY_(this.svgHandle_);
-  var handleStart = this.horizontal_ ? handleXY.x : handleXY.y;
-  var handlePosition = this.handlePosition_;
+  const handleXY = Blockly.utils.getInjectionDivXY_(this.svgHandle_);
+  const handleStart = this.horizontal_ ? handleXY.x : handleXY.y;
+  let handlePosition = this.handlePosition_;
 
-  var pageLength = this.handleLength_ * 0.95;
+  const pageLength = this.handleLength_ * 0.95;
   if (mouseLocation <= handleStart) {
     // Decrease the scrollbar's value by a page.
     handlePosition -= pageLength;
@@ -755,9 +755,9 @@ Blockly.Scrollbar.prototype.onMouseDownHandle_ = function(e) {
  * @private
  */
 Blockly.Scrollbar.prototype.onMouseMoveHandle_ = function(e) {
-  var currentMouse = this.horizontal_ ? e.clientX : e.clientY;
-  var mouseDelta = currentMouse - this.startDragMouse_;
-  var handlePosition = this.startDragHandle + mouseDelta;
+  const currentMouse = this.horizontal_ ? e.clientX : e.clientY;
+  const mouseDelta = currentMouse - this.startDragMouse_;
+  const handlePosition = this.startDragHandle + mouseDelta;
   // Position the bar.
   this.setHandlePosition(this.constrainHandlePosition_(handlePosition));
   this.updateMetrics_();
@@ -797,8 +797,8 @@ Blockly.Scrollbar.prototype.cleanUp_ = function() {
  * @package
  */
 Blockly.Scrollbar.prototype.getRatio_ = function() {
-  var scrollHandleRange = this.scrollbarLength_ - this.handleLength_;
-  var ratio = this.handlePosition_ / scrollHandleRange;
+  const scrollHandleRange = this.scrollbarLength_ - this.handleLength_;
+  let ratio = this.handlePosition_ / scrollHandleRange;
   if (isNaN(ratio)) {
     ratio = 0;
   }
@@ -811,8 +811,8 @@ Blockly.Scrollbar.prototype.getRatio_ = function() {
  * @private
  */
 Blockly.Scrollbar.prototype.updateMetrics_ = function() {
-  var ratio = this.getRatio_();
-  var xyRatio = {};
+  const ratio = this.getRatio_();
+  const xyRatio = {};
   if (this.horizontal_) {
     xyRatio.x = ratio;
   } else {
diff --git a/core/scrollbar_pair.js b/core/scrollbar_pair.js
index 3caf986e7..7f7aa0ee2 100644
--- a/core/scrollbar_pair.js
+++ b/core/scrollbar_pair.js
@@ -44,7 +44,7 @@ Blockly.ScrollbarPair = function(
 
   addHorizontal = addHorizontal === undefined ? true : addHorizontal;
   addVertical = addVertical === undefined ? true : addVertical;
-  var isPair = addHorizontal && addVertical;
+  const isPair = addHorizontal && addVertical;
 
   if (addHorizontal) {
     this.hScroll = new Blockly.Scrollbar(
@@ -101,15 +101,15 @@ Blockly.ScrollbarPair.prototype.dispose = function() {
  */
 Blockly.ScrollbarPair.prototype.resize = function() {
   // Look up the host metrics once, and use for both scrollbars.
-  var hostMetrics = this.workspace_.getMetrics();
+  const hostMetrics = this.workspace_.getMetrics();
   if (!hostMetrics) {
     // Host element is likely not visible.
     return;
   }
 
   // Only change the scrollbars if there has been a change in metrics.
-  var resizeH = false;
-  var resizeV = false;
+  let resizeH = false;
+  let resizeV = false;
   if (!this.oldHostMetrics_ ||
       this.oldHostMetrics_.viewWidth != hostMetrics.viewWidth ||
       this.oldHostMetrics_.viewHeight != hostMetrics.viewHeight ||
@@ -226,7 +226,7 @@ Blockly.ScrollbarPair.prototype.set = function(x, y, updateMetrics) {
 
   if (updateMetrics || updateMetrics === undefined) {
     // Update metrics.
-    var xyRatio = {};
+    const xyRatio = {};
     if (this.hScroll) {
       xyRatio.x = this.hScroll.getRatio_();
     }
@@ -278,7 +278,7 @@ Blockly.ScrollbarPair.prototype.setContainerVisible = function(visible) {
  * @return {boolean} True if visible.
  */
 Blockly.ScrollbarPair.prototype.isVisible = function() {
-  var isVisible = false;
+  let isVisible = false;
   if (this.hScroll) {
     isVisible = this.hScroll.isVisible();
   }

From 5bbc49c21a6c923cfbc6c37533c96594a312f737 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:42:36 -0700
Subject: [PATCH 459/833] Migrate core/scrollbar.js and core/scrollbar_pair.js
 to goog.module

---
 core/scrollbar.js      | 123 +++++++++++++++++++++--------------------
 core/scrollbar_pair.js |  31 ++++++-----
 tests/deps.js          |   4 +-
 3 files changed, 83 insertions(+), 75 deletions(-)

diff --git a/core/scrollbar.js b/core/scrollbar.js
index 45f7e17e6..2ad6bb348 100644
--- a/core/scrollbar.js
+++ b/core/scrollbar.js
@@ -10,8 +10,11 @@
  */
 'use strict';
 
-goog.provide('Blockly.Scrollbar');
+goog.module('Blockly.Scrollbar');
+goog.module.declareLegacyNamespace();
 
+// TODO(#5073): Add Blockly require after fixing circular dependency.
+// goog.require('Blockly');
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
@@ -39,7 +42,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @param {number=} opt_margin The margin to apply to this scrollbar.
  * @constructor
  */
-Blockly.Scrollbar = function(
+const Scrollbar = function(
     workspace, horizontal, opt_pair, opt_class, opt_margin) {
   /**
    * The workspace this scrollbar is bound to.
@@ -67,7 +70,7 @@ Blockly.Scrollbar = function(
    * @private
    */
   this.margin_ = (opt_margin !== undefined) ?
-      opt_margin : Blockly.Scrollbar.DEFAULT_SCROLLBAR_MARGIN;
+      opt_margin : Scrollbar.DEFAULT_SCROLLBAR_MARGIN;
   /**
    * Previously recorded metrics from the workspace.
    * @type {?Blockly.utils.Metrics}
@@ -93,7 +96,7 @@ Blockly.Scrollbar = function(
   this.position = new Blockly.utils.Coordinate(0, 0);
 
   // Store the thickness in a temp variable for readability.
-  const scrollbarThickness = Blockly.Scrollbar.scrollbarThickness;
+  const scrollbarThickness = Scrollbar.scrollbarThickness;
   if (horizontal) {
     this.svgBackground_.setAttribute('height', scrollbarThickness);
     this.outerSvg_.setAttribute('height', scrollbarThickness);
@@ -125,7 +128,7 @@ Blockly.Scrollbar = function(
  * @type {Blockly.utils.Coordinate}
  * @private
  */
-Blockly.Scrollbar.prototype.origin_ = new Blockly.utils.Coordinate(0, 0);
+Scrollbar.prototype.origin_ = new Blockly.utils.Coordinate(0, 0);
 
 /**
  * The position of the mouse along this scrollbar's major axis at the start of
@@ -136,7 +139,7 @@ Blockly.Scrollbar.prototype.origin_ = new Blockly.utils.Coordinate(0, 0);
  * @type {number}
  * @private
  */
-Blockly.Scrollbar.prototype.startDragMouse_ = 0;
+Scrollbar.prototype.startDragMouse_ = 0;
 
 /**
  * The length of the scrollbars (including the handle and the background), in
@@ -145,14 +148,14 @@ Blockly.Scrollbar.prototype.startDragMouse_ = 0;
  * @type {number}
  * @private
  */
-Blockly.Scrollbar.prototype.scrollbarLength_ = 0;
+Scrollbar.prototype.scrollbarLength_ = 0;
 
 /**
  * The length of the scrollbar handle in CSS pixels.
  * @type {number}
  * @private
  */
-Blockly.Scrollbar.prototype.handleLength_ = 0;
+Scrollbar.prototype.handleLength_ = 0;
 
 /**
  * The offset of the start of the handle from the scrollbar position, in CSS
@@ -160,29 +163,29 @@ Blockly.Scrollbar.prototype.handleLength_ = 0;
  * @type {number}
  * @private
  */
-Blockly.Scrollbar.prototype.handlePosition_ = 0;
+Scrollbar.prototype.handlePosition_ = 0;
 
 /**
  * Whether the scrollbar handle is visible.
  * @type {boolean}
  * @private
  */
-Blockly.Scrollbar.prototype.isVisible_ = true;
+Scrollbar.prototype.isVisible_ = true;
 
 /**
  * Whether the workspace containing this scrollbar is visible.
  * @type {boolean}
  * @private
  */
-Blockly.Scrollbar.prototype.containerVisible_ = true;
+Scrollbar.prototype.containerVisible_ = true;
 
 /**
  * Width of vertical scrollbar or height of horizontal scrollbar in CSS pixels.
  * Scrollbars should be larger on touch devices.
  */
-Blockly.Scrollbar.scrollbarThickness = 15;
+Scrollbar.scrollbarThickness = 15;
 if (Blockly.Touch.TOUCH_ENABLED) {
-  Blockly.Scrollbar.scrollbarThickness = 25;
+  Scrollbar.scrollbarThickness = 25;
 }
 
 /**
@@ -192,7 +195,7 @@ if (Blockly.Touch.TOUCH_ENABLED) {
  * @const
  * @package
  */
-Blockly.Scrollbar.DEFAULT_SCROLLBAR_MARGIN = 0.5;
+Scrollbar.DEFAULT_SCROLLBAR_MARGIN = 0.5;
 
 
 /**
@@ -203,7 +206,7 @@ Blockly.Scrollbar.DEFAULT_SCROLLBAR_MARGIN = 0.5;
  * @return {boolean} Whether the two sets of metrics are equivalent.
  * @private
  */
-Blockly.Scrollbar.metricsAreEquivalent_ = function(first, second) {
+Scrollbar.metricsAreEquivalent_ = function(first, second) {
   return (first.viewWidth == second.viewWidth &&
       first.viewHeight == second.viewHeight &&
       first.viewLeft == second.viewLeft &&
@@ -221,7 +224,7 @@ Blockly.Scrollbar.metricsAreEquivalent_ = function(first, second) {
  * Unlink from all DOM elements to prevent memory leaks.
  * @suppress {checkTypes}
  */
-Blockly.Scrollbar.prototype.dispose = function() {
+Scrollbar.prototype.dispose = function() {
   this.cleanUp_();
   Blockly.browserEvents.unbind(this.onMouseDownBarWrapper_);
   this.onMouseDownBarWrapper_ = null;
@@ -246,7 +249,7 @@ Blockly.Scrollbar.prototype.dispose = function() {
  * @return {number} Constrained value, in CSS pixels.
  * @private
  */
-Blockly.Scrollbar.prototype.constrainHandleLength_ = function(value) {
+Scrollbar.prototype.constrainHandleLength_ = function(value) {
   if (value <= 0 || isNaN(value)) {
     value = 0;
   } else {
@@ -261,7 +264,7 @@ Blockly.Scrollbar.prototype.constrainHandleLength_ = function(value) {
  * @param {number} newLength The new scrollbar handle length in CSS pixels.
  * @private
  */
-Blockly.Scrollbar.prototype.setHandleLength_ = function(newLength) {
+Scrollbar.prototype.setHandleLength_ = function(newLength) {
   this.handleLength_ = newLength;
   this.svgHandle_.setAttribute(this.lengthAttribute_, this.handleLength_);
 };
@@ -273,7 +276,7 @@ Blockly.Scrollbar.prototype.setHandleLength_ = function(newLength) {
  * @return {number} Constrained value, in CSS pixels.
  * @private
  */
-Blockly.Scrollbar.prototype.constrainHandlePosition_ = function(value) {
+Scrollbar.prototype.constrainHandlePosition_ = function(value) {
   if (value <= 0 || isNaN(value)) {
     value = 0;
   } else {
@@ -290,7 +293,7 @@ Blockly.Scrollbar.prototype.constrainHandlePosition_ = function(value) {
  * change the SVG attribute accordingly.
  * @param {number} newPosition The new scrollbar handle offset in CSS pixels.
  */
-Blockly.Scrollbar.prototype.setHandlePosition = function(newPosition) {
+Scrollbar.prototype.setHandlePosition = function(newPosition) {
   this.handlePosition_ = newPosition;
   this.svgHandle_.setAttribute(this.positionAttribute_, this.handlePosition_);
 };
@@ -301,7 +304,7 @@ Blockly.Scrollbar.prototype.setHandlePosition = function(newPosition) {
  * @param {number} newSize The new scrollbar background length in CSS pixels.
  * @private
  */
-Blockly.Scrollbar.prototype.setScrollbarLength_ = function(newSize) {
+Scrollbar.prototype.setScrollbarLength_ = function(newSize) {
   this.scrollbarLength_ = newSize;
   this.outerSvg_.setAttribute(this.lengthAttribute_, this.scrollbarLength_);
   this.svgBackground_.setAttribute(this.lengthAttribute_, this.scrollbarLength_);
@@ -314,7 +317,7 @@ Blockly.Scrollbar.prototype.setScrollbarLength_ = function(newSize) {
  * @param {number} y The new y coordinate.
  * @package
  */
-Blockly.Scrollbar.prototype.setPosition = function(x, y) {
+Scrollbar.prototype.setPosition = function(x, y) {
   this.position.x = x;
   this.position.y = y;
 
@@ -330,7 +333,7 @@ Blockly.Scrollbar.prototype.setPosition = function(x, y) {
  *     describing all the required dimensions.  If not provided, it will be
  *     fetched from the host object.
  */
-Blockly.Scrollbar.prototype.resize = function(opt_metrics) {
+Scrollbar.prototype.resize = function(opt_metrics) {
   // Determine the location, height and width of the host element.
   let hostMetrics = opt_metrics;
   if (!hostMetrics) {
@@ -341,7 +344,7 @@ Blockly.Scrollbar.prototype.resize = function(opt_metrics) {
     }
   }
 
-  if (this.oldHostMetrics_ && Blockly.Scrollbar.metricsAreEquivalent_(
+  if (this.oldHostMetrics_ && Scrollbar.metricsAreEquivalent_(
       hostMetrics, this.oldHostMetrics_)) {
     return;
   }
@@ -366,7 +369,7 @@ Blockly.Scrollbar.prototype.resize = function(opt_metrics) {
  * @return {boolean} Whether a resizeView is necessary.
  * @private
  */
-Blockly.Scrollbar.prototype.requiresViewResize_ = function(hostMetrics) {
+Scrollbar.prototype.requiresViewResize_ = function(hostMetrics) {
   if (!this.oldHostMetrics_) {
     return true;
   }
@@ -382,7 +385,7 @@ Blockly.Scrollbar.prototype.requiresViewResize_ = function(hostMetrics) {
  *     the required dimensions, possibly fetched from the host object.
  * @private
  */
-Blockly.Scrollbar.prototype.resizeHorizontal_ = function(hostMetrics) {
+Scrollbar.prototype.resizeHorizontal_ = function(hostMetrics) {
   if (this.requiresViewResize_(hostMetrics)) {
     this.resizeViewHorizontal(hostMetrics);
   } else {
@@ -396,23 +399,23 @@ Blockly.Scrollbar.prototype.resizeHorizontal_ = function(hostMetrics) {
  * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
-Blockly.Scrollbar.prototype.resizeViewHorizontal = function(hostMetrics) {
+Scrollbar.prototype.resizeViewHorizontal = function(hostMetrics) {
   let viewSize = hostMetrics.viewWidth - this.margin_ * 2;
   if (this.pair_) {
     // Shorten the scrollbar to make room for the corner square.
-    viewSize -= Blockly.Scrollbar.scrollbarThickness;
+    viewSize -= Scrollbar.scrollbarThickness;
   }
   this.setScrollbarLength_(Math.max(0, viewSize));
 
   let xCoordinate =
       hostMetrics.absoluteLeft + this.margin_;
   if (this.pair_ && this.workspace_.RTL) {
-    xCoordinate += Blockly.Scrollbar.scrollbarThickness;
+    xCoordinate += Scrollbar.scrollbarThickness;
   }
 
   // Horizontal toolbar should always be just above the bottom of the workspace.
   const yCoordinate = hostMetrics.absoluteTop + hostMetrics.viewHeight -
-      Blockly.Scrollbar.scrollbarThickness - this.margin_;
+      Scrollbar.scrollbarThickness - this.margin_;
   this.setPosition(xCoordinate, yCoordinate);
 
   // If the view has been resized, a content resize will also be necessary.
@@ -426,7 +429,7 @@ Blockly.Scrollbar.prototype.resizeViewHorizontal = function(hostMetrics) {
  * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
-Blockly.Scrollbar.prototype.resizeContentHorizontal = function(hostMetrics) {
+Scrollbar.prototype.resizeContentHorizontal = function(hostMetrics) {
   if (hostMetrics.viewWidth >= hostMetrics.scrollWidth) {
     // viewWidth is often greater than scrollWidth in flyouts and
     // non-scrollable workspaces.
@@ -479,7 +482,7 @@ Blockly.Scrollbar.prototype.resizeContentHorizontal = function(hostMetrics) {
  *     the required dimensions, possibly fetched from the host object.
  * @private
  */
-Blockly.Scrollbar.prototype.resizeVertical_ = function(hostMetrics) {
+Scrollbar.prototype.resizeVertical_ = function(hostMetrics) {
   if (this.requiresViewResize_(hostMetrics)) {
     this.resizeViewVertical(hostMetrics);
   } else {
@@ -493,18 +496,18 @@ Blockly.Scrollbar.prototype.resizeVertical_ = function(hostMetrics) {
  * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
-Blockly.Scrollbar.prototype.resizeViewVertical = function(hostMetrics) {
+Scrollbar.prototype.resizeViewVertical = function(hostMetrics) {
   let viewSize = hostMetrics.viewHeight - this.margin_ * 2;
   if (this.pair_) {
     // Shorten the scrollbar to make room for the corner square.
-    viewSize -= Blockly.Scrollbar.scrollbarThickness;
+    viewSize -= Scrollbar.scrollbarThickness;
   }
   this.setScrollbarLength_(Math.max(0, viewSize));
 
   const xCoordinate = this.workspace_.RTL ?
       hostMetrics.absoluteLeft + this.margin_ :
       hostMetrics.absoluteLeft + hostMetrics.viewWidth -
-      Blockly.Scrollbar.scrollbarThickness - this.margin_;
+      Scrollbar.scrollbarThickness - this.margin_;
 
   const yCoordinate = hostMetrics.absoluteTop + this.margin_;
   this.setPosition(xCoordinate, yCoordinate);
@@ -520,7 +523,7 @@ Blockly.Scrollbar.prototype.resizeViewVertical = function(hostMetrics) {
  * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
-Blockly.Scrollbar.prototype.resizeContentVertical = function(hostMetrics) {
+Scrollbar.prototype.resizeContentVertical = function(hostMetrics) {
   if (hostMetrics.viewHeight >= hostMetrics.scrollHeight) {
     // viewHeight is often greater than scrollHeight in flyouts and
     // non-scrollable workspaces.
@@ -573,7 +576,7 @@ Blockly.Scrollbar.prototype.resizeContentVertical = function(hostMetrics) {
  * @param {string=} opt_class A class to be applied to this scrollbar.
  * @private
  */
-Blockly.Scrollbar.prototype.createDom_ = function(opt_class) {
+Scrollbar.prototype.createDom_ = function(opt_class) {
   /* Create the following DOM:
   <svg class="blocklyScrollbarHorizontal  optionalClass">
     <g>
@@ -595,7 +598,7 @@ Blockly.Scrollbar.prototype.createDom_ = function(opt_class) {
       Blockly.utils.Svg.RECT, {
         'class': 'blocklyScrollbarBackground'
       }, this.svgGroup_);
-  const radius = Math.floor((Blockly.Scrollbar.scrollbarThickness - 5) / 2);
+  const radius = Math.floor((Scrollbar.scrollbarThickness - 5) / 2);
   this.svgHandle_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.RECT,
       {
@@ -617,7 +620,7 @@ Blockly.Scrollbar.prototype.createDom_ = function(opt_class) {
  * needed.
  * @return {boolean} True if visible.
  */
-Blockly.Scrollbar.prototype.isVisible = function() {
+Scrollbar.prototype.isVisible = function() {
   return this.isVisible_;
 };
 
@@ -626,7 +629,7 @@ Blockly.Scrollbar.prototype.isVisible = function() {
  * display accordingly if visibility has changed.
  * @param {boolean} visible Whether the container is visible
  */
-Blockly.Scrollbar.prototype.setContainerVisible = function(visible) {
+Scrollbar.prototype.setContainerVisible = function(visible) {
   const visibilityChanged = (visible != this.containerVisible_);
 
   this.containerVisible_ = visible;
@@ -640,7 +643,7 @@ Blockly.Scrollbar.prototype.setContainerVisible = function(visible) {
  * Only applies to non-paired scrollbars.
  * @param {boolean} visible True if visible.
  */
-Blockly.Scrollbar.prototype.setVisible = function(visible) {
+Scrollbar.prototype.setVisible = function(visible) {
   const visibilityChanged = (visible != this.isVisible());
 
   // Ideally this would also apply to scrollbar pairs, but that's a bigger
@@ -660,7 +663,7 @@ Blockly.Scrollbar.prototype.setVisible = function(visible) {
  * We cannot rely on the containing workspace being hidden to hide us
  * because it is not necessarily our parent in the DOM.
  */
-Blockly.Scrollbar.prototype.updateDisplay_ = function() {
+Scrollbar.prototype.updateDisplay_ = function() {
   let show = true;
   // Check whether our parent/container is visible.
   if (!this.containerVisible_) {
@@ -681,7 +684,7 @@ Blockly.Scrollbar.prototype.updateDisplay_ = function() {
  * @param {!Event} e Mouse down event.
  * @private
  */
-Blockly.Scrollbar.prototype.onMouseDownBar_ = function(e) {
+Scrollbar.prototype.onMouseDownBar_ = function(e) {
   this.workspace_.markFocused();
   Blockly.Touch.clearTouchIdentifier();  // This is really a click.
   this.cleanUp_();
@@ -722,7 +725,7 @@ Blockly.Scrollbar.prototype.onMouseDownBar_ = function(e) {
  * @param {!Event} e Mouse down event.
  * @private
  */
-Blockly.Scrollbar.prototype.onMouseDownHandle_ = function(e) {
+Scrollbar.prototype.onMouseDownHandle_ = function(e) {
   this.workspace_.markFocused();
   this.cleanUp_();
   if (Blockly.utils.isRightButton(e)) {
@@ -741,9 +744,9 @@ Blockly.Scrollbar.prototype.onMouseDownHandle_ = function(e) {
 
   // Record the current mouse position.
   this.startDragMouse_ = this.horizontal_ ? e.clientX : e.clientY;
-  Blockly.Scrollbar.onMouseUpWrapper_ = Blockly.browserEvents.conditionalBind(
+  Scrollbar.onMouseUpWrapper_ = Blockly.browserEvents.conditionalBind(
       document, 'mouseup', this, this.onMouseUpHandle_);
-  Blockly.Scrollbar.onMouseMoveWrapper_ = Blockly.browserEvents.conditionalBind(
+  Scrollbar.onMouseMoveWrapper_ = Blockly.browserEvents.conditionalBind(
       document, 'mousemove', this, this.onMouseMoveHandle_);
   e.stopPropagation();
   e.preventDefault();
@@ -754,7 +757,7 @@ Blockly.Scrollbar.prototype.onMouseDownHandle_ = function(e) {
  * @param {!Event} e Mouse up event.
  * @private
  */
-Blockly.Scrollbar.prototype.onMouseMoveHandle_ = function(e) {
+Scrollbar.prototype.onMouseMoveHandle_ = function(e) {
   const currentMouse = this.horizontal_ ? e.clientX : e.clientY;
   const mouseDelta = currentMouse - this.startDragMouse_;
   const handlePosition = this.startDragHandle + mouseDelta;
@@ -767,7 +770,7 @@ Blockly.Scrollbar.prototype.onMouseMoveHandle_ = function(e) {
  * Release the scrollbar handle and reset state accordingly.
  * @private
  */
-Blockly.Scrollbar.prototype.onMouseUpHandle_ = function() {
+Scrollbar.prototype.onMouseUpHandle_ = function() {
   // Tell the workspace to clean up now that the workspace is done moving.
   this.workspace_.resetDragSurface();
   Blockly.Touch.clearTouchIdentifier();
@@ -779,15 +782,15 @@ Blockly.Scrollbar.prototype.onMouseUpHandle_ = function() {
  * wrap up loose ends associated with the scrollbar.
  * @private
  */
-Blockly.Scrollbar.prototype.cleanUp_ = function() {
+Scrollbar.prototype.cleanUp_ = function() {
   Blockly.hideChaff(true);
-  if (Blockly.Scrollbar.onMouseUpWrapper_) {
-    Blockly.browserEvents.unbind(Blockly.Scrollbar.onMouseUpWrapper_);
-    Blockly.Scrollbar.onMouseUpWrapper_ = null;
+  if (Scrollbar.onMouseUpWrapper_) {
+    Blockly.browserEvents.unbind(Scrollbar.onMouseUpWrapper_);
+    Scrollbar.onMouseUpWrapper_ = null;
   }
-  if (Blockly.Scrollbar.onMouseMoveWrapper_) {
-    Blockly.browserEvents.unbind(Blockly.Scrollbar.onMouseMoveWrapper_);
-    Blockly.Scrollbar.onMouseMoveWrapper_ = null;
+  if (Scrollbar.onMouseMoveWrapper_) {
+    Blockly.browserEvents.unbind(Scrollbar.onMouseMoveWrapper_);
+    Scrollbar.onMouseMoveWrapper_ = null;
   }
 };
 
@@ -796,7 +799,7 @@ Blockly.Scrollbar.prototype.cleanUp_ = function() {
  * @return {number} Ratio.
  * @package
  */
-Blockly.Scrollbar.prototype.getRatio_ = function() {
+Scrollbar.prototype.getRatio_ = function() {
   const scrollHandleRange = this.scrollbarLength_ - this.handleLength_;
   let ratio = this.handlePosition_ / scrollHandleRange;
   if (isNaN(ratio)) {
@@ -810,7 +813,7 @@ Blockly.Scrollbar.prototype.getRatio_ = function() {
  * moved.
  * @private
  */
-Blockly.Scrollbar.prototype.updateMetrics_ = function() {
+Scrollbar.prototype.updateMetrics_ = function() {
   const ratio = this.getRatio_();
   const xyRatio = {};
   if (this.horizontal_) {
@@ -828,7 +831,7 @@ Blockly.Scrollbar.prototype.updateMetrics_ = function() {
  * @param {boolean=} updateMetrics Whether to update metrics on this set call.
  *    Defaults to true.
  */
-Blockly.Scrollbar.prototype.set = function(value, updateMetrics) {
+Scrollbar.prototype.set = function(value, updateMetrics) {
   this.setHandlePosition(this.constrainHandlePosition_(value * this.ratio));
   if (updateMetrics || updateMetrics === undefined) {
     this.updateMetrics_();
@@ -843,6 +846,8 @@ Blockly.Scrollbar.prototype.set = function(value, updateMetrics) {
  * @param {number} x The x coordinate of the scrollbar's origin, in CSS pixels.
  * @param {number} y The y coordinate of the scrollbar's origin, in CSS pixels.
  */
-Blockly.Scrollbar.prototype.setOrigin = function(x, y) {
+Scrollbar.prototype.setOrigin = function(x, y) {
   this.origin_ = new Blockly.utils.Coordinate(x, y);
 };
+
+exports = Scrollbar;
diff --git a/core/scrollbar_pair.js b/core/scrollbar_pair.js
index 7f7aa0ee2..ce402b19d 100644
--- a/core/scrollbar_pair.js
+++ b/core/scrollbar_pair.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.ScrollbarPair');
+goog.module('Blockly.ScrollbarPair');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Scrollbar');
@@ -33,7 +34,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @param {number=} opt_margin The margin to apply to these scrollbars.
  * @constructor
  */
-Blockly.ScrollbarPair = function(
+const ScrollbarPair = function(
     workspace, addHorizontal, addVertical, opt_class, opt_margin) {
   /**
    * The workspace this scrollbar pair is bound to.
@@ -80,7 +81,7 @@ Blockly.ScrollbarPair = function(
  * Unlink from all DOM elements to prevent memory leaks.
  * @suppress {checkTypes}
  */
-Blockly.ScrollbarPair.prototype.dispose = function() {
+ScrollbarPair.prototype.dispose = function() {
   Blockly.utils.dom.removeNode(this.corner_);
   this.corner_ = null;
   this.workspace_ = null;
@@ -99,7 +100,7 @@ Blockly.ScrollbarPair.prototype.dispose = function() {
  * Recalculate both of the scrollbars' locations and lengths.
  * Also reposition the corner rectangle.
  */
-Blockly.ScrollbarPair.prototype.resize = function() {
+ScrollbarPair.prototype.resize = function() {
   // Look up the host metrics once, and use for both scrollbars.
   const hostMetrics = this.workspace_.getMetrics();
   if (!hostMetrics) {
@@ -171,7 +172,7 @@ Blockly.ScrollbarPair.prototype.resize = function() {
  * Returns whether scrolling horizontally is enabled.
  * @return {boolean} True if horizontal scroll is enabled.
  */
-Blockly.ScrollbarPair.prototype.canScrollHorizontally = function() {
+ScrollbarPair.prototype.canScrollHorizontally = function() {
   return !!this.hScroll;
 };
 
@@ -179,7 +180,7 @@ Blockly.ScrollbarPair.prototype.canScrollHorizontally = function() {
  * Returns whether scrolling vertically is enabled.
  * @return {boolean} True if vertical scroll is enabled.
  */
-Blockly.ScrollbarPair.prototype.canScrollVertically = function() {
+ScrollbarPair.prototype.canScrollVertically = function() {
   return !!this.vScroll;
 };
 
@@ -192,7 +193,7 @@ Blockly.ScrollbarPair.prototype.canScrollVertically = function() {
  * @param {number} y The y coordinate of the scrollbar's origin, in CSS pixels.
  * @package
  */
-Blockly.ScrollbarPair.prototype.setOrigin = function(x, y) {
+ScrollbarPair.prototype.setOrigin = function(x, y) {
   if (this.hScroll) {
     this.hScroll.setOrigin(x, y);
   }
@@ -210,7 +211,7 @@ Blockly.ScrollbarPair.prototype.setOrigin = function(x, y) {
  * @param {boolean} updateMetrics Whether to update metrics on this set call.
  *    Defaults to true.
  */
-Blockly.ScrollbarPair.prototype.set = function(x, y, updateMetrics) {
+ScrollbarPair.prototype.set = function(x, y, updateMetrics) {
   // This function is equivalent to:
   //   this.hScroll.set(x);
   //   this.vScroll.set(y);
@@ -242,7 +243,7 @@ Blockly.ScrollbarPair.prototype.set = function(x, y, updateMetrics) {
  *    CSS pixels relative to its parents.
  * @param {number} x Horizontal scroll value.
  */
-Blockly.ScrollbarPair.prototype.setX = function(x) {
+ScrollbarPair.prototype.setX = function(x) {
   if (this.hScroll) {
     this.hScroll.set(x, true);
   }
@@ -253,7 +254,7 @@ Blockly.ScrollbarPair.prototype.setX = function(x) {
  *    CSS pixels relative to its parents.
  * @param {number} y Vertical scroll value.
  */
-Blockly.ScrollbarPair.prototype.setY = function(y) {
+ScrollbarPair.prototype.setY = function(y) {
   if (this.vScroll) {
     this.vScroll.set(y, true);
   }
@@ -263,7 +264,7 @@ Blockly.ScrollbarPair.prototype.setY = function(y) {
  * Set whether this scrollbar's container is visible.
  * @param {boolean} visible Whether the container is visible.
  */
-Blockly.ScrollbarPair.prototype.setContainerVisible = function(visible) {
+ScrollbarPair.prototype.setContainerVisible = function(visible) {
   if (this.hScroll) {
     this.hScroll.setContainerVisible(visible);
   }
@@ -277,7 +278,7 @@ Blockly.ScrollbarPair.prototype.setContainerVisible = function(visible) {
  * when they aren't needed.
  * @return {boolean} True if visible.
  */
-Blockly.ScrollbarPair.prototype.isVisible = function() {
+ScrollbarPair.prototype.isVisible = function() {
   let isVisible = false;
   if (this.hScroll) {
     isVisible = this.hScroll.isVisible();
@@ -294,7 +295,7 @@ Blockly.ScrollbarPair.prototype.isVisible = function() {
  * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
-Blockly.ScrollbarPair.prototype.resizeContent = function(hostMetrics) {
+ScrollbarPair.prototype.resizeContent = function(hostMetrics) {
   if (this.hScroll) {
     this.hScroll.resizeContentHorizontal(hostMetrics);
   }
@@ -309,7 +310,7 @@ Blockly.ScrollbarPair.prototype.resizeContent = function(hostMetrics) {
  * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
-Blockly.ScrollbarPair.prototype.resizeView = function(hostMetrics) {
+ScrollbarPair.prototype.resizeView = function(hostMetrics) {
   if (this.hScroll) {
     this.hScroll.resizeViewHorizontal(hostMetrics);
   }
@@ -317,3 +318,5 @@ Blockly.ScrollbarPair.prototype.resizeView = function(hostMetrics) {
     this.vScroll.resizeViewVertical(hostMetrics);
   }
 };
+
+exports = ScrollbarPair;
diff --git a/tests/deps.js b/tests/deps.js
index c03fb93f0..16445324c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -160,8 +160,8 @@ goog.addDependency('../../core/renderers/zelos/measurables/rows.js', ['Blockly.z
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider']);
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo']);
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
-goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.utils.KeyCodes']);
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From cb4231683093b3dfb74cd2aa081026ed5fb9c668 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:43:54 -0700
Subject: [PATCH 460/833] Migrate core/scrollbar.js and core/scrollbar_pair.js
 named requires

---
 core/scrollbar.js      | 106 ++++++++++++++++++++---------------------
 core/scrollbar_pair.js |  45 +++++++++--------
 2 files changed, 75 insertions(+), 76 deletions(-)

diff --git a/core/scrollbar.js b/core/scrollbar.js
index 2ad6bb348..912fb3c41 100644
--- a/core/scrollbar.js
+++ b/core/scrollbar.js
@@ -15,15 +15,15 @@ goog.module.declareLegacyNamespace();
 
 // TODO(#5073): Add Blockly require after fixing circular dependency.
 // goog.require('Blockly');
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.Touch');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Metrics');
-goog.require('Blockly.utils.Svg');
-
-goog.requireType('Blockly.WorkspaceSvg');
+const Touch = goog.require('Blockly.Touch');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Metrics = goog.require('Blockly.utils.Metrics');
+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 utils = goog.require('Blockly.utils');
 
 
 /**
@@ -35,7 +35,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * Class for a pure SVG scrollbar.
  * This technique offers a scrollbar that is guaranteed to work, but may not
  * look or behave like the system's scrollbars.
- * @param {!Blockly.WorkspaceSvg} workspace Workspace to bind the scrollbar to.
+ * @param {!WorkspaceSvg} workspace Workspace to bind the scrollbar to.
  * @param {boolean} horizontal True if horizontal, false if vertical.
  * @param {boolean=} opt_pair True if scrollbar is part of a horiz/vert pair.
  * @param {string=} opt_class A class to be applied to this scrollbar.
@@ -46,7 +46,7 @@ const Scrollbar = function(
     workspace, horizontal, opt_pair, opt_class, opt_margin) {
   /**
    * The workspace this scrollbar is bound to.
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @private
    */
   this.workspace_ = workspace;
@@ -73,7 +73,7 @@ const Scrollbar = function(
       opt_margin : Scrollbar.DEFAULT_SCROLLBAR_MARGIN;
   /**
    * Previously recorded metrics from the workspace.
-   * @type {?Blockly.utils.Metrics}
+   * @type {?Metrics}
    * @private
    */
   this.oldHostMetrics_ = null;
@@ -90,10 +90,10 @@ const Scrollbar = function(
    * The upper left corner of the scrollbar's SVG group in CSS pixels relative
    * to the scrollbar's origin.  This is usually relative to the injection div
    * origin.
-   * @type {Blockly.utils.Coordinate}
+   * @type {Coordinate}
    * @package
    */
-  this.position = new Blockly.utils.Coordinate(0, 0);
+  this.position = new Coordinate(0, 0);
 
   // Store the thickness in a temp variable for readability.
   const scrollbarThickness = Scrollbar.scrollbarThickness;
@@ -115,9 +115,9 @@ const Scrollbar = function(
     this.positionAttribute_ = 'y';
   }
   const scrollbar = this;
-  this.onMouseDownBarWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onMouseDownBarWrapper_ = browserEvents.conditionalBind(
       this.svgBackground_, 'mousedown', scrollbar, scrollbar.onMouseDownBar_);
-  this.onMouseDownHandleWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onMouseDownHandleWrapper_ = browserEvents.conditionalBind(
       this.svgHandle_, 'mousedown', scrollbar, scrollbar.onMouseDownHandle_);
 };
 
@@ -125,10 +125,10 @@ const Scrollbar = function(
  * The location of the origin of the workspace that the scrollbar is in,
  * measured in CSS pixels relative to the injection div origin.  This is usually
  * (0, 0).  When the scrollbar is in a flyout it may have a different origin.
- * @type {Blockly.utils.Coordinate}
+ * @type {Coordinate}
  * @private
  */
-Scrollbar.prototype.origin_ = new Blockly.utils.Coordinate(0, 0);
+Scrollbar.prototype.origin_ = new Coordinate(0, 0);
 
 /**
  * The position of the mouse along this scrollbar's major axis at the start of
@@ -184,7 +184,7 @@ Scrollbar.prototype.containerVisible_ = true;
  * Scrollbars should be larger on touch devices.
  */
 Scrollbar.scrollbarThickness = 15;
-if (Blockly.Touch.TOUCH_ENABLED) {
+if (Touch.TOUCH_ENABLED) {
   Scrollbar.scrollbarThickness = 25;
 }
 
@@ -199,9 +199,9 @@ Scrollbar.DEFAULT_SCROLLBAR_MARGIN = 0.5;
 
 
 /**
- * @param {!Blockly.utils.Metrics} first An object containing computed
+ * @param {!Metrics} first An object containing computed
  *     measurements of a workspace.
- * @param {!Blockly.utils.Metrics} second Another object containing computed
+ * @param {!Metrics} second Another object containing computed
  *     measurements of a workspace.
  * @return {boolean} Whether the two sets of metrics are equivalent.
  * @private
@@ -226,12 +226,12 @@ Scrollbar.metricsAreEquivalent_ = function(first, second) {
  */
 Scrollbar.prototype.dispose = function() {
   this.cleanUp_();
-  Blockly.browserEvents.unbind(this.onMouseDownBarWrapper_);
+  browserEvents.unbind(this.onMouseDownBarWrapper_);
   this.onMouseDownBarWrapper_ = null;
-  Blockly.browserEvents.unbind(this.onMouseDownHandleWrapper_);
+  browserEvents.unbind(this.onMouseDownHandleWrapper_);
   this.onMouseDownHandleWrapper_ = null;
 
-  Blockly.utils.dom.removeNode(this.outerSvg_);
+  dom.removeNode(this.outerSvg_);
   this.outerSvg_ = null;
   this.svgGroup_ = null;
   this.svgBackground_ = null;
@@ -324,12 +324,12 @@ Scrollbar.prototype.setPosition = function(x, y) {
   const tempX = this.position.x + this.origin_.x;
   const tempY = this.position.y + this.origin_.y;
   const transform = 'translate(' + tempX + 'px,' + tempY + 'px)';
-  Blockly.utils.dom.setCssTransform(this.outerSvg_, transform);
+  dom.setCssTransform(this.outerSvg_, transform);
 };
 
 /**
  * Recalculate the scrollbar's location and its length.
- * @param {Blockly.utils.Metrics=} opt_metrics A data structure of from the
+ * @param {Metrics=} opt_metrics A data structure of from the
  *     describing all the required dimensions.  If not provided, it will be
  *     fetched from the host object.
  */
@@ -364,7 +364,7 @@ Scrollbar.prototype.resize = function(opt_metrics) {
 /**
  * Returns whether the a resizeView is necessary by comparing the passed
  * hostMetrics with cached old host metrics.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ * @param {!Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  * @return {boolean} Whether a resizeView is necessary.
  * @private
@@ -381,7 +381,7 @@ Scrollbar.prototype.requiresViewResize_ = function(hostMetrics) {
 
 /**
  * Recalculate a horizontal scrollbar's location and length.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ * @param {!Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  * @private
  */
@@ -396,7 +396,7 @@ Scrollbar.prototype.resizeHorizontal_ = function(hostMetrics) {
 /**
  * Recalculate a horizontal scrollbar's location on the screen and path length.
  * This should be called when the layout or size of the window has changed.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ * @param {!Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
 Scrollbar.prototype.resizeViewHorizontal = function(hostMetrics) {
@@ -426,7 +426,7 @@ Scrollbar.prototype.resizeViewHorizontal = function(hostMetrics) {
 /**
  * Recalculate a horizontal scrollbar's location within its path and length.
  * This should be called when the contents of the workspace have changed.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ * @param {!Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
 Scrollbar.prototype.resizeContentHorizontal = function(hostMetrics) {
@@ -478,7 +478,7 @@ Scrollbar.prototype.resizeContentHorizontal = function(hostMetrics) {
 
 /**
  * Recalculate a vertical scrollbar's location and length.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ * @param {!Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  * @private
  */
@@ -493,7 +493,7 @@ Scrollbar.prototype.resizeVertical_ = function(hostMetrics) {
 /**
  * Recalculate a vertical scrollbar's location on the screen and path length.
  * This should be called when the layout or size of the window has changed.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ * @param {!Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
 Scrollbar.prototype.resizeViewVertical = function(hostMetrics) {
@@ -520,7 +520,7 @@ Scrollbar.prototype.resizeViewVertical = function(hostMetrics) {
 /**
  * Recalculate a vertical scrollbar's location within its path and length.
  * This should be called when the contents of the workspace have changed.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ * @param {!Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
 Scrollbar.prototype.resizeContentVertical = function(hostMetrics) {
@@ -590,17 +590,17 @@ Scrollbar.prototype.createDom_ = function(opt_class) {
   if (opt_class) {
     className += ' ' + opt_class;
   }
-  this.outerSvg_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.SVG, {'class': className}, null);
-  this.svgGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G, {}, this.outerSvg_);
-  this.svgBackground_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT, {
+  this.outerSvg_ = dom.createSvgElement(
+      Svg.SVG, {'class': className}, null);
+  this.svgGroup_ = dom.createSvgElement(
+      Svg.G, {}, this.outerSvg_);
+  this.svgBackground_ = dom.createSvgElement(
+      Svg.RECT, {
         'class': 'blocklyScrollbarBackground'
       }, this.svgGroup_);
   const radius = Math.floor((Scrollbar.scrollbarThickness - 5) / 2);
-  this.svgHandle_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  this.svgHandle_ = dom.createSvgElement(
+      Svg.RECT,
       {
         'class': 'blocklyScrollbarHandle',
         'rx': radius,
@@ -611,7 +611,7 @@ Scrollbar.prototype.createDom_ = function(opt_class) {
       this.svgHandle_, 'scrollbarColour', 'fill');
   this.workspace_.getThemeManager().subscribe(
       this.svgHandle_, 'scrollbarOpacity', 'fill-opacity');
-  Blockly.utils.dom.insertAfter(this.outerSvg_,
+  dom.insertAfter(this.outerSvg_,
       this.workspace_.getParentSvg());
 };
 
@@ -686,20 +686,20 @@ Scrollbar.prototype.updateDisplay_ = function() {
  */
 Scrollbar.prototype.onMouseDownBar_ = function(e) {
   this.workspace_.markFocused();
-  Blockly.Touch.clearTouchIdentifier();  // This is really a click.
+  Touch.clearTouchIdentifier();  // This is really a click.
   this.cleanUp_();
-  if (Blockly.utils.isRightButton(e)) {
+  if (utils.isRightButton(e)) {
     // Right-click.
     // Scrollbars have no context menu.
     e.stopPropagation();
     return;
   }
-  const mouseXY = Blockly.utils.mouseToSvg(e,
+  const mouseXY = utils.mouseToSvg(e,
       this.workspace_.getParentSvg(),
       this.workspace_.getInverseScreenCTM());
   const mouseLocation = this.horizontal_ ? mouseXY.x : mouseXY.y;
 
-  const handleXY = Blockly.utils.getInjectionDivXY_(this.svgHandle_);
+  const handleXY = utils.getInjectionDivXY_(this.svgHandle_);
   const handleStart = this.horizontal_ ? handleXY.x : handleXY.y;
   let handlePosition = this.handlePosition_;
 
@@ -728,7 +728,7 @@ Scrollbar.prototype.onMouseDownBar_ = function(e) {
 Scrollbar.prototype.onMouseDownHandle_ = function(e) {
   this.workspace_.markFocused();
   this.cleanUp_();
-  if (Blockly.utils.isRightButton(e)) {
+  if (utils.isRightButton(e)) {
     // Right-click.
     // Scrollbars have no context menu.
     e.stopPropagation();
@@ -744,9 +744,9 @@ Scrollbar.prototype.onMouseDownHandle_ = function(e) {
 
   // Record the current mouse position.
   this.startDragMouse_ = this.horizontal_ ? e.clientX : e.clientY;
-  Scrollbar.onMouseUpWrapper_ = Blockly.browserEvents.conditionalBind(
+  Scrollbar.onMouseUpWrapper_ = browserEvents.conditionalBind(
       document, 'mouseup', this, this.onMouseUpHandle_);
-  Scrollbar.onMouseMoveWrapper_ = Blockly.browserEvents.conditionalBind(
+  Scrollbar.onMouseMoveWrapper_ = browserEvents.conditionalBind(
       document, 'mousemove', this, this.onMouseMoveHandle_);
   e.stopPropagation();
   e.preventDefault();
@@ -773,7 +773,7 @@ Scrollbar.prototype.onMouseMoveHandle_ = function(e) {
 Scrollbar.prototype.onMouseUpHandle_ = function() {
   // Tell the workspace to clean up now that the workspace is done moving.
   this.workspace_.resetDragSurface();
-  Blockly.Touch.clearTouchIdentifier();
+  Touch.clearTouchIdentifier();
   this.cleanUp_();
 };
 
@@ -785,11 +785,11 @@ Scrollbar.prototype.onMouseUpHandle_ = function() {
 Scrollbar.prototype.cleanUp_ = function() {
   Blockly.hideChaff(true);
   if (Scrollbar.onMouseUpWrapper_) {
-    Blockly.browserEvents.unbind(Scrollbar.onMouseUpWrapper_);
+    browserEvents.unbind(Scrollbar.onMouseUpWrapper_);
     Scrollbar.onMouseUpWrapper_ = null;
   }
   if (Scrollbar.onMouseMoveWrapper_) {
-    Blockly.browserEvents.unbind(Scrollbar.onMouseMoveWrapper_);
+    browserEvents.unbind(Scrollbar.onMouseMoveWrapper_);
     Scrollbar.onMouseMoveWrapper_ = null;
   }
 };
@@ -847,7 +847,7 @@ Scrollbar.prototype.set = function(value, updateMetrics) {
  * @param {number} y The y coordinate of the scrollbar's origin, in CSS pixels.
  */
 Scrollbar.prototype.setOrigin = function(x, y) {
-  this.origin_ = new Blockly.utils.Coordinate(x, y);
+  this.origin_ = new Coordinate(x, y);
 };
 
 exports = Scrollbar;
diff --git a/core/scrollbar_pair.js b/core/scrollbar_pair.js
index ce402b19d..67aafbbec 100644
--- a/core/scrollbar_pair.js
+++ b/core/scrollbar_pair.js
@@ -13,19 +13,18 @@
 goog.module('Blockly.ScrollbarPair');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Scrollbar');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Metrics');
-goog.require('Blockly.utils.Svg');
-
-goog.requireType('Blockly.WorkspaceSvg');
+const Events = goog.require('Blockly.Events');
+const Metrics = goog.require('Blockly.utils.Metrics');
+const Scrollbar = goog.require('Blockly.Scrollbar');
+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');
 
 
 /**
  * Class for a pair of scrollbars.  Horizontal and vertical.
- * @param {!Blockly.WorkspaceSvg} workspace Workspace to bind the scrollbars to.
+ * @param {!WorkspaceSvg} workspace Workspace to bind the scrollbars to.
  * @param {boolean=} addHorizontal Whether to add a horizontal scrollbar.
  *    Defaults to true.
  * @param {boolean=} addVertical Whether to add a vertical scrollbar. Defaults
@@ -38,7 +37,7 @@ const ScrollbarPair = function(
     workspace, addHorizontal, addVertical, opt_class, opt_margin) {
   /**
    * The workspace this scrollbar pair is bound to.
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @private
    */
   this.workspace_ = workspace;
@@ -48,29 +47,29 @@ const ScrollbarPair = function(
   const isPair = addHorizontal && addVertical;
 
   if (addHorizontal) {
-    this.hScroll = new Blockly.Scrollbar(
+    this.hScroll = new Scrollbar(
         workspace, true, isPair, opt_class, opt_margin);
   }
   if (addVertical) {
-    this.vScroll = new Blockly.Scrollbar(
+    this.vScroll = new Scrollbar(
         workspace, false, isPair, opt_class, opt_margin);
   }
 
   if (isPair) {
-    this.corner_ = Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.RECT,
+    this.corner_ = dom.createSvgElement(
+        Svg.RECT,
         {
-          'height': Blockly.Scrollbar.scrollbarThickness,
-          'width': Blockly.Scrollbar.scrollbarThickness,
+          'height': Scrollbar.scrollbarThickness,
+          'width': Scrollbar.scrollbarThickness,
           'class': 'blocklyScrollbarBackground'
         },
         null);
-    Blockly.utils.dom.insertAfter(this.corner_, workspace.getBubbleCanvas());
+    dom.insertAfter(this.corner_, workspace.getBubbleCanvas());
   }
 
   /**
    * Previously recorded metrics from the workspace.
-   * @type {?Blockly.utils.Metrics}
+   * @type {?Metrics}
    * @private
    */
   this.oldHostMetrics_ = null;
@@ -82,7 +81,7 @@ const ScrollbarPair = function(
  * @suppress {checkTypes}
  */
 ScrollbarPair.prototype.dispose = function() {
-  Blockly.utils.dom.removeNode(this.corner_);
+  dom.removeNode(this.corner_);
   this.corner_ = null;
   this.workspace_ = null;
   this.oldHostMetrics_ = null;
@@ -137,7 +136,7 @@ ScrollbarPair.prototype.resize = function() {
 
   if (resizeH || resizeV) {
     try {
-      Blockly.Events.disable();
+      Events.disable();
       if (this.hScroll && resizeH) {
         this.hScroll.resize(hostMetrics);
       }
@@ -145,7 +144,7 @@ ScrollbarPair.prototype.resize = function() {
         this.vScroll.resize(hostMetrics);
       }
     } finally {
-      Blockly.Events.enable();
+      Events.enable();
     }
     this.workspace_.maybeFireViewportChangeEvent();
   }
@@ -292,7 +291,7 @@ ScrollbarPair.prototype.isVisible = function() {
 /**
  * Recalculates the scrollbars' locations within their path and length.
  * This should be called when the contents of the workspace have changed.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ * @param {!Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
 ScrollbarPair.prototype.resizeContent = function(hostMetrics) {
@@ -307,7 +306,7 @@ ScrollbarPair.prototype.resizeContent = function(hostMetrics) {
 /**
  * Recalculates the scrollbars' locations on the screen and path length.
  * This should be called when the layout or size of the window has changed.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ * @param {!Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
 ScrollbarPair.prototype.resizeView = function(hostMetrics) {

From 0367b9845f816f79a2d92d01b80ca6eeda4a0faa Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:44:34 -0700
Subject: [PATCH 461/833] clang-format core/scrollbar.js and
 core/scrollbar_pair.js

---
 core/scrollbar.js      | 50 +++++++++++++++++-------------------------
 core/scrollbar_pair.js | 11 +++++-----
 2 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/core/scrollbar.js b/core/scrollbar.js
index 912fb3c41..2f93e2162 100644
--- a/core/scrollbar.js
+++ b/core/scrollbar.js
@@ -70,7 +70,8 @@ const Scrollbar = function(
    * @private
    */
   this.margin_ = (opt_margin !== undefined) ?
-      opt_margin : Scrollbar.DEFAULT_SCROLLBAR_MARGIN;
+      opt_margin :
+      Scrollbar.DEFAULT_SCROLLBAR_MARGIN;
   /**
    * Previously recorded metrics from the workspace.
    * @type {?Metrics}
@@ -207,10 +208,10 @@ Scrollbar.DEFAULT_SCROLLBAR_MARGIN = 0.5;
  * @private
  */
 Scrollbar.metricsAreEquivalent_ = function(first, second) {
-  return (first.viewWidth == second.viewWidth &&
+  return (
+      first.viewWidth == second.viewWidth &&
       first.viewHeight == second.viewHeight &&
-      first.viewLeft == second.viewLeft &&
-      first.viewTop == second.viewTop &&
+      first.viewLeft == second.viewLeft && first.viewTop == second.viewTop &&
       first.absoluteTop == second.absoluteTop &&
       first.absoluteLeft == second.absoluteLeft &&
       first.scrollWidth == second.scrollWidth &&
@@ -307,7 +308,8 @@ Scrollbar.prototype.setHandlePosition = function(newPosition) {
 Scrollbar.prototype.setScrollbarLength_ = function(newSize) {
   this.scrollbarLength_ = newSize;
   this.outerSvg_.setAttribute(this.lengthAttribute_, this.scrollbarLength_);
-  this.svgBackground_.setAttribute(this.lengthAttribute_, this.scrollbarLength_);
+  this.svgBackground_.setAttribute(
+      this.lengthAttribute_, this.scrollbarLength_);
 };
 
 /**
@@ -344,8 +346,8 @@ Scrollbar.prototype.resize = function(opt_metrics) {
     }
   }
 
-  if (this.oldHostMetrics_ && Scrollbar.metricsAreEquivalent_(
-      hostMetrics, this.oldHostMetrics_)) {
+  if (this.oldHostMetrics_ &&
+      Scrollbar.metricsAreEquivalent_(hostMetrics, this.oldHostMetrics_)) {
     return;
   }
 
@@ -407,8 +409,7 @@ Scrollbar.prototype.resizeViewHorizontal = function(hostMetrics) {
   }
   this.setScrollbarLength_(Math.max(0, viewSize));
 
-  let xCoordinate =
-      hostMetrics.absoluteLeft + this.margin_;
+  let xCoordinate = hostMetrics.absoluteLeft + this.margin_;
   if (this.pair_ && this.workspace_.RTL) {
     xCoordinate += Scrollbar.scrollbarThickness;
   }
@@ -507,7 +508,7 @@ Scrollbar.prototype.resizeViewVertical = function(hostMetrics) {
   const xCoordinate = this.workspace_.RTL ?
       hostMetrics.absoluteLeft + this.margin_ :
       hostMetrics.absoluteLeft + hostMetrics.viewWidth -
-      Scrollbar.scrollbarThickness - this.margin_;
+          Scrollbar.scrollbarThickness - this.margin_;
 
   const yCoordinate = hostMetrics.absoluteTop + this.margin_;
   this.setPosition(xCoordinate, yCoordinate);
@@ -585,34 +586,24 @@ Scrollbar.prototype.createDom_ = function(opt_class) {
     </g>
   </svg>
   */
-  let className = 'blocklyScrollbar' +
-      (this.horizontal_ ? 'Horizontal' : 'Vertical');
+  let className =
+      'blocklyScrollbar' + (this.horizontal_ ? 'Horizontal' : 'Vertical');
   if (opt_class) {
     className += ' ' + opt_class;
   }
-  this.outerSvg_ = dom.createSvgElement(
-      Svg.SVG, {'class': className}, null);
-  this.svgGroup_ = dom.createSvgElement(
-      Svg.G, {}, this.outerSvg_);
+  this.outerSvg_ = dom.createSvgElement(Svg.SVG, {'class': className}, null);
+  this.svgGroup_ = dom.createSvgElement(Svg.G, {}, this.outerSvg_);
   this.svgBackground_ = dom.createSvgElement(
-      Svg.RECT, {
-        'class': 'blocklyScrollbarBackground'
-      }, this.svgGroup_);
+      Svg.RECT, {'class': 'blocklyScrollbarBackground'}, this.svgGroup_);
   const radius = Math.floor((Scrollbar.scrollbarThickness - 5) / 2);
   this.svgHandle_ = dom.createSvgElement(
-      Svg.RECT,
-      {
-        'class': 'blocklyScrollbarHandle',
-        'rx': radius,
-        'ry': radius
-      },
+      Svg.RECT, {'class': 'blocklyScrollbarHandle', 'rx': radius, 'ry': radius},
       this.svgGroup_);
   this.workspace_.getThemeManager().subscribe(
       this.svgHandle_, 'scrollbarColour', 'fill');
   this.workspace_.getThemeManager().subscribe(
       this.svgHandle_, 'scrollbarOpacity', 'fill-opacity');
-  dom.insertAfter(this.outerSvg_,
-      this.workspace_.getParentSvg());
+  dom.insertAfter(this.outerSvg_, this.workspace_.getParentSvg());
 };
 
 /**
@@ -694,9 +685,8 @@ Scrollbar.prototype.onMouseDownBar_ = function(e) {
     e.stopPropagation();
     return;
   }
-  const mouseXY = utils.mouseToSvg(e,
-      this.workspace_.getParentSvg(),
-      this.workspace_.getInverseScreenCTM());
+  const mouseXY = utils.mouseToSvg(
+      e, this.workspace_.getParentSvg(), this.workspace_.getInverseScreenCTM());
   const mouseLocation = this.horizontal_ ? mouseXY.x : mouseXY.y;
 
   const handleXY = utils.getInjectionDivXY_(this.svgHandle_);
diff --git a/core/scrollbar_pair.js b/core/scrollbar_pair.js
index 67aafbbec..7c98164e5 100644
--- a/core/scrollbar_pair.js
+++ b/core/scrollbar_pair.js
@@ -47,18 +47,17 @@ const ScrollbarPair = function(
   const isPair = addHorizontal && addVertical;
 
   if (addHorizontal) {
-    this.hScroll = new Scrollbar(
-        workspace, true, isPair, opt_class, opt_margin);
+    this.hScroll =
+        new Scrollbar(workspace, true, isPair, opt_class, opt_margin);
   }
   if (addVertical) {
-    this.vScroll = new Scrollbar(
-        workspace, false, isPair, opt_class, opt_margin);
+    this.vScroll =
+        new Scrollbar(workspace, false, isPair, opt_class, opt_margin);
   }
 
   if (isPair) {
     this.corner_ = dom.createSvgElement(
-        Svg.RECT,
-        {
+        Svg.RECT, {
           'height': Scrollbar.scrollbarThickness,
           'width': Scrollbar.scrollbarThickness,
           'class': 'blocklyScrollbarBackground'

From 540088f25fe409ba6903c1cb1d1d2eeb744d3655 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:47:51 -0700
Subject: [PATCH 462/833] Update require to requireType

---
 core/scrollbar.js      | 3 ++-
 core/scrollbar_pair.js | 3 ++-
 tests/deps.js          | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/scrollbar.js b/core/scrollbar.js
index 2f93e2162..9877d8201 100644
--- a/core/scrollbar.js
+++ b/core/scrollbar.js
@@ -17,7 +17,8 @@ goog.module.declareLegacyNamespace();
 // goog.require('Blockly');
 const Touch = goog.require('Blockly.Touch');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
-const Metrics = goog.require('Blockly.utils.Metrics');
+/* eslint-disable-next-line no-unused-vars */
+const Metrics = goog.requireType('Blockly.utils.Metrics');
 const Svg = goog.require('Blockly.utils.Svg');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
diff --git a/core/scrollbar_pair.js b/core/scrollbar_pair.js
index 7c98164e5..2b240f276 100644
--- a/core/scrollbar_pair.js
+++ b/core/scrollbar_pair.js
@@ -14,7 +14,8 @@ goog.module('Blockly.ScrollbarPair');
 goog.module.declareLegacyNamespace();
 
 const Events = goog.require('Blockly.Events');
-const Metrics = goog.require('Blockly.utils.Metrics');
+/* eslint-disable-next-line no-unused-vars */
+const Metrics = goog.requireType('Blockly.utils.Metrics');
 const Scrollbar = goog.require('Blockly.Scrollbar');
 const Svg = goog.require('Blockly.utils.Svg');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/tests/deps.js b/tests/deps.js
index 16445324c..d4eac1200 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -160,8 +160,8 @@ goog.addDependency('../../core/renderers/zelos/measurables/rows.js', ['Blockly.z
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider']);
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo']);
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
-goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.utils.KeyCodes']);
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From af3f04b508dc7ad2e0434269312222aa2ea55ab3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 11:06:55 -0700
Subject: [PATCH 463/833] Migrate core/toolbox/toolbox_item.js to goog.module

---
 core/toolbox/toolbox_item.js | 24 ++++++++++++++----------
 tests/deps.js                |  2 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/core/toolbox/toolbox_item.js b/core/toolbox/toolbox_item.js
index febc0a068..e34290eb6 100644
--- a/core/toolbox/toolbox_item.js
+++ b/core/toolbox/toolbox_item.js
@@ -10,12 +10,14 @@
  */
 'use strict';
 
-goog.provide('Blockly.ToolboxItem');
+goog.module('Blockly.ToolboxItem');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.IToolboxItem');
 
 goog.requireType('Blockly.ICollapsibleToolboxItem');
 goog.requireType('Blockly.IToolbox');
+goog.require('Blockly.utils.IdGenerator');
 goog.requireType('Blockly.utils.toolbox');
 goog.requireType('Blockly.WorkspaceSvg');
 
@@ -30,7 +32,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @constructor
  * @implements {Blockly.IToolboxItem}
  */
-Blockly.ToolboxItem = function(toolboxItemDef, toolbox, opt_parent) {
+const ToolboxItem = function(toolboxItemDef, toolbox, opt_parent) {
 
   /**
    * The id for the category.
@@ -81,7 +83,7 @@ Blockly.ToolboxItem = function(toolboxItemDef, toolbox, opt_parent) {
  * on the info object.
  * @public
  */
-Blockly.ToolboxItem.prototype.init = function() {
+ToolboxItem.prototype.init = function() {
   // No-op by default.
 };
 
@@ -90,7 +92,7 @@ Blockly.ToolboxItem.prototype.init = function() {
  * @return {?Element} The div for the toolbox item.
  * @public
  */
-Blockly.ToolboxItem.prototype.getDiv = function() {
+ToolboxItem.prototype.getDiv = function() {
   return null;
 };
 
@@ -99,7 +101,7 @@ Blockly.ToolboxItem.prototype.getDiv = function() {
  * @return {string} The ID for the toolbox item.
  * @public
  */
-Blockly.ToolboxItem.prototype.getId = function() {
+ToolboxItem.prototype.getId = function() {
   return this.id_;
 };
 
@@ -109,7 +111,7 @@ Blockly.ToolboxItem.prototype.getId = function() {
  *     this toolbox item is not nested.
  * @public
  */
-Blockly.ToolboxItem.prototype.getParent = function() {
+ToolboxItem.prototype.getParent = function() {
   return null;
 };
 
@@ -118,7 +120,7 @@ Blockly.ToolboxItem.prototype.getParent = function() {
  * @return {number} The nested level of the category.
  * @package
  */
-Blockly.ToolboxItem.prototype.getLevel = function() {
+ToolboxItem.prototype.getLevel = function() {
   return this.level_;
 };
 
@@ -127,7 +129,7 @@ Blockly.ToolboxItem.prototype.getLevel = function() {
  * @return {boolean} True if the toolbox item can be selected.
  * @public
  */
-Blockly.ToolboxItem.prototype.isSelectable = function() {
+ToolboxItem.prototype.isSelectable = function() {
   return false;
 };
 
@@ -136,7 +138,7 @@ Blockly.ToolboxItem.prototype.isSelectable = function() {
  * @return {boolean} True if the toolbox item is collapsible.
  * @public
  */
-Blockly.ToolboxItem.prototype.isCollapsible = function() {
+ToolboxItem.prototype.isCollapsible = function() {
   return false;
 };
 
@@ -144,5 +146,7 @@ Blockly.ToolboxItem.prototype.isCollapsible = function() {
  * Dispose of this toolbox item. No-op by default.
  * @public
  */
-Blockly.ToolboxItem.prototype.dispose = function() {
+ToolboxItem.prototype.dispose = function() {
 };
+
+exports = ToolboxItem;
diff --git a/tests/deps.js b/tests/deps.js
index d4eac1200..1e9ef54f4 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -172,7 +172,7 @@ goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory']
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.IToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
-goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem']);
+goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem', 'Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);

From 65608065eaeda3bab616bba7c22f0fde677d9216 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 11:10:19 -0700
Subject: [PATCH 464/833] Migrate core/toolbox/toolbox_item.js named requires

---
 core/toolbox/toolbox_item.js | 37 +++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/core/toolbox/toolbox_item.js b/core/toolbox/toolbox_item.js
index e34290eb6..f2cb3b711 100644
--- a/core/toolbox/toolbox_item.js
+++ b/core/toolbox/toolbox_item.js
@@ -13,24 +13,27 @@
 goog.module('Blockly.ToolboxItem');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.IToolboxItem');
-
-goog.requireType('Blockly.ICollapsibleToolboxItem');
-goog.requireType('Blockly.IToolbox');
-goog.require('Blockly.utils.IdGenerator');
-goog.requireType('Blockly.utils.toolbox');
-goog.requireType('Blockly.WorkspaceSvg');
+/* eslint-disable-next-line no-unused-vars */
+const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');
+const IdGenerator = goog.require('Blockly.utils.IdGenerator');
+/* eslint-disable-next-line no-unused-vars */
+const IToolbox = goog.requireType('Blockly.IToolbox');
+const IToolboxItem = goog.require('Blockly.IToolboxItem');
+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 */
 
 
 /**
  * Class for an item in the toolbox.
- * @param {!Blockly.utils.toolbox.ToolboxItemInfo} toolboxItemDef The JSON defining the
+ * @param {!toolbox.ToolboxItemInfo} toolboxItemDef The JSON defining the
  *     toolbox item.
- * @param {!Blockly.IToolbox} toolbox The toolbox that holds the toolbox item.
- * @param {Blockly.ICollapsibleToolboxItem=} opt_parent The parent toolbox item
+ * @param {!IToolbox} toolbox The toolbox that holds the toolbox item.
+ * @param {ICollapsibleToolboxItem=} opt_parent The parent toolbox item
  *     or null if the category does not have a parent.
  * @constructor
- * @implements {Blockly.IToolboxItem}
+ * @implements {IToolboxItem}
  */
 const ToolboxItem = function(toolboxItemDef, toolbox, opt_parent) {
 
@@ -39,11 +42,11 @@ const ToolboxItem = function(toolboxItemDef, toolbox, opt_parent) {
    * @type {string}
    * @protected
    */
-  this.id_ = toolboxItemDef['toolboxitemid'] || Blockly.utils.IdGenerator.getNextUniqueId();
+  this.id_ = toolboxItemDef['toolboxitemid'] || IdGenerator.getNextUniqueId();
 
   /**
    * The parent of the category.
-   * @type {?Blockly.ICollapsibleToolboxItem}
+   * @type {?ICollapsibleToolboxItem}
    * @protected
    */
   this.parent_ = opt_parent || null;
@@ -57,21 +60,21 @@ const ToolboxItem = function(toolboxItemDef, toolbox, opt_parent) {
 
   /**
    * The JSON definition of the toolbox item.
-   * @type {!Blockly.utils.toolbox.ToolboxItemInfo}
+   * @type {!toolbox.ToolboxItemInfo}
    * @protected
    */
   this.toolboxItemDef_ = toolboxItemDef;
 
   /**
    * The toolbox this category belongs to.
-   * @type {!Blockly.IToolbox}
+   * @type {!IToolbox}
    * @protected
    */
   this.parentToolbox_ = toolbox;
 
   /**
    * The workspace of the parent toolbox.
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @protected
    */
   this.workspace_ = this.parentToolbox_.getWorkspace();
@@ -107,7 +110,7 @@ ToolboxItem.prototype.getId = function() {
 
 /**
  * Gets the parent if the toolbox item is nested.
- * @return {?Blockly.IToolboxItem} The parent toolbox item, or null if
+ * @return {?IToolboxItem} The parent toolbox item, or null if
  *     this toolbox item is not nested.
  * @public
  */

From 759638812436961f015f511678d95cd8ad0d1dfc Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 11:10:25 -0700
Subject: [PATCH 465/833] clang-format core/toolbox/toolbox_item.js

---
 core/toolbox/toolbox_item.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/toolbox/toolbox_item.js b/core/toolbox/toolbox_item.js
index f2cb3b711..be7ba37fb 100644
--- a/core/toolbox/toolbox_item.js
+++ b/core/toolbox/toolbox_item.js
@@ -36,7 +36,6 @@ const toolbox = goog.requireType('Blockly.utils.toolbox');
  * @implements {IToolboxItem}
  */
 const ToolboxItem = function(toolboxItemDef, toolbox, opt_parent) {
-
   /**
    * The id for the category.
    * @type {string}
@@ -149,7 +148,6 @@ ToolboxItem.prototype.isCollapsible = function() {
  * Dispose of this toolbox item. No-op by default.
  * @public
  */
-ToolboxItem.prototype.dispose = function() {
-};
+ToolboxItem.prototype.dispose = function() {};
 
 exports = ToolboxItem;

From 4eed760a1986d0d0c935ccf6422b9b660e45c6d9 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 30 Jul 2021 15:40:56 -0700
Subject: [PATCH 466/833] Fix eslint disable lines

---
 core/toolbox/toolbox_item.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/toolbox/toolbox_item.js b/core/toolbox/toolbox_item.js
index be7ba37fb..0fdbfd424 100644
--- a/core/toolbox/toolbox_item.js
+++ b/core/toolbox/toolbox_item.js
@@ -18,11 +18,12 @@ const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxIte
 const IdGenerator = goog.require('Blockly.utils.IdGenerator');
 /* eslint-disable-next-line no-unused-vars */
 const IToolbox = goog.requireType('Blockly.IToolbox');
+/* eslint-disable-next-line no-unused-vars */
 const IToolboxItem = goog.require('Blockly.IToolboxItem');
+/* 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 */
 
 
 /**

From 0b16c9da9ad2f8e806171a595430c436e86e058b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 30 Jul 2021 15:48:54 -0700
Subject: [PATCH 467/833] Remove extra eslint disable from core/gesture.js

---
 core/gesture.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/gesture.js b/core/gesture.js
index 5d77d4e0a..ae01b62cc 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -20,7 +20,6 @@ goog.module.declareLegacyNamespace();
 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 Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.Field');

From 92df3900741e7b80d68f3483de08bada1d59f0c1 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 09:19:57 -0700
Subject: [PATCH 468/833] Migrate core/events/events_viewport.js to ES6
 const/let

---
 core/events/events_viewport.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/events/events_viewport.js b/core/events/events_viewport.js
index 6d857cd67..552c709f0 100644
--- a/core/events/events_viewport.js
+++ b/core/events/events_viewport.js
@@ -77,7 +77,7 @@ Blockly.Events.ViewportChange.prototype.type = Blockly.Events.VIEWPORT_CHANGE;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.ViewportChange.prototype.toJson = function() {
-  var json = Blockly.Events.ViewportChange.superClass_.toJson.call(this);
+  const json = Blockly.Events.ViewportChange.superClass_.toJson.call(this);
   json['viewTop'] = this.viewTop;
   json['viewLeft'] = this.viewLeft;
   json['scale'] = this.scale;

From 2294eb9a282b465dd5fbab670d853ce6ea387975 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 09:22:04 -0700
Subject: [PATCH 469/833] Migrate core/events/events_viewport.js to goog.module

---
 core/events/events_viewport.js | 23 +++++++++++++----------
 tests/deps.js                  |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/core/events/events_viewport.js b/core/events/events_viewport.js
index 552c709f0..4cca81050 100644
--- a/core/events/events_viewport.js
+++ b/core/events/events_viewport.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.ViewportChange');
+goog.module('Blockly.Events.ViewportChange');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.UiBase');
@@ -33,9 +34,9 @@ goog.require('Blockly.utils.object');
  * @extends {Blockly.Events.UiBase}
  * @constructor
  */
-Blockly.Events.ViewportChange = function(opt_top, opt_left, opt_scale,
+const ViewportChange = function(opt_top, opt_left, opt_scale,
     opt_workspaceId, opt_oldScale) {
-  Blockly.Events.ViewportChange.superClass_.constructor.call(this, opt_workspaceId);
+  ViewportChange.superClass_.constructor.call(this, opt_workspaceId);
 
   /**
    * Top-edge of the visible portion of the workspace, relative to the workspace
@@ -63,21 +64,21 @@ Blockly.Events.ViewportChange = function(opt_top, opt_left, opt_scale,
    */
   this.oldScale = opt_oldScale;
 };
-Blockly.utils.object.inherits(Blockly.Events.ViewportChange,
+Blockly.utils.object.inherits(ViewportChange,
     Blockly.Events.UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.ViewportChange.prototype.type = Blockly.Events.VIEWPORT_CHANGE;
+ViewportChange.prototype.type = Blockly.Events.VIEWPORT_CHANGE;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.ViewportChange.prototype.toJson = function() {
-  const json = Blockly.Events.ViewportChange.superClass_.toJson.call(this);
+ViewportChange.prototype.toJson = function() {
+  const json = ViewportChange.superClass_.toJson.call(this);
   json['viewTop'] = this.viewTop;
   json['viewLeft'] = this.viewLeft;
   json['scale'] = this.scale;
@@ -89,8 +90,8 @@ Blockly.Events.ViewportChange.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.ViewportChange.prototype.fromJson = function(json) {
-  Blockly.Events.ViewportChange.superClass_.fromJson.call(this, json);
+ViewportChange.prototype.fromJson = function(json) {
+  ViewportChange.superClass_.fromJson.call(this, json);
   this.viewTop = json['viewTop'];
   this.viewLeft = json['viewLeft'];
   this.scale = json['scale'];
@@ -98,4 +99,6 @@ Blockly.Events.ViewportChange.prototype.fromJson = function(json) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VIEWPORT_CHANGE, Blockly.Events.ViewportChange);
+    Blockly.Events.VIEWPORT_CHANGE, ViewportChange);
+
+exports = ViewportChange;
diff --git a/tests/deps.js b/tests/deps.js
index 1e9ef54f4..3b2de8ffa 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -44,7 +44,7 @@ goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Sele
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/variable_events.js', ['Blockly.Events.VarBase', 'Blockly.Events.VarCreate', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es5'});

From 38a459f5b4aecdce19fe4a11e752b27a51fea803 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 09:35:39 -0700
Subject: [PATCH 470/833] Migrate core/events/events_viewport.js to named
 requires

---
 core/events/events_viewport.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/events/events_viewport.js b/core/events/events_viewport.js
index 4cca81050..29af11802 100644
--- a/core/events/events_viewport.js
+++ b/core/events/events_viewport.js
@@ -13,10 +13,10 @@
 goog.module('Blockly.Events.ViewportChange');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
@@ -31,7 +31,7 @@ goog.require('Blockly.utils.object');
  *    Undefined for a blank event.
  * @param {number=} opt_oldScale The old scale of the workspace. Undefined for a
  *    blank event.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @constructor
  */
 const ViewportChange = function(opt_top, opt_left, opt_scale,
@@ -64,14 +64,14 @@ const ViewportChange = function(opt_top, opt_left, opt_scale,
    */
   this.oldScale = opt_oldScale;
 };
-Blockly.utils.object.inherits(ViewportChange,
-    Blockly.Events.UiBase);
+object.inherits(ViewportChange,
+    UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-ViewportChange.prototype.type = Blockly.Events.VIEWPORT_CHANGE;
+ViewportChange.prototype.type = Events.VIEWPORT_CHANGE;
 
 /**
  * Encode the event as JSON.
@@ -98,7 +98,7 @@ ViewportChange.prototype.fromJson = function(json) {
   this.oldScale = json['oldScale'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VIEWPORT_CHANGE, ViewportChange);
+registry.register(registry.Type.EVENT,
+    Events.VIEWPORT_CHANGE, ViewportChange);
 
 exports = ViewportChange;

From d3ad80f654a33f66869d098a2c5d4e608f2a1977 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 09:36:01 -0700
Subject: [PATCH 471/833] clang-format core/events/events_viewport.js

---
 core/events/events_viewport.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/events/events_viewport.js b/core/events/events_viewport.js
index 29af11802..2cfd94a7f 100644
--- a/core/events/events_viewport.js
+++ b/core/events/events_viewport.js
@@ -34,8 +34,8 @@ const registry = goog.require('Blockly.registry');
  * @extends {UiBase}
  * @constructor
  */
-const ViewportChange = function(opt_top, opt_left, opt_scale,
-    opt_workspaceId, opt_oldScale) {
+const ViewportChange = function(
+    opt_top, opt_left, opt_scale, opt_workspaceId, opt_oldScale) {
   ViewportChange.superClass_.constructor.call(this, opt_workspaceId);
 
   /**
@@ -64,8 +64,7 @@ const ViewportChange = function(opt_top, opt_left, opt_scale,
    */
   this.oldScale = opt_oldScale;
 };
-object.inherits(ViewportChange,
-    UiBase);
+object.inherits(ViewportChange, UiBase);
 
 /**
  * Type of this event.
@@ -98,7 +97,6 @@ ViewportChange.prototype.fromJson = function(json) {
   this.oldScale = json['oldScale'];
 };
 
-registry.register(registry.Type.EVENT,
-    Events.VIEWPORT_CHANGE, ViewportChange);
+registry.register(registry.Type.EVENT, Events.VIEWPORT_CHANGE, ViewportChange);
 
 exports = ViewportChange;

From 412d8101767449b40248cf38736db077b8c9ccd6 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 09:52:24 -0700
Subject: [PATCH 472/833] Migrate core/events/events_toolbox_item_select.js to
 ES6 const/let

---
 core/events/events_toolbox_item_select.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/events/events_toolbox_item_select.js b/core/events/events_toolbox_item_select.js
index a7dbb5305..694e24d5d 100644
--- a/core/events/events_toolbox_item_select.js
+++ b/core/events/events_toolbox_item_select.js
@@ -59,7 +59,7 @@ Blockly.Events.ToolboxItemSelect.prototype.type = Blockly.Events.TOOLBOX_ITEM_SE
  * @return {!Object} JSON representation.
  */
 Blockly.Events.ToolboxItemSelect.prototype.toJson = function() {
-  var json = Blockly.Events.ToolboxItemSelect.superClass_.toJson.call(this);
+  const json = Blockly.Events.ToolboxItemSelect.superClass_.toJson.call(this);
   json['oldItem'] = this.oldItem;
   json['newItem'] = this.newItem;
   return json;

From 7e9ee2d1c1f3bf6225d9570e629e9a0958086ae9 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 09:52:43 -0700
Subject: [PATCH 473/833] Migrate core/events/events_toolbox_item_select.js to
 goog.module

---
 core/events/events_toolbox_item_select.js | 23 +++++++++++++----------
 tests/deps.js                             |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/core/events/events_toolbox_item_select.js b/core/events/events_toolbox_item_select.js
index 694e24d5d..ec587ad92 100644
--- a/core/events/events_toolbox_item_select.js
+++ b/core/events/events_toolbox_item_select.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.ToolboxItemSelect');
+goog.module('Blockly.Events.ToolboxItemSelect');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.UiBase');
@@ -29,9 +30,9 @@ goog.require('Blockly.utils.object');
  * @extends {Blockly.Events.UiBase}
  * @constructor
  */
-Blockly.Events.ToolboxItemSelect = function(opt_oldItem, opt_newItem,
+const ToolboxItemSelect = function(opt_oldItem, opt_newItem,
     opt_workspaceId) {
-  Blockly.Events.ToolboxItemSelect.superClass_.constructor.call(
+  ToolboxItemSelect.superClass_.constructor.call(
       this, opt_workspaceId);
 
   /**
@@ -46,20 +47,20 @@ Blockly.Events.ToolboxItemSelect = function(opt_oldItem, opt_newItem,
    */
   this.newItem = opt_newItem;
 };
-Blockly.utils.object.inherits(Blockly.Events.ToolboxItemSelect, Blockly.Events.UiBase);
+Blockly.utils.object.inherits(ToolboxItemSelect, Blockly.Events.UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.ToolboxItemSelect.prototype.type = Blockly.Events.TOOLBOX_ITEM_SELECT;
+ToolboxItemSelect.prototype.type = Blockly.Events.TOOLBOX_ITEM_SELECT;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.ToolboxItemSelect.prototype.toJson = function() {
-  const json = Blockly.Events.ToolboxItemSelect.superClass_.toJson.call(this);
+ToolboxItemSelect.prototype.toJson = function() {
+  const json = ToolboxItemSelect.superClass_.toJson.call(this);
   json['oldItem'] = this.oldItem;
   json['newItem'] = this.newItem;
   return json;
@@ -69,11 +70,13 @@ Blockly.Events.ToolboxItemSelect.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.ToolboxItemSelect.prototype.fromJson = function(json) {
-  Blockly.Events.ToolboxItemSelect.superClass_.fromJson.call(this, json);
+ToolboxItemSelect.prototype.fromJson = function(json) {
+  ToolboxItemSelect.superClass_.fromJson.call(this, json);
   this.oldItem = json['oldItem'];
   this.newItem = json['newItem'];
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.TOOLBOX_ITEM_SELECT, Blockly.Events.ToolboxItemSelect);
+    Blockly.Events.TOOLBOX_ITEM_SELECT, ToolboxItemSelect);
+
+exports = ToolboxItemSelect;
diff --git a/tests/deps.js b/tests/deps.js
index 1e9ef54f4..c5dd33a1d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -42,7 +42,7 @@ goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click']
 goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);

From df71e638303c274fa0f87551c02231a8ac4469ff Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 09:53:12 -0700
Subject: [PATCH 474/833] Migrate core/events/events_toolbox_item_select.js to
 named requires

---
 core/events/events_toolbox_item_select.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/events/events_toolbox_item_select.js b/core/events/events_toolbox_item_select.js
index ec587ad92..0ef7111f8 100644
--- a/core/events/events_toolbox_item_select.js
+++ b/core/events/events_toolbox_item_select.js
@@ -13,10 +13,10 @@
 goog.module('Blockly.Events.ToolboxItemSelect');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
@@ -27,7 +27,7 @@ goog.require('Blockly.utils.object');
  *    a blank event.
  * @param {string=} opt_workspaceId The workspace identifier for this event.
  *    Undefined for a blank event.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @constructor
  */
 const ToolboxItemSelect = function(opt_oldItem, opt_newItem,
@@ -47,13 +47,13 @@ const ToolboxItemSelect = function(opt_oldItem, opt_newItem,
    */
   this.newItem = opt_newItem;
 };
-Blockly.utils.object.inherits(ToolboxItemSelect, Blockly.Events.UiBase);
+object.inherits(ToolboxItemSelect, UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-ToolboxItemSelect.prototype.type = Blockly.Events.TOOLBOX_ITEM_SELECT;
+ToolboxItemSelect.prototype.type = Events.TOOLBOX_ITEM_SELECT;
 
 /**
  * Encode the event as JSON.
@@ -76,7 +76,7 @@ ToolboxItemSelect.prototype.fromJson = function(json) {
   this.newItem = json['newItem'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.TOOLBOX_ITEM_SELECT, ToolboxItemSelect);
+registry.register(registry.Type.EVENT,
+    Events.TOOLBOX_ITEM_SELECT, ToolboxItemSelect);
 
 exports = ToolboxItemSelect;

From bee144fae2a081ad99c073b8f9786d05285b0338 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 09:53:38 -0700
Subject: [PATCH 475/833] clang-format
 core/events/events_toolbox_item_select.js

---
 core/events/events_toolbox_item_select.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/events/events_toolbox_item_select.js b/core/events/events_toolbox_item_select.js
index 0ef7111f8..0fddaf4e9 100644
--- a/core/events/events_toolbox_item_select.js
+++ b/core/events/events_toolbox_item_select.js
@@ -30,10 +30,8 @@ const registry = goog.require('Blockly.registry');
  * @extends {UiBase}
  * @constructor
  */
-const ToolboxItemSelect = function(opt_oldItem, opt_newItem,
-    opt_workspaceId) {
-  ToolboxItemSelect.superClass_.constructor.call(
-      this, opt_workspaceId);
+const ToolboxItemSelect = function(opt_oldItem, opt_newItem, opt_workspaceId) {
+  ToolboxItemSelect.superClass_.constructor.call(this, opt_workspaceId);
 
   /**
    * The previously selected toolbox item.
@@ -76,7 +74,7 @@ ToolboxItemSelect.prototype.fromJson = function(json) {
   this.newItem = json['newItem'];
 };
 
-registry.register(registry.Type.EVENT,
-    Events.TOOLBOX_ITEM_SELECT, ToolboxItemSelect);
+registry.register(
+    registry.Type.EVENT, Events.TOOLBOX_ITEM_SELECT, ToolboxItemSelect);
 
 exports = ToolboxItemSelect;

From 2e545c677bd238f799938a8ce160a6cb0630d4d6 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 10:17:38 -0700
Subject: [PATCH 476/833] Update build artifact sizes in check_metadata.sh

---
 tests/scripts/check_metadata.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/scripts/check_metadata.sh b/tests/scripts/check_metadata.sh
index a35257c8e..188678c3b 100755
--- a/tests/scripts/check_metadata.sh
+++ b/tests/scripts/check_metadata.sh
@@ -25,7 +25,8 @@ readonly BUILD_DIR='build'
 # Q4 2020	4.20201217.0	653624
 # Q1 2021	5.20210325.0	653957
 # Q2 2021	6.20210701.0	664497
-readonly BLOCKLY_SIZE_EXPECTED=664497
+# Q3 2021	6.20210701.0	731695
+readonly BLOCKLY_SIZE_EXPECTED=731695
 
 # Size of blocks_compressed.js
 # Q2 2019	2.20190722.0	75618
@@ -37,6 +38,7 @@ readonly BLOCKLY_SIZE_EXPECTED=664497
 # Q4 2020	4.20201217.0	76693
 # Q1 2021	5.20210325.0	76693
 # Q2 2021	6.20210701.0	76669
+# Q3 2021	6.20210701.0	76669
 readonly BLOCKS_SIZE_EXPECTED=76669
 
 # Size of blockly_compressed.js.gz
@@ -49,7 +51,8 @@ readonly BLOCKS_SIZE_EXPECTED=76669
 # Q4 2020	4.20201217.0	138115
 # Q1 2021	5.20210325.0	136118
 # Q2 2021	6.20210701.0	142112
-readonly BLOCKLY_GZ_SIZE_EXPECTED=142112
+# Q3 2021	6.20210701.0	147476
+readonly BLOCKLY_GZ_SIZE_EXPECTED=147476
 
 # Size of blocks_compressed.js.gz
 # Q2 2019	2.20190722.0	14552
@@ -61,7 +64,8 @@ readonly BLOCKLY_GZ_SIZE_EXPECTED=142112
 # Q4 2020	4.20201217.0	15224
 # Q1 2021	5.20210325.0	15285
 # Q2 2021	6.20210701.0	15275
-readonly BLOCKS_GZ_SIZE_EXPECTED=15275
+# Q3 2021	6.20210701.0	15284
+readonly BLOCKS_GZ_SIZE_EXPECTED=15284
 
 # ANSI colors
 readonly BOLD_GREEN='\033[1;32m'

From 98dd332fda2f62f72a10bb125a1c430d42b40143 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 10:34:32 -0700
Subject: [PATCH 477/833] Add comment about root cause of build artifact size
 change

---
 tests/scripts/check_metadata.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/scripts/check_metadata.sh b/tests/scripts/check_metadata.sh
index 188678c3b..642be7191 100755
--- a/tests/scripts/check_metadata.sh
+++ b/tests/scripts/check_metadata.sh
@@ -25,7 +25,7 @@ readonly BUILD_DIR='build'
 # Q4 2020	4.20201217.0	653624
 # Q1 2021	5.20210325.0	653957
 # Q2 2021	6.20210701.0	664497
-# Q3 2021	6.20210701.0	731695
+# Q3 2021	6.20210701.0	731695 (mid-quarter goog.module conversion change)
 readonly BLOCKLY_SIZE_EXPECTED=731695
 
 # Size of blocks_compressed.js
@@ -51,7 +51,7 @@ readonly BLOCKS_SIZE_EXPECTED=76669
 # Q4 2020	4.20201217.0	138115
 # Q1 2021	5.20210325.0	136118
 # Q2 2021	6.20210701.0	142112
-# Q3 2021	6.20210701.0	147476
+# Q3 2021	6.20210701.0	147476 (mid-quarter goog.module conversion change)
 readonly BLOCKLY_GZ_SIZE_EXPECTED=147476
 
 # Size of blocks_compressed.js.gz

From 8c2a469931a733c973a3ab4fde4f31b23fd62420 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 11:04:40 -0700
Subject: [PATCH 478/833] Migrate core/events/events_marker_move.js to ES6
 const/let

---
 core/events/events_marker_move.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/events/events_marker_move.js b/core/events/events_marker_move.js
index ab839daff..acb28a66b 100644
--- a/core/events/events_marker_move.js
+++ b/core/events/events_marker_move.js
@@ -37,7 +37,7 @@ goog.requireType('Blockly.Workspace');
  */
 Blockly.Events.MarkerMove = function(opt_block, isCursor, opt_oldNode,
     opt_newNode) {
-  var workspaceId = opt_block ? opt_block.workspace.id : undefined;
+  let workspaceId = opt_block ? opt_block.workspace.id : undefined;
   if (opt_newNode && opt_newNode.getType() == Blockly.ASTNode.types.WORKSPACE) {
     workspaceId =
         (/** @type {!Blockly.Workspace} */ (opt_newNode.getLocation())).id;
@@ -81,7 +81,7 @@ Blockly.Events.MarkerMove.prototype.type = Blockly.Events.MARKER_MOVE;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.MarkerMove.prototype.toJson = function() {
-  var json = Blockly.Events.MarkerMove.superClass_.toJson.call(this);
+  const json = Blockly.Events.MarkerMove.superClass_.toJson.call(this);
   json['isCursor'] = this.isCursor;
   json['blockId'] = this.blockId;
   json['oldNode'] = this.oldNode;

From cf97c1c15f9e92357d29e57732d838f3ac7c27d5 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 11:08:51 -0700
Subject: [PATCH 479/833] Migrate core/events/events_marker_move.js to
 goog.module

---
 core/events/events_marker_move.js | 23 +++++++++++++----------
 tests/deps.js                     |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/core/events/events_marker_move.js b/core/events/events_marker_move.js
index acb28a66b..e85b5fd07 100644
--- a/core/events/events_marker_move.js
+++ b/core/events/events_marker_move.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.MarkerMove');
+goog.module('Blockly.Events.MarkerMove');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.UiBase');
@@ -35,14 +36,14 @@ goog.requireType('Blockly.Workspace');
  * @extends {Blockly.Events.UiBase}
  * @constructor
  */
-Blockly.Events.MarkerMove = function(opt_block, isCursor, opt_oldNode,
+const MarkerMove = function(opt_block, isCursor, opt_oldNode,
     opt_newNode) {
   let workspaceId = opt_block ? opt_block.workspace.id : undefined;
   if (opt_newNode && opt_newNode.getType() == Blockly.ASTNode.types.WORKSPACE) {
     workspaceId =
         (/** @type {!Blockly.Workspace} */ (opt_newNode.getLocation())).id;
   }
-  Blockly.Events.MarkerMove.superClass_.constructor.call(this, workspaceId);
+  MarkerMove.superClass_.constructor.call(this, workspaceId);
 
   /**
    * The workspace identifier for this event.
@@ -68,20 +69,20 @@ Blockly.Events.MarkerMove = function(opt_block, isCursor, opt_oldNode,
    */
   this.isCursor = isCursor;
 };
-Blockly.utils.object.inherits(Blockly.Events.MarkerMove, Blockly.Events.UiBase);
+Blockly.utils.object.inherits(MarkerMove, Blockly.Events.UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.MarkerMove.prototype.type = Blockly.Events.MARKER_MOVE;
+MarkerMove.prototype.type = Blockly.Events.MARKER_MOVE;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.MarkerMove.prototype.toJson = function() {
-  const json = Blockly.Events.MarkerMove.superClass_.toJson.call(this);
+MarkerMove.prototype.toJson = function() {
+  const json = MarkerMove.superClass_.toJson.call(this);
   json['isCursor'] = this.isCursor;
   json['blockId'] = this.blockId;
   json['oldNode'] = this.oldNode;
@@ -93,8 +94,8 @@ Blockly.Events.MarkerMove.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.MarkerMove.prototype.fromJson = function(json) {
-  Blockly.Events.MarkerMove.superClass_.fromJson.call(this, json);
+MarkerMove.prototype.fromJson = function(json) {
+  MarkerMove.superClass_.fromJson.call(this, json);
   this.isCursor = json['isCursor'];
   this.blockId = json['blockId'];
   this.oldNode = json['oldNode'];
@@ -102,4 +103,6 @@ Blockly.Events.MarkerMove.prototype.fromJson = function(json) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.MARKER_MOVE, Blockly.Events.MarkerMove);
+    Blockly.Events.MARKER_MOVE, MarkerMove);
+
+exports = MarkerMove;
diff --git a/tests/deps.js b/tests/deps.js
index 1e9ef54f4..7cb45f9bd 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -39,7 +39,7 @@ goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abst
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);

From b9af6677e851bb194e38c06ba5fa9d09602cee8d Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 11:14:52 -0700
Subject: [PATCH 480/833] Migrate core/events/events_marker_move.js to named
 requires

---
 core/events/events_marker_move.js | 41 ++++++++++++++++---------------
 tests/deps.js                     |  2 +-
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/core/events/events_marker_move.js b/core/events/events_marker_move.js
index e85b5fd07..e4c0f2f9c 100644
--- a/core/events/events_marker_move.js
+++ b/core/events/events_marker_move.js
@@ -13,35 +13,36 @@
 goog.module('Blockly.Events.MarkerMove');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.ASTNode');
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.Workspace');
+const ASTNode = goog.require('Blockly.ASTNode');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
  * Class for a marker move event.
- * @param {?Blockly.Block=} opt_block The affected block. Null if current node
+ * @param {?Block=} opt_block The affected block. Null if current node
  *    is of type workspace. Undefined for a blank event.
  * @param {boolean=} isCursor Whether this is a cursor event. Undefined for a
  *    blank event.
- * @param {?Blockly.ASTNode=} opt_oldNode The old node the marker used to be on.
+ * @param {?ASTNode=} opt_oldNode The old node the marker used to be on.
  *    Undefined for a blank event.
- * @param {!Blockly.ASTNode=} opt_newNode The new node the marker is now on.
+ * @param {!ASTNode=} opt_newNode The new node the marker is now on.
  *    Undefined for a blank event.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @constructor
  */
 const MarkerMove = function(opt_block, isCursor, opt_oldNode,
     opt_newNode) {
   let workspaceId = opt_block ? opt_block.workspace.id : undefined;
-  if (opt_newNode && opt_newNode.getType() == Blockly.ASTNode.types.WORKSPACE) {
+  if (opt_newNode && opt_newNode.getType() == ASTNode.types.WORKSPACE) {
     workspaceId =
-        (/** @type {!Blockly.Workspace} */ (opt_newNode.getLocation())).id;
+        (/** @type {!Workspace} */ (opt_newNode.getLocation())).id;
   }
   MarkerMove.superClass_.constructor.call(this, workspaceId);
 
@@ -53,13 +54,13 @@ const MarkerMove = function(opt_block, isCursor, opt_oldNode,
 
   /**
    * The old node the marker used to be on.
-   * @type {?Blockly.ASTNode|undefined}
+   * @type {?ASTNode|undefined}
    */
   this.oldNode = opt_oldNode;
 
   /**
    * The new node the  marker is now on.
-   * @type {Blockly.ASTNode|undefined}
+   * @type {ASTNode|undefined}
    */
   this.newNode = opt_newNode;
 
@@ -69,13 +70,13 @@ const MarkerMove = function(opt_block, isCursor, opt_oldNode,
    */
   this.isCursor = isCursor;
 };
-Blockly.utils.object.inherits(MarkerMove, Blockly.Events.UiBase);
+object.inherits(MarkerMove, UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-MarkerMove.prototype.type = Blockly.Events.MARKER_MOVE;
+MarkerMove.prototype.type = Events.MARKER_MOVE;
 
 /**
  * Encode the event as JSON.
@@ -102,7 +103,7 @@ MarkerMove.prototype.fromJson = function(json) {
   this.newNode = json['newNode'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.MARKER_MOVE, MarkerMove);
+registry.register(registry.Type.EVENT,
+    Events.MARKER_MOVE, MarkerMove);
 
 exports = MarkerMove;
diff --git a/tests/deps.js b/tests/deps.js
index 7cb45f9bd..cdb39710c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -39,7 +39,7 @@ goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abst
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);

From 3f83a8f600ea130d9ff1340fd163d4bbcde48150 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 11:15:11 -0700
Subject: [PATCH 481/833] clang-format core/events/events_marker_move.js

---
 core/events/events_marker_move.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/core/events/events_marker_move.js b/core/events/events_marker_move.js
index e4c0f2f9c..2d0e0957b 100644
--- a/core/events/events_marker_move.js
+++ b/core/events/events_marker_move.js
@@ -37,12 +37,10 @@ const registry = goog.require('Blockly.registry');
  * @extends {UiBase}
  * @constructor
  */
-const MarkerMove = function(opt_block, isCursor, opt_oldNode,
-    opt_newNode) {
+const MarkerMove = function(opt_block, isCursor, opt_oldNode, opt_newNode) {
   let workspaceId = opt_block ? opt_block.workspace.id : undefined;
   if (opt_newNode && opt_newNode.getType() == ASTNode.types.WORKSPACE) {
-    workspaceId =
-        (/** @type {!Workspace} */ (opt_newNode.getLocation())).id;
+    workspaceId = (/** @type {!Workspace} */ (opt_newNode.getLocation())).id;
   }
   MarkerMove.superClass_.constructor.call(this, workspaceId);
 
@@ -103,7 +101,6 @@ MarkerMove.prototype.fromJson = function(json) {
   this.newNode = json['newNode'];
 };
 
-registry.register(registry.Type.EVENT,
-    Events.MARKER_MOVE, MarkerMove);
+registry.register(registry.Type.EVENT, Events.MARKER_MOVE, MarkerMove);
 
 exports = MarkerMove;

From 0dde319291c1d5dea3e580bdd0b9fceff3c3b70e Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 11:22:32 -0700
Subject: [PATCH 482/833] Migrate core/events/events_click.js to ES6 const/let

---
 core/events/events_click.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/events/events_click.js b/core/events/events_click.js
index ea46b0a76..19775c41e 100644
--- a/core/events/events_click.js
+++ b/core/events/events_click.js
@@ -33,7 +33,7 @@ goog.requireType('Blockly.Block');
  * @constructor
  */
 Blockly.Events.Click = function(opt_block, opt_workspaceId, opt_targetType) {
-  var workspaceId = opt_block ? opt_block.workspace.id : opt_workspaceId;
+  const workspaceId = opt_block ? opt_block.workspace.id : opt_workspaceId;
   Blockly.Events.Click.superClass_.constructor.call(this, workspaceId);
   this.blockId = opt_block ? opt_block.id : null;
 
@@ -56,7 +56,7 @@ Blockly.Events.Click.prototype.type = Blockly.Events.CLICK;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.Click.prototype.toJson = function() {
-  var json = Blockly.Events.Click.superClass_.toJson.call(this);
+  const json = Blockly.Events.Click.superClass_.toJson.call(this);
   json['targetType'] = this.targetType;
   if (this.blockId) {
     json['blockId'] = this.blockId;

From 31fc78393f004e3b361f92275205010b867b8cfe Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 11:24:28 -0700
Subject: [PATCH 483/833] Migrate core/events/events_click.js to goog.module

---
 core/events/events_click.js | 23 +++++++++++++----------
 tests/deps.js               |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/core/events/events_click.js b/core/events/events_click.js
index 19775c41e..a19ee6b75 100644
--- a/core/events/events_click.js
+++ b/core/events/events_click.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.Click');
+goog.module('Blockly.Events.Click');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.UiBase');
@@ -32,9 +33,9 @@ goog.requireType('Blockly.Block');
  * @extends {Blockly.Events.UiBase}
  * @constructor
  */
-Blockly.Events.Click = function(opt_block, opt_workspaceId, opt_targetType) {
+const Click = function(opt_block, opt_workspaceId, opt_targetType) {
   const workspaceId = opt_block ? opt_block.workspace.id : opt_workspaceId;
-  Blockly.Events.Click.superClass_.constructor.call(this, workspaceId);
+  Click.superClass_.constructor.call(this, workspaceId);
   this.blockId = opt_block ? opt_block.id : null;
 
   /**
@@ -43,20 +44,20 @@ Blockly.Events.Click = function(opt_block, opt_workspaceId, opt_targetType) {
    */
   this.targetType = opt_targetType;
 };
-Blockly.utils.object.inherits(Blockly.Events.Click, Blockly.Events.UiBase);
+Blockly.utils.object.inherits(Click, Blockly.Events.UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.Click.prototype.type = Blockly.Events.CLICK;
+Click.prototype.type = Blockly.Events.CLICK;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.Click.prototype.toJson = function() {
-  const json = Blockly.Events.Click.superClass_.toJson.call(this);
+Click.prototype.toJson = function() {
+  const json = Click.superClass_.toJson.call(this);
   json['targetType'] = this.targetType;
   if (this.blockId) {
     json['blockId'] = this.blockId;
@@ -68,11 +69,13 @@ Blockly.Events.Click.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.Click.prototype.fromJson = function(json) {
-  Blockly.Events.Click.superClass_.fromJson.call(this, json);
+Click.prototype.fromJson = function(json) {
+  Click.superClass_.fromJson.call(this, json);
   this.targetType = json['targetType'];
   this.blockId = json['blockId'];
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.CLICK,
-    Blockly.Events.Click);
+    Click);
+
+exports = Click;
diff --git a/tests/deps.js b/tests/deps.js
index 1e9ef54f4..4ddac911b 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -38,7 +38,7 @@ goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.
 goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events']);
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);

From 0abdb821d87745b2d5b280e5a202c9920b8f27d4 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 11:26:57 -0700
Subject: [PATCH 484/833] Migrate core/events/events_click.js to named requires

---
 core/events/events_click.js | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/core/events/events_click.js b/core/events/events_click.js
index a19ee6b75..27628ebb9 100644
--- a/core/events/events_click.js
+++ b/core/events/events_click.js
@@ -13,24 +13,23 @@
 goog.module('Blockly.Events.Click');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.Block');
-
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 /**
  * Class for a click event.
- * @param {?Blockly.Block=} opt_block The affected block. Null for click events
+ * @param {?Block=} opt_block The affected block. Null for click events
  *    that do not have an associated block (i.e. workspace click). Undefined
  *    for a blank event.
  * @param {?string=} opt_workspaceId The workspace identifier for this event.
  *    Not used if block is passed. Undefined for a blank event.
  * @param {string=} opt_targetType The type of element targeted by this click
  *    event. Undefined for a blank event.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @constructor
  */
 const Click = function(opt_block, opt_workspaceId, opt_targetType) {
@@ -44,13 +43,13 @@ const Click = function(opt_block, opt_workspaceId, opt_targetType) {
    */
   this.targetType = opt_targetType;
 };
-Blockly.utils.object.inherits(Click, Blockly.Events.UiBase);
+object.inherits(Click, UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Click.prototype.type = Blockly.Events.CLICK;
+Click.prototype.type = Events.CLICK;
 
 /**
  * Encode the event as JSON.
@@ -75,7 +74,7 @@ Click.prototype.fromJson = function(json) {
   this.blockId = json['blockId'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.CLICK,
+registry.register(registry.Type.EVENT, Events.CLICK,
     Click);
 
 exports = Click;

From 6662718440f1ed0e4f1c3695cc51fa1d9789bf0b Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 11:27:17 -0700
Subject: [PATCH 485/833] clang-format core/events/events_click.js

---
 core/events/events_click.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/events/events_click.js b/core/events/events_click.js
index 27628ebb9..521f87763 100644
--- a/core/events/events_click.js
+++ b/core/events/events_click.js
@@ -74,7 +74,6 @@ Click.prototype.fromJson = function(json) {
   this.blockId = json['blockId'];
 };
 
-registry.register(registry.Type.EVENT, Events.CLICK,
-    Click);
+registry.register(registry.Type.EVENT, Events.CLICK, Click);
 
 exports = Click;

From d1191fb7b5712f59ca9cf743121846505ce3b2ce Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 23 Jul 2021 19:39:56 -0700
Subject: [PATCH 486/833] Migrate core/positionable_helpers.js to ES6 const/let

---
 core/positionable_helpers.js | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/core/positionable_helpers.js b/core/positionable_helpers.js
index 3dc52e50c..fb33f177f 100644
--- a/core/positionable_helpers.js
+++ b/core/positionable_helpers.js
@@ -80,8 +80,8 @@ Blockly.uiPosition.getStartPositionRect = function(
     position, size, horizontalPadding,
     verticalPadding, metrics, workspace) {
   // Horizontal positioning.
-  var left = 0;
-  var hasVerticalScrollbar =
+  let left = 0;
+  const hasVerticalScrollbar =
       workspace.scrollbar && workspace.scrollbar.canScrollVertically();
   if (position.horizontal ===
       Blockly.uiPosition.horizontalPosition.LEFT) {
@@ -97,7 +97,7 @@ Blockly.uiPosition.getStartPositionRect = function(
     }
   }
   // Vertical positioning.
-  var top = 0;
+  let top = 0;
   if (position.vertical ===
       Blockly.uiPosition.verticalPosition.TOP) {
     top = metrics.absoluteMetrics.top + verticalPadding;
@@ -124,15 +124,15 @@ Blockly.uiPosition.getStartPositionRect = function(
  * @package
  */
 Blockly.uiPosition.getCornerOppositeToolbox = function(workspace, metrics) {
-  var leftCorner =
+  const leftCorner =
       metrics.toolboxMetrics.position !== Blockly.utils.toolbox.Position.LEFT &&
       (!workspace.horizontalLayout || workspace.RTL);
-  var topCorner =
+  const topCorner =
       metrics.toolboxMetrics.position === Blockly.utils.toolbox.Position.BOTTOM;
-  var horizontalPosition = leftCorner ?
+  const horizontalPosition = leftCorner ?
       Blockly.uiPosition.horizontalPosition.LEFT :
       Blockly.uiPosition.horizontalPosition.RIGHT;
-  var verticalPosition = topCorner ?
+  const verticalPosition = topCorner ?
       Blockly.uiPosition.verticalPosition.TOP :
       Blockly.uiPosition.verticalPosition.BOTTOM;
   return {
@@ -156,14 +156,15 @@ Blockly.uiPosition.getCornerOppositeToolbox = function(workspace, metrics) {
  */
 Blockly.uiPosition.bumpPositionRect = function(
     startRect, margin, bumpDirection, savedPositions) {
-  var top = startRect.top;
-  var left = startRect.left;
-  var width = startRect.right - startRect.left;
-  var height = startRect.bottom - startRect.top;
+  let top = startRect.top;
+  const left = startRect.left;
+  const width = startRect.right - startRect.left;
+  const height = startRect.bottom - startRect.top;
 
   // Check for collision and bump if needed.
-  var boundingRect = startRect;
-  for (var i = 0, otherEl; (otherEl = savedPositions[i]); i++) {
+  let boundingRect = startRect;
+  for (let i = 0; i < savedPositions.length; i++) {
+    const otherEl = savedPositions[i];
     if (boundingRect.intersects(otherEl)) {
       if (bumpDirection === Blockly.uiPosition.bumpDirection.UP) {
         top = otherEl.top - height - margin;

From 1d72126e1d8ad255574e501a5d306868e8f83f08 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 23 Jul 2021 19:43:56 -0700
Subject: [PATCH 487/833] Migrate core/positionable_helpers.js to goog.module

---
 core/positionable_helpers.js | 74 ++++++++++++++++++++----------------
 tests/deps.js                |  2 +-
 2 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/core/positionable_helpers.js b/core/positionable_helpers.js
index fb33f177f..9ca1d0759 100644
--- a/core/positionable_helpers.js
+++ b/core/positionable_helpers.js
@@ -10,62 +10,68 @@
  */
 'use strict';
 
-goog.provide('Blockly.uiPosition');
+goog.module('Blockly.uiPosition');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Scrollbar');
 goog.require('Blockly.utils.Rect');
 goog.require('Blockly.utils.toolbox');
 
 goog.requireType('Blockly.MetricsManager');
+goog.requireType('Blockly.utils.Size');
 goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
  * Enum for vertical positioning.
  * @enum {number}
- * @package
  */
-Blockly.uiPosition.verticalPosition = {
+const verticalPosition = {
   TOP: 0,
   BOTTOM: 1
 };
+/** @package */
+exports.verticalPosition = verticalPosition;
 
 /**
  * Enum for horizontal positioning.
  * @enum {number}
- * @package
  */
-Blockly.uiPosition.horizontalPosition = {
+const horizontalPosition = {
   LEFT: 0,
   RIGHT: 1
 };
+/** @package */
+exports.horizontalPosition = horizontalPosition;
 
 /**
  * An object defining a horizontal and vertical positioning.
  * @typedef {{
- *   horizontal: !Blockly.uiPosition.horizontalPosition,
- *   vertical: !Blockly.uiPosition.verticalPosition
+ *   horizontal: !horizontalPosition,
+ *   vertical: !verticalPosition
  * }}
- * @package
  */
-Blockly.uiPosition.Position;
+let Position;
+/** @package */
+exports.Position = Position;
 
 /**
  * Enum for bump rules to use for dealing with collisions.
  * @enum {number}
- * @package
  */
-Blockly.uiPosition.bumpDirection = {
+const bumpDirection = {
   UP: 0,
   DOWN: 1
 };
+/** @package */
+exports.bumpDirection = bumpDirection;
 
 /**
  * Returns a rectangle representing reasonable position for where to place a UI
  * element of the specified size given the restraints and locations of the
  * scrollbars. This method does not take into account any already placed UI
  * elements.
- * @param {!Blockly.uiPosition.Position} position The starting
+ * @param {!Position} position The starting
  *    horizontal and vertical position.
  * @param {!Blockly.utils.Size} size the size of the UI element to get a start
  *    position for.
@@ -74,9 +80,8 @@ Blockly.uiPosition.bumpDirection = {
  * @param {!Blockly.MetricsManager.UiMetrics} metrics The workspace UI metrics.
  * @param {!Blockly.WorkspaceSvg} workspace The workspace.
  * @return {!Blockly.utils.Rect} The suggested start position.
- * @package
  */
-Blockly.uiPosition.getStartPositionRect = function(
+const getStartPositionRect = function(
     position, size, horizontalPadding,
     verticalPadding, metrics, workspace) {
   // Horizontal positioning.
@@ -84,7 +89,7 @@ Blockly.uiPosition.getStartPositionRect = function(
   const hasVerticalScrollbar =
       workspace.scrollbar && workspace.scrollbar.canScrollVertically();
   if (position.horizontal ===
-      Blockly.uiPosition.horizontalPosition.LEFT) {
+      horizontalPosition.LEFT) {
     left = metrics.absoluteMetrics.left + horizontalPadding;
     if (hasVerticalScrollbar && workspace.RTL) {
       left += Blockly.Scrollbar.scrollbarThickness;
@@ -99,7 +104,7 @@ Blockly.uiPosition.getStartPositionRect = function(
   // Vertical positioning.
   let top = 0;
   if (position.vertical ===
-      Blockly.uiPosition.verticalPosition.TOP) {
+      verticalPosition.TOP) {
     top = metrics.absoluteMetrics.top + verticalPadding;
   } else {  // position.vertical == verticalPosition.BOTTOM
     top = metrics.absoluteMetrics.top + metrics.viewMetrics.height -
@@ -112,6 +117,8 @@ Blockly.uiPosition.getStartPositionRect = function(
   return new Blockly.utils.Rect(
       top, top + size.height, left, left + size.width);
 };
+/** @package */
+exports.getStartPositionRect = getStartPositionRect;
 
 /**
  * Returns a corner position that is on the opposite side of the workspace from
@@ -120,26 +127,26 @@ Blockly.uiPosition.getStartPositionRect = function(
  * orientation, defaults to the right corner.
  * @param {!Blockly.WorkspaceSvg} workspace The workspace.
  * @param {!Blockly.MetricsManager.UiMetrics} metrics The workspace metrics.
- * @return {!Blockly.uiPosition.Position} The suggested corner position.
+ * @return {!Position} The suggested corner position.
  * @package
  */
-Blockly.uiPosition.getCornerOppositeToolbox = function(workspace, metrics) {
+const getCornerOppositeToolbox = function(workspace, metrics) {
   const leftCorner =
       metrics.toolboxMetrics.position !== Blockly.utils.toolbox.Position.LEFT &&
       (!workspace.horizontalLayout || workspace.RTL);
   const topCorner =
       metrics.toolboxMetrics.position === Blockly.utils.toolbox.Position.BOTTOM;
-  const horizontalPosition = leftCorner ?
-      Blockly.uiPosition.horizontalPosition.LEFT :
-      Blockly.uiPosition.horizontalPosition.RIGHT;
-  const verticalPosition = topCorner ?
-      Blockly.uiPosition.verticalPosition.TOP :
-      Blockly.uiPosition.verticalPosition.BOTTOM;
+  const hPosition = leftCorner ?
+      horizontalPosition.LEFT : horizontalPosition.RIGHT;
+  const vPosition = topCorner ?
+      verticalPosition.TOP : verticalPosition.BOTTOM;
   return {
-    horizontal: horizontalPosition,
-    vertical: verticalPosition
+    horizontal: hPosition,
+    vertical: vPosition
   };
 };
+/** @package */
+exports.getCornerOppositeToolbox = getCornerOppositeToolbox;
 
 /**
  * Returns a position Rect based on a starting position that is bumped
@@ -147,15 +154,14 @@ Blockly.uiPosition.getCornerOppositeToolbox = function(workspace, metrics) {
  * method does not check that the bumped position is still within bounds.
  * @param {!Blockly.utils.Rect} startRect The starting position to use.
  * @param {number} margin The margin to use between elements when bumping.
- * @param {!Blockly.uiPosition.bumpDirection} bumpDirection The direction
- *    to bump if there is a collision with an existing UI element.
+ * @param {!bumpDirection} bumpDir The direction to bump if there is a collision
+ *    with an existing UI element.
  * @param {!Array<!Blockly.utils.Rect>} savedPositions List of rectangles that
  *    represent the positions of UI elements already placed.
  * @return {!Blockly.utils.Rect} The suggested position rectangle.
- * @package
  */
-Blockly.uiPosition.bumpPositionRect = function(
-    startRect, margin, bumpDirection, savedPositions) {
+const bumpPositionRect = function(
+    startRect, margin, bumpDir, savedPositions) {
   let top = startRect.top;
   const left = startRect.left;
   const width = startRect.right - startRect.left;
@@ -166,9 +172,9 @@ Blockly.uiPosition.bumpPositionRect = function(
   for (let i = 0; i < savedPositions.length; i++) {
     const otherEl = savedPositions[i];
     if (boundingRect.intersects(otherEl)) {
-      if (bumpDirection === Blockly.uiPosition.bumpDirection.UP) {
+      if (bumpDir === bumpDirection.UP) {
         top = otherEl.top - height - margin;
-      } else {  // bumpDirection == bumpDirection.DOWN
+      } else {  // bumpDir == bumpDirection.DOWN
         top = otherEl.bottom + margin;
       }
       // Recheck other savedPositions
@@ -179,3 +185,5 @@ Blockly.uiPosition.bumpPositionRect = function(
   }
   return boundingRect;
 };
+/** @package */
+exports.bumpPositionRect = bumpPositionRect;
diff --git a/tests/deps.js b/tests/deps.js
index 556839dd2..e250dc441 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -117,7 +117,7 @@ goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global'
 goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', '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.internalConstants']);
 goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.Metrics', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.xml']);
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From c59f083485ca474d01dd2af75926073fe8864459 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 14:21:57 -0700
Subject: [PATCH 488/833] Migrate core/positionable_helpers.js named requires

---
 core/positionable_helpers.js | 45 ++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/core/positionable_helpers.js b/core/positionable_helpers.js
index 9ca1d0759..6579a5a4e 100644
--- a/core/positionable_helpers.js
+++ b/core/positionable_helpers.js
@@ -13,13 +13,12 @@
 goog.module('Blockly.uiPosition');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Scrollbar');
-goog.require('Blockly.utils.Rect');
-goog.require('Blockly.utils.toolbox');
-
-goog.requireType('Blockly.MetricsManager');
-goog.requireType('Blockly.utils.Size');
-goog.requireType('Blockly.WorkspaceSvg');
+const MetricsManager = goog.requireType('Blockly.MetricsManager');
+const Rect = goog.require('Blockly.utils.Rect');
+const Scrollbar = goog.require('Blockly.Scrollbar');
+const Size = goog.requireType('Blockly.utils.Size');
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const toolbox = goog.require('Blockly.utils.toolbox');
 
 
 /**
@@ -73,13 +72,13 @@ exports.bumpDirection = bumpDirection;
  * elements.
  * @param {!Position} position The starting
  *    horizontal and vertical position.
- * @param {!Blockly.utils.Size} size the size of the UI element to get a start
+ * @param {!Size} size the size of the UI element to get a start
  *    position for.
  * @param {number} horizontalPadding The horizontal padding to use.
  * @param {number} verticalPadding The vertical padding to use.
- * @param {!Blockly.MetricsManager.UiMetrics} metrics The workspace UI metrics.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace.
- * @return {!Blockly.utils.Rect} The suggested start position.
+ * @param {!MetricsManager.UiMetrics} metrics The workspace UI metrics.
+ * @param {!WorkspaceSvg} workspace The workspace.
+ * @return {!Rect} The suggested start position.
  */
 const getStartPositionRect = function(
     position, size, horizontalPadding,
@@ -92,13 +91,13 @@ const getStartPositionRect = function(
       horizontalPosition.LEFT) {
     left = metrics.absoluteMetrics.left + horizontalPadding;
     if (hasVerticalScrollbar && workspace.RTL) {
-      left += Blockly.Scrollbar.scrollbarThickness;
+      left += Scrollbar.scrollbarThickness;
     }
   } else {  // position.horizontal == horizontalPosition.RIGHT
     left = metrics.absoluteMetrics.left + metrics.viewMetrics.width -
         size.width - horizontalPadding;
     if (hasVerticalScrollbar && !workspace.RTL) {
-      left -= Blockly.Scrollbar.scrollbarThickness;
+      left -= Scrollbar.scrollbarThickness;
     }
   }
   // Vertical positioning.
@@ -111,10 +110,10 @@ const getStartPositionRect = function(
         size.height - verticalPadding;
     if (workspace.scrollbar && workspace.scrollbar.canScrollHorizontally()) {
       // The scrollbars are always positioned on the bottom if they exist.
-      top -= Blockly.Scrollbar.scrollbarThickness;
+      top -= Scrollbar.scrollbarThickness;
     }
   }
-  return new Blockly.utils.Rect(
+  return new Rect(
       top, top + size.height, left, left + size.width);
 };
 /** @package */
@@ -125,17 +124,17 @@ exports.getStartPositionRect = getStartPositionRect;
  * the toolbox.
  * If in horizontal orientation, defaults to the bottom corner. If in vertical
  * orientation, defaults to the right corner.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace.
- * @param {!Blockly.MetricsManager.UiMetrics} metrics The workspace metrics.
+ * @param {!WorkspaceSvg} workspace The workspace.
+ * @param {!MetricsManager.UiMetrics} metrics The workspace metrics.
  * @return {!Position} The suggested corner position.
  * @package
  */
 const getCornerOppositeToolbox = function(workspace, metrics) {
   const leftCorner =
-      metrics.toolboxMetrics.position !== Blockly.utils.toolbox.Position.LEFT &&
+      metrics.toolboxMetrics.position !== toolbox.Position.LEFT &&
       (!workspace.horizontalLayout || workspace.RTL);
   const topCorner =
-      metrics.toolboxMetrics.position === Blockly.utils.toolbox.Position.BOTTOM;
+      metrics.toolboxMetrics.position === toolbox.Position.BOTTOM;
   const hPosition = leftCorner ?
       horizontalPosition.LEFT : horizontalPosition.RIGHT;
   const vPosition = topCorner ?
@@ -152,13 +151,13 @@ exports.getCornerOppositeToolbox = getCornerOppositeToolbox;
  * Returns a position Rect based on a starting position that is bumped
  * so that it doesn't intersect with any of the provided savedPositions. This
  * method does not check that the bumped position is still within bounds.
- * @param {!Blockly.utils.Rect} startRect The starting position to use.
+ * @param {!Rect} startRect The starting position to use.
  * @param {number} margin The margin to use between elements when bumping.
  * @param {!bumpDirection} bumpDir The direction to bump if there is a collision
  *    with an existing UI element.
- * @param {!Array<!Blockly.utils.Rect>} savedPositions List of rectangles that
+ * @param {!Array<!Rect>} savedPositions List of rectangles that
  *    represent the positions of UI elements already placed.
- * @return {!Blockly.utils.Rect} The suggested position rectangle.
+ * @return {!Rect} The suggested position rectangle.
  */
 const bumpPositionRect = function(
     startRect, margin, bumpDir, savedPositions) {
@@ -178,7 +177,7 @@ const bumpPositionRect = function(
         top = otherEl.bottom + margin;
       }
       // Recheck other savedPositions
-      boundingRect = new Blockly.utils.Rect(
+      boundingRect = new Rect(
           top, top + height, left, left + width);
       i = -1;
     }

From b3cd8b7c861d5e69efa0d7c2d0827ad0bbc917f3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 14:22:11 -0700
Subject: [PATCH 489/833] clang-format core/positionable_helpers.js

---
 core/positionable_helpers.js | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/core/positionable_helpers.js b/core/positionable_helpers.js
index 6579a5a4e..9e45d5a68 100644
--- a/core/positionable_helpers.js
+++ b/core/positionable_helpers.js
@@ -81,14 +81,12 @@ exports.bumpDirection = bumpDirection;
  * @return {!Rect} The suggested start position.
  */
 const getStartPositionRect = function(
-    position, size, horizontalPadding,
-    verticalPadding, metrics, workspace) {
+    position, size, horizontalPadding, verticalPadding, metrics, workspace) {
   // Horizontal positioning.
   let left = 0;
   const hasVerticalScrollbar =
       workspace.scrollbar && workspace.scrollbar.canScrollVertically();
-  if (position.horizontal ===
-      horizontalPosition.LEFT) {
+  if (position.horizontal === horizontalPosition.LEFT) {
     left = metrics.absoluteMetrics.left + horizontalPadding;
     if (hasVerticalScrollbar && workspace.RTL) {
       left += Scrollbar.scrollbarThickness;
@@ -102,8 +100,7 @@ const getStartPositionRect = function(
   }
   // Vertical positioning.
   let top = 0;
-  if (position.vertical ===
-      verticalPosition.TOP) {
+  if (position.vertical === verticalPosition.TOP) {
     top = metrics.absoluteMetrics.top + verticalPadding;
   } else {  // position.vertical == verticalPosition.BOTTOM
     top = metrics.absoluteMetrics.top + metrics.viewMetrics.height -
@@ -113,8 +110,7 @@ const getStartPositionRect = function(
       top -= Scrollbar.scrollbarThickness;
     }
   }
-  return new Rect(
-      top, top + size.height, left, left + size.width);
+  return new Rect(top, top + size.height, left, left + size.width);
 };
 /** @package */
 exports.getStartPositionRect = getStartPositionRect;
@@ -133,16 +129,11 @@ const getCornerOppositeToolbox = function(workspace, metrics) {
   const leftCorner =
       metrics.toolboxMetrics.position !== toolbox.Position.LEFT &&
       (!workspace.horizontalLayout || workspace.RTL);
-  const topCorner =
-      metrics.toolboxMetrics.position === toolbox.Position.BOTTOM;
-  const hPosition = leftCorner ?
-      horizontalPosition.LEFT : horizontalPosition.RIGHT;
-  const vPosition = topCorner ?
-      verticalPosition.TOP : verticalPosition.BOTTOM;
-  return {
-    horizontal: hPosition,
-    vertical: vPosition
-  };
+  const topCorner = metrics.toolboxMetrics.position === toolbox.Position.BOTTOM;
+  const hPosition =
+      leftCorner ? horizontalPosition.LEFT : horizontalPosition.RIGHT;
+  const vPosition = topCorner ? verticalPosition.TOP : verticalPosition.BOTTOM;
+  return {horizontal: hPosition, vertical: vPosition};
 };
 /** @package */
 exports.getCornerOppositeToolbox = getCornerOppositeToolbox;
@@ -159,8 +150,7 @@ exports.getCornerOppositeToolbox = getCornerOppositeToolbox;
  *    represent the positions of UI elements already placed.
  * @return {!Rect} The suggested position rectangle.
  */
-const bumpPositionRect = function(
-    startRect, margin, bumpDir, savedPositions) {
+const bumpPositionRect = function(startRect, margin, bumpDir, savedPositions) {
   let top = startRect.top;
   const left = startRect.left;
   const width = startRect.right - startRect.left;
@@ -177,8 +167,7 @@ const bumpPositionRect = function(
         top = otherEl.bottom + margin;
       }
       // Recheck other savedPositions
-      boundingRect = new Rect(
-          top, top + height, left, left + width);
+      boundingRect = new Rect(top, top + height, left, left + width);
       i = -1;
     }
   }

From 97d95c87b6eea00b2ac2fe3e6bd9bf4542c8b290 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 14:26:42 -0700
Subject: [PATCH 490/833] Add eslint disable in core/positionable_helpers.js

---
 core/positionable_helpers.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/positionable_helpers.js b/core/positionable_helpers.js
index 9e45d5a68..c38ca3263 100644
--- a/core/positionable_helpers.js
+++ b/core/positionable_helpers.js
@@ -13,10 +13,13 @@
 goog.module('Blockly.uiPosition');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const MetricsManager = goog.requireType('Blockly.MetricsManager');
 const Rect = goog.require('Blockly.utils.Rect');
 const Scrollbar = goog.require('Blockly.Scrollbar');
+/* 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 toolbox = goog.require('Blockly.utils.toolbox');
 

From 5b5b15ccbc898933f1991597ffebbdd77595c01c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 30 Jul 2021 15:53:17 -0700
Subject: [PATCH 491/833] Add extra @package annotation

---
 core/positionable_helpers.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/positionable_helpers.js b/core/positionable_helpers.js
index c38ca3263..812c5f7be 100644
--- a/core/positionable_helpers.js
+++ b/core/positionable_helpers.js
@@ -126,7 +126,6 @@ exports.getStartPositionRect = getStartPositionRect;
  * @param {!WorkspaceSvg} workspace The workspace.
  * @param {!MetricsManager.UiMetrics} metrics The workspace metrics.
  * @return {!Position} The suggested corner position.
- * @package
  */
 const getCornerOppositeToolbox = function(workspace, metrics) {
   const leftCorner =

From 315e1b856ffa83def33d42eb8a8b87f731d86e14 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:03:37 -0700
Subject: [PATCH 492/833] Migrate core/shortcut_items.js to ES6 const/let

---
 core/shortcut_items.js | 90 +++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/core/shortcut_items.js b/core/shortcut_items.js
index 494b64bfe..6f80f5648 100644
--- a/core/shortcut_items.js
+++ b/core/shortcut_items.js
@@ -42,12 +42,12 @@ Blockly.ShortcutItems.names = {
 /** Keyboard shortcut to hide chaff on escape. */
 Blockly.ShortcutItems.registerEscape = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
-  var escapeAction = {
+  const escapeAction = {
     name: Blockly.ShortcutItems.names.ESCAPE,
-    preconditionFn: function(workspace) {
+    preconditionFn: function (workspace) {
       return !workspace.options.readOnly;
     },
-    callback: function() {
+    callback: function () {
       Blockly.hideChaff();
       return true;
     }
@@ -60,14 +60,14 @@ Blockly.ShortcutItems.registerEscape = function() {
 /** Keyboard shortcut to delete a block on delete or backspace */
 Blockly.ShortcutItems.registerDelete = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
-  var deleteShortcut = {
+  const deleteShortcut = {
     name: Blockly.ShortcutItems.names.DELETE,
-    preconditionFn: function(workspace) {
+    preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
           Blockly.selected &&
           Blockly.selected.isDeletable();
     },
-    callback: function(workspace, e) {
+    callback: function (workspace, e) {
       // Delete or backspace.
       // Stop the browser from going back to the previous page.
       // Do this first to prevent an error in the delete code from resulting in
@@ -91,16 +91,16 @@ Blockly.ShortcutItems.registerDelete = function() {
 /** Keyboard shortcut to copy a block on ctrl+c, cmd+c, or alt+c. */
 Blockly.ShortcutItems.registerCopy = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
-  var copyShortcut = {
+  const copyShortcut = {
     name: Blockly.ShortcutItems.names.COPY,
-    preconditionFn: function(workspace) {
+    preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
-        !Blockly.Gesture.inProgress() &&
-        Blockly.selected &&
-        Blockly.selected.isDeletable() &&
-        Blockly.selected.isMovable();
+          !Blockly.Gesture.inProgress() &&
+          Blockly.selected &&
+          Blockly.selected.isDeletable() &&
+          Blockly.selected.isMovable();
     },
-    callback: function(workspace, e) {
+    callback: function (workspace, e) {
       // Prevent the default copy behavior, which may beep or otherwise indicate
       // an error due to the lack of a selection.
       e.preventDefault();
@@ -111,15 +111,15 @@ Blockly.ShortcutItems.registerCopy = function() {
   };
   Blockly.ShortcutRegistry.registry.register(copyShortcut);
 
-  var ctrlC = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const ctrlC = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.CTRL]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlC, copyShortcut.name);
 
-  var altC = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const altC = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.ALT]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(altC, copyShortcut.name);
 
-  var metaC = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const metaC = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.META]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(metaC, copyShortcut.name);
 };
@@ -127,15 +127,15 @@ Blockly.ShortcutItems.registerCopy = function() {
 /** Keyboard shortcut to copy and delete a block on ctrl+x, cmd+x, or alt+x. */
 Blockly.ShortcutItems.registerCut = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
-  var cutShortcut = {
+  const cutShortcut = {
     name: Blockly.ShortcutItems.names.CUT,
-    preconditionFn: function(workspace) {
+    preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
-        !Blockly.Gesture.inProgress() &&
-        Blockly.selected &&
-        Blockly.selected.isDeletable() &&
-        Blockly.selected.isMovable() &&
-        !Blockly.selected.workspace.isFlyout;
+          !Blockly.Gesture.inProgress() &&
+          Blockly.selected &&
+          Blockly.selected.isDeletable() &&
+          Blockly.selected.isMovable() &&
+          !Blockly.selected.workspace.isFlyout;
     },
     callback: function() {
       Blockly.clipboard.copy(/** @type {!Blockly.ICopyable} */ (Blockly.selected));
@@ -146,15 +146,15 @@ Blockly.ShortcutItems.registerCut = function() {
 
   Blockly.ShortcutRegistry.registry.register(cutShortcut);
 
-  var ctrlX = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const ctrlX = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.X, [Blockly.utils.KeyCodes.CTRL]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlX, cutShortcut.name);
 
-  var altX = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const altX = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.X, [Blockly.utils.KeyCodes.ALT]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(altX, cutShortcut.name);
 
-  var metaX = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const metaX = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.X, [Blockly.utils.KeyCodes.META]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(metaX, cutShortcut.name);
 };
@@ -162,9 +162,9 @@ Blockly.ShortcutItems.registerCut = function() {
 /** Keyboard shortcut to paste a block on ctrl+v, cmd+v, or alt+v. */
 Blockly.ShortcutItems.registerPaste = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
-  var pasteShortcut = {
+  const pasteShortcut = {
     name: Blockly.ShortcutItems.names.PASTE,
-    preconditionFn: function(workspace) {
+    preconditionFn: function (workspace) {
       return !workspace.options.readOnly && !Blockly.Gesture.inProgress();
     },
     callback: function() {
@@ -174,15 +174,15 @@ Blockly.ShortcutItems.registerPaste = function() {
 
   Blockly.ShortcutRegistry.registry.register(pasteShortcut);
 
-  var ctrlV = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const ctrlV = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.V, [Blockly.utils.KeyCodes.CTRL]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlV, pasteShortcut.name);
 
-  var altV = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const altV = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.V, [Blockly.utils.KeyCodes.ALT]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(altV, pasteShortcut.name);
 
-  var metaV = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const metaV = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.V, [Blockly.utils.KeyCodes.META]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(metaV, pasteShortcut.name);
 };
@@ -190,13 +190,13 @@ Blockly.ShortcutItems.registerPaste = function() {
 /** Keyboard shortcut to undo the previous action on ctrl+z, cmd+z, or alt+z. */
 Blockly.ShortcutItems.registerUndo = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
-  var undoShortcut = {
+  const undoShortcut = {
     name: Blockly.ShortcutItems.names.UNDO,
-    preconditionFn: function(workspace) {
+    preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
-        !Blockly.Gesture.inProgress();
+          !Blockly.Gesture.inProgress();
     },
-    callback: function(workspace) {
+    callback: function (workspace) {
       // 'z' for undo 'Z' is for redo.
       Blockly.hideChaff();
       workspace.undo(false);
@@ -205,15 +205,15 @@ Blockly.ShortcutItems.registerUndo = function() {
   };
   Blockly.ShortcutRegistry.registry.register(undoShortcut);
 
-  var ctrlZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const ctrlZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.CTRL]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlZ, undoShortcut.name);
 
-  var altZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const altZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.ALT]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(altZ, undoShortcut.name);
 
-  var metaZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const metaZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.META]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(metaZ, undoShortcut.name);
 };
@@ -221,12 +221,12 @@ Blockly.ShortcutItems.registerUndo = function() {
 /** Keyboard shortcut to redo the previous action on ctrl+shift+z, cmd+shift+z, or alt+shift+z. */
 Blockly.ShortcutItems.registerRedo = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
-  var redoShortcut = {
+  const redoShortcut = {
     name: Blockly.ShortcutItems.names.REDO,
-    preconditionFn: function(workspace) {
+    preconditionFn: function (workspace) {
       return !Blockly.Gesture.inProgress() && !workspace.options.readOnly;
     },
-    callback: function(workspace) {
+    callback: function (workspace) {
       // 'z' for undo 'Z' is for redo.
       Blockly.hideChaff();
       workspace.undo(true);
@@ -235,25 +235,25 @@ Blockly.ShortcutItems.registerRedo = function() {
   };
   Blockly.ShortcutRegistry.registry.register(redoShortcut);
 
-  var ctrlShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const ctrlShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.Z,
       [Blockly.utils.KeyCodes.SHIFT, Blockly.utils.KeyCodes.CTRL]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(
       ctrlShiftZ, redoShortcut.name);
 
-  var altShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const altShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.Z,
       [Blockly.utils.KeyCodes.SHIFT, Blockly.utils.KeyCodes.ALT]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(altShiftZ, redoShortcut.name);
 
-  var metaShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const metaShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.Z,
       [Blockly.utils.KeyCodes.SHIFT, Blockly.utils.KeyCodes.META]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(
       metaShiftZ, redoShortcut.name);
 
   // Ctrl-y is redo in Windows.  Command-y is never valid on Macs.
-  var ctrlY = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const ctrlY = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.Y, [Blockly.utils.KeyCodes.CTRL]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlY, redoShortcut.name);
 };

From 318fa4c014f1131a74e256aff0fa0b4e4fc37f3c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:05:12 -0700
Subject: [PATCH 493/833] Migrate core/shortcut_items.js to goog.module

---
 core/shortcut_items.js | 67 +++++++++++++++++++++++-------------------
 tests/deps.js          |  2 +-
 2 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/core/shortcut_items.js b/core/shortcut_items.js
index 6f80f5648..0a99e1259 100644
--- a/core/shortcut_items.js
+++ b/core/shortcut_items.js
@@ -10,12 +10,10 @@
  */
 'use strict';
 
-/**
- * @name Blockly.ShortcutItems
- * @namespace
- */
-goog.provide('Blockly.ShortcutItems');
+goog.module('Blockly.ShortcutItems');
+goog.module.declareLegacyNamespace();
 
+goog.require('Blockly');
 goog.require('Blockly.clipboard');
 goog.require('Blockly.Gesture');
 goog.require('Blockly.ShortcutRegistry');
@@ -29,7 +27,7 @@ goog.requireType('Blockly.ICopyable');
  * Object holding the names of the default shortcut items.
  * @enum {string}
  */
-Blockly.ShortcutItems.names = {
+const names = {
   ESCAPE: 'escape',
   DELETE: 'delete',
   COPY: 'copy',
@@ -38,12 +36,13 @@ Blockly.ShortcutItems.names = {
   UNDO: 'undo',
   REDO: 'redo'
 };
+exports.names = names;
 
 /** Keyboard shortcut to hide chaff on escape. */
-Blockly.ShortcutItems.registerEscape = function() {
+const registerEscape = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
   const escapeAction = {
-    name: Blockly.ShortcutItems.names.ESCAPE,
+    name: names.ESCAPE,
     preconditionFn: function (workspace) {
       return !workspace.options.readOnly;
     },
@@ -56,12 +55,13 @@ Blockly.ShortcutItems.registerEscape = function() {
   Blockly.ShortcutRegistry.registry.addKeyMapping(
       Blockly.utils.KeyCodes.ESC, escapeAction.name);
 };
+exports.registerEscape = registerEscape;
 
 /** Keyboard shortcut to delete a block on delete or backspace */
-Blockly.ShortcutItems.registerDelete = function() {
+const registerDelete = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
   const deleteShortcut = {
-    name: Blockly.ShortcutItems.names.DELETE,
+    name: names.DELETE,
     preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
           Blockly.selected &&
@@ -87,12 +87,13 @@ Blockly.ShortcutItems.registerDelete = function() {
   Blockly.ShortcutRegistry.registry.addKeyMapping(
       Blockly.utils.KeyCodes.BACKSPACE, deleteShortcut.name);
 };
+exports.registerDelete = registerDelete;
 
 /** Keyboard shortcut to copy a block on ctrl+c, cmd+c, or alt+c. */
-Blockly.ShortcutItems.registerCopy = function() {
+const registerCopy = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
   const copyShortcut = {
-    name: Blockly.ShortcutItems.names.COPY,
+    name: names.COPY,
     preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
           !Blockly.Gesture.inProgress() &&
@@ -123,12 +124,13 @@ Blockly.ShortcutItems.registerCopy = function() {
       Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.META]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(metaC, copyShortcut.name);
 };
+exports.registerCopy = registerCopy;
 
 /** Keyboard shortcut to copy and delete a block on ctrl+x, cmd+x, or alt+x. */
-Blockly.ShortcutItems.registerCut = function() {
+const registerCut = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
   const cutShortcut = {
-    name: Blockly.ShortcutItems.names.CUT,
+    name: names.CUT,
     preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
           !Blockly.Gesture.inProgress() &&
@@ -158,12 +160,13 @@ Blockly.ShortcutItems.registerCut = function() {
       Blockly.utils.KeyCodes.X, [Blockly.utils.KeyCodes.META]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(metaX, cutShortcut.name);
 };
+exports.registerCut = registerCut;
 
 /** Keyboard shortcut to paste a block on ctrl+v, cmd+v, or alt+v. */
-Blockly.ShortcutItems.registerPaste = function() {
+const registerPaste = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
   const pasteShortcut = {
-    name: Blockly.ShortcutItems.names.PASTE,
+    name: names.PASTE,
     preconditionFn: function (workspace) {
       return !workspace.options.readOnly && !Blockly.Gesture.inProgress();
     },
@@ -186,12 +189,13 @@ Blockly.ShortcutItems.registerPaste = function() {
       Blockly.utils.KeyCodes.V, [Blockly.utils.KeyCodes.META]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(metaV, pasteShortcut.name);
 };
+exports.registerPaste = registerPaste;
 
 /** Keyboard shortcut to undo the previous action on ctrl+z, cmd+z, or alt+z. */
-Blockly.ShortcutItems.registerUndo = function() {
+const registerUndo = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
   const undoShortcut = {
-    name: Blockly.ShortcutItems.names.UNDO,
+    name: names.UNDO,
     preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
           !Blockly.Gesture.inProgress();
@@ -217,12 +221,13 @@ Blockly.ShortcutItems.registerUndo = function() {
       Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.META]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(metaZ, undoShortcut.name);
 };
+exports.registerUndo = registerUndo;
 
 /** Keyboard shortcut to redo the previous action on ctrl+shift+z, cmd+shift+z, or alt+shift+z. */
-Blockly.ShortcutItems.registerRedo = function() {
+const registerRedo = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
   const redoShortcut = {
-    name: Blockly.ShortcutItems.names.REDO,
+    name: names.REDO,
     preconditionFn: function (workspace) {
       return !Blockly.Gesture.inProgress() && !workspace.options.readOnly;
     },
@@ -257,20 +262,22 @@ Blockly.ShortcutItems.registerRedo = function() {
       Blockly.utils.KeyCodes.Y, [Blockly.utils.KeyCodes.CTRL]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlY, redoShortcut.name);
 };
+exports.registerRedo = registerRedo;
 
 /**
  * Registers all default keyboard shortcut item. This should be called once per instance of
  * KeyboardShortcutRegistry.
- * @package
  */
-Blockly.ShortcutItems.registerDefaultShortcuts = function() {
-  Blockly.ShortcutItems.registerEscape();
-  Blockly.ShortcutItems.registerDelete();
-  Blockly.ShortcutItems.registerCopy();
-  Blockly.ShortcutItems.registerCut();
-  Blockly.ShortcutItems.registerPaste();
-  Blockly.ShortcutItems.registerUndo();
-  Blockly.ShortcutItems.registerRedo();
+const registerDefaultShortcuts = function() {
+  registerEscape();
+  registerDelete();
+  registerCopy();
+  registerCut();
+  registerPaste();
+  registerUndo();
+  registerRedo();
 };
+/** @package */
+exports.registerDefaultShortcuts = registerDefaultShortcuts;
 
-Blockly.ShortcutItems.registerDefaultShortcuts();
+registerDefaultShortcuts();
diff --git a/tests/deps.js b/tests/deps.js
index e250dc441..0b2e55f2c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -162,7 +162,7 @@ goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Ren
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.utils.KeyCodes']);
+goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly', 'Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);

From 47ac5548642b3afef730e8a466b0767f563006a0 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 11:17:13 -0700
Subject: [PATCH 494/833] Migrate core/shortcut_items.js named requires

---
 core/shortcut_items.js | 181 +++++++++++++++++++++--------------------
 1 file changed, 91 insertions(+), 90 deletions(-)

diff --git a/core/shortcut_items.js b/core/shortcut_items.js
index 0a99e1259..9d622914b 100644
--- a/core/shortcut_items.js
+++ b/core/shortcut_items.js
@@ -13,14 +13,15 @@
 goog.module('Blockly.ShortcutItems');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly');
-goog.require('Blockly.clipboard');
-goog.require('Blockly.Gesture');
-goog.require('Blockly.ShortcutRegistry');
-goog.require('Blockly.utils.KeyCodes');
-
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.ICopyable');
+const Blockly = goog.require('Blockly');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const Gesture = goog.require('Blockly.Gesture');
+/* eslint-disable-next-line no-unused-vars */
+const ICopyable = goog.requireType('Blockly.ICopyable');
+const KeyCodes = goog.require('Blockly.utils.KeyCodes');
+const ShortcutRegistry = goog.require('Blockly.ShortcutRegistry');
+const clipboard = goog.require('Blockly.clipboard');
 
 
 /**
@@ -40,7 +41,7 @@ exports.names = names;
 
 /** Keyboard shortcut to hide chaff on escape. */
 const registerEscape = function() {
-  /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
+  /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const escapeAction = {
     name: names.ESCAPE,
     preconditionFn: function (workspace) {
@@ -51,15 +52,15 @@ const registerEscape = function() {
       return true;
     }
   };
-  Blockly.ShortcutRegistry.registry.register(escapeAction);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(
-      Blockly.utils.KeyCodes.ESC, escapeAction.name);
+  ShortcutRegistry.registry.register(escapeAction);
+  ShortcutRegistry.registry.addKeyMapping(
+      KeyCodes.ESC, escapeAction.name);
 };
 exports.registerEscape = registerEscape;
 
 /** Keyboard shortcut to delete a block on delete or backspace */
 const registerDelete = function() {
-  /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
+  /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const deleteShortcut = {
     name: names.DELETE,
     preconditionFn: function (workspace) {
@@ -74,29 +75,29 @@ const registerDelete = function() {
       // data loss.
       e.preventDefault();
       // Don't delete while dragging.  Jeez.
-      if (Blockly.Gesture.inProgress()) {
+      if (Gesture.inProgress()) {
         return false;
       }
-      Blockly.deleteBlock(/** @type {!Blockly.BlockSvg} */ (Blockly.selected));
+      Blockly.deleteBlock(/** @type {!BlockSvg} */ (Blockly.selected));
       return true;
     }
   };
-  Blockly.ShortcutRegistry.registry.register(deleteShortcut);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(
-      Blockly.utils.KeyCodes.DELETE, deleteShortcut.name);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(
-      Blockly.utils.KeyCodes.BACKSPACE, deleteShortcut.name);
+  ShortcutRegistry.registry.register(deleteShortcut);
+  ShortcutRegistry.registry.addKeyMapping(
+      KeyCodes.DELETE, deleteShortcut.name);
+  ShortcutRegistry.registry.addKeyMapping(
+      KeyCodes.BACKSPACE, deleteShortcut.name);
 };
 exports.registerDelete = registerDelete;
 
 /** Keyboard shortcut to copy a block on ctrl+c, cmd+c, or alt+c. */
 const registerCopy = function() {
-  /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
+  /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const copyShortcut = {
     name: names.COPY,
     preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
-          !Blockly.Gesture.inProgress() &&
+          !Gesture.inProgress() &&
           Blockly.selected &&
           Blockly.selected.isDeletable() &&
           Blockly.selected.isMovable();
@@ -106,99 +107,99 @@ const registerCopy = function() {
       // an error due to the lack of a selection.
       e.preventDefault();
       Blockly.hideChaff();
-      Blockly.clipboard.copy(/** @type {!Blockly.ICopyable} */ (Blockly.selected));
+      clipboard.copy(/** @type {!ICopyable} */ (Blockly.selected));
       return true;
     }
   };
-  Blockly.ShortcutRegistry.registry.register(copyShortcut);
+  ShortcutRegistry.registry.register(copyShortcut);
 
-  const ctrlC = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.CTRL]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlC, copyShortcut.name);
+  const ctrlC = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.C, [KeyCodes.CTRL]);
+  ShortcutRegistry.registry.addKeyMapping(ctrlC, copyShortcut.name);
 
-  const altC = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.ALT]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(altC, copyShortcut.name);
+  const altC = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.C, [KeyCodes.ALT]);
+  ShortcutRegistry.registry.addKeyMapping(altC, copyShortcut.name);
 
-  const metaC = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.META]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(metaC, copyShortcut.name);
+  const metaC = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.C, [KeyCodes.META]);
+  ShortcutRegistry.registry.addKeyMapping(metaC, copyShortcut.name);
 };
 exports.registerCopy = registerCopy;
 
 /** Keyboard shortcut to copy and delete a block on ctrl+x, cmd+x, or alt+x. */
 const registerCut = function() {
-  /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
+  /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const cutShortcut = {
     name: names.CUT,
     preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
-          !Blockly.Gesture.inProgress() &&
+          !Gesture.inProgress() &&
           Blockly.selected &&
           Blockly.selected.isDeletable() &&
           Blockly.selected.isMovable() &&
           !Blockly.selected.workspace.isFlyout;
     },
     callback: function() {
-      Blockly.clipboard.copy(/** @type {!Blockly.ICopyable} */ (Blockly.selected));
-      Blockly.deleteBlock(/** @type {!Blockly.BlockSvg} */ (Blockly.selected));
+      clipboard.copy(/** @type {!ICopyable} */ (Blockly.selected));
+      Blockly.deleteBlock(/** @type {!BlockSvg} */ (Blockly.selected));
       return true;
     }
   };
 
-  Blockly.ShortcutRegistry.registry.register(cutShortcut);
+  ShortcutRegistry.registry.register(cutShortcut);
 
-  const ctrlX = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.X, [Blockly.utils.KeyCodes.CTRL]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlX, cutShortcut.name);
+  const ctrlX = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.X, [KeyCodes.CTRL]);
+  ShortcutRegistry.registry.addKeyMapping(ctrlX, cutShortcut.name);
 
-  const altX = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.X, [Blockly.utils.KeyCodes.ALT]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(altX, cutShortcut.name);
+  const altX = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.X, [KeyCodes.ALT]);
+  ShortcutRegistry.registry.addKeyMapping(altX, cutShortcut.name);
 
-  const metaX = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.X, [Blockly.utils.KeyCodes.META]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(metaX, cutShortcut.name);
+  const metaX = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.X, [KeyCodes.META]);
+  ShortcutRegistry.registry.addKeyMapping(metaX, cutShortcut.name);
 };
 exports.registerCut = registerCut;
 
 /** Keyboard shortcut to paste a block on ctrl+v, cmd+v, or alt+v. */
 const registerPaste = function() {
-  /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
+  /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const pasteShortcut = {
     name: names.PASTE,
     preconditionFn: function (workspace) {
-      return !workspace.options.readOnly && !Blockly.Gesture.inProgress();
+      return !workspace.options.readOnly && !Gesture.inProgress();
     },
     callback: function() {
-      return Blockly.clipboard.paste();
+      return clipboard.paste();
     }
   };
 
-  Blockly.ShortcutRegistry.registry.register(pasteShortcut);
+  ShortcutRegistry.registry.register(pasteShortcut);
 
-  const ctrlV = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.V, [Blockly.utils.KeyCodes.CTRL]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlV, pasteShortcut.name);
+  const ctrlV = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.V, [KeyCodes.CTRL]);
+  ShortcutRegistry.registry.addKeyMapping(ctrlV, pasteShortcut.name);
 
-  const altV = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.V, [Blockly.utils.KeyCodes.ALT]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(altV, pasteShortcut.name);
+  const altV = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.V, [KeyCodes.ALT]);
+  ShortcutRegistry.registry.addKeyMapping(altV, pasteShortcut.name);
 
-  const metaV = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.V, [Blockly.utils.KeyCodes.META]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(metaV, pasteShortcut.name);
+  const metaV = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.V, [KeyCodes.META]);
+  ShortcutRegistry.registry.addKeyMapping(metaV, pasteShortcut.name);
 };
 exports.registerPaste = registerPaste;
 
 /** Keyboard shortcut to undo the previous action on ctrl+z, cmd+z, or alt+z. */
 const registerUndo = function() {
-  /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
+  /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const undoShortcut = {
     name: names.UNDO,
     preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
-          !Blockly.Gesture.inProgress();
+          !Gesture.inProgress();
     },
     callback: function (workspace) {
       // 'z' for undo 'Z' is for redo.
@@ -207,29 +208,29 @@ const registerUndo = function() {
       return true;
     }
   };
-  Blockly.ShortcutRegistry.registry.register(undoShortcut);
+  ShortcutRegistry.registry.register(undoShortcut);
 
-  const ctrlZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.CTRL]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlZ, undoShortcut.name);
+  const ctrlZ = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.Z, [KeyCodes.CTRL]);
+  ShortcutRegistry.registry.addKeyMapping(ctrlZ, undoShortcut.name);
 
-  const altZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.ALT]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(altZ, undoShortcut.name);
+  const altZ = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.Z, [KeyCodes.ALT]);
+  ShortcutRegistry.registry.addKeyMapping(altZ, undoShortcut.name);
 
-  const metaZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.META]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(metaZ, undoShortcut.name);
+  const metaZ = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.Z, [KeyCodes.META]);
+  ShortcutRegistry.registry.addKeyMapping(metaZ, undoShortcut.name);
 };
 exports.registerUndo = registerUndo;
 
 /** Keyboard shortcut to redo the previous action on ctrl+shift+z, cmd+shift+z, or alt+shift+z. */
 const registerRedo = function() {
-  /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
+  /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const redoShortcut = {
     name: names.REDO,
     preconditionFn: function (workspace) {
-      return !Blockly.Gesture.inProgress() && !workspace.options.readOnly;
+      return !Gesture.inProgress() && !workspace.options.readOnly;
     },
     callback: function (workspace) {
       // 'z' for undo 'Z' is for redo.
@@ -238,29 +239,29 @@ const registerRedo = function() {
       return true;
     }
   };
-  Blockly.ShortcutRegistry.registry.register(redoShortcut);
+  ShortcutRegistry.registry.register(redoShortcut);
 
-  const ctrlShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.Z,
-      [Blockly.utils.KeyCodes.SHIFT, Blockly.utils.KeyCodes.CTRL]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(
+  const ctrlShiftZ = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.Z,
+      [KeyCodes.SHIFT, KeyCodes.CTRL]);
+  ShortcutRegistry.registry.addKeyMapping(
       ctrlShiftZ, redoShortcut.name);
 
-  const altShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.Z,
-      [Blockly.utils.KeyCodes.SHIFT, Blockly.utils.KeyCodes.ALT]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(altShiftZ, redoShortcut.name);
+  const altShiftZ = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.Z,
+      [KeyCodes.SHIFT, KeyCodes.ALT]);
+  ShortcutRegistry.registry.addKeyMapping(altShiftZ, redoShortcut.name);
 
-  const metaShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.Z,
-      [Blockly.utils.KeyCodes.SHIFT, Blockly.utils.KeyCodes.META]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(
+  const metaShiftZ = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.Z,
+      [KeyCodes.SHIFT, KeyCodes.META]);
+  ShortcutRegistry.registry.addKeyMapping(
       metaShiftZ, redoShortcut.name);
 
   // Ctrl-y is redo in Windows.  Command-y is never valid on Macs.
-  const ctrlY = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.Y, [Blockly.utils.KeyCodes.CTRL]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlY, redoShortcut.name);
+  const ctrlY = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.Y, [KeyCodes.CTRL]);
+  ShortcutRegistry.registry.addKeyMapping(ctrlY, redoShortcut.name);
 };
 exports.registerRedo = registerRedo;
 

From d11071999ef317a289e0188ae3daa01746cbd458 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 11:17:20 -0700
Subject: [PATCH 495/833] clang-format core/shortcut_items.js

---
 core/shortcut_items.js | 91 +++++++++++++++++++-----------------------
 1 file changed, 40 insertions(+), 51 deletions(-)

diff --git a/core/shortcut_items.js b/core/shortcut_items.js
index 9d622914b..259a8c4bc 100644
--- a/core/shortcut_items.js
+++ b/core/shortcut_items.js
@@ -44,17 +44,16 @@ const registerEscape = function() {
   /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const escapeAction = {
     name: names.ESCAPE,
-    preconditionFn: function (workspace) {
+    preconditionFn: function(workspace) {
       return !workspace.options.readOnly;
     },
-    callback: function () {
+    callback: function() {
       Blockly.hideChaff();
       return true;
     }
   };
   ShortcutRegistry.registry.register(escapeAction);
-  ShortcutRegistry.registry.addKeyMapping(
-      KeyCodes.ESC, escapeAction.name);
+  ShortcutRegistry.registry.addKeyMapping(KeyCodes.ESC, escapeAction.name);
 };
 exports.registerEscape = registerEscape;
 
@@ -63,12 +62,11 @@ const registerDelete = function() {
   /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const deleteShortcut = {
     name: names.DELETE,
-    preconditionFn: function (workspace) {
-      return !workspace.options.readOnly &&
-          Blockly.selected &&
+    preconditionFn: function(workspace) {
+      return !workspace.options.readOnly && Blockly.selected &&
           Blockly.selected.isDeletable();
     },
-    callback: function (workspace, e) {
+    callback: function(workspace, e) {
       // Delete or backspace.
       // Stop the browser from going back to the previous page.
       // Do this first to prevent an error in the delete code from resulting in
@@ -83,8 +81,7 @@ const registerDelete = function() {
     }
   };
   ShortcutRegistry.registry.register(deleteShortcut);
-  ShortcutRegistry.registry.addKeyMapping(
-      KeyCodes.DELETE, deleteShortcut.name);
+  ShortcutRegistry.registry.addKeyMapping(KeyCodes.DELETE, deleteShortcut.name);
   ShortcutRegistry.registry.addKeyMapping(
       KeyCodes.BACKSPACE, deleteShortcut.name);
 };
@@ -95,14 +92,12 @@ const registerCopy = function() {
   /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const copyShortcut = {
     name: names.COPY,
-    preconditionFn: function (workspace) {
-      return !workspace.options.readOnly &&
-          !Gesture.inProgress() &&
-          Blockly.selected &&
-          Blockly.selected.isDeletable() &&
+    preconditionFn: function(workspace) {
+      return !workspace.options.readOnly && !Gesture.inProgress() &&
+          Blockly.selected && Blockly.selected.isDeletable() &&
           Blockly.selected.isMovable();
     },
-    callback: function (workspace, e) {
+    callback: function(workspace, e) {
       // Prevent the default copy behavior, which may beep or otherwise indicate
       // an error due to the lack of a selection.
       e.preventDefault();
@@ -117,8 +112,8 @@ const registerCopy = function() {
       KeyCodes.C, [KeyCodes.CTRL]);
   ShortcutRegistry.registry.addKeyMapping(ctrlC, copyShortcut.name);
 
-  const altC = ShortcutRegistry.registry.createSerializedKey(
-      KeyCodes.C, [KeyCodes.ALT]);
+  const altC =
+      ShortcutRegistry.registry.createSerializedKey(KeyCodes.C, [KeyCodes.ALT]);
   ShortcutRegistry.registry.addKeyMapping(altC, copyShortcut.name);
 
   const metaC = ShortcutRegistry.registry.createSerializedKey(
@@ -132,13 +127,10 @@ const registerCut = function() {
   /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const cutShortcut = {
     name: names.CUT,
-    preconditionFn: function (workspace) {
-      return !workspace.options.readOnly &&
-          !Gesture.inProgress() &&
-          Blockly.selected &&
-          Blockly.selected.isDeletable() &&
-          Blockly.selected.isMovable() &&
-          !Blockly.selected.workspace.isFlyout;
+    preconditionFn: function(workspace) {
+      return !workspace.options.readOnly && !Gesture.inProgress() &&
+          Blockly.selected && Blockly.selected.isDeletable() &&
+          Blockly.selected.isMovable() && !Blockly.selected.workspace.isFlyout;
     },
     callback: function() {
       clipboard.copy(/** @type {!ICopyable} */ (Blockly.selected));
@@ -153,8 +145,8 @@ const registerCut = function() {
       KeyCodes.X, [KeyCodes.CTRL]);
   ShortcutRegistry.registry.addKeyMapping(ctrlX, cutShortcut.name);
 
-  const altX = ShortcutRegistry.registry.createSerializedKey(
-      KeyCodes.X, [KeyCodes.ALT]);
+  const altX =
+      ShortcutRegistry.registry.createSerializedKey(KeyCodes.X, [KeyCodes.ALT]);
   ShortcutRegistry.registry.addKeyMapping(altX, cutShortcut.name);
 
   const metaX = ShortcutRegistry.registry.createSerializedKey(
@@ -168,7 +160,7 @@ const registerPaste = function() {
   /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const pasteShortcut = {
     name: names.PASTE,
-    preconditionFn: function (workspace) {
+    preconditionFn: function(workspace) {
       return !workspace.options.readOnly && !Gesture.inProgress();
     },
     callback: function() {
@@ -182,8 +174,8 @@ const registerPaste = function() {
       KeyCodes.V, [KeyCodes.CTRL]);
   ShortcutRegistry.registry.addKeyMapping(ctrlV, pasteShortcut.name);
 
-  const altV = ShortcutRegistry.registry.createSerializedKey(
-      KeyCodes.V, [KeyCodes.ALT]);
+  const altV =
+      ShortcutRegistry.registry.createSerializedKey(KeyCodes.V, [KeyCodes.ALT]);
   ShortcutRegistry.registry.addKeyMapping(altV, pasteShortcut.name);
 
   const metaV = ShortcutRegistry.registry.createSerializedKey(
@@ -197,11 +189,10 @@ const registerUndo = function() {
   /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const undoShortcut = {
     name: names.UNDO,
-    preconditionFn: function (workspace) {
-      return !workspace.options.readOnly &&
-          !Gesture.inProgress();
+    preconditionFn: function(workspace) {
+      return !workspace.options.readOnly && !Gesture.inProgress();
     },
-    callback: function (workspace) {
+    callback: function(workspace) {
       // 'z' for undo 'Z' is for redo.
       Blockly.hideChaff();
       workspace.undo(false);
@@ -214,8 +205,8 @@ const registerUndo = function() {
       KeyCodes.Z, [KeyCodes.CTRL]);
   ShortcutRegistry.registry.addKeyMapping(ctrlZ, undoShortcut.name);
 
-  const altZ = ShortcutRegistry.registry.createSerializedKey(
-      KeyCodes.Z, [KeyCodes.ALT]);
+  const altZ =
+      ShortcutRegistry.registry.createSerializedKey(KeyCodes.Z, [KeyCodes.ALT]);
   ShortcutRegistry.registry.addKeyMapping(altZ, undoShortcut.name);
 
   const metaZ = ShortcutRegistry.registry.createSerializedKey(
@@ -224,15 +215,18 @@ const registerUndo = function() {
 };
 exports.registerUndo = registerUndo;
 
-/** Keyboard shortcut to redo the previous action on ctrl+shift+z, cmd+shift+z, or alt+shift+z. */
+/**
+ * Keyboard shortcut to redo the previous action on ctrl+shift+z, cmd+shift+z,
+ * or alt+shift+z.
+ */
 const registerRedo = function() {
   /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const redoShortcut = {
     name: names.REDO,
-    preconditionFn: function (workspace) {
+    preconditionFn: function(workspace) {
       return !Gesture.inProgress() && !workspace.options.readOnly;
     },
-    callback: function (workspace) {
+    callback: function(workspace) {
       // 'z' for undo 'Z' is for redo.
       Blockly.hideChaff();
       workspace.undo(true);
@@ -242,21 +236,16 @@ const registerRedo = function() {
   ShortcutRegistry.registry.register(redoShortcut);
 
   const ctrlShiftZ = ShortcutRegistry.registry.createSerializedKey(
-      KeyCodes.Z,
-      [KeyCodes.SHIFT, KeyCodes.CTRL]);
-  ShortcutRegistry.registry.addKeyMapping(
-      ctrlShiftZ, redoShortcut.name);
+      KeyCodes.Z, [KeyCodes.SHIFT, KeyCodes.CTRL]);
+  ShortcutRegistry.registry.addKeyMapping(ctrlShiftZ, redoShortcut.name);
 
   const altShiftZ = ShortcutRegistry.registry.createSerializedKey(
-      KeyCodes.Z,
-      [KeyCodes.SHIFT, KeyCodes.ALT]);
+      KeyCodes.Z, [KeyCodes.SHIFT, KeyCodes.ALT]);
   ShortcutRegistry.registry.addKeyMapping(altShiftZ, redoShortcut.name);
 
   const metaShiftZ = ShortcutRegistry.registry.createSerializedKey(
-      KeyCodes.Z,
-      [KeyCodes.SHIFT, KeyCodes.META]);
-  ShortcutRegistry.registry.addKeyMapping(
-      metaShiftZ, redoShortcut.name);
+      KeyCodes.Z, [KeyCodes.SHIFT, KeyCodes.META]);
+  ShortcutRegistry.registry.addKeyMapping(metaShiftZ, redoShortcut.name);
 
   // Ctrl-y is redo in Windows.  Command-y is never valid on Macs.
   const ctrlY = ShortcutRegistry.registry.createSerializedKey(
@@ -266,8 +255,8 @@ const registerRedo = function() {
 exports.registerRedo = registerRedo;
 
 /**
- * Registers all default keyboard shortcut item. This should be called once per instance of
- * KeyboardShortcutRegistry.
+ * Registers all default keyboard shortcut item. This should be called once per
+ * instance of KeyboardShortcutRegistry.
  */
 const registerDefaultShortcuts = function() {
   registerEscape();

From 8e30d9ebd1d74d881b553eff959a77e3a27aaa13 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Tue, 3 Aug 2021 10:37:17 -0700
Subject: [PATCH 496/833] Migrate core/renderers/geras/constants.js to
 goog.module

---
 core/renderers/geras/constants.js | 15 +++++++++------
 tests/deps.js                     |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/renderers/geras/constants.js b/core/renderers/geras/constants.js
index 0272d921f..117172ade 100644
--- a/core/renderers/geras/constants.js
+++ b/core/renderers/geras/constants.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.geras.ConstantProvider');
+goog.module('Blockly.geras.ConstantProvider');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.ConstantProvider');
 goog.require('Blockly.utils.object');
@@ -23,8 +24,8 @@ goog.require('Blockly.utils.object');
  * @package
  * @extends {Blockly.blockRendering.ConstantProvider}
  */
-Blockly.geras.ConstantProvider = function() {
-  Blockly.geras.ConstantProvider.superClass_.constructor.call(this);
+const ConstantProvider = function() {
+  ConstantProvider.superClass_.constructor.call(this);
 
   /**
    * @override
@@ -47,15 +48,15 @@ Blockly.geras.ConstantProvider = function() {
    */
   this.STATEMENT_BOTTOM_SPACER = -this.NOTCH_HEIGHT / 2;
 };
-Blockly.utils.object.inherits(Blockly.geras.ConstantProvider,
+Blockly.utils.object.inherits(ConstantProvider,
     Blockly.blockRendering.ConstantProvider);
 
 
 /**
  * @override
  */
-Blockly.geras.ConstantProvider.prototype.getCSS_ = function(selector) {
-  return Blockly.geras.ConstantProvider.superClass_.getCSS_.call(this, selector)
+ConstantProvider.prototype.getCSS_ = function(selector) {
+  return ConstantProvider.superClass_.getCSS_.call(this, selector)
       .concat([
         /* eslint-disable indent */
         // Insertion marker.
@@ -67,3 +68,5 @@ Blockly.geras.ConstantProvider.prototype.getCSS_ = function(selector) {
         /* eslint-enable indent */
       ]);
 };
+
+exports = ConstantProvider;
diff --git a/tests/deps.js b/tests/deps.js
index 03c4b65e5..fd025333f 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -130,7 +130,7 @@ goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRenderi
 goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
-goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es5'});
+goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.geras.RenderInfo', 'Blockly.utils.object', 'Blockly.utils.svgPaths']);
 goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.svgPaths'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths']);

From 0203eec8c78c5e32f696f64625ed6439ab91b032 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Tue, 3 Aug 2021 10:40:25 -0700
Subject: [PATCH 497/833] Migrate core/renderers/geras/constants.js to named
 requires

---
 core/renderers/geras/constants.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/renderers/geras/constants.js b/core/renderers/geras/constants.js
index 117172ade..68b24efe5 100644
--- a/core/renderers/geras/constants.js
+++ b/core/renderers/geras/constants.js
@@ -14,15 +14,15 @@
 goog.module('Blockly.geras.ConstantProvider');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.ConstantProvider');
-goog.require('Blockly.utils.object');
+const BaseConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object that provides constants for rendering blocks in Geras mode.
  * @constructor
  * @package
- * @extends {Blockly.blockRendering.ConstantProvider}
+ * @extends {BaseConstantProvider}
  */
 const ConstantProvider = function() {
   ConstantProvider.superClass_.constructor.call(this);
@@ -48,8 +48,8 @@ const ConstantProvider = function() {
    */
   this.STATEMENT_BOTTOM_SPACER = -this.NOTCH_HEIGHT / 2;
 };
-Blockly.utils.object.inherits(ConstantProvider,
-    Blockly.blockRendering.ConstantProvider);
+object.inherits(ConstantProvider,
+  BaseConstantProvider);
 
 
 /**

From 87ccee78437c724075a16dfea77c9f1cdf936cbb Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Tue, 3 Aug 2021 10:42:26 -0700
Subject: [PATCH 498/833] clang-format core/renderers/geras/constants.js

---
 core/renderers/geras/constants.js | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/core/renderers/geras/constants.js b/core/renderers/geras/constants.js
index 68b24efe5..9a923a34a 100644
--- a/core/renderers/geras/constants.js
+++ b/core/renderers/geras/constants.js
@@ -48,25 +48,23 @@ const ConstantProvider = function() {
    */
   this.STATEMENT_BOTTOM_SPACER = -this.NOTCH_HEIGHT / 2;
 };
-object.inherits(ConstantProvider,
-  BaseConstantProvider);
+object.inherits(ConstantProvider, BaseConstantProvider);
 
 
 /**
  * @override
  */
 ConstantProvider.prototype.getCSS_ = function(selector) {
-  return ConstantProvider.superClass_.getCSS_.call(this, selector)
-      .concat([
-        /* eslint-disable indent */
-        // Insertion marker.
-        selector + ' .blocklyInsertionMarker>.blocklyPathLight,',
-        selector + ' .blocklyInsertionMarker>.blocklyPathDark {',
-          'fill-opacity: ' + this.INSERTION_MARKER_OPACITY + ';',
-          'stroke: none;',
-        '}',
-        /* eslint-enable indent */
-      ]);
+  return ConstantProvider.superClass_.getCSS_.call(this, selector).concat([
+    /* eslint-disable indent */
+    // Insertion marker.
+    selector + ' .blocklyInsertionMarker>.blocklyPathLight,',
+    selector + ' .blocklyInsertionMarker>.blocklyPathDark {',
+      'fill-opacity: ' + this.INSERTION_MARKER_OPACITY + ';',
+      'stroke: none;',
+    '}',
+    /* eslint-enable indent */
+  ]);
 };
 
 exports = ConstantProvider;

From e7709cbd1fb6c9f5eecc94181443a4b435a75517 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Tue, 27 Jul 2021 11:03:16 -0700
Subject: [PATCH 499/833] Remove extra output from generator and mocha tests
 (#5196)

* Remove extra output from generator tests

* Fix test

* Update loglevel for both tests
---
 tests/generators/run_generators_in_browser.js | 1 +
 tests/mocha/run_mocha_tests_in_browser.js     | 3 ++-
 tests/scripts/run_generators.sh               | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/generators/run_generators_in_browser.js b/tests/generators/run_generators_in_browser.js
index d0ed80009..2ab48ee2e 100644
--- a/tests/generators/run_generators_in_browser.js
+++ b/tests/generators/run_generators_in_browser.js
@@ -42,6 +42,7 @@ async function runGeneratorsInBrowser() {
     capabilities: {
       browserName: 'chrome',
     },
+    logLevel: 'warn',
     services: ['selenium-standalone']
   };
   // Run in headless mode on Github Actions.
diff --git a/tests/mocha/run_mocha_tests_in_browser.js b/tests/mocha/run_mocha_tests_in_browser.js
index b562586bd..253b79f01 100644
--- a/tests/mocha/run_mocha_tests_in_browser.js
+++ b/tests/mocha/run_mocha_tests_in_browser.js
@@ -24,7 +24,8 @@ async function runMochaTestsInBrowser() {
     },
     services: [
       ['selenium-standalone']
-    ]
+    ],
+    logLevel: 'warn'
   };
   // Run in headless mode on Github Actions.
   if (process.env.CI) {
diff --git a/tests/scripts/run_generators.sh b/tests/scripts/run_generators.sh
index 9d556acad..8c461f8e0 100755
--- a/tests/scripts/run_generators.sh
+++ b/tests/scripts/run_generators.sh
@@ -18,7 +18,7 @@ check_result() {
   if [ -f $tmp_filename ]; then
     local golden_filename="${GOLDEN_DIR}generated.$suffix"
     if [ -f $golden_filename ]; then
-      if cmp --silent $tmp_filename $golden_filename; then
+      if cmp $tmp_filename $golden_filename; then
         echo -e "$SUCCESS_PREFIX $suffix: $tmp_filename matches $golden_filename"
       else
         echo -e "$FAILURE_PREFIX $suffix: $tmp_filename does not match $golden_filename"

From e685e0fb8fe42421f6e8b22d6f74bb62f9c26d5f Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 22 Jul 2021 09:04:51 -0700
Subject: [PATCH 500/833] Migrate core/menuitem.js to ES6 const/let

---
 core/menuitem.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/menuitem.js b/core/menuitem.js
index 91e156742..5eaff00fc 100644
--- a/core/menuitem.js
+++ b/core/menuitem.js
@@ -103,7 +103,7 @@ Blockly.MenuItem = function(content, opt_value) {
  * @return {!Element} Completed DOM.
  */
 Blockly.MenuItem.prototype.createDom = function() {
-  var element = document.createElement('div');
+  const element = document.createElement('div');
   element.id = Blockly.utils.IdGenerator.getNextUniqueId();
   this.element_ = element;
 
@@ -116,16 +116,16 @@ Blockly.MenuItem.prototype.createDom = function() {
         'blocklyMenuItemHighlight goog-menuitem-highlight ' : '') +
       (this.rightToLeft_ ? 'blocklyMenuItemRtl goog-menuitem-rtl ' : '');
 
-  var content = document.createElement('div');
+  const content = document.createElement('div');
   content.className = 'blocklyMenuItemContent goog-menuitem-content';
   // Add a checkbox for checkable menu items.
   if (this.checkable_) {
-    var checkbox = document.createElement('div');
+    const checkbox = document.createElement('div');
     checkbox.className = 'blocklyMenuItemCheckbox goog-menuitem-checkbox';
     content.appendChild(checkbox);
   }
 
-  var contentDom = /** @type {!HTMLElement} */ (this.content_);
+  let contentDom = /** @type {!HTMLElement} */ (this.content_);
   if (typeof this.content_ == 'string') {
     contentDom = document.createTextNode(this.content_);
   }
@@ -223,12 +223,12 @@ Blockly.MenuItem.prototype.setChecked = function(checked) {
 Blockly.MenuItem.prototype.setHighlighted = function(highlight) {
   this.highlight_ = highlight;
 
-  var el = this.getElement();
+  const el = this.getElement();
   if (el && this.isEnabled()) {
     // goog-menuitem-highlight is deprecated, use blocklyMenuItemHighlight.
     // May 2020.
-    var name = 'blocklyMenuItemHighlight';
-    var nameDep = 'goog-menuitem-highlight';
+    const name = 'blocklyMenuItemHighlight';
+    const nameDep = 'goog-menuitem-highlight';
     if (highlight) {
       Blockly.utils.dom.addClass(el, name);
       Blockly.utils.dom.addClass(el, nameDep);

From cc606ba2d24a1ae7e88d21d94c40767fe5fcc511 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 22 Jul 2021 09:09:16 -0700
Subject: [PATCH 501/833] Migrate core/menuitem.js to goog.module

---
 core/menuitem.js | 37 ++++++++++++++++++++-----------------
 tests/deps.js    |  2 +-
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/core/menuitem.js b/core/menuitem.js
index 5eaff00fc..40a7a8c6f 100644
--- a/core/menuitem.js
+++ b/core/menuitem.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.MenuItem');
+goog.module('Blockly.MenuItem');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.utils.aria');
 goog.require('Blockly.utils.dom');
@@ -25,7 +26,7 @@ goog.require('Blockly.utils.IdGenerator');
  * @param {string=} opt_value Data/model associated with the menu item.
  * @constructor
  */
-Blockly.MenuItem = function(content, opt_value) {
+const MenuItem = function(content, opt_value) {
   /**
    * Human-readable text of this menu item, or the HTML element to display.
    * @type {string|!HTMLElement}
@@ -102,7 +103,7 @@ Blockly.MenuItem = function(content, opt_value) {
  * Creates the menuitem's DOM.
  * @return {!Element} Completed DOM.
  */
-Blockly.MenuItem.prototype.createDom = function() {
+MenuItem.prototype.createDom = function() {
   const element = document.createElement('div');
   element.id = Blockly.utils.IdGenerator.getNextUniqueId();
   this.element_ = element;
@@ -147,7 +148,7 @@ Blockly.MenuItem.prototype.createDom = function() {
 /**
  * Dispose of this menu item.
  */
-Blockly.MenuItem.prototype.dispose = function() {
+MenuItem.prototype.dispose = function() {
   this.element_ = null;
 };
 
@@ -156,7 +157,7 @@ Blockly.MenuItem.prototype.dispose = function() {
  * @return {?Element} The DOM element.
  * @package
  */
-Blockly.MenuItem.prototype.getElement = function() {
+MenuItem.prototype.getElement = function() {
   return this.element_;
 };
 
@@ -165,7 +166,7 @@ Blockly.MenuItem.prototype.getElement = function() {
  * @return {string} Unique component ID.
  * @package
  */
-Blockly.MenuItem.prototype.getId = function() {
+MenuItem.prototype.getId = function() {
   return this.element_.id;
 };
 
@@ -174,7 +175,7 @@ Blockly.MenuItem.prototype.getId = function() {
  * @return {*} value Value associated with the menu item.
  * @package
  */
-Blockly.MenuItem.prototype.getValue = function() {
+MenuItem.prototype.getValue = function() {
   return this.value_;
 };
 
@@ -183,7 +184,7 @@ Blockly.MenuItem.prototype.getValue = function() {
  * @param {boolean} rtl True if RTL, false if LTR.
  * @package
  */
-Blockly.MenuItem.prototype.setRightToLeft = function(rtl) {
+MenuItem.prototype.setRightToLeft = function(rtl) {
   this.rightToLeft_ = rtl;
 };
 
@@ -192,7 +193,7 @@ Blockly.MenuItem.prototype.setRightToLeft = function(rtl) {
  * @param {!Blockly.utils.aria.Role} roleName Role name.
  * @package
  */
-Blockly.MenuItem.prototype.setRole = function(roleName) {
+MenuItem.prototype.setRole = function(roleName) {
   this.roleName_ = roleName;
 };
 
@@ -202,7 +203,7 @@ Blockly.MenuItem.prototype.setRole = function(roleName) {
  * @param {boolean} checkable Whether the menu item is checkable.
  * @package
  */
-Blockly.MenuItem.prototype.setCheckable = function(checkable) {
+MenuItem.prototype.setCheckable = function(checkable) {
   this.checkable_ = checkable;
 };
 
@@ -211,7 +212,7 @@ Blockly.MenuItem.prototype.setCheckable = function(checkable) {
  * @param {boolean} checked Whether to check or uncheck the component.
  * @package
  */
-Blockly.MenuItem.prototype.setChecked = function(checked) {
+MenuItem.prototype.setChecked = function(checked) {
   this.checked_ = checked;
 };
 
@@ -220,7 +221,7 @@ Blockly.MenuItem.prototype.setChecked = function(checked) {
  * @param {boolean} highlight Whether to highlight or unhighlight the component.
  * @package
  */
-Blockly.MenuItem.prototype.setHighlighted = function(highlight) {
+MenuItem.prototype.setHighlighted = function(highlight) {
   this.highlight_ = highlight;
 
   const el = this.getElement();
@@ -244,7 +245,7 @@ Blockly.MenuItem.prototype.setHighlighted = function(highlight) {
  * @return {boolean} Whether the menu item is enabled.
  * @package
  */
-Blockly.MenuItem.prototype.isEnabled = function() {
+MenuItem.prototype.isEnabled = function() {
   return this.enabled_;
 };
 
@@ -253,7 +254,7 @@ Blockly.MenuItem.prototype.isEnabled = function() {
  * @param {boolean} enabled Whether to enable or disable the menu item.
  * @package
  */
-Blockly.MenuItem.prototype.setEnabled = function(enabled) {
+MenuItem.prototype.setEnabled = function(enabled) {
   this.enabled_ = enabled;
 };
 
@@ -262,7 +263,7 @@ Blockly.MenuItem.prototype.setEnabled = function(enabled) {
  * by the user.
  * @package
  */
-Blockly.MenuItem.prototype.performAction = function() {
+MenuItem.prototype.performAction = function() {
   if (this.isEnabled() && this.actionHandler_) {
     this.actionHandler_(this);
   }
@@ -271,10 +272,12 @@ Blockly.MenuItem.prototype.performAction = function() {
 /**
  * Set the handler that's called when the menu item is activated by the user.
  * `obj` will be used as the 'this' object in the function when called.
- * @param {function(!Blockly.MenuItem)} fn The handler.
+ * @param {function(!MenuItem)} fn The handler.
  * @param {!Object} obj Used as the 'this' object in fn when called.
  * @package
  */
-Blockly.MenuItem.prototype.onAction = function(fn, obj) {
+MenuItem.prototype.onAction = function(fn, obj) {
   this.actionHandler_ = fn.bind(obj);
 };
+
+exports = MenuItem;
diff --git a/tests/deps.js b/tests/deps.js
index 1e9ef54f4..37bc564c1 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -111,7 +111,7 @@ goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], [],
 goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], [], {'lang': 'es6', 'module': 'goog'});
 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.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom']);
+goog.addDependency('../../core/menuitem.js', ['Blockly.MenuItem'], ['Blockly.utils.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/metrics_manager.js', ['Blockly.FlyoutMetricsManager', 'Blockly.MetricsManager'], ['Blockly.IMetricsManager', 'Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global']);
 goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});

From dc682a7e0b217fb35383ba14e3fba8b89691eb53 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 22 Jul 2021 09:54:35 -0700
Subject: [PATCH 502/833] Migrate core/menuitem.js named requires

---
 core/menuitem.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/core/menuitem.js b/core/menuitem.js
index 40a7a8c6f..c7d93014e 100644
--- a/core/menuitem.js
+++ b/core/menuitem.js
@@ -13,9 +13,9 @@
 goog.module('Blockly.MenuItem');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.utils.aria');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.IdGenerator');
+const aria = goog.require('Blockly.utils.aria');
+const {addClass, removeClass} = goog.require('Blockly.utils.dom');
+const {getNextUniqueId} = goog.require('Blockly.utils.IdGenerator');
 
 
 /**
@@ -64,7 +64,7 @@ const MenuItem = function(content, opt_value) {
 
   /**
    * ARIA name for this menu.
-   * @type {?Blockly.utils.aria.Role}
+   * @type {?aria.Role}
    * @private
    */
   this.roleName_ = null;
@@ -105,7 +105,7 @@ const MenuItem = function(content, opt_value) {
  */
 MenuItem.prototype.createDom = function() {
   const element = document.createElement('div');
-  element.id = Blockly.utils.IdGenerator.getNextUniqueId();
+  element.id = getNextUniqueId();
   this.element_ = element;
 
   // Set class and style
@@ -135,11 +135,11 @@ MenuItem.prototype.createDom = function() {
 
   // Initialize ARIA role and state.
   if (this.roleName_) {
-    Blockly.utils.aria.setRole(element, this.roleName_);
+    aria.setRole(element, this.roleName_);
   }
-  Blockly.utils.aria.setState(element, Blockly.utils.aria.State.SELECTED,
+  aria.setState(element, aria.State.SELECTED,
       (this.checkable_ && this.checked_) || false);
-  Blockly.utils.aria.setState(element, Blockly.utils.aria.State.DISABLED,
+  aria.setState(element, aria.State.DISABLED,
       !this.enabled_);
 
   return element;
@@ -190,7 +190,7 @@ MenuItem.prototype.setRightToLeft = function(rtl) {
 
 /**
  * Set the menu item's accessibility role.
- * @param {!Blockly.utils.aria.Role} roleName Role name.
+ * @param {!aria.Role} roleName Role name.
  * @package
  */
 MenuItem.prototype.setRole = function(roleName) {
@@ -231,11 +231,11 @@ MenuItem.prototype.setHighlighted = function(highlight) {
     const name = 'blocklyMenuItemHighlight';
     const nameDep = 'goog-menuitem-highlight';
     if (highlight) {
-      Blockly.utils.dom.addClass(el, name);
-      Blockly.utils.dom.addClass(el, nameDep);
+      addClass(el, name);
+      addClass(el, nameDep);
     } else {
-      Blockly.utils.dom.removeClass(el, name);
-      Blockly.utils.dom.removeClass(el, nameDep);
+      removeClass(el, name);
+      removeClass(el, nameDep);
     }
   }
 };

From 1e3cdeb16ea7c512ff9609c808e5673ff2356788 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 22 Jul 2021 09:55:27 -0700
Subject: [PATCH 503/833] clang-format core/menuitem.js

---
 core/menuitem.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/menuitem.js b/core/menuitem.js
index c7d93014e..5237068d2 100644
--- a/core/menuitem.js
+++ b/core/menuitem.js
@@ -113,8 +113,8 @@ MenuItem.prototype.createDom = function() {
   element.className = 'blocklyMenuItem goog-menuitem ' +
       (this.enabled_ ? '' : 'blocklyMenuItemDisabled goog-menuitem-disabled ') +
       (this.checked_ ? 'blocklyMenuItemSelected goog-option-selected ' : '') +
-      (this.highlight_ ?
-        'blocklyMenuItemHighlight goog-menuitem-highlight ' : '') +
+      (this.highlight_ ? 'blocklyMenuItemHighlight goog-menuitem-highlight ' :
+                         '') +
       (this.rightToLeft_ ? 'blocklyMenuItemRtl goog-menuitem-rtl ' : '');
 
   const content = document.createElement('div');
@@ -137,10 +137,10 @@ MenuItem.prototype.createDom = function() {
   if (this.roleName_) {
     aria.setRole(element, this.roleName_);
   }
-  aria.setState(element, aria.State.SELECTED,
+  aria.setState(
+      element, aria.State.SELECTED,
       (this.checkable_ && this.checked_) || false);
-  aria.setState(element, aria.State.DISABLED,
-      !this.enabled_);
+  aria.setState(element, aria.State.DISABLED, !this.enabled_);
 
   return element;
 };

From 0fb4ed3ff4374ec7b4e29bd0667702e8ea3b932f Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Fri, 23 Jul 2021 13:12:38 -0700
Subject: [PATCH 504/833] Fix imports

---
 core/menuitem.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/menuitem.js b/core/menuitem.js
index 5237068d2..9a8ea2c67 100644
--- a/core/menuitem.js
+++ b/core/menuitem.js
@@ -14,8 +14,8 @@ goog.module('Blockly.MenuItem');
 goog.module.declareLegacyNamespace();
 
 const aria = goog.require('Blockly.utils.aria');
-const {addClass, removeClass} = goog.require('Blockly.utils.dom');
-const {getNextUniqueId} = goog.require('Blockly.utils.IdGenerator');
+const dom = goog.require('Blockly.utils.dom');
+const idGenerator = goog.require('Blockly.utils.IdGenerator');
 
 
 /**
@@ -105,7 +105,7 @@ const MenuItem = function(content, opt_value) {
  */
 MenuItem.prototype.createDom = function() {
   const element = document.createElement('div');
-  element.id = getNextUniqueId();
+  element.id = idGenerator.getNextUniqueId();
   this.element_ = element;
 
   // Set class and style
@@ -231,11 +231,11 @@ MenuItem.prototype.setHighlighted = function(highlight) {
     const name = 'blocklyMenuItemHighlight';
     const nameDep = 'goog-menuitem-highlight';
     if (highlight) {
-      addClass(el, name);
-      addClass(el, nameDep);
+      dom.addClass(el, name);
+      dom.addClass(el, nameDep);
     } else {
-      removeClass(el, name);
-      removeClass(el, nameDep);
+      dom.removeClass(el, name);
+      dom.removeClass(el, nameDep);
     }
   }
 };

From 724cdd3bd234c5bf08162d0b8898b61ee1e82332 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Tue, 3 Aug 2021 14:36:54 -0700
Subject: [PATCH 505/833] Migrate core/events/events_selected.js to goog.module
 syntax (#5281)

* Migrate core/events/events_selected.js to ES6 const/let

* Migrate core/events/events_selected.js to goog.module

* Migrate core/events/events_selected.js to named requires

* clang-format core/events/events_selected.js
---
 core/events/events_selected.js | 35 +++++++++++++++++-----------------
 tests/deps.js                  |  2 +-
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/core/events/events_selected.js b/core/events/events_selected.js
index cfb7c6573..47fcee5df 100644
--- a/core/events/events_selected.js
+++ b/core/events/events_selected.js
@@ -10,12 +10,13 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.Selected');
+goog.module('Blockly.Events.Selected');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
@@ -26,12 +27,11 @@ goog.require('Blockly.utils.object');
  *    element currently selected (deselect). Undefined for a blank event.
  * @param {string=} opt_workspaceId The workspace identifier for this event.
  *    Null if no element previously selected. Undefined for a blank event.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @constructor
  */
-Blockly.Events.Selected = function(opt_oldElementId, opt_newElementId,
-    opt_workspaceId) {
-  Blockly.Events.Selected.superClass_.constructor.call(this, opt_workspaceId);
+const Selected = function(opt_oldElementId, opt_newElementId, opt_workspaceId) {
+  Selected.superClass_.constructor.call(this, opt_workspaceId);
 
   /**
    * The id of the last selected element.
@@ -45,20 +45,20 @@ Blockly.Events.Selected = function(opt_oldElementId, opt_newElementId,
    */
   this.newElementId = opt_newElementId;
 };
-Blockly.utils.object.inherits(Blockly.Events.Selected, Blockly.Events.UiBase);
+object.inherits(Selected, UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.Selected.prototype.type = Blockly.Events.SELECTED;
+Selected.prototype.type = Events.SELECTED;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.Selected.prototype.toJson = function() {
-  var json = Blockly.Events.Selected.superClass_.toJson.call(this);
+Selected.prototype.toJson = function() {
+  const json = Selected.superClass_.toJson.call(this);
   json['oldElementId'] = this.oldElementId;
   json['newElementId'] = this.newElementId;
   return json;
@@ -68,11 +68,12 @@ Blockly.Events.Selected.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.Selected.prototype.fromJson = function(json) {
-  Blockly.Events.Selected.superClass_.fromJson.call(this, json);
+Selected.prototype.fromJson = function(json) {
+  Selected.superClass_.fromJson.call(this, json);
   this.oldElementId = json['oldElementId'];
   this.newElementId = json['newElementId'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.SELECTED,
-    Blockly.Events.Selected);
+registry.register(registry.Type.EVENT, Events.SELECTED, Selected);
+
+exports = Selected;
diff --git a/tests/deps.js b/tests/deps.js
index 95167497f..b35d0324a 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -40,7 +40,7 @@ goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.Bl
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);

From bec82da3584819f0060a33fa732794a3cf2edcad Mon Sep 17 00:00:00 2001
From: Monica Kozbial <6621618+moniika@users.noreply.github.com>
Date: Tue, 3 Aug 2021 15:07:14 -0700
Subject: [PATCH 506/833] Remove require destructuring (#5294)

---
 core/block_drag_surface.js                   | 27 +++++----
 core/comment.js                              | 63 ++++++++++----------
 core/connection_checker.js                   |  4 +-
 core/delete_area.js                          |  4 +-
 core/extensions.js                           | 22 +++----
 core/field.js                                | 43 +++++++------
 core/field_checkbox.js                       |  4 +-
 core/field_colour.js                         | 51 ++++++++--------
 core/field_dropdown.js                       | 18 +++---
 core/field_image.js                          | 24 ++++----
 core/field_label.js                          |  8 +--
 core/field_label_serializable.js             |  8 +--
 core/field_multilineinput.js                 |  8 +--
 core/field_number.js                         |  8 +--
 core/field_textinput.js                      | 12 ++--
 core/field_variable.js                       |  8 +--
 core/flyout_base.js                          |  4 +-
 core/flyout_button.js                        |  8 ++-
 core/flyout_horizontal.js                    | 20 +++----
 core/flyout_vertical.js                      | 24 ++++----
 core/icon.js                                 |  6 +-
 core/interfaces/i_flyout.js                  |  4 +-
 core/interfaces/i_metrics_manager.js         | 20 +++----
 core/interfaces/i_positionable.js            |  6 +-
 core/interfaces/i_selectable_toolbox_item.js |  4 +-
 core/interfaces/i_toolbox.js                 |  4 +-
 core/keyboard_nav/basic_cursor.js            |  9 +--
 core/keyboard_nav/cursor.js                  |  8 +--
 core/keyboard_nav/tab_navigate_cursor.js     |  4 +-
 core/renderers/common/info.js                | 28 +++++----
 core/utils/toolbox.js                        | 18 +++---
 31 files changed, 242 insertions(+), 237 deletions(-)

diff --git a/core/block_drag_surface.js b/core/block_drag_surface.js
index 2b911ef09..717713915 100644
--- a/core/block_drag_surface.js
+++ b/core/block_drag_surface.js
@@ -8,8 +8,9 @@
  * @fileoverview A class that manages a surface for dragging blocks.  When a
  * block drag is started, we move the block (and children) to a separate DOM
  * element that we move around using translate3d. At the end of the drag, the
- * blocks are put back in into the SVG they came from. This helps performance by
- * avoiding repainting the entire SVG on every mouse move while dragging blocks.
+ * blocks are put back in into the SVG they came from. This helps
+ * performance by avoiding repainting the entire SVG on every mouse move
+ * while dragging blocks.
  * @author picklesrus
  */
 
@@ -19,9 +20,9 @@ goog.module('Blockly.BlockDragSurfaceSvg');
 goog.module.declareLegacyNamespace();
 
 const Coordinate = goog.require('Blockly.utils.Coordinate');
-const {G, SVG} = goog.require('Blockly.utils.Svg');
-const {createSvgElement, HTML_NS, setCssTransform, SVG_NS, XLINK_NS} = goog.require('Blockly.utils.dom');
-const {getRelativeXY} = goog.require('Blockly.utils');
+const Svg = goog.require('Blockly.utils.Svg');
+const dom = goog.require('Blockly.utils.dom');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -94,16 +95,16 @@ BlockDragSurfaceSvg.prototype.createDom = function() {
   if (this.SVG_) {
     return;  // Already created.
   }
-  this.SVG_ = createSvgElement(
-      SVG, {
-        'xmlns': SVG_NS,
-        'xmlns:html': HTML_NS,
-        'xmlns:xlink': XLINK_NS,
+  this.SVG_ = dom.createSvgElement(
+      Svg.SVG, {
+        'xmlns': dom.SVG_NS,
+        'xmlns:html': dom.HTML_NS,
+        'xmlns:xlink': dom.XLINK_NS,
         'version': '1.1',
         'class': 'blocklyBlockDragSurface'
       },
       this.container_);
-  this.dragGroup_ = createSvgElement(G, {}, this.SVG_);
+  this.dragGroup_ = dom.createSvgElement(Svg.G, {}, this.SVG_);
 };
 
 /**
@@ -157,7 +158,7 @@ BlockDragSurfaceSvg.prototype.translateSurfaceInternal_ = function() {
   y = y.toFixed(0);
   this.SVG_.style.display = 'block';
 
-  setCssTransform(this.SVG_, 'translate3d(' + x + 'px, ' + y + 'px, 0)');
+  dom.setCssTransform(this.SVG_, 'translate3d(' + x + 'px, ' + y + 'px, 0)');
 };
 
 /**
@@ -191,7 +192,7 @@ BlockDragSurfaceSvg.prototype.translateSurface = function(x, y) {
  * @return {!Coordinate} Current translation of the surface.
  */
 BlockDragSurfaceSvg.prototype.getSurfaceTranslation = function() {
-  const xy = getRelativeXY(/** @type {!SVGElement} */ (this.SVG_));
+  const xy = utils.getRelativeXY(/** @type {!SVGElement} */ (this.SVG_));
   return new Coordinate(xy.x / this.scale_, xy.y / this.scale_);
 };
 
diff --git a/core/comment.js b/core/comment.js
index 99d81e89c..b126aaf57 100644
--- a/core/comment.js
+++ b/core/comment.js
@@ -20,6 +20,7 @@ const BlockSvg = goog.requireType('Blockly.BlockSvg');
 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 Events = goog.require('Blockly.Events');
 const Icon = goog.require('Blockly.Icon');
 /* eslint-disable-next-line no-unused-vars */
@@ -27,12 +28,10 @@ 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 object = goog.require('Blockly.utils.object');
 const userAgent = goog.require('Blockly.utils.userAgent');
-/* eslint-disable-next-line no-unused-vars */
-const {conditionalBind, Data, unbind} = goog.require('Blockly.browserEvents');
-const {createSvgElement, HTML_NS} = goog.require('Blockly.utils.dom');
-const {inherits} = goog.require('Blockly.utils.object');
-const {register} = goog.require('Blockly.Css');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
@@ -70,35 +69,35 @@ const Comment = function(block) {
 
   /**
    * Mouse up event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onMouseUpWrapper_ = null;
 
   /**
    * Wheel event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onWheelWrapper_ = null;
 
   /**
    * Change event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onChangeWrapper_ = null;
 
   /**
    * Input event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onInputWrapper_ = null;
 
   this.createIcon();
 };
-inherits(Comment, Icon);
+object.inherits(Comment, Icon);
 
 /**
  * Draw the comment icon.
@@ -107,13 +106,13 @@ inherits(Comment, Icon);
  */
 Comment.prototype.drawIcon_ = function(group) {
   // Circle.
-  createSvgElement(
+  dom.createSvgElement(
       Svg.CIRCLE, {'class': 'blocklyIconShape', 'r': '8', 'cx': '8', 'cy': '8'},
       group);
   // Can't use a real '?' text character since different browsers and operating
   // systems render it differently.
   // Body of question mark.
-  createSvgElement(
+  dom.createSvgElement(
       Svg.PATH, {
         'class': 'blocklyIconSymbol',
         'd': 'm6.8,10h2c0.003,-0.617 0.271,-0.962 0.633,-1.266 2.875,-2.405' +
@@ -122,7 +121,7 @@ Comment.prototype.drawIcon_ = function(group) {
       },
       group);
   // Dot of question mark.
-  createSvgElement(
+  dom.createSvgElement(
       Svg.RECT, {
         'class': 'blocklyIconSymbol',
         'x': '6.8',
@@ -151,15 +150,15 @@ Comment.prototype.createEditor_ = function() {
    * For non-editable mode see Warning.textToDom_.
    */
 
-  this.foreignObject_ = createSvgElement(
+  this.foreignObject_ = dom.createSvgElement(
       Svg.FOREIGNOBJECT, {'x': Bubble.BORDER_WIDTH, 'y': Bubble.BORDER_WIDTH},
       null);
 
-  const body = document.createElementNS(HTML_NS, 'body');
-  body.setAttribute('xmlns', HTML_NS);
+  const body = document.createElementNS(dom.HTML_NS, 'body');
+  body.setAttribute('xmlns', dom.HTML_NS);
   body.className = 'blocklyMinimalBody';
 
-  this.textarea_ = document.createElementNS(HTML_NS, 'textarea');
+  this.textarea_ = document.createElementNS(dom.HTML_NS, 'textarea');
   const textarea = this.textarea_;
   textarea.className = 'blocklyCommentTextarea';
   textarea.setAttribute('dir', this.block_.RTL ? 'RTL' : 'LTR');
@@ -172,23 +171,25 @@ Comment.prototype.createEditor_ = function() {
   // Ideally this would be hooked to the focus event for the comment.
   // However doing so in Firefox swallows the cursor for unknown reasons.
   // So this is hooked to mouseup instead.  No big deal.
-  this.onMouseUpWrapper_ =
-      conditionalBind(textarea, 'mouseup', this, this.startEdit_, true, true);
+  this.onMouseUpWrapper_ = browserEvents.conditionalBind(
+      textarea, 'mouseup', this, this.startEdit_, true, true);
   // Don't zoom with mousewheel.
-  this.onWheelWrapper_ = conditionalBind(textarea, 'wheel', this, function(e) {
-    e.stopPropagation();
-  });
+  this.onWheelWrapper_ =
+      browserEvents.conditionalBind(textarea, 'wheel', this, function(e) {
+        e.stopPropagation();
+      });
   this.onChangeWrapper_ =
-      conditionalBind(textarea, 'change', this, function(_e) {
+      browserEvents.conditionalBind(textarea, 'change', this, function(_e) {
         if (this.cachedText_ != this.model_.text) {
           Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
               this.block_, 'comment', null, this.cachedText_,
               this.model_.text));
         }
       });
-  this.onInputWrapper_ = conditionalBind(textarea, 'input', this, function(_e) {
-    this.model_.text = textarea.value;
-  });
+  this.onInputWrapper_ =
+      browserEvents.conditionalBind(textarea, 'input', this, function(_e) {
+        this.model_.text = textarea.value;
+      });
 
   setTimeout(textarea.focus.bind(textarea), 0);
 
@@ -307,19 +308,19 @@ Comment.prototype.createNonEditableBubble_ = function() {
  */
 Comment.prototype.disposeBubble_ = function() {
   if (this.onMouseUpWrapper_) {
-    unbind(this.onMouseUpWrapper_);
+    browserEvents.unbind(this.onMouseUpWrapper_);
     this.onMouseUpWrapper_ = null;
   }
   if (this.onWheelWrapper_) {
-    unbind(this.onWheelWrapper_);
+    browserEvents.unbind(this.onWheelWrapper_);
     this.onWheelWrapper_ = null;
   }
   if (this.onChangeWrapper_) {
-    unbind(this.onChangeWrapper_);
+    browserEvents.unbind(this.onChangeWrapper_);
     this.onChangeWrapper_ = null;
   }
   if (this.onInputWrapper_) {
-    unbind(this.onInputWrapper_);
+    browserEvents.unbind(this.onInputWrapper_);
     this.onInputWrapper_ = null;
   }
   this.bubble_.dispose();
@@ -397,7 +398,7 @@ Comment.prototype.dispose = function() {
 /**
  * CSS for block comment.  See css.js for use.
  */
-register([
+Css.register([
   /* eslint-disable indent */
   '.blocklyCommentTextarea {', 'background-color: #fef49c;', 'border: 0;',
   'outline: 0;', 'margin: 0;', 'padding: 3px;', 'resize: none;',
diff --git a/core/connection_checker.js b/core/connection_checker.js
index 2ea27aa19..20a582aac 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -20,8 +20,8 @@ const IConnectionChecker = goog.require('Blockly.IConnectionChecker');
 /* eslint-disable-next-line no-unused-vars */
 const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 const connectionTypes = goog.require('Blockly.connectionTypes');
+const internalConstants = goog.require('Blockly.internalConstants');
 const registry = goog.require('Blockly.registry');
-const {OPPOSITE_TYPE} = goog.require('Blockly.internalConstants');
 
 
 /**
@@ -145,7 +145,7 @@ ConnectionChecker.prototype.doSafetyChecks = function(a, b) {
   }
   if (blockA == blockB) {
     return Connection.REASON_SELF_CONNECTION;
-  } else if (b.type != OPPOSITE_TYPE[a.type]) {
+  } else if (b.type != internalConstants.OPPOSITE_TYPE[a.type]) {
     return Connection.REASON_WRONG_TYPE;
   } else if (blockA.workspace !== blockB.workspace) {
     return Connection.REASON_DIFFERENT_WORKSPACES;
diff --git a/core/delete_area.js b/core/delete_area.js
index 55eb61a34..248ef2fd2 100644
--- a/core/delete_area.js
+++ b/core/delete_area.js
@@ -21,7 +21,7 @@ const DragTarget = goog.require('Blockly.DragTarget');
 const IDeleteArea = goog.require('Blockly.IDeleteArea');
 /* eslint-disable-next-line no-unused-vars */
 const IDraggable = goog.requireType('Blockly.IDraggable');
-const {inherits} = goog.require('Blockly.utils.object');
+const object = goog.require('Blockly.utils.object');
 
 /**
  * Abstract class for a component that can delete a block or bubble that is
@@ -42,7 +42,7 @@ const DeleteArea = function() {
    */
   this.wouldDelete_ = false;
 };
-inherits(DeleteArea, DragTarget);
+object.inherits(DeleteArea, DragTarget);
 
 /**
  * Returns whether the provided block or bubble would be deleted if dropped on
diff --git a/core/extensions.js b/core/extensions.js
index 3f20777aa..bb9ef6731 100644
--- a/core/extensions.js
+++ b/core/extensions.js
@@ -22,7 +22,7 @@ goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Block = goog.requireType('Blockly.Block');
-const {checkMessageReferences, replaceMessageReferences, runAfterPageLoad} = goog.require('Blockly.utils');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -331,13 +331,13 @@ const buildTooltipForDropdown = function(dropdownName, lookupTable) {
 
   // Check the tooltip string messages for invalid references.
   // Wait for load, in case Blockly.Msg is not yet populated.
-  // runAfterPageLoad() does not run in a Node.js environment due to lack of
-  // document object, in which case skip the validation.
+  // utils.runAfterPageLoad() does not run in a Node.js environment due to lack
+  // of document object, in which case skip the validation.
   if (typeof document == 'object') {  // Relies on document.readyState
-    runAfterPageLoad(function() {
+    utils.runAfterPageLoad(function() {
       for (let key in lookupTable) {
         // Will print warnings if reference is missing.
-        checkMessageReferences(lookupTable[key]);
+        utils.checkMessageReferences(lookupTable[key]);
       }
     });
   }
@@ -366,7 +366,7 @@ const buildTooltipForDropdown = function(dropdownName, lookupTable) {
           console.warn(warning + '.');
         }
       } else {
-        tooltip = replaceMessageReferences(tooltip);
+        tooltip = utils.replaceMessageReferences(tooltip);
       }
       return tooltip;
     }.bind(this));
@@ -411,12 +411,12 @@ const checkDropdownOptionsInTable = function(block, dropdownName, lookupTable) {
 const buildTooltipWithFieldText = function(msgTemplate, fieldName) {
   // Check the tooltip string messages for invalid references.
   // Wait for load, in case Blockly.Msg is not yet populated.
-  // runAfterPageLoad() does not run in a Node.js environment due to lack of
-  // document object, in which case skip the validation.
+  // utils.runAfterPageLoad() does not run in a Node.js environment due to lack
+  // of document object, in which case skip the validation.
   if (typeof document == 'object') {  // Relies on document.readyState
-    runAfterPageLoad(function() {
+    utils.runAfterPageLoad(function() {
       // Will print warnings if reference is missing.
-      checkMessageReferences(msgTemplate);
+      utils.checkMessageReferences(msgTemplate);
     });
   }
 
@@ -427,7 +427,7 @@ const buildTooltipWithFieldText = function(msgTemplate, fieldName) {
   const extensionFn = function() {
     this.setTooltip(function() {
       const field = this.getField(fieldName);
-      return replaceMessageReferences(msgTemplate)
+      return utils.replaceMessageReferences(msgTemplate)
           .replace('%1', field ? field.getText() : '');
     }.bind(this));
   };
diff --git a/core/field.js b/core/field.js
index 926e62008..77e0ab88c 100644
--- a/core/field.js
+++ b/core/field.js
@@ -32,9 +32,9 @@ const IASTNodeLocationWithBlock = goog.require('Blockly.IASTNodeLocationWithBloc
 /* 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');
+/* 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 */
@@ -45,12 +45,11 @@ 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 dom = goog.require('Blockly.utils.dom');
+const browserEvents = goog.require('Blockly.browserEvents');
+const style = goog.require('Blockly.utils.style');
 const userAgent = goog.require('Blockly.utils.userAgent');
-const {addClass, createSvgElement, getFastTextWidth, removeClass, removeNode} = goog.require('Blockly.utils.dom');
-/* eslint-disable-next-line no-unused-vars */
-const {conditionalBind, unbind, Data} = goog.require('Blockly.browserEvents');
-const {getPageOffset} = goog.require('Blockly.utils.style');
-const {replaceMessageReferences} = goog.require('Blockly.utils');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
@@ -150,7 +149,7 @@ const Field = function(value, opt_validator, opt_config) {
 
   /**
    * Mouse down event listener data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.mouseDownWrapper_ = null;
@@ -281,7 +280,7 @@ Field.prototype.SERIALIZABLE = false;
 Field.prototype.configure_ = function(config) {
   let tooltip = config['tooltip'];
   if (typeof tooltip == 'string') {
-    tooltip = replaceMessageReferences(config['tooltip']);
+    tooltip = utils.replaceMessageReferences(config['tooltip']);
   }
   tooltip && this.setTooltip(tooltip);
 
@@ -331,7 +330,7 @@ Field.prototype.init = function() {
     // Field has already been initialized once.
     return;
   }
-  this.fieldGroup_ = createSvgElement(Svg.G, {}, null);
+  this.fieldGroup_ = dom.createSvgElement(Svg.G, {}, null);
   if (!this.isVisible()) {
     this.fieldGroup_.style.display = 'none';
   }
@@ -367,7 +366,7 @@ Field.prototype.initModel = function() {};
  * @protected
  */
 Field.prototype.createBorderRect_ = function() {
-  this.borderRect_ = createSvgElement(
+  this.borderRect_ = dom.createSvgElement(
       Svg.RECT, {
         'rx': this.getConstants().FIELD_BORDER_RECT_RADIUS,
         'ry': this.getConstants().FIELD_BORDER_RECT_RADIUS,
@@ -387,7 +386,7 @@ Field.prototype.createBorderRect_ = function() {
  * @protected
  */
 Field.prototype.createTextElement_ = function() {
-  this.textElement_ = createSvgElement(
+  this.textElement_ = dom.createSvgElement(
       Svg.TEXT, {
         'class': 'blocklyText',
       },
@@ -406,7 +405,7 @@ Field.prototype.createTextElement_ = function() {
  */
 Field.prototype.bindEvents_ = function() {
   Tooltip.bindMouseEvents(this.getClickTarget_());
-  this.mouseDownWrapper_ = conditionalBind(
+  this.mouseDownWrapper_ = browserEvents.conditionalBind(
       this.getClickTarget_(), 'mousedown', this, this.onMouseDown_);
 };
 
@@ -443,10 +442,10 @@ Field.prototype.dispose = function() {
   Tooltip.unbindMouseEvents(this.getClickTarget_());
 
   if (this.mouseDownWrapper_) {
-    unbind(this.mouseDownWrapper_);
+    browserEvents.unbind(this.mouseDownWrapper_);
   }
 
-  removeNode(this.fieldGroup_);
+  dom.removeNode(this.fieldGroup_);
 
   this.disposed = true;
 };
@@ -460,12 +459,12 @@ Field.prototype.updateEditable = function() {
     return;
   }
   if (this.enabled_ && this.sourceBlock_.isEditable()) {
-    addClass(group, 'blocklyEditableText');
-    removeClass(group, 'blocklyNonEditableText');
+    dom.addClass(group, 'blocklyEditableText');
+    dom.removeClass(group, 'blocklyNonEditableText');
     group.style.cursor = this.CURSOR;
   } else {
-    addClass(group, 'blocklyNonEditableText');
-    removeClass(group, 'blocklyEditableText');
+    dom.addClass(group, 'blocklyNonEditableText');
+    dom.removeClass(group, 'blocklyEditableText');
     group.style.cursor = '';
   }
 };
@@ -643,7 +642,7 @@ Field.prototype.updateSize_ = function(opt_margin) {
 
   let contentWidth = 0;
   if (this.textElement_) {
-    contentWidth = getFastTextWidth(
+    contentWidth = dom.getFastTextWidth(
         this.textElement_, constants.FIELD_TEXT_FONTSIZE,
         constants.FIELD_TEXT_FONTWEIGHT, constants.FIELD_TEXT_FONTFAMILY);
     totalWidth += contentWidth;
@@ -760,7 +759,7 @@ Field.prototype.getScaledBBox = function() {
     }
   } else {
     const bBox = this.borderRect_.getBoundingClientRect();
-    xy = getPageOffset(this.borderRect_);
+    xy = style.getPageOffset(this.borderRect_);
     scaledWidth = bBox.width;
     scaledHeight = bBox.height;
   }
@@ -1020,7 +1019,7 @@ Field.prototype.getClickTarget_ = function() {
  * @protected
  */
 Field.prototype.getAbsoluteXY_ = function() {
-  return getPageOffset(
+  return style.getPageOffset(
       /** @type {!SVGRectElement} */ (this.getClickTarget_()));
 };
 
diff --git a/core/field_checkbox.js b/core/field_checkbox.js
index d2ce60eaa..67362fd63 100644
--- a/core/field_checkbox.js
+++ b/core/field_checkbox.js
@@ -16,7 +16,7 @@ goog.module.declareLegacyNamespace();
 const Field = goog.require('Blockly.Field');
 const dom = goog.require('Blockly.utils.dom');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
-const {inherits} = goog.require('Blockly.utils.object');
+const object = goog.require('Blockly.utils.object');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 
@@ -48,7 +48,7 @@ const FieldCheckbox = function(opt_value, opt_validator, opt_config) {
   FieldCheckbox.superClass_.constructor.call(
       this, opt_value, opt_validator, opt_config);
 };
-inherits(FieldCheckbox, Field);
+object.inherits(FieldCheckbox, Field);
 
 /**
  * The default value for this field.
diff --git a/core/field_colour.js b/core/field_colour.js
index a3dc0bf72..b4f53967d 100644
--- a/core/field_colour.js
+++ b/core/field_colour.js
@@ -20,12 +20,11 @@ const IdGenerator = goog.require('Blockly.utils.IdGenerator');
 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');
+const dom = goog.require('Blockly.utils.dom');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
-const {addClass, removeClass} = goog.require('Blockly.utils.dom');
-/* eslint-disable-next-line no-unused-vars */
-const {conditionalBind, unbind, Data} = goog.require('Blockly.browserEvents');
-const {inherits} = goog.require('Blockly.utils.object');
+const object = goog.require('Blockly.utils.object');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 
@@ -65,40 +64,40 @@ const FieldColour = function(opt_value, opt_validator, opt_config) {
 
   /**
    * Mouse click event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onClickWrapper_ = null;
 
   /**
    * Mouse move event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onMouseMoveWrapper_ = null;
 
   /**
    * Mouse enter event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onMouseEnterWrapper_ = null;
 
   /**
    * Mouse leave event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onMouseLeaveWrapper_ = null;
 
   /**
    * Key down event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onKeyDownWrapper_ = null;
 };
-inherits(FieldColour, Field);
+object.inherits(FieldColour, Field);
 
 /**
  * Construct a FieldColour from a JSON arg object.
@@ -472,7 +471,7 @@ FieldColour.prototype.onMouseLeave_ = function() {
   this.picker_.blur();
   const highlighted = this.getHighlighted_();
   if (highlighted) {
-    removeClass(highlighted, 'blocklyColourHighlighted');
+    dom.removeClass(highlighted, 'blocklyColourHighlighted');
   }
 };
 
@@ -503,10 +502,10 @@ FieldColour.prototype.setHighlightedCell_ = function(cell, index) {
   // Unhighlight the current item.
   const highlighted = this.getHighlighted_();
   if (highlighted) {
-    removeClass(highlighted, 'blocklyColourHighlighted');
+    dom.removeClass(highlighted, 'blocklyColourHighlighted');
   }
   // Highlight new item.
-  addClass(cell, 'blocklyColourHighlighted');
+  dom.addClass(cell, 'blocklyColourHighlighted');
   // Set new highlighted index.
   this.highlightedIndex_ = index;
 
@@ -560,15 +559,15 @@ FieldColour.prototype.dropdownCreate_ = function() {
 
   // Configure event handler on the table to listen for any event in a cell.
   this.onClickWrapper_ =
-      conditionalBind(table, 'click', this, this.onClick_, true);
-  this.onMouseMoveWrapper_ =
-      conditionalBind(table, 'mousemove', this, this.onMouseMove_, true);
-  this.onMouseEnterWrapper_ =
-      conditionalBind(table, 'mouseenter', this, this.onMouseEnter_, true);
-  this.onMouseLeaveWrapper_ =
-      conditionalBind(table, 'mouseleave', this, this.onMouseLeave_, true);
+      browserEvents.conditionalBind(table, 'click', this, this.onClick_, true);
+  this.onMouseMoveWrapper_ = browserEvents.conditionalBind(
+      table, 'mousemove', this, this.onMouseMove_, true);
+  this.onMouseEnterWrapper_ = browserEvents.conditionalBind(
+      table, 'mouseenter', this, this.onMouseEnter_, true);
+  this.onMouseLeaveWrapper_ = browserEvents.conditionalBind(
+      table, 'mouseleave', this, this.onMouseLeave_, true);
   this.onKeyDownWrapper_ =
-      conditionalBind(table, 'keydown', this, this.onKeyDown_);
+      browserEvents.conditionalBind(table, 'keydown', this, this.onKeyDown_);
 
   this.picker_ = table;
 };
@@ -579,23 +578,23 @@ FieldColour.prototype.dropdownCreate_ = function() {
  */
 FieldColour.prototype.dropdownDispose_ = function() {
   if (this.onClickWrapper_) {
-    unbind(this.onClickWrapper_);
+    browserEvents.unbind(this.onClickWrapper_);
     this.onClickWrapper_ = null;
   }
   if (this.onMouseMoveWrapper_) {
-    unbind(this.onMouseMoveWrapper_);
+    browserEvents.unbind(this.onMouseMoveWrapper_);
     this.onMouseMoveWrapper_ = null;
   }
   if (this.onMouseEnterWrapper_) {
-    unbind(this.onMouseEnterWrapper_);
+    browserEvents.unbind(this.onMouseEnterWrapper_);
     this.onMouseEnterWrapper_ = null;
   }
   if (this.onMouseLeaveWrapper_) {
-    unbind(this.onMouseLeaveWrapper_);
+    browserEvents.unbind(this.onMouseLeaveWrapper_);
     this.onMouseLeaveWrapper_ = null;
   }
   if (this.onKeyDownWrapper_) {
-    unbind(this.onKeyDownWrapper_);
+    browserEvents.unbind(this.onKeyDownWrapper_);
     this.onKeyDownWrapper_ = null;
   }
   this.picker_ = null;
diff --git a/core/field_dropdown.js b/core/field_dropdown.js
index ddb5a4e18..effd6a31d 100644
--- a/core/field_dropdown.js
+++ b/core/field_dropdown.js
@@ -24,10 +24,10 @@ 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');
+const object = goog.require('Blockly.utils.object');
 const userAgent = goog.require('Blockly.utils.userAgent');
-const {commonWordPrefix, commonWordSuffix, shortestStringLength} = goog.require('Blockly.utils.string');
-const {inherits} = goog.require('Blockly.utils.object');
-const {replaceMessageReferences} = goog.require('Blockly.utils');
+const utils = goog.require('Blockly.utils');
+const utilsString = goog.require('Blockly.utils.string');
 
 
 /**
@@ -130,7 +130,7 @@ const FieldDropdown = function(menuGenerator, opt_validator, opt_config) {
    */
   this.svgArrow_ = null;
 };
-inherits(FieldDropdown, Field);
+object.inherits(FieldDropdown, Field);
 
 /**
  * Dropdown image properties.
@@ -405,10 +405,10 @@ FieldDropdown.prototype.trimOptions_ = function() {
   for (let i = 0; i < options.length; i++) {
     const label = options[i][0];
     if (typeof label == 'string') {
-      options[i][0] = replaceMessageReferences(label);
+      options[i][0] = utils.replaceMessageReferences(label);
     } else {
       if (label.alt != null) {
-        options[i][0].alt = replaceMessageReferences(label.alt);
+        options[i][0].alt = utils.replaceMessageReferences(label.alt);
       }
       hasImages = true;
     }
@@ -420,9 +420,9 @@ FieldDropdown.prototype.trimOptions_ = function() {
   for (let i = 0; i < options.length; i++) {
     strings.push(options[i][0]);
   }
-  const shortest = shortestStringLength(strings);
-  const prefixLength = commonWordPrefix(strings, shortest);
-  const suffixLength = commonWordSuffix(strings, shortest);
+  const shortest = utilsString.shortestStringLength(strings);
+  const prefixLength = utilsString.commonWordPrefix(strings, shortest);
+  const suffixLength = utilsString.commonWordSuffix(strings, shortest);
   if (!prefixLength && !suffixLength) {
     return;
   }
diff --git a/core/field_image.js b/core/field_image.js
index 9edc92c56..ff4460867 100644
--- a/core/field_image.js
+++ b/core/field_image.js
@@ -16,10 +16,10 @@ goog.module.declareLegacyNamespace();
 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 {createSvgElement, XLINK_NS} = goog.require('Blockly.utils.dom');
-const {inherits} = goog.require('Blockly.utils.object');
-const {replaceMessageReferences} = goog.require('Blockly.utils');
+const object = goog.require('Blockly.utils.object');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -45,9 +45,9 @@ const FieldImage = function(
   if (!src) {
     throw Error('Src value of an image field is required');
   }
-  src = replaceMessageReferences(src);
-  const imageHeight = Number(replaceMessageReferences(height));
-  const imageWidth = Number(replaceMessageReferences(width));
+  src = utils.replaceMessageReferences(src);
+  const imageHeight = Number(utils.replaceMessageReferences(height));
+  const imageWidth = Number(utils.replaceMessageReferences(width));
   if (isNaN(imageHeight) || isNaN(imageWidth)) {
     throw Error(
         'Height and width values of an image field must cast to' +
@@ -78,7 +78,7 @@ const FieldImage = function(
 
   if (!opt_config) {  // If the config wasn't passed, do old configuration.
     this.flipRtl_ = !!opt_flipRtl;
-    this.altText_ = replaceMessageReferences(opt_alt) || '';
+    this.altText_ = utils.replaceMessageReferences(opt_alt) || '';
   }
 
   // Initialize other properties.
@@ -115,7 +115,7 @@ const FieldImage = function(
    */
   this.imageElement_ = null;
 };
-inherits(FieldImage, Field);
+object.inherits(FieldImage, Field);
 
 /**
  * The default value for this field.
@@ -174,7 +174,7 @@ FieldImage.prototype.isDirty_ = false;
 FieldImage.prototype.configure_ = function(config) {
   FieldImage.superClass_.configure_.call(this, config);
   this.flipRtl_ = !!config['flipRtl'];
-  this.altText_ = replaceMessageReferences(config['alt']) || '';
+  this.altText_ = utils.replaceMessageReferences(config['alt']) || '';
 };
 
 /**
@@ -182,7 +182,7 @@ FieldImage.prototype.configure_ = function(config) {
  * @package
  */
 FieldImage.prototype.initView = function() {
-  this.imageElement_ = createSvgElement(
+  this.imageElement_ = dom.createSvgElement(
       Svg.IMAGE, {
         'height': this.imageHeight_ + 'px',
         'width': this.size_.width + 'px',
@@ -190,7 +190,7 @@ FieldImage.prototype.initView = function() {
       },
       this.fieldGroup_);
   this.imageElement_.setAttributeNS(
-      XLINK_NS, 'xlink:href', /** @type {string} */ (this.value_));
+      dom.XLINK_NS, 'xlink:href', /** @type {string} */ (this.value_));
 
   if (this.clickHandler_) {
     this.imageElement_.style.cursor = 'pointer';
@@ -227,7 +227,7 @@ FieldImage.prototype.doValueUpdate_ = function(newValue) {
   this.value_ = newValue;
   if (this.imageElement_) {
     this.imageElement_.setAttributeNS(
-        XLINK_NS, 'xlink:href', String(this.value_));
+        dom.XLINK_NS, 'xlink:href', String(this.value_));
   }
 };
 
diff --git a/core/field_label.js b/core/field_label.js
index 822d476ab..1a7480543 100644
--- a/core/field_label.js
+++ b/core/field_label.js
@@ -17,8 +17,8 @@ goog.module.declareLegacyNamespace();
 const Field = goog.require('Blockly.Field');
 const dom = goog.require('Blockly.utils.dom');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
-const {inherits} = goog.require('Blockly.utils.object');
-const {replaceMessageReferences} = goog.require('Blockly.utils');
+const object = goog.require('Blockly.utils.object');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -47,7 +47,7 @@ const FieldLabel = function(opt_value, opt_class, opt_config) {
     this.class_ = opt_class || null;
   }
 };
-inherits(FieldLabel, Field);
+object.inherits(FieldLabel, Field);
 
 /**
  * The default value for this field.
@@ -65,7 +65,7 @@ FieldLabel.prototype.DEFAULT_VALUE = '';
  * @nocollapse
  */
 FieldLabel.fromJson = function(options) {
-  const text = replaceMessageReferences(options['text']);
+  const text = utils.replaceMessageReferences(options['text']);
   // `this` might be a subclass of FieldLabel if that class doesn't override
   // the static fromJson method.
   return new this(text, undefined, options);
diff --git a/core/field_label_serializable.js b/core/field_label_serializable.js
index daabaa59f..dee9da1ef 100644
--- a/core/field_label_serializable.js
+++ b/core/field_label_serializable.js
@@ -16,8 +16,8 @@ goog.module.declareLegacyNamespace();
 
 const FieldLabel = goog.require('Blockly.FieldLabel');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
-const {inherits} = goog.require('Blockly.utils.object');
-const {replaceMessageReferences} = goog.require('Blockly.utils');
+const object = goog.require('Blockly.utils.object');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -37,7 +37,7 @@ const FieldLabelSerializable = function(opt_value, opt_class, opt_config) {
   FieldLabelSerializable.superClass_.constructor.call(
       this, opt_value, opt_class, opt_config);
 };
-inherits(FieldLabelSerializable, FieldLabel);
+object.inherits(FieldLabelSerializable, FieldLabel);
 
 /**
  * Construct a FieldLabelSerializable from a JSON arg object,
@@ -48,7 +48,7 @@ inherits(FieldLabelSerializable, FieldLabel);
  * @nocollapse
  */
 FieldLabelSerializable.fromJson = function(options) {
-  const text = replaceMessageReferences(options['text']);
+  const text = utils.replaceMessageReferences(options['text']);
   // `this` might be a subclass of FieldLabelSerializable if that class doesn't
   // override the static fromJson method.
   return new this(text, undefined, options);
diff --git a/core/field_multilineinput.js b/core/field_multilineinput.js
index 4842429a5..eee4f58c4 100644
--- a/core/field_multilineinput.js
+++ b/core/field_multilineinput.js
@@ -24,9 +24,9 @@ const WidgetDiv = goog.require('Blockly.WidgetDiv');
 const aria = goog.require('Blockly.utils.aria');
 const dom = goog.require('Blockly.utils.dom');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
+const object = goog.require('Blockly.utils.object');
 const userAgent = goog.require('Blockly.utils.userAgent');
-const {inherits} = goog.require('Blockly.utils.object');
-const {replaceMessageReferences} = goog.require('Blockly.utils');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -70,7 +70,7 @@ const FieldMultilineInput = function(opt_value, opt_validator, opt_config) {
    */
   this.isOverflowedY_ = false;
 };
-inherits(FieldMultilineInput, FieldTextInput);
+object.inherits(FieldMultilineInput, FieldTextInput);
 
 /**
  * @override
@@ -89,7 +89,7 @@ FieldMultilineInput.prototype.configure_ = function(config) {
  * @nocollapse
  */
 FieldMultilineInput.fromJson = function(options) {
-  const text = replaceMessageReferences(options['text']);
+  const text = utils.replaceMessageReferences(options['text']);
   // `this` might be a subclass of FieldMultilineInput if that class doesn't
   // override the static fromJson method.
   return new this(text, undefined, options);
diff --git a/core/field_number.js b/core/field_number.js
index 8389f477f..4ed5ac5aa 100644
--- a/core/field_number.js
+++ b/core/field_number.js
@@ -15,8 +15,8 @@ goog.module.declareLegacyNamespace();
 
 const FieldTextInput = goog.require('Blockly.FieldTextInput');
 const aria = goog.require('Blockly.utils.aria');
-const {inherits} = goog.require('Blockly.utils.object');
-const {register} = goog.require('Blockly.fieldRegistry');
+const fieldRegistry = goog.require('Blockly.fieldRegistry');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -74,7 +74,7 @@ const FieldNumber = function(
     this.setConstraints(opt_min, opt_max, opt_precision);
   }
 };
-inherits(FieldNumber, FieldTextInput);
+object.inherits(FieldNumber, FieldTextInput);
 
 /**
  * The default value for this field.
@@ -313,6 +313,6 @@ FieldNumber.prototype.widgetCreate_ = function() {
   return htmlInput;
 };
 
-register('field_number', FieldNumber);
+fieldRegistry.register('field_number', FieldNumber);
 
 exports = FieldNumber;
diff --git a/core/field_textinput.js b/core/field_textinput.js
index cfa891e34..4b80e411b 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -13,6 +13,7 @@
 goog.module('Blockly.FieldTextInput');
 goog.module.declareLegacyNamespace();
 
+const Blockly = goog.require('Blockly');
 /* eslint-disable-next-line no-unused-vars */
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
@@ -28,10 +29,9 @@ const aria = goog.require('Blockly.utils.aria');
 const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
+const object = goog.require('Blockly.utils.object');
 const userAgent = goog.require('Blockly.utils.userAgent');
-const {inherits} = goog.require('Blockly.utils.object');
-const {prompt: blocklyPrompt} = goog.require('Blockly');
-const {replaceMessageReferences} = goog.require('Blockly.utils');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 
@@ -95,7 +95,7 @@ const FieldTextInput = function(opt_value, opt_validator, opt_config) {
    */
   this.workspace_ = null;
 };
-inherits(FieldTextInput, Field);
+object.inherits(FieldTextInput, Field);
 
 /**
  * The default value for this field.
@@ -113,7 +113,7 @@ FieldTextInput.prototype.DEFAULT_VALUE = '';
  * @nocollapse
  */
 FieldTextInput.fromJson = function(options) {
-  const text = replaceMessageReferences(options['text']);
+  const text = utils.replaceMessageReferences(options['text']);
   // `this` might be a subclass of FieldTextInput if that class doesn't override
   // the static fromJson method.
   return new this(text, undefined, options);
@@ -312,7 +312,7 @@ FieldTextInput.prototype.showEditor_ = function(_opt_e, opt_quietInput) {
  * @private
  */
 FieldTextInput.prototype.showPromptEditor_ = function() {
-  blocklyPrompt(Msg['CHANGE_VALUE_TITLE'], this.getText(), function(text) {
+  Blockly.prompt(Msg['CHANGE_VALUE_TITLE'], this.getText(), function(text) {
     this.setValue(this.getValueFromEditorText_(text));
   }.bind(this));
 };
diff --git a/core/field_variable.js b/core/field_variable.js
index f4ae38a51..e98db6f86 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -27,8 +27,8 @@ const Variables = goog.require('Blockly.Variables');
 const Xml = goog.require('Blockly.Xml');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const internalConstants = goog.require('Blockly.internalConstants');
-const {inherits} = goog.require('Blockly.utils.object');
-const {replaceMessageReferences} = goog.require('Blockly.utils');
+const object = goog.require('Blockly.utils.object');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 
@@ -89,7 +89,7 @@ const FieldVariable = function(
     this.setTypes_(opt_variableTypes, opt_defaultType);
   }
 };
-inherits(FieldVariable, FieldDropdown);
+object.inherits(FieldVariable, FieldDropdown);
 
 /**
  * Construct a FieldVariable from a JSON arg object,
@@ -101,7 +101,7 @@ inherits(FieldVariable, FieldDropdown);
  * @nocollapse
  */
 FieldVariable.fromJson = function(options) {
-  const varName = replaceMessageReferences(options['variable']);
+  const varName = utils.replaceMessageReferences(options['variable']);
   // `this` might be a subclass of FieldVariable if that class doesn't override
   // the static fromJson method.
   return new this(varName, undefined, undefined, undefined, options);
diff --git a/core/flyout_base.js b/core/flyout_base.js
index 594d83a9f..2e6908174 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -15,6 +15,7 @@ goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Block = goog.require('Blockly.Block');
+const Blockly = goog.require('Blockly');
 /* eslint-disable-next-line no-unused-vars */
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const ComponentManager = goog.require('Blockly.ComponentManager');
@@ -38,7 +39,6 @@ const dom = goog.require('Blockly.utils.dom');
 const toolbox = goog.require('Blockly.utils.toolbox');
 const utils = goog.require('Blockly.utils');
 const utilsXml = goog.require('Blockly.utils.xml');
-const {hideChaff} = goog.require('Blockly');
 /** @suppress {extraRequire} */
 goog.require('Blockly.blockRendering');
 /** @suppress {extraRequire} */
@@ -854,7 +854,7 @@ Flyout.prototype.createBlock = function(originalBlock) {
   }
 
   // Close the flyout.
-  hideChaff();
+  Blockly.hideChaff();
 
   const newVariables = Variables.getAddedVariables(
       this.targetWorkspace, variablesBeforeCreation);
diff --git a/core/flyout_button.js b/core/flyout_button.js
index db05ca4f4..7bb5a3e88 100644
--- a/core/flyout_button.js
+++ b/core/flyout_button.js
@@ -23,7 +23,7 @@ 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 {replaceMessageReferences} = goog.require('Blockly.utils');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -167,7 +167,7 @@ FlyoutButton.prototype.createDom = function() {
         'text-anchor': 'middle'
       },
       this.svgGroup_);
-  let text = replaceMessageReferences(this.text_);
+  let text = utils.replaceMessageReferences(this.text_);
   if (this.workspace_.RTL) {
     // Force text to be RTL by adding an RLM.
     text += '\u200F';
@@ -329,7 +329,9 @@ Css.register([
     'cursor: default;',
   '}',
 
-  '.blocklyFlyoutLabelBackground {', 'opacity: 0;', '}',
+  '.blocklyFlyoutLabelBackground {',
+    'opacity: 0;',
+  '}',
   /* eslint-enable indent */
 ]);
 
diff --git a/core/flyout_horizontal.js b/core/flyout_horizontal.js
index 7f1ad72fd..b1c611215 100644
--- a/core/flyout_horizontal.js
+++ b/core/flyout_horizontal.js
@@ -22,10 +22,10 @@ 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 object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
-const {Position} = goog.require('Blockly.utils.toolbox');
-const {getScrollDeltaPixels} = goog.require('Blockly.utils');
-const {inherits} = goog.require('Blockly.utils.object');
+const toolbox = goog.require('Blockly.utils.toolbox');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -39,7 +39,7 @@ const HorizontalFlyout = function(workspaceOptions) {
   HorizontalFlyout.superClass_.constructor.call(this, workspaceOptions);
   this.horizontalLayout = true;
 };
-inherits(HorizontalFlyout, Flyout);
+object.inherits(HorizontalFlyout, Flyout);
 
 /**
  * Sets the translation of the flyout to match the scrollbars.
@@ -92,7 +92,7 @@ HorizontalFlyout.prototype.getY = function() {
   const toolboxMetrics = metricsManager.getToolboxMetrics();
 
   let y = 0;
-  const atTop = this.toolboxPosition_ == Position.TOP;
+  const atTop = this.toolboxPosition_ == toolbox.Position.TOP;
   // If this flyout is not the trashcan flyout (e.g. toolbox or mutator).
   if (this.targetWorkspace.toolboxPosition == this.toolboxPosition_) {
     // If there is a category toolbox.
@@ -159,7 +159,7 @@ HorizontalFlyout.prototype.position = function() {
  * @private
  */
 HorizontalFlyout.prototype.setBackgroundPath_ = function(width, height) {
-  const atTop = this.toolboxPosition_ == Position.TOP;
+  const atTop = this.toolboxPosition_ == toolbox.Position.TOP;
   // Start at top left.
   const path = ['M 0,' + (atTop ? 0 : this.CORNER_RADIUS)];
 
@@ -210,7 +210,7 @@ HorizontalFlyout.prototype.scrollToStart = function() {
  * @protected
  */
 HorizontalFlyout.prototype.wheel_ = function(e) {
-  const scrollDelta = getScrollDeltaPixels(e);
+  const scrollDelta = utils.getScrollDeltaPixels(e);
   const delta = scrollDelta.x || scrollDelta.y;
 
   if (delta) {
@@ -326,7 +326,7 @@ HorizontalFlyout.prototype.getClientRect = function() {
   const BIG_NUM = 1000000000;
   const top = flyoutRect.top;
 
-  if (this.toolboxPosition_ == Position.TOP) {
+  if (this.toolboxPosition_ == toolbox.Position.TOP) {
     const height = flyoutRect.height;
     return new Rect(-BIG_NUM, top + height, -BIG_NUM, BIG_NUM);
   } else {  // Bottom.
@@ -335,7 +335,7 @@ HorizontalFlyout.prototype.getClientRect = function() {
 };
 
 /**
- * Compute height of flyout.  Position mat under each block.
+ * Compute height of flyout.  toolbox.Position mat under each block.
  * For RTL: Lay out the blocks right-aligned.
  * @protected
  */
@@ -362,7 +362,7 @@ HorizontalFlyout.prototype.reflowInternal_ = function() {
     }
 
     if (this.targetWorkspace.toolboxPosition == this.toolboxPosition_ &&
-        this.toolboxPosition_ == Position.TOP &&
+        this.toolboxPosition_ == toolbox.Position.TOP &&
         !this.targetWorkspace.getToolbox()) {
       // This flyout is a simple toolbox. Reposition the workspace so that (0,0)
       // is in the correct position relative to the new absolute edge (ie
diff --git a/core/flyout_vertical.js b/core/flyout_vertical.js
index 2091d1321..5b396c061 100644
--- a/core/flyout_vertical.js
+++ b/core/flyout_vertical.js
@@ -22,10 +22,10 @@ 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 object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
-const {Position} = goog.require('Blockly.utils.toolbox');
-const {getScrollDeltaPixels} = goog.require('Blockly.utils');
-const {inherits} = goog.require('Blockly.utils.object');
+const toolbox = goog.require('Blockly.utils.toolbox');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Block');
 /** @suppress {extraRequire} */
@@ -42,7 +42,7 @@ goog.require('Blockly.constants');
 const VerticalFlyout = function(workspaceOptions) {
   VerticalFlyout.superClass_.constructor.call(this, workspaceOptions);
 };
-inherits(VerticalFlyout, Flyout);
+object.inherits(VerticalFlyout, Flyout);
 
 /**
  * The name of the vertical flyout in the registry.
@@ -94,14 +94,14 @@ VerticalFlyout.prototype.getX = function() {
   if (this.targetWorkspace.toolboxPosition == this.toolboxPosition_) {
     // If there is a category toolbox.
     if (this.targetWorkspace.getToolbox()) {
-      if (this.toolboxPosition_ == Position.LEFT) {
+      if (this.toolboxPosition_ == toolbox.Position.LEFT) {
         x = toolboxMetrics.width;
       } else {
         x = viewMetrics.width - this.width_;
       }
       // Simple (flyout-only) toolbox.
     } else {
-      if (this.toolboxPosition_ == Position.LEFT) {
+      if (this.toolboxPosition_ == toolbox.Position.LEFT) {
         x = 0;
       } else {
         // The simple flyout does not cover the workspace.
@@ -110,7 +110,7 @@ VerticalFlyout.prototype.getX = function() {
     }
     // Trashcan flyout is opposite the main flyout.
   } else {
-    if (this.toolboxPosition_ == Position.LEFT) {
+    if (this.toolboxPosition_ == toolbox.Position.LEFT) {
       x = 0;
     } else {
       // Because the anchor point of the flyout is on the left, but we want
@@ -165,7 +165,7 @@ VerticalFlyout.prototype.position = function() {
  * @private
  */
 VerticalFlyout.prototype.setBackgroundPath_ = function(width, height) {
-  const atRight = this.toolboxPosition_ == Position.RIGHT;
+  const atRight = this.toolboxPosition_ == toolbox.Position.RIGHT;
   const totalWidth = width + this.CORNER_RADIUS;
 
   // Decide whether to start on the left or right.
@@ -201,7 +201,7 @@ VerticalFlyout.prototype.scrollToStart = function() {
  * @protected
  */
 VerticalFlyout.prototype.wheel_ = function(e) {
-  const scrollDelta = getScrollDeltaPixels(e);
+  const scrollDelta = utils.getScrollDeltaPixels(e);
 
   if (scrollDelta.y) {
     const metricsManager = this.workspace_.getMetricsManager();
@@ -306,7 +306,7 @@ VerticalFlyout.prototype.getClientRect = function() {
   const BIG_NUM = 1000000000;
   const left = flyoutRect.left;
 
-  if (this.toolboxPosition_ == Position.LEFT) {
+  if (this.toolboxPosition_ == toolbox.Position.LEFT) {
     const width = flyoutRect.width;
     return new Rect(-BIG_NUM, BIG_NUM, -BIG_NUM, left + width);
   } else {  // Right
@@ -315,7 +315,7 @@ VerticalFlyout.prototype.getClientRect = function() {
 };
 
 /**
- * Compute width of flyout.  Position mat under each block.
+ * Compute width of flyout.  toolbox.Position mat under each block.
  * For RTL: Lay out the blocks and buttons to be right-aligned.
  * @protected
  */
@@ -363,7 +363,7 @@ VerticalFlyout.prototype.reflowInternal_ = function() {
     }
 
     if (this.targetWorkspace.toolboxPosition == this.toolboxPosition_ &&
-        this.toolboxPosition_ == Position.LEFT &&
+        this.toolboxPosition_ == toolbox.Position.LEFT &&
         !this.targetWorkspace.getToolbox()) {
       // This flyout is a simple toolbox. Reposition the workspace so that (0,0)
       // is in the correct position relative to the new absolute edge (ie
diff --git a/core/icon.js b/core/icon.js
index 69ff3ef37..cae1d8b6c 100644
--- a/core/icon.js
+++ b/core/icon.js
@@ -22,7 +22,7 @@ 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 {getRelativeXY, isRightButton} = goog.require('Blockly.utils');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -135,7 +135,7 @@ Icon.prototype.iconClick_ = function(e) {
     // Drag operation is concluding.  Don't open the editor.
     return;
   }
-  if (!this.block_.isInFlyout && !isRightButton(e)) {
+  if (!this.block_.isInFlyout && !utils.isRightButton(e)) {
     this.setVisible(!this.isVisible());
   }
 };
@@ -167,7 +167,7 @@ Icon.prototype.setIconLocation = function(xy) {
 Icon.prototype.computeIconLocation = function() {
   // Find coordinates for the centre of the icon and update the arrow.
   const blockXY = this.block_.getRelativeToSurfaceXY();
-  const iconXY = getRelativeXY(
+  const iconXY = utils.getRelativeXY(
       /** @type {!SVGElement} */ (this.iconGroup_));
   const newXY = new Coordinate(
       blockXY.x + iconXY.x + this.SIZE / 2,
diff --git a/core/interfaces/i_flyout.js b/core/interfaces/i_flyout.js
index 23c76dd0b..7c0c47421 100644
--- a/core/interfaces/i_flyout.js
+++ b/core/interfaces/i_flyout.js
@@ -25,7 +25,7 @@ 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 {FlyoutDefinition} = goog.requireType('Blockly.utils.toolbox');
+const toolbox = goog.requireType('Blockly.utils.toolbox');
 
 
 /**
@@ -142,7 +142,7 @@ IFlyout.prototype.hide;
 
 /**
  * Show and populate the flyout.
- * @param {!FlyoutDefinition|string} flyoutDef Contents to
+ * @param {!toolbox.FlyoutDefinition|string} flyoutDef Contents to
  *     display in the flyout. This is either an array of Nodes, a NodeList, a
  *     toolbox definition, or a string with the name of the dynamic category.
  */
diff --git a/core/interfaces/i_metrics_manager.js b/core/interfaces/i_metrics_manager.js
index db1f575c1..7dd8ef663 100644
--- a/core/interfaces/i_metrics_manager.js
+++ b/core/interfaces/i_metrics_manager.js
@@ -17,9 +17,9 @@ goog.module.declareLegacyNamespace();
 /* eslint-disable-next-line no-unused-vars */
 const Metrics = goog.requireType('Blockly.utils.Metrics');
 /* eslint-disable-next-line no-unused-vars */
-const Size = goog.requireType('Blockly.utils.Size');
+const MetricsManager = goog.requireType('Blockly.MetricsManager');
 /* eslint-disable-next-line no-unused-vars */
-const {AbsoluteMetrics, ContainerRegion, ToolboxMetrics} = goog.requireType('Blockly.MetricsManager');
+const Size = goog.requireType('Blockly.utils.Size');
 
 
 /**
@@ -39,13 +39,13 @@ IMetricsManager.prototype.hasFixedEdges;
  * Returns the metrics for the scroll area of the workspace.
  * @param {boolean=} opt_getWorkspaceCoordinates True to get the scroll metrics
  *     in workspace coordinates, false to get them in pixel coordinates.
- * @param {!ContainerRegion=} opt_viewMetrics The view
+ * @param {!MetricsManager.ContainerRegion=} opt_viewMetrics The view
  *     metrics if they have been previously computed. Passing in null may cause
  *     the view metrics to be computed again, if it is needed.
- * @param {!ContainerRegion=} opt_contentMetrics The
+ * @param {!MetricsManager.ContainerRegion=} opt_contentMetrics The
  *     content metrics if they have been previously computed. Passing in null
  *     may cause the content metrics to be computed again, if it is needed.
- * @return {!ContainerRegion} The metrics for the scroll
+ * @return {!MetricsManager.ContainerRegion} The metrics for the scroll
  *    container
  */
 IMetricsManager.prototype.getScrollMetrics;
@@ -55,7 +55,7 @@ IMetricsManager.prototype.getScrollMetrics;
  * coordinates. Returns 0 for the width and height if the workspace has a
  * category toolbox instead of a simple toolbox.
  * @param {boolean=} opt_own Whether to only return the workspace's own flyout.
- * @return {!ToolboxMetrics} The width and height of the
+ * @return {!MetricsManager.ToolboxMetrics} The width and height of the
  *     flyout.
  * @public
  */
@@ -66,7 +66,7 @@ IMetricsManager.prototype.getFlyoutMetrics;
  * coordinates. Returns 0 for the width and height if the workspace has a simple
  * toolbox instead of a category toolbox. To get the width and height of a
  * simple toolbox @see {@link getFlyoutMetrics}.
- * @return {!ToolboxMetrics} The object with the width,
+ * @return {!MetricsManager.ToolboxMetrics} The object with the width,
  *     height and position of the toolbox.
  * @public
  */
@@ -84,7 +84,7 @@ IMetricsManager.prototype.getSvgMetrics;
 /**
  * Gets the absolute left and absolute top in pixel coordinates.
  * This is where the visible workspace starts in relation to the SVG container.
- * @return {!AbsoluteMetrics} The absolute metrics for
+ * @return {!MetricsManager.AbsoluteMetrics} The absolute metrics for
  *     the workspace.
  * @public
  */
@@ -95,7 +95,7 @@ IMetricsManager.prototype.getAbsoluteMetrics;
  * coordinates. The visible workspace does not include the toolbox or flyout.
  * @param {boolean=} opt_getWorkspaceCoordinates True to get the view metrics in
  *     workspace coordinates, false to get them in pixel coordinates.
- * @return {!ContainerRegion} The width, height, top and
+ * @return {!MetricsManager.ContainerRegion} The width, height, top and
  *     left of the viewport in either workspace coordinates or pixel
  *     coordinates.
  * @public
@@ -108,7 +108,7 @@ IMetricsManager.prototype.getViewMetrics;
  * workspace (workspace comments and blocks).
  * @param {boolean=} opt_getWorkspaceCoordinates True to get the content metrics
  *     in workspace coordinates, false to get them in pixel coordinates.
- * @return {!ContainerRegion} The
+ * @return {!MetricsManager.ContainerRegion} The
  *     metrics for the content container.
  * @public
  */
diff --git a/core/interfaces/i_positionable.js b/core/interfaces/i_positionable.js
index 1fe773add..56b9515c3 100644
--- a/core/interfaces/i_positionable.js
+++ b/core/interfaces/i_positionable.js
@@ -17,9 +17,9 @@ goog.module.declareLegacyNamespace();
 /* eslint-disable-next-line no-unused-vars */
 const IComponent = goog.require('Blockly.IComponent');
 /* eslint-disable-next-line no-unused-vars */
-const Rect = goog.requireType('Blockly.utils.Rect');
+const MetricsManager = goog.requireType('Blockly.MetricsManager');
 /* eslint-disable-next-line no-unused-vars */
-const {UiMetrics} = goog.requireType('Blockly.MetricsManager');
+const Rect = goog.requireType('Blockly.utils.Rect');
 
 
 /**
@@ -31,7 +31,7 @@ const IPositionable = function() {};
 
 /**
  * Positions the element. Called when the window is resized.
- * @param {!UiMetrics} metrics The workspace metrics.
+ * @param {!MetricsManager.UiMetrics} metrics The workspace metrics.
  * @param {!Array<!Rect>} savedPositions List of rectangles that
  *     are already on the workspace.
  */
diff --git a/core/interfaces/i_selectable_toolbox_item.js b/core/interfaces/i_selectable_toolbox_item.js
index cefe35740..837aad148 100644
--- a/core/interfaces/i_selectable_toolbox_item.js
+++ b/core/interfaces/i_selectable_toolbox_item.js
@@ -17,7 +17,7 @@ goog.module.declareLegacyNamespace();
 /* eslint-disable-next-line no-unused-vars */
 const IToolboxItem = goog.require('Blockly.IToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
-const {FlyoutItemInfoArray} = goog.requireType('Blockly.utils.toolbox');
+const toolbox = goog.requireType('Blockly.utils.toolbox');
 
 
 /**
@@ -37,7 +37,7 @@ ISelectableToolboxItem.prototype.getName;
 /**
  * Gets the contents of the toolbox item. These are items that are meant to be
  * displayed in the flyout.
- * @return {!FlyoutItemInfoArray|string} The definition
+ * @return {!toolbox.FlyoutItemInfoArray|string} The definition
  *     of items to be displayed in the flyout.
  * @public
  */
diff --git a/core/interfaces/i_toolbox.js b/core/interfaces/i_toolbox.js
index 0c7e7deb3..d6d6ec626 100644
--- a/core/interfaces/i_toolbox.js
+++ b/core/interfaces/i_toolbox.js
@@ -23,7 +23,7 @@ const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 /* eslint-disable-next-line no-unused-vars */
-const {ToolboxInfo} = goog.requireType('Blockly.utils.toolbox');
+const toolbox = goog.requireType('Blockly.utils.toolbox');
 
 
 /**
@@ -41,7 +41,7 @@ IToolbox.prototype.init;
 
 /**
  * Fills the toolbox with new toolbox items and removes any old contents.
- * @param {!ToolboxInfo} toolboxDef Object holding information
+ * @param {!toolbox.ToolboxInfo} toolboxDef Object holding information
  *     for creating a toolbox.
  */
 IToolbox.prototype.render;
diff --git a/core/keyboard_nav/basic_cursor.js b/core/keyboard_nav/basic_cursor.js
index e9780e119..78ee3fe1b 100644
--- a/core/keyboard_nav/basic_cursor.js
+++ b/core/keyboard_nav/basic_cursor.js
@@ -16,8 +16,8 @@ goog.module.declareLegacyNamespace();
 
 const ASTNode = goog.require('Blockly.ASTNode');
 const Cursor = goog.require('Blockly.Cursor');
-const {register, Type} = goog.require('Blockly.registry');
-const {inherits} = goog.require('Blockly.utils.object');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
@@ -30,7 +30,7 @@ const {inherits} = goog.require('Blockly.utils.object');
 const BasicCursor = function() {
   BasicCursor.superClass_.constructor.call(this);
 };
-inherits(BasicCursor, Cursor);
+object.inherits(BasicCursor, Cursor);
 
 /**
  * Name used for registering a basic cursor.
@@ -214,6 +214,7 @@ BasicCursor.prototype.getRightMostChild_ = function(node) {
   return this.getRightMostChild_(newNode);
 };
 
-register(Type.CURSOR, BasicCursor.registrationName, BasicCursor);
+registry.register(
+    registry.Type.CURSOR, BasicCursor.registrationName, BasicCursor);
 
 exports = BasicCursor;
diff --git a/core/keyboard_nav/cursor.js b/core/keyboard_nav/cursor.js
index de3d97498..9bc9526e2 100644
--- a/core/keyboard_nav/cursor.js
+++ b/core/keyboard_nav/cursor.js
@@ -16,8 +16,8 @@ goog.module.declareLegacyNamespace();
 
 const ASTNode = goog.require('Blockly.ASTNode');
 const Marker = goog.require('Blockly.Marker');
-const {DEFAULT, register, Type} = goog.require('Blockly.registry');
-const {inherits} = goog.require('Blockly.utils.object');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
@@ -34,7 +34,7 @@ const Cursor = function() {
    */
   this.type = 'cursor';
 };
-inherits(Cursor, Marker);
+object.inherits(Cursor, Marker);
 
 /**
  * Find the next connection, field, or block.
@@ -134,6 +134,6 @@ Cursor.prototype.out = function() {
   return newNode;
 };
 
-register(Type.CURSOR, DEFAULT, Cursor);
+registry.register(registry.Type.CURSOR, registry.DEFAULT, Cursor);
 
 exports = Cursor;
diff --git a/core/keyboard_nav/tab_navigate_cursor.js b/core/keyboard_nav/tab_navigate_cursor.js
index 77fc5a2a2..3847b03a9 100644
--- a/core/keyboard_nav/tab_navigate_cursor.js
+++ b/core/keyboard_nav/tab_navigate_cursor.js
@@ -18,7 +18,7 @@ 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 {inherits} = goog.require('Blockly.utils.object');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -29,7 +29,7 @@ const {inherits} = goog.require('Blockly.utils.object');
 const TabNavigateCursor = function() {
   TabNavigateCursor.superClass_.constructor.call(this);
 };
-inherits(TabNavigateCursor, BasicCursor);
+object.inherits(TabNavigateCursor, BasicCursor);
 
 /**
  * Skip all nodes except for tab navigable fields.
diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js
index 0f8548192..06f9d7009 100644
--- a/core/renderers/common/info.js
+++ b/core/renderers/common/info.js
@@ -46,8 +46,8 @@ const SquareCorner = goog.require('Blockly.blockRendering.SquareCorner');
 const StatementInput = goog.require('Blockly.blockRendering.StatementInput');
 const TopRow = goog.require('Blockly.blockRendering.TopRow');
 const Types = goog.require('Blockly.blockRendering.Types');
-const {ALIGN} = goog.require('Blockly.constants');
-const {DUMMY, STATEMENT, VALUE} = goog.require('Blockly.inputTypes');
+const constants = goog.require('Blockly.constants');
+const inputTypes = goog.require('Blockly.inputTypes');
 
 
 
@@ -290,7 +290,7 @@ RenderInfo.prototype.populateTopRow_ = function() {
   }
 
   const precedesStatement = this.block_.inputList.length &&
-      this.block_.inputList[0].type == STATEMENT;
+      this.block_.inputList[0].type == inputTypes.STATEMENT;
 
   // This is the minimum height for the row. If one of its elements has a
   // greater height it will be overwritten in the compute pass.
@@ -314,7 +314,8 @@ RenderInfo.prototype.populateBottomRow_ = function() {
   this.bottomRow.hasNextConnection = !!this.block_.nextConnection;
 
   const followsStatement = this.block_.inputList.length &&
-      this.block_.inputList[this.block_.inputList.length - 1].type == STATEMENT;
+      this.block_.inputList[this.block_.inputList.length - 1].type ==
+          inputTypes.STATEMENT;
 
   // This is the minimum height for the row. If one of its elements has a
   // greater height it will be overwritten in the compute pass.
@@ -359,16 +360,16 @@ RenderInfo.prototype.populateBottomRow_ = function() {
  */
 RenderInfo.prototype.addInput_ = function(input, activeRow) {
   // Non-dummy inputs have visual representations onscreen.
-  if (this.isInline && input.type == VALUE) {
+  if (this.isInline && input.type == inputTypes.VALUE) {
     activeRow.elements.push(new InlineInput(this.constants_, input));
     activeRow.hasInlineInput = true;
-  } else if (input.type == STATEMENT) {
+  } else if (input.type == inputTypes.STATEMENT) {
     activeRow.elements.push(new StatementInput(this.constants_, input));
     activeRow.hasStatement = true;
-  } else if (input.type == VALUE) {
+  } else if (input.type == inputTypes.VALUE) {
     activeRow.elements.push(new ExternalValueInput(this.constants_, input));
     activeRow.hasExternalInput = true;
-  } else if (input.type == DUMMY) {
+  } else if (input.type == inputTypes.DUMMY) {
     // Dummy inputs have no visual representation, but the information is still
     // important.
     activeRow.minHeight = Math.max(
@@ -397,11 +398,12 @@ RenderInfo.prototype.shouldStartNewRow_ = function(input, lastInput) {
     return false;
   }
   // A statement input or an input following one always gets a new row.
-  if (input.type == STATEMENT || lastInput.type == STATEMENT) {
+  if (input.type == inputTypes.STATEMENT ||
+      lastInput.type == inputTypes.STATEMENT) {
     return true;
   }
   // Value and dummy inputs get new row if inputs are not inlined.
-  if (input.type == VALUE || input.type == DUMMY) {
+  if (input.type == inputTypes.VALUE || input.type == inputTypes.DUMMY) {
     return !this.isInline;
   }
   return false;
@@ -575,14 +577,14 @@ RenderInfo.prototype.addAlignmentPadding_ = function(row, missingSpace) {
   }
 
   // Decide where the extra padding goes.
-  if (row.align == ALIGN.LEFT) {
+  if (row.align == constants.ALIGN.LEFT) {
     // Add padding to the end of the row.
     lastSpacer.width += missingSpace;
-  } else if (row.align == ALIGN.CENTRE) {
+  } else if (row.align == constants.ALIGN.CENTRE) {
     // Split the padding between the beginning and end of the row.
     firstSpacer.width += missingSpace / 2;
     lastSpacer.width += missingSpace / 2;
-  } else if (row.align == ALIGN.RIGHT) {
+  } else if (row.align == constants.ALIGN.RIGHT) {
     // Add padding at the beginning of the row.
     firstSpacer.width += missingSpace;
   } else {
diff --git a/core/utils/toolbox.js b/core/utils/toolbox.js
index 6dabc1fd5..73b57cbd7 100644
--- a/core/utils/toolbox.js
+++ b/core/utils/toolbox.js
@@ -17,12 +17,12 @@
 goog.module('Blockly.utils.toolbox');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
+const ToolboxCategory = goog.requireType('Blockly.ToolboxCategory');
+/* eslint-disable-next-line no-unused-vars */
+const ToolboxSeparator = goog.requireType('Blockly.ToolboxSeparator');
+const Xml = goog.require('Blockly.Xml');
 const userAgent = goog.require('Blockly.utils.userAgent');
-/* eslint-disable-next-line no-unused-vars */
-const {CssConfig: CategoryCssConfig} = goog.requireType('Blockly.ToolboxCategory');
-/* eslint-disable-next-line no-unused-vars */
-const {CssConfig: SeparatorCssConfig} = goog.requireType('Blockly.ToolboxSeparator');
-const {textToDom} = goog.require('Blockly.Xml');
 
 /**
  * The information needed to create a block in the toolbox.
@@ -43,7 +43,7 @@ exports.BlockInfo = BlockInfo;
  *            kind:string,
  *            id:(string|undefined),
  *            gap:(number|undefined),
- *            cssconfig:(!SeparatorCssConfig|undefined)
+ *            cssconfig:(!ToolboxSeparator.CssConfig|undefined)
  *          }}
  */
 let SeparatorInfo;
@@ -88,7 +88,7 @@ exports.ButtonOrLabelInfo = ButtonOrLabelInfo;
  *            id:(string|undefined),
  *            categorystyle:(string|undefined),
  *            colour:(string|undefined),
- *            cssconfig:(!CategoryCssConfig|undefined),
+ *            cssconfig:(!ToolboxCategory.CssConfig|undefined),
  *            hidden:(string|undefined)
  *          }}
  */
@@ -103,7 +103,7 @@ exports.StaticCategoryInfo = StaticCategoryInfo;
  *            id:(string|undefined),
  *            categorystyle:(string|undefined),
  *            colour:(string|undefined),
- *            cssconfig:(!CategoryCssConfig|undefined),
+ *            cssconfig:(!ToolboxCategory.CssConfig|undefined),
  *            hidden:(string|undefined)
  *          }}
  */
@@ -413,7 +413,7 @@ const parseToolboxTree = function(toolboxDef) {
       }
     }
     if (typeof toolboxDef == 'string') {
-      toolboxDef = textToDom(toolboxDef);
+      toolboxDef = Xml.textToDom(toolboxDef);
       if (toolboxDef.nodeName.toLowerCase() != 'xml') {
         throw TypeError('Toolbox should be an <xml> document.');
       }

From 582b67ae7b392d98a5006405de2d2ea94bd3713e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 28 Jul 2021 16:03:58 -0700
Subject: [PATCH 507/833] Migrate core/toolbox/separator.js to ES6 const/let

---
 core/toolbox/separator.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/toolbox/separator.js b/core/toolbox/separator.js
index 63ded4a6b..27f475ba4 100644
--- a/core/toolbox/separator.js
+++ b/core/toolbox/separator.js
@@ -45,7 +45,7 @@ Blockly.ToolboxSeparator = function(separatorDef, toolbox) {
     'container': 'blocklyTreeSeparator'
   };
 
-  var cssConfig = separatorDef['cssconfig'] || separatorDef['cssConfig'];
+  const cssConfig = separatorDef['cssconfig'] || separatorDef['cssConfig'];
   Blockly.utils.object.mixin(this.cssConfig_, cssConfig);
 };
 Blockly.utils.object.inherits(Blockly.ToolboxSeparator, Blockly.ToolboxItem);
@@ -77,7 +77,7 @@ Blockly.ToolboxSeparator.prototype.init = function() {
  * @protected
  */
 Blockly.ToolboxSeparator.prototype.createDom_ = function() {
-  var container = document.createElement('div');
+  const container = document.createElement('div');
   Blockly.utils.dom.addClass(container, this.cssConfig_['container']);
   this.htmlDiv_ = container;
   return container;

From bce1136500c5e2db32638bd1290a70a66ff0eff3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 28 Jul 2021 16:04:21 -0700
Subject: [PATCH 508/833] Migrate core/toolbox/separator.js to goog.module

---
 core/toolbox/separator.js | 29 +++++++++++++++++------------
 tests/deps.js             |  2 +-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/core/toolbox/separator.js b/core/toolbox/separator.js
index 27f475ba4..90a6ab276 100644
--- a/core/toolbox/separator.js
+++ b/core/toolbox/separator.js
@@ -11,12 +11,15 @@
  */
 'use strict';
 
-goog.provide('Blockly.ToolboxSeparator');
+goog.module('Blockly.ToolboxSeparator');
+goog.module.declareLegacyNamespace();
 
+goog.require('Blockly.Css');
 goog.require('Blockly.IToolboxItem');
 goog.require('Blockly.registry');
 goog.require('Blockly.ToolboxItem');
 goog.require('Blockly.utils.dom');
+goog.require('Blockly.utils.object');
 
 goog.requireType('Blockly.IToolbox');
 goog.requireType('Blockly.utils.toolbox');
@@ -32,13 +35,13 @@ goog.requireType('Blockly.utils.toolbox');
  * @extends {Blockly.ToolboxItem}
  * @implements {Blockly.IToolboxItem}
  */
-Blockly.ToolboxSeparator = function(separatorDef, toolbox) {
+const ToolboxSeparator = function(separatorDef, toolbox) {
 
-  Blockly.ToolboxSeparator.superClass_.constructor.call(
+  ToolboxSeparator.superClass_.constructor.call(
       this, separatorDef, toolbox);
   /**
    * All the CSS class names that are used to create a separator.
-   * @type {!Blockly.ToolboxSeparator.CssConfig}
+   * @type {!ToolboxSeparator.CssConfig}
    * @protected
    */
   this.cssConfig_ = {
@@ -48,7 +51,7 @@ Blockly.ToolboxSeparator = function(separatorDef, toolbox) {
   const cssConfig = separatorDef['cssconfig'] || separatorDef['cssConfig'];
   Blockly.utils.object.mixin(this.cssConfig_, cssConfig);
 };
-Blockly.utils.object.inherits(Blockly.ToolboxSeparator, Blockly.ToolboxItem);
+Blockly.utils.object.inherits(ToolboxSeparator, Blockly.ToolboxItem);
 
 /**
  * All the CSS class names that are used to create a separator.
@@ -56,18 +59,18 @@ Blockly.utils.object.inherits(Blockly.ToolboxSeparator, Blockly.ToolboxItem);
  *            container:(string|undefined)
  *          }}
  */
-Blockly.ToolboxSeparator.CssConfig;
+ToolboxSeparator.CssConfig;
 
 /**
  * Name used for registering a toolbox separator.
  * @const {string}
  */
-Blockly.ToolboxSeparator.registrationName = 'sep';
+ToolboxSeparator.registrationName = 'sep';
 
 /**
  * @override
  */
-Blockly.ToolboxSeparator.prototype.init = function() {
+ToolboxSeparator.prototype.init = function() {
   this.createDom_();
 };
 
@@ -76,7 +79,7 @@ Blockly.ToolboxSeparator.prototype.init = function() {
  * @return {!Element} The parent element for the separator.
  * @protected
  */
-Blockly.ToolboxSeparator.prototype.createDom_ = function() {
+ToolboxSeparator.prototype.createDom_ = function() {
   const container = document.createElement('div');
   Blockly.utils.dom.addClass(container, this.cssConfig_['container']);
   this.htmlDiv_ = container;
@@ -86,14 +89,14 @@ Blockly.ToolboxSeparator.prototype.createDom_ = function() {
 /**
  * @override
  */
-Blockly.ToolboxSeparator.prototype.getDiv = function() {
+ToolboxSeparator.prototype.getDiv = function() {
   return this.htmlDiv_;
 };
 
 /**
  * @override
  */
-Blockly.ToolboxSeparator.prototype.dispose = function() {
+ToolboxSeparator.prototype.dispose = function() {
   Blockly.utils.dom.removeNode(this.htmlDiv_);
 };
 
@@ -120,4 +123,6 @@ Blockly.Css.register([
 ]);
 
 Blockly.registry.register(Blockly.registry.Type.TOOLBOX_ITEM,
-    Blockly.ToolboxSeparator.registrationName, Blockly.ToolboxSeparator);
+    ToolboxSeparator.registrationName, ToolboxSeparator);
+
+exports = ToolboxSeparator;
diff --git a/tests/deps.js b/tests/deps.js
index b35d0324a..1e3476539 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -170,7 +170,7 @@ goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Bloc
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.IToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es5'});
+goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.IToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem', 'Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.utils.string']);

From 6bf443bdd684180d96057014493dda02d8d7a954 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 28 Jul 2021 16:07:40 -0700
Subject: [PATCH 509/833] Migrate core/toolbox/separator.js named requires

---
 core/toolbox/separator.js | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/core/toolbox/separator.js b/core/toolbox/separator.js
index 90a6ab276..d0de25646 100644
--- a/core/toolbox/separator.js
+++ b/core/toolbox/separator.js
@@ -14,26 +14,25 @@
 goog.module('Blockly.ToolboxSeparator');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Css');
-goog.require('Blockly.IToolboxItem');
-goog.require('Blockly.registry');
-goog.require('Blockly.ToolboxItem');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.IToolbox');
-goog.requireType('Blockly.utils.toolbox');
+const Css = goog.require('Blockly.Css');
+const IToolbox = goog.requireType('Blockly.IToolbox');
+const IToolboxItem = goog.require('Blockly.IToolboxItem');
+const ToolboxItem = goog.require('Blockly.ToolboxItem');
+const dom = goog.require('Blockly.utils.dom');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
+const toolbox = goog.requireType('Blockly.utils.toolbox');
 
 
 /**
  * Class for a toolbox separator. This is the thin visual line that appears on
  * the toolbox. This item is not interactable.
- * @param {!Blockly.utils.toolbox.SeparatorInfo} separatorDef The information
+ * @param {!toolbox.SeparatorInfo} separatorDef The information
  *     needed to create a separator.
- * @param {!Blockly.IToolbox} toolbox The parent toolbox for the separator.
+ * @param {!IToolbox} toolbox The parent toolbox for the separator.
  * @constructor
- * @extends {Blockly.ToolboxItem}
- * @implements {Blockly.IToolboxItem}
+ * @extends {ToolboxItem}
+ * @implements {IToolboxItem}
  */
 const ToolboxSeparator = function(separatorDef, toolbox) {
 
@@ -49,9 +48,9 @@ const ToolboxSeparator = function(separatorDef, toolbox) {
   };
 
   const cssConfig = separatorDef['cssconfig'] || separatorDef['cssConfig'];
-  Blockly.utils.object.mixin(this.cssConfig_, cssConfig);
+  object.mixin(this.cssConfig_, cssConfig);
 };
-Blockly.utils.object.inherits(ToolboxSeparator, Blockly.ToolboxItem);
+object.inherits(ToolboxSeparator, ToolboxItem);
 
 /**
  * All the CSS class names that are used to create a separator.
@@ -81,7 +80,7 @@ ToolboxSeparator.prototype.init = function() {
  */
 ToolboxSeparator.prototype.createDom_ = function() {
   const container = document.createElement('div');
-  Blockly.utils.dom.addClass(container, this.cssConfig_['container']);
+  dom.addClass(container, this.cssConfig_['container']);
   this.htmlDiv_ = container;
   return container;
 };
@@ -97,13 +96,13 @@ ToolboxSeparator.prototype.getDiv = function() {
  * @override
  */
 ToolboxSeparator.prototype.dispose = function() {
-  Blockly.utils.dom.removeNode(this.htmlDiv_);
+  dom.removeNode(this.htmlDiv_);
 };
 
 /**
  * CSS for Toolbox.  See css.js for use.
  */
-Blockly.Css.register([
+Css.register([
   /* eslint-disable indent */
   '.blocklyTreeSeparator {',
     'border-bottom: solid #e5e5e5 1px;',
@@ -122,7 +121,7 @@ Blockly.Css.register([
   /* eslint-enable indent */
 ]);
 
-Blockly.registry.register(Blockly.registry.Type.TOOLBOX_ITEM,
+registry.register(registry.Type.TOOLBOX_ITEM,
     ToolboxSeparator.registrationName, ToolboxSeparator);
 
 exports = ToolboxSeparator;

From d004607b3b09aaa0f51f0df7c3ec3c741883c846 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 28 Jul 2021 16:09:11 -0700
Subject: [PATCH 510/833] clang-format core/toolbox/separator.js

---
 core/toolbox/separator.js | 42 +++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/core/toolbox/separator.js b/core/toolbox/separator.js
index d0de25646..f4222cd0b 100644
--- a/core/toolbox/separator.js
+++ b/core/toolbox/separator.js
@@ -35,17 +35,13 @@ const toolbox = goog.requireType('Blockly.utils.toolbox');
  * @implements {IToolboxItem}
  */
 const ToolboxSeparator = function(separatorDef, toolbox) {
-
-  ToolboxSeparator.superClass_.constructor.call(
-      this, separatorDef, toolbox);
+  ToolboxSeparator.superClass_.constructor.call(this, separatorDef, toolbox);
   /**
    * All the CSS class names that are used to create a separator.
    * @type {!ToolboxSeparator.CssConfig}
    * @protected
    */
-  this.cssConfig_ = {
-    'container': 'blocklyTreeSeparator'
-  };
+  this.cssConfig_ = {'container': 'blocklyTreeSeparator'};
 
   const cssConfig = separatorDef['cssconfig'] || separatorDef['cssConfig'];
   object.mixin(this.cssConfig_, cssConfig);
@@ -103,25 +99,23 @@ ToolboxSeparator.prototype.dispose = function() {
  * CSS for Toolbox.  See css.js for use.
  */
 Css.register([
-  /* eslint-disable indent */
-  '.blocklyTreeSeparator {',
-    'border-bottom: solid #e5e5e5 1px;',
-    'height: 0;',
-    'margin: 5px 0;',
-  '}',
-
-  '.blocklyToolboxDiv[layout="h"] .blocklyTreeSeparator {',
-    'border-right: solid #e5e5e5 1px;',
-    'border-bottom: none;',
-    'height: auto;',
-    'margin: 0 5px 0 5px;',
-    'padding: 5px 0;',
-    'width: 0;',
-  '}',
-  /* eslint-enable indent */
+  `.blocklyTreeSeparator {
+  border-bottom: solid #e5e5e5 1px;
+  height: 0;
+  margin: 5px 0;
+}`,
+  `.blocklyToolboxDiv[layout="h"] .blocklyTreeSeparator {
+  border-right: solid #e5e5e5 1px;
+  border-bottom: none;
+  height: auto;
+  margin: 0 5px 0 5px;
+  padding: 5px 0;
+  width: 0;
+}`,
 ]);
 
-registry.register(registry.Type.TOOLBOX_ITEM,
-    ToolboxSeparator.registrationName, ToolboxSeparator);
+registry.register(
+    registry.Type.TOOLBOX_ITEM, ToolboxSeparator.registrationName,
+    ToolboxSeparator);
 
 exports = ToolboxSeparator;

From d5d155641e6e6934b0e05eadb0c652f97e549705 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 28 Jul 2021 16:14:14 -0700
Subject: [PATCH 511/833] Add eslint disable to core/toolbox/separator.js

---
 core/toolbox/separator.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/toolbox/separator.js b/core/toolbox/separator.js
index f4222cd0b..664fa4584 100644
--- a/core/toolbox/separator.js
+++ b/core/toolbox/separator.js
@@ -15,12 +15,14 @@ goog.module('Blockly.ToolboxSeparator');
 goog.module.declareLegacyNamespace();
 
 const Css = goog.require('Blockly.Css');
+/* eslint-disable-next-line no-unused-vars */
 const IToolbox = goog.requireType('Blockly.IToolbox');
 const IToolboxItem = goog.require('Blockly.IToolboxItem');
 const ToolboxItem = goog.require('Blockly.ToolboxItem');
 const dom = goog.require('Blockly.utils.dom');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
+/* eslint-disable-next-line no-unused-vars */
 const toolbox = goog.requireType('Blockly.utils.toolbox');
 
 

From 38b44f5dab80a273b91fee9ea7650197245045c1 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 3 Aug 2021 15:26:29 -0700
Subject: [PATCH 512/833] Remove unecessary implements

---
 core/toolbox/separator.js | 2 --
 tests/deps.js             | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/toolbox/separator.js b/core/toolbox/separator.js
index 664fa4584..dbf30f4f0 100644
--- a/core/toolbox/separator.js
+++ b/core/toolbox/separator.js
@@ -17,7 +17,6 @@ goog.module.declareLegacyNamespace();
 const Css = goog.require('Blockly.Css');
 /* eslint-disable-next-line no-unused-vars */
 const IToolbox = goog.requireType('Blockly.IToolbox');
-const IToolboxItem = goog.require('Blockly.IToolboxItem');
 const ToolboxItem = goog.require('Blockly.ToolboxItem');
 const dom = goog.require('Blockly.utils.dom');
 const object = goog.require('Blockly.utils.object');
@@ -34,7 +33,6 @@ const toolbox = goog.requireType('Blockly.utils.toolbox');
  * @param {!IToolbox} toolbox The parent toolbox for the separator.
  * @constructor
  * @extends {ToolboxItem}
- * @implements {IToolboxItem}
  */
 const ToolboxSeparator = function(separatorDef, toolbox) {
   ToolboxSeparator.superClass_.constructor.call(this, separatorDef, toolbox);
diff --git a/tests/deps.js b/tests/deps.js
index 1e3476539..69bb647ad 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -170,7 +170,7 @@ goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Bloc
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.IToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem', 'Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.utils.string']);

From 136fc7e668577bacaad1d6203b19b069269eb806 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 4 Aug 2021 08:19:15 -0700
Subject: [PATCH 513/833] Migrate core/workspace_drag_surface_svg.js to
 goog.module syntax (#5263)

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

* Migrate core/workspace_drag_surface_svg.js to goog.module

* Migrate core/workspace_drag_surface_svg.js to named requires

* clang-format core/workspace_drag_surface_svg.js

* Re-wrap strings onto one line
---
 core/workspace_drag_surface_svg.js | 93 +++++++++++++++---------------
 tests/deps.js                      |  4 +-
 2 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/core/workspace_drag_surface_svg.js b/core/workspace_drag_surface_svg.js
index cef1f7921..8cffb37d6 100644
--- a/core/workspace_drag_surface_svg.js
+++ b/core/workspace_drag_surface_svg.js
@@ -14,13 +14,14 @@
 
 'use strict';
 
-goog.provide('Blockly.WorkspaceDragSurfaceSvg');
+goog.module('Blockly.WorkspaceDragSurfaceSvg');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Svg');
-
-goog.requireType('Blockly.utils.Coordinate');
+/* eslint-disable-next-line no-unused-vars */
+const Coordinate = goog.requireType('Blockly.utils.Coordinate');
+const Svg = goog.require('Blockly.utils.Svg');
+const dom = goog.require('Blockly.utils.dom');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -30,50 +31,50 @@ goog.requireType('Blockly.utils.Coordinate');
  * @param {!Element} container Containing element.
  * @constructor
  */
-Blockly.WorkspaceDragSurfaceSvg = function(container) {
+const WorkspaceDragSurfaceSvg = function(container) {
   this.container_ = container;
   this.createDom();
 };
 
 /**
- * The SVG drag surface. Set once by Blockly.WorkspaceDragSurfaceSvg.createDom.
+ * The SVG drag surface. Set once by WorkspaceDragSurfaceSvg.createDom.
  * @type {SVGElement}
  * @private
  */
-Blockly.WorkspaceDragSurfaceSvg.prototype.SVG_ = null;
+WorkspaceDragSurfaceSvg.prototype.SVG_ = null;
 
 /**
  * Containing HTML element; parent of the workspace and the drag surface.
  * @type {Element}
  * @private
  */
-Blockly.WorkspaceDragSurfaceSvg.prototype.container_ = null;
+WorkspaceDragSurfaceSvg.prototype.container_ = null;
 
 /**
  * Create the drag surface and inject it into the container.
  */
-Blockly.WorkspaceDragSurfaceSvg.prototype.createDom = function() {
+WorkspaceDragSurfaceSvg.prototype.createDom = function() {
   if (this.SVG_) {
     return;  // Already created.
   }
 
   /**
-  * Dom structure when the workspace is being dragged. If there is no drag in
-  * progress, the SVG is empty and display: none.
-  * <svg class="blocklyWsDragSurface" style=transform:translate3d(...)>
-  *   <g class="blocklyBlockCanvas"></g>
-  *   <g class="blocklyBubbleCanvas">/g>
-  * </svg>
-  */
-  this.SVG_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.SVG,
-      {
-        'xmlns': Blockly.utils.dom.SVG_NS,
-        'xmlns:html': Blockly.utils.dom.HTML_NS,
-        'xmlns:xlink': Blockly.utils.dom.XLINK_NS,
+   * Dom structure when the workspace is being dragged. If there is no drag in
+   * progress, the SVG is empty and display: none.
+   * <svg class="blocklyWsDragSurface" style=transform:translate3d(...)>
+   *   <g class="blocklyBlockCanvas"></g>
+   *   <g class="blocklyBubbleCanvas">/g>
+   * </svg>
+   */
+  this.SVG_ = dom.createSvgElement(
+      Svg.SVG, {
+        'xmlns': dom.SVG_NS,
+        'xmlns:html': dom.HTML_NS,
+        'xmlns:xlink': dom.XLINK_NS,
         'version': '1.1',
         'class': 'blocklyWsDragSurface blocklyOverflowVisible'
-      }, null);
+      },
+      null);
   this.container_.appendChild(this.SVG_);
 };
 
@@ -86,25 +87,25 @@ Blockly.WorkspaceDragSurfaceSvg.prototype.createDom = function() {
  * @param {number} y Y translation for the entire surface
  * @package
  */
-Blockly.WorkspaceDragSurfaceSvg.prototype.translateSurface = function(x, y) {
+WorkspaceDragSurfaceSvg.prototype.translateSurface = function(x, y) {
   // This is a work-around to prevent a the blocks from rendering
   // fuzzy while they are being moved on the drag surface.
-  var fixedX = x.toFixed(0);
-  var fixedY = y.toFixed(0);
+  const fixedX = x.toFixed(0);
+  const fixedY = y.toFixed(0);
 
   this.SVG_.style.display = 'block';
-  Blockly.utils.dom.setCssTransform(
+  dom.setCssTransform(
       this.SVG_, 'translate3d(' + fixedX + 'px, ' + fixedY + 'px, 0)');
 };
 
 /**
  * Reports the surface translation in scaled workspace coordinates.
  * Use this when finishing a drag to return blocks to the correct position.
- * @return {!Blockly.utils.Coordinate} Current translation of the surface
+ * @return {!Coordinate} Current translation of the surface
  * @package
  */
-Blockly.WorkspaceDragSurfaceSvg.prototype.getSurfaceTranslation = function() {
-  return Blockly.utils.getRelativeXY(/** @type {!SVGElement} */ (this.SVG_));
+WorkspaceDragSurfaceSvg.prototype.getSurfaceTranslation = function() {
+  return utils.getRelativeXY(/** @type {!SVGElement} */ (this.SVG_));
 };
 
 /**
@@ -114,36 +115,36 @@ Blockly.WorkspaceDragSurfaceSvg.prototype.getSurfaceTranslation = function() {
  *     into.
  * @package
  */
-Blockly.WorkspaceDragSurfaceSvg.prototype.clearAndHide = function(newSurface) {
+WorkspaceDragSurfaceSvg.prototype.clearAndHide = function(newSurface) {
   if (!newSurface) {
-    throw Error('Couldn\'t clear and hide the drag surface: missing ' +
-        'new surface.');
+    throw Error(
+        'Couldn\'t clear and hide the drag surface: missing new surface.');
   }
-  var blockCanvas = /** @type {!Element} */ (this.SVG_.childNodes[0]);
-  var bubbleCanvas = /** @type {!Element} */ (this.SVG_.childNodes[1]);
+  const blockCanvas = /** @type {!Element} */ (this.SVG_.childNodes[0]);
+  const bubbleCanvas = /** @type {!Element} */ (this.SVG_.childNodes[1]);
   if (!blockCanvas || !bubbleCanvas ||
-      !Blockly.utils.dom.hasClass(blockCanvas, 'blocklyBlockCanvas') ||
-      !Blockly.utils.dom.hasClass(bubbleCanvas, 'blocklyBubbleCanvas')) {
-    throw Error('Couldn\'t clear and hide the drag surface. ' +
-        'A node was missing.');
+      !dom.hasClass(blockCanvas, 'blocklyBlockCanvas') ||
+      !dom.hasClass(bubbleCanvas, 'blocklyBubbleCanvas')) {
+    throw Error(
+        'Couldn\'t clear and hide the drag surface. A node was missing.');
   }
 
   // If there is a previous sibling, put the blockCanvas back right afterwards,
   // otherwise insert it as the first child node in newSurface.
   if (this.previousSibling_ != null) {
-    Blockly.utils.dom.insertAfter(blockCanvas, this.previousSibling_);
+    dom.insertAfter(blockCanvas, this.previousSibling_);
   } else {
     newSurface.insertBefore(blockCanvas, newSurface.firstChild);
   }
 
   // Reattach the bubble canvas after the blockCanvas.
-  Blockly.utils.dom.insertAfter(bubbleCanvas, blockCanvas);
+  dom.insertAfter(bubbleCanvas, blockCanvas);
   // Hide the drag surface.
   this.SVG_.style.display = 'none';
   if (this.SVG_.childNodes.length) {
     throw Error('Drag surface was not cleared.');
   }
-  Blockly.utils.dom.setCssTransform(this.SVG_, '');
+  dom.setCssTransform(this.SVG_, '');
   this.previousSibling_ = null;
 };
 
@@ -160,7 +161,7 @@ Blockly.WorkspaceDragSurfaceSvg.prototype.clearAndHide = function(newSurface) {
  * @param {number} scale The scale of the workspace being dragged.
  * @package
  */
-Blockly.WorkspaceDragSurfaceSvg.prototype.setContentsAndShow = function(
+WorkspaceDragSurfaceSvg.prototype.setContentsAndShow = function(
     blockCanvas, bubbleCanvas, previousSibling, width, height, scale) {
   if (this.SVG_.childNodes.length) {
     throw Error('Already dragging a block.');
@@ -176,3 +177,5 @@ Blockly.WorkspaceDragSurfaceSvg.prototype.setContentsAndShow = function(
   this.SVG_.appendChild(bubbleCanvas);
   this.SVG_.style.display = 'block';
 };
+
+exports = WorkspaceDragSurfaceSvg;
diff --git a/tests/deps.js b/tests/deps.js
index 69bb647ad..8cccc9ea1 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -208,9 +208,9 @@ goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.C
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICopyable', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);

From 623e901b1c35039d82e277c3629b1c22a6d2f152 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 4 Aug 2021 08:23:38 -0700
Subject: [PATCH 514/833] Migrate core/events/events_trashcan_open.js to
 goog.module syntax (#5277)

* Migrate core/events/events_trashcan_open.js to ES6 const/let

* Migrate core/events/events_trashcan_open.js to goog.module

* Migrate core/events/events_trashcan_open.js to named requires

* clang-format core/events/events_trashcan_open.js
---
 core/events/events_trashcan_open.js | 34 +++++++++++++++--------------
 tests/deps.js                       |  2 +-
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/core/events/events_trashcan_open.js b/core/events/events_trashcan_open.js
index ab388d909..6f5318213 100644
--- a/core/events/events_trashcan_open.js
+++ b/core/events/events_trashcan_open.js
@@ -10,12 +10,13 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.TrashcanOpen');
+goog.module('Blockly.Events.TrashcanOpen');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
@@ -24,11 +25,11 @@ goog.require('Blockly.utils.object');
  *    opening). Undefined for a blank event.
  * @param {string=} opt_workspaceId The workspace identifier for this event.
  *    Undefined for a blank event.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @constructor
  */
-Blockly.Events.TrashcanOpen = function(opt_isOpen, opt_workspaceId) {
-  Blockly.Events.TrashcanOpen.superClass_.constructor.call(this, opt_workspaceId);
+const TrashcanOpen = function(opt_isOpen, opt_workspaceId) {
+  TrashcanOpen.superClass_.constructor.call(this, opt_workspaceId);
 
   /**
    * Whether the trashcan flyout is opening (false if closing).
@@ -36,20 +37,20 @@ Blockly.Events.TrashcanOpen = function(opt_isOpen, opt_workspaceId) {
    */
   this.isOpen = opt_isOpen;
 };
-Blockly.utils.object.inherits(Blockly.Events.TrashcanOpen, Blockly.Events.UiBase);
+object.inherits(TrashcanOpen, UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.TrashcanOpen.prototype.type = Blockly.Events.TRASHCAN_OPEN;
+TrashcanOpen.prototype.type = Events.TRASHCAN_OPEN;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.TrashcanOpen.prototype.toJson = function() {
-  var json = Blockly.Events.TrashcanOpen.superClass_.toJson.call(this);
+TrashcanOpen.prototype.toJson = function() {
+  const json = TrashcanOpen.superClass_.toJson.call(this);
   json['isOpen'] = this.isOpen;
   return json;
 };
@@ -58,10 +59,11 @@ Blockly.Events.TrashcanOpen.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.TrashcanOpen.prototype.fromJson = function(json) {
-  Blockly.Events.TrashcanOpen.superClass_.fromJson.call(this, json);
+TrashcanOpen.prototype.fromJson = function(json) {
+  TrashcanOpen.superClass_.fromJson.call(this, json);
   this.isOpen = json['isOpen'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.TRASHCAN_OPEN, Blockly.Events.TrashcanOpen);
+registry.register(registry.Type.EVENT, Events.TRASHCAN_OPEN, TrashcanOpen);
+
+exports = TrashcanOpen;
diff --git a/tests/deps.js b/tests/deps.js
index 8cccc9ea1..e379b9add 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -43,7 +43,7 @@ goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.M
 goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/variable_events.js', ['Blockly.Events.VarBase', 'Blockly.Events.VarCreate', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);

From 18efccc2f6e101e87b78fb12547e9fc8b6cec3fa Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 4 Aug 2021 08:25:07 -0700
Subject: [PATCH 515/833] Migrate core/events/events_bubble_open.js to
 goog.module syntax (#5285)

* Migrate core/events/events_bubble_open.js to ES6 const/let

* Migrate core/events/events_bubble_open.js to goog.module

* Migrate core/events/events_bubble_open.js to named requires
---
 core/events/events_bubble_open.js | 45 ++++++++++++++++---------------
 tests/deps.js                     |  2 +-
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/core/events/events_bubble_open.js b/core/events/events_bubble_open.js
index 7d3fbff2d..1e177f33e 100644
--- a/core/events/events_bubble_open.js
+++ b/core/events/events_bubble_open.js
@@ -10,30 +10,32 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.BubbleOpen');
+goog.module('Blockly.Events.BubbleOpen');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
  * Class for a bubble open event.
- * @param {Blockly.BlockSvg} opt_block The associated block. Undefined for a
+ * @param {BlockSvg} opt_block The associated block. Undefined for a
  *    blank event.
  * @param {boolean=} opt_isOpen Whether the bubble is opening (false if
  *    closing). Undefined for a blank event.
- * @param {string=} opt_bubbleType The type of bubble. One of 'mutator', 'comment'
+ * @param {string=} opt_bubbleType The type of bubble. One of 'mutator',
+ *     'comment'
  *    or 'warning'. Undefined for a blank event.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @constructor
  */
-Blockly.Events.BubbleOpen = function(opt_block, opt_isOpen, opt_bubbleType) {
-  var workspaceId = opt_block ? opt_block.workspace.id : undefined;
-  Blockly.Events.BubbleOpen.superClass_.constructor.call(this, workspaceId);
+const BubbleOpen = function(opt_block, opt_isOpen, opt_bubbleType) {
+  const workspaceId = opt_block ? opt_block.workspace.id : undefined;
+  BubbleOpen.superClass_.constructor.call(this, workspaceId);
   this.blockId = opt_block ? opt_block.id : null;
 
   /**
@@ -48,20 +50,20 @@ Blockly.Events.BubbleOpen = function(opt_block, opt_isOpen, opt_bubbleType) {
    */
   this.bubbleType = opt_bubbleType;
 };
-Blockly.utils.object.inherits(Blockly.Events.BubbleOpen, Blockly.Events.UiBase);
+object.inherits(BubbleOpen, UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.BubbleOpen.prototype.type = Blockly.Events.BUBBLE_OPEN;
+BubbleOpen.prototype.type = Events.BUBBLE_OPEN;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.BubbleOpen.prototype.toJson = function() {
-  var json = Blockly.Events.BubbleOpen.superClass_.toJson.call(this);
+BubbleOpen.prototype.toJson = function() {
+  const json = BubbleOpen.superClass_.toJson.call(this);
   json['isOpen'] = this.isOpen;
   json['bubbleType'] = this.bubbleType;
   json['blockId'] = this.blockId;
@@ -72,12 +74,13 @@ Blockly.Events.BubbleOpen.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.BubbleOpen.prototype.fromJson = function(json) {
-  Blockly.Events.BubbleOpen.superClass_.fromJson.call(this, json);
+BubbleOpen.prototype.fromJson = function(json) {
+  BubbleOpen.superClass_.fromJson.call(this, json);
   this.isOpen = json['isOpen'];
   this.bubbleType = json['bubbleType'];
   this.blockId = json['blockId'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.BUBBLE_OPEN, Blockly.Events.BubbleOpen);
+registry.register(registry.Type.EVENT, Events.BUBBLE_OPEN, BubbleOpen);
+
+exports = BubbleOpen;
diff --git a/tests/deps.js b/tests/deps.js
index e379b9add..e77cd3f94 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -37,7 +37,7 @@ goog.addDependency('../../core/events/block_events.js', ['Blockly.Events.BlockBa
 goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils']);
 goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events']);
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 8eda99ea34856ef64225ad23162b3d473e9e1f9a Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:26:21 -0700
Subject: [PATCH 516/833] Migrate core/renderers/common/marker_svg.js to ES6
 const/let

---
 core/renderers/common/marker_svg.js | 99 +++++++++++++++--------------
 1 file changed, 51 insertions(+), 48 deletions(-)

diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js
index 36d12b119..c8232d235 100644
--- a/core/renderers/common/marker_svg.js
+++ b/core/renderers/common/marker_svg.js
@@ -75,7 +75,7 @@ Blockly.blockRendering.MarkerSvg = function(workspace, constants, marker) {
    */
   this.currentMarkerSvg = null;
 
-  var defaultColour = this.isCursor() ? this.constants_.CURSOR_COLOUR :
+  const defaultColour = this.isCursor() ? this.constants_.CURSOR_COLOUR :
       this.constants_.MARKER_COLOUR;
 
   /**
@@ -135,7 +135,7 @@ Blockly.blockRendering.MarkerSvg.prototype.isCursor = function() {
  * @package
  */
 Blockly.blockRendering.MarkerSvg.prototype.createDom = function() {
-  var className = this.isCursor() ?
+  const className = this.isCursor() ?
       Blockly.blockRendering.MarkerSvg.CURSOR_CLASS :
       Blockly.blockRendering.MarkerSvg.MARKER_CLASS;
 
@@ -182,8 +182,8 @@ Blockly.blockRendering.MarkerSvg.prototype.draw = function(oldNode, curNode) {
 
   this.constants_ = this.workspace_.getRenderer().getConstants();
 
-  var defaultColour = this.isCursor() ? this.constants_.CURSOR_COLOUR :
-    this.constants_.MARKER_COLOUR;
+  const defaultColour = this.isCursor() ? this.constants_.CURSOR_COLOUR :
+      this.constants_.MARKER_COLOUR;
   this.colour_ = this.marker_.colour || defaultColour;
   this.applyColour_(curNode);
 
@@ -192,7 +192,7 @@ Blockly.blockRendering.MarkerSvg.prototype.draw = function(oldNode, curNode) {
   this.fireMarkerEvent_(oldNode, curNode);
 
   // Ensures the marker will be visible immediately after the move.
-  var animate = this.currentMarkerSvg.childNodes[0];
+  const animate = this.currentMarkerSvg.childNodes[0];
   if (animate !== undefined) {
     animate.beginElement && animate.beginElement();
   }
@@ -205,9 +205,9 @@ Blockly.blockRendering.MarkerSvg.prototype.draw = function(oldNode, curNode) {
  * @protected
  */
 Blockly.blockRendering.MarkerSvg.prototype.showAtLocation_ = function(curNode) {
-  var curNodeAsConnection =
-    /** @type {!Blockly.Connection} */ (curNode.getLocation());
-  var connectionType = curNodeAsConnection.type;
+  const curNodeAsConnection =
+      /** @type {!Blockly.Connection} */ (curNode.getLocation());
+  const connectionType = curNodeAsConnection.type;
   if (curNode.getType() == Blockly.ASTNode.types.BLOCK) {
     this.showWithBlock_(curNode);
   } else if (curNode.getType() == Blockly.ASTNode.types.OUTPUT) {
@@ -239,17 +239,18 @@ Blockly.blockRendering.MarkerSvg.prototype.showAtLocation_ = function(curNode) {
  */
 Blockly.blockRendering.MarkerSvg.prototype.showWithBlockPrevOutput_ = function(
     curNode) {
-  var block = /** @type {!Blockly.BlockSvg} */ (curNode.getSourceBlock());
-  var width = block.width;
-  var height = block.height;
-  var markerHeight = height * Blockly.blockRendering.MarkerSvg.HEIGHT_MULTIPLIER;
-  var markerOffset = this.constants_.CURSOR_BLOCK_PADDING;
+  const block = /** @type {!Blockly.BlockSvg} */ (curNode.getSourceBlock());
+  const width = block.width;
+  const height = block.height;
+  const markerHeight = height
+      * Blockly.blockRendering.MarkerSvg.HEIGHT_MULTIPLIER;
+  const markerOffset = this.constants_.CURSOR_BLOCK_PADDING;
 
   if (block.previousConnection) {
-    var connectionShape = this.constants_.shapeFor(block.previousConnection);
+    let connectionShape = this.constants_.shapeFor(block.previousConnection);
     this.positionPrevious_(width, markerOffset, markerHeight, connectionShape);
   } else if (block.outputConnection) {
-    var connectionShape = this.constants_.shapeFor(block.outputConnection);
+    let connectionShape = this.constants_.shapeFor(block.outputConnection);
     this.positionOutput_(width, height, connectionShape);
   } else {
     this.positionBlock_(width, markerOffset, markerHeight);
@@ -294,9 +295,9 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithOutput_ = function(curNode) {
  */
 Blockly.blockRendering.MarkerSvg.prototype.showWithCoordinates_ = function(
     curNode) {
-  var wsCoordinate = curNode.getWsCoordinate();
-  var x = wsCoordinate.x;
-  var y = wsCoordinate.y;
+  const wsCoordinate = curNode.getWsCoordinate();
+  let x = wsCoordinate.x;
+  const y = wsCoordinate.y;
 
   if (this.workspace_.RTL) {
     x -= this.constants_.CURSOR_WS_WIDTH;
@@ -314,9 +315,9 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithCoordinates_ = function(
  * @protected
  */
 Blockly.blockRendering.MarkerSvg.prototype.showWithField_ = function(curNode) {
-  var field = /** @type {Blockly.Field} */ (curNode.getLocation());
-  var width = field.getSize().width;
-  var height = field.getSize().height;
+  const field = /** @type {Blockly.Field} */ (curNode.getLocation());
+  const width = field.getSize().width;
+  const height = field.getSize().height;
 
   this.positionRect_(0, 0, width, height);
   this.setParent_(field);
@@ -330,9 +331,9 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithField_ = function(curNode) {
  * @protected
  */
 Blockly.blockRendering.MarkerSvg.prototype.showWithInput_ = function(curNode) {
-  var connection = /** @type {Blockly.RenderedConnection} */
+  const connection = /** @type {Blockly.RenderedConnection} */
       (curNode.getLocation());
-  var sourceBlock = /** @type {!Blockly.BlockSvg} */ (connection.getSourceBlock());
+  const sourceBlock = /** @type {!Blockly.BlockSvg} */ (connection.getSourceBlock());
 
   this.positionInput_(connection);
   this.setParent_(sourceBlock);
@@ -347,13 +348,13 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithInput_ = function(curNode) {
  * @protected
  */
 Blockly.blockRendering.MarkerSvg.prototype.showWithNext_ = function(curNode) {
-  var connection =
-    /** @type {!Blockly.RenderedConnection} */ (curNode.getLocation());
-  var targetBlock =
-    /** @type {Blockly.BlockSvg} */ (connection.getSourceBlock());
-  var x = 0;
-  var y = connection.getOffsetInBlock().y;
-  var width = targetBlock.getHeightWidth().width;
+  const connection =
+      /** @type {!Blockly.RenderedConnection} */ (curNode.getLocation());
+  const targetBlock =
+      /** @type {Blockly.BlockSvg} */ (connection.getSourceBlock());
+  let x = 0;
+  const y = connection.getOffsetInBlock().y;
+  const width = targetBlock.getHeightWidth().width;
   if (this.workspace_.RTL) {
     x = -width;
   }
@@ -369,21 +370,21 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithNext_ = function(curNode) {
  * @protected
  */
 Blockly.blockRendering.MarkerSvg.prototype.showWithStack_ = function(curNode) {
-  var block = /** @type {Blockly.BlockSvg} */ (curNode.getLocation());
+  const block = /** @type {Blockly.BlockSvg} */ (curNode.getLocation());
 
   // Gets the height and width of entire stack.
-  var heightWidth = block.getHeightWidth();
+  const heightWidth = block.getHeightWidth();
 
   // Add padding so that being on a stack looks different than being on a block.
-  var width = heightWidth.width + this.constants_.CURSOR_STACK_PADDING;
-  var height = heightWidth.height + this.constants_.CURSOR_STACK_PADDING;
+  const width = heightWidth.width + this.constants_.CURSOR_STACK_PADDING;
+  const height = heightWidth.height + this.constants_.CURSOR_STACK_PADDING;
 
   // Shift the rectangle slightly to upper left so padding is equal on all sides.
-  var xPadding = -this.constants_.CURSOR_STACK_PADDING / 2;
-  var yPadding = -this.constants_.CURSOR_STACK_PADDING / 2;
+  const xPadding = -this.constants_.CURSOR_STACK_PADDING / 2;
+  const yPadding = -this.constants_.CURSOR_STACK_PADDING / 2;
 
-  var x = xPadding;
-  var y = yPadding;
+  let x = xPadding;
+  const y = yPadding;
 
   if (this.workspace_.RTL) {
     x = -(width + xPadding);
@@ -416,7 +417,8 @@ Blockly.blockRendering.MarkerSvg.prototype.showCurrent_ = function() {
  */
 Blockly.blockRendering.MarkerSvg.prototype.positionBlock_ = function(
     width, markerOffset, markerHeight) {
-  var markerPath = Blockly.utils.svgPaths.moveBy(-markerOffset, markerHeight) +
+  const markerPath = Blockly.utils.svgPaths.moveBy(-markerOffset, markerHeight)
+      +
       Blockly.utils.svgPaths.lineOnAxis('V', -markerOffset) +
       Blockly.utils.svgPaths.lineOnAxis('H', width + markerOffset * 2) +
       Blockly.utils.svgPaths.lineOnAxis('V', markerHeight);
@@ -436,10 +438,10 @@ Blockly.blockRendering.MarkerSvg.prototype.positionBlock_ = function(
  */
 Blockly.blockRendering.MarkerSvg.prototype.positionInput_ = function(
     connection) {
-  var x = connection.getOffsetInBlock().x;
-  var y = connection.getOffsetInBlock().y;
+  const x = connection.getOffsetInBlock().x;
+  const y = connection.getOffsetInBlock().y;
 
-  var path = Blockly.utils.svgPaths.moveTo(0, 0) +
+  const path = Blockly.utils.svgPaths.moveTo(0, 0) +
       this.constants_.shapeFor(connection).pathDown;
 
   this.markerInput_.setAttribute('d', path);
@@ -475,7 +477,7 @@ Blockly.blockRendering.MarkerSvg.prototype.positionLine_ = function(
  */
 Blockly.blockRendering.MarkerSvg.prototype.positionOutput_ = function(
     width, height, connectionShape) {
-  var markerPath = Blockly.utils.svgPaths.moveBy(width, 0) +
+  const markerPath = Blockly.utils.svgPaths.moveBy(width, 0) +
       Blockly.utils.svgPaths.lineOnAxis(
           'h', -(width - connectionShape.width)) +
       Blockly.utils.svgPaths.lineOnAxis(
@@ -502,7 +504,8 @@ Blockly.blockRendering.MarkerSvg.prototype.positionOutput_ = function(
  */
 Blockly.blockRendering.MarkerSvg.prototype.positionPrevious_ = function(
     width, markerOffset, markerHeight, connectionShape) {
-  var markerPath = Blockly.utils.svgPaths.moveBy(-markerOffset, markerHeight) +
+  const markerPath = Blockly.utils.svgPaths.moveBy(-markerOffset, markerHeight)
+      +
       Blockly.utils.svgPaths.lineOnAxis('V', -markerOffset) +
       Blockly.utils.svgPaths.lineOnAxis(
           'H', this.constants_.NOTCH_OFFSET_LEFT) +
@@ -563,8 +566,8 @@ Blockly.blockRendering.MarkerSvg.prototype.hide = function() {
  */
 Blockly.blockRendering.MarkerSvg.prototype.fireMarkerEvent_ = function(
     oldNode, curNode) {
-  var curBlock = curNode.getSourceBlock();
-  var event = new (Blockly.Events.get(Blockly.Events.MARKER_MOVE))(
+  const curBlock = curNode.getSourceBlock();
+  const event = new (Blockly.Events.get(Blockly.Events.MARKER_MOVE))(
       curBlock, this.isCursor(), oldNode, curNode);
   Blockly.Events.fire(event);
 };
@@ -651,7 +654,7 @@ Blockly.blockRendering.MarkerSvg.prototype.createDomInternal_ = function() {
 
   // Markers and stack markers don't blink.
   if (this.isCursor()) {
-    var blinkProperties = this.getBlinkProperties_();
+    const blinkProperties = this.getBlinkProperties_();
     Blockly.utils.dom.createSvgElement(
         Blockly.utils.Svg.ANIMATE, blinkProperties,
         this.markerSvgLine_);
@@ -680,7 +683,7 @@ Blockly.blockRendering.MarkerSvg.prototype.applyColour_ = function(_curNode) {
   this.markerBlock_.setAttribute('stroke', this.colour_);
 
   if (this.isCursor()) {
-    var values = this.colour_ + ';transparent;transparent;';
+    const values = this.colour_ + ';transparent;transparent;';
     this.markerSvgLine_.firstChild.setAttribute('values', values);
     this.markerInput_.firstChild.setAttribute('values', values);
     this.markerBlock_.firstChild.setAttribute('values', values);

From 7aa382154c18e7a5c5c8533568e857b10a265028 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:26:30 -0700
Subject: [PATCH 517/833] Migrate core/renderers/common/marker_svg.js to
 goog.module

---
 core/renderers/common/marker_svg.js | 80 +++++++++++++++--------------
 tests/deps.js                       |  2 +-
 2 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js
index c8232d235..12982168d 100644
--- a/core/renderers/common/marker_svg.js
+++ b/core/renderers/common/marker_svg.js
@@ -11,7 +11,8 @@
 'use strict';
 
 
-goog.provide('Blockly.blockRendering.MarkerSvg');
+goog.module('Blockly.blockRendering.MarkerSvg');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.ASTNode');
 goog.require('Blockly.connectionTypes');
@@ -20,6 +21,7 @@ goog.require('Blockly.Events');
 goog.require('Blockly.Events.MarkerMove');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.Svg');
+goog.require('Blockly.utils.svgPaths');
 
 goog.requireType('Blockly.blockRendering.ConstantProvider');
 goog.requireType('Blockly.BlockSvg');
@@ -39,7 +41,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @param {!Blockly.Marker} marker The marker to draw.
  * @constructor
  */
-Blockly.blockRendering.MarkerSvg = function(workspace, constants, marker) {
+const MarkerSvg = function(workspace, constants, marker) {
   /**
    * The workspace the marker belongs to.
    * @type {!Blockly.WorkspaceSvg}
@@ -89,26 +91,26 @@ Blockly.blockRendering.MarkerSvg = function(workspace, constants, marker) {
  * The name of the CSS class for a cursor.
  * @const {string}
  */
-Blockly.blockRendering.MarkerSvg.CURSOR_CLASS = 'blocklyCursor';
+MarkerSvg.CURSOR_CLASS = 'blocklyCursor';
 
 /**
  * The name of the CSS class for a marker.
  * @const {string}
  */
-Blockly.blockRendering.MarkerSvg.MARKER_CLASS = 'blocklyMarker';
+MarkerSvg.MARKER_CLASS = 'blocklyMarker';
 
 /**
  * What we multiply the height by to get the height of the marker.
  * Only used for the block and block connections.
  * @const {number}
  */
-Blockly.blockRendering.MarkerSvg.HEIGHT_MULTIPLIER = 3 / 4;
+MarkerSvg.HEIGHT_MULTIPLIER = 3 / 4;
 
 /**
  * Return the root node of the SVG or null if none exists.
  * @return {SVGElement} The root SVG node.
  */
-Blockly.blockRendering.MarkerSvg.prototype.getSvgRoot = function() {
+MarkerSvg.prototype.getSvgRoot = function() {
   return this.svgGroup_;
 };
 
@@ -116,7 +118,7 @@ Blockly.blockRendering.MarkerSvg.prototype.getSvgRoot = function() {
  * Get the marker.
  * @return {!Blockly.Marker} The marker to draw for.
  */
-Blockly.blockRendering.MarkerSvg.prototype.getMarker = function() {
+MarkerSvg.prototype.getMarker = function() {
   return this.marker_;
 };
 
@@ -125,7 +127,7 @@ Blockly.blockRendering.MarkerSvg.prototype.getMarker = function() {
  * A cursor is drawn as a flashing line. A marker is drawn as a solid line.
  * @return {boolean} True if the marker is a cursor, false otherwise.
  */
-Blockly.blockRendering.MarkerSvg.prototype.isCursor = function() {
+MarkerSvg.prototype.isCursor = function() {
   return this.marker_.type == 'cursor';
 };
 
@@ -134,10 +136,10 @@ Blockly.blockRendering.MarkerSvg.prototype.isCursor = function() {
  * @return {!SVGElement} The marker controls SVG group.
  * @package
  */
-Blockly.blockRendering.MarkerSvg.prototype.createDom = function() {
+MarkerSvg.prototype.createDom = function() {
   const className = this.isCursor() ?
-      Blockly.blockRendering.MarkerSvg.CURSOR_CLASS :
-      Blockly.blockRendering.MarkerSvg.MARKER_CLASS;
+      MarkerSvg.CURSOR_CLASS :
+      MarkerSvg.MARKER_CLASS;
 
   this.svgGroup_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.G, {
@@ -154,7 +156,7 @@ Blockly.blockRendering.MarkerSvg.prototype.createDom = function() {
  *     block that the marker SVG element should be attached to.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.setParent_ = function(newParent) {
+MarkerSvg.prototype.setParent_ = function(newParent) {
   if (!this.isCursor()) {
     if (this.parent_) {
       this.parent_.setMarkerSvg(null);
@@ -174,7 +176,7 @@ Blockly.blockRendering.MarkerSvg.prototype.setParent_ = function(newParent) {
  * @param {Blockly.ASTNode} oldNode The previous node the marker was on or null.
  * @param {Blockly.ASTNode} curNode The node that we want to draw the marker for.
  */
-Blockly.blockRendering.MarkerSvg.prototype.draw = function(oldNode, curNode) {
+MarkerSvg.prototype.draw = function(oldNode, curNode) {
   if (!curNode) {
     this.hide();
     return;
@@ -204,7 +206,7 @@ Blockly.blockRendering.MarkerSvg.prototype.draw = function(oldNode, curNode) {
  * @param {!Blockly.ASTNode} curNode The node that we want to draw the marker for.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.showAtLocation_ = function(curNode) {
+MarkerSvg.prototype.showAtLocation_ = function(curNode) {
   const curNodeAsConnection =
       /** @type {!Blockly.Connection} */ (curNode.getLocation());
   const connectionType = curNodeAsConnection.type;
@@ -237,13 +239,13 @@ Blockly.blockRendering.MarkerSvg.prototype.showAtLocation_ = function(curNode) {
  * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
  * @private
  */
-Blockly.blockRendering.MarkerSvg.prototype.showWithBlockPrevOutput_ = function(
+MarkerSvg.prototype.showWithBlockPrevOutput_ = function(
     curNode) {
   const block = /** @type {!Blockly.BlockSvg} */ (curNode.getSourceBlock());
   const width = block.width;
   const height = block.height;
   const markerHeight = height
-      * Blockly.blockRendering.MarkerSvg.HEIGHT_MULTIPLIER;
+      * MarkerSvg.HEIGHT_MULTIPLIER;
   const markerOffset = this.constants_.CURSOR_BLOCK_PADDING;
 
   if (block.previousConnection) {
@@ -264,7 +266,7 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithBlockPrevOutput_ = function(
  * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.showWithBlock_ = function(curNode) {
+MarkerSvg.prototype.showWithBlock_ = function(curNode) {
   this.showWithBlockPrevOutput_(curNode);
 };
 
@@ -273,7 +275,7 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithBlock_ = function(curNode) {
  * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.showWithPrevious_ = function(
+MarkerSvg.prototype.showWithPrevious_ = function(
     curNode) {
   this.showWithBlockPrevOutput_(curNode);
 };
@@ -283,7 +285,7 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithPrevious_ = function(
  * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.showWithOutput_ = function(curNode) {
+MarkerSvg.prototype.showWithOutput_ = function(curNode) {
   this.showWithBlockPrevOutput_(curNode);
 };
 
@@ -293,7 +295,7 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithOutput_ = function(curNode) {
  * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.showWithCoordinates_ = function(
+MarkerSvg.prototype.showWithCoordinates_ = function(
     curNode) {
   const wsCoordinate = curNode.getWsCoordinate();
   let x = wsCoordinate.x;
@@ -314,7 +316,7 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithCoordinates_ = function(
  * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.showWithField_ = function(curNode) {
+MarkerSvg.prototype.showWithField_ = function(curNode) {
   const field = /** @type {Blockly.Field} */ (curNode.getLocation());
   const width = field.getSize().width;
   const height = field.getSize().height;
@@ -330,7 +332,7 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithField_ = function(curNode) {
  * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.showWithInput_ = function(curNode) {
+MarkerSvg.prototype.showWithInput_ = function(curNode) {
   const connection = /** @type {Blockly.RenderedConnection} */
       (curNode.getLocation());
   const sourceBlock = /** @type {!Blockly.BlockSvg} */ (connection.getSourceBlock());
@@ -347,7 +349,7 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithInput_ = function(curNode) {
  * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.showWithNext_ = function(curNode) {
+MarkerSvg.prototype.showWithNext_ = function(curNode) {
   const connection =
       /** @type {!Blockly.RenderedConnection} */ (curNode.getLocation());
   const targetBlock =
@@ -369,7 +371,7 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithNext_ = function(curNode) {
  * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.showWithStack_ = function(curNode) {
+MarkerSvg.prototype.showWithStack_ = function(curNode) {
   const block = /** @type {Blockly.BlockSvg} */ (curNode.getLocation());
 
   // Gets the height and width of entire stack.
@@ -398,7 +400,7 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithStack_ = function(curNode) {
  * Show the current marker.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.showCurrent_ = function() {
+MarkerSvg.prototype.showCurrent_ = function() {
   this.hide();
   this.currentMarkerSvg.style.display = '';
 };
@@ -415,7 +417,7 @@ Blockly.blockRendering.MarkerSvg.prototype.showCurrent_ = function() {
  * @param {number} markerHeight The height of the marker.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.positionBlock_ = function(
+MarkerSvg.prototype.positionBlock_ = function(
     width, markerOffset, markerHeight) {
   const markerPath = Blockly.utils.svgPaths.moveBy(-markerOffset, markerHeight)
       +
@@ -436,7 +438,7 @@ Blockly.blockRendering.MarkerSvg.prototype.positionBlock_ = function(
  *     marker around.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.positionInput_ = function(
+MarkerSvg.prototype.positionInput_ = function(
     connection) {
   const x = connection.getOffsetInBlock().x;
   const y = connection.getOffsetInBlock().y;
@@ -459,7 +461,7 @@ Blockly.blockRendering.MarkerSvg.prototype.positionInput_ = function(
  * @param {number} width The new width, in workspace units.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.positionLine_ = function(
+MarkerSvg.prototype.positionLine_ = function(
     x, y, width) {
   this.markerSvgLine_.setAttribute('x', x);
   this.markerSvgLine_.setAttribute('y', y);
@@ -475,7 +477,7 @@ Blockly.blockRendering.MarkerSvg.prototype.positionLine_ = function(
  * @param {!Object} connectionShape The shape object for the connection.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.positionOutput_ = function(
+MarkerSvg.prototype.positionOutput_ = function(
     width, height, connectionShape) {
   const markerPath = Blockly.utils.svgPaths.moveBy(width, 0) +
       Blockly.utils.svgPaths.lineOnAxis(
@@ -502,7 +504,7 @@ Blockly.blockRendering.MarkerSvg.prototype.positionOutput_ = function(
  * @param {!Object} connectionShape The shape object for the connection.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.positionPrevious_ = function(
+MarkerSvg.prototype.positionPrevious_ = function(
     width, markerOffset, markerHeight, connectionShape) {
   const markerPath = Blockly.utils.svgPaths.moveBy(-markerOffset, markerHeight)
       +
@@ -529,7 +531,7 @@ Blockly.blockRendering.MarkerSvg.prototype.positionPrevious_ = function(
  * @param {number} height The new height, in workspace units.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.positionRect_ = function(
+MarkerSvg.prototype.positionRect_ = function(
     x, y, width, height) {
   this.markerSvgRect_.setAttribute('x', x);
   this.markerSvgRect_.setAttribute('y', y);
@@ -543,14 +545,14 @@ Blockly.blockRendering.MarkerSvg.prototype.positionRect_ = function(
  * @param {!SVGElement} markerSvg The marker that we want to flip.
  * @private
  */
-Blockly.blockRendering.MarkerSvg.prototype.flipRtl_ = function(markerSvg) {
+MarkerSvg.prototype.flipRtl_ = function(markerSvg) {
   markerSvg.setAttribute('transform', 'scale(-1 1)');
 };
 
 /**
  * Hide the marker.
  */
-Blockly.blockRendering.MarkerSvg.prototype.hide = function() {
+MarkerSvg.prototype.hide = function() {
   this.markerSvgLine_.style.display = 'none';
   this.markerSvgRect_.style.display = 'none';
   this.markerInput_.style.display = 'none';
@@ -564,7 +566,7 @@ Blockly.blockRendering.MarkerSvg.prototype.hide = function() {
  * @param {!Blockly.ASTNode} curNode The new node the marker is currently on.
  * @private
  */
-Blockly.blockRendering.MarkerSvg.prototype.fireMarkerEvent_ = function(
+MarkerSvg.prototype.fireMarkerEvent_ = function(
     oldNode, curNode) {
   const curBlock = curNode.getSourceBlock();
   const event = new (Blockly.Events.get(Blockly.Events.MARKER_MOVE))(
@@ -577,7 +579,7 @@ Blockly.blockRendering.MarkerSvg.prototype.fireMarkerEvent_ = function(
  * @return {!Object} The object holding attributes to make the marker blink.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.getBlinkProperties_ = function() {
+MarkerSvg.prototype.getBlinkProperties_ = function() {
   return {
     'attributeType': 'XML',
     'attributeName': 'fill',
@@ -593,7 +595,7 @@ Blockly.blockRendering.MarkerSvg.prototype.getBlinkProperties_ = function() {
  * @return {Element} The SVG node created.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.createDomInternal_ = function() {
+MarkerSvg.prototype.createDomInternal_ = function() {
   /* This markup will be generated and added to the .svgGroup_:
   <g>
     <rect width="100" height="5">
@@ -676,7 +678,7 @@ Blockly.blockRendering.MarkerSvg.prototype.createDomInternal_ = function() {
  *    for.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.applyColour_ = function(_curNode) {
+MarkerSvg.prototype.applyColour_ = function(_curNode) {
   this.markerSvgLine_.setAttribute('fill', this.colour_);
   this.markerSvgRect_.setAttribute('stroke', this.colour_);
   this.markerInput_.setAttribute('fill', this.colour_);
@@ -693,8 +695,10 @@ Blockly.blockRendering.MarkerSvg.prototype.applyColour_ = function(_curNode) {
 /**
  * Dispose of this marker.
  */
-Blockly.blockRendering.MarkerSvg.prototype.dispose = function() {
+MarkerSvg.prototype.dispose = function() {
   if (this.svgGroup_) {
     Blockly.utils.dom.removeNode(this.svgGroup_);
   }
 };
+
+exports = MarkerSvg;
diff --git a/tests/deps.js b/tests/deps.js
index e77cd3f94..a596ec5f0 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -127,7 +127,7 @@ goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRen
 goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 3b43a19705e4a0dc799f3af0b2cf230e5502d64a Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:29:58 -0700
Subject: [PATCH 518/833] Migrate core/renderers/common/marker_svg.js named
 requires

---
 core/renderers/common/marker_svg.js | 191 ++++++++++++++--------------
 1 file changed, 99 insertions(+), 92 deletions(-)

diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js
index 12982168d..514785bd2 100644
--- a/core/renderers/common/marker_svg.js
+++ b/core/renderers/common/marker_svg.js
@@ -14,44 +14,51 @@
 goog.module('Blockly.blockRendering.MarkerSvg');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.ASTNode');
-goog.require('Blockly.connectionTypes');
-goog.require('Blockly.Events');
+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 Connection = goog.requireType('Blockly.Connection');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+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 */
+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');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.MarkerMove');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.svgPaths');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.Connection');
-goog.requireType('Blockly.Field');
-goog.requireType('Blockly.IASTNodeLocationSvg');
-goog.requireType('Blockly.Marker');
-goog.requireType('Blockly.RenderedConnection');
-goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
  * Class for a marker.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace the marker belongs to.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The constants for
+ * @param {!WorkspaceSvg} workspace The workspace the marker belongs to.
+ * @param {!ConstantProvider} constants The constants for
  *     the renderer.
- * @param {!Blockly.Marker} marker The marker to draw.
+ * @param {!Marker} marker The marker to draw.
  * @constructor
  */
 const MarkerSvg = function(workspace, constants, marker) {
   /**
    * The workspace the marker belongs to.
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @private
    */
   this.workspace_ = workspace;
 
   /**
    * The marker to draw.
-   * @type {!Blockly.Marker}
+   * @type {!Marker}
    * @private
    */
   this.marker_ = marker;
@@ -59,14 +66,14 @@ const MarkerSvg = function(workspace, constants, marker) {
   /**
    * The workspace, field, or block that the marker SVG element should be
    * attached to.
-   * @type {Blockly.IASTNodeLocationSvg}
+   * @type {IASTNodeLocationSvg}
    * @private
    */
   this.parent_ = null;
 
   /**
    * The constants necessary to draw the marker.
-   * @type {Blockly.blockRendering.ConstantProvider}
+   * @type {ConstantProvider}
    * @protected
    */
   this.constants_ = constants;
@@ -116,7 +123,7 @@ MarkerSvg.prototype.getSvgRoot = function() {
 
 /**
  * Get the marker.
- * @return {!Blockly.Marker} The marker to draw for.
+ * @return {!Marker} The marker to draw for.
  */
 MarkerSvg.prototype.getMarker = function() {
   return this.marker_;
@@ -141,8 +148,8 @@ MarkerSvg.prototype.createDom = function() {
       MarkerSvg.CURSOR_CLASS :
       MarkerSvg.MARKER_CLASS;
 
-  this.svgGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G, {
+  this.svgGroup_ = dom.createSvgElement(
+      Svg.G, {
         'class': className
       }, null);
 
@@ -152,7 +159,7 @@ MarkerSvg.prototype.createDom = function() {
 
 /**
  * Attaches the SVG root of the marker to the SVG group of the parent.
- * @param {!Blockly.IASTNodeLocationSvg} newParent The workspace, field, or
+ * @param {!IASTNodeLocationSvg} newParent The workspace, field, or
  *     block that the marker SVG element should be attached to.
  * @protected
  */
@@ -173,8 +180,8 @@ MarkerSvg.prototype.setParent_ = function(newParent) {
 
 /**
  * Update the marker.
- * @param {Blockly.ASTNode} oldNode The previous node the marker was on or null.
- * @param {Blockly.ASTNode} curNode The node that we want to draw the marker for.
+ * @param {ASTNode} oldNode The previous node the marker was on or null.
+ * @param {ASTNode} curNode The node that we want to draw the marker for.
  */
 MarkerSvg.prototype.draw = function(oldNode, curNode) {
   if (!curNode) {
@@ -203,28 +210,28 @@ MarkerSvg.prototype.draw = function(oldNode, curNode) {
 
 /**
  * Update the marker's visible state based on the type of curNode..
- * @param {!Blockly.ASTNode} curNode The node that we want to draw the marker for.
+ * @param {!ASTNode} curNode The node that we want to draw the marker for.
  * @protected
  */
 MarkerSvg.prototype.showAtLocation_ = function(curNode) {
   const curNodeAsConnection =
-      /** @type {!Blockly.Connection} */ (curNode.getLocation());
+      /** @type {!Connection} */ (curNode.getLocation());
   const connectionType = curNodeAsConnection.type;
-  if (curNode.getType() == Blockly.ASTNode.types.BLOCK) {
+  if (curNode.getType() == ASTNode.types.BLOCK) {
     this.showWithBlock_(curNode);
-  } else if (curNode.getType() == Blockly.ASTNode.types.OUTPUT) {
+  } else if (curNode.getType() == ASTNode.types.OUTPUT) {
     this.showWithOutput_(curNode);
-  } else if (connectionType == Blockly.connectionTypes.INPUT_VALUE) {
+  } else if (connectionType == connectionTypes.INPUT_VALUE) {
     this.showWithInput_(curNode);
-  } else if (connectionType == Blockly.connectionTypes.NEXT_STATEMENT) {
+  } else if (connectionType == connectionTypes.NEXT_STATEMENT) {
     this.showWithNext_(curNode);
-  } else if (curNode.getType() == Blockly.ASTNode.types.PREVIOUS) {
+  } else if (curNode.getType() == ASTNode.types.PREVIOUS) {
     this.showWithPrevious_(curNode);
-  } else if (curNode.getType() == Blockly.ASTNode.types.FIELD) {
+  } else if (curNode.getType() == ASTNode.types.FIELD) {
     this.showWithField_(curNode);
-  } else if (curNode.getType() == Blockly.ASTNode.types.WORKSPACE) {
+  } else if (curNode.getType() == ASTNode.types.WORKSPACE) {
     this.showWithCoordinates_(curNode);
-  } else if (curNode.getType() == Blockly.ASTNode.types.STACK) {
+  } else if (curNode.getType() == ASTNode.types.STACK) {
     this.showWithStack_(curNode);
   }
 };
@@ -236,12 +243,12 @@ MarkerSvg.prototype.showAtLocation_ = function(curNode) {
 /**
  * Show the marker as a combination of the previous connection and block,
  * the output connection and block, or just the block.
- * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
+ * @param {!ASTNode} curNode The node to draw the marker for.
  * @private
  */
 MarkerSvg.prototype.showWithBlockPrevOutput_ = function(
     curNode) {
-  const block = /** @type {!Blockly.BlockSvg} */ (curNode.getSourceBlock());
+  const block = /** @type {!BlockSvg} */ (curNode.getSourceBlock());
   const width = block.width;
   const height = block.height;
   const markerHeight = height
@@ -263,7 +270,7 @@ MarkerSvg.prototype.showWithBlockPrevOutput_ = function(
 
 /**
  * Position and display the marker for a block.
- * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
+ * @param {!ASTNode} curNode The node to draw the marker for.
  * @protected
  */
 MarkerSvg.prototype.showWithBlock_ = function(curNode) {
@@ -272,7 +279,7 @@ MarkerSvg.prototype.showWithBlock_ = function(curNode) {
 
 /**
  * Position and display the marker for a previous connection.
- * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
+ * @param {!ASTNode} curNode The node to draw the marker for.
  * @protected
  */
 MarkerSvg.prototype.showWithPrevious_ = function(
@@ -282,7 +289,7 @@ MarkerSvg.prototype.showWithPrevious_ = function(
 
 /**
  * Position and display the marker for an output connection.
- * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
+ * @param {!ASTNode} curNode The node to draw the marker for.
  * @protected
  */
 MarkerSvg.prototype.showWithOutput_ = function(curNode) {
@@ -292,7 +299,7 @@ MarkerSvg.prototype.showWithOutput_ = function(curNode) {
 /**
  * Position and display the marker for a workspace coordinate.
  * This is a horizontal line.
- * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
+ * @param {!ASTNode} curNode The node to draw the marker for.
  * @protected
  */
 MarkerSvg.prototype.showWithCoordinates_ = function(
@@ -313,11 +320,11 @@ MarkerSvg.prototype.showWithCoordinates_ = function(
 /**
  * Position and display the marker for a field.
  * This is a box around the field.
- * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
+ * @param {!ASTNode} curNode The node to draw the marker for.
  * @protected
  */
 MarkerSvg.prototype.showWithField_ = function(curNode) {
-  const field = /** @type {Blockly.Field} */ (curNode.getLocation());
+  const field = /** @type {Field} */ (curNode.getLocation());
   const width = field.getSize().width;
   const height = field.getSize().height;
 
@@ -329,13 +336,13 @@ MarkerSvg.prototype.showWithField_ = function(curNode) {
 /**
  * Position and display the marker for an input.
  * This is a puzzle piece.
- * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
+ * @param {!ASTNode} curNode The node to draw the marker for.
  * @protected
  */
 MarkerSvg.prototype.showWithInput_ = function(curNode) {
-  const connection = /** @type {Blockly.RenderedConnection} */
+  const connection = /** @type {RenderedConnection} */
       (curNode.getLocation());
-  const sourceBlock = /** @type {!Blockly.BlockSvg} */ (connection.getSourceBlock());
+  const sourceBlock = /** @type {!BlockSvg} */ (connection.getSourceBlock());
 
   this.positionInput_(connection);
   this.setParent_(sourceBlock);
@@ -346,14 +353,14 @@ MarkerSvg.prototype.showWithInput_ = function(curNode) {
 /**
  * Position and display the marker for a next connection.
  * This is a horizontal line.
- * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
+ * @param {!ASTNode} curNode The node to draw the marker for.
  * @protected
  */
 MarkerSvg.prototype.showWithNext_ = function(curNode) {
   const connection =
-      /** @type {!Blockly.RenderedConnection} */ (curNode.getLocation());
+      /** @type {!RenderedConnection} */ (curNode.getLocation());
   const targetBlock =
-      /** @type {Blockly.BlockSvg} */ (connection.getSourceBlock());
+      /** @type {BlockSvg} */ (connection.getSourceBlock());
   let x = 0;
   const y = connection.getOffsetInBlock().y;
   const width = targetBlock.getHeightWidth().width;
@@ -368,11 +375,11 @@ MarkerSvg.prototype.showWithNext_ = function(curNode) {
 /**
  * Position and display the marker for a stack.
  * This is a box with extra padding around the entire stack of blocks.
- * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
+ * @param {!ASTNode} curNode The node to draw the marker for.
  * @protected
  */
 MarkerSvg.prototype.showWithStack_ = function(curNode) {
-  const block = /** @type {Blockly.BlockSvg} */ (curNode.getLocation());
+  const block = /** @type {BlockSvg} */ (curNode.getLocation());
 
   // Gets the height and width of entire stack.
   const heightWidth = block.getHeightWidth();
@@ -419,11 +426,11 @@ MarkerSvg.prototype.showCurrent_ = function() {
  */
 MarkerSvg.prototype.positionBlock_ = function(
     width, markerOffset, markerHeight) {
-  const markerPath = Blockly.utils.svgPaths.moveBy(-markerOffset, markerHeight)
+  const markerPath = svgPaths.moveBy(-markerOffset, markerHeight)
       +
-      Blockly.utils.svgPaths.lineOnAxis('V', -markerOffset) +
-      Blockly.utils.svgPaths.lineOnAxis('H', width + markerOffset * 2) +
-      Blockly.utils.svgPaths.lineOnAxis('V', markerHeight);
+      svgPaths.lineOnAxis('V', -markerOffset) +
+      svgPaths.lineOnAxis('H', width + markerOffset * 2) +
+      svgPaths.lineOnAxis('V', markerHeight);
   this.markerBlock_.setAttribute('d', markerPath);
   if (this.workspace_.RTL) {
     this.flipRtl_(this.markerBlock_);
@@ -434,7 +441,7 @@ MarkerSvg.prototype.positionBlock_ = function(
 /**
  * Position the marker for an input connection.
  * Displays a filled in puzzle piece.
- * @param {!Blockly.RenderedConnection} connection The connection to position
+ * @param {!RenderedConnection} connection The connection to position
  *     marker around.
  * @protected
  */
@@ -443,7 +450,7 @@ MarkerSvg.prototype.positionInput_ = function(
   const x = connection.getOffsetInBlock().x;
   const y = connection.getOffsetInBlock().y;
 
-  const path = Blockly.utils.svgPaths.moveTo(0, 0) +
+  const path = svgPaths.moveTo(0, 0) +
       this.constants_.shapeFor(connection).pathDown;
 
   this.markerInput_.setAttribute('d', path);
@@ -479,14 +486,14 @@ MarkerSvg.prototype.positionLine_ = function(
  */
 MarkerSvg.prototype.positionOutput_ = function(
     width, height, connectionShape) {
-  const markerPath = Blockly.utils.svgPaths.moveBy(width, 0) +
-      Blockly.utils.svgPaths.lineOnAxis(
+  const markerPath = svgPaths.moveBy(width, 0) +
+      svgPaths.lineOnAxis(
           'h', -(width - connectionShape.width)) +
-      Blockly.utils.svgPaths.lineOnAxis(
+      svgPaths.lineOnAxis(
           'v', this.constants_.TAB_OFFSET_FROM_TOP) +
       connectionShape.pathDown +
-      Blockly.utils.svgPaths.lineOnAxis('V', height) +
-      Blockly.utils.svgPaths.lineOnAxis('H', width);
+      svgPaths.lineOnAxis('V', height) +
+      svgPaths.lineOnAxis('H', width);
   this.markerBlock_.setAttribute('d', markerPath);
   if (this.workspace_.RTL) {
     this.flipRtl_(this.markerBlock_);
@@ -506,15 +513,15 @@ MarkerSvg.prototype.positionOutput_ = function(
  */
 MarkerSvg.prototype.positionPrevious_ = function(
     width, markerOffset, markerHeight, connectionShape) {
-  const markerPath = Blockly.utils.svgPaths.moveBy(-markerOffset, markerHeight)
+  const markerPath = svgPaths.moveBy(-markerOffset, markerHeight)
       +
-      Blockly.utils.svgPaths.lineOnAxis('V', -markerOffset) +
-      Blockly.utils.svgPaths.lineOnAxis(
+      svgPaths.lineOnAxis('V', -markerOffset) +
+      svgPaths.lineOnAxis(
           'H', this.constants_.NOTCH_OFFSET_LEFT) +
       connectionShape.pathLeft +
-      Blockly.utils.svgPaths.lineOnAxis(
+      svgPaths.lineOnAxis(
           'H', width + markerOffset * 2) +
-      Blockly.utils.svgPaths.lineOnAxis('V', markerHeight);
+      svgPaths.lineOnAxis('V', markerHeight);
   this.markerBlock_.setAttribute('d', markerPath);
   if (this.workspace_.RTL) {
     this.flipRtl_(this.markerBlock_);
@@ -562,16 +569,16 @@ MarkerSvg.prototype.hide = function() {
 
 /**
  * Fire event for the marker or marker.
- * @param {Blockly.ASTNode} oldNode The old node the marker used to be on.
- * @param {!Blockly.ASTNode} curNode The new node the marker is currently on.
+ * @param {ASTNode} oldNode The old node the marker used to be on.
+ * @param {!ASTNode} curNode The new node the marker is currently on.
  * @private
  */
 MarkerSvg.prototype.fireMarkerEvent_ = function(
     oldNode, curNode) {
   const curBlock = curNode.getSourceBlock();
-  const event = new (Blockly.Events.get(Blockly.Events.MARKER_MOVE))(
+  const event = new (Events.get(Events.MARKER_MOVE))(
       curBlock, this.isCursor(), oldNode, curNode);
-  Blockly.Events.fire(event);
+  Events.fire(event);
 };
 
 /**
@@ -605,8 +612,8 @@ MarkerSvg.prototype.createDomInternal_ = function() {
   </g>
   */
 
-  this.markerSvg_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
+  this.markerSvg_ = dom.createSvgElement(
+      Svg.G,
       {
         'width': this.constants_.CURSOR_WS_WIDTH,
         'height': this.constants_.WS_CURSOR_HEIGHT
@@ -614,8 +621,8 @@ MarkerSvg.prototype.createDomInternal_ = function() {
 
   // A horizontal line used to represent a workspace coordinate or next
   // connection.
-  this.markerSvgLine_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  this.markerSvgLine_ = dom.createSvgElement(
+      Svg.RECT,
       {
         'width': this.constants_.CURSOR_WS_WIDTH,
         'height': this.constants_.WS_CURSOR_HEIGHT,
@@ -624,8 +631,8 @@ MarkerSvg.prototype.createDomInternal_ = function() {
       this.markerSvg_);
 
   // A filled in rectangle used to represent a stack.
-  this.markerSvgRect_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  this.markerSvgRect_ = dom.createSvgElement(
+      Svg.RECT,
       {
         'class': 'blocklyVerticalMarker',
         'rx': 10, 'ry': 10,
@@ -634,8 +641,8 @@ MarkerSvg.prototype.createDomInternal_ = function() {
       this.markerSvg_);
 
   // A filled in puzzle piece used to represent an input value.
-  this.markerInput_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
+  this.markerInput_ = dom.createSvgElement(
+      Svg.PATH,
       {
         'transform': '',
         'style': 'display: none'
@@ -644,8 +651,8 @@ MarkerSvg.prototype.createDomInternal_ = function() {
 
   // A path used to represent a previous connection and a block, an output
   // connection and a block, or a block.
-  this.markerBlock_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
+  this.markerBlock_ = dom.createSvgElement(
+      Svg.PATH,
       {
         'transform': '',
         'style': 'display: none',
@@ -657,15 +664,15 @@ MarkerSvg.prototype.createDomInternal_ = function() {
   // Markers and stack markers don't blink.
   if (this.isCursor()) {
     const blinkProperties = this.getBlinkProperties_();
-    Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.ANIMATE, blinkProperties,
+    dom.createSvgElement(
+        Svg.ANIMATE, blinkProperties,
         this.markerSvgLine_);
-    Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.ANIMATE, blinkProperties,
+    dom.createSvgElement(
+        Svg.ANIMATE, blinkProperties,
         this.markerInput_);
     blinkProperties['attributeName'] = 'stroke';
-    Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.ANIMATE, blinkProperties,
+    dom.createSvgElement(
+        Svg.ANIMATE, blinkProperties,
         this.markerBlock_);
   }
 
@@ -674,7 +681,7 @@ MarkerSvg.prototype.createDomInternal_ = function() {
 
 /**
  * Apply the marker's colour.
- * @param {!Blockly.ASTNode} _curNode The node that we want to draw the marker
+ * @param {!ASTNode} _curNode The node that we want to draw the marker
  *    for.
  * @protected
  */
@@ -697,7 +704,7 @@ MarkerSvg.prototype.applyColour_ = function(_curNode) {
  */
 MarkerSvg.prototype.dispose = function() {
   if (this.svgGroup_) {
-    Blockly.utils.dom.removeNode(this.svgGroup_);
+    dom.removeNode(this.svgGroup_);
   }
 };
 

From 99b30b92cefb78554431a498085dcfdc5a5a18df Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:31:27 -0700
Subject: [PATCH 519/833] clang-format core/renderers/common/marker_svg.js

---
 core/renderers/common/marker_svg.js | 114 ++++++++++------------------
 1 file changed, 42 insertions(+), 72 deletions(-)

diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js
index 514785bd2..bfc4baf35 100644
--- a/core/renderers/common/marker_svg.js
+++ b/core/renderers/common/marker_svg.js
@@ -85,7 +85,7 @@ const MarkerSvg = function(workspace, constants, marker) {
   this.currentMarkerSvg = null;
 
   const defaultColour = this.isCursor() ? this.constants_.CURSOR_COLOUR :
-      this.constants_.MARKER_COLOUR;
+                                          this.constants_.MARKER_COLOUR;
 
   /**
    * The colour of the marker.
@@ -144,14 +144,10 @@ MarkerSvg.prototype.isCursor = function() {
  * @package
  */
 MarkerSvg.prototype.createDom = function() {
-  const className = this.isCursor() ?
-      MarkerSvg.CURSOR_CLASS :
-      MarkerSvg.MARKER_CLASS;
+  const className =
+      this.isCursor() ? MarkerSvg.CURSOR_CLASS : MarkerSvg.MARKER_CLASS;
 
-  this.svgGroup_ = dom.createSvgElement(
-      Svg.G, {
-        'class': className
-      }, null);
+  this.svgGroup_ = dom.createSvgElement(Svg.G, {'class': className}, null);
 
   this.createDomInternal_();
   return this.svgGroup_;
@@ -192,7 +188,7 @@ MarkerSvg.prototype.draw = function(oldNode, curNode) {
   this.constants_ = this.workspace_.getRenderer().getConstants();
 
   const defaultColour = this.isCursor() ? this.constants_.CURSOR_COLOUR :
-      this.constants_.MARKER_COLOUR;
+                                          this.constants_.MARKER_COLOUR;
   this.colour_ = this.marker_.colour || defaultColour;
   this.applyColour_(curNode);
 
@@ -246,13 +242,11 @@ MarkerSvg.prototype.showAtLocation_ = function(curNode) {
  * @param {!ASTNode} curNode The node to draw the marker for.
  * @private
  */
-MarkerSvg.prototype.showWithBlockPrevOutput_ = function(
-    curNode) {
+MarkerSvg.prototype.showWithBlockPrevOutput_ = function(curNode) {
   const block = /** @type {!BlockSvg} */ (curNode.getSourceBlock());
   const width = block.width;
   const height = block.height;
-  const markerHeight = height
-      * MarkerSvg.HEIGHT_MULTIPLIER;
+  const markerHeight = height * MarkerSvg.HEIGHT_MULTIPLIER;
   const markerOffset = this.constants_.CURSOR_BLOCK_PADDING;
 
   if (block.previousConnection) {
@@ -282,8 +276,7 @@ MarkerSvg.prototype.showWithBlock_ = function(curNode) {
  * @param {!ASTNode} curNode The node to draw the marker for.
  * @protected
  */
-MarkerSvg.prototype.showWithPrevious_ = function(
-    curNode) {
+MarkerSvg.prototype.showWithPrevious_ = function(curNode) {
   this.showWithBlockPrevOutput_(curNode);
 };
 
@@ -302,8 +295,7 @@ MarkerSvg.prototype.showWithOutput_ = function(curNode) {
  * @param {!ASTNode} curNode The node to draw the marker for.
  * @protected
  */
-MarkerSvg.prototype.showWithCoordinates_ = function(
-    curNode) {
+MarkerSvg.prototype.showWithCoordinates_ = function(curNode) {
   const wsCoordinate = curNode.getWsCoordinate();
   let x = wsCoordinate.x;
   const y = wsCoordinate.y;
@@ -388,7 +380,8 @@ MarkerSvg.prototype.showWithStack_ = function(curNode) {
   const width = heightWidth.width + this.constants_.CURSOR_STACK_PADDING;
   const height = heightWidth.height + this.constants_.CURSOR_STACK_PADDING;
 
-  // Shift the rectangle slightly to upper left so padding is equal on all sides.
+  // Shift the rectangle slightly to upper left so padding is equal on all
+  // sides.
   const xPadding = -this.constants_.CURSOR_STACK_PADDING / 2;
   const yPadding = -this.constants_.CURSOR_STACK_PADDING / 2;
 
@@ -426,8 +419,7 @@ MarkerSvg.prototype.showCurrent_ = function() {
  */
 MarkerSvg.prototype.positionBlock_ = function(
     width, markerOffset, markerHeight) {
-  const markerPath = svgPaths.moveBy(-markerOffset, markerHeight)
-      +
+  const markerPath = svgPaths.moveBy(-markerOffset, markerHeight) +
       svgPaths.lineOnAxis('V', -markerOffset) +
       svgPaths.lineOnAxis('H', width + markerOffset * 2) +
       svgPaths.lineOnAxis('V', markerHeight);
@@ -445,18 +437,18 @@ MarkerSvg.prototype.positionBlock_ = function(
  *     marker around.
  * @protected
  */
-MarkerSvg.prototype.positionInput_ = function(
-    connection) {
+MarkerSvg.prototype.positionInput_ = function(connection) {
   const x = connection.getOffsetInBlock().x;
   const y = connection.getOffsetInBlock().y;
 
-  const path = svgPaths.moveTo(0, 0) +
-      this.constants_.shapeFor(connection).pathDown;
+  const path =
+      svgPaths.moveTo(0, 0) + this.constants_.shapeFor(connection).pathDown;
 
   this.markerInput_.setAttribute('d', path);
-  this.markerInput_.setAttribute('transform',
+  this.markerInput_.setAttribute(
+      'transform',
       'translate(' + x + ',' + y + ')' +
-      (this.workspace_.RTL ? ' scale(-1 1)' : ''));
+          (this.workspace_.RTL ? ' scale(-1 1)' : ''));
   this.currentMarkerSvg = this.markerInput_;
 };
 
@@ -468,8 +460,7 @@ MarkerSvg.prototype.positionInput_ = function(
  * @param {number} width The new width, in workspace units.
  * @protected
  */
-MarkerSvg.prototype.positionLine_ = function(
-    x, y, width) {
+MarkerSvg.prototype.positionLine_ = function(x, y, width) {
   this.markerSvgLine_.setAttribute('x', x);
   this.markerSvgLine_.setAttribute('y', y);
   this.markerSvgLine_.setAttribute('width', width);
@@ -484,15 +475,11 @@ MarkerSvg.prototype.positionLine_ = function(
  * @param {!Object} connectionShape The shape object for the connection.
  * @protected
  */
-MarkerSvg.prototype.positionOutput_ = function(
-    width, height, connectionShape) {
+MarkerSvg.prototype.positionOutput_ = function(width, height, connectionShape) {
   const markerPath = svgPaths.moveBy(width, 0) +
-      svgPaths.lineOnAxis(
-          'h', -(width - connectionShape.width)) +
-      svgPaths.lineOnAxis(
-          'v', this.constants_.TAB_OFFSET_FROM_TOP) +
-      connectionShape.pathDown +
-      svgPaths.lineOnAxis('V', height) +
+      svgPaths.lineOnAxis('h', -(width - connectionShape.width)) +
+      svgPaths.lineOnAxis('v', this.constants_.TAB_OFFSET_FROM_TOP) +
+      connectionShape.pathDown + svgPaths.lineOnAxis('V', height) +
       svgPaths.lineOnAxis('H', width);
   this.markerBlock_.setAttribute('d', markerPath);
   if (this.workspace_.RTL) {
@@ -513,14 +500,11 @@ MarkerSvg.prototype.positionOutput_ = function(
  */
 MarkerSvg.prototype.positionPrevious_ = function(
     width, markerOffset, markerHeight, connectionShape) {
-  const markerPath = svgPaths.moveBy(-markerOffset, markerHeight)
-      +
+  const markerPath = svgPaths.moveBy(-markerOffset, markerHeight) +
       svgPaths.lineOnAxis('V', -markerOffset) +
-      svgPaths.lineOnAxis(
-          'H', this.constants_.NOTCH_OFFSET_LEFT) +
+      svgPaths.lineOnAxis('H', this.constants_.NOTCH_OFFSET_LEFT) +
       connectionShape.pathLeft +
-      svgPaths.lineOnAxis(
-          'H', width + markerOffset * 2) +
+      svgPaths.lineOnAxis('H', width + markerOffset * 2) +
       svgPaths.lineOnAxis('V', markerHeight);
   this.markerBlock_.setAttribute('d', markerPath);
   if (this.workspace_.RTL) {
@@ -538,8 +522,7 @@ MarkerSvg.prototype.positionPrevious_ = function(
  * @param {number} height The new height, in workspace units.
  * @protected
  */
-MarkerSvg.prototype.positionRect_ = function(
-    x, y, width, height) {
+MarkerSvg.prototype.positionRect_ = function(x, y, width, height) {
   this.markerSvgRect_.setAttribute('x', x);
   this.markerSvgRect_.setAttribute('y', y);
   this.markerSvgRect_.setAttribute('width', width);
@@ -573,8 +556,7 @@ MarkerSvg.prototype.hide = function() {
  * @param {!ASTNode} curNode The new node the marker is currently on.
  * @private
  */
-MarkerSvg.prototype.fireMarkerEvent_ = function(
-    oldNode, curNode) {
+MarkerSvg.prototype.fireMarkerEvent_ = function(oldNode, curNode) {
   const curBlock = curNode.getSourceBlock();
   const event = new (Events.get(Events.MARKER_MOVE))(
       curBlock, this.isCursor(), oldNode, curNode);
@@ -607,23 +589,23 @@ MarkerSvg.prototype.createDomInternal_ = function() {
   <g>
     <rect width="100" height="5">
       <animate attributeType="XML" attributeName="fill" dur="1s"
-        values="transparent;transparent;#fff;transparent" repeatCount="indefinite" />
+        values="transparent;transparent;#fff;transparent"
+  repeatCount="indefinite" />
     </rect>
   </g>
   */
 
   this.markerSvg_ = dom.createSvgElement(
-      Svg.G,
-      {
+      Svg.G, {
         'width': this.constants_.CURSOR_WS_WIDTH,
         'height': this.constants_.WS_CURSOR_HEIGHT
-      }, this.svgGroup_);
+      },
+      this.svgGroup_);
 
   // A horizontal line used to represent a workspace coordinate or next
   // connection.
   this.markerSvgLine_ = dom.createSvgElement(
-      Svg.RECT,
-      {
+      Svg.RECT, {
         'width': this.constants_.CURSOR_WS_WIDTH,
         'height': this.constants_.WS_CURSOR_HEIGHT,
         'style': 'display: none'
@@ -632,28 +614,22 @@ MarkerSvg.prototype.createDomInternal_ = function() {
 
   // A filled in rectangle used to represent a stack.
   this.markerSvgRect_ = dom.createSvgElement(
-      Svg.RECT,
-      {
+      Svg.RECT, {
         'class': 'blocklyVerticalMarker',
-        'rx': 10, 'ry': 10,
+        'rx': 10,
+        'ry': 10,
         'style': 'display: none'
       },
       this.markerSvg_);
 
   // A filled in puzzle piece used to represent an input value.
   this.markerInput_ = dom.createSvgElement(
-      Svg.PATH,
-      {
-        'transform': '',
-        'style': 'display: none'
-      },
-      this.markerSvg_);
+      Svg.PATH, {'transform': '', 'style': 'display: none'}, this.markerSvg_);
 
   // A path used to represent a previous connection and a block, an output
   // connection and a block, or a block.
   this.markerBlock_ = dom.createSvgElement(
-      Svg.PATH,
-      {
+      Svg.PATH, {
         'transform': '',
         'style': 'display: none',
         'fill': 'none',
@@ -664,16 +640,10 @@ MarkerSvg.prototype.createDomInternal_ = function() {
   // Markers and stack markers don't blink.
   if (this.isCursor()) {
     const blinkProperties = this.getBlinkProperties_();
-    dom.createSvgElement(
-        Svg.ANIMATE, blinkProperties,
-        this.markerSvgLine_);
-    dom.createSvgElement(
-        Svg.ANIMATE, blinkProperties,
-        this.markerInput_);
+    dom.createSvgElement(Svg.ANIMATE, blinkProperties, this.markerSvgLine_);
+    dom.createSvgElement(Svg.ANIMATE, blinkProperties, this.markerInput_);
     blinkProperties['attributeName'] = 'stroke';
-    dom.createSvgElement(
-        Svg.ANIMATE, blinkProperties,
-        this.markerBlock_);
+    dom.createSvgElement(Svg.ANIMATE, blinkProperties, this.markerBlock_);
   }
 
   return this.markerSvg_;

From b233c5f10ad1e34529de815fbed81fc535c4bcab Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 16:50:31 -0700
Subject: [PATCH 520/833] Update visibility of constants

---
 core/renderers/common/marker_svg.js | 42 ++++++++++++++---------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js
index bfc4baf35..171fa36a6 100644
--- a/core/renderers/common/marker_svg.js
+++ b/core/renderers/common/marker_svg.js
@@ -40,6 +40,25 @@ const svgPaths = goog.require('Blockly.utils.svgPaths');
 goog.require('Blockly.Events.MarkerMove');
 
 
+/**
+ * The name of the CSS class for a cursor.
+ * @const {string}
+ */
+const CURSOR_CLASS = 'blocklyCursor';
+
+/**
+ * The name of the CSS class for a marker.
+ * @const {string}
+ */
+const MARKER_CLASS = 'blocklyMarker';
+
+/**
+ * What we multiply the height by to get the height of the marker.
+ * Only used for the block and block connections.
+ * @const {number}
+ */
+const HEIGHT_MULTIPLIER = 3 / 4;
+
 /**
  * Class for a marker.
  * @param {!WorkspaceSvg} workspace The workspace the marker belongs to.
@@ -94,25 +113,6 @@ const MarkerSvg = function(workspace, constants, marker) {
   this.colour_ = marker.colour || defaultColour;
 };
 
-/**
- * The name of the CSS class for a cursor.
- * @const {string}
- */
-MarkerSvg.CURSOR_CLASS = 'blocklyCursor';
-
-/**
- * The name of the CSS class for a marker.
- * @const {string}
- */
-MarkerSvg.MARKER_CLASS = 'blocklyMarker';
-
-/**
- * What we multiply the height by to get the height of the marker.
- * Only used for the block and block connections.
- * @const {number}
- */
-MarkerSvg.HEIGHT_MULTIPLIER = 3 / 4;
-
 /**
  * Return the root node of the SVG or null if none exists.
  * @return {SVGElement} The root SVG node.
@@ -145,7 +145,7 @@ MarkerSvg.prototype.isCursor = function() {
  */
 MarkerSvg.prototype.createDom = function() {
   const className =
-      this.isCursor() ? MarkerSvg.CURSOR_CLASS : MarkerSvg.MARKER_CLASS;
+      this.isCursor() ? CURSOR_CLASS : MARKER_CLASS;
 
   this.svgGroup_ = dom.createSvgElement(Svg.G, {'class': className}, null);
 
@@ -246,7 +246,7 @@ MarkerSvg.prototype.showWithBlockPrevOutput_ = function(curNode) {
   const block = /** @type {!BlockSvg} */ (curNode.getSourceBlock());
   const width = block.width;
   const height = block.height;
-  const markerHeight = height * MarkerSvg.HEIGHT_MULTIPLIER;
+  const markerHeight = height * HEIGHT_MULTIPLIER;
   const markerOffset = this.constants_.CURSOR_BLOCK_PADDING;
 
   if (block.previousConnection) {

From fae0c2ac6d910228fd93e81364e30ef3dfd517c0 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 13:03:16 -0700
Subject: [PATCH 521/833] Migrate core/contextmenu.js to ES6 const/let

---
 core/contextmenu.js | 56 +++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/core/contextmenu.js b/core/contextmenu.js
index 3bfcda167..9af86b0c9 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -62,7 +62,7 @@ Blockly.ContextMenu.show = function(e, options, rtl) {
     Blockly.ContextMenu.hide();
     return;
   }
-  var menu = Blockly.ContextMenu.populate_(options, rtl);
+  const menu = Blockly.ContextMenu.populate_(options, rtl);
   Blockly.ContextMenu.menu_ = menu;
 
   Blockly.ContextMenu.position_(menu, e, rtl);
@@ -85,17 +85,18 @@ Blockly.ContextMenu.populate_ = function(options, rtl) {
      enabled: true,
      callback: Blockly.MakeItSo}
   */
-  var menu = new Blockly.Menu();
+  const menu = new Blockly.Menu();
   menu.setRole(Blockly.utils.aria.Role.MENU);
-  for (var i = 0, option; (option = options[i]); i++) {
-    var menuItem = new Blockly.MenuItem(option.text);
+  for (let i = 0; i < options.length; i++) {
+    const option = options[i];
+    const menuItem = new Blockly.MenuItem(option.text);
     menuItem.setRightToLeft(rtl);
     menuItem.setRole(Blockly.utils.aria.Role.MENUITEM);
     menu.addChild(menuItem);
     menuItem.setEnabled(option.enabled);
     if (option.enabled) {
-      var actionHandler = function(_menuItem) {
-        var option = this;
+      const actionHandler = function (_menuItem) {
+        const option = this;
         Blockly.ContextMenu.hide();
         option.callback(option.scope);
       };
@@ -115,10 +116,10 @@ Blockly.ContextMenu.populate_ = function(options, rtl) {
  */
 Blockly.ContextMenu.position_ = function(menu, e, rtl) {
   // Record windowSize and scrollOffset before adding menu.
-  var viewportBBox = Blockly.utils.getViewportBBox();
+  const viewportBBox = Blockly.utils.getViewportBBox();
   // This one is just a point, but we'll pretend that it's a rect so we can use
   // some helper functions.
-  var anchorBBox = new Blockly.utils.Rect(
+  const anchorBBox = new Blockly.utils.Rect(
       e.clientY + viewportBBox.top,
       e.clientY + viewportBBox.top,
       e.clientX + viewportBBox.left,
@@ -126,7 +127,7 @@ Blockly.ContextMenu.position_ = function(menu, e, rtl) {
   );
 
   Blockly.ContextMenu.createWidget_(menu);
-  var menuSize = menu.getSize();
+  const menuSize = menu.getSize();
 
   if (rtl) {
     anchorBBox.left += menuSize.width;
@@ -148,9 +149,9 @@ Blockly.ContextMenu.position_ = function(menu, e, rtl) {
  * @private
  */
 Blockly.ContextMenu.createWidget_ = function(menu) {
-  var div = Blockly.WidgetDiv.DIV;
+  const div = Blockly.WidgetDiv.DIV;
   menu.render(div);
-  var menuDom = menu.getElement();
+  const menuDom = menu.getElement();
   Blockly.utils.dom.addClass(
       /** @type {!Element} */ (menuDom), 'blocklyContextMenu');
   // Prevent system context menu when right-clicking a Blockly context menu.
@@ -189,10 +190,11 @@ Blockly.ContextMenu.dispose = function() {
 Blockly.ContextMenu.callbackFactory = function(block, xml) {
   return function() {
     Blockly.Events.disable();
+    let newBlock;
     try {
-      var newBlock = Blockly.Xml.domToBlock(xml, block.workspace);
+      newBlock = Blockly.Xml.domToBlock(xml, block.workspace);
       // Move the new block next to the old block.
-      var xy = block.getRelativeToSurfaceXY();
+      const xy = block.getRelativeToSurfaceXY();
       if (block.RTL) {
         xy.x -= Blockly.internalConstants.SNAP_RADIUS;
       } else {
@@ -221,10 +223,10 @@ Blockly.ContextMenu.callbackFactory = function(block, xml) {
  * @package
  */
 Blockly.ContextMenu.commentDeleteOption = function(comment) {
-  var deleteOption = {
+  const deleteOption = {
     text: Blockly.Msg['REMOVE_COMMENT'],
     enabled: true,
-    callback: function() {
+    callback: function () {
       Blockly.Events.setGroup(true);
       comment.dispose(true, true);
       Blockly.Events.setGroup(false);
@@ -241,10 +243,10 @@ Blockly.ContextMenu.commentDeleteOption = function(comment) {
  * @package
  */
 Blockly.ContextMenu.commentDuplicateOption = function(comment) {
-  var duplicateOption = {
+  const duplicateOption = {
     text: Blockly.Msg['DUPLICATE_COMMENT'],
     enabled: true,
-    callback: function() {
+    callback: function () {
       Blockly.duplicate(comment);
     }
   };
@@ -267,35 +269,35 @@ Blockly.ContextMenu.workspaceCommentOption = function(ws, e) {
   }
   // Helper function to create and position a comment correctly based on the
   // location of the mouse event.
-  var addWsComment = function() {
-    var comment = new Blockly.WorkspaceCommentSvg(
+  const addWsComment = function () {
+    const comment = new Blockly.WorkspaceCommentSvg(
         ws, Blockly.Msg['WORKSPACE_COMMENT_DEFAULT_TEXT'],
         Blockly.WorkspaceCommentSvg.DEFAULT_SIZE,
         Blockly.WorkspaceCommentSvg.DEFAULT_SIZE);
 
-    var injectionDiv = ws.getInjectionDiv();
+    const injectionDiv = ws.getInjectionDiv();
     // Bounding rect coordinates are in client coordinates, meaning that they
     // are in pixels relative to the upper left corner of the visible browser
     // window.  These coordinates change when you scroll the browser window.
-    var boundingRect = injectionDiv.getBoundingClientRect();
+    const boundingRect = injectionDiv.getBoundingClientRect();
 
     // The client coordinates offset by the injection div's upper left corner.
-    var clientOffsetPixels = new Blockly.utils.Coordinate(
+    const clientOffsetPixels = new Blockly.utils.Coordinate(
         e.clientX - boundingRect.left, e.clientY - boundingRect.top);
 
     // The offset in pixels between the main workspace's origin and the upper
     // left corner of the injection div.
-    var mainOffsetPixels = ws.getOriginOffsetInPixels();
+    const mainOffsetPixels = ws.getOriginOffsetInPixels();
 
     // The position of the new comment in pixels relative to the origin of the
     // main workspace.
-    var finalOffset = Blockly.utils.Coordinate.difference(clientOffsetPixels,
+    const finalOffset = Blockly.utils.Coordinate.difference(clientOffsetPixels,
         mainOffsetPixels);
     // The position of the new comment in main workspace coordinates.
     finalOffset.scale(1 / ws.scale);
 
-    var commentX = finalOffset.x;
-    var commentY = finalOffset.y;
+    const commentX = finalOffset.x;
+    const commentY = finalOffset.y;
     comment.moveBy(commentX, commentY);
     if (ws.rendered) {
       comment.initSvg();
@@ -304,7 +306,7 @@ Blockly.ContextMenu.workspaceCommentOption = function(ws, e) {
     }
   };
 
-  var wsCommentOption = {
+  const wsCommentOption = {
     // Foreign objects don't work in IE.  Don't let the user create comments
     // that they won't be able to edit.
     enabled: !Blockly.utils.userAgent.IE

From 19722e508fcbc9600af3a87dc19457a413c34a0f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 16:47:11 -0700
Subject: [PATCH 522/833] Migrate core/contextmenu.js to goog.module

---
 core/block_svg.js   |  4 +-
 core/contextmenu.js | 94 ++++++++++++++++++++++++++++++---------------
 tests/deps.js       |  2 +-
 3 files changed, 67 insertions(+), 33 deletions(-)

diff --git a/core/block_svg.js b/core/block_svg.js
index fd5be3212..57d20c1ba 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -780,7 +780,7 @@ Blockly.BlockSvg.prototype.showContextMenu = function(e) {
 
   if (menuOptions && menuOptions.length) {
     Blockly.ContextMenu.show(e, menuOptions, this.RTL);
-    Blockly.ContextMenu.currentBlock = this;
+    Blockly.ContextMenu.setCurrentBlock(this);
   }
 };
 
@@ -921,7 +921,7 @@ Blockly.BlockSvg.prototype.dispose = function(healStack, animate) {
     this.workspace.cancelCurrentGesture();
   }
   // If this block has a context menu open, close it.
-  if (Blockly.ContextMenu.currentBlock == this) {
+  if (Blockly.ContextMenu.getCurrentBlock() == this) {
     Blockly.ContextMenu.hide();
   }
 
diff --git a/core/contextmenu.js b/core/contextmenu.js
index 9af86b0c9..9bb76033a 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -14,8 +14,11 @@
  * @name Blockly.ContextMenu
  * @namespace
  */
-goog.provide('Blockly.ContextMenu');
+goog.module('Blockly.ContextMenu');
+goog.module.declareLegacyNamespace();
 
+// TODO(#5073): Add Blockly require after fixing circular dependency.
+// goog.require('Blockly');
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
@@ -39,16 +42,39 @@ goog.requireType('Blockly.WorkspaceSvg');
 
 /**
  * Which block is the context menu attached to?
- * @type {Blockly.Block}
+ * @type {?Blockly.Block}
  */
-Blockly.ContextMenu.currentBlock = null;
+let currentBlock = null;
+
+/**
+ * Gets the block the context menu is currently attached to.
+ * @return {?Blockly.Block} The block the context menu is attached to.
+ */
+const getCurrentBlock = function() {
+  return currentBlock;
+};
+exports.getCurrentBlock = getCurrentBlock;
+
+/**
+ * Sets the block the context menu is currently attached to.
+ * @param {?Blockly.Block} block The block the context menu is attached to.
+ */
+const setCurrentBlock = function(block) {
+  currentBlock = block;
+};
+exports.setCurrentBlock = setCurrentBlock;
+
+// Ad JS accessors for backwards compatibility.
+Object.defineProperty(exports, 'currentBlock', {
+  get: getCurrentBlock,
+  set: setCurrentBlock,
+});
 
 /**
  * Menu object.
  * @type {Blockly.Menu}
- * @private
  */
-Blockly.ContextMenu.menu_ = null;
+let menu_ = null;
 
 /**
  * Construct the menu based on the list of options and show the menu.
@@ -56,21 +82,22 @@ Blockly.ContextMenu.menu_ = null;
  * @param {!Array<!Object>} options Array of menu options.
  * @param {boolean} rtl True if RTL, false if LTR.
  */
-Blockly.ContextMenu.show = function(e, options, rtl) {
-  Blockly.WidgetDiv.show(Blockly.ContextMenu, rtl, Blockly.ContextMenu.dispose);
+const show = function(e, options, rtl) {
+  Blockly.WidgetDiv.show(exports, rtl, dispose);
   if (!options.length) {
-    Blockly.ContextMenu.hide();
+    hide();
     return;
   }
-  const menu = Blockly.ContextMenu.populate_(options, rtl);
-  Blockly.ContextMenu.menu_ = menu;
+  const menu = populate_(options, rtl);
+  menu_ = menu;
 
-  Blockly.ContextMenu.position_(menu, e, rtl);
+  position_(menu, e, rtl);
   // 1ms delay is required for focusing on context menus because some other
   // mouse event is still waiting in the queue and clears focus.
   setTimeout(function() {menu.focus();}, 1);
-  Blockly.ContextMenu.currentBlock = null;  // May be set by Blockly.Block.
+  currentBlock = null;  // May be set by Blockly.Block.
 };
+exports.show = show;
 
 /**
  * Create the context menu object and populate it with the given options.
@@ -79,7 +106,7 @@ Blockly.ContextMenu.show = function(e, options, rtl) {
  * @return {!Blockly.Menu} The menu that will be shown on right click.
  * @private
  */
-Blockly.ContextMenu.populate_ = function(options, rtl) {
+const populate_ = function(options, rtl) {
   /* Here's what one option object looks like:
     {text: 'Make It So',
      enabled: true,
@@ -97,7 +124,7 @@ Blockly.ContextMenu.populate_ = function(options, rtl) {
     if (option.enabled) {
       const actionHandler = function (_menuItem) {
         const option = this;
-        Blockly.ContextMenu.hide();
+        hide();
         option.callback(option.scope);
       };
       menuItem.onAction(actionHandler, option);
@@ -114,7 +141,7 @@ Blockly.ContextMenu.populate_ = function(options, rtl) {
  * @param {boolean} rtl True if RTL, false if LTR.
  * @private
  */
-Blockly.ContextMenu.position_ = function(menu, e, rtl) {
+const position_ = function(menu, e, rtl) {
   // Record windowSize and scrollOffset before adding menu.
   const viewportBBox = Blockly.utils.getViewportBBox();
   // This one is just a point, but we'll pretend that it's a rect so we can use
@@ -126,7 +153,7 @@ Blockly.ContextMenu.position_ = function(menu, e, rtl) {
       e.clientX + viewportBBox.left
   );
 
-  Blockly.ContextMenu.createWidget_(menu);
+  createWidget_(menu);
   const menuSize = menu.getSize();
 
   if (rtl) {
@@ -148,7 +175,7 @@ Blockly.ContextMenu.position_ = function(menu, e, rtl) {
  * @param {!Blockly.Menu} menu The menu to add to the widget div.
  * @private
  */
-Blockly.ContextMenu.createWidget_ = function(menu) {
+const createWidget_ = function(menu) {
   const div = Blockly.WidgetDiv.DIV;
   menu.render(div);
   const menuDom = menu.getElement();
@@ -165,20 +192,22 @@ Blockly.ContextMenu.createWidget_ = function(menu) {
 /**
  * Hide the context menu.
  */
-Blockly.ContextMenu.hide = function() {
-  Blockly.WidgetDiv.hideIfOwner(Blockly.ContextMenu);
-  Blockly.ContextMenu.currentBlock = null;
+const hide = function() {
+  Blockly.WidgetDiv.hideIfOwner(exports);
+  currentBlock = null;
 };
+exports.hide = hide;
 
 /**
  * Dispose of the menu.
  */
-Blockly.ContextMenu.dispose = function() {
-  if (Blockly.ContextMenu.menu_) {
-    Blockly.ContextMenu.menu_.dispose();
-    Blockly.ContextMenu.menu_ = null;
+const dispose = function() {
+  if (menu_) {
+    menu_.dispose();
+    menu_ = null;
   }
 };
+exports.dispose = dispose;
 
 /**
  * Create a callback function that creates and configures a block,
@@ -187,7 +216,7 @@ Blockly.ContextMenu.dispose = function() {
  * @param {!Element} xml XML representation of new block.
  * @return {!Function} Function that creates a block.
  */
-Blockly.ContextMenu.callbackFactory = function(block, xml) {
+const callbackFactory = function(block, xml) {
   return function() {
     Blockly.Events.disable();
     let newBlock;
@@ -212,6 +241,7 @@ Blockly.ContextMenu.callbackFactory = function(block, xml) {
     newBlock.select();
   };
 };
+exports.callbackFactory = callbackFactory;
 
 // Helper functions for creating context menu options.
 
@@ -220,9 +250,8 @@ Blockly.ContextMenu.callbackFactory = function(block, xml) {
  * @param {!Blockly.WorkspaceCommentSvg} comment The workspace comment where the
  *     right-click originated.
  * @return {!Object} A menu option, containing text, enabled, and a callback.
- * @package
  */
-Blockly.ContextMenu.commentDeleteOption = function(comment) {
+const commentDeleteOption = function(comment) {
   const deleteOption = {
     text: Blockly.Msg['REMOVE_COMMENT'],
     enabled: true,
@@ -234,15 +263,16 @@ Blockly.ContextMenu.commentDeleteOption = function(comment) {
   };
   return deleteOption;
 };
+/** @package */
+exports.commentDeleteOption = commentDeleteOption;
 
 /**
  * Make a context menu option for duplicating the current workspace comment.
  * @param {!Blockly.WorkspaceCommentSvg} comment The workspace comment where the
  *     right-click originated.
  * @return {!Object} A menu option, containing text, enabled, and a callback.
- * @package
  */
-Blockly.ContextMenu.commentDuplicateOption = function(comment) {
+const commentDuplicateOption = function(comment) {
   const duplicateOption = {
     text: Blockly.Msg['DUPLICATE_COMMENT'],
     enabled: true,
@@ -252,6 +282,8 @@ Blockly.ContextMenu.commentDuplicateOption = function(comment) {
   };
   return duplicateOption;
 };
+/** @package */
+exports.commentDuplicateOption = commentDuplicateOption;
 
 /**
  * Make a context menu option for adding a comment on the workspace.
@@ -263,7 +295,7 @@ Blockly.ContextMenu.commentDuplicateOption = function(comment) {
  * @suppress {strictModuleDepCheck,checkTypes} Suppress checks while workspace
  *     comments are not bundled in.
  */
-Blockly.ContextMenu.workspaceCommentOption = function(ws, e) {
+const workspaceCommentOption = function(ws, e) {
   if (!Blockly.WorkspaceCommentSvg) {
     throw Error('Missing require for Blockly.WorkspaceCommentSvg');
   }
@@ -317,3 +349,5 @@ Blockly.ContextMenu.workspaceCommentOption = function(ws, e) {
   };
   return wsCommentOption;
 };
+/** @package */
+exports.workspaceCommentOption = workspaceCommentOption;
diff --git a/tests/deps.js b/tests/deps.js
index a596ec5f0..bbf289725 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -26,7 +26,7 @@ goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionCheck
 goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.RenderedConnection', 'Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es5'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});

From fe29e1cb9dbf09f629c685467d42064348963a09 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 09:30:31 -0700
Subject: [PATCH 523/833] Migrate core/contextmenu.js named requires

---
 core/contextmenu.js | 119 +++++++++++++++++++++-----------------------
 1 file changed, 58 insertions(+), 61 deletions(-)

diff --git a/core/contextmenu.js b/core/contextmenu.js
index 9bb76033a..bd8fddf88 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -10,45 +10,42 @@
  */
 'use strict';
 
-/**
- * @name Blockly.ContextMenu
- * @namespace
- */
 goog.module('Blockly.ContextMenu');
 goog.module.declareLegacyNamespace();
 
 // TODO(#5073): Add Blockly require after fixing circular dependency.
 // goog.require('Blockly');
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Events = goog.require('Blockly.Events');
+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');
+const browserEvents = goog.require('Blockly.browserEvents');
+const dom = goog.require('Blockly.utils.dom');
+const internalConstants = goog.require('Blockly.internalConstants');
+const userAgent = goog.require('Blockly.utils.userAgent');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.Menu');
-goog.require('Blockly.MenuItem');
-goog.require('Blockly.Msg');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.aria');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Rect');
-goog.require('Blockly.utils.userAgent');
-goog.require('Blockly.WidgetDiv');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
  * Which block is the context menu attached to?
- * @type {?Blockly.Block}
+ * @type {?Block}
  */
 let currentBlock = null;
 
 /**
  * Gets the block the context menu is currently attached to.
- * @return {?Blockly.Block} The block the context menu is attached to.
+ * @return {?Block} The block the context menu is attached to.
  */
 const getCurrentBlock = function() {
   return currentBlock;
@@ -57,7 +54,7 @@ exports.getCurrentBlock = getCurrentBlock;
 
 /**
  * Sets the block the context menu is currently attached to.
- * @param {?Blockly.Block} block The block the context menu is attached to.
+ * @param {?Block} block The block the context menu is attached to.
  */
 const setCurrentBlock = function(block) {
   currentBlock = block;
@@ -72,7 +69,7 @@ Object.defineProperty(exports, 'currentBlock', {
 
 /**
  * Menu object.
- * @type {Blockly.Menu}
+ * @type {Menu}
  */
 let menu_ = null;
 
@@ -83,7 +80,7 @@ let menu_ = null;
  * @param {boolean} rtl True if RTL, false if LTR.
  */
 const show = function(e, options, rtl) {
-  Blockly.WidgetDiv.show(exports, rtl, dispose);
+  WidgetDiv.show(exports, rtl, dispose);
   if (!options.length) {
     hide();
     return;
@@ -103,7 +100,7 @@ exports.show = show;
  * Create the context menu object and populate it with the given options.
  * @param {!Array<!Object>} options Array of menu options.
  * @param {boolean} rtl True if RTL, false if LTR.
- * @return {!Blockly.Menu} The menu that will be shown on right click.
+ * @return {!Menu} The menu that will be shown on right click.
  * @private
  */
 const populate_ = function(options, rtl) {
@@ -112,13 +109,13 @@ const populate_ = function(options, rtl) {
      enabled: true,
      callback: Blockly.MakeItSo}
   */
-  const menu = new Blockly.Menu();
-  menu.setRole(Blockly.utils.aria.Role.MENU);
+  const menu = new Menu();
+  menu.setRole(aria.Role.MENU);
   for (let i = 0; i < options.length; i++) {
     const option = options[i];
-    const menuItem = new Blockly.MenuItem(option.text);
+    const menuItem = new MenuItem(option.text);
     menuItem.setRightToLeft(rtl);
-    menuItem.setRole(Blockly.utils.aria.Role.MENUITEM);
+    menuItem.setRole(aria.Role.MENUITEM);
     menu.addChild(menuItem);
     menuItem.setEnabled(option.enabled);
     if (option.enabled) {
@@ -135,7 +132,7 @@ const populate_ = function(options, rtl) {
 
 /**
  * Add the menu to the page and position it correctly.
- * @param {!Blockly.Menu} menu The menu to add and position.
+ * @param {!Menu} menu The menu to add and position.
  * @param {!Event} e Mouse event for the right click that is making the context
  *     menu appear.
  * @param {boolean} rtl True if RTL, false if LTR.
@@ -143,10 +140,10 @@ const populate_ = function(options, rtl) {
  */
 const position_ = function(menu, e, rtl) {
   // Record windowSize and scrollOffset before adding menu.
-  const viewportBBox = Blockly.utils.getViewportBBox();
+  const viewportBBox = utils.getViewportBBox();
   // This one is just a point, but we'll pretend that it's a rect so we can use
   // some helper functions.
-  const anchorBBox = new Blockly.utils.Rect(
+  const anchorBBox = new Rect(
       e.clientY + viewportBBox.top,
       e.clientY + viewportBBox.top,
       e.clientX + viewportBBox.left,
@@ -163,7 +160,7 @@ const position_ = function(menu, e, rtl) {
     viewportBBox.right += menuSize.width;
   }
 
-  Blockly.WidgetDiv.positionWithAnchor(viewportBBox, anchorBBox, menuSize, rtl);
+  WidgetDiv.positionWithAnchor(viewportBBox, anchorBBox, menuSize, rtl);
   // Calling menuDom.focus() has to wait until after the menu has been placed
   // correctly.  Otherwise it will cause a page scroll to get the misplaced menu
   // in view.  See issue #1329.
@@ -172,19 +169,19 @@ const position_ = function(menu, e, rtl) {
 
 /**
  * Create and render the menu widget inside Blockly's widget div.
- * @param {!Blockly.Menu} menu The menu to add to the widget div.
+ * @param {!Menu} menu The menu to add to the widget div.
  * @private
  */
 const createWidget_ = function(menu) {
-  const div = Blockly.WidgetDiv.DIV;
+  const div = WidgetDiv.DIV;
   menu.render(div);
   const menuDom = menu.getElement();
-  Blockly.utils.dom.addClass(
+  dom.addClass(
       /** @type {!Element} */ (menuDom), 'blocklyContextMenu');
   // Prevent system context menu when right-clicking a Blockly context menu.
-  Blockly.browserEvents.conditionalBind(
+  browserEvents.conditionalBind(
       /** @type {!EventTarget} */ (menuDom), 'contextmenu', null,
-      Blockly.utils.noEvent);
+      utils.noEvent);
   // Focus only after the initial render to avoid issue #1329.
   menu.focus();
 };
@@ -193,7 +190,7 @@ const createWidget_ = function(menu) {
  * Hide the context menu.
  */
 const hide = function() {
-  Blockly.WidgetDiv.hideIfOwner(exports);
+  WidgetDiv.hideIfOwner(exports);
   currentBlock = null;
 };
 exports.hide = hide;
@@ -212,31 +209,31 @@ exports.dispose = dispose;
 /**
  * Create a callback function that creates and configures a block,
  *   then places the new block next to the original.
- * @param {!Blockly.Block} block Original block.
+ * @param {!Block} block Original block.
  * @param {!Element} xml XML representation of new block.
  * @return {!Function} Function that creates a block.
  */
 const callbackFactory = function(block, xml) {
   return function() {
-    Blockly.Events.disable();
+    Events.disable();
     let newBlock;
     try {
-      newBlock = Blockly.Xml.domToBlock(xml, block.workspace);
+      newBlock = Xml.domToBlock(xml, block.workspace);
       // Move the new block next to the old block.
       const xy = block.getRelativeToSurfaceXY();
       if (block.RTL) {
-        xy.x -= Blockly.internalConstants.SNAP_RADIUS;
+        xy.x -= internalConstants.SNAP_RADIUS;
       } else {
-        xy.x += Blockly.internalConstants.SNAP_RADIUS;
+        xy.x += internalConstants.SNAP_RADIUS;
       }
-      xy.y += Blockly.internalConstants.SNAP_RADIUS * 2;
+      xy.y += internalConstants.SNAP_RADIUS * 2;
       newBlock.moveBy(xy.x, xy.y);
     } finally {
-      Blockly.Events.enable();
+      Events.enable();
     }
-    if (Blockly.Events.isEnabled() && !newBlock.isShadow()) {
-      Blockly.Events.fire(
-          new (Blockly.Events.get(Blockly.Events.BLOCK_CREATE))(newBlock));
+    if (Events.isEnabled() && !newBlock.isShadow()) {
+      Events.fire(
+          new (Events.get(Events.BLOCK_CREATE))(newBlock));
     }
     newBlock.select();
   };
@@ -253,12 +250,12 @@ exports.callbackFactory = callbackFactory;
  */
 const commentDeleteOption = function(comment) {
   const deleteOption = {
-    text: Blockly.Msg['REMOVE_COMMENT'],
+    text: Msg['REMOVE_COMMENT'],
     enabled: true,
     callback: function () {
-      Blockly.Events.setGroup(true);
+      Events.setGroup(true);
       comment.dispose(true, true);
-      Blockly.Events.setGroup(false);
+      Events.setGroup(false);
     }
   };
   return deleteOption;
@@ -274,7 +271,7 @@ exports.commentDeleteOption = commentDeleteOption;
  */
 const commentDuplicateOption = function(comment) {
   const duplicateOption = {
-    text: Blockly.Msg['DUPLICATE_COMMENT'],
+    text: Msg['DUPLICATE_COMMENT'],
     enabled: true,
     callback: function () {
       Blockly.duplicate(comment);
@@ -287,7 +284,7 @@ exports.commentDuplicateOption = commentDuplicateOption;
 
 /**
  * Make a context menu option for adding a comment on the workspace.
- * @param {!Blockly.WorkspaceSvg} ws The workspace where the right-click
+ * @param {!WorkspaceSvg} ws The workspace where the right-click
  *     originated.
  * @param {!Event} e The right-click mouse event.
  * @return {!Object} A menu option, containing text, enabled, and a callback.
@@ -303,7 +300,7 @@ const workspaceCommentOption = function(ws, e) {
   // location of the mouse event.
   const addWsComment = function () {
     const comment = new Blockly.WorkspaceCommentSvg(
-        ws, Blockly.Msg['WORKSPACE_COMMENT_DEFAULT_TEXT'],
+        ws, Msg['WORKSPACE_COMMENT_DEFAULT_TEXT'],
         Blockly.WorkspaceCommentSvg.DEFAULT_SIZE,
         Blockly.WorkspaceCommentSvg.DEFAULT_SIZE);
 
@@ -314,7 +311,7 @@ const workspaceCommentOption = function(ws, e) {
     const boundingRect = injectionDiv.getBoundingClientRect();
 
     // The client coordinates offset by the injection div's upper left corner.
-    const clientOffsetPixels = new Blockly.utils.Coordinate(
+    const clientOffsetPixels = new Coordinate(
         e.clientX - boundingRect.left, e.clientY - boundingRect.top);
 
     // The offset in pixels between the main workspace's origin and the upper
@@ -323,7 +320,7 @@ const workspaceCommentOption = function(ws, e) {
 
     // The position of the new comment in pixels relative to the origin of the
     // main workspace.
-    const finalOffset = Blockly.utils.Coordinate.difference(clientOffsetPixels,
+    const finalOffset = Coordinate.difference(clientOffsetPixels,
         mainOffsetPixels);
     // The position of the new comment in main workspace coordinates.
     finalOffset.scale(1 / ws.scale);
@@ -341,9 +338,9 @@ const workspaceCommentOption = function(ws, e) {
   const wsCommentOption = {
     // Foreign objects don't work in IE.  Don't let the user create comments
     // that they won't be able to edit.
-    enabled: !Blockly.utils.userAgent.IE
+    enabled: !userAgent.IE
   };
-  wsCommentOption.text = Blockly.Msg['ADD_COMMENT'];
+  wsCommentOption.text = Msg['ADD_COMMENT'];
   wsCommentOption.callback = function() {
     addWsComment();
   };

From eea23e24f667d208025ce960cb6480041d348b48 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 09:31:15 -0700
Subject: [PATCH 524/833] clang-format core/contextmenu.js

---
 core/contextmenu.js | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/core/contextmenu.js b/core/contextmenu.js
index bd8fddf88..39d4a8319 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -91,7 +91,9 @@ const show = function(e, options, rtl) {
   position_(menu, e, rtl);
   // 1ms delay is required for focusing on context menus because some other
   // mouse event is still waiting in the queue and clears focus.
-  setTimeout(function() {menu.focus();}, 1);
+  setTimeout(function() {
+    menu.focus();
+  }, 1);
   currentBlock = null;  // May be set by Blockly.Block.
 };
 exports.show = show;
@@ -119,7 +121,7 @@ const populate_ = function(options, rtl) {
     menu.addChild(menuItem);
     menuItem.setEnabled(option.enabled);
     if (option.enabled) {
-      const actionHandler = function (_menuItem) {
+      const actionHandler = function(_menuItem) {
         const option = this;
         hide();
         option.callback(option.scope);
@@ -144,11 +146,8 @@ const position_ = function(menu, e, rtl) {
   // This one is just a point, but we'll pretend that it's a rect so we can use
   // some helper functions.
   const anchorBBox = new Rect(
-      e.clientY + viewportBBox.top,
-      e.clientY + viewportBBox.top,
-      e.clientX + viewportBBox.left,
-      e.clientX + viewportBBox.left
-  );
+      e.clientY + viewportBBox.top, e.clientY + viewportBBox.top,
+      e.clientX + viewportBBox.left, e.clientX + viewportBBox.left);
 
   createWidget_(menu);
   const menuSize = menu.getSize();
@@ -232,8 +231,7 @@ const callbackFactory = function(block, xml) {
       Events.enable();
     }
     if (Events.isEnabled() && !newBlock.isShadow()) {
-      Events.fire(
-          new (Events.get(Events.BLOCK_CREATE))(newBlock));
+      Events.fire(new (Events.get(Events.BLOCK_CREATE))(newBlock));
     }
     newBlock.select();
   };
@@ -252,7 +250,7 @@ const commentDeleteOption = function(comment) {
   const deleteOption = {
     text: Msg['REMOVE_COMMENT'],
     enabled: true,
-    callback: function () {
+    callback: function() {
       Events.setGroup(true);
       comment.dispose(true, true);
       Events.setGroup(false);
@@ -273,7 +271,7 @@ const commentDuplicateOption = function(comment) {
   const duplicateOption = {
     text: Msg['DUPLICATE_COMMENT'],
     enabled: true,
-    callback: function () {
+    callback: function() {
       Blockly.duplicate(comment);
     }
   };
@@ -298,7 +296,7 @@ const workspaceCommentOption = function(ws, e) {
   }
   // Helper function to create and position a comment correctly based on the
   // location of the mouse event.
-  const addWsComment = function () {
+  const addWsComment = function() {
     const comment = new Blockly.WorkspaceCommentSvg(
         ws, Msg['WORKSPACE_COMMENT_DEFAULT_TEXT'],
         Blockly.WorkspaceCommentSvg.DEFAULT_SIZE,
@@ -320,8 +318,8 @@ const workspaceCommentOption = function(ws, e) {
 
     // The position of the new comment in pixels relative to the origin of the
     // main workspace.
-    const finalOffset = Coordinate.difference(clientOffsetPixels,
-        mainOffsetPixels);
+    const finalOffset =
+        Coordinate.difference(clientOffsetPixels, mainOffsetPixels);
     // The position of the new comment in main workspace coordinates.
     finalOffset.scale(1 / ws.scale);
 

From fba87c93c4f680f37fee8d902c82340a4905a363 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 4 Aug 2021 12:12:53 -0700
Subject: [PATCH 525/833] Migrate core/renderers/geras/highlighter.js to
 goog.module syntax (#5304)

* Migrate core/renderers/geras/highlighter.js to ES6 const/let

* Migrate core/renderers/geras/highlighter.js to goog.module

* Migrate core/renderers/geras/highlighter.js to named requires

* clang-format core/renderers/geras/highlighter.js
---
 core/renderers/geras/highlighter.js | 185 ++++++++++++++--------------
 tests/deps.js                       |   4 +-
 2 files changed, 95 insertions(+), 94 deletions(-)

diff --git a/core/renderers/geras/highlighter.js b/core/renderers/geras/highlighter.js
index 74a6bb43d..f04339d29 100644
--- a/core/renderers/geras/highlighter.js
+++ b/core/renderers/geras/highlighter.js
@@ -11,15 +11,19 @@
  */
 'use strict';
 
-goog.provide('Blockly.geras.Highlighter');
+goog.module('Blockly.geras.Highlighter');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.svgPaths');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.geras.HighlightConstantProvider');
-goog.requireType('Blockly.geras.Renderer');
-goog.requireType('Blockly.geras.RenderInfo');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const HighlightConstantProvider = goog.requireType('Blockly.geras.HighlightConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const Renderer = goog.requireType('Blockly.geras.Renderer');
+/* eslint-disable-next-line no-unused-vars */
+const RenderInfo = goog.requireType('Blockly.geras.RenderInfo');
+const Types = goog.require('Blockly.blockRendering.Types');
+const svgPaths = goog.require('Blockly.utils.svgPaths');
 
 
 /**
@@ -33,28 +37,28 @@ goog.requireType('Blockly.geras.RenderInfo');
  * or closed paths.  The highlights for tabs and notches are loosely based on
  * tab and notch shapes, but are not exactly the same.
  *
- * @param {!Blockly.geras.RenderInfo} info An object containing all
+ * @param {!RenderInfo} info An object containing all
  *     information needed to render this block.
  * @package
  * @constructor
  */
-Blockly.geras.Highlighter = function(info) {
+const Highlighter = function(info) {
   this.info_ = info;
   this.steps_ = '';
   this.inlineSteps_ = '';
 
   this.RTL_ = this.info_.RTL;
 
-  var renderer = /** @type {!Blockly.geras.Renderer} */ (info.getRenderer());
+  const renderer = /** @type {!Renderer} */ (info.getRenderer());
 
   /**
    * The renderer's constant provider.
-   * @type {!Blockly.blockRendering.ConstantProvider}
+   * @type {!ConstantProvider}
    */
   this.constants_ = renderer.getConstants();
 
   /**
-   * @type {!Blockly.geras.HighlightConstantProvider}
+   * @type {!HighlightConstantProvider}
    */
   this.highlightConstants_ = renderer.getHighlightConstants();
   /**
@@ -69,8 +73,7 @@ Blockly.geras.Highlighter = function(info) {
   this.puzzleTabPaths_ = this.highlightConstants_.PUZZLE_TAB;
   this.notchPaths_ = this.highlightConstants_.NOTCH;
   this.startPaths_ = this.highlightConstants_.START_HAT;
-  this.jaggedTeethPaths_ =
-      this.highlightConstants_.JAGGED_TEETH;
+  this.jaggedTeethPaths_ = this.highlightConstants_.JAGGED_TEETH;
 };
 
 /**
@@ -78,177 +81,175 @@ Blockly.geras.Highlighter = function(info) {
  * @return {string} The steps for the highlight path.
  * @package
  */
-Blockly.geras.Highlighter.prototype.getPath = function() {
+Highlighter.prototype.getPath = function() {
   return this.steps_ + '\n' + this.inlineSteps_;
 };
 
-Blockly.geras.Highlighter.prototype.drawTopCorner = function(row) {
-  this.steps_ += Blockly.utils.svgPaths.moveBy(row.xPos, this.info_.startY);
-  for (var i = 0, elem; (elem = row.elements[i]); i++) {
-    if (Blockly.blockRendering.Types.isLeftSquareCorner(elem)) {
+Highlighter.prototype.drawTopCorner = function(row) {
+  this.steps_ += svgPaths.moveBy(row.xPos, this.info_.startY);
+  for (let i = 0, elem; (elem = row.elements[i]); i++) {
+    if (Types.isLeftSquareCorner(elem)) {
       this.steps_ += this.highlightConstants_.START_POINT;
-    } else if (Blockly.blockRendering.Types.isLeftRoundedCorner(elem)) {
+    } else if (Types.isLeftRoundedCorner(elem)) {
       this.steps_ += this.outsideCornerPaths_.topLeft(this.RTL_);
-    } else if (Blockly.blockRendering.Types.isPreviousConnection(elem)) {
+    } else if (Types.isPreviousConnection(elem)) {
       this.steps_ += this.notchPaths_.pathLeft;
-    } else if (Blockly.blockRendering.Types.isHat(elem)) {
+    } else if (Types.isHat(elem)) {
       this.steps_ += this.startPaths_.path(this.RTL_);
-    } else if (Blockly.blockRendering.Types.isSpacer(elem) && elem.width != 0) {
+    } else if (Types.isSpacer(elem) && elem.width != 0) {
       // The end point of the spacer needs to be offset by the highlight amount.
       // So instead of using the spacer's width for a relative horizontal, use
       // its width and position for an absolute horizontal move.
-      this.steps_ += Blockly.utils.svgPaths.lineOnAxis('H',
-          elem.xPos + elem.width - this.highlightOffset_);
+      this.steps_ += svgPaths.lineOnAxis(
+          'H', elem.xPos + elem.width - this.highlightOffset_);
     }
   }
 
-  var right = row.xPos + row.width - this.highlightOffset_;
-  this.steps_ += Blockly.utils.svgPaths.lineOnAxis('H', right);
+  const right = row.xPos + row.width - this.highlightOffset_;
+  this.steps_ += svgPaths.lineOnAxis('H', right);
 };
 
-Blockly.geras.Highlighter.prototype.drawJaggedEdge_ = function(row) {
+Highlighter.prototype.drawJaggedEdge_ = function(row) {
   if (this.info_.RTL) {
-    var remainder =
+    const remainder =
         row.height - this.jaggedTeethPaths_.height - this.highlightOffset_;
-    this.steps_ += this.jaggedTeethPaths_.pathLeft +
-        Blockly.utils.svgPaths.lineOnAxis('v', remainder);
+    this.steps_ +=
+        this.jaggedTeethPaths_.pathLeft + svgPaths.lineOnAxis('v', remainder);
   }
 };
 
-Blockly.geras.Highlighter.prototype.drawValueInput = function(row) {
-  var input = row.getLastInput();
+Highlighter.prototype.drawValueInput = function(row) {
+  const input = row.getLastInput();
   if (this.RTL_) {
-    var belowTabHeight = row.height - input.connectionHeight;
+    const belowTabHeight = row.height - input.connectionHeight;
 
     this.steps_ +=
-        Blockly.utils.svgPaths.moveTo(
+        svgPaths.moveTo(
             input.xPos + input.width - this.highlightOffset_, row.yPos) +
         this.puzzleTabPaths_.pathDown(this.RTL_) +
-        Blockly.utils.svgPaths.lineOnAxis('v', belowTabHeight);
+        svgPaths.lineOnAxis('v', belowTabHeight);
   } else {
-    this.steps_ +=
-        Blockly.utils.svgPaths.moveTo(input.xPos + input.width, row.yPos) +
+    this.steps_ += svgPaths.moveTo(input.xPos + input.width, row.yPos) +
         this.puzzleTabPaths_.pathDown(this.RTL_);
   }
 };
 
-Blockly.geras.Highlighter.prototype.drawStatementInput = function(row) {
-  var input = row.getLastInput();
+Highlighter.prototype.drawStatementInput = function(row) {
+  const input = row.getLastInput();
   if (this.RTL_) {
-    var innerHeight = row.height - (2 * this.insideCornerPaths_.height);
-    this.steps_ +=
-        Blockly.utils.svgPaths.moveTo(input.xPos, row.yPos) +
+    const innerHeight = row.height - (2 * this.insideCornerPaths_.height);
+    this.steps_ += svgPaths.moveTo(input.xPos, row.yPos) +
         this.insideCornerPaths_.pathTop(this.RTL_) +
-        Blockly.utils.svgPaths.lineOnAxis('v', innerHeight) +
+        svgPaths.lineOnAxis('v', innerHeight) +
         this.insideCornerPaths_.pathBottom(this.RTL_) +
-        Blockly.utils.svgPaths.lineTo(
+        svgPaths.lineTo(
             row.width - input.xPos - this.insideCornerPaths_.width, 0);
   } else {
-    this.steps_ +=
-        Blockly.utils.svgPaths.moveTo(input.xPos, row.yPos + row.height) +
+    this.steps_ += svgPaths.moveTo(input.xPos, row.yPos + row.height) +
         this.insideCornerPaths_.pathBottom(this.RTL_) +
-        Blockly.utils.svgPaths.lineTo(
+        svgPaths.lineTo(
             row.width - input.xPos - this.insideCornerPaths_.width, 0);
   }
 };
 
-Blockly.geras.Highlighter.prototype.drawRightSideRow = function(row) {
-  var rightEdge = row.xPos + row.width - this.highlightOffset_;
+Highlighter.prototype.drawRightSideRow = function(row) {
+  const rightEdge = row.xPos + row.width - this.highlightOffset_;
   if (row.followsStatement) {
-    this.steps_ += Blockly.utils.svgPaths.lineOnAxis('H', rightEdge);
+    this.steps_ += svgPaths.lineOnAxis('H', rightEdge);
   }
   if (this.RTL_) {
-    this.steps_ += Blockly.utils.svgPaths.lineOnAxis('H', rightEdge);
+    this.steps_ += svgPaths.lineOnAxis('H', rightEdge);
     if (row.height > this.highlightOffset_) {
-      this.steps_ += Blockly.utils.svgPaths.lineOnAxis('V',
-          row.yPos + row.height - this.highlightOffset_);
+      this.steps_ += svgPaths.lineOnAxis(
+          'V', row.yPos + row.height - this.highlightOffset_);
     }
   }
 };
 
-Blockly.geras.Highlighter.prototype.drawBottomRow = function(row) {
+Highlighter.prototype.drawBottomRow = function(row) {
   // Highlight the vertical edge of the bottom row on the input side.
   // Highlighting is always from the top left, both in LTR and RTL.
   if (this.RTL_) {
     this.steps_ +=
-        Blockly.utils.svgPaths.lineOnAxis('V', row.baseline - this.highlightOffset_);
+        svgPaths.lineOnAxis('V', row.baseline - this.highlightOffset_);
   } else {
-    var cornerElem = this.info_.bottomRow.elements[0];
-    if (Blockly.blockRendering.Types.isLeftSquareCorner(cornerElem)) {
-      this.steps_ += Blockly.utils.svgPaths.moveTo(
+    const cornerElem = this.info_.bottomRow.elements[0];
+    if (Types.isLeftSquareCorner(cornerElem)) {
+      this.steps_ += svgPaths.moveTo(
           row.xPos + this.highlightOffset_,
           row.baseline - this.highlightOffset_);
-    } else if (Blockly.blockRendering.Types.isLeftRoundedCorner(cornerElem)) {
-      this.steps_ += Blockly.utils.svgPaths.moveTo(row.xPos, row.baseline);
+    } else if (Types.isLeftRoundedCorner(cornerElem)) {
+      this.steps_ += svgPaths.moveTo(row.xPos, row.baseline);
       this.steps_ += this.outsideCornerPaths_.bottomLeft();
     }
   }
 };
 
-Blockly.geras.Highlighter.prototype.drawLeft = function() {
-  var outputConnection = this.info_.outputConnection;
+Highlighter.prototype.drawLeft = function() {
+  const outputConnection = this.info_.outputConnection;
   if (outputConnection) {
-    var tabBottom =
+    const tabBottom =
         outputConnection.connectionOffsetY + outputConnection.height;
     // Draw a line up to the bottom of the tab.
     if (this.RTL_) {
-      this.steps_ += Blockly.utils.svgPaths.moveTo(this.info_.startX, tabBottom);
+      this.steps_ += svgPaths.moveTo(this.info_.startX, tabBottom);
     } else {
-      var left = this.info_.startX + this.highlightOffset_;
-      var bottom = this.info_.bottomRow.baseline - this.highlightOffset_;
-      this.steps_ += Blockly.utils.svgPaths.moveTo(left, bottom);
-      this.steps_ += Blockly.utils.svgPaths.lineOnAxis('V', tabBottom);
+      const left = this.info_.startX + this.highlightOffset_;
+      const bottom = this.info_.bottomRow.baseline - this.highlightOffset_;
+      this.steps_ += svgPaths.moveTo(left, bottom);
+      this.steps_ += svgPaths.lineOnAxis('V', tabBottom);
     }
     this.steps_ += this.puzzleTabPaths_.pathUp(this.RTL_);
   }
 
   if (!this.RTL_) {
-    var topRow = this.info_.topRow;
-    if (Blockly.blockRendering.Types.isLeftRoundedCorner(topRow.elements[0])) {
-      this.steps_ += Blockly.utils.svgPaths.lineOnAxis('V', this.outsideCornerPaths_.height);
+    const topRow = this.info_.topRow;
+    if (Types.isLeftRoundedCorner(topRow.elements[0])) {
+      this.steps_ += svgPaths.lineOnAxis('V', this.outsideCornerPaths_.height);
     } else {
       this.steps_ +=
-          Blockly.utils.svgPaths.lineOnAxis('V', topRow.capline + this.highlightOffset_);
+          svgPaths.lineOnAxis('V', topRow.capline + this.highlightOffset_);
     }
   }
 };
 
-Blockly.geras.Highlighter.prototype.drawInlineInput = function(input) {
-  var offset = this.highlightOffset_;
+Highlighter.prototype.drawInlineInput = function(input) {
+  const offset = this.highlightOffset_;
 
   // Relative to the block's left.
-  var connectionRight = input.xPos + input.connectionWidth;
-  var yPos = input.centerline - input.height / 2;
-  var bottomHighlightWidth = input.width - input.connectionWidth;
-  var startY = yPos + offset;
+  const connectionRight = input.xPos + input.connectionWidth;
+  const yPos = input.centerline - input.height / 2;
+  const bottomHighlightWidth = input.width - input.connectionWidth;
+  const startY = yPos + offset;
 
   if (this.RTL_) {
-    var aboveTabHeight = input.connectionOffsetY - offset;
-    var belowTabHeight = input.height -
+    const aboveTabHeight = input.connectionOffsetY - offset;
+    const belowTabHeight = input.height -
         (input.connectionOffsetY + input.connectionHeight) + offset;
 
-    var startX = connectionRight - offset;
+    const startX = connectionRight - offset;
 
-    this.inlineSteps_ += Blockly.utils.svgPaths.moveTo(startX, startY) +
+    this.inlineSteps_ += svgPaths.moveTo(startX, startY) +
         // Right edge above tab.
-        Blockly.utils.svgPaths.lineOnAxis('v', aboveTabHeight) +
+        svgPaths.lineOnAxis('v', aboveTabHeight) +
         // Back of tab.
         this.puzzleTabPaths_.pathDown(this.RTL_) +
         // Right edge below tab.
-        Blockly.utils.svgPaths.lineOnAxis('v', belowTabHeight) +
+        svgPaths.lineOnAxis('v', belowTabHeight) +
         // Bottom.
-        Blockly.utils.svgPaths.lineOnAxis('h', bottomHighlightWidth);
+        svgPaths.lineOnAxis('h', bottomHighlightWidth);
   } else {
-
     this.inlineSteps_ +=
         // Go to top right corner.
-        Blockly.utils.svgPaths.moveTo(input.xPos + input.width + offset, startY) +
+        svgPaths.moveTo(input.xPos + input.width + offset, startY) +
         // Highlight right edge, bottom.
-        Blockly.utils.svgPaths.lineOnAxis('v', input.height) +
-        Blockly.utils.svgPaths.lineOnAxis('h', -bottomHighlightWidth) +
+        svgPaths.lineOnAxis('v', input.height) +
+        svgPaths.lineOnAxis('h', -bottomHighlightWidth) +
         // Go to top of tab.
-        Blockly.utils.svgPaths.moveTo(connectionRight, yPos + input.connectionOffsetY) +
+        svgPaths.moveTo(connectionRight, yPos + input.connectionOffsetY) +
         // Short highlight glint at bottom of tab.
         this.puzzleTabPaths_.pathDown(this.RTL_);
   }
 };
+
+exports = Highlighter;
diff --git a/tests/deps.js b/tests/deps.js
index bbf289725..14ae08221 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -133,7 +133,7 @@ goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRen
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.geras.RenderInfo', 'Blockly.utils.object', 'Blockly.utils.svgPaths']);
 goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.svgPaths'], {'lang': 'es5'});
-goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths']);
+goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras', 'Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/geras/measurables/inputs.js', ['Blockly.geras.InlineInput', 'Blockly.geras.StatementInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.PathObject', 'Blockly.geras.ConstantProvider', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object']);
@@ -210,7 +210,7 @@ goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICopyable', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);

From 084c421597977501df1f6b7e178391715dd17a7d Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 30 Jul 2021 13:44:21 -0700
Subject: [PATCH 526/833] Remove some unused functions and add deprecation
 warnings

---
 core/blockly.js | 84 +++----------------------------------------------
 core/inject.js  |  2 --
 2 files changed, 5 insertions(+), 81 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index 7ad87be94..4d14aac1e 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -76,9 +76,14 @@ Blockly.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);
   },
   get: function() {
+    Blockly.utils.deprecation.warn(
+        'Blockly.mainWorkspace', 'September 2021', 'September 2022',
+        'Blockly.getMainWorkspace()');
     return Blockly.common.getMainWorkspace();
   }
 });
@@ -96,13 +101,6 @@ Blockly.selected = null;
  */
 Blockly.draggingConnections = [];
 
-/**
- * Cached value for whether 3D is supported.
- * @type {?boolean}
- * @private
- */
-Blockly.cache3dSupported_ = null;
-
 /**
  * Container element to render the WidgetDiv, DropDownDiv and Tooltip.
  * @type {?Element}
@@ -372,78 +370,6 @@ Blockly.hueToHex = function(hue) {
       Blockly.internalConstants.HSV_VALUE * 255);
 };
 
-/**
- * Checks old colour constants are not overwritten by the host application.
- * If a constant is overwritten, it prints a console warning directing the
- * developer to use the equivalent Msg constant.
- * @package
- */
-Blockly.checkBlockColourConstants = function() {
-  Blockly.checkBlockColourConstant_(
-      'LOGIC_HUE', ['Blocks', 'logic', 'HUE'], undefined);
-  Blockly.checkBlockColourConstant_(
-      'LOGIC_HUE', ['Constants', 'Logic', 'HUE'], 210);
-  Blockly.checkBlockColourConstant_(
-      'LOOPS_HUE', ['Blocks', 'loops', 'HUE'], undefined);
-  Blockly.checkBlockColourConstant_(
-      'LOOPS_HUE', ['Constants', 'Loops', 'HUE'], 120);
-  Blockly.checkBlockColourConstant_(
-      'MATH_HUE', ['Blocks', 'math', 'HUE'], undefined);
-  Blockly.checkBlockColourConstant_(
-      'MATH_HUE', ['Constants', 'Math', 'HUE'], 230);
-  Blockly.checkBlockColourConstant_(
-      'TEXTS_HUE', ['Blocks', 'texts', 'HUE'], undefined);
-  Blockly.checkBlockColourConstant_(
-      'TEXTS_HUE', ['Constants', 'Text', 'HUE'], 160);
-  Blockly.checkBlockColourConstant_(
-      'LISTS_HUE', ['Blocks', 'lists', 'HUE'], undefined);
-  Blockly.checkBlockColourConstant_(
-      'LISTS_HUE', ['Constants', 'Lists', 'HUE'], 260);
-  Blockly.checkBlockColourConstant_(
-      'COLOUR_HUE', ['Blocks', 'colour', 'HUE'], undefined);
-  Blockly.checkBlockColourConstant_(
-      'COLOUR_HUE', ['Constants', 'Colour', 'HUE'], 20);
-  Blockly.checkBlockColourConstant_(
-      'VARIABLES_HUE', ['Blocks', 'variables', 'HUE'], undefined);
-  Blockly.checkBlockColourConstant_(
-      'VARIABLES_HUE', ['Constants', 'Variables', 'HUE'], 330);
-  // Blockly.Blocks.variables_dynamic.HUE never existed.
-  Blockly.checkBlockColourConstant_(
-      'VARIABLES_DYNAMIC_HUE', ['Constants', 'VariablesDynamic', 'HUE'], 310);
-  Blockly.checkBlockColourConstant_(
-      'PROCEDURES_HUE', ['Blocks', 'procedures', 'HUE'], undefined);
-  // Blockly.Constants.Procedures.HUE never existed.
-};
-
-/**
- * Checks for a constant in the Blockly namespace, verifying it is undefined or
- * has the old/original value. Prints a warning if this is not true.
- * @param {string} msgName The Msg constant identifier.
- * @param {!Array<string>} blocklyNamePath The name parts of the tested
- *     constant.
- * @param {number|undefined} expectedValue The expected value of the constant.
- * @private
- */
-Blockly.checkBlockColourConstant_ = function(
-    msgName, blocklyNamePath, expectedValue) {
-  var namePath = 'Blockly';
-  var value = Blockly;
-  for (var i = 0; i < blocklyNamePath.length; ++i) {
-    namePath += '.' + blocklyNamePath[i];
-    if (value) {
-      value = value[blocklyNamePath[i]];
-    }
-  }
-
-  if (value && value !== expectedValue) {
-    var warningPattern = (expectedValue === undefined) ?
-        '%1 has been removed. Use Blockly.Msg["%2"].' :
-        '%1 is deprecated and unused. Override Blockly.Msg["%2"].';
-    var warning = warningPattern.replace('%1', namePath).replace('%2', msgName);
-    console.warn(warning);
-  }
-};
-
 /**
  * Set the parent container.  This is the container element that the WidgetDiv,
  * DropDownDiv, and Tooltip are rendered into the first time `Blockly.inject`
diff --git a/core/inject.js b/core/inject.js
index 6bb3e6077..3b3715b0f 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -45,8 +45,6 @@ goog.requireType('Blockly.BlockSvg');
  * @return {!Blockly.WorkspaceSvg} Newly created main workspace.
  */
 Blockly.inject = function(container, opt_options) {
-  Blockly.checkBlockColourConstants();
-
   if (typeof container == 'string') {
     container = document.getElementById(container) ||
         document.querySelector(container);

From 1eabe91fa68f4e69fc470580b5873b5f5ba867cf Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 30 Jul 2021 13:55:17 -0700
Subject: [PATCH 527/833] Move set/getParentContainer into common

---
 core/blockly.js     | 11 +----------
 core/common.js      | 28 ++++++++++++++++++++++++++++
 core/dropdowndiv.js |  2 +-
 core/tooltip.js     |  3 ++-
 core/widgetdiv.js   |  2 +-
 tests/deps.js       |  5 +++++
 6 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index 4d14aac1e..f8dc17d3d 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -101,13 +101,6 @@ Blockly.selected = null;
  */
 Blockly.draggingConnections = [];
 
-/**
- * Container element to render the WidgetDiv, DropDownDiv and Tooltip.
- * @type {?Element}
- * @package
- */
-Blockly.parentContainer = null;
-
 /**
  * Returns the dimensions of the specified SVG image.
  * @param {!SVGElement} svg SVG image.
@@ -377,9 +370,7 @@ Blockly.hueToHex = function(hue) {
  * This method is a NOP if called after the first ``Blockly.inject``.
  * @param {!Element} container The container element.
  */
-Blockly.setParentContainer = function(container) {
-  Blockly.parentContainer = container;
-};
+Blockly.setParentContainer = Blockly.common.setParentContainer;
 
 /** Aliases. */
 
diff --git a/core/common.js b/core/common.js
index d9a6b9638..711cf3571 100644
--- a/core/common.js
+++ b/core/common.js
@@ -44,3 +44,31 @@ const setMainWorkspace = function(workspace) {
   mainWorkspace = workspace;
 };
 exports.setMainWorkspace = setMainWorkspace;
+
+/**
+ * Container element in which to render the WidgetDiv, DropDownDiv and Tooltip.
+ * @type {?Element}
+ */
+let parentContainer;
+
+/**
+ * Get the container element in which to render the WidgetDiv, DropDownDiv and\
+ * Tooltip.
+ * @return {?Element}
+ */
+const getParentContainer = function() {
+  return parentContainer;
+};
+exports.getParentContainer = getParentContainer;
+
+/**
+ * Set the parent container.  This is the container element that the WidgetDiv,
+ * DropDownDiv, and Tooltip are rendered into the first time `Blockly.inject`
+ * is called.
+ * This method is a NOP if called after the first ``Blockly.inject``.
+ * @param {!Element} newParent The container element.
+ */
+const setParentContainer = function(newParent) {
+  parentContainer = newParent;
+};
+exports.setParentContainer = setParentContainer;
diff --git a/core/dropdowndiv.js b/core/dropdowndiv.js
index bf5eddb69..5ebb22a5e 100644
--- a/core/dropdowndiv.js
+++ b/core/dropdowndiv.js
@@ -163,7 +163,7 @@ Blockly.DropDownDiv.createDom = function() {
   }
   var div = document.createElement('div');
   div.className = 'blocklyDropDownDiv';
-  var container = Blockly.parentContainer || document.body;
+  var container = Blockly.common.getParentContainer() || document.body;
   container.appendChild(div);
   /**
    * The div element.
diff --git a/core/tooltip.js b/core/tooltip.js
index 12819e13f..d93825815 100644
--- a/core/tooltip.js
+++ b/core/tooltip.js
@@ -22,6 +22,7 @@
 goog.provide('Blockly.Tooltip');
 
 goog.require('Blockly.browserEvents');
+goog.require('Blockly.common');
 goog.require('Blockly.utils.string');
 
 
@@ -170,7 +171,7 @@ Blockly.Tooltip.createDom = function() {
   // Create an HTML container for popup overlays (e.g. editor widgets).
   Blockly.Tooltip.DIV = document.createElement('div');
   Blockly.Tooltip.DIV.className = 'blocklyTooltipDiv';
-  var container = Blockly.parentContainer || document.body;
+  var container = Blockly.common.getParentContainer() || document.body;
   container.appendChild(Blockly.Tooltip.DIV);
 };
 
diff --git a/core/widgetdiv.js b/core/widgetdiv.js
index 8b7de7dac..106dce645 100644
--- a/core/widgetdiv.js
+++ b/core/widgetdiv.js
@@ -67,7 +67,7 @@ Blockly.WidgetDiv.createDom = function() {
    */
   Blockly.WidgetDiv.DIV = document.createElement('div');
   Blockly.WidgetDiv.DIV.className = 'blocklyWidgetDiv';
-  var container = Blockly.parentContainer || document.body;
+  var container = Blockly.common.getParentContainer() || document.body;
   container.appendChild(Blockly.WidgetDiv.DIV);
 };
 
diff --git a/tests/deps.js b/tests/deps.js
index 14ae08221..784fc398a 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -172,8 +172,13 @@ goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory']
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+<<<<<<< HEAD
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem', 'Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.utils.string']);
+=======
+goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem']);
+goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.string']);
+>>>>>>> c62fba04 (Move set/getParentContainer into common)
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});

From d5a6d7d3db2d929ad174fb59e3bddfc52eea3c3c Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 30 Jul 2021 14:13:39 -0700
Subject: [PATCH 528/833] Move draggingConnections to common

---
 core/block_dragger.js      |  3 ++-
 core/block_svg.js          |  8 +++++---
 core/blockly.js            |  8 --------
 core/common.js             | 31 ++++++++++++++++++++++++++++++-
 core/connection_checker.js |  5 +++--
 tests/deps.js              |  6 +++---
 6 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/core/block_dragger.js b/core/block_dragger.js
index b7c11e8a3..7345c0327 100644
--- a/core/block_dragger.js
+++ b/core/block_dragger.js
@@ -24,6 +24,7 @@ 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 common = goog.require('Blockly.common');
 const dom = goog.require('Blockly.utils.dom');
 const events = goog.require('Blockly.Events');
 const registry = goog.require('Blockly.registry');
@@ -332,7 +333,7 @@ BlockDragger.prototype.maybeDeleteBlock_ = function() {
     // Fire a move event, so we know where to go back to for an undo.
     this.fireMoveEvent_();
     this.draggingBlock_.dispose(false, true);
-    Blockly.draggingConnections = [];
+    common.setDraggingConnections([]);
     return true;
   }
   return false;
diff --git a/core/block_svg.js b/core/block_svg.js
index 57d20c1ba..cbb69063e 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -17,6 +17,7 @@ goog.require('Blockly.Block');
 goog.require('Blockly.blockAnimations');
 goog.require('Blockly.blockRendering.IPathObject');
 goog.require('Blockly.browserEvents');
+goog.require('Blockly.common');
 goog.require('Blockly.connectionTypes');
 goog.require('Blockly.constants');
 goog.require('Blockly.ContextMenu');
@@ -824,12 +825,13 @@ Blockly.BlockSvg.prototype.setDragging = function(adding) {
     var group = this.getSvgRoot();
     group.translate_ = '';
     group.skew_ = '';
-    Blockly.draggingConnections =
-        Blockly.draggingConnections.concat(this.getConnections_(true));
+    var newList =
+        Blockly.common.getDraggingConnections().concat(this.getConnections_(true));
+    Blockly.common.setDraggingConnections(newList);
     Blockly.utils.dom.addClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDragging');
   } else {
-    Blockly.draggingConnections = [];
+    Blockly.common.setDraggingConnections([]);
     Blockly.utils.dom.removeClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDragging');
   }
diff --git a/core/blockly.js b/core/blockly.js
index f8dc17d3d..1f8cfa55a 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -57,7 +57,6 @@ goog.require('Blockly.WorkspaceSvg');
 goog.require('Blockly.Xml');
 
 goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.Connection');
 goog.requireType('Blockly.ICopyable');
 goog.requireType('Blockly.Workspace');
 
@@ -94,13 +93,6 @@ Object.defineProperty(Blockly, 'mainWorkspace', {
  */
 Blockly.selected = null;
 
-/**
- * All of the connections on blocks that are currently being dragged.
- * @type {!Array<!Blockly.Connection>}
- * @package
- */
-Blockly.draggingConnections = [];
-
 /**
  * Returns the dimensions of the specified SVG image.
  * @param {!SVGElement} svg SVG image.
diff --git a/core/common.js b/core/common.js
index 711cf3571..762ac8f3f 100644
--- a/core/common.js
+++ b/core/common.js
@@ -14,6 +14,8 @@
 goog.module('Blockly.common');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
+const Connection = goog.requireType('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
 
@@ -54,7 +56,7 @@ let parentContainer;
 /**
  * Get the container element in which to render the WidgetDiv, DropDownDiv and\
  * Tooltip.
- * @return {?Element}
+ * @return {?Element} The parent container.
  */
 const getParentContainer = function() {
   return parentContainer;
@@ -72,3 +74,30 @@ const setParentContainer = function(newParent) {
   parentContainer = newParent;
 };
 exports.setParentContainer = setParentContainer;
+
+/**
+ * All of the connections on blocks that are currently being dragged.
+ * @type {!Array.<!Connection>}
+ */
+let draggingConnections = [];
+
+/**
+ * Get the list of dragging connections.
+ * @returns {!Array.<!Connection>} The list of connections on blocks that are
+ *     currently being dragged.
+ */
+const getDraggingConnections = function() {
+  return draggingConnections;
+};
+/** @package **/
+exports.getDraggingConnections = getDraggingConnections;
+
+/**
+ * Set the list of dragging connections.
+ * @param {!Array.<!Connection>} connectionList The new list of connections on
+ *     blocks that are currently being dragged.
+ */
+const setDraggingConnections = function(connectionList) {
+  draggingConnections = connectionList;
+};
+exports.setDraggingConnections = setDraggingConnections;
diff --git a/core/connection_checker.js b/core/connection_checker.js
index 20a582aac..c6fb1fd9b 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -19,6 +19,7 @@ const Connection = goog.require('Blockly.Connection');
 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 connectionTypes = goog.require('Blockly.connectionTypes');
 const internalConstants = goog.require('Blockly.internalConstants');
 const registry = goog.require('Blockly.registry');
@@ -239,7 +240,7 @@ ConnectionChecker.prototype.doDragChecks = function(a, b, distance) {
   }
 
   // Don't let blocks try to connect to themselves or ones they nest.
-  if (Blockly.draggingConnections.indexOf(b) != -1) {
+  if (common.getDraggingConnections().indexOf(b) != -1) {
     return false;
   }
 
@@ -263,7 +264,7 @@ ConnectionChecker.prototype.canConnectToPrevious_ = function(a, b) {
   }
 
   // Don't let blocks try to connect to themselves or ones they nest.
-  if (Blockly.draggingConnections.indexOf(b) != -1) {
+  if (common.getDraggingConnections().indexOf(b) != -1) {
     return false;
   }
 
diff --git a/tests/deps.js b/tests/deps.js
index 784fc398a..2438a641b 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -10,8 +10,8 @@ goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.Vari
 goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.IASTNodeLocation', 'Blockly.IDeletable', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.Workspace', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es5'});
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', '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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', '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']);
+goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', '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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', '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']);
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 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'});
@@ -22,7 +22,7 @@ goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubbl
 goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.RenderedConnection', 'Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});

From 36c02120e9bdff8ae60a588016a42dd86be7ef62 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Mon, 2 Aug 2021 20:10:10 -0700
Subject: [PATCH 529/833] Rebuild

---
 tests/deps.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/deps.js b/tests/deps.js
index 2438a641b..e1834d0a3 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -172,13 +172,8 @@ goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory']
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
-<<<<<<< HEAD
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem', 'Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.utils.string']);
-=======
-goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem']);
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.string']);
->>>>>>> c62fba04 (Move set/getParentContainer into common)
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});

From 7bc461ea833878fef147f6f683fbb9c6f2fd0eca Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Wed, 4 Aug 2021 17:17:24 -0700
Subject: [PATCH 530/833] polish: export draggingConnections directly

---
 core/block_dragger.js      |  2 +-
 core/block_svg.js          |  6 ++----
 core/common.js             | 25 ++-----------------------
 core/connection_checker.js |  4 ++--
 tests/deps.js              |  2 +-
 5 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/core/block_dragger.js b/core/block_dragger.js
index 7345c0327..6e5ac10c1 100644
--- a/core/block_dragger.js
+++ b/core/block_dragger.js
@@ -333,7 +333,7 @@ BlockDragger.prototype.maybeDeleteBlock_ = function() {
     // Fire a move event, so we know where to go back to for an undo.
     this.fireMoveEvent_();
     this.draggingBlock_.dispose(false, true);
-    common.setDraggingConnections([]);
+    common.draggingConnections.length = 0;
     return true;
   }
   return false;
diff --git a/core/block_svg.js b/core/block_svg.js
index cbb69063e..fbd3dd5dc 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -825,13 +825,11 @@ Blockly.BlockSvg.prototype.setDragging = function(adding) {
     var group = this.getSvgRoot();
     group.translate_ = '';
     group.skew_ = '';
-    var newList =
-        Blockly.common.getDraggingConnections().concat(this.getConnections_(true));
-    Blockly.common.setDraggingConnections(newList);
+    Blockly.common.draggingConnections.push(...this.getConnections_(true));
     Blockly.utils.dom.addClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDragging');
   } else {
-    Blockly.common.setDraggingConnections([]);
+    Blockly.common.draggingConnections.length = 0;
     Blockly.utils.dom.removeClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDragging');
   }
diff --git a/core/common.js b/core/common.js
index 762ac8f3f..b6d7ad369 100644
--- a/core/common.js
+++ b/core/common.js
@@ -77,27 +77,6 @@ exports.setParentContainer = setParentContainer;
 
 /**
  * All of the connections on blocks that are currently being dragged.
- * @type {!Array.<!Connection>}
+ * @type {!Array<!Connection>}
  */
-let draggingConnections = [];
-
-/**
- * Get the list of dragging connections.
- * @returns {!Array.<!Connection>} The list of connections on blocks that are
- *     currently being dragged.
- */
-const getDraggingConnections = function() {
-  return draggingConnections;
-};
-/** @package **/
-exports.getDraggingConnections = getDraggingConnections;
-
-/**
- * Set the list of dragging connections.
- * @param {!Array.<!Connection>} connectionList The new list of connections on
- *     blocks that are currently being dragged.
- */
-const setDraggingConnections = function(connectionList) {
-  draggingConnections = connectionList;
-};
-exports.setDraggingConnections = setDraggingConnections;
+exports.draggingConnections = [];
diff --git a/core/connection_checker.js b/core/connection_checker.js
index c6fb1fd9b..76162b017 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -240,7 +240,7 @@ ConnectionChecker.prototype.doDragChecks = function(a, b, distance) {
   }
 
   // Don't let blocks try to connect to themselves or ones they nest.
-  if (common.getDraggingConnections().indexOf(b) != -1) {
+  if (common.draggingConnections.indexOf(b) != -1) {
     return false;
   }
 
@@ -264,7 +264,7 @@ ConnectionChecker.prototype.canConnectToPrevious_ = function(a, b) {
   }
 
   // Don't let blocks try to connect to themselves or ones they nest.
-  if (common.getDraggingConnections().indexOf(b) != -1) {
+  if (common.draggingConnections.indexOf(b) != -1) {
     return false;
   }
 
diff --git a/tests/deps.js b/tests/deps.js
index e1834d0a3..0cb50f476 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -11,7 +11,7 @@ goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode',
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', '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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', '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']);
+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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', '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'});
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 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'});

From 08cdbcf8c73671f53eb89a07eec55206040a9c58 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Wed, 4 Aug 2021 17:35:34 -0700
Subject: [PATCH 531/833] fix: update tag module workflow to add labels instead
 of setting one label

---
 .github/workflows/tag_module_cleanup.yml | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tag_module_cleanup.yml b/.github/workflows/tag_module_cleanup.yml
index 94e7ec692..9cec19500 100644
--- a/.github/workflows/tag_module_cleanup.yml
+++ b/.github/workflows/tag_module_cleanup.yml
@@ -5,14 +5,14 @@ name: Tag module cleanup
 
 # Trigger on pull requests against goog_module branch only
 # Uses pull_request_target to get write permissions so that it can write labels.
-on: 
+on:
   pull_request_target:
     branches:
       - goog_module
 
 jobs:
   tag-module-cleanup:
-  
+
     # Add the type: cleanup label
     runs-on: ubuntu-latest
     steps:
@@ -23,13 +23,22 @@ jobs:
             // https://github.com/google/blockly/milestone/18
             const milestoneNumber = 18;
             // Note that pull requests are accessed through the issues API.
-            const issuesUpdateParams = { 
-              owner: context.repo.owner, 
-              repo: context.repo.repo, 
+
+            const issueGetParams = {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number
+            }
+
+            const issueInfo = await github.issues.get(issueGetParams)
+
+            const issuesUpdateParams = {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
               // Adds the milestone
-              milestone: milestoneNumber, 
+              milestone: milestoneNumber,
               issue_number: context.issue.number,
               // Sets the labels
-              labels: ['type: cleanup']
+              labels: [...issueInfo.labels, 'type: cleanup']
             }
             await github.issues.update(issuesUpdateParams)

From 80b521e8d7a0d376793f399170a9643afc404738 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 5 Aug 2021 08:09:10 -0700
Subject: [PATCH 532/833] Migrate core/renderers/geras/info.js to goog.module
 syntax (#5305)

* Migrate core/renderers/geras/info.js to ES6 const/let

* Migrate core/renderers/geras/info.js to goog.module

* Migrate core/renderers/geras/info.js to named requires

* clang-format core/renderers/geras/info.js
---
 core/renderers/geras/info.js | 280 +++++++++++++++++------------------
 tests/deps.js                |   2 +-
 2 files changed, 133 insertions(+), 149 deletions(-)

diff --git a/core/renderers/geras/info.js b/core/renderers/geras/info.js
index 121e3b353..582aab2da 100644
--- a/core/renderers/geras/info.js
+++ b/core/renderers/geras/info.js
@@ -11,22 +11,25 @@
  */
 'use strict';
 
-goog.provide('Blockly.geras');
-goog.provide('Blockly.geras.RenderInfo');
+goog.module('Blockly.geras.RenderInfo');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.ExternalValueInput');
-goog.require('Blockly.blockRendering.InputRow');
-goog.require('Blockly.blockRendering.InRowSpacer');
-goog.require('Blockly.blockRendering.RenderInfo');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.geras.InlineInput');
-goog.require('Blockly.geras.StatementInput');
-goog.require('Blockly.inputTypes');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.Field');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.geras.Renderer');
+const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const ExternalValueInput = goog.require('Blockly.blockRendering.ExternalValueInput');
+/* eslint-disable-next-line no-unused-vars */
+const Field = goog.requireType('Blockly.blockRendering.Field');
+const InlineInput = goog.require('Blockly.geras.InlineInput');
+/* eslint-disable-next-line no-unused-vars */
+const InputRow = goog.requireType('Blockly.blockRendering.InputRow');
+const InRowSpacer = goog.require('Blockly.blockRendering.InRowSpacer');
+/* eslint-disable-next-line no-unused-vars */
+const Renderer = goog.requireType('Blockly.geras.Renderer');
+const StatementInput = goog.require('Blockly.geras.StatementInput');
+const Types = goog.require('Blockly.blockRendering.Types');
+const inputTypes = goog.require('Blockly.inputTypes');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -36,36 +39,35 @@ goog.requireType('Blockly.geras.Renderer');
  * may choose to rerender when getSize() is called).  However, calling it
  * repeatedly may be expensive.
  *
- * @param {!Blockly.geras.Renderer} renderer The renderer in use.
- * @param {!Blockly.BlockSvg} block The block to measure.
+ * @param {!Renderer} renderer The renderer in use.
+ * @param {!BlockSvg} block The block to measure.
  * @constructor
  * @package
- * @extends {Blockly.blockRendering.RenderInfo}
+ * @extends {BaseRenderInfo}
  */
-Blockly.geras.RenderInfo = function(renderer, block) {
-  Blockly.geras.RenderInfo.superClass_.constructor.call(this, renderer, block);
+const RenderInfo = function(renderer, block) {
+  RenderInfo.superClass_.constructor.call(this, renderer, block);
 };
-Blockly.utils.object.inherits(Blockly.geras.RenderInfo,
-    Blockly.blockRendering.RenderInfo);
+object.inherits(RenderInfo, BaseRenderInfo);
 
 /**
  * Get the block renderer in use.
- * @return {!Blockly.geras.Renderer} The block renderer in use.
+ * @return {!Renderer} The block renderer in use.
  * @package
  */
-Blockly.geras.RenderInfo.prototype.getRenderer = function() {
-  return /** @type {!Blockly.geras.Renderer} */ (this.renderer_);
+RenderInfo.prototype.getRenderer = function() {
+  return /** @type {!Renderer} */ (this.renderer_);
 };
 
 /**
  * @override
  */
-Blockly.geras.RenderInfo.prototype.populateBottomRow_ = function() {
-  Blockly.geras.RenderInfo.superClass_.populateBottomRow_.call(this);
+RenderInfo.prototype.populateBottomRow_ = function() {
+  RenderInfo.superClass_.populateBottomRow_.call(this);
 
-  var followsStatement = this.block_.inputList.length &&
+  const followsStatement = this.block_.inputList.length &&
       this.block_.inputList[this.block_.inputList.length - 1].type ==
-          Blockly.inputTypes.STATEMENT;
+          inputTypes.STATEMENT;
 
   // The minimum height of the bottom row is smaller in Geras than in other
   // renderers, because the dark path adds a pixel.
@@ -75,31 +77,27 @@ Blockly.geras.RenderInfo.prototype.populateBottomRow_ = function() {
     this.bottomRow.minHeight =
         this.constants_.MEDIUM_PADDING - this.constants_.DARK_PATH_OFFSET;
   }
-
 };
 
 /**
  * @override
  */
-Blockly.geras.RenderInfo.prototype.addInput_ = function(input, activeRow) {
+RenderInfo.prototype.addInput_ = function(input, activeRow) {
   // Non-dummy inputs have visual representations onscreen.
-  if (this.isInline && input.type == Blockly.inputTypes.VALUE) {
-    activeRow.elements.push(
-        new Blockly.geras.InlineInput(this.constants_, input));
+  if (this.isInline && input.type == inputTypes.VALUE) {
+    activeRow.elements.push(new InlineInput(this.constants_, input));
     activeRow.hasInlineInput = true;
-  } else if (input.type == Blockly.inputTypes.STATEMENT) {
-    activeRow.elements.push(
-        new Blockly.geras.StatementInput(this.constants_, input));
+  } else if (input.type == inputTypes.STATEMENT) {
+    activeRow.elements.push(new StatementInput(this.constants_, input));
     activeRow.hasStatement = true;
-  } else if (input.type == Blockly.inputTypes.VALUE) {
-    activeRow.elements.push(
-        new Blockly.blockRendering.ExternalValueInput(this.constants_, input));
+  } else if (input.type == inputTypes.VALUE) {
+    activeRow.elements.push(new ExternalValueInput(this.constants_, input));
     activeRow.hasExternalInput = true;
-  } else if (input.type == Blockly.inputTypes.DUMMY) {
+  } else if (input.type == inputTypes.DUMMY) {
     // Dummy inputs have no visual representation, but the information is still
     // important.
-    activeRow.minHeight = Math.max(activeRow.minHeight,
-        this.constants_.DUMMY_INPUT_MIN_HEIGHT);
+    activeRow.minHeight =
+        Math.max(activeRow.minHeight, this.constants_.DUMMY_INPUT_MIN_HEIGHT);
     activeRow.hasDummyInput = true;
   }
   // Ignore row alignment if inline.
@@ -111,40 +109,38 @@ Blockly.geras.RenderInfo.prototype.addInput_ = function(input, activeRow) {
 /**
  * @override
  */
-Blockly.geras.RenderInfo.prototype.addElemSpacing_ = function() {
-  var hasExternalInputs = false;
-  for (var i = 0, row; (row = this.rows[i]); i++) {
+RenderInfo.prototype.addElemSpacing_ = function() {
+  let hasExternalInputs = false;
+  for (let i = 0, row; (row = this.rows[i]); i++) {
     if (row.hasExternalInput) {
       hasExternalInputs = true;
     }
   }
-  for (var i = 0, row; (row = this.rows[i]); i++) {
-    var oldElems = row.elements;
+  for (let i = 0, row; (row = this.rows[i]); i++) {
+    const oldElems = row.elements;
     row.elements = [];
     // No spacing needed before the corner on the top row or the bottom row.
     if (row.startsWithElemSpacer()) {
       // There's a spacer before the first element in the row.
-      row.elements.push(new Blockly.blockRendering.InRowSpacer(
+      row.elements.push(new InRowSpacer(
           this.constants_, this.getInRowSpacing_(null, oldElems[0])));
     }
     if (!oldElems.length) {
       continue;
     }
-    for (var e = 0; e < oldElems.length - 1; e++) {
+    for (let e = 0; e < oldElems.length - 1; e++) {
       row.elements.push(oldElems[e]);
-      var spacing = this.getInRowSpacing_(oldElems[e], oldElems[e + 1]);
-      row.elements.push(
-          new Blockly.blockRendering.InRowSpacer(this.constants_, spacing));
+      const spacing = this.getInRowSpacing_(oldElems[e], oldElems[e + 1]);
+      row.elements.push(new InRowSpacer(this.constants_, spacing));
     }
     row.elements.push(oldElems[oldElems.length - 1]);
     if (row.endsWithElemSpacer()) {
-      var spacing = this.getInRowSpacing_(oldElems[oldElems.length - 1], null);
+      let spacing = this.getInRowSpacing_(oldElems[oldElems.length - 1], null);
       if (hasExternalInputs && row.hasDummyInput) {
         spacing += this.constants_.TAB_WIDTH;
       }
       // There's a spacer after the last element in the row.
-      row.elements.push(new Blockly.blockRendering.InRowSpacer(
-          this.constants_, spacing));
+      row.elements.push(new InRowSpacer(this.constants_, spacing));
     }
   }
 };
@@ -152,18 +148,18 @@ Blockly.geras.RenderInfo.prototype.addElemSpacing_ = function() {
 /**
  * @override
  */
-Blockly.geras.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
+RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   if (!prev) {
     // Between an editable field and the beginning of the row.
-    if (next && Blockly.blockRendering.Types.isField(next) &&
-        (/** @type {Blockly.blockRendering.Field} */ (next)).isEditable) {
+    if (next && Types.isField(next) &&
+        (/** @type {Field} */ (next)).isEditable) {
       return this.constants_.MEDIUM_PADDING;
     }
     // Inline input at the beginning of the row.
-    if (next && Blockly.blockRendering.Types.isInlineInput(next)) {
+    if (next && Types.isInlineInput(next)) {
       return this.constants_.MEDIUM_LARGE_PADDING;
     }
-    if (next && Blockly.blockRendering.Types.isStatementInput(next)) {
+    if (next && Types.isStatementInput(next)) {
       return this.constants_.STATEMENT_INPUT_PADDING_LEFT;
     }
     // Anything else at the beginning of the row.
@@ -171,30 +167,28 @@ Blockly.geras.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   }
 
   // Spacing between a non-input and the end of the row or a statement input.
-  if (!Blockly.blockRendering.Types.isInput(prev) && (!next ||
-      Blockly.blockRendering.Types.isStatementInput(next))) {
+  if (!Types.isInput(prev) && (!next || Types.isStatementInput(next))) {
     // Between an editable field and the end of the row.
-    if (Blockly.blockRendering.Types.isField(prev) &&
-        (/** @type {Blockly.blockRendering.Field} */ (prev)).isEditable) {
+    if (Types.isField(prev) && (/** @type {Field} */ (prev)).isEditable) {
       return this.constants_.MEDIUM_PADDING;
     }
     // Padding at the end of an icon-only row to make the block shape clearer.
-    if (Blockly.blockRendering.Types.isIcon(prev)) {
+    if (Types.isIcon(prev)) {
       return (this.constants_.LARGE_PADDING * 2) + 1;
     }
-    if (Blockly.blockRendering.Types.isHat(prev)) {
+    if (Types.isHat(prev)) {
       return this.constants_.NO_PADDING;
     }
     // Establish a minimum width for a block with a previous or next connection.
-    if (Blockly.blockRendering.Types.isPreviousOrNextConnection(prev)) {
+    if (Types.isPreviousOrNextConnection(prev)) {
       return this.constants_.LARGE_PADDING;
     }
     // Between rounded corner and the end of the row.
-    if (Blockly.blockRendering.Types.isLeftRoundedCorner(prev)) {
+    if (Types.isLeftRoundedCorner(prev)) {
       return this.constants_.MIN_BLOCK_WIDTH;
     }
     // Between a jagged edge and the end of the row.
-    if (Blockly.blockRendering.Types.isJaggedEdge(prev)) {
+    if (Types.isJaggedEdge(prev)) {
       return this.constants_.NO_PADDING;
     }
     // Between noneditable fields and icons and the end of the row.
@@ -202,33 +196,31 @@ Blockly.geras.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   }
 
   // Between inputs and the end of the row.
-  if (Blockly.blockRendering.Types.isInput(prev) && !next) {
-    if (Blockly.blockRendering.Types.isExternalInput(prev)) {
+  if (Types.isInput(prev) && !next) {
+    if (Types.isExternalInput(prev)) {
       return this.constants_.NO_PADDING;
-    } else if (Blockly.blockRendering.Types.isInlineInput(prev)) {
+    } else if (Types.isInlineInput(prev)) {
       return this.constants_.LARGE_PADDING;
-    } else if (Blockly.blockRendering.Types.isStatementInput(prev)) {
+    } else if (Types.isStatementInput(prev)) {
       return this.constants_.NO_PADDING;
     }
   }
 
   // Spacing between a non-input and an input.
-  if (!Blockly.blockRendering.Types.isInput(prev) &&
-      next && Blockly.blockRendering.Types.isInput(next)) {
+  if (!Types.isInput(prev) && next && Types.isInput(next)) {
     // Between an editable field and an input.
-    if (Blockly.blockRendering.Types.isField(prev) &&
-        (/** @type {Blockly.blockRendering.Field} */ (prev)).isEditable) {
-      if (Blockly.blockRendering.Types.isInlineInput(next)) {
+    if (Types.isField(prev) && (/** @type {Field} */ (prev)).isEditable) {
+      if (Types.isInlineInput(next)) {
         return this.constants_.SMALL_PADDING;
-      } else if (Blockly.blockRendering.Types.isExternalInput(next)) {
+      } else if (Types.isExternalInput(next)) {
         return this.constants_.SMALL_PADDING;
       }
     } else {
-      if (Blockly.blockRendering.Types.isInlineInput(next)) {
+      if (Types.isInlineInput(next)) {
         return this.constants_.MEDIUM_LARGE_PADDING;
-      } else if (Blockly.blockRendering.Types.isExternalInput(next)) {
+      } else if (Types.isExternalInput(next)) {
         return this.constants_.MEDIUM_LARGE_PADDING;
-      } else if (Blockly.blockRendering.Types.isStatementInput(next)) {
+      } else if (Types.isStatementInput(next)) {
         return this.constants_.LARGE_PADDING;
       }
     }
@@ -236,16 +228,14 @@ Blockly.geras.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   }
 
   // Spacing between an icon and an icon or field.
-  if (Blockly.blockRendering.Types.isIcon(prev) &&
-      next && !Blockly.blockRendering.Types.isInput(next)) {
+  if (Types.isIcon(prev) && next && !Types.isInput(next)) {
     return this.constants_.LARGE_PADDING;
   }
 
   // Spacing between an inline input and a field.
-  if (Blockly.blockRendering.Types.isInlineInput(prev) &&
-      next && Blockly.blockRendering.Types.isField(next)) {
+  if (Types.isInlineInput(prev) && next && Types.isField(next)) {
     // Editable field after inline input.
-    if ((/** @type {Blockly.blockRendering.Field} */ (next)).isEditable) {
+    if ((/** @type {Field} */ (next)).isEditable) {
       return this.constants_.MEDIUM_PADDING;
     } else {
       // Noneditable field after inline input.
@@ -253,46 +243,43 @@ Blockly.geras.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
     }
   }
 
-  if (Blockly.blockRendering.Types.isLeftSquareCorner(prev) && next) {
+  if (Types.isLeftSquareCorner(prev) && next) {
     // Spacing between a hat and a corner
-    if (Blockly.blockRendering.Types.isHat(next)) {
+    if (Types.isHat(next)) {
       return this.constants_.NO_PADDING;
     }
     // Spacing between a square corner and a previous or next connection
-    if (Blockly.blockRendering.Types.isPreviousConnection(next)) {
+    if (Types.isPreviousConnection(next)) {
       return next.notchOffset;
-    } else if (Blockly.blockRendering.Types.isNextConnection(next)) {
+    } else if (Types.isNextConnection(next)) {
       // Next connections are shifted slightly to the left (in both LTR and RTL)
       // to make the dark path under the previous connection show through.
-      var offset = (this.RTL ? 1 : -1) *
-          this.constants_.DARK_PATH_OFFSET / 2;
+      const offset = (this.RTL ? 1 : -1) * this.constants_.DARK_PATH_OFFSET / 2;
       return next.notchOffset + offset;
     }
   }
 
   // Spacing between a rounded corner and a previous or next connection.
-  if (Blockly.blockRendering.Types.isLeftRoundedCorner(prev) && next) {
-    if (Blockly.blockRendering.Types.isPreviousConnection(next)) {
+  if (Types.isLeftRoundedCorner(prev) && next) {
+    if (Types.isPreviousConnection(next)) {
       return next.notchOffset - this.constants_.CORNER_RADIUS;
-    } else if (Blockly.blockRendering.Types.isNextConnection(next)) {
+    } else if (Types.isNextConnection(next)) {
       // Next connections are shifted slightly to the left (in both LTR and RTL)
       // to make the dark path under the previous connection show through.
-      var offset = (this.RTL ? 1 : -1) *
-          this.constants_.DARK_PATH_OFFSET / 2;
+      const offset = (this.RTL ? 1 : -1) * this.constants_.DARK_PATH_OFFSET / 2;
       return next.notchOffset - this.constants_.CORNER_RADIUS + offset;
     }
   }
 
   // Spacing between two fields of the same editability.
-  if (Blockly.blockRendering.Types.isField(prev) &&
-      next && Blockly.blockRendering.Types.isField(next) &&
-      ((/** @type {Blockly.blockRendering.Field} */ (prev)).isEditable ==
-          (/** @type {Blockly.blockRendering.Field} */ (next)).isEditable)) {
+  if (Types.isField(prev) && next && Types.isField(next) &&
+      ((/** @type {Field} */ (prev)).isEditable ==
+       (/** @type {Field} */ (next)).isEditable)) {
     return this.constants_.LARGE_PADDING;
   }
 
   // Spacing between anything and a jagged edge.
-  if (next && Blockly.blockRendering.Types.isJaggedEdge(next)) {
+  if (next && Types.isJaggedEdge(next)) {
     return this.constants_.LARGE_PADDING;
   }
 
@@ -302,15 +289,13 @@ Blockly.geras.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
 /**
  * @override
  */
-Blockly.geras.RenderInfo.prototype.getSpacerRowHeight_ = function(prev, next) {
+RenderInfo.prototype.getSpacerRowHeight_ = function(prev, next) {
   // If we have an empty block add a spacer to increase the height.
-  if (Blockly.blockRendering.Types.isTopRow(prev) &&
-      Blockly.blockRendering.Types.isBottomRow(next)) {
+  if (Types.isTopRow(prev) && Types.isBottomRow(next)) {
     return this.constants_.EMPTY_BLOCK_SPACER_HEIGHT;
   }
   // Top and bottom rows act as a spacer so we don't need any extra padding.
-  if (Blockly.blockRendering.Types.isTopRow(prev) ||
-      Blockly.blockRendering.Types.isBottomRow(next)) {
+  if (Types.isTopRow(prev) || Types.isBottomRow(next)) {
     return this.constants_.NO_PADDING;
   }
   if (prev.hasExternalInput && next.hasExternalInput) {
@@ -334,33 +319,32 @@ Blockly.geras.RenderInfo.prototype.getSpacerRowHeight_ = function(prev, next) {
 /**
  * @override
  */
-Blockly.geras.RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
-  if (Blockly.blockRendering.Types.isSpacer(elem)) {
+RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
+  if (Types.isSpacer(elem)) {
     return row.yPos + elem.height / 2;
   }
-  if (Blockly.blockRendering.Types.isBottomRow(row)) {
-    var baseline = row.yPos + row.height - row.descenderHeight;
-    if (Blockly.blockRendering.Types.isNextConnection(elem)) {
+  if (Types.isBottomRow(row)) {
+    const baseline = row.yPos + row.height - row.descenderHeight;
+    if (Types.isNextConnection(elem)) {
       return baseline + elem.height / 2;
     }
     return baseline - elem.height / 2;
   }
-  if (Blockly.blockRendering.Types.isTopRow(row)) {
-    if (Blockly.blockRendering.Types.isHat(elem)) {
+  if (Types.isTopRow(row)) {
+    if (Types.isHat(elem)) {
       return row.capline - elem.height / 2;
     }
     return row.capline + elem.height / 2;
   }
 
-  var result = row.yPos;
-  if (Blockly.blockRendering.Types.isField(elem) ||
-      Blockly.blockRendering.Types.isIcon(elem)) {
+  let result = row.yPos;
+  if (Types.isField(elem) || Types.isIcon(elem)) {
     result += (elem.height / 2);
     if ((row.hasInlineInput || row.hasStatement) &&
         elem.height + this.constants_.TALL_INPUT_FIELD_OFFSET_Y <= row.height) {
       result += this.constants_.TALL_INPUT_FIELD_OFFSET_Y;
     }
-  } else if (Blockly.blockRendering.Types.isInlineInput(elem)) {
+  } else if (Types.isInlineInput(elem)) {
     result += elem.height / 2;
   } else {
     result += (row.height / 2);
@@ -371,22 +355,22 @@ Blockly.geras.RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
 /**
  * @override
  */
-Blockly.geras.RenderInfo.prototype.alignRowElements_ = function() {
+RenderInfo.prototype.alignRowElements_ = function() {
   if (!this.isInline) {
-    Blockly.geras.RenderInfo.superClass_.alignRowElements_.call(this);
+    RenderInfo.superClass_.alignRowElements_.call(this);
     return;
   }
 
   // Walk backgrounds through rows on the block, keeping track of the right
   // input edge.
-  var nextRightEdge = 0;
-  var prevInput = null;
-  for (var i = this.rows.length - 1, row; (row = this.rows[i]); i--) {
+  let nextRightEdge = 0;
+  let prevInput = null;
+  for (let i = this.rows.length - 1, row; (row = this.rows[i]); i--) {
     row.nextRightEdge = nextRightEdge;
-    if (Blockly.blockRendering.Types.isInputRow(row)) {
+    if (Types.isInputRow(row)) {
       if (row.hasStatement) {
         this.alignStatementRow_(
-            /** @type {!Blockly.blockRendering.InputRow} */ (row));
+            /** @type {!InputRow} */ (row));
       }
       if (prevInput && prevInput.hasStatement && row.width < prevInput.width) {
         row.nextRightEdge = prevInput.width;
@@ -398,17 +382,17 @@ Blockly.geras.RenderInfo.prototype.alignRowElements_ = function() {
   }
   // Walk down each row from the top, comparing the prev and next right input
   // edges and setting the desired width to the max of the two.
-  var prevRightEdge = 0;
-  for (var i = 0, row; (row = this.rows[i]); i++) {
+  let prevRightEdge = 0;
+  for (let i = 0, row; (row = this.rows[i]); i++) {
     if (row.hasStatement) {
       prevRightEdge = this.getDesiredRowWidth_(row);
-    } else if (Blockly.blockRendering.Types.isSpacer(row)) {
+    } else if (Types.isSpacer(row)) {
       // Set the spacer row to the max of the prev or next input width.
       row.width = Math.max(prevRightEdge, row.nextRightEdge);
     } else {
-      var currentWidth = row.width;
-      var desiredWidth = Math.max(prevRightEdge, row.nextRightEdge);
-      var missingSpace = desiredWidth - currentWidth;
+      const currentWidth = row.width;
+      const desiredWidth = Math.max(prevRightEdge, row.nextRightEdge);
+      const missingSpace = desiredWidth - currentWidth;
       if (missingSpace > 0) {
         this.addAlignmentPadding_(row, missingSpace);
       }
@@ -420,26 +404,24 @@ Blockly.geras.RenderInfo.prototype.alignRowElements_ = function() {
 /**
  * @override
  */
-Blockly.geras.RenderInfo.prototype.getDesiredRowWidth_ = function(
-    row) {
+RenderInfo.prototype.getDesiredRowWidth_ = function(row) {
   // Limit the width of a statement row when a block is inline.
   if (this.isInline && row.hasStatement) {
     return this.statementEdge + this.constants_.MAX_BOTTOM_WIDTH + this.startX;
   }
-  return Blockly.geras.RenderInfo.superClass_.getDesiredRowWidth_.call(this,
-      row);
+  return RenderInfo.superClass_.getDesiredRowWidth_.call(this, row);
 };
 
 /**
  * @override
  */
-Blockly.geras.RenderInfo.prototype.finalize_ = function() {
+RenderInfo.prototype.finalize_ = function() {
   // Performance note: this could be combined with the draw pass, if the time
   // that this takes is excessive.  But it shouldn't be, because it only
   // accesses and sets properties that already exist on the objects.
-  var widestRowWithConnectedBlocks = 0;
-  var yCursor = 0;
-  for (var i = 0, row; (row = this.rows[i]); i++) {
+  let widestRowWithConnectedBlocks = 0;
+  let yCursor = 0;
+  for (let i = 0, row; (row = this.rows[i]); i++) {
     row.yPos = yCursor;
     row.xPos = this.startX;
     yCursor += row.height;
@@ -447,11 +429,11 @@ Blockly.geras.RenderInfo.prototype.finalize_ = function() {
     widestRowWithConnectedBlocks =
         Math.max(widestRowWithConnectedBlocks, row.widthWithConnectedBlocks);
     // Add padding to the bottom row if block height is less than minimum
-    var heightWithoutHat = yCursor - this.topRow.ascenderHeight;
+    const heightWithoutHat = yCursor - this.topRow.ascenderHeight;
     if (row == this.bottomRow &&
         heightWithoutHat < this.constants_.MIN_BLOCK_HEIGHT) {
       // But the hat height shouldn't be part of this.
-      var diff = this.constants_.MIN_BLOCK_HEIGHT - heightWithoutHat;
+      const diff = this.constants_.MIN_BLOCK_HEIGHT - heightWithoutHat;
       this.bottomRow.height += diff;
       yCursor += diff;
     }
@@ -460,18 +442,20 @@ Blockly.geras.RenderInfo.prototype.finalize_ = function() {
   if (this.outputConnection && this.block_.nextConnection &&
       this.block_.nextConnection.isConnected()) {
     // Include width of connected block in value to stack width measurement.
-    widestRowWithConnectedBlocks =
-        Math.max(widestRowWithConnectedBlocks,
-            this.block_.nextConnection.targetBlock().getHeightWidth().width -
+    widestRowWithConnectedBlocks = Math.max(
+        widestRowWithConnectedBlocks,
+        this.block_.nextConnection.targetBlock().getHeightWidth().width -
             this.constants_.DARK_PATH_OFFSET);
   }
 
   this.bottomRow.baseline = yCursor - this.bottomRow.descenderHeight;
 
   // The dark (lowlight) adds to the size of the block in both x and y.
-  this.widthWithChildren = widestRowWithConnectedBlocks +
-      this.startX + this.constants_.DARK_PATH_OFFSET;
+  this.widthWithChildren = widestRowWithConnectedBlocks + this.startX +
+      this.constants_.DARK_PATH_OFFSET;
   this.width += this.constants_.DARK_PATH_OFFSET;
   this.height = yCursor + this.constants_.DARK_PATH_OFFSET;
   this.startY = this.topRow.capline;
 };
+
+exports = RenderInfo;
diff --git a/tests/deps.js b/tests/deps.js
index 14ae08221..c3e682394 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -134,7 +134,7 @@ goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.Co
 goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.geras.RenderInfo', 'Blockly.utils.object', 'Blockly.utils.svgPaths']);
 goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.svgPaths'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras', 'Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/measurables/inputs.js', ['Blockly.geras.InlineInput', 'Blockly.geras.StatementInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.PathObject', 'Blockly.geras.ConstantProvider', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object']);

From de732f181d4233bdc2a88ecf5f7ae8c605ff254f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 15:18:10 -0700
Subject: [PATCH 533/833] Migrate core/input_types.js to goog.module

---
 core/input_types.js | 7 +++++--
 tests/deps.js       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/input_types.js b/core/input_types.js
index a58706358..eb9a08a71 100644
--- a/core/input_types.js
+++ b/core/input_types.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-goog.provide('Blockly.inputTypes');
+goog.module('Blockly.inputTypes');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.connectionTypes');
 
@@ -19,7 +20,7 @@ goog.require('Blockly.connectionTypes');
  * Enum for the type of a connection or input.
  * @enum {number}
  */
-Blockly.inputTypes = {
+const inputTypes = {
   // A right-facing value input.  E.g. 'set item to' or 'return'.
   VALUE: Blockly.connectionTypes.INPUT_VALUE,
   // A down-facing block stack.  E.g. 'if-do' or 'else'.
@@ -27,3 +28,5 @@ Blockly.inputTypes = {
   // A dummy input.  Used to add field(s) with no input.
   DUMMY: 5
 };
+
+exports = inputTypes;
diff --git a/tests/deps.js b/tests/deps.js
index c3e682394..9b5264dc5 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -73,7 +73,7 @@ goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg',
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.Connection', 'Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes']);
+goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.internalConstants'], {'lang': 'es5'});
 goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], ['Blockly.IASTNodeLocation'], {'lang': 'es6', 'module': 'goog'});

From 5d09b80cb63506ae92b1302125f576fa8015433b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 15:18:19 -0700
Subject: [PATCH 534/833] Migrate core/input_types.js named requires

---
 core/input_types.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/input_types.js b/core/input_types.js
index eb9a08a71..8bdc9e504 100644
--- a/core/input_types.js
+++ b/core/input_types.js
@@ -14,7 +14,7 @@
 goog.module('Blockly.inputTypes');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.connectionTypes');
+const connectionTypes = goog.require('Blockly.connectionTypes');
 
 /**
  * Enum for the type of a connection or input.
@@ -22,9 +22,9 @@ goog.require('Blockly.connectionTypes');
  */
 const inputTypes = {
   // A right-facing value input.  E.g. 'set item to' or 'return'.
-  VALUE: Blockly.connectionTypes.INPUT_VALUE,
+  VALUE: connectionTypes.INPUT_VALUE,
   // A down-facing block stack.  E.g. 'if-do' or 'else'.
-  STATEMENT: Blockly.connectionTypes.NEXT_STATEMENT,
+  STATEMENT: connectionTypes.NEXT_STATEMENT,
   // A dummy input.  Used to add field(s) with no input.
   DUMMY: 5
 };

From d0b5f6db8bbb297f022bd54fc8ef9a9c62211852 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 5 Aug 2021 10:13:03 -0700
Subject: [PATCH 535/833] Migrate core/renderers/geras/highlight_constants.js
 to goog.module syntax (#5303)

* Migrate core/renderers/geras/highlight_constants.js to ES6 const/let

* Migrate core/renderers/geras/highlight_constants.js to goog.module

* Migrate core/renderers/geras/highlight_constants.js to named requires

* clang-format core/renderers/geras/highlight_constants.js
---
 core/renderers/geras/highlight_constants.js | 200 +++++++++-----------
 tests/deps.js                               |   2 +-
 2 files changed, 89 insertions(+), 113 deletions(-)

diff --git a/core/renderers/geras/highlight_constants.js b/core/renderers/geras/highlight_constants.js
index a986c9e35..5689029b5 100644
--- a/core/renderers/geras/highlight_constants.js
+++ b/core/renderers/geras/highlight_constants.js
@@ -10,10 +10,12 @@
  */
 'use strict';
 
-goog.provide('Blockly.geras.HighlightConstantProvider');
+goog.module('Blockly.geras.HighlightConstantProvider');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.ConstantProvider');
-goog.require('Blockly.utils.svgPaths');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const svgPaths = goog.require('Blockly.utils.svgPaths');
 
 
 /**
@@ -21,15 +23,15 @@ goog.require('Blockly.utils.svgPaths');
  * Some highlights are simple offsets of the parent paths and can be generated
  * programmatically.  Others, especially on curves, are just made out of piles
  * of constants and are hard to tweak.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
  * @constructor
  * @package
  */
-Blockly.geras.HighlightConstantProvider = function(constants) {
+const HighlightConstantProvider = function(constants) {
   /**
    * The renderer's constant provider.
-   * @type {!Blockly.blockRendering.ConstantProvider}
+   * @type {!ConstantProvider}
    */
   this.constantProvider = constants;
 
@@ -44,16 +46,14 @@ Blockly.geras.HighlightConstantProvider = function(constants) {
    * The start point, which is offset in both X and Y, as an SVG path chunk.
    * @type {string}
    */
-  this.START_POINT = Blockly.utils.svgPaths.moveBy(this.OFFSET, this.OFFSET);
-
+  this.START_POINT = svgPaths.moveBy(this.OFFSET, this.OFFSET);
 };
 
 /**
  * Initialize shape objects based on the constants set in the constructor.
  * @package
  */
-Blockly.geras.HighlightConstantProvider.prototype.init = function() {
-
+HighlightConstantProvider.prototype.init = function() {
   /**
    * An object containing sizing and path information about inside corner
    * highlights.
@@ -101,34 +101,32 @@ Blockly.geras.HighlightConstantProvider.prototype.init = function() {
  *     inside corner highlights.
  * @package
  */
-Blockly.geras.HighlightConstantProvider.prototype.makeInsideCorner = function() {
-  var radius = this.constantProvider.CORNER_RADIUS;
-  var offset = this.OFFSET;
+HighlightConstantProvider.prototype.makeInsideCorner = function() {
+  const radius = this.constantProvider.CORNER_RADIUS;
+  const offset = this.OFFSET;
 
   /**
    * Distance from shape edge to intersect with a curved corner at 45 degrees.
    * Applies to highlighting on around the outside of a curve.
    * @const
    */
-  var distance45outside = (1 - Math.SQRT1_2) * (radius + offset) - offset;
+  const distance45outside = (1 - Math.SQRT1_2) * (radius + offset) - offset;
 
-  var pathTopRtl =
-      Blockly.utils.svgPaths.moveBy(distance45outside, distance45outside) +
-      Blockly.utils.svgPaths.arc('a', '0 0,0', radius,
-          Blockly.utils.svgPaths.point(
-              -distance45outside - offset,
-              radius - distance45outside));
+  const pathTopRtl = svgPaths.moveBy(distance45outside, distance45outside) +
+      svgPaths.arc(
+          'a', '0 0,0', radius,
+          svgPaths.point(
+              -distance45outside - offset, radius - distance45outside));
 
-  var pathBottomRtl =
-      Blockly.utils.svgPaths.arc('a', '0 0,0', radius + offset,
-          Blockly.utils.svgPaths.point(radius + offset, radius + offset));
+  const pathBottomRtl = svgPaths.arc(
+      'a', '0 0,0', radius + offset,
+      svgPaths.point(radius + offset, radius + offset));
 
-  var pathBottomLtr =
-      Blockly.utils.svgPaths.moveBy(distance45outside, - distance45outside) +
-      Blockly.utils.svgPaths.arc('a', '0 0,0', radius + offset,
-          Blockly.utils.svgPaths.point(
-              radius - distance45outside,
-              distance45outside + offset));
+  const pathBottomLtr = svgPaths.moveBy(distance45outside, -distance45outside) +
+      svgPaths.arc(
+          'a', '0 0,0', radius + offset,
+          svgPaths.point(
+              radius - distance45outside, distance45outside + offset));
 
   return {
     width: radius + offset,
@@ -147,39 +145,40 @@ Blockly.geras.HighlightConstantProvider.prototype.makeInsideCorner = function()
  *     outside corner highlights.
  * @package
  */
-Blockly.geras.HighlightConstantProvider.prototype.makeOutsideCorner = function() {
-  var radius = this.constantProvider.CORNER_RADIUS;
-  var offset = this.OFFSET;
+HighlightConstantProvider.prototype.makeOutsideCorner = function() {
+  const radius = this.constantProvider.CORNER_RADIUS;
+  const offset = this.OFFSET;
 
   /**
    * Distance from shape edge to intersect with a curved corner at 45 degrees.
    * Applies to highlighting on around the inside of a curve.
    * @const
    */
-  var distance45inside = (1 - Math.SQRT1_2) * (radius - offset) + offset;
+  const distance45inside = (1 - Math.SQRT1_2) * (radius - offset) + offset;
 
-  var topLeftStartX = distance45inside;
-  var topLeftStartY = distance45inside;
-  var topLeftCornerHighlightRtl =
-      Blockly.utils.svgPaths.moveBy(topLeftStartX, topLeftStartY) +
-      Blockly.utils.svgPaths.arc('a', '0 0,1', radius - offset,
-          Blockly.utils.svgPaths.point(radius - topLeftStartX, -topLeftStartY + offset));
+  const topLeftStartX = distance45inside;
+  const topLeftStartY = distance45inside;
+  const topLeftCornerHighlightRtl =
+      svgPaths.moveBy(topLeftStartX, topLeftStartY) +
+      svgPaths.arc(
+          'a', '0 0,1', radius - offset,
+          svgPaths.point(radius - topLeftStartX, -topLeftStartY + offset));
   /**
    * SVG path for drawing the highlight on the rounded top-left corner.
    * @const
    */
-  var topLeftCornerHighlightLtr =
-      Blockly.utils.svgPaths.moveBy(offset, radius) +
-      Blockly.utils.svgPaths.arc('a', '0 0,1', radius - offset,
-          Blockly.utils.svgPaths.point(radius, -radius + offset));
+  const topLeftCornerHighlightLtr = svgPaths.moveBy(offset, radius) +
+      svgPaths.arc(
+          'a', '0 0,1', radius - offset,
+          svgPaths.point(radius, -radius + offset));
 
-  var bottomLeftStartX = distance45inside;
-  var bottomLeftStartY = -distance45inside;
-  var bottomLeftPath = Blockly.utils.svgPaths.moveBy(
-      bottomLeftStartX, bottomLeftStartY) +
-          Blockly.utils.svgPaths.arc('a', '0 0,1', radius - offset,
-              Blockly.utils.svgPaths.point(-bottomLeftStartX + offset,
-                  -bottomLeftStartY - radius));
+  const bottomLeftStartX = distance45inside;
+  const bottomLeftStartY = -distance45inside;
+  const bottomLeftPath = svgPaths.moveBy(bottomLeftStartX, bottomLeftStartY) +
+      svgPaths.arc(
+          'a', '0 0,1', radius - offset,
+          svgPaths.point(
+              -bottomLeftStartX + offset, -bottomLeftStartY - radius));
 
   return {
     height: radius,
@@ -197,42 +196,35 @@ Blockly.geras.HighlightConstantProvider.prototype.makeOutsideCorner = function()
  *     puzzle tab highlights.
  * @package
  */
-Blockly.geras.HighlightConstantProvider.prototype.makePuzzleTab = function() {
-  var width = this.constantProvider.TAB_WIDTH;
-  var height = this.constantProvider.TAB_HEIGHT;
+HighlightConstantProvider.prototype.makePuzzleTab = function() {
+  const width = this.constantProvider.TAB_WIDTH;
+  const height = this.constantProvider.TAB_HEIGHT;
 
   // This is how much of the vertical block edge is actually drawn by the puzzle
   // tab.
-  var verticalOverlap = 2.5;
+  const verticalOverlap = 2.5;
 
-  var highlightRtlUp =
-      Blockly.utils.svgPaths.moveBy(-2, -height + verticalOverlap + 0.9) +
-      Blockly.utils.svgPaths.lineTo(width * -0.45, -2.1);
+  const highlightRtlUp = svgPaths.moveBy(-2, -height + verticalOverlap + 0.9) +
+      svgPaths.lineTo(width * -0.45, -2.1);
 
-  var highlightRtlDown =
-      Blockly.utils.svgPaths.lineOnAxis('v', verticalOverlap) +
-      Blockly.utils.svgPaths.moveBy(-width * 0.97, 2.5) +
-      Blockly.utils.svgPaths.curve('q',
+  const highlightRtlDown = svgPaths.lineOnAxis('v', verticalOverlap) +
+      svgPaths.moveBy(-width * 0.97, 2.5) +
+      svgPaths.curve(
+          'q',
           [
-            Blockly.utils.svgPaths.point(-width * 0.05, 10),
-            Blockly.utils.svgPaths.point(width * 0.3, 9.5)
+            svgPaths.point(-width * 0.05, 10), svgPaths.point(width * 0.3, 9.5)
           ]) +
-      Blockly.utils.svgPaths.moveBy(width * 0.67, -1.9) +
-      Blockly.utils.svgPaths.lineOnAxis('v', verticalOverlap);
+      svgPaths.moveBy(width * 0.67, -1.9) +
+      svgPaths.lineOnAxis('v', verticalOverlap);
 
-  var highlightLtrUp =
-      Blockly.utils.svgPaths.lineOnAxis('v', -1.5) +
-      Blockly.utils.svgPaths.moveBy(width * -0.92, -0.5) +
-      Blockly.utils.svgPaths.curve('q',
-          [
-            Blockly.utils.svgPaths.point(width * -0.19, -5.5),
-            Blockly.utils.svgPaths.point(0,-11)
-          ]) +
-      Blockly.utils.svgPaths.moveBy(width * 0.92, 1);
+  const highlightLtrUp = svgPaths.lineOnAxis('v', -1.5) +
+      svgPaths.moveBy(width * -0.92, -0.5) +
+      svgPaths.curve(
+          'q', [svgPaths.point(width * -0.19, -5.5), svgPaths.point(0, -11)]) +
+      svgPaths.moveBy(width * 0.92, 1);
 
-  var highlightLtrDown =
-      Blockly.utils.svgPaths.moveBy(-5, height - 0.7) +
-      Blockly.utils.svgPaths.lineTo(width * 0.46, -2.1);
+  const highlightLtrDown =
+      svgPaths.moveBy(-5, height - 0.7) + svgPaths.lineTo(width * 0.46, -2.1);
 
   return {
     width: width,
@@ -251,15 +243,11 @@ Blockly.geras.HighlightConstantProvider.prototype.makePuzzleTab = function() {
  *     notch highlights.
  * @package
  */
-Blockly.geras.HighlightConstantProvider.prototype.makeNotch = function() {
+HighlightConstantProvider.prototype.makeNotch = function() {
   // This is only for the previous connection.
-  var pathLeft =
-      Blockly.utils.svgPaths.lineOnAxis(
-          'h', this.OFFSET) +
+  const pathLeft = svgPaths.lineOnAxis('h', this.OFFSET) +
       this.constantProvider.NOTCH.pathLeft;
-  return {
-    pathLeft: pathLeft
-  };
+  return {pathLeft: pathLeft};
 };
 
 /**
@@ -267,16 +255,10 @@ Blockly.geras.HighlightConstantProvider.prototype.makeNotch = function() {
  *     collapsed block edge highlights.
  * @package
  */
-Blockly.geras.HighlightConstantProvider.prototype.makeJaggedTeeth = function() {
-  var pathLeft =
-      Blockly.utils.svgPaths.lineTo(5.1, 2.6) +
-      Blockly.utils.svgPaths.moveBy(-10.2, 6.8) +
-      Blockly.utils.svgPaths.lineTo(5.1, 2.6);
-  return {
-    pathLeft: pathLeft,
-    height: 12,
-    width: 10.2
-  };
+HighlightConstantProvider.prototype.makeJaggedTeeth = function() {
+  const pathLeft = svgPaths.lineTo(5.1, 2.6) + svgPaths.moveBy(-10.2, 6.8) +
+      svgPaths.lineTo(5.1, 2.6);
+  return {pathLeft: pathLeft, height: 12, width: 10.2};
 };
 
 /**
@@ -284,28 +266,22 @@ Blockly.geras.HighlightConstantProvider.prototype.makeJaggedTeeth = function() {
  *     start highlights.
  * @package
  */
-Blockly.geras.HighlightConstantProvider.prototype.makeStartHat = function() {
-  var hatHeight = this.constantProvider.START_HAT.height;
-  var pathRtl =
-      Blockly.utils.svgPaths.moveBy(25, -8.7) +
-      Blockly.utils.svgPaths.curve('c',
-          [
-            Blockly.utils.svgPaths.point(29.7, -6.2),
-            Blockly.utils.svgPaths.point(57.2, -0.5),
-            Blockly.utils.svgPaths.point(75, 8.7)
-          ]);
+HighlightConstantProvider.prototype.makeStartHat = function() {
+  const hatHeight = this.constantProvider.START_HAT.height;
+  const pathRtl = svgPaths.moveBy(25, -8.7) + svgPaths.curve('c', [
+    svgPaths.point(29.7, -6.2), svgPaths.point(57.2, -0.5),
+    svgPaths.point(75, 8.7)
+  ]);
 
-  var pathLtr =
-      Blockly.utils.svgPaths.curve('c',
-          [
-            Blockly.utils.svgPaths.point(17.8, -9.2),
-            Blockly.utils.svgPaths.point(45.3, -14.9),
-            Blockly.utils.svgPaths.point(75, -8.7)
-          ]) +
-      Blockly.utils.svgPaths.moveTo(100.5, hatHeight + 0.5);
+  const pathLtr = svgPaths.curve('c', [
+    svgPaths.point(17.8, -9.2), svgPaths.point(45.3, -14.9),
+    svgPaths.point(75, -8.7)
+  ]) + svgPaths.moveTo(100.5, hatHeight + 0.5);
   return {
     path: function(rtl) {
       return rtl ? pathRtl : pathLtr;
     }
   };
 };
+
+exports = HighlightConstantProvider;
diff --git a/tests/deps.js b/tests/deps.js
index abed86ec5..fb30bbb2b 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -132,7 +132,7 @@ goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.block
 goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.geras.RenderInfo', 'Blockly.utils.object', 'Blockly.utils.svgPaths']);
-goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.svgPaths'], {'lang': 'es5'});
+goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/measurables/inputs.js', ['Blockly.geras.InlineInput', 'Blockly.geras.StatementInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);

From ef0fcdbcdd7c3b9389a34c76e1bf0508f51b2757 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 12:38:01 -0700
Subject: [PATCH 536/833] Split Blockly.BlocklyOptions into a separate file

---
 core/blockly_options.js | 21 +++++++++++++++++++++
 core/inject.js          |  1 +
 core/mutator.js         |  6 +++---
 core/options.js         |  9 +--------
 core/toolbox/toolbox.js |  1 +
 core/trashcan.js        |  4 ++--
 core/workspace.js       |  1 +
 core/workspace_svg.js   |  1 +
 tests/deps.js           |  1 +
 9 files changed, 32 insertions(+), 13 deletions(-)
 create mode 100644 core/blockly_options.js

diff --git a/core/blockly_options.js b/core/blockly_options.js
new file mode 100644
index 000000000..d2964385f
--- /dev/null
+++ b/core/blockly_options.js
@@ -0,0 +1,21 @@
+/**
+ * @license
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Object that defines user-specified options for the workspace.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.provide('Blockly.BlocklyOptions');
+
+/**
+ * Blockly options.
+ * This interface is further described in
+ * `typings/parts/blockly-interfaces.d.ts`.
+ * @interface
+ */
+Blockly.BlocklyOptions = function() {};
diff --git a/core/inject.js b/core/inject.js
index 3b3715b0f..a1bdffbe1 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -34,6 +34,7 @@ goog.require('Blockly.WorkspaceDragSurfaceSvg');
 goog.require('Blockly.WorkspaceSvg');
 goog.require('Blockly.WidgetDiv');
 
+goog.requireType('Blockly.BlocklyOptions');
 goog.requireType('Blockly.BlockSvg');
 
 
diff --git a/core/mutator.js b/core/mutator.js
index 8f9bab118..5f7189fcd 100644
--- a/core/mutator.js
+++ b/core/mutator.js
@@ -19,9 +19,9 @@ const Abstract = goog.requireType('Blockly.Events.Abstract');
 /* 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 BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
 /* eslint-disable-next-line no-unused-vars */
-const Blockly = goog.requireType('Blockly');
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const Bubble = goog.require('Blockly.Bubble');
 /* eslint-disable-next-line no-unused-vars */
 const Connection = goog.requireType('Blockly.Connection');
@@ -170,7 +170,7 @@ Mutator.prototype.createEditor_ = function() {
     quarkXml = null;
   }
   const workspaceOptions = new Options(
-      /** @type {!Blockly.BlocklyOptions} */
+      /** @type {!BlocklyOptions} */
       ({
         // If you want to enable disabling, also remove the
         // event filter from workspaceChanged_ .
diff --git a/core/options.js b/core/options.js
index 58c4e378a..fbb4cfd1e 100644
--- a/core/options.js
+++ b/core/options.js
@@ -19,6 +19,7 @@ goog.require('Blockly.utils.IdGenerator');
 goog.require('Blockly.utils.Metrics');
 goog.require('Blockly.utils.toolbox');
 
+goog.requireType('Blockly.BlocklyOptions');
 goog.requireType('Blockly.WorkspaceSvg');
 
 
@@ -180,14 +181,6 @@ Blockly.Options = function(options) {
   this.plugins = plugins;
 };
 
-/**
- * Blockly options.
- * This interface is further described in
- * `typings/parts/blockly-interfaces.d.ts`.
- * @interface
- */
-Blockly.BlocklyOptions = function() {};
-
 /**
  * Grid Options.
  * @typedef {{
diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index a2e76ef70..826482eaf 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -36,6 +36,7 @@ goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.Rect');
 goog.require('Blockly.utils.toolbox');
 
+goog.requireType('Blockly.BlocklyOptions');
 goog.requireType('Blockly.ICollapsibleToolboxItem');
 goog.requireType('Blockly.IDraggable');
 goog.requireType('Blockly.IFlyout');
diff --git a/core/trashcan.js b/core/trashcan.js
index fb60ca3a1..7e60d841d 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -16,7 +16,7 @@ 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 Blockly = goog.requireType('Blockly');
+const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
 const ComponentManager = goog.require('Blockly.ComponentManager');
 const DeleteArea = goog.require('Blockly.DeleteArea');
 const Events = goog.require('Blockly.Events');
@@ -90,7 +90,7 @@ const Trashcan = function(workspace) {
   }
   // Create flyout options.
   const flyoutWorkspaceOptions = new Options(
-      /** @type {!Blockly.BlocklyOptions} */
+      /** @type {!BlocklyOptions} */
       ({
         'scrollbars': true,
         'parentWorkspace': this.workspace_,
diff --git a/core/workspace.js b/core/workspace.js
index 9a1dd8cbb..4c35f5b83 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -23,6 +23,7 @@ goog.require('Blockly.utils.math');
 goog.require('Blockly.VariableMap');
 
 goog.requireType('Blockly.Block');
+goog.requireType('Blockly.BlocklyOptions');
 goog.requireType('Blockly.ConnectionDB');
 goog.requireType('Blockly.Events.Abstract');
 goog.requireType('Blockly.IConnectionChecker');
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 81536d5e6..e4aa50229 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -57,6 +57,7 @@ goog.require('Blockly.Xml');
 
 goog.requireType('Blockly.Block');
 goog.requireType('Blockly.BlockDragSurfaceSvg');
+goog.requireType('Blockly.BlocklyOptions');
 goog.requireType('Blockly.blockRendering.Renderer');
 goog.requireType('Blockly.Cursor');
 goog.requireType('Blockly.FlyoutButton');
diff --git a/tests/deps.js b/tests/deps.js
index fb30bbb2b..40c6a7e40 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -13,6 +13,7 @@ goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfac
 goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', '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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', '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'});
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/blockly_options.js', ['Blockly.BlocklyOptions'], []);
 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'});
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);

From de92fe9cb8bcfe2d9f5fa629e4b57e72204e7fd1 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 12:50:09 -0700
Subject: [PATCH 537/833] Migrate core/options.js to ES6 const/let

---
 core/options.js | 85 +++++++++++++++++++++++++------------------------
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/core/options.js b/core/options.js
index fbb4cfd1e..5dd8c24e6 100644
--- a/core/options.js
+++ b/core/options.js
@@ -31,57 +31,57 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @constructor
  */
 Blockly.Options = function(options) {
-  var readOnly = !!options['readOnly'];
-  if (readOnly) {
-    var toolboxJsonDef = null;
-    var hasCategories = false;
-    var hasTrashcan = false;
-    var hasCollapse = false;
-    var hasComments = false;
-    var hasDisable = false;
-    var hasSounds = false;
-  } else {
-    var toolboxJsonDef = Blockly.utils.toolbox.convertToolboxDefToJson(options['toolbox']);
-    var hasCategories = Blockly.utils.toolbox.hasCategories(toolboxJsonDef);
-    var hasTrashcan = options['trashcan'];
+  let toolboxJsonDef = null;
+  let hasCategories = false;
+  let hasTrashcan = false;
+  let hasCollapse = false;
+  let hasComments = false;
+  let hasDisable = false;
+  let hasSounds = false;
+  const readOnly = !!options['readOnly'];
+  if (!readOnly) {
+    toolboxJsonDef = Blockly.utils.toolbox.convertToolboxDefToJson(options['toolbox']);
+    hasCategories = Blockly.utils.toolbox.hasCategories(toolboxJsonDef);
+    hasTrashcan = options['trashcan'];
     if (hasTrashcan === undefined) {
       hasTrashcan = hasCategories;
     }
-    var maxTrashcanContents = options['maxTrashcanContents'];
-    if (hasTrashcan) {
-      if (maxTrashcanContents === undefined) {
-        maxTrashcanContents = 32;
-      }
-    } else {
-      maxTrashcanContents = 0;
-    }
-    var hasCollapse = options['collapse'];
+    hasCollapse = options['collapse'];
     if (hasCollapse === undefined) {
       hasCollapse = hasCategories;
     }
-    var hasComments = options['comments'];
+    hasComments = options['comments'];
     if (hasComments === undefined) {
       hasComments = hasCategories;
     }
-    var hasDisable = options['disable'];
+    hasDisable = options['disable'];
     if (hasDisable === undefined) {
       hasDisable = hasCategories;
     }
-    var hasSounds = options['sounds'];
+    hasSounds = options['sounds'];
     if (hasSounds === undefined) {
       hasSounds = true;
     }
   }
-  var rtl = !!options['rtl'];
-  var horizontalLayout = options['horizontalLayout'];
+
+  let maxTrashcanContents = options['maxTrashcanContents'];
+  if (hasTrashcan) {
+    if (maxTrashcanContents === undefined) {
+      maxTrashcanContents = 32;
+    }
+  } else {
+    maxTrashcanContents = 0;
+  }
+  const rtl = !!options['rtl'];
+  let horizontalLayout = options['horizontalLayout'];
   if (horizontalLayout === undefined) {
     horizontalLayout = false;
   }
-  var toolboxAtStart = options['toolboxPosition'];
+  let toolboxAtStart = options['toolboxPosition'];
   toolboxAtStart = toolboxAtStart !== 'end';
 
   /** @type {!Blockly.utils.toolbox.Position} */
-  var toolboxPosition;
+  let toolboxPosition;
   if (horizontalLayout) {
     toolboxPosition = toolboxAtStart ?
         Blockly.utils.toolbox.Position.TOP : Blockly.utils.toolbox.Position.BOTTOM;
@@ -90,25 +90,26 @@ Blockly.Options = function(options) {
         Blockly.utils.toolbox.Position.RIGHT : Blockly.utils.toolbox.Position.LEFT;
   }
 
-  var hasCss = options['css'];
+  let hasCss = options['css'];
   if (hasCss === undefined) {
     hasCss = true;
   }
-  var pathToMedia = 'https://blockly-demo.appspot.com/static/media/';
+  let pathToMedia = 'https://blockly-demo.appspot.com/static/media/';
   if (options['media']) {
     pathToMedia = options['media'];
   } else if (options['path']) {
     // 'path' is a deprecated option which has been replaced by 'media'.
     pathToMedia = options['path'] + 'media/';
   }
+  let oneBasedIndex;
   if (options['oneBasedIndex'] === undefined) {
-    var oneBasedIndex = true;
+    oneBasedIndex = true;
   } else {
-    var oneBasedIndex = !!options['oneBasedIndex'];
+    oneBasedIndex = !!options['oneBasedIndex'];
   }
-  var renderer = options['renderer'] || 'geras';
+  const renderer = options['renderer'] || 'geras';
 
-  var plugins = options['plugins'] || {};
+  const plugins = options['plugins'] || {};
 
   /** @type {boolean} */
   this.RTL = rtl;
@@ -248,8 +249,8 @@ Blockly.Options.prototype.getMetrics;
  * @private
  */
 Blockly.Options.parseMoveOptions_ = function(options, hasCategories) {
-  var move = options['move'] || {};
-  var moveOptions = {};
+  const move = options['move'] || {};
+  const moveOptions = {};
   if (move['scrollbars'] === undefined && options['scrollbars'] === undefined) {
     moveOptions.scrollbars = hasCategories;
   } else if (typeof move['scrollbars'] == 'object') {
@@ -295,8 +296,8 @@ Blockly.Options.parseMoveOptions_ = function(options, hasCategories) {
  * @private
  */
 Blockly.Options.parseZoomOptions_ = function(options) {
-  var zoom = options['zoom'] || {};
-  var zoomOptions = {};
+  const zoom = options['zoom'] || {};
+  const zoomOptions = {};
   if (zoom['controls'] === undefined) {
     zoomOptions.controls = false;
   } else {
@@ -344,8 +345,8 @@ Blockly.Options.parseZoomOptions_ = function(options) {
  * @private
  */
 Blockly.Options.parseGridOptions_ = function(options) {
-  var grid = options['grid'] || {};
-  var gridOptions = {};
+  const grid = options['grid'] || {};
+  const gridOptions = {};
   gridOptions.spacing = Number(grid['spacing']) || 0;
   gridOptions.colour = grid['colour'] || '#888';
   gridOptions.length =
@@ -362,7 +363,7 @@ Blockly.Options.parseGridOptions_ = function(options) {
  * @private
  */
 Blockly.Options.parseThemeOptions_ = function(options) {
-  var theme = options['theme'] || Blockly.Themes.Classic;
+  const theme = options['theme'] || Blockly.Themes.Classic;
   if (typeof theme == 'string') {
     return /** @type {!Blockly.Theme} */ (
       Blockly.registry.getObject(Blockly.registry.Type.THEME, theme));

From 468360873f9694711816b3b4049d09bd78b54e9c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 12:51:28 -0700
Subject: [PATCH 538/833] Migrate core/options.js and core/blockly_options.js
 to goog.module

---
 core/blockly_options.js |  7 ++++--
 core/options.js         | 56 ++++++++++++++++++++++-------------------
 tests/deps.js           |  4 +--
 3 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/core/blockly_options.js b/core/blockly_options.js
index d2964385f..3c93f8784 100644
--- a/core/blockly_options.js
+++ b/core/blockly_options.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.BlocklyOptions');
+goog.module('Blockly.BlocklyOptions');
+goog.module.declareLegacyNamespace();
 
 /**
  * Blockly options.
@@ -18,4 +19,6 @@ goog.provide('Blockly.BlocklyOptions');
  * `typings/parts/blockly-interfaces.d.ts`.
  * @interface
  */
-Blockly.BlocklyOptions = function() {};
+const BlocklyOptions = function() {};
+
+exports = BlocklyOptions;
diff --git a/core/options.js b/core/options.js
index 5dd8c24e6..2f2836f07 100644
--- a/core/options.js
+++ b/core/options.js
@@ -10,16 +10,18 @@
  */
 'use strict';
 
-goog.provide('Blockly.Options');
+goog.module('Blockly.Options');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.registry');
 goog.require('Blockly.Theme');
 goog.require('Blockly.Themes.Classic');
+goog.require('Blockly.utils.deprecation');
 goog.require('Blockly.utils.IdGenerator');
-goog.require('Blockly.utils.Metrics');
 goog.require('Blockly.utils.toolbox');
 
 goog.requireType('Blockly.BlocklyOptions');
+goog.requireType('Blockly.utils.Metrics');
 goog.requireType('Blockly.WorkspaceSvg');
 
 
@@ -30,7 +32,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  *     Specification: https://developers.google.com/blockly/guides/get-started/web#configuration
  * @constructor
  */
-Blockly.Options = function(options) {
+const Options = function(options) {
   let toolboxJsonDef = null;
   let hasCategories = false;
   let hasTrashcan = false;
@@ -131,8 +133,8 @@ Blockly.Options = function(options) {
   this.pathToMedia = pathToMedia;
   /** @type {boolean} */
   this.hasCategories = hasCategories;
-  /** @type {!Blockly.Options.MoveOptions} */
-  this.moveOptions = Blockly.Options.parseMoveOptions_(options, hasCategories);
+  /** @type {!Options.MoveOptions} */
+  this.moveOptions = Options.parseMoveOptions_(options, hasCategories);
   /** @deprecated  January 2019 */
   this.hasScrollbars = !!this.moveOptions.scrollbars;
   /** @type {boolean} */
@@ -147,14 +149,14 @@ Blockly.Options = function(options) {
   this.horizontalLayout = horizontalLayout;
   /** @type {?Blockly.utils.toolbox.ToolboxInfo} */
   this.languageTree = toolboxJsonDef;
-  /** @type {!Blockly.Options.GridOptions} */
-  this.gridOptions = Blockly.Options.parseGridOptions_(options);
-  /** @type {!Blockly.Options.ZoomOptions} */
-  this.zoomOptions = Blockly.Options.parseZoomOptions_(options);
+  /** @type {!Options.GridOptions} */
+  this.gridOptions = Options.parseGridOptions_(options);
+  /** @type {!Options.ZoomOptions} */
+  this.zoomOptions = Options.parseZoomOptions_(options);
   /** @type {!Blockly.utils.toolbox.Position} */
   this.toolboxPosition = toolboxPosition;
   /** @type {!Blockly.Theme} */
-  this.theme = Blockly.Options.parseThemeOptions_(options);
+  this.theme = Options.parseThemeOptions_(options);
   /** @type {string} */
   this.renderer = renderer;
   /** @type {?Object} */
@@ -191,17 +193,17 @@ Blockly.Options = function(options) {
  *     spacing: number
  * }}
  */
-Blockly.Options.GridOptions;
+Options.GridOptions;
 
 /**
  * Move Options.
  * @typedef {{
  *     drag: boolean,
- *     scrollbars: (boolean | !Blockly.Options.ScrollbarOptions),
+ *     scrollbars: (boolean | !Options.ScrollbarOptions),
  *     wheel: boolean
  * }}
  */
-Blockly.Options.MoveOptions;
+Options.MoveOptions;
 
 /**
  * Scrollbar Options.
@@ -210,7 +212,7 @@ Blockly.Options.MoveOptions;
  *     vertical: boolean
  * }}
  */
-Blockly.Options.ScrollbarOptions;
+Options.ScrollbarOptions;
 
 /**
  * Zoom Options.
@@ -224,7 +226,7 @@ Blockly.Options.ScrollbarOptions;
  *     wheel: boolean
  * }}
  */
-Blockly.Options.ZoomOptions;
+Options.ZoomOptions;
 
 /**
  * If set, sets the translation of the workspace to match the scrollbars.
@@ -232,23 +234,23 @@ Blockly.Options.ZoomOptions;
  *     is a float between 0 and 1 specifying the degree of scrolling.
  * @return {void}
  */
-Blockly.Options.prototype.setMetrics;
+Options.prototype.setMetrics;
 
 /**
  * Return an object with the metrics required to size the workspace.
  * @return {!Blockly.utils.Metrics} Contains size and position metrics.
  */
-Blockly.Options.prototype.getMetrics;
+Options.prototype.getMetrics;
 
 /**
  * Parse the user-specified move options, using reasonable defaults where
  *    behaviour is unspecified.
  * @param {!Object} options Dictionary of options.
  * @param {boolean} hasCategories Whether the workspace has categories or not.
- * @return {!Blockly.Options.MoveOptions} Normalized move options.
+ * @return {!Options.MoveOptions} Normalized move options.
  * @private
  */
-Blockly.Options.parseMoveOptions_ = function(options, hasCategories) {
+Options.parseMoveOptions_ = function(options, hasCategories) {
   const move = options['move'] || {};
   const moveOptions = {};
   if (move['scrollbars'] === undefined && options['scrollbars'] === undefined) {
@@ -292,10 +294,10 @@ Blockly.Options.parseMoveOptions_ = function(options, hasCategories) {
  * behaviour is unspecified.  See zoom documentation:
  *   https://developers.google.com/blockly/guides/configure/web/zoom
  * @param {!Object} options Dictionary of options.
- * @return {!Blockly.Options.ZoomOptions} Normalized zoom options.
+ * @return {!Options.ZoomOptions} Normalized zoom options.
  * @private
  */
-Blockly.Options.parseZoomOptions_ = function(options) {
+Options.parseZoomOptions_ = function(options) {
   const zoom = options['zoom'] || {};
   const zoomOptions = {};
   if (zoom['controls'] === undefined) {
@@ -341,10 +343,10 @@ Blockly.Options.parseZoomOptions_ = function(options) {
  * behaviour is unspecified. See grid documentation:
  *   https://developers.google.com/blockly/guides/configure/web/grid
  * @param {!Object} options Dictionary of options.
- * @return {!Blockly.Options.GridOptions} Normalized grid options.
+ * @return {!Options.GridOptions} Normalized grid options.
  * @private
  */
-Blockly.Options.parseGridOptions_ = function(options) {
+Options.parseGridOptions_ = function(options) {
   const grid = options['grid'] || {};
   const gridOptions = {};
   gridOptions.spacing = Number(grid['spacing']) || 0;
@@ -362,7 +364,7 @@ Blockly.Options.parseGridOptions_ = function(options) {
  * @return {!Blockly.Theme} A Blockly Theme.
  * @private
  */
-Blockly.Options.parseThemeOptions_ = function(options) {
+Options.parseThemeOptions_ = function(options) {
   const theme = options['theme'] || Blockly.Themes.Classic;
   if (typeof theme == 'string') {
     return /** @type {!Blockly.Theme} */ (
@@ -381,11 +383,13 @@ Blockly.Options.parseThemeOptions_ = function(options) {
  * @return {?Node} DOM tree of blocks, or null.
  * @deprecated Use Blockly.utils.toolbox.parseToolboxTree. (2020 September 28)
  */
-Blockly.Options.parseToolboxTree = function(toolboxDef) {
+Options.parseToolboxTree = function(toolboxDef) {
   Blockly.utils.deprecation.warn(
-      'Blockly.Options.parseToolboxTree',
+      'Options.parseToolboxTree',
       'September 2020',
       'September 2021',
       'Blockly.utils.toolbox.parseToolboxTree');
   return Blockly.utils.toolbox.parseToolboxTree(toolboxDef);
 };
+
+exports = Options;
diff --git a/tests/deps.js b/tests/deps.js
index 40c6a7e40..c71382196 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -13,7 +13,7 @@ goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfac
 goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', '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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', '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'});
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/blockly_options.js', ['Blockly.BlocklyOptions'], []);
+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'});
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
@@ -117,7 +117,7 @@ goog.addDependency('../../core/metrics_manager.js', ['Blockly.FlyoutMetricsManag
 goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global']);
 goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', '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.internalConstants']);
-goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.Metrics', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.xml']);
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});

From d8bc82fa1ceafb13f19d1a948faebd863684f35e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 12:59:34 -0700
Subject: [PATCH 539/833] Migrate core/options.js named requires

---
 core/options.js | 68 +++++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/core/options.js b/core/options.js
index 2f2836f07..5c6397a96 100644
--- a/core/options.js
+++ b/core/options.js
@@ -13,22 +13,24 @@
 goog.module('Blockly.Options');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.registry');
-goog.require('Blockly.Theme');
-goog.require('Blockly.Themes.Classic');
-goog.require('Blockly.utils.deprecation');
-goog.require('Blockly.utils.IdGenerator');
-goog.require('Blockly.utils.toolbox');
-
-goog.requireType('Blockly.BlocklyOptions');
-goog.requireType('Blockly.utils.Metrics');
-goog.requireType('Blockly.WorkspaceSvg');
+/* eslint-disable-next-line no-unused-vars */
+const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
+const Classic = goog.require('Blockly.Themes.Classic');
+const IdGenerator = goog.require('Blockly.utils.IdGenerator');
+/* eslint-disable-next-line no-unused-vars */
+const Metrics = goog.requireType('Blockly.utils.Metrics');
+const Theme = goog.require('Blockly.Theme');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const deprecation = goog.require('Blockly.utils.deprecation');
+const registry = goog.require('Blockly.registry');
+const toolbox = goog.require('Blockly.utils.toolbox');
 
 
 /**
  * Parse the user-specified options, using reasonable defaults where behaviour
  * is unspecified.
- * @param {!Blockly.BlocklyOptions} options Dictionary of options.
+ * @param {!BlocklyOptions} options Dictionary of options.
  *     Specification: https://developers.google.com/blockly/guides/get-started/web#configuration
  * @constructor
  */
@@ -42,8 +44,8 @@ const Options = function(options) {
   let hasSounds = false;
   const readOnly = !!options['readOnly'];
   if (!readOnly) {
-    toolboxJsonDef = Blockly.utils.toolbox.convertToolboxDefToJson(options['toolbox']);
-    hasCategories = Blockly.utils.toolbox.hasCategories(toolboxJsonDef);
+    toolboxJsonDef = toolbox.convertToolboxDefToJson(options['toolbox']);
+    hasCategories = toolbox.hasCategories(toolboxJsonDef);
     hasTrashcan = options['trashcan'];
     if (hasTrashcan === undefined) {
       hasTrashcan = hasCategories;
@@ -82,14 +84,14 @@ const Options = function(options) {
   let toolboxAtStart = options['toolboxPosition'];
   toolboxAtStart = toolboxAtStart !== 'end';
 
-  /** @type {!Blockly.utils.toolbox.Position} */
+  /** @type {!toolbox.Position} */
   let toolboxPosition;
   if (horizontalLayout) {
     toolboxPosition = toolboxAtStart ?
-        Blockly.utils.toolbox.Position.TOP : Blockly.utils.toolbox.Position.BOTTOM;
+        toolbox.Position.TOP : toolbox.Position.BOTTOM;
   } else {
     toolboxPosition = (toolboxAtStart == rtl) ?
-        Blockly.utils.toolbox.Position.RIGHT : Blockly.utils.toolbox.Position.LEFT;
+        toolbox.Position.RIGHT : toolbox.Position.LEFT;
   }
 
   let hasCss = options['css'];
@@ -147,15 +149,15 @@ const Options = function(options) {
   this.hasCss = hasCss;
   /** @type {boolean} */
   this.horizontalLayout = horizontalLayout;
-  /** @type {?Blockly.utils.toolbox.ToolboxInfo} */
+  /** @type {?toolbox.ToolboxInfo} */
   this.languageTree = toolboxJsonDef;
   /** @type {!Options.GridOptions} */
   this.gridOptions = Options.parseGridOptions_(options);
   /** @type {!Options.ZoomOptions} */
   this.zoomOptions = Options.parseZoomOptions_(options);
-  /** @type {!Blockly.utils.toolbox.Position} */
+  /** @type {!toolbox.Position} */
   this.toolboxPosition = toolboxPosition;
-  /** @type {!Blockly.Theme} */
+  /** @type {!Theme} */
   this.theme = Options.parseThemeOptions_(options);
   /** @type {string} */
   this.renderer = renderer;
@@ -173,7 +175,7 @@ const Options = function(options) {
    * The parent of the current workspace, or null if there is no parent
    * workspace.  We can assert that this is of type WorkspaceSvg as opposed to
    * Workspace as this is only used in a rendered workspace.
-   * @type {Blockly.WorkspaceSvg}
+   * @type {WorkspaceSvg}
    */
   this.parentWorkspace = options['parentWorkspace'];
 
@@ -238,7 +240,7 @@ Options.prototype.setMetrics;
 
 /**
  * Return an object with the metrics required to size the workspace.
- * @return {!Blockly.utils.Metrics} Contains size and position metrics.
+ * @return {!Metrics} Contains size and position metrics.
  */
 Options.prototype.getMetrics;
 
@@ -361,19 +363,19 @@ Options.parseGridOptions_ = function(options) {
  * Parse the user-specified theme options, using the classic theme as a default.
  *   https://developers.google.com/blockly/guides/configure/web/themes
  * @param {!Object} options Dictionary of options.
- * @return {!Blockly.Theme} A Blockly Theme.
+ * @return {!Theme} A Blockly Theme.
  * @private
  */
 Options.parseThemeOptions_ = function(options) {
-  const theme = options['theme'] || Blockly.Themes.Classic;
+  const theme = options['theme'] || Classic;
   if (typeof theme == 'string') {
-    return /** @type {!Blockly.Theme} */ (
-      Blockly.registry.getObject(Blockly.registry.Type.THEME, theme));
-  } else if (theme instanceof Blockly.Theme) {
-    return /** @type {!Blockly.Theme} */ (theme);
+    return /** @type {!Theme} */ (
+      registry.getObject(registry.Type.THEME, theme));
+  } else if (theme instanceof Theme) {
+    return /** @type {!Theme} */ (theme);
   }
-  return Blockly.Theme.defineTheme(theme.name ||
-      ('builtin' + Blockly.utils.IdGenerator.getNextUniqueId()), theme);
+  return Theme.defineTheme(theme.name ||
+      ('builtin' + IdGenerator.getNextUniqueId()), theme);
 };
 
 /**
@@ -381,15 +383,15 @@ Options.parseThemeOptions_ = function(options) {
  * @param {?Node|?string} toolboxDef DOM tree of blocks, or text representation
  *    of same.
  * @return {?Node} DOM tree of blocks, or null.
- * @deprecated Use Blockly.utils.toolbox.parseToolboxTree. (2020 September 28)
+ * @deprecated Use toolbox.parseToolboxTree. (2020 September 28)
  */
 Options.parseToolboxTree = function(toolboxDef) {
-  Blockly.utils.deprecation.warn(
+  deprecation.warn(
       'Options.parseToolboxTree',
       'September 2020',
       'September 2021',
-      'Blockly.utils.toolbox.parseToolboxTree');
-  return Blockly.utils.toolbox.parseToolboxTree(toolboxDef);
+      'toolbox.parseToolboxTree');
+  return toolbox.parseToolboxTree(toolboxDef);
 };
 
 exports = Options;

From 9354670828586df5417882e19bfda6d65b894737 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 13:00:34 -0700
Subject: [PATCH 540/833] clang-format core/options.js

---
 core/options.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/options.js b/core/options.js
index 5c6397a96..0ed544bae 100644
--- a/core/options.js
+++ b/core/options.js
@@ -31,7 +31,8 @@ const toolbox = goog.require('Blockly.utils.toolbox');
  * Parse the user-specified options, using reasonable defaults where behaviour
  * is unspecified.
  * @param {!BlocklyOptions} options Dictionary of options.
- *     Specification: https://developers.google.com/blockly/guides/get-started/web#configuration
+ *     Specification:
+ * https://developers.google.com/blockly/guides/get-started/web#configuration
  * @constructor
  */
 const Options = function(options) {
@@ -87,11 +88,11 @@ const Options = function(options) {
   /** @type {!toolbox.Position} */
   let toolboxPosition;
   if (horizontalLayout) {
-    toolboxPosition = toolboxAtStart ?
-        toolbox.Position.TOP : toolbox.Position.BOTTOM;
+    toolboxPosition =
+        toolboxAtStart ? toolbox.Position.TOP : toolbox.Position.BOTTOM;
   } else {
-    toolboxPosition = (toolboxAtStart == rtl) ?
-        toolbox.Position.RIGHT : toolbox.Position.LEFT;
+    toolboxPosition = (toolboxAtStart == rtl) ? toolbox.Position.RIGHT :
+                                                toolbox.Position.LEFT;
   }
 
   let hasCss = options['css'];
@@ -266,7 +267,8 @@ Options.parseMoveOptions_ = function(options, hasCategories) {
     // !!moveOptions.scrollbars.
     if (moveOptions.scrollbars.horizontal && moveOptions.scrollbars.vertical) {
       moveOptions.scrollbars = true;
-    } else if (!moveOptions.scrollbars.horizontal &&
+    } else if (
+        !moveOptions.scrollbars.horizontal &&
         !moveOptions.scrollbars.vertical) {
       moveOptions.scrollbars = false;
     }
@@ -370,12 +372,12 @@ Options.parseThemeOptions_ = function(options) {
   const theme = options['theme'] || Classic;
   if (typeof theme == 'string') {
     return /** @type {!Theme} */ (
-      registry.getObject(registry.Type.THEME, theme));
+        registry.getObject(registry.Type.THEME, theme));
   } else if (theme instanceof Theme) {
     return /** @type {!Theme} */ (theme);
   }
-  return Theme.defineTheme(theme.name ||
-      ('builtin' + IdGenerator.getNextUniqueId()), theme);
+  return Theme.defineTheme(
+      theme.name || ('builtin' + IdGenerator.getNextUniqueId()), theme);
 };
 
 /**
@@ -387,9 +389,7 @@ Options.parseThemeOptions_ = function(options) {
  */
 Options.parseToolboxTree = function(toolboxDef) {
   deprecation.warn(
-      'Options.parseToolboxTree',
-      'September 2020',
-      'September 2021',
+      'Options.parseToolboxTree', 'September 2020', 'September 2021',
       'toolbox.parseToolboxTree');
   return toolbox.parseToolboxTree(toolboxDef);
 };

From 569ddec1c901acbc9837accf35604e69b569ac7e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 10:08:39 -0700
Subject: [PATCH 541/833] Add newline

---
 core/blockly_options.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/blockly_options.js b/core/blockly_options.js
index 3c93f8784..c9c7b62f9 100644
--- a/core/blockly_options.js
+++ b/core/blockly_options.js
@@ -13,6 +13,7 @@
 goog.module('Blockly.BlocklyOptions');
 goog.module.declareLegacyNamespace();
 
+
 /**
  * Blockly options.
  * This interface is further described in

From 3ae6a21c5566598731dd6602de03b924025274dd Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 16:06:34 -0700
Subject: [PATCH 542/833] Migrate core/toolbox/category.js to ES6 const/let

---
 core/toolbox/category.js | 42 +++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/core/toolbox/category.js b/core/toolbox/category.js
index ae9755cad..d035c13d1 100644
--- a/core/toolbox/category.js
+++ b/core/toolbox/category.js
@@ -96,7 +96,7 @@ Blockly.ToolboxCategory = function(categoryDef, toolbox, opt_parent) {
    */
   this.cssConfig_ = this.makeDefaultCssConfig_();
 
-  var cssConfig = categoryDef['cssconfig'] || categoryDef['cssConfig'];
+  const cssConfig = categoryDef['cssconfig'] || categoryDef['cssConfig'];
   Blockly.utils.object.mixin(this.cssConfig_, cssConfig);
 
   /**
@@ -193,13 +193,14 @@ Blockly.ToolboxCategory.prototype.makeDefaultCssConfig_ = function() {
  * @protected
  */
 Blockly.ToolboxCategory.prototype.parseContents_ = function(categoryDef) {
-  var contents = categoryDef['contents'];
+  const contents = categoryDef['contents'];
 
   if (categoryDef['custom']) {
     this.flyoutItems_ = categoryDef['custom'];
   } else if (contents) {
-    for (var i = 0, itemDef; (itemDef = contents[i]); i++) {
-      var flyoutItem = /** @type {Blockly.utils.toolbox.FlyoutItemInfo} */ (itemDef);
+    for (let i = 0; i < contents.length; i++) {
+      const itemDef = contents[i];
+      const flyoutItem = /** @type {Blockly.utils.toolbox.FlyoutItemInfo} */ (itemDef);
       this.flyoutItems_.push(flyoutItem);
     }
   }
@@ -256,7 +257,7 @@ Blockly.ToolboxCategory.prototype.createDom_ = function() {
  * @protected
  */
 Blockly.ToolboxCategory.prototype.createContainer_ = function() {
-  var container = document.createElement('div');
+  const container = document.createElement('div');
   Blockly.utils.dom.addClass(container, this.cssConfig_['container']);
   return container;
 };
@@ -268,9 +269,9 @@ Blockly.ToolboxCategory.prototype.createContainer_ = function() {
  * @protected
  */
 Blockly.ToolboxCategory.prototype.createRowContainer_ = function() {
-  var rowDiv = document.createElement('div');
+  const rowDiv = document.createElement('div');
   Blockly.utils.dom.addClass(rowDiv, this.cssConfig_['row']);
-  var nestedPadding = Blockly.ToolboxCategory.nestedPadding * this.getLevel();
+  let nestedPadding = Blockly.ToolboxCategory.nestedPadding * this.getLevel();
   nestedPadding = nestedPadding.toString() + 'px';
   this.workspace_.RTL ? rowDiv.style.paddingRight = nestedPadding :
       rowDiv.style.paddingLeft = nestedPadding;
@@ -284,7 +285,7 @@ Blockly.ToolboxCategory.prototype.createRowContainer_ = function() {
  * @protected
  */
 Blockly.ToolboxCategory.prototype.createRowContentsContainer_ = function() {
-  var contentsContainer = document.createElement('div');
+  const contentsContainer = document.createElement('div');
   Blockly.utils.dom.addClass(contentsContainer, this.cssConfig_['rowcontentcontainer']);
   return contentsContainer;
 };
@@ -295,7 +296,7 @@ Blockly.ToolboxCategory.prototype.createRowContentsContainer_ = function() {
  * @protected
  */
 Blockly.ToolboxCategory.prototype.createIconDom_ = function() {
-  var toolboxIcon = document.createElement('span');
+  const toolboxIcon = document.createElement('span');
   if (!this.parentToolbox_.isHorizontal()) {
     Blockly.utils.dom.addClass(toolboxIcon, this.cssConfig_['icon']);
   }
@@ -312,7 +313,7 @@ Blockly.ToolboxCategory.prototype.createIconDom_ = function() {
  * @protected
  */
 Blockly.ToolboxCategory.prototype.createLabelDom_ = function(name) {
-  var toolboxLabel = document.createElement('span');
+  const toolboxLabel = document.createElement('span');
   toolboxLabel.setAttribute('id', this.getId() + '.label');
   toolboxLabel.textContent = name;
   Blockly.utils.dom.addClass(toolboxLabel, this.cssConfig_['label']);
@@ -336,7 +337,7 @@ Blockly.ToolboxCategory.prototype.refreshTheme = function() {
  */
 Blockly.ToolboxCategory.prototype.addColourBorder_ = function(colour) {
   if (colour) {
-    var border = Blockly.ToolboxCategory.borderWidth + 'px solid ' +
+    const border = Blockly.ToolboxCategory.borderWidth + 'px solid ' +
         (colour || '#ddd');
     if (this.workspace_.RTL) {
       this.rowDiv_.style.borderRight = border;
@@ -354,8 +355,9 @@ Blockly.ToolboxCategory.prototype.addColourBorder_ = function(colour) {
  * @protected
  */
 Blockly.ToolboxCategory.prototype.getColour_ = function(categoryDef) {
-  var styleName = categoryDef['categorystyle'] || categoryDef['categoryStyle'];
-  var colour = categoryDef['colour'];
+  const styleName = categoryDef['categorystyle']
+      || categoryDef['categoryStyle'];
+  const colour = categoryDef['colour'];
 
   if (colour && styleName) {
     console.warn('Toolbox category "' + this.name_ +
@@ -376,9 +378,9 @@ Blockly.ToolboxCategory.prototype.getColour_ = function(categoryDef) {
  * @private
  */
 Blockly.ToolboxCategory.prototype.getColourfromStyle_ = function(styleName) {
-  var theme = this.workspace_.getTheme();
+  const theme = this.workspace_.getTheme();
   if (styleName && theme) {
-    var style = theme.categoryStyles[styleName];
+    const style = theme.categoryStyles[styleName];
     if (style && style.colour) {
       return this.parseColour_(style.colour);
     } else {
@@ -410,16 +412,16 @@ Blockly.ToolboxCategory.prototype.getClickTarget = function() {
 Blockly.ToolboxCategory.prototype.parseColour_ = function(colourValue) {
   // Decode the colour for any potential message references
   // (eg. `%{BKY_MATH_HUE}`).
-  var colour = Blockly.utils.replaceMessageReferences(colourValue);
+  const colour = Blockly.utils.replaceMessageReferences(colourValue);
   if (colour == null || colour === '') {
     // No attribute. No colour.
     return '';
   } else {
-    var hue = Number(colour);
+    const hue = Number(colour);
     if (!isNaN(hue)) {
       return Blockly.hueToHex(hue);
     } else {
-      var hex = Blockly.utils.colour.parse(colour);
+      const hex = Blockly.utils.colour.parse(colour);
       if (hex) {
         return hex;
       } else {
@@ -503,7 +505,7 @@ Blockly.ToolboxCategory.prototype.isVisible = function() {
  * @protected
  */
 Blockly.ToolboxCategory.prototype.allAncestorsExpanded_ = function() {
-  var category = this;
+  let category = this;
   while (category.getParent()) {
     category = category.getParent();
     if (!category.isExpanded()) {
@@ -537,7 +539,7 @@ Blockly.ToolboxCategory.prototype.onClick = function(_e) {
  */
 Blockly.ToolboxCategory.prototype.setSelected = function(isSelected) {
   if (isSelected) {
-    var defaultColour = this.parseColour_(
+    const defaultColour = this.parseColour_(
         Blockly.ToolboxCategory.defaultBackgroundColour);
     this.rowDiv_.style.backgroundColor = this.colour_ || defaultColour;
     Blockly.utils.dom.addClass(this.rowDiv_, this.cssConfig_['selected']);

From 68654b34d15359b941ea2b0fd79f11d65aa97ef3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 10:42:52 -0700
Subject: [PATCH 543/833] Migrate core/toolbox/category.js to goog.module

---
 core/toolbox/category.js | 99 +++++++++++++++++++++-------------------
 tests/deps.js            |  2 +-
 2 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/core/toolbox/category.js b/core/toolbox/category.js
index d035c13d1..3613b5a75 100644
--- a/core/toolbox/category.js
+++ b/core/toolbox/category.js
@@ -10,8 +10,11 @@
  */
 'use strict';
 
-goog.provide('Blockly.ToolboxCategory');
+goog.module('Blockly.ToolboxCategory');
+goog.module.declareLegacyNamespace();
 
+goog.require('Blockly');
+goog.require('Blockly.Css');
 goog.require('Blockly.ISelectableToolboxItem');
 goog.require('Blockly.registry');
 goog.require('Blockly.ToolboxItem');
@@ -36,8 +39,8 @@ goog.requireType('Blockly.IToolbox');
  * @extends {Blockly.ToolboxItem}
  * @implements {Blockly.ISelectableToolboxItem}
  */
-Blockly.ToolboxCategory = function(categoryDef, toolbox, opt_parent) {
-  Blockly.ToolboxCategory.superClass_.constructor.call(
+const ToolboxCategory = function(categoryDef, toolbox, opt_parent) {
+  ToolboxCategory.superClass_.constructor.call(
       this, categoryDef, toolbox, opt_parent);
 
   /**
@@ -91,7 +94,7 @@ Blockly.ToolboxCategory = function(categoryDef, toolbox, opt_parent) {
 
   /**
    * All the css class names that are used to create a category.
-   * @type {!Blockly.ToolboxCategory.CssConfig}
+   * @type {!ToolboxCategory.CssConfig}
    * @protected
    */
   this.cssConfig_ = this.makeDefaultCssConfig_();
@@ -123,7 +126,7 @@ Blockly.ToolboxCategory = function(categoryDef, toolbox, opt_parent) {
   this.parseContents_(categoryDef);
 };
 
-Blockly.utils.object.inherits(Blockly.ToolboxCategory, Blockly.ToolboxItem);
+Blockly.utils.object.inherits(ToolboxCategory, Blockly.ToolboxItem);
 
 /**
  * All the CSS class names that are used to create a category.
@@ -138,40 +141,40 @@ Blockly.utils.object.inherits(Blockly.ToolboxCategory, Blockly.ToolboxItem);
  *            closedicon:(string|undefined)
  *          }}
  */
-Blockly.ToolboxCategory.CssConfig;
+ToolboxCategory.CssConfig;
 
 /**
  * Name used for registering a toolbox category.
  * @const {string}
  */
-Blockly.ToolboxCategory.registrationName = 'category';
+ToolboxCategory.registrationName = 'category';
 
 /**
  * The number of pixels to move the category over at each nested level.
  * @type {number}
  */
-Blockly.ToolboxCategory.nestedPadding = 19;
+ToolboxCategory.nestedPadding = 19;
 
 /**
  * The width in pixels of the strip of colour next to each category.
  * @type {number}
  */
-Blockly.ToolboxCategory.borderWidth = 8;
+ToolboxCategory.borderWidth = 8;
 
 /**
  * The default colour of the category. This is used as the background colour of
  * the category when it is selected.
  * @type {string}
  */
-Blockly.ToolboxCategory.defaultBackgroundColour = '#57e';
+ToolboxCategory.defaultBackgroundColour = '#57e';
 
 /**
  * Creates an object holding the default classes for a category.
- * @return {!Blockly.ToolboxCategory.CssConfig} The configuration object holding
+ * @return {!ToolboxCategory.CssConfig} The configuration object holding
  *    all the CSS classes for a category.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.makeDefaultCssConfig_ = function() {
+ToolboxCategory.prototype.makeDefaultCssConfig_ = function() {
   return {
     'container': 'blocklyToolboxCategory',
     'row': 'blocklyTreeRow',
@@ -192,7 +195,7 @@ Blockly.ToolboxCategory.prototype.makeDefaultCssConfig_ = function() {
  *     to create a category.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.parseContents_ = function(categoryDef) {
+ToolboxCategory.prototype.parseContents_ = function(categoryDef) {
   const contents = categoryDef['contents'];
 
   if (categoryDef['custom']) {
@@ -209,7 +212,7 @@ Blockly.ToolboxCategory.prototype.parseContents_ = function(categoryDef) {
 /**
  * @override
  */
-Blockly.ToolboxCategory.prototype.init = function() {
+ToolboxCategory.prototype.init = function() {
   this.createDom_();
   if (this.toolboxItemDef_['hidden'] == 'true') {
     this.hide();
@@ -221,7 +224,7 @@ Blockly.ToolboxCategory.prototype.init = function() {
  * @return {!Element} The parent element for the category.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.createDom_ = function() {
+ToolboxCategory.prototype.createDom_ = function() {
   this.htmlDiv_ = this.createContainer_();
   Blockly.utils.aria.setRole(this.htmlDiv_, Blockly.utils.aria.Role.TREEITEM);
   Blockly.utils.aria.setState(/** @type {!Element} */ (this.htmlDiv_),
@@ -256,7 +259,7 @@ Blockly.ToolboxCategory.prototype.createDom_ = function() {
  * @return {!Element} The div that holds the icon and the label.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.createContainer_ = function() {
+ToolboxCategory.prototype.createContainer_ = function() {
   const container = document.createElement('div');
   Blockly.utils.dom.addClass(container, this.cssConfig_['container']);
   return container;
@@ -268,10 +271,10 @@ Blockly.ToolboxCategory.prototype.createContainer_ = function() {
  * @return {!Element} The div that holds the contents container.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.createRowContainer_ = function() {
+ToolboxCategory.prototype.createRowContainer_ = function() {
   const rowDiv = document.createElement('div');
   Blockly.utils.dom.addClass(rowDiv, this.cssConfig_['row']);
-  let nestedPadding = Blockly.ToolboxCategory.nestedPadding * this.getLevel();
+  let nestedPadding = ToolboxCategory.nestedPadding * this.getLevel();
   nestedPadding = nestedPadding.toString() + 'px';
   this.workspace_.RTL ? rowDiv.style.paddingRight = nestedPadding :
       rowDiv.style.paddingLeft = nestedPadding;
@@ -284,7 +287,7 @@ Blockly.ToolboxCategory.prototype.createRowContainer_ = function() {
  * @return {!Element} The div that holds the icon and the label.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.createRowContentsContainer_ = function() {
+ToolboxCategory.prototype.createRowContentsContainer_ = function() {
   const contentsContainer = document.createElement('div');
   Blockly.utils.dom.addClass(contentsContainer, this.cssConfig_['rowcontentcontainer']);
   return contentsContainer;
@@ -295,7 +298,7 @@ Blockly.ToolboxCategory.prototype.createRowContentsContainer_ = function() {
  * @return {!Element} The span that holds the category icon.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.createIconDom_ = function() {
+ToolboxCategory.prototype.createIconDom_ = function() {
   const toolboxIcon = document.createElement('span');
   if (!this.parentToolbox_.isHorizontal()) {
     Blockly.utils.dom.addClass(toolboxIcon, this.cssConfig_['icon']);
@@ -312,7 +315,7 @@ Blockly.ToolboxCategory.prototype.createIconDom_ = function() {
  * @return {!Element} The span that holds the category label.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.createLabelDom_ = function(name) {
+ToolboxCategory.prototype.createLabelDom_ = function(name) {
   const toolboxLabel = document.createElement('span');
   toolboxLabel.setAttribute('id', this.getId() + '.label');
   toolboxLabel.textContent = name;
@@ -324,7 +327,7 @@ Blockly.ToolboxCategory.prototype.createLabelDom_ = function(name) {
  * Updates the colour for this category.
  * @public
  */
-Blockly.ToolboxCategory.prototype.refreshTheme = function() {
+ToolboxCategory.prototype.refreshTheme = function() {
   this.colour_ = this.getColour_(/** @type {Blockly.utils.toolbox.CategoryInfo} **/
       (this.toolboxItemDef_));
   this.addColourBorder_(this.colour_);
@@ -335,9 +338,9 @@ Blockly.ToolboxCategory.prototype.refreshTheme = function() {
  * @param {string} colour The category colour.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.addColourBorder_ = function(colour) {
+ToolboxCategory.prototype.addColourBorder_ = function(colour) {
   if (colour) {
-    const border = Blockly.ToolboxCategory.borderWidth + 'px solid ' +
+    const border = ToolboxCategory.borderWidth + 'px solid ' +
         (colour || '#ddd');
     if (this.workspace_.RTL) {
       this.rowDiv_.style.borderRight = border;
@@ -354,7 +357,7 @@ Blockly.ToolboxCategory.prototype.addColourBorder_ = function(colour) {
  * @return {string} The hex colour for the category.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.getColour_ = function(categoryDef) {
+ToolboxCategory.prototype.getColour_ = function(categoryDef) {
   const styleName = categoryDef['categorystyle']
       || categoryDef['categoryStyle'];
   const colour = categoryDef['colour'];
@@ -377,7 +380,7 @@ Blockly.ToolboxCategory.prototype.getColour_ = function(categoryDef) {
  * @return {string} The hex colour for the category.
  * @private
  */
-Blockly.ToolboxCategory.prototype.getColourfromStyle_ = function(styleName) {
+ToolboxCategory.prototype.getColourfromStyle_ = function(styleName) {
   const theme = this.workspace_.getTheme();
   if (styleName && theme) {
     const style = theme.categoryStyles[styleName];
@@ -398,7 +401,7 @@ Blockly.ToolboxCategory.prototype.getColourfromStyle_ = function(styleName) {
  * @return {!Element} The HTML element that receives clicks.
  * @public
  */
-Blockly.ToolboxCategory.prototype.getClickTarget = function() {
+ToolboxCategory.prototype.getClickTarget = function() {
   return /** @type {!Element} */(this.rowDiv_);
 };
 
@@ -409,7 +412,7 @@ Blockly.ToolboxCategory.prototype.getClickTarget = function() {
  * @return {string} The hex colour for the category.
  * @private
  */
-Blockly.ToolboxCategory.prototype.parseColour_ = function(colourValue) {
+ToolboxCategory.prototype.parseColour_ = function(colourValue) {
   // Decode the colour for any potential message references
   // (eg. `%{BKY_MATH_HUE}`).
   const colour = Blockly.utils.replaceMessageReferences(colourValue);
@@ -438,7 +441,7 @@ Blockly.ToolboxCategory.prototype.parseColour_ = function(colourValue) {
  * @param {?Element} iconDiv The div that holds the icon.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.openIcon_ = function(iconDiv) {
+ToolboxCategory.prototype.openIcon_ = function(iconDiv) {
   if (!iconDiv) {
     return;
   }
@@ -451,7 +454,7 @@ Blockly.ToolboxCategory.prototype.openIcon_ = function(iconDiv) {
  * @param {?Element} iconDiv The div that holds the icon.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.closeIcon_ = function(iconDiv) {
+ToolboxCategory.prototype.closeIcon_ = function(iconDiv) {
   if (!iconDiv) {
     return;
   }
@@ -465,7 +468,7 @@ Blockly.ToolboxCategory.prototype.closeIcon_ = function(iconDiv) {
  * @param {boolean} isVisible True if category should be visible.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.setVisible_ = function(isVisible) {
+ToolboxCategory.prototype.setVisible_ = function(isVisible) {
   this.htmlDiv_.style.display = isVisible ? 'block' : 'none';
   this.isHidden_ = !isVisible;
 
@@ -477,7 +480,7 @@ Blockly.ToolboxCategory.prototype.setVisible_ = function(isVisible) {
 /**
  * Hide the category.
  */
-Blockly.ToolboxCategory.prototype.hide = function() {
+ToolboxCategory.prototype.hide = function() {
   this.setVisible_(false);
 };
 
@@ -485,7 +488,7 @@ Blockly.ToolboxCategory.prototype.hide = function() {
  * Show the category. Category will only appear if its parent category is also
  * expanded.
  */
-Blockly.ToolboxCategory.prototype.show = function() {
+ToolboxCategory.prototype.show = function() {
   this.setVisible_(true);
 };
 
@@ -495,7 +498,7 @@ Blockly.ToolboxCategory.prototype.show = function() {
  * @return {boolean} True if the category is visible, false otherwise.
  * @public
  */
-Blockly.ToolboxCategory.prototype.isVisible = function() {
+ToolboxCategory.prototype.isVisible = function() {
   return !this.isHidden_ && this.allAncestorsExpanded_();
 };
 
@@ -504,7 +507,7 @@ Blockly.ToolboxCategory.prototype.isVisible = function() {
  * @return {boolean} True only if every ancestor is expanded
  * @protected
  */
-Blockly.ToolboxCategory.prototype.allAncestorsExpanded_ = function() {
+ToolboxCategory.prototype.allAncestorsExpanded_ = function() {
   let category = this;
   while (category.getParent()) {
     category = category.getParent();
@@ -518,7 +521,7 @@ Blockly.ToolboxCategory.prototype.allAncestorsExpanded_ = function() {
 /**
  * @override
  */
-Blockly.ToolboxCategory.prototype.isSelectable = function() {
+ToolboxCategory.prototype.isSelectable = function() {
   return this.isVisible() && !this.isDisabled_;
 };
 
@@ -527,7 +530,7 @@ Blockly.ToolboxCategory.prototype.isSelectable = function() {
  * @param {!Event} _e Click event to handle.
  * @public
  */
-Blockly.ToolboxCategory.prototype.onClick = function(_e) {
+ToolboxCategory.prototype.onClick = function(_e) {
   // No-op
 };
 
@@ -537,10 +540,10 @@ Blockly.ToolboxCategory.prototype.onClick = function(_e) {
  *     otherwise.
  * @public
  */
-Blockly.ToolboxCategory.prototype.setSelected = function(isSelected) {
+ToolboxCategory.prototype.setSelected = function(isSelected) {
   if (isSelected) {
     const defaultColour = this.parseColour_(
-        Blockly.ToolboxCategory.defaultBackgroundColour);
+        ToolboxCategory.defaultBackgroundColour);
     this.rowDiv_.style.backgroundColor = this.colour_ || defaultColour;
     Blockly.utils.dom.addClass(this.rowDiv_, this.cssConfig_['selected']);
   } else {
@@ -555,7 +558,7 @@ Blockly.ToolboxCategory.prototype.setSelected = function(isSelected) {
  * Sets whether the category is disabled.
  * @param {boolean} isDisabled True to disable the category, false otherwise.
  */
-Blockly.ToolboxCategory.prototype.setDisabled = function(isDisabled) {
+ToolboxCategory.prototype.setDisabled = function(isDisabled) {
   this.isDisabled_ = isDisabled;
   this.getDiv().setAttribute('disabled', isDisabled);
   isDisabled ? this.getDiv().setAttribute('disabled', 'true') :
@@ -567,21 +570,21 @@ Blockly.ToolboxCategory.prototype.setDisabled = function(isDisabled) {
  * @return {string} The name of the toolbox item.
  * @public
  */
-Blockly.ToolboxCategory.prototype.getName = function() {
+ToolboxCategory.prototype.getName = function() {
   return this.name_;
 };
 
 /**
  * @override
  */
-Blockly.ToolboxCategory.prototype.getParent = function() {
+ToolboxCategory.prototype.getParent = function() {
   return this.parent_;
 };
 
 /**
  * @override
  */
-Blockly.ToolboxCategory.prototype.getDiv = function() {
+ToolboxCategory.prototype.getDiv = function() {
   return this.htmlDiv_;
 };
 
@@ -592,7 +595,7 @@ Blockly.ToolboxCategory.prototype.getDiv = function() {
  *     of items to be displayed in the flyout.
  * @public
  */
-Blockly.ToolboxCategory.prototype.getContents = function() {
+ToolboxCategory.prototype.getContents = function() {
   return this.flyoutItems_;
 };
 
@@ -605,7 +608,7 @@ Blockly.ToolboxCategory.prototype.getContents = function() {
  *     dynamic category.
  * @public
  */
-Blockly.ToolboxCategory.prototype.updateFlyoutContents = function(contents) {
+ToolboxCategory.prototype.updateFlyoutContents = function(contents) {
   this.flyoutItems_ = [];
 
   if (typeof contents == 'string') {
@@ -623,7 +626,7 @@ Blockly.ToolboxCategory.prototype.updateFlyoutContents = function(contents) {
 /**
  * @override
  */
-Blockly.ToolboxCategory.prototype.dispose = function() {
+ToolboxCategory.prototype.dispose = function() {
   Blockly.utils.dom.removeNode(this.htmlDiv_);
 };
 
@@ -707,4 +710,6 @@ Blockly.Css.register([
 ]);
 
 Blockly.registry.register(Blockly.registry.Type.TOOLBOX_ITEM,
-    Blockly.ToolboxCategory.registrationName, Blockly.ToolboxCategory);
+    ToolboxCategory.registrationName, ToolboxCategory);
+
+exports = ToolboxCategory;
diff --git a/tests/deps.js b/tests/deps.js
index c71382196..a563d81e7 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -169,7 +169,7 @@ goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry'
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly', 'Blockly.Css', 'Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});

From 3c564982fcd46944e7ef2fe51e0c123c4fa37570 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 10:44:42 -0700
Subject: [PATCH 544/833] Migrate core/toolbox/category.js named requires

---
 core/toolbox/category.js | 112 ++++++++++++++++++++-------------------
 1 file changed, 57 insertions(+), 55 deletions(-)

diff --git a/core/toolbox/category.js b/core/toolbox/category.js
index 3613b5a75..590216637 100644
--- a/core/toolbox/category.js
+++ b/core/toolbox/category.js
@@ -13,31 +13,33 @@
 goog.module('Blockly.ToolboxCategory');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly');
-goog.require('Blockly.Css');
-goog.require('Blockly.ISelectableToolboxItem');
-goog.require('Blockly.registry');
-goog.require('Blockly.ToolboxItem');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.aria');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.toolbox');
-
-goog.requireType('Blockly.ICollapsibleToolboxItem');
-goog.requireType('Blockly.IToolbox');
+const Blockly = goog.require('Blockly');
+const Css = goog.require('Blockly.Css');
+/* eslint-disable-next-line no-unused-vars */
+const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');
+/* eslint-disable-next-line no-unused-vars */
+const ISelectableToolboxItem = goog.require('Blockly.ISelectableToolboxItem');
+/* eslint-disable-next-line no-unused-vars */
+const IToolbox = goog.requireType('Blockly.IToolbox');
+const ToolboxItem = goog.require('Blockly.ToolboxItem');
+const aria = goog.require('Blockly.utils.aria');
+const dom = goog.require('Blockly.utils.dom');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
+const toolbox = goog.require('Blockly.utils.toolbox');
+const utils = goog.require('Blockly.utils');
 
 
 /**
  * Class for a category in a toolbox.
- * @param {!Blockly.utils.toolbox.CategoryInfo} categoryDef The information needed
+ * @param {!toolbox.CategoryInfo} categoryDef The information needed
  *     to create a category in the toolbox.
- * @param {!Blockly.IToolbox} toolbox The parent toolbox for the category.
- * @param {Blockly.ICollapsibleToolboxItem=} opt_parent The parent category or null if
+ * @param {!IToolbox} toolbox The parent toolbox for the category.
+ * @param {ICollapsibleToolboxItem=} opt_parent The parent category or null if
  *     the category does not have a parent.
  * @constructor
- * @extends {Blockly.ToolboxItem}
- * @implements {Blockly.ISelectableToolboxItem}
+ * @extends {ToolboxItem}
+ * @implements {ISelectableToolboxItem}
  */
 const ToolboxCategory = function(categoryDef, toolbox, opt_parent) {
   ToolboxCategory.superClass_.constructor.call(
@@ -48,7 +50,7 @@ const ToolboxCategory = function(categoryDef, toolbox, opt_parent) {
    * @type {string}
    * @protected
    */
-  this.name_ = Blockly.utils.replaceMessageReferences(categoryDef['name']);
+  this.name_ = utils.replaceMessageReferences(categoryDef['name']);
 
   /**
    * The colour of the category.
@@ -100,7 +102,7 @@ const ToolboxCategory = function(categoryDef, toolbox, opt_parent) {
   this.cssConfig_ = this.makeDefaultCssConfig_();
 
   const cssConfig = categoryDef['cssconfig'] || categoryDef['cssConfig'];
-  Blockly.utils.object.mixin(this.cssConfig_, cssConfig);
+  object.mixin(this.cssConfig_, cssConfig);
 
   /**
    * True if the category is meant to be hidden, false otherwise.
@@ -118,7 +120,7 @@ const ToolboxCategory = function(categoryDef, toolbox, opt_parent) {
 
   /**
    * The flyout items for this category.
-   * @type {string|!Blockly.utils.toolbox.FlyoutItemInfoArray}
+   * @type {string|!toolbox.FlyoutItemInfoArray}
    * @protected
    */
   this.flyoutItems_ = [];
@@ -126,7 +128,7 @@ const ToolboxCategory = function(categoryDef, toolbox, opt_parent) {
   this.parseContents_(categoryDef);
 };
 
-Blockly.utils.object.inherits(ToolboxCategory, Blockly.ToolboxItem);
+object.inherits(ToolboxCategory, ToolboxItem);
 
 /**
  * All the CSS class names that are used to create a category.
@@ -191,7 +193,7 @@ ToolboxCategory.prototype.makeDefaultCssConfig_ = function() {
 /**
  * Parses the contents array depending on if the category is a dynamic category,
  * or if its contents are meant to be shown in the flyout.
- * @param {!Blockly.utils.toolbox.CategoryInfo} categoryDef The information needed
+ * @param {!toolbox.CategoryInfo} categoryDef The information needed
  *     to create a category.
  * @protected
  */
@@ -226,11 +228,11 @@ ToolboxCategory.prototype.init = function() {
  */
 ToolboxCategory.prototype.createDom_ = function() {
   this.htmlDiv_ = this.createContainer_();
-  Blockly.utils.aria.setRole(this.htmlDiv_, Blockly.utils.aria.Role.TREEITEM);
-  Blockly.utils.aria.setState(/** @type {!Element} */ (this.htmlDiv_),
-      Blockly.utils.aria.State.SELECTED,false);
-  Blockly.utils.aria.setState(/** @type {!Element} */ (this.htmlDiv_),
-      Blockly.utils.aria.State.LEVEL, this.level_);
+  aria.setRole(this.htmlDiv_, aria.Role.TREEITEM);
+  aria.setState(/** @type {!Element} */ (this.htmlDiv_),
+      aria.State.SELECTED,false);
+  aria.setState(/** @type {!Element} */ (this.htmlDiv_),
+      aria.State.LEVEL, this.level_);
 
   this.rowDiv_ = this.createRowContainer_();
   this.rowDiv_.style.pointerEvents = 'auto';
@@ -241,13 +243,13 @@ ToolboxCategory.prototype.createDom_ = function() {
   this.rowDiv_.appendChild(this.rowContents_);
 
   this.iconDom_ = this.createIconDom_();
-  Blockly.utils.aria.setRole(this.iconDom_, Blockly.utils.aria.Role.PRESENTATION);
+  aria.setRole(this.iconDom_, aria.Role.PRESENTATION);
   this.rowContents_.appendChild(this.iconDom_);
 
   this.labelDom_ = this.createLabelDom_(this.name_);
   this.rowContents_.appendChild(this.labelDom_);
-  Blockly.utils.aria.setState(/** @type {!Element} */ (this.htmlDiv_),
-      Blockly.utils.aria.State.LABELLEDBY, this.labelDom_.getAttribute('id'));
+  aria.setState(/** @type {!Element} */ (this.htmlDiv_),
+      aria.State.LABELLEDBY, this.labelDom_.getAttribute('id'));
 
   this.addColourBorder_(this.colour_);
 
@@ -261,7 +263,7 @@ ToolboxCategory.prototype.createDom_ = function() {
  */
 ToolboxCategory.prototype.createContainer_ = function() {
   const container = document.createElement('div');
-  Blockly.utils.dom.addClass(container, this.cssConfig_['container']);
+  dom.addClass(container, this.cssConfig_['container']);
   return container;
 };
 
@@ -273,7 +275,7 @@ ToolboxCategory.prototype.createContainer_ = function() {
  */
 ToolboxCategory.prototype.createRowContainer_ = function() {
   const rowDiv = document.createElement('div');
-  Blockly.utils.dom.addClass(rowDiv, this.cssConfig_['row']);
+  dom.addClass(rowDiv, this.cssConfig_['row']);
   let nestedPadding = ToolboxCategory.nestedPadding * this.getLevel();
   nestedPadding = nestedPadding.toString() + 'px';
   this.workspace_.RTL ? rowDiv.style.paddingRight = nestedPadding :
@@ -289,7 +291,7 @@ ToolboxCategory.prototype.createRowContainer_ = function() {
  */
 ToolboxCategory.prototype.createRowContentsContainer_ = function() {
   const contentsContainer = document.createElement('div');
-  Blockly.utils.dom.addClass(contentsContainer, this.cssConfig_['rowcontentcontainer']);
+  dom.addClass(contentsContainer, this.cssConfig_['rowcontentcontainer']);
   return contentsContainer;
 };
 
@@ -301,7 +303,7 @@ ToolboxCategory.prototype.createRowContentsContainer_ = function() {
 ToolboxCategory.prototype.createIconDom_ = function() {
   const toolboxIcon = document.createElement('span');
   if (!this.parentToolbox_.isHorizontal()) {
-    Blockly.utils.dom.addClass(toolboxIcon, this.cssConfig_['icon']);
+    dom.addClass(toolboxIcon, this.cssConfig_['icon']);
   }
 
   toolboxIcon.style.display = 'inline-block';
@@ -319,7 +321,7 @@ ToolboxCategory.prototype.createLabelDom_ = function(name) {
   const toolboxLabel = document.createElement('span');
   toolboxLabel.setAttribute('id', this.getId() + '.label');
   toolboxLabel.textContent = name;
-  Blockly.utils.dom.addClass(toolboxLabel, this.cssConfig_['label']);
+  dom.addClass(toolboxLabel, this.cssConfig_['label']);
   return toolboxLabel;
 };
 
@@ -328,7 +330,7 @@ ToolboxCategory.prototype.createLabelDom_ = function(name) {
  * @public
  */
 ToolboxCategory.prototype.refreshTheme = function() {
-  this.colour_ = this.getColour_(/** @type {Blockly.utils.toolbox.CategoryInfo} **/
+  this.colour_ = this.getColour_(/** @type {toolbox.CategoryInfo} **/
       (this.toolboxItemDef_));
   this.addColourBorder_(this.colour_);
 };
@@ -352,7 +354,7 @@ ToolboxCategory.prototype.addColourBorder_ = function(colour) {
 
 /**
  * Gets either the colour or the style for a category.
- * @param {!Blockly.utils.toolbox.CategoryInfo} categoryDef The object holding
+ * @param {!toolbox.CategoryInfo} categoryDef The object holding
  *    information on the category.
  * @return {string} The hex colour for the category.
  * @protected
@@ -415,7 +417,7 @@ ToolboxCategory.prototype.getClickTarget = function() {
 ToolboxCategory.prototype.parseColour_ = function(colourValue) {
   // Decode the colour for any potential message references
   // (eg. `%{BKY_MATH_HUE}`).
-  const colour = Blockly.utils.replaceMessageReferences(colourValue);
+  const colour = utils.replaceMessageReferences(colourValue);
   if (colour == null || colour === '') {
     // No attribute. No colour.
     return '';
@@ -424,7 +426,7 @@ ToolboxCategory.prototype.parseColour_ = function(colourValue) {
     if (!isNaN(hue)) {
       return Blockly.hueToHex(hue);
     } else {
-      const hex = Blockly.utils.colour.parse(colour);
+      const hex = utils.colour.parse(colour);
       if (hex) {
         return hex;
       } else {
@@ -445,8 +447,8 @@ ToolboxCategory.prototype.openIcon_ = function(iconDiv) {
   if (!iconDiv) {
     return;
   }
-  Blockly.utils.dom.removeClasses(iconDiv, this.cssConfig_['closedicon']);
-  Blockly.utils.dom.addClass(iconDiv, this.cssConfig_['openicon']);
+  dom.removeClasses(iconDiv, this.cssConfig_['closedicon']);
+  dom.addClass(iconDiv, this.cssConfig_['openicon']);
 };
 
 /**
@@ -458,8 +460,8 @@ ToolboxCategory.prototype.closeIcon_ = function(iconDiv) {
   if (!iconDiv) {
     return;
   }
-  Blockly.utils.dom.removeClasses(iconDiv, this.cssConfig_['openicon']);
-  Blockly.utils.dom.addClass(iconDiv, this.cssConfig_['closedicon']);
+  dom.removeClasses(iconDiv, this.cssConfig_['openicon']);
+  dom.addClass(iconDiv, this.cssConfig_['closedicon']);
 };
 
 /**
@@ -545,13 +547,13 @@ ToolboxCategory.prototype.setSelected = function(isSelected) {
     const defaultColour = this.parseColour_(
         ToolboxCategory.defaultBackgroundColour);
     this.rowDiv_.style.backgroundColor = this.colour_ || defaultColour;
-    Blockly.utils.dom.addClass(this.rowDiv_, this.cssConfig_['selected']);
+    dom.addClass(this.rowDiv_, this.cssConfig_['selected']);
   } else {
     this.rowDiv_.style.backgroundColor = '';
-    Blockly.utils.dom.removeClass(this.rowDiv_, this.cssConfig_['selected']);
+    dom.removeClass(this.rowDiv_, this.cssConfig_['selected']);
   }
-  Blockly.utils.aria.setState(/** @type {!Element} */ (this.htmlDiv_),
-      Blockly.utils.aria.State.SELECTED, isSelected);
+  aria.setState(/** @type {!Element} */ (this.htmlDiv_),
+      aria.State.SELECTED, isSelected);
 };
 
 /**
@@ -591,7 +593,7 @@ ToolboxCategory.prototype.getDiv = function() {
 /**
  * Gets the contents of the category. These are items that are meant to be
  * displayed in the flyout.
- * @return {!Blockly.utils.toolbox.FlyoutItemInfoArray|string} The definition
+ * @return {!toolbox.FlyoutItemInfoArray|string} The definition
  *     of items to be displayed in the flyout.
  * @public
  */
@@ -603,7 +605,7 @@ ToolboxCategory.prototype.getContents = function() {
  * Updates the contents to be displayed in the flyout.
  * If the flyout is open when the contents are updated, refreshSelection on the
  * toolbox must also be called.
- * @param {!Blockly.utils.toolbox.FlyoutDefinition|string} contents The contents
+ * @param {!toolbox.FlyoutDefinition|string} contents The contents
  *     to be displayed in the flyout. A string can be supplied to create a
  *     dynamic category.
  * @public
@@ -617,23 +619,23 @@ ToolboxCategory.prototype.updateFlyoutContents = function(contents) {
     // Removes old custom field when contents is updated.
     delete this.toolboxItemDef_['custom'];
     this.toolboxItemDef_['contents'] =
-        Blockly.utils.toolbox.convertFlyoutDefToJsonArray(contents);
+        toolbox.convertFlyoutDefToJsonArray(contents);
   }
   this.parseContents_(
-      /** @type {Blockly.utils.toolbox.CategoryInfo} */ (this.toolboxItemDef_));
+      /** @type {toolbox.CategoryInfo} */ (this.toolboxItemDef_));
 };
 
 /**
  * @override
  */
 ToolboxCategory.prototype.dispose = function() {
-  Blockly.utils.dom.removeNode(this.htmlDiv_);
+  dom.removeNode(this.htmlDiv_);
 };
 
 /**
  * CSS for Toolbox.  See css.js for use.
  */
-Blockly.Css.register([
+Css.register([
   /* eslint-disable indent */
   '.blocklyTreeRow:not(.blocklyTreeSelected):hover {',
     'background-color: rgba(255, 255, 255, 0.2);',
@@ -709,7 +711,7 @@ Blockly.Css.register([
   /* eslint-enable indent */
 ]);
 
-Blockly.registry.register(Blockly.registry.Type.TOOLBOX_ITEM,
+registry.register(registry.Type.TOOLBOX_ITEM,
     ToolboxCategory.registrationName, ToolboxCategory);
 
 exports = ToolboxCategory;

From f818f882bc6cc0083f803ff9d7bcdcf495a4fce9 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 10:49:26 -0700
Subject: [PATCH 545/833] clang-format core/toolbox/category.js

---
 core/toolbox/category.js | 177 ++++++++++++++++++++-------------------
 1 file changed, 91 insertions(+), 86 deletions(-)

diff --git a/core/toolbox/category.js b/core/toolbox/category.js
index 590216637..5c8076383 100644
--- a/core/toolbox/category.js
+++ b/core/toolbox/category.js
@@ -205,7 +205,8 @@ ToolboxCategory.prototype.parseContents_ = function(categoryDef) {
   } else if (contents) {
     for (let i = 0; i < contents.length; i++) {
       const itemDef = contents[i];
-      const flyoutItem = /** @type {Blockly.utils.toolbox.FlyoutItemInfo} */ (itemDef);
+      const flyoutItem =
+          /** @type {Blockly.utils.toolbox.FlyoutItemInfo} */ (itemDef);
       this.flyoutItems_.push(flyoutItem);
     }
   }
@@ -229,10 +230,10 @@ ToolboxCategory.prototype.init = function() {
 ToolboxCategory.prototype.createDom_ = function() {
   this.htmlDiv_ = this.createContainer_();
   aria.setRole(this.htmlDiv_, aria.Role.TREEITEM);
-  aria.setState(/** @type {!Element} */ (this.htmlDiv_),
-      aria.State.SELECTED,false);
-  aria.setState(/** @type {!Element} */ (this.htmlDiv_),
-      aria.State.LEVEL, this.level_);
+  aria.setState(
+      /** @type {!Element} */ (this.htmlDiv_), aria.State.SELECTED, false);
+  aria.setState(
+      /** @type {!Element} */ (this.htmlDiv_), aria.State.LEVEL, this.level_);
 
   this.rowDiv_ = this.createRowContainer_();
   this.rowDiv_.style.pointerEvents = 'auto';
@@ -248,8 +249,9 @@ ToolboxCategory.prototype.createDom_ = function() {
 
   this.labelDom_ = this.createLabelDom_(this.name_);
   this.rowContents_.appendChild(this.labelDom_);
-  aria.setState(/** @type {!Element} */ (this.htmlDiv_),
-      aria.State.LABELLEDBY, this.labelDom_.getAttribute('id'));
+  aria.setState(
+      /** @type {!Element} */ (this.htmlDiv_), aria.State.LABELLEDBY,
+      this.labelDom_.getAttribute('id'));
 
   this.addColourBorder_(this.colour_);
 
@@ -279,7 +281,7 @@ ToolboxCategory.prototype.createRowContainer_ = function() {
   let nestedPadding = ToolboxCategory.nestedPadding * this.getLevel();
   nestedPadding = nestedPadding.toString() + 'px';
   this.workspace_.RTL ? rowDiv.style.paddingRight = nestedPadding :
-      rowDiv.style.paddingLeft = nestedPadding;
+                        rowDiv.style.paddingLeft = nestedPadding;
   return rowDiv;
 };
 
@@ -331,7 +333,7 @@ ToolboxCategory.prototype.createLabelDom_ = function(name) {
  */
 ToolboxCategory.prototype.refreshTheme = function() {
   this.colour_ = this.getColour_(/** @type {toolbox.CategoryInfo} **/
-      (this.toolboxItemDef_));
+                                 (this.toolboxItemDef_));
   this.addColourBorder_(this.colour_);
 };
 
@@ -342,8 +344,8 @@ ToolboxCategory.prototype.refreshTheme = function() {
  */
 ToolboxCategory.prototype.addColourBorder_ = function(colour) {
   if (colour) {
-    const border = ToolboxCategory.borderWidth + 'px solid ' +
-        (colour || '#ddd');
+    const border =
+        ToolboxCategory.borderWidth + 'px solid ' + (colour || '#ddd');
     if (this.workspace_.RTL) {
       this.rowDiv_.style.borderRight = border;
     } else {
@@ -360,12 +362,13 @@ ToolboxCategory.prototype.addColourBorder_ = function(colour) {
  * @protected
  */
 ToolboxCategory.prototype.getColour_ = function(categoryDef) {
-  const styleName = categoryDef['categorystyle']
-      || categoryDef['categoryStyle'];
+  const styleName =
+      categoryDef['categorystyle'] || categoryDef['categoryStyle'];
   const colour = categoryDef['colour'];
 
   if (colour && styleName) {
-    console.warn('Toolbox category "' + this.name_ +
+    console.warn(
+        'Toolbox category "' + this.name_ +
         '" must not have both a style and a colour');
   } else if (styleName) {
     return this.getColourfromStyle_(styleName);
@@ -389,8 +392,8 @@ ToolboxCategory.prototype.getColourfromStyle_ = function(styleName) {
     if (style && style.colour) {
       return this.parseColour_(style.colour);
     } else {
-      console.warn('Style "' + styleName +
-          '" must exist and contain a colour value');
+      console.warn(
+          'Style "' + styleName + '" must exist and contain a colour value');
     }
   }
   return '';
@@ -404,7 +407,7 @@ ToolboxCategory.prototype.getColourfromStyle_ = function(styleName) {
  * @public
  */
 ToolboxCategory.prototype.getClickTarget = function() {
-  return /** @type {!Element} */(this.rowDiv_);
+  return /** @type {!Element} */ (this.rowDiv_);
 };
 
 /**
@@ -430,7 +433,8 @@ ToolboxCategory.prototype.parseColour_ = function(colourValue) {
       if (hex) {
         return hex;
       } else {
-        console.warn('Toolbox category "' + this.name_ +
+        console.warn(
+            'Toolbox category "' + this.name_ +
             '" has unrecognized colour attribute: ' + colour);
         return '';
       }
@@ -496,7 +500,8 @@ ToolboxCategory.prototype.show = function() {
 
 /**
  * Whether the category is visible.
- * A category is only visible if all of its ancestors are expanded and isHidden_ is false.
+ * A category is only visible if all of its ancestors are expanded and isHidden_
+ * is false.
  * @return {boolean} True if the category is visible, false otherwise.
  * @public
  */
@@ -505,7 +510,8 @@ ToolboxCategory.prototype.isVisible = function() {
 };
 
 /**
- * Whether all ancestors of a category (parent and parent's parent, etc.) are expanded.
+ * Whether all ancestors of a category (parent and parent's parent, etc.) are
+ * expanded.
  * @return {boolean} True only if every ancestor is expanded
  * @protected
  */
@@ -544,16 +550,16 @@ ToolboxCategory.prototype.onClick = function(_e) {
  */
 ToolboxCategory.prototype.setSelected = function(isSelected) {
   if (isSelected) {
-    const defaultColour = this.parseColour_(
-        ToolboxCategory.defaultBackgroundColour);
+    const defaultColour =
+        this.parseColour_(ToolboxCategory.defaultBackgroundColour);
     this.rowDiv_.style.backgroundColor = this.colour_ || defaultColour;
     dom.addClass(this.rowDiv_, this.cssConfig_['selected']);
   } else {
     this.rowDiv_.style.backgroundColor = '';
     dom.removeClass(this.rowDiv_, this.cssConfig_['selected']);
   }
-  aria.setState(/** @type {!Element} */ (this.htmlDiv_),
-      aria.State.SELECTED, isSelected);
+  aria.setState(
+      /** @type {!Element} */ (this.htmlDiv_), aria.State.SELECTED, isSelected);
 };
 
 /**
@@ -564,7 +570,7 @@ ToolboxCategory.prototype.setDisabled = function(isDisabled) {
   this.isDisabled_ = isDisabled;
   this.getDiv().setAttribute('disabled', isDisabled);
   isDisabled ? this.getDiv().setAttribute('disabled', 'true') :
-      this.getDiv().removeAttribute('disabled');
+               this.getDiv().removeAttribute('disabled');
 };
 
 /**
@@ -636,82 +642,81 @@ ToolboxCategory.prototype.dispose = function() {
  * CSS for Toolbox.  See css.js for use.
  */
 Css.register([
-  /* eslint-disable indent */
-  '.blocklyTreeRow:not(.blocklyTreeSelected):hover {',
-    'background-color: rgba(255, 255, 255, 0.2);',
-  '}',
+  `.blocklyTreeRow:not(.blocklyTreeSelected):hover {
+  background-color: rgba(255, 255, 255, 0.2);
+}`,
 
-  '.blocklyToolboxDiv[layout="h"] .blocklyToolboxCategory {',
-    'margin: 1px 5px 1px 0;',
-  '}',
+  `.blocklyToolboxDiv[layout="h"] .blocklyToolboxCategory {
+  margin: 1px 5px 1px 0;
+}`,
 
-  '.blocklyToolboxDiv[dir="RTL"][layout="h"] .blocklyToolboxCategory {',
-    'margin: 1px 0 1px 5px;',
-  '}',
+  `.blocklyToolboxDiv[dir="RTL"][layout="h"] .blocklyToolboxCategory {
+  margin: 1px 0 1px 5px;
+}`,
 
-  '.blocklyTreeRow {',
-    'height: 22px;',
-    'line-height: 22px;',
-    'margin-bottom: 3px;',
-    'padding-right: 8px;',
-    'white-space: nowrap;',
-  '}',
+  `.blocklyTreeRow {
+  height: 22px;
+  line-height: 22px;
+  margin-bottom: 3px;
+  padding-right: 8px;
+  white-space: nowrap;
+}`,
 
-  '.blocklyToolboxDiv[dir="RTL"] .blocklyTreeRow {',
-    'margin-left: 8px;',
-    'padding-right: 0',
-  '}',
+  `.blocklyToolboxDiv[dir="RTL"] .blocklyTreeRow {
+  margin-left: 8px;
+  padding-right: 0;
+}`,
 
-  '.blocklyTreeIcon {',
-    'background-image: url(<<<PATH>>>/sprites.png);',
-    'height: 16px;',
-    'vertical-align: middle;',
-    'visibility: hidden;',
-    'width: 16px;',
-  '}',
+  `.blocklyTreeIcon {',
+  background-image: url(<<<PATH>>>/sprites.png);
+  height: 16px;
+  vertical-align: middle;
+  visibility: hidden;
+  width: 16px;
+}`,
 
-  '.blocklyTreeIconClosed {',
-    'background-position: -32px -1px;',
-  '}',
+  `.blocklyTreeIconClosed {
+  background-position: -32px -1px;
+}`,
 
-  '.blocklyToolboxDiv[dir="RTL"] .blocklyTreeIconClosed {',
-    'background-position: 0 -1px;',
-  '}',
+  `.blocklyToolboxDiv[dir="RTL"] .blocklyTreeIconClosed {
+  background-position: 0 -1px;
+}`,
 
-  '.blocklyTreeSelected>.blocklyTreeIconClosed {',
-    'background-position: -32px -17px;',
-  '}',
+  `.blocklyTreeSelected>.blocklyTreeIconClosed {
+  background-position: -32px -17px;
+}`,
 
-  '.blocklyToolboxDiv[dir="RTL"] .blocklyTreeSelected>.blocklyTreeIconClosed {',
-    'background-position: 0 -17px;',
-  '}',
+  `.blocklyToolboxDiv[dir="RTL"] .blocklyTreeSelected>.blocklyTreeIconClosed {
+  background-position: 0 -17px;
+}`,
 
-  '.blocklyTreeIconOpen {',
-    'background-position: -16px -1px;',
-  '}',
+  `.blocklyTreeIconOpen {
+  background-position: -16px -1px;
+}`,
 
-  '.blocklyTreeSelected>.blocklyTreeIconOpen {',
-    'background-position: -16px -17px;',
-  '}',
+  `.blocklyTreeSelected>.blocklyTreeIconOpen {
+  background-position: -16px -17px;
+}`,
 
-  '.blocklyTreeLabel {',
-    'cursor: default;',
-    'font: 16px sans-serif;',
-    'padding: 0 3px;',
-    'vertical-align: middle;',
-  '}',
+  `.blocklyTreeLabel {
+  cursor: default;
+  font: 16px sans-serif;
+  padding: 0 3px;
+  vertical-align: middle;
+}`,
 
-  '.blocklyToolboxDelete .blocklyTreeLabel {',
-    'cursor: url("<<<PATH>>>/handdelete.cur"), auto;',
-  '}',
+  `.blocklyToolboxDelete .blocklyTreeLabel {
+  cursor: url("<<<PATH>>>/handdelete.cur"), auto;
+}`,
 
-  '.blocklyTreeSelected .blocklyTreeLabel {',
-    'color: #fff;',
-  '}'
-  /* eslint-enable indent */
+  `.blocklyTreeSelected .blocklyTreeLabel {
+  color: #fff;
+}`
 ]);
 
-registry.register(registry.Type.TOOLBOX_ITEM,
-    ToolboxCategory.registrationName, ToolboxCategory);
+registry.register(
+    registry.Type.TOOLBOX_ITEM, ToolboxCategory.registrationName,
+    ToolboxCategory);
 
 exports = ToolboxCategory;

From 2a137dff4c8cadc18e236ba4449d5c39c777a325 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 15:23:56 -0700
Subject: [PATCH 546/833] Migrate core/names.js to ES6 const/let

---
 core/names.js | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/core/names.js b/core/names.js
index a559321cf..ce57404d3 100644
--- a/core/names.js
+++ b/core/names.js
@@ -30,8 +30,8 @@ Blockly.Names = function(reservedWords, opt_variablePrefix) {
   this.variablePrefix_ = opt_variablePrefix || '';
   this.reservedDict_ = Object.create(null);
   if (reservedWords) {
-    var splitWords = reservedWords.split(',');
-    for (var i = 0; i < splitWords.length; i++) {
+    const splitWords = reservedWords.split(',');
+    for (let i = 0; i < splitWords.length; i++) {
       this.reservedDict_[splitWords[i]] = true;
     }
   }
@@ -91,7 +91,7 @@ Blockly.Names.prototype.getNameForUserVariable_ = function(id) {
         'workspace.getVariableMap());');
     return null;
   }
-  var variable = this.variableMap_.getVariableById(id);
+  const variable = this.variableMap_.getVariableById(id);
   if (variable) {
     return variable.name;
   }
@@ -103,8 +103,8 @@ Blockly.Names.prototype.getNameForUserVariable_ = function(id) {
  * @param {!Blockly.Workspace} workspace Workspace to generate variables from.
  */
 Blockly.Names.prototype.populateVariables = function(workspace) {
-  var variables = Blockly.Variables.allUsedVarModels(workspace);
-  for (var i = 0; i < variables.length; i++) {
+  const variables = Blockly.Variables.allUsedVarModels(workspace);
+  for (let i = 0; i < variables.length; i++) {
     this.getName(
         variables[i].getId(), Blockly.internalConstants.VARIABLE_CATEGORY_NAME);
   }
@@ -115,10 +115,10 @@ Blockly.Names.prototype.populateVariables = function(workspace) {
  * @param {!Blockly.Workspace} workspace Workspace to generate procedures from.
  */
 Blockly.Names.prototype.populateProcedures = function(workspace) {
-  var procedures = Blockly.Procedures.allProcedures(workspace);
+  let procedures = Blockly.Procedures.allProcedures(workspace);
   // Flatten the return vs no-return procedure lists.
   procedures = procedures[0].concat(procedures[1]);
-  for (var i = 0; i < procedures.length; i++) {
+  for (let i = 0; i < procedures.length; i++) {
     this.getName(
         procedures[i][0], Blockly.internalConstants.PROCEDURE_CATEGORY_NAME);
   }
@@ -133,28 +133,28 @@ Blockly.Names.prototype.populateProcedures = function(workspace) {
  * @return {string} An entity name that is legal in the exported language.
  */
 Blockly.Names.prototype.getName = function(nameOrId, realm) {
-  var name = nameOrId;
+  let name = nameOrId;
   if (realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME) {
-    var varName = this.getNameForUserVariable_(nameOrId);
+    const varName = this.getNameForUserVariable_(nameOrId);
     if (varName) {
       // Successful ID lookup.
       name = varName;
     }
   }
-  var normalizedName = name.toLowerCase();
+  const normalizedName = name.toLowerCase();
 
-  var isVar = realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME ||
+  const isVar = realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME ||
       realm == Blockly.Names.DEVELOPER_VARIABLE_TYPE;
 
-  var prefix = isVar ? this.variablePrefix_ : '';
+  const prefix = isVar ? this.variablePrefix_ : '';
   if (!(realm in this.db_)) {
     this.db_[realm] = Object.create(null);
   }
-  var realmDb = this.db_[realm];
+  const realmDb = this.db_[realm];
   if (normalizedName in realmDb) {
     return prefix + realmDb[normalizedName];
   }
-  var safeName = this.getDistinctName(name, realm);
+  const safeName = this.getDistinctName(name, realm);
   realmDb[normalizedName] = safeName.substr(prefix.length);
   return safeName;
 };
@@ -166,7 +166,7 @@ Blockly.Names.prototype.getName = function(nameOrId, realm) {
  * @return {!Array<string>} A list of Blockly entity names (no constraints).
  */
 Blockly.Names.prototype.getUserNames = function(realm) {
-  var realmDb = this.db_[realm] || {};
+  const realmDb = this.db_[realm] || {};
   return Object.keys(realmDb);
 };
 
@@ -181,8 +181,8 @@ Blockly.Names.prototype.getUserNames = function(realm) {
  * @return {string} An entity name that is legal in the exported language.
  */
 Blockly.Names.prototype.getDistinctName = function(name, realm) {
-  var safeName = this.safeName_(name);
-  var i = '';
+  let safeName = this.safeName_(name);
+  let i = '';
   while (this.dbReverse_[safeName + i] ||
          (safeName + i) in this.reservedDict_) {
     // Collision with existing name.  Create a unique name.
@@ -190,9 +190,9 @@ Blockly.Names.prototype.getDistinctName = function(name, realm) {
   }
   safeName += i;
   this.dbReverse_[safeName] = true;
-  var isVar = realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME ||
+  const isVar = realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME ||
       realm == Blockly.Names.DEVELOPER_VARIABLE_TYPE;
-  var prefix = isVar ? this.variablePrefix_ : '';
+  const prefix = isVar ? this.variablePrefix_ : '';
   return prefix + safeName;
 };
 

From 2ea6c4af7fa10f9399a589984d04b36393da9867 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 15:24:25 -0700
Subject: [PATCH 547/833] Migrate core/names.js to goog.module

---
 core/names.js | 41 ++++++++++++++++++++++++-----------------
 tests/deps.js |  2 +-
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/core/names.js b/core/names.js
index ce57404d3..3653b2d3a 100644
--- a/core/names.js
+++ b/core/names.js
@@ -10,12 +10,17 @@
  */
 'use strict';
 
-goog.provide('Blockly.Names');
+goog.module('Blockly.Names');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.internalConstants');
 goog.require('Blockly.Msg');
+goog.require('Blockly.Variables');
 
+/** @suppress {extraRequire} */
+goog.requireType('Blockly.Procedures');
 goog.requireType('Blockly.VariableMap');
+goog.requireType('Blockly.Workspace');
 
 
 /**
@@ -26,7 +31,7 @@ goog.requireType('Blockly.VariableMap');
  *     before all variable names (but not procedure names).
  * @constructor
  */
-Blockly.Names = function(reservedWords, opt_variablePrefix) {
+const Names = function(reservedWords, opt_variablePrefix) {
   this.variablePrefix_ = opt_variablePrefix || '';
   this.reservedDict_ = Object.create(null);
   if (reservedWords) {
@@ -45,7 +50,7 @@ Blockly.Names = function(reservedWords, opt_variablePrefix) {
  * will never be shown to the user in the workspace or stored in the variable
  * map.
  */
-Blockly.Names.DEVELOPER_VARIABLE_TYPE = 'DEVELOPER_VARIABLE';
+Names.DEVELOPER_VARIABLE_TYPE = 'DEVELOPER_VARIABLE';
 
 /**
  * When JavaScript (or most other languages) is generated, variable 'foo' and
@@ -59,7 +64,7 @@ Blockly.Names.DEVELOPER_VARIABLE_TYPE = 'DEVELOPER_VARIABLE';
 /**
  * Empty the database and start from scratch.  The reserved words are kept.
  */
-Blockly.Names.prototype.reset = function() {
+Names.prototype.reset = function() {
   this.db_ = Object.create(null);
   this.dbReverse_ = Object.create(null);
   this.variableMap_ = null;
@@ -69,7 +74,7 @@ Blockly.Names.prototype.reset = function() {
  * Set the variable map that maps from variable name to variable object.
  * @param {!Blockly.VariableMap} map The map to track.
  */
-Blockly.Names.prototype.setVariableMap = function(map) {
+Names.prototype.setVariableMap = function(map) {
   this.variableMap_ = map;
 };
 
@@ -82,9 +87,9 @@ Blockly.Names.prototype.setVariableMap = function(map) {
  *     no variable map or the variable was not found in the map.
  * @private
  */
-Blockly.Names.prototype.getNameForUserVariable_ = function(id) {
+Names.prototype.getNameForUserVariable_ = function(id) {
   if (!this.variableMap_) {
-    console.warn('Deprecated call to Blockly.Names.prototype.getName without ' +
+    console.warn('Deprecated call to Names.prototype.getName without ' +
         'defining a variable map. To fix, add the following code in your ' +
         'generator\'s init() function:\n' +
         'Blockly.YourGeneratorName.nameDB_.setVariableMap(' +
@@ -102,7 +107,7 @@ Blockly.Names.prototype.getNameForUserVariable_ = function(id) {
  * Generate names for user variables, but only ones that are being used.
  * @param {!Blockly.Workspace} workspace Workspace to generate variables from.
  */
-Blockly.Names.prototype.populateVariables = function(workspace) {
+Names.prototype.populateVariables = function(workspace) {
   const variables = Blockly.Variables.allUsedVarModels(workspace);
   for (let i = 0; i < variables.length; i++) {
     this.getName(
@@ -114,8 +119,8 @@ Blockly.Names.prototype.populateVariables = function(workspace) {
  * Generate names for procedures.
  * @param {!Blockly.Workspace} workspace Workspace to generate procedures from.
  */
-Blockly.Names.prototype.populateProcedures = function(workspace) {
-  let procedures = Blockly.Procedures.allProcedures(workspace);
+Names.prototype.populateProcedures = function(workspace) {
+  let procedures = goog.module.get('Blockly.Procedures').allProcedures(workspace);
   // Flatten the return vs no-return procedure lists.
   procedures = procedures[0].concat(procedures[1]);
   for (let i = 0; i < procedures.length; i++) {
@@ -132,7 +137,7 @@ Blockly.Names.prototype.populateProcedures = function(workspace) {
  *     ('VARIABLE', 'PROCEDURE', 'DEVELOPER_VARIABLE', etc...).
  * @return {string} An entity name that is legal in the exported language.
  */
-Blockly.Names.prototype.getName = function(nameOrId, realm) {
+Names.prototype.getName = function(nameOrId, realm) {
   let name = nameOrId;
   if (realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME) {
     const varName = this.getNameForUserVariable_(nameOrId);
@@ -144,7 +149,7 @@ Blockly.Names.prototype.getName = function(nameOrId, realm) {
   const normalizedName = name.toLowerCase();
 
   const isVar = realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME ||
-      realm == Blockly.Names.DEVELOPER_VARIABLE_TYPE;
+      realm == Names.DEVELOPER_VARIABLE_TYPE;
 
   const prefix = isVar ? this.variablePrefix_ : '';
   if (!(realm in this.db_)) {
@@ -165,7 +170,7 @@ Blockly.Names.prototype.getName = function(nameOrId, realm) {
  *     ('VARIABLE', 'PROCEDURE', 'DEVELOPER_VARIABLE', etc...).
  * @return {!Array<string>} A list of Blockly entity names (no constraints).
  */
-Blockly.Names.prototype.getUserNames = function(realm) {
+Names.prototype.getUserNames = function(realm) {
   const realmDb = this.db_[realm] || {};
   return Object.keys(realmDb);
 };
@@ -180,7 +185,7 @@ Blockly.Names.prototype.getUserNames = function(realm) {
  *     ('VARIABLE', 'PROCEDURE', 'DEVELOPER_VARIABLE', etc...).
  * @return {string} An entity name that is legal in the exported language.
  */
-Blockly.Names.prototype.getDistinctName = function(name, realm) {
+Names.prototype.getDistinctName = function(name, realm) {
   let safeName = this.safeName_(name);
   let i = '';
   while (this.dbReverse_[safeName + i] ||
@@ -191,7 +196,7 @@ Blockly.Names.prototype.getDistinctName = function(name, realm) {
   safeName += i;
   this.dbReverse_[safeName] = true;
   const isVar = realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME ||
-      realm == Blockly.Names.DEVELOPER_VARIABLE_TYPE;
+      realm == Names.DEVELOPER_VARIABLE_TYPE;
   const prefix = isVar ? this.variablePrefix_ : '';
   return prefix + safeName;
 };
@@ -204,7 +209,7 @@ Blockly.Names.prototype.getDistinctName = function(name, realm) {
  * @return {string} Safe entity name.
  * @private
  */
-Blockly.Names.prototype.safeName_ = function(name) {
+Names.prototype.safeName_ = function(name) {
   if (!name) {
     name = Blockly.Msg['UNNAMED_KEY'] || 'unnamed';
   } else {
@@ -227,7 +232,9 @@ Blockly.Names.prototype.safeName_ = function(name) {
  * @param {string} name2 Second name.
  * @return {boolean} True if names are the same.
  */
-Blockly.Names.equals = function(name1, name2) {
+Names.equals = function(name1, name2) {
   // name1.localeCompare(name2) is slower.
   return name1.toLowerCase() == name2.toLowerCase();
 };
+
+exports = Names;
diff --git a/tests/deps.js b/tests/deps.js
index a563d81e7..1d8aaa3ac 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -116,7 +116,7 @@ goog.addDependency('../../core/menuitem.js', ['Blockly.MenuItem'], ['Blockly.uti
 goog.addDependency('../../core/metrics_manager.js', ['Blockly.FlyoutMetricsManager', 'Blockly.MetricsManager'], ['Blockly.IMetricsManager', 'Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global']);
 goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', '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.internalConstants']);
+goog.addDependency('../../core/names.js', ['Blockly.Names'], ['Blockly.Msg', 'Blockly.Variables', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.xml']);

From 03d4d4265f3de7fe375b3bd1f286b31cd256e849 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 15:46:37 -0700
Subject: [PATCH 548/833] Migrate core/names.js named requires

---
 core/names.js | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/core/names.js b/core/names.js
index 3653b2d3a..eeee8391a 100644
--- a/core/names.js
+++ b/core/names.js
@@ -13,14 +13,15 @@
 goog.module('Blockly.Names');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.Msg');
-goog.require('Blockly.Variables');
-
+const Msg = goog.require('Blockly.Msg');
+/* eslint-disable-next-line no-unused-vars */
+const VariableMap = goog.requireType('Blockly.VariableMap');
+const Variables = goog.require('Blockly.Variables');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+const internalConstants = goog.require('Blockly.internalConstants');
 /** @suppress {extraRequire} */
 goog.requireType('Blockly.Procedures');
-goog.requireType('Blockly.VariableMap');
-goog.requireType('Blockly.Workspace');
 
 
 /**
@@ -72,7 +73,7 @@ Names.prototype.reset = function() {
 
 /**
  * Set the variable map that maps from variable name to variable object.
- * @param {!Blockly.VariableMap} map The map to track.
+ * @param {!VariableMap} map The map to track.
  */
 Names.prototype.setVariableMap = function(map) {
   this.variableMap_ = map;
@@ -81,7 +82,7 @@ Names.prototype.setVariableMap = function(map) {
 /**
  * Get the name for a user-defined variable, based on its ID.
  * This should only be used for variables of realm
- * Blockly.internalConstants.VARIABLE_CATEGORY_NAME.
+ * internalConstants.VARIABLE_CATEGORY_NAME.
  * @param {string} id The ID to look up in the variable map.
  * @return {?string} The name of the referenced variable, or null if there was
  *     no variable map or the variable was not found in the map.
@@ -105,19 +106,19 @@ Names.prototype.getNameForUserVariable_ = function(id) {
 
 /**
  * Generate names for user variables, but only ones that are being used.
- * @param {!Blockly.Workspace} workspace Workspace to generate variables from.
+ * @param {!Workspace} workspace Workspace to generate variables from.
  */
 Names.prototype.populateVariables = function(workspace) {
-  const variables = Blockly.Variables.allUsedVarModels(workspace);
+  const variables = Variables.allUsedVarModels(workspace);
   for (let i = 0; i < variables.length; i++) {
     this.getName(
-        variables[i].getId(), Blockly.internalConstants.VARIABLE_CATEGORY_NAME);
+        variables[i].getId(), internalConstants.VARIABLE_CATEGORY_NAME);
   }
 };
 
 /**
  * Generate names for procedures.
- * @param {!Blockly.Workspace} workspace Workspace to generate procedures from.
+ * @param {!Workspace} workspace Workspace to generate procedures from.
  */
 Names.prototype.populateProcedures = function(workspace) {
   let procedures = goog.module.get('Blockly.Procedures').allProcedures(workspace);
@@ -125,7 +126,7 @@ Names.prototype.populateProcedures = function(workspace) {
   procedures = procedures[0].concat(procedures[1]);
   for (let i = 0; i < procedures.length; i++) {
     this.getName(
-        procedures[i][0], Blockly.internalConstants.PROCEDURE_CATEGORY_NAME);
+        procedures[i][0], internalConstants.PROCEDURE_CATEGORY_NAME);
   }
 };
 
@@ -139,7 +140,7 @@ Names.prototype.populateProcedures = function(workspace) {
  */
 Names.prototype.getName = function(nameOrId, realm) {
   let name = nameOrId;
-  if (realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME) {
+  if (realm == internalConstants.VARIABLE_CATEGORY_NAME) {
     const varName = this.getNameForUserVariable_(nameOrId);
     if (varName) {
       // Successful ID lookup.
@@ -148,7 +149,7 @@ Names.prototype.getName = function(nameOrId, realm) {
   }
   const normalizedName = name.toLowerCase();
 
-  const isVar = realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME ||
+  const isVar = realm == internalConstants.VARIABLE_CATEGORY_NAME ||
       realm == Names.DEVELOPER_VARIABLE_TYPE;
 
   const prefix = isVar ? this.variablePrefix_ : '';
@@ -195,7 +196,7 @@ Names.prototype.getDistinctName = function(name, realm) {
   }
   safeName += i;
   this.dbReverse_[safeName] = true;
-  const isVar = realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME ||
+  const isVar = realm == internalConstants.VARIABLE_CATEGORY_NAME ||
       realm == Names.DEVELOPER_VARIABLE_TYPE;
   const prefix = isVar ? this.variablePrefix_ : '';
   return prefix + safeName;
@@ -211,7 +212,7 @@ Names.prototype.getDistinctName = function(name, realm) {
  */
 Names.prototype.safeName_ = function(name) {
   if (!name) {
-    name = Blockly.Msg['UNNAMED_KEY'] || 'unnamed';
+    name = Msg['UNNAMED_KEY'] || 'unnamed';
   } else {
     // Unfortunately names in non-latin characters will look like
     // _E9_9F_B3_E4_B9_90 which is pretty meaningless.

From 20531314d857101840a97e105d97bfc5b8eb81cc Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 15:46:59 -0700
Subject: [PATCH 549/833] clang-format core/names.js

---
 core/names.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/names.js b/core/names.js
index eeee8391a..b66da4c37 100644
--- a/core/names.js
+++ b/core/names.js
@@ -90,7 +90,8 @@ Names.prototype.setVariableMap = function(map) {
  */
 Names.prototype.getNameForUserVariable_ = function(id) {
   if (!this.variableMap_) {
-    console.warn('Deprecated call to Names.prototype.getName without ' +
+    console.warn(
+        'Deprecated call to Names.prototype.getName without ' +
         'defining a variable map. To fix, add the following code in your ' +
         'generator\'s init() function:\n' +
         'Blockly.YourGeneratorName.nameDB_.setVariableMap(' +
@@ -121,12 +122,12 @@ Names.prototype.populateVariables = function(workspace) {
  * @param {!Workspace} workspace Workspace to generate procedures from.
  */
 Names.prototype.populateProcedures = function(workspace) {
-  let procedures = goog.module.get('Blockly.Procedures').allProcedures(workspace);
+  let procedures =
+      goog.module.get('Blockly.Procedures').allProcedures(workspace);
   // Flatten the return vs no-return procedure lists.
   procedures = procedures[0].concat(procedures[1]);
   for (let i = 0; i < procedures.length; i++) {
-    this.getName(
-        procedures[i][0], internalConstants.PROCEDURE_CATEGORY_NAME);
+    this.getName(procedures[i][0], internalConstants.PROCEDURE_CATEGORY_NAME);
   }
 };
 

From 1376f1e6c2c75b7bc9a9aade923b9c1013d971cb Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Thu, 5 Aug 2021 11:53:38 -0700
Subject: [PATCH 550/833] Revert "fix: update tag module workflow to add labels
 instead of setting one label"

---
 .github/workflows/tag_module_cleanup.yml | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/tag_module_cleanup.yml b/.github/workflows/tag_module_cleanup.yml
index 9cec19500..94e7ec692 100644
--- a/.github/workflows/tag_module_cleanup.yml
+++ b/.github/workflows/tag_module_cleanup.yml
@@ -5,14 +5,14 @@ name: Tag module cleanup
 
 # Trigger on pull requests against goog_module branch only
 # Uses pull_request_target to get write permissions so that it can write labels.
-on:
+on: 
   pull_request_target:
     branches:
       - goog_module
 
 jobs:
   tag-module-cleanup:
-
+  
     # Add the type: cleanup label
     runs-on: ubuntu-latest
     steps:
@@ -23,22 +23,13 @@ jobs:
             // https://github.com/google/blockly/milestone/18
             const milestoneNumber = 18;
             // Note that pull requests are accessed through the issues API.
-
-            const issueGetParams = {
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number
-            }
-
-            const issueInfo = await github.issues.get(issueGetParams)
-
-            const issuesUpdateParams = {
-              owner: context.repo.owner,
-              repo: context.repo.repo,
+            const issuesUpdateParams = { 
+              owner: context.repo.owner, 
+              repo: context.repo.repo, 
               // Adds the milestone
-              milestone: milestoneNumber,
+              milestone: milestoneNumber, 
               issue_number: context.issue.number,
               // Sets the labels
-              labels: [...issueInfo.labels, 'type: cleanup']
+              labels: ['type: cleanup']
             }
             await github.issues.update(issuesUpdateParams)

From 2b6d275440783cad68faaeb97b875833b45702d2 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 5 Aug 2021 13:57:16 -0700
Subject: [PATCH 551/833] Migrate core/renderers/measurables/types.js to
 goog.module syntax (#5309)

* Migrate core/renderers/measurables/types.js to goog.module

* Migrate core/renderers/measurables/types.js to named requires

* clang-format core/renderers/measurables/types.js
---
 core/renderers/measurables/types.js | 232 ++++++++++++++--------------
 tests/deps.js                       |   2 +-
 2 files changed, 116 insertions(+), 118 deletions(-)

diff --git a/core/renderers/measurables/types.js b/core/renderers/measurables/types.js
index 19cacceca..655375569 100644
--- a/core/renderers/measurables/types.js
+++ b/core/renderers/measurables/types.js
@@ -11,42 +11,45 @@
 
 'use strict';
 
-goog.provide('Blockly.blockRendering.Types');
+goog.module('Blockly.blockRendering.Types');
+goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.blockRendering.Measurable');
-goog.requireType('Blockly.blockRendering.Row');
+/* eslint-disable-next-line no-unused-vars */
+const Measurable = goog.requireType('Blockly.blockRendering.Measurable');
+/* eslint-disable-next-line no-unused-vars */
+const Row = goog.requireType('Blockly.blockRendering.Row');
 
 
 /**
  * Types of rendering elements.
  * @enum {number}
  */
-Blockly.blockRendering.Types = {
-  NONE: 0,                      // None
-  FIELD: 1 << 0,                // Field.
-  HAT: 1 << 1,                  // Hat.
-  ICON: 1 << 2,                 // Icon.
-  SPACER: 1 << 3,               // Spacer.
-  BETWEEN_ROW_SPACER: 1 << 4,   // Between Row Spacer.
-  IN_ROW_SPACER: 1 << 5,        // In Row Spacer.
-  EXTERNAL_VALUE_INPUT: 1 << 6, // External Value Input.
-  INPUT: 1 << 7,                // Input.
-  INLINE_INPUT: 1 << 8,         // Inline Input.
-  STATEMENT_INPUT: 1 << 9,      // Statement Input.
-  CONNECTION: 1 << 10,          // Connection.
-  PREVIOUS_CONNECTION: 1 << 11, // Previous Connection.
-  NEXT_CONNECTION: 1 << 12,     // Next Connection.
-  OUTPUT_CONNECTION: 1 << 13,   // Output Connection.
-  CORNER: 1 << 14,              // Corner.
-  LEFT_SQUARE_CORNER: 1 << 15,  // Square Corner.
-  LEFT_ROUND_CORNER: 1 << 16,   // Round Corner.
-  RIGHT_SQUARE_CORNER: 1 << 17, // Right Square Corner.
-  RIGHT_ROUND_CORNER: 1 << 18,  // Right Round Corner.
-  JAGGED_EDGE: 1 << 19,         // Jagged Edge.
-  ROW: 1 << 20,                 // Row.
-  TOP_ROW: 1 << 21,             // Top Row.
-  BOTTOM_ROW: 1 << 22,          // Bottom Row.
-  INPUT_ROW: 1 << 23            // Input Row.
+const Types = {
+  NONE: 0,                       // None
+  FIELD: 1 << 0,                 // Field.
+  HAT: 1 << 1,                   // Hat.
+  ICON: 1 << 2,                  // Icon.
+  SPACER: 1 << 3,                // Spacer.
+  BETWEEN_ROW_SPACER: 1 << 4,    // Between Row Spacer.
+  IN_ROW_SPACER: 1 << 5,         // In Row Spacer.
+  EXTERNAL_VALUE_INPUT: 1 << 6,  // External Value Input.
+  INPUT: 1 << 7,                 // Input.
+  INLINE_INPUT: 1 << 8,          // Inline Input.
+  STATEMENT_INPUT: 1 << 9,       // Statement Input.
+  CONNECTION: 1 << 10,           // Connection.
+  PREVIOUS_CONNECTION: 1 << 11,  // Previous Connection.
+  NEXT_CONNECTION: 1 << 12,      // Next Connection.
+  OUTPUT_CONNECTION: 1 << 13,    // Output Connection.
+  CORNER: 1 << 14,               // Corner.
+  LEFT_SQUARE_CORNER: 1 << 15,   // Square Corner.
+  LEFT_ROUND_CORNER: 1 << 16,    // Round Corner.
+  RIGHT_SQUARE_CORNER: 1 << 17,  // Right Square Corner.
+  RIGHT_ROUND_CORNER: 1 << 18,   // Right Round Corner.
+  JAGGED_EDGE: 1 << 19,          // Jagged Edge.
+  ROW: 1 << 20,                  // Row.
+  TOP_ROW: 1 << 21,              // Top Row.
+  BOTTOM_ROW: 1 << 22,           // Bottom Row.
+  INPUT_ROW: 1 << 23             // Input Row.
 };
 
 /**
@@ -55,9 +58,7 @@ Blockly.blockRendering.Types = {
  * @const
  * @package
  */
-Blockly.blockRendering.Types.LEFT_CORNER =
-    Blockly.blockRendering.Types.LEFT_SQUARE_CORNER |
-    Blockly.blockRendering.Types.LEFT_ROUND_CORNER;
+Types.LEFT_CORNER = Types.LEFT_SQUARE_CORNER | Types.LEFT_ROUND_CORNER;
 
 /**
  * A Right Corner Union Type.
@@ -65,19 +66,17 @@ Blockly.blockRendering.Types.LEFT_CORNER =
  * @const
  * @package
  */
-Blockly.blockRendering.Types.RIGHT_CORNER =
-    Blockly.blockRendering.Types.RIGHT_SQUARE_CORNER |
-    Blockly.blockRendering.Types.RIGHT_ROUND_CORNER;
+Types.RIGHT_CORNER = Types.RIGHT_SQUARE_CORNER | Types.RIGHT_ROUND_CORNER;
 
 /**
  * Next flag value to use for custom rendering element types.
  * This must be updated to reflect the next enum flag value
  * to use if additional elements are added to
- * `Blockly.blockRendering.Types`.
+ * `Types`.
  * @type {number}
  * @private
  */
-Blockly.blockRendering.Types.nextTypeValue_ = 1 << 24;
+Types.nextTypeValue_ = 1 << 24;
 
 /**
  * Get the enum flag value of an existing type or register a new type.
@@ -85,268 +84,267 @@ Blockly.blockRendering.Types.nextTypeValue_ = 1 << 24;
  * @return {!number} The enum flag value associated with that type.
  * @package
  */
-Blockly.blockRendering.Types.getType = function(type) {
-  if (!Object.prototype.hasOwnProperty.call(Blockly.blockRendering.Types, type)) {
-    Blockly.blockRendering.Types[type] =
-      Blockly.blockRendering.Types.nextTypeValue_;
-    Blockly.blockRendering.Types.nextTypeValue_ <<= 1;
+Types.getType = function(type) {
+  if (!Object.prototype.hasOwnProperty.call(Types, type)) {
+    Types[type] = Types.nextTypeValue_;
+    Types.nextTypeValue_ <<= 1;
   }
-  return Blockly.blockRendering.Types[type];
+  return Types[type];
 };
 
 /**
  * Whether a measurable stores information about a field.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a field.
  * @package
  */
-Blockly.blockRendering.Types.isField = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.FIELD;
+Types.isField = function(elem) {
+  return elem.type & Types.FIELD;
 };
 
 /**
  * Whether a measurable stores information about a hat.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a hat.
  * @package
  */
-Blockly.blockRendering.Types.isHat = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.HAT;
+Types.isHat = function(elem) {
+  return elem.type & Types.HAT;
 };
 
 /**
  * Whether a measurable stores information about an icon.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about an icon.
  * @package
  */
-Blockly.blockRendering.Types.isIcon = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.ICON;
+Types.isIcon = function(elem) {
+  return elem.type & Types.ICON;
 };
 
 /**
  * Whether a measurable stores information about a spacer.
- * @param {!Blockly.blockRendering.Measurable|!Blockly.blockRendering.Row} elem
+ * @param {!Measurable|!Row} elem
  *     The element to check.
  * @return {number} 1 if the object stores information about a spacer.
  * @package
  */
-Blockly.blockRendering.Types.isSpacer = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.SPACER;
+Types.isSpacer = function(elem) {
+  return elem.type & Types.SPACER;
 };
 
 /**
  * Whether a measurable stores information about an in-row spacer.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about an
  *   in-row spacer.
  * @package
  */
-Blockly.blockRendering.Types.isInRowSpacer = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.IN_ROW_SPACER;
+Types.isInRowSpacer = function(elem) {
+  return elem.type & Types.IN_ROW_SPACER;
 };
 
 /**
  * Whether a measurable stores information about an input.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about an input.
  * @package
  */
-Blockly.blockRendering.Types.isInput = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.INPUT;
+Types.isInput = function(elem) {
+  return elem.type & Types.INPUT;
 };
 
 /**
  * Whether a measurable stores information about an external input.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about an
  *   external input.
  * @package
  */
-Blockly.blockRendering.Types.isExternalInput = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.EXTERNAL_VALUE_INPUT;
+Types.isExternalInput = function(elem) {
+  return elem.type & Types.EXTERNAL_VALUE_INPUT;
 };
 
 /**
  * Whether a measurable stores information about an inline input.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about an
  *   inline input.
  * @package
  */
-Blockly.blockRendering.Types.isInlineInput = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.INLINE_INPUT;
+Types.isInlineInput = function(elem) {
+  return elem.type & Types.INLINE_INPUT;
 };
 
 /**
  * Whether a measurable stores information about a statement input.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a
  *   statement input.
  * @package
  */
-Blockly.blockRendering.Types.isStatementInput = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.STATEMENT_INPUT;
+Types.isStatementInput = function(elem) {
+  return elem.type & Types.STATEMENT_INPUT;
 };
 
 /**
  * Whether a measurable stores information about a previous connection.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a
  *   previous connection.
  * @package
  */
-Blockly.blockRendering.Types.isPreviousConnection = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.PREVIOUS_CONNECTION;
+Types.isPreviousConnection = function(elem) {
+  return elem.type & Types.PREVIOUS_CONNECTION;
 };
 
 /**
  * Whether a measurable stores information about a next connection.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a
  *   next connection.
  * @package
  */
-Blockly.blockRendering.Types.isNextConnection = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.NEXT_CONNECTION;
+Types.isNextConnection = function(elem) {
+  return elem.type & Types.NEXT_CONNECTION;
 };
 
 /**
  * Whether a measurable stores information about a previous or next connection.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a previous or
  *   next connection.
  * @package
  */
-Blockly.blockRendering.Types.isPreviousOrNextConnection = function(elem) {
-  return elem.type & (Blockly.blockRendering.Types.PREVIOUS_CONNECTION |
-      Blockly.blockRendering.Types.NEXT_CONNECTION);
+Types.isPreviousOrNextConnection = function(elem) {
+  return elem.type & (Types.PREVIOUS_CONNECTION | Types.NEXT_CONNECTION);
 };
 
 /**
  * Whether a measurable stores information about a left round corner.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a
  *   left round corner.
  * @package
  */
-Blockly.blockRendering.Types.isLeftRoundedCorner = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.LEFT_ROUND_CORNER;
+Types.isLeftRoundedCorner = function(elem) {
+  return elem.type & Types.LEFT_ROUND_CORNER;
 };
 
 /**
  * Whether a measurable stores information about a right round corner.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a
  *   right round corner.
  * @package
  */
-Blockly.blockRendering.Types.isRightRoundedCorner = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.RIGHT_ROUND_CORNER;
+Types.isRightRoundedCorner = function(elem) {
+  return elem.type & Types.RIGHT_ROUND_CORNER;
 };
 
 /**
  * Whether a measurable stores information about a left square corner.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a
  *   left square corner.
  * @package
  */
-Blockly.blockRendering.Types.isLeftSquareCorner = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.LEFT_SQUARE_CORNER;
+Types.isLeftSquareCorner = function(elem) {
+  return elem.type & Types.LEFT_SQUARE_CORNER;
 };
 
 /**
  * Whether a measurable stores information about a right square corner.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a
  *   right square corner.
  * @package
  */
-Blockly.blockRendering.Types.isRightSquareCorner = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.RIGHT_SQUARE_CORNER;
+Types.isRightSquareCorner = function(elem) {
+  return elem.type & Types.RIGHT_SQUARE_CORNER;
 };
 
 /**
  * Whether a measurable stores information about a corner.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a
  *   corner.
  * @package
  */
-Blockly.blockRendering.Types.isCorner = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.CORNER;
+Types.isCorner = function(elem) {
+  return elem.type & Types.CORNER;
 };
 
 /**
  * Whether a measurable stores information about a jagged edge.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a jagged edge.
  * @package
  */
-Blockly.blockRendering.Types.isJaggedEdge = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.JAGGED_EDGE;
+Types.isJaggedEdge = function(elem) {
+  return elem.type & Types.JAGGED_EDGE;
 };
 
 /**
  * Whether a measurable stores information about a row.
- * @param {!Blockly.blockRendering.Row} row The row to check.
+ * @param {!Row} row The row to check.
  * @return {number} 1 if the object stores information about a row.
  * @package
  */
-Blockly.blockRendering.Types.isRow = function(row) {
-  return row.type & Blockly.blockRendering.Types.ROW;
+Types.isRow = function(row) {
+  return row.type & Types.ROW;
 };
 
 /**
  * Whether a measurable stores information about a between-row spacer.
- * @param {!Blockly.blockRendering.Row} row The row to check.
+ * @param {!Row} row The row to check.
  * @return {number} 1 if the object stores information about a
  *   between-row spacer.
  * @package
  */
-Blockly.blockRendering.Types.isBetweenRowSpacer = function(row) {
-  return row.type & Blockly.blockRendering.Types.BETWEEN_ROW_SPACER;
+Types.isBetweenRowSpacer = function(row) {
+  return row.type & Types.BETWEEN_ROW_SPACER;
 };
 
 /**
  * Whether a measurable stores information about a top row.
- * @param {!Blockly.blockRendering.Row} row The row to check.
+ * @param {!Row} row The row to check.
  * @return {number} 1 if the object stores information about a top row.
  * @package
  */
-Blockly.blockRendering.Types.isTopRow = function(row) {
-  return row.type & Blockly.blockRendering.Types.TOP_ROW;
+Types.isTopRow = function(row) {
+  return row.type & Types.TOP_ROW;
 };
 
 /**
  * Whether a measurable stores information about a bottom row.
- * @param {!Blockly.blockRendering.Row} row The row to check.
+ * @param {!Row} row The row to check.
  * @return {number} 1 if the object stores information about a bottom row.
  * @package
  */
-Blockly.blockRendering.Types.isBottomRow = function(row) {
-  return row.type & Blockly.blockRendering.Types.BOTTOM_ROW;
+Types.isBottomRow = function(row) {
+  return row.type & Types.BOTTOM_ROW;
 };
 
 /**
  * Whether a measurable stores information about a top or bottom row.
- * @param {!Blockly.blockRendering.Row} row The row to check.
+ * @param {!Row} row The row to check.
  * @return {number} 1 if the object stores information about a top or
  *   bottom row.
  * @package
  */
-Blockly.blockRendering.Types.isTopOrBottomRow = function(row) {
-  return row.type & (Blockly.blockRendering.Types.TOP_ROW |
-      Blockly.blockRendering.Types.BOTTOM_ROW);
+Types.isTopOrBottomRow = function(row) {
+  return row.type & (Types.TOP_ROW | Types.BOTTOM_ROW);
 };
 
 /**
  * Whether a measurable stores information about an input row.
- * @param {!Blockly.blockRendering.Row} row The row to check.
+ * @param {!Row} row The row to check.
  * @return {number} 1 if the object stores information about an input row.
  * @package
  */
-Blockly.blockRendering.Types.isInputRow = function(row) {
-  return row.type & Blockly.blockRendering.Types.INPUT_ROW;
+Types.isInputRow = function(row) {
+  return row.type & Types.INPUT_ROW;
 };
+
+exports = Types;
diff --git a/tests/deps.js b/tests/deps.js
index 1d8aaa3ac..ff7e2926e 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -144,7 +144,7 @@ goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.
 goog.addDependency('../../core/renderers/measurables/inputs.js', ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/row_elements.js', ['Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/rows.js', ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], []);
+goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist', 'Blockly.minimalist.RenderInfo'], ['Blockly.utils.object']);

From 23a0b89fc10b404a5eea46f5552f969d8d9d2c42 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 6 Aug 2021 12:30:30 -0700
Subject: [PATCH 552/833] Migrate core/block.js to goog.module syntax (#5322)

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

* Migrate core/block.js to goog.module

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

* Migrate core/block.js to goog.module

* Migrate core/block.js to named requires

* clang-format core/block.js

* Add missing period to comment in core/block.js
---
 core/block.js | 865 +++++++++++++++++++++++++-------------------------
 tests/deps.js |   2 +-
 2 files changed, 439 insertions(+), 428 deletions(-)

diff --git a/core/block.js b/core/block.js
index cfeaddebd..adddfe5ec 100644
--- a/core/block.js
+++ b/core/block.js
@@ -10,15 +10,40 @@
  */
 'use strict';
 
-goog.provide('Blockly.Block');
+goog.module('Blockly.Block');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.ASTNode');
-goog.require('Blockly.Blocks');
-goog.require('Blockly.Connection');
-goog.require('Blockly.connectionTypes');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
-goog.require('Blockly.Events');
+/* 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');
+const Connection = goog.require('Blockly.Connection');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Events = goog.require('Blockly.Events');
+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 connectionTypes = goog.require('Blockly.connectionTypes');
+const constants = goog.require('Blockly.constants');
+const fieldRegistry = goog.require('Blockly.fieldRegistry');
+const inputTypes = goog.require('Blockly.inputTypes');
+const object = goog.require('Blockly.utils.object');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
@@ -27,59 +52,41 @@ goog.require('Blockly.Events.BlockCreate');
 goog.require('Blockly.Events.BlockDelete');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockMove');
-goog.require('Blockly.Extensions');
-goog.require('Blockly.fieldRegistry');
-goog.require('Blockly.IASTNodeLocation');
-goog.require('Blockly.IDeletable');
-goog.require('Blockly.Input');
-goog.require('Blockly.inputTypes');
-goog.require('Blockly.Tooltip');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Size');
-goog.require('Blockly.Workspace');
-
-goog.requireType('Blockly.Comment');
-goog.requireType('Blockly.Events.Abstract');
-goog.requireType('Blockly.Field');
-goog.requireType('Blockly.Mutator');
-goog.requireType('Blockly.utils.Size');
-goog.requireType('Blockly.VariableModel');
 
 
 /**
  * Class for one block.
  * Not normally called directly, workspace.newBlock() is preferred.
- * @param {!Blockly.Workspace} workspace The block's workspace.
+ * @param {!Workspace} workspace The block's workspace.
  * @param {!string} prototypeName Name of the language object containing
  *     type-specific functions for this block.
  * @param {string=} opt_id Optional ID.  Use this ID if provided, otherwise
  *     create a new ID.
  * @constructor
- * @implements {Blockly.IASTNodeLocation}
- * @implements {Blockly.IDeletable}
+ * @implements {IASTNodeLocation}
+ * @implements {IDeletable}
  * @throws When the prototypeName is not valid or not allowed.
  */
-Blockly.Block = function(workspace, prototypeName, opt_id) {
-  if (Blockly.Generator &&
-      typeof Blockly.Generator.prototype[prototypeName] != 'undefined') {
+const Block = function(workspace, prototypeName, opt_id) {
+  const Generator = goog.module.get('Blockly.Generator');
+  if (Generator && typeof Generator.prototype[prototypeName] != 'undefined') {
     // Occluding Generator class members is not allowed.
-    throw Error('Block prototypeName "' + prototypeName +
+    throw Error(
+        'Block prototypeName "' + prototypeName +
         '" conflicts with Blockly.Generator members.');
   }
 
   /** @type {string} */
-  this.id = (opt_id && !workspace.getBlockById(opt_id)) ?
-      opt_id : Blockly.utils.genUid();
+  this.id =
+      (opt_id && !workspace.getBlockById(opt_id)) ? opt_id : utils.genUid();
   workspace.setBlockById(this.id, this);
-  /** @type {Blockly.Connection} */
+  /** @type {Connection} */
   this.outputConnection = null;
-  /** @type {Blockly.Connection} */
+  /** @type {Connection} */
   this.nextConnection = null;
-  /** @type {Blockly.Connection} */
+  /** @type {Connection} */
   this.previousConnection = null;
-  /** @type {!Array<!Blockly.Input>} */
+  /** @type {!Array<!Input>} */
   this.inputList = [];
   /** @type {boolean|undefined} */
   this.inputsInline = undefined;
@@ -88,19 +95,19 @@ Blockly.Block = function(workspace, prototypeName, opt_id) {
    * @private
    */
   this.disabled = false;
-  /** @type {!Blockly.Tooltip.TipInfo} */
+  /** @type {!Tooltip.TipInfo} */
   this.tooltip = '';
   /** @type {boolean} */
   this.contextMenu = true;
 
   /**
-   * @type {Blockly.Block}
+   * @type {Block}
    * @protected
    */
   this.parentBlock_ = null;
 
   /**
-   * @type {!Array<!Blockly.Block>}
+   * @type {!Array<!Block>}
    * @protected
    */
   this.childBlocks_ = [];
@@ -143,31 +150,27 @@ Blockly.Block = function(workspace, prototypeName, opt_id) {
 
   /**
    * A string representing the comment attached to this block.
-   * @type {string|Blockly.Comment}
+   * @type {string|Comment}
    * @deprecated August 2019. Use getCommentText instead.
    */
   this.comment = null;
 
   /**
    * A model of the comment attached to this block.
-   * @type {!Blockly.Block.CommentModel}
+   * @type {!Block.CommentModel}
    * @package
    */
-  this.commentModel = {
-    text: null,
-    pinned: false,
-    size: new Blockly.utils.Size(160, 80)
-  };
+  this.commentModel = {text: null, pinned: false, size: new Size(160, 80)};
 
   /**
    * The block's position in workspace units.  (0, 0) is at the workspace's
    * origin; scale does not change this value.
-   * @type {!Blockly.utils.Coordinate}
+   * @type {!Coordinate}
    * @private
    */
-  this.xy_ = new Blockly.utils.Coordinate(0, 0);
+  this.xy_ = new Coordinate(0, 0);
 
-  /** @type {!Blockly.Workspace} */
+  /** @type {!Workspace} */
   this.workspace = workspace;
   /** @type {boolean} */
   this.isInFlyout = workspace.isFlyout;
@@ -204,11 +207,11 @@ Blockly.Block = function(workspace, prototypeName, opt_id) {
   if (prototypeName) {
     /** @type {string} */
     this.type = prototypeName;
-    var prototype = Blockly.Blocks[prototypeName];
+    const prototype = Blocks[prototypeName];
     if (!prototype || typeof prototype != 'object') {
       throw TypeError('Unknown block type: ' + prototypeName);
     }
-    Blockly.utils.object.mixin(this, prototype);
+    object.mixin(this, prototype);
   }
 
   workspace.addTopBlock(this);
@@ -217,32 +220,31 @@ Blockly.Block = function(workspace, prototypeName, opt_id) {
   // All events fired should be part of the same group.
   // Any events fired during init should not be undoable,
   // so that block creation is atomic.
-  var existingGroup = Blockly.Events.getGroup();
+  const existingGroup = Events.getGroup();
   if (!existingGroup) {
-    Blockly.Events.setGroup(true);
+    Events.setGroup(true);
   }
-  var initialUndoFlag = Blockly.Events.recordUndo;
+  const initialUndoFlag = Events.recordUndo;
 
   try {
     // Call an initialization function, if it exists.
     if (typeof this.init == 'function') {
-      Blockly.Events.recordUndo = false;
+      Events.recordUndo = false;
       this.init();
-      Blockly.Events.recordUndo = initialUndoFlag;
+      Events.recordUndo = initialUndoFlag;
     }
 
     // Fire a create event.
-    if (Blockly.Events.isEnabled()) {
-      Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CREATE))(
-          this));
+    if (Events.isEnabled()) {
+      Events.fire(new (Events.get(Events.BLOCK_CREATE))(this));
     }
 
   } finally {
     if (!existingGroup) {
-      Blockly.Events.setGroup(false);
+      Events.setGroup(false);
     }
     // In case init threw, recordUndo flag should still be reset.
-    Blockly.Events.recordUndo = initialUndoFlag;
+    Events.recordUndo = initialUndoFlag;
   }
 
   // Record initial inline state.
@@ -259,36 +261,36 @@ Blockly.Block = function(workspace, prototypeName, opt_id) {
  * @typedef {{
  *            text:?string,
  *            pinned:boolean,
- *            size:Blockly.utils.Size
+ *            size:Size
  *          }}
  */
-Blockly.Block.CommentModel;
+Block.CommentModel;
 
 /**
  * The language-neutral ID given to the collapsed input.
  * @const {string}
  */
-Blockly.Block.COLLAPSED_INPUT_NAME = Blockly.constants.COLLAPSED_INPUT_NAME;
+Block.COLLAPSED_INPUT_NAME = constants.COLLAPSED_INPUT_NAME;
 
 /**
  * The language-neutral ID given to the collapsed field.
  * @const {string}
  */
-Blockly.Block.COLLAPSED_FIELD_NAME = Blockly.constants.COLLAPSED_FIELD_NAME;
+Block.COLLAPSED_FIELD_NAME = constants.COLLAPSED_FIELD_NAME;
 
 /**
  * Optional text data that round-trips between blocks and XML.
  * Has no effect. May be used by 3rd parties for meta information.
  * @type {?string}
  */
-Blockly.Block.prototype.data = null;
+Block.prototype.data = null;
 
 /**
  * Has this block been disposed of?
  * @type {boolean}
  * @package
  */
-Blockly.Block.prototype.disposed = false;
+Block.prototype.disposed = false;
 
 /**
  * Colour of the block as HSV hue value (0-360)
@@ -296,56 +298,56 @@ Blockly.Block.prototype.disposed = false;
  * @type {?number}
  * @private
  */
-Blockly.Block.prototype.hue_ = null;
+Block.prototype.hue_ = null;
 
 /**
  * Colour of the block in '#RRGGBB' format.
  * @type {string}
  * @protected
  */
-Blockly.Block.prototype.colour_ = '#000000';
+Block.prototype.colour_ = '#000000';
 
 /**
  * Name of the block style.
  * @type {string}
  * @protected
  */
-Blockly.Block.prototype.styleName_ = '';
+Block.prototype.styleName_ = '';
 
 /**
  * An optional method called during initialization.
  * @type {?function()}
  */
-Blockly.Block.prototype.init;
+Block.prototype.init;
 
 /**
  * An optional callback method to use whenever the block's parent workspace
  * changes. This is usually only called from the constructor, the block type
  * initializer function, or an extension initializer function.
- * @type {?function(Blockly.Events.Abstract)}
+ * @type {?function(Abstract)}
  */
-Blockly.Block.prototype.onchange;
+Block.prototype.onchange;
 
 /**
  * An optional serialization method for defining how to serialize the
  * mutation state. This must be coupled with defining `domToMutation`.
  * @type {?function(...):!Element}
  */
-Blockly.Block.prototype.mutationToDom;
+Block.prototype.mutationToDom;
 
 /**
  * An optional deserialization method for defining how to deserialize the
  * mutation state. This must be coupled with defining `mutationToDom`.
  * @type {?function(!Element)}
  */
-Blockly.Block.prototype.domToMutation;
+Block.prototype.domToMutation;
 
 /**
  * An optional property for suppressing adding STATEMENT_PREFIX and
  * STATEMENT_SUFFIX to generated code.
  * @type {?boolean}
  */
-Blockly.Block.prototype.suppressPrefixSuffix;
+Block.prototype.suppressPrefixSuffix;
 
 /**
  * An optional property for declaring developer variables.  Return a list of
@@ -353,7 +355,7 @@ Blockly.Block.prototype.suppressPrefixSuffix;
  * the user, but are declared as global variables in the generated code.
  * @type {?function():!Array<string>}
  */
-Blockly.Block.prototype.getDeveloperVariables;
+Block.prototype.getDeveloperVariables;
 
 /**
  * Dispose of this block.
@@ -362,7 +364,7 @@ Blockly.Block.prototype.getDeveloperVariables;
  *     all children of this block.
  * @suppress {checkTypes}
  */
-Blockly.Block.prototype.dispose = function(healStack) {
+Block.prototype.dispose = function(healStack) {
   if (!this.workspace) {
     // Already deleted.
     return;
@@ -373,11 +375,10 @@ Blockly.Block.prototype.dispose = function(healStack) {
   }
 
   this.unplug(healStack);
-  if (Blockly.Events.isEnabled()) {
-    Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_DELETE))(
-        this));
+  if (Events.isEnabled()) {
+    Events.fire(new (Events.get(Events.BLOCK_DELETE))(this));
   }
-  Blockly.Events.disable();
+  Events.disable();
 
   try {
     // This block is now at the top of the workspace.
@@ -399,22 +400,22 @@ Blockly.Block.prototype.dispose = function(healStack) {
     }
 
     // First, dispose of all my children.
-    for (var i = this.childBlocks_.length - 1; i >= 0; i--) {
+    for (let i = this.childBlocks_.length - 1; i >= 0; i--) {
       this.childBlocks_[i].dispose(false);
     }
     // Then dispose of myself.
     // Dispose of all inputs and their fields.
-    for (var i = 0, input; (input = this.inputList[i]); i++) {
+    for (let i = 0, input; (input = this.inputList[i]); i++) {
       input.dispose();
     }
     this.inputList.length = 0;
     // Dispose of any remaining connections (next/previous/output).
-    var connections = this.getConnections_(true);
-    for (var i = 0, connection; (connection = connections[i]); i++) {
+    const connections = this.getConnections_(true);
+    for (let i = 0, connection; (connection = connections[i]); i++) {
       connection.dispose();
     }
   } finally {
-    Blockly.Events.enable();
+    Events.enable();
     this.disposed = true;
   }
 };
@@ -428,9 +429,9 @@ Blockly.Block.prototype.dispose = function(healStack) {
  * change).
  * @public
  */
-Blockly.Block.prototype.initModel = function() {
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
-    for (var j = 0, field; (field = input.fieldRow[j]); j++) {
+Block.prototype.initModel = function() {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
+    for (let j = 0, field; (field = input.fieldRow[j]); j++) {
       if (field.initModel) {
         field.initModel();
       }
@@ -444,7 +445,7 @@ Blockly.Block.prototype.initModel = function() {
  * @param {boolean=} opt_healStack Disconnect child statement and reconnect
  *   stack.  Defaults to false.
  */
-Blockly.Block.prototype.unplug = function(opt_healStack) {
+Block.prototype.unplug = function(opt_healStack) {
   if (this.outputConnection) {
     this.unplugFromRow_(opt_healStack);
   } else if (this.previousConnection) {
@@ -459,8 +460,8 @@ Blockly.Block.prototype.unplug = function(opt_healStack) {
  *     left-side block.  Defaults to false.
  * @private
  */
-Blockly.Block.prototype.unplugFromRow_ = function(opt_healStack) {
-  var parentConnection = null;
+Block.prototype.unplugFromRow_ = function(opt_healStack) {
+  let parentConnection = null;
   if (this.outputConnection.isConnected()) {
     parentConnection = this.outputConnection.targetConnection;
     // Disconnect from any superior block.
@@ -472,21 +473,20 @@ Blockly.Block.prototype.unplugFromRow_ = function(opt_healStack) {
     return;
   }
 
-  var thisConnection = this.getOnlyValueConnection_();
-  if (!thisConnection ||
-      !thisConnection.isConnected() ||
+  const thisConnection = this.getOnlyValueConnection_();
+  if (!thisConnection || !thisConnection.isConnected() ||
       thisConnection.targetBlock().isShadow()) {
     // Too many or too few possible connections on this block, or there's
     // nothing on the other side of this connection.
     return;
   }
 
-  var childConnection = thisConnection.targetConnection;
+  const childConnection = thisConnection.targetConnection;
   // Disconnect the child block.
   childConnection.disconnect();
   // Connect child to the parent if possible, otherwise bump away.
   if (this.workspace.connectionChecker.canConnect(
-      childConnection, parentConnection, false)) {
+          childConnection, parentConnection, false)) {
     parentConnection.connect(childConnection);
   } else {
     childConnection.onFailedConnect(parentConnection);
@@ -500,15 +500,14 @@ Blockly.Block.prototype.unplugFromRow_ = function(opt_healStack) {
  * Since only one block can be displaced and attached to the insertion marker
  * this should only ever return one connection.
  *
- * @return {?Blockly.Connection} The connection on the value input, or null.
+ * @return {?Connection} The connection on the value input, or null.
  * @private
  */
-Blockly.Block.prototype.getOnlyValueConnection_ = function() {
-  var connection = null;
-  for (var i = 0; i < this.inputList.length; i++) {
-    var thisConnection = this.inputList[i].connection;
-    if (thisConnection &&
-        thisConnection.type == Blockly.connectionTypes.INPUT_VALUE &&
+Block.prototype.getOnlyValueConnection_ = function() {
+  let connection = null;
+  for (let i = 0; i < this.inputList.length; i++) {
+    const thisConnection = this.inputList[i].connection;
+    if (thisConnection && thisConnection.type == connectionTypes.INPUT_VALUE &&
         thisConnection.targetConnection) {
       if (connection) {
         return null;  // More than one value input found.
@@ -526,18 +525,18 @@ Blockly.Block.prototype.getOnlyValueConnection_ = function() {
  *   stack.  Defaults to false.
  * @private
  */
-Blockly.Block.prototype.unplugFromStack_ = function(opt_healStack) {
-  var previousTarget = null;
+Block.prototype.unplugFromStack_ = function(opt_healStack) {
+  let previousTarget = null;
   if (this.previousConnection.isConnected()) {
     // Remember the connection that any next statements need to connect to.
     previousTarget = this.previousConnection.targetConnection;
     // Detach this block from the parent's tree.
     this.previousConnection.disconnect();
   }
-  var nextBlock = this.getNextBlock();
+  const nextBlock = this.getNextBlock();
   if (opt_healStack && nextBlock && !nextBlock.isShadow()) {
     // Disconnect the next statement.
-    var nextTarget = this.nextConnection.targetConnection;
+    const nextTarget = this.nextConnection.targetConnection;
     nextTarget.disconnect();
     if (previousTarget &&
         this.workspace.connectionChecker.canConnect(
@@ -551,11 +550,11 @@ Blockly.Block.prototype.unplugFromStack_ = function(opt_healStack) {
 /**
  * Returns all connections originating from this block.
  * @param {boolean} _all If true, return all connections even hidden ones.
- * @return {!Array<!Blockly.Connection>} Array of connections.
+ * @return {!Array<!Connection>} Array of connections.
  * @package
  */
-Blockly.Block.prototype.getConnections_ = function(_all) {
-  var myConnections = [];
+Block.prototype.getConnections_ = function(_all) {
+  const myConnections = [];
   if (this.outputConnection) {
     myConnections.push(this.outputConnection);
   }
@@ -565,7 +564,7 @@ Blockly.Block.prototype.getConnections_ = function(_all) {
   if (this.nextConnection) {
     myConnections.push(this.nextConnection);
   }
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     if (input.connection) {
       myConnections.push(input.connection);
     }
@@ -578,13 +577,13 @@ Blockly.Block.prototype.getConnections_ = function(_all) {
  * @param {boolean} ignoreShadows If true,the last connection on a non-shadow
  *     block will be returned. If false, this will follow shadows to find the
  *     last connection.
- * @return {?Blockly.Connection} The last next connection on the stack, or null.
+ * @return {?Connection} The last next connection on the stack, or null.
  * @package
  */
-Blockly.Block.prototype.lastConnectionInStack = function(ignoreShadows) {
-  var nextConnection = this.nextConnection;
+Block.prototype.lastConnectionInStack = function(ignoreShadows) {
+  let nextConnection = this.nextConnection;
   while (nextConnection) {
-    var nextBlock = nextConnection.targetBlock();
+    const nextBlock = nextConnection.targetBlock();
     if (!nextBlock || (ignoreShadows && nextBlock.isShadow())) {
       return nextConnection;
     }
@@ -597,28 +596,29 @@ Blockly.Block.prototype.lastConnectionInStack = function(ignoreShadows) {
  * Bump unconnected blocks out of alignment.  Two blocks which aren't actually
  * connected should not coincidentally line up on screen.
  */
-Blockly.Block.prototype.bumpNeighbours = function() {
+Block.prototype.bumpNeighbours = function() {
   // noop.
 };
 
 /**
  * Return the parent block or null if this block is at the top level. The parent
- * block is either the block connected to the previous connection (for a statement
- * block) or the block connected to the output connection (for a value block).
- * @return {?Blockly.Block} The block (if any) that holds the current block.
+ * block is either the block connected to the previous connection (for a
+ * statement block) or the block connected to the output connection (for a value
+ * block).
+ * @return {?Block} The block (if any) that holds the current block.
  */
-Blockly.Block.prototype.getParent = function() {
+Block.prototype.getParent = function() {
   return this.parentBlock_;
 };
 
 /**
  * Return the input that connects to the specified block.
- * @param {!Blockly.Block} block A block connected to an input on this block.
- * @return {?Blockly.Input} The input (if any) that connects to the specified
+ * @param {!Block} block A block connected to an input on this block.
+ * @return {?Input} The input (if any) that connects to the specified
  *     block.
  */
-Blockly.Block.prototype.getInputWithBlock = function(block) {
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+Block.prototype.getInputWithBlock = function(block) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     if (input.connection && input.connection.targetBlock() == block) {
       return input;
     }
@@ -630,12 +630,13 @@ Blockly.Block.prototype.getInputWithBlock = function(block) {
  * Return the parent block that surrounds the current block, or null if this
  * block has no surrounding block.  A parent block might just be the previous
  * statement, whereas the surrounding block is an if statement, while loop, etc.
- * @return {?Blockly.Block} The block (if any) that surrounds the current block.
+ * @return {?Block} The block (if any) that surrounds the current block.
  */
-Blockly.Block.prototype.getSurroundParent = function() {
-  var block = this;
+Block.prototype.getSurroundParent = function() {
+  let block = this;
+  let prevBlock;
   do {
-    var prevBlock = block;
+    prevBlock = block;
     block = block.getParent();
     if (!block) {
       // Ran off the top.
@@ -648,30 +649,30 @@ Blockly.Block.prototype.getSurroundParent = function() {
 
 /**
  * Return the next statement block directly connected to this block.
- * @return {?Blockly.Block} The next statement block or null.
+ * @return {?Block} The next statement block or null.
  */
-Blockly.Block.prototype.getNextBlock = function() {
+Block.prototype.getNextBlock = function() {
   return this.nextConnection && this.nextConnection.targetBlock();
 };
 
 /**
  * Returns the block connected to the previous connection.
- * @return {?Blockly.Block} The previous statement block or null.
+ * @return {?Block} The previous statement block or null.
  */
-Blockly.Block.prototype.getPreviousBlock = function() {
+Block.prototype.getPreviousBlock = function() {
   return this.previousConnection && this.previousConnection.targetBlock();
 };
 
 /**
  * Return the connection on the first statement input on this block, or null if
  * there are none.
- * @return {?Blockly.Connection} The first statement connection or null.
+ * @return {?Connection} The first statement connection or null.
  * @package
  */
-Blockly.Block.prototype.getFirstStatementConnection = function() {
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+Block.prototype.getFirstStatementConnection = function() {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     if (input.connection &&
-        input.connection.type == Blockly.connectionTypes.NEXT_STATEMENT) {
+        input.connection.type == connectionTypes.NEXT_STATEMENT) {
       return input.connection;
     }
   }
@@ -681,11 +682,11 @@ Blockly.Block.prototype.getFirstStatementConnection = function() {
 /**
  * Return the top-most block in this block's tree.
  * This will return itself if this block is at the top level.
- * @return {!Blockly.Block} The root block.
+ * @return {!Block} The root block.
  */
-Blockly.Block.prototype.getRootBlock = function() {
-  var rootBlock;
-  var block = this;
+Block.prototype.getRootBlock = function() {
+  let rootBlock;
+  let block = this;
   do {
     rootBlock = block;
     block = rootBlock.parentBlock_;
@@ -697,13 +698,14 @@ Blockly.Block.prototype.getRootBlock = function() {
  * Walk up from the given block up through the stack of blocks to find
  * the top block of the sub stack. If we are nested in a statement input only
  * find the top-most nested block. Do not go all the way to the root block.
- * @return {!Blockly.Block} The top block in a stack.
+ * @return {!Block} The top block in a stack.
  * @package
  */
-Blockly.Block.prototype.getTopStackBlock = function() {
-  var block = this;
+Block.prototype.getTopStackBlock = function() {
+  let block = this;
+  let previous;
   do {
-    var previous = block.getPreviousBlock();
+    previous = block.getPreviousBlock();
   } while (previous && previous.getNextBlock() == block && (block = previous));
   return block;
 };
@@ -714,22 +716,22 @@ Blockly.Block.prototype.getTopStackBlock = function() {
  * Excludes any connection on an output tab or any preceding statement.
  * Blocks are optionally sorted by position; top to bottom.
  * @param {boolean} ordered Sort the list if true.
- * @return {!Array<!Blockly.Block>} Array of blocks.
+ * @return {!Array<!Block>} Array of blocks.
  */
-Blockly.Block.prototype.getChildren = function(ordered) {
+Block.prototype.getChildren = function(ordered) {
   if (!ordered) {
     return this.childBlocks_;
   }
-  var blocks = [];
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+  const blocks = [];
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     if (input.connection) {
-      var child = input.connection.targetBlock();
+      const child = input.connection.targetBlock();
       if (child) {
         blocks.push(child);
       }
     }
   }
-  var next = this.getNextBlock();
+  const next = this.getNextBlock();
   if (next) {
     blocks.push(next);
   }
@@ -738,31 +740,32 @@ Blockly.Block.prototype.getChildren = function(ordered) {
 
 /**
  * Set parent of this block to be a new block or null.
- * @param {Blockly.Block} newParent New parent block.
+ * @param {Block} newParent New parent block.
  * @package
  */
-Blockly.Block.prototype.setParent = function(newParent) {
+Block.prototype.setParent = function(newParent) {
   if (newParent === this.parentBlock_) {
     return;
   }
 
   // Check that block is connected to new parent if new parent is not null and
   //    that block is not connected to superior one if new parent is null.
-  var connection = this.previousConnection || this.outputConnection;
-  var isConnected = !!(connection && connection.targetBlock());
+  const connection = this.previousConnection || this.outputConnection;
+  const isConnected = !!(connection && connection.targetBlock());
 
   if (isConnected && newParent && connection.targetBlock() !== newParent) {
     throw Error('Block connected to superior one that is not new parent.');
   } else if (!isConnected && newParent) {
     throw Error('Block not connected to new parent.');
   } else if (isConnected && !newParent) {
-    throw Error('Cannot set parent to null while block is still connected to' +
+    throw Error(
+        'Cannot set parent to null while block is still connected to' +
         ' superior block.');
   }
 
   if (this.parentBlock_) {
     // Remove this block from the old parent's child list.
-    Blockly.utils.arrayRemove(this.parentBlock_.childBlocks_, this);
+    utils.arrayRemove(this.parentBlock_.childBlocks_, this);
 
     // This block hasn't actually moved on-screen, so there's no need to update
     //     its connection locations.
@@ -788,12 +791,12 @@ Blockly.Block.prototype.setParent = function(newParent) {
  * Excludes any connection on an output tab or any preceding statements.
  * Blocks are optionally sorted by position; top to bottom.
  * @param {boolean} ordered Sort the list if true.
- * @return {!Array<!Blockly.Block>} Flattened array of blocks.
+ * @return {!Array<!Block>} Flattened array of blocks.
  */
-Blockly.Block.prototype.getDescendants = function(ordered) {
-  var blocks = [this];
-  var childBlocks = this.getChildren(ordered);
-  for (var child, i = 0; (child = childBlocks[i]); i++) {
+Block.prototype.getDescendants = function(ordered) {
+  const blocks = [this];
+  const childBlocks = this.getChildren(ordered);
+  for (let child, i = 0; (child = childBlocks[i]); i++) {
     blocks.push.apply(blocks, child.getDescendants(ordered));
   }
   return blocks;
@@ -803,7 +806,7 @@ Blockly.Block.prototype.getDescendants = function(ordered) {
  * Get whether this block is deletable or not.
  * @return {boolean} True if deletable.
  */
-Blockly.Block.prototype.isDeletable = function() {
+Block.prototype.isDeletable = function() {
   return this.deletable_ && !this.isShadow_ &&
       !(this.workspace && this.workspace.options.readOnly);
 };
@@ -812,7 +815,7 @@ Blockly.Block.prototype.isDeletable = function() {
  * Set whether this block is deletable or not.
  * @param {boolean} deletable True if deletable.
  */
-Blockly.Block.prototype.setDeletable = function(deletable) {
+Block.prototype.setDeletable = function(deletable) {
   this.deletable_ = deletable;
 };
 
@@ -820,7 +823,7 @@ Blockly.Block.prototype.setDeletable = function(deletable) {
  * Get whether this block is movable or not.
  * @return {boolean} True if movable.
  */
-Blockly.Block.prototype.isMovable = function() {
+Block.prototype.isMovable = function() {
   return this.movable_ && !this.isShadow_ &&
       !(this.workspace && this.workspace.options.readOnly);
 };
@@ -829,7 +832,7 @@ Blockly.Block.prototype.isMovable = function() {
  * Set whether this block is movable or not.
  * @param {boolean} movable True if movable.
  */
-Blockly.Block.prototype.setMovable = function(movable) {
+Block.prototype.setMovable = function(movable) {
   this.movable_ = movable;
 };
 
@@ -840,19 +843,19 @@ Blockly.Block.prototype.setMovable = function(movable) {
  * type over their maxInstances this block is not duplicatable.
  * @return {boolean} True if duplicatable.
  */
-Blockly.Block.prototype.isDuplicatable = function() {
+Block.prototype.isDuplicatable = function() {
   if (!this.workspace.hasBlockLimits()) {
     return true;
   }
   return this.workspace.isCapacityAvailable(
-      Blockly.utils.getBlockTypeCounts(this, true));
+      utils.getBlockTypeCounts(this, true));
 };
 
 /**
  * Get whether this block is a shadow block or not.
  * @return {boolean} True if a shadow.
  */
-Blockly.Block.prototype.isShadow = function() {
+Block.prototype.isShadow = function() {
   return this.isShadow_;
 };
 
@@ -861,7 +864,7 @@ Blockly.Block.prototype.isShadow = function() {
  * @param {boolean} shadow True if a shadow.
  * @package
  */
-Blockly.Block.prototype.setShadow = function(shadow) {
+Block.prototype.setShadow = function(shadow) {
   this.isShadow_ = shadow;
 };
 
@@ -869,7 +872,7 @@ Blockly.Block.prototype.setShadow = function(shadow) {
  * Get whether this block is an insertion marker block or not.
  * @return {boolean} True if an insertion marker.
  */
-Blockly.Block.prototype.isInsertionMarker = function() {
+Block.prototype.isInsertionMarker = function() {
   return this.isInsertionMarker_;
 };
 
@@ -879,7 +882,7 @@ Blockly.Block.prototype.isInsertionMarker = function() {
  * @param {boolean} insertionMarker True if an insertion marker.
  * @package
  */
-Blockly.Block.prototype.setInsertionMarker = function(insertionMarker) {
+Block.prototype.setInsertionMarker = function(insertionMarker) {
   this.isInsertionMarker_ = insertionMarker;
 };
 
@@ -887,7 +890,7 @@ Blockly.Block.prototype.setInsertionMarker = function(insertionMarker) {
  * Get whether this block is editable or not.
  * @return {boolean} True if editable.
  */
-Blockly.Block.prototype.isEditable = function() {
+Block.prototype.isEditable = function() {
   return this.editable_ && !(this.workspace && this.workspace.options.readOnly);
 };
 
@@ -895,10 +898,10 @@ Blockly.Block.prototype.isEditable = function() {
  * Set whether this block is editable or not.
  * @param {boolean} editable True if editable.
  */
-Blockly.Block.prototype.setEditable = function(editable) {
+Block.prototype.setEditable = function(editable) {
   this.editable_ = editable;
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
-    for (var j = 0, field; (field = input.fieldRow[j]); j++) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
+    for (let j = 0, field; (field = input.fieldRow[j]); j++) {
       field.updateEditable();
     }
   }
@@ -908,7 +911,7 @@ Blockly.Block.prototype.setEditable = function(editable) {
  * Returns if this block has been disposed of / deleted.
  * @return {boolean} True if this block has been disposed of / deleted.
  */
-Blockly.Block.prototype.isDisposed = function() {
+Block.prototype.isDisposed = function() {
   return this.disposed;
 };
 
@@ -916,18 +919,18 @@ Blockly.Block.prototype.isDisposed = function() {
  * Find the connection on this block that corresponds to the given connection
  * on the other block.
  * Used to match connections between a block and its insertion marker.
- * @param {!Blockly.Block} otherBlock The other block to match against.
- * @param {!Blockly.Connection} conn The other connection to match.
- * @return {?Blockly.Connection} The matching connection on this block, or null.
+ * @param {!Block} otherBlock The other block to match against.
+ * @param {!Connection} conn The other connection to match.
+ * @return {?Connection} The matching connection on this block, or null.
  * @package
  */
-Blockly.Block.prototype.getMatchingConnection = function(otherBlock, conn) {
-  var connections = this.getConnections_(true);
-  var otherConnections = otherBlock.getConnections_(true);
+Block.prototype.getMatchingConnection = function(otherBlock, conn) {
+  const connections = this.getConnections_(true);
+  const otherConnections = otherBlock.getConnections_(true);
   if (connections.length != otherConnections.length) {
-    throw Error("Connection lists did not match in length.");
+    throw Error('Connection lists did not match in length.');
   }
-  for (var i = 0; i < otherConnections.length; i++) {
+  for (let i = 0; i < otherConnections.length; i++) {
     if (otherConnections[i] == conn) {
       return connections[i];
     }
@@ -940,17 +943,17 @@ Blockly.Block.prototype.getMatchingConnection = function(otherBlock, conn) {
  * @param {string|Function} url URL string for block help, or function that
  *     returns a URL.  Null for no help.
  */
-Blockly.Block.prototype.setHelpUrl = function(url) {
+Block.prototype.setHelpUrl = function(url) {
   this.helpUrl = url;
 };
 
 /**
  * Sets the tooltip for this block.
- * @param {!Blockly.Tooltip.TipInfo} newTip The text for the tooltip, a function
+ * @param {!Tooltip.TipInfo} newTip The text for the tooltip, a function
  *     that returns the text for the tooltip, or a parent object whose tooltip
  *     will be used. To not display a tooltip pass the empty string.
  */
-Blockly.Block.prototype.setTooltip = function(newTip) {
+Block.prototype.setTooltip = function(newTip) {
   this.tooltip = newTip;
 };
 
@@ -958,15 +961,15 @@ Blockly.Block.prototype.setTooltip = function(newTip) {
  * Returns the tooltip text for this block.
  * @return {!string} The tooltip text for this block.
  */
-Blockly.Block.prototype.getTooltip = function() {
-  return Blockly.Tooltip.getTooltipOfObject(this);
+Block.prototype.getTooltip = function() {
+  return Tooltip.getTooltipOfObject(this);
 };
 
 /**
  * Get the colour of a block.
  * @return {string} #RRGGBB string.
  */
-Blockly.Block.prototype.getColour = function() {
+Block.prototype.getColour = function() {
   return this.colour_;
 };
 
@@ -974,7 +977,7 @@ Blockly.Block.prototype.getColour = function() {
  * Get the name of the block style.
  * @return {string} Name of the block style.
  */
-Blockly.Block.prototype.getStyleName = function() {
+Block.prototype.getStyleName = function() {
   return this.styleName_;
 };
 
@@ -982,7 +985,7 @@ Blockly.Block.prototype.getStyleName = function() {
  * Get the HSV hue value of a block.  Null if hue not set.
  * @return {?number} Hue value (0-360).
  */
-Blockly.Block.prototype.getHue = function() {
+Block.prototype.getHue = function() {
   return this.hue_;
 };
 
@@ -991,8 +994,8 @@ Blockly.Block.prototype.getHue = function() {
  * @param {number|string} colour HSV hue value (0 to 360), #RRGGBB string,
  *     or a message reference string pointing to one of those two values.
  */
-Blockly.Block.prototype.setColour = function(colour) {
-  var parsed = Blockly.utils.parseBlockColour(colour);
+Block.prototype.setColour = function(colour) {
+  const parsed = utils.parseBlockColour(colour);
   this.hue_ = parsed.hue;
   this.colour_ = parsed.hex;
 };
@@ -1001,7 +1004,7 @@ Blockly.Block.prototype.setColour = function(colour) {
  * Set the style and colour values of a block.
  * @param {string} blockStyleName Name of the block style.
  */
-Blockly.Block.prototype.setStyle = function(blockStyleName) {
+Block.prototype.setStyle = function(blockStyleName) {
   this.styleName_ = blockStyleName;
 };
 
@@ -1010,11 +1013,11 @@ Blockly.Block.prototype.setStyle = function(blockStyleName) {
  * changes, replacing any prior onchange handler. This is usually only called
  * from the constructor, the block type initializer function, or an extension
  * initializer function.
- * @param {function(Blockly.Events.Abstract)} onchangeFn The callback to call
+ * @param {function(Abstract)} onchangeFn The callback to call
  *     when the block's workspace changes.
  * @throws {Error} if onchangeFn is not falsey and not a function.
  */
-Blockly.Block.prototype.setOnChange = function(onchangeFn) {
+Block.prototype.setOnChange = function(onchangeFn) {
   if (onchangeFn && typeof onchangeFn != 'function') {
     throw Error('onchange must be a function.');
   }
@@ -1031,17 +1034,18 @@ Blockly.Block.prototype.setOnChange = function(onchangeFn) {
 /**
  * Returns the named field from a block.
  * @param {string} name The name of the field.
- * @return {?Blockly.Field} Named field, or null if field does not exist.
+ * @return {?Field} Named field, or null if field does not exist.
  */
-Blockly.Block.prototype.getField = function(name) {
+Block.prototype.getField = function(name) {
   if (typeof name !== 'string') {
-    throw TypeError('Blockly.Block.prototype.getField expects a string ' +
-      'with the field name but received ' +
-      (name === undefined ? 'nothing' : name + ' of type ' + typeof name) +
-      ' instead');
+    throw TypeError(
+        'Block.prototype.getField expects a string ' +
+        'with the field name but received ' +
+        (name === undefined ? 'nothing' : name + ' of type ' + typeof name) +
+        ' instead');
   }
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
-    for (var j = 0, field; (field = input.fieldRow[j]); j++) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
+    for (let j = 0, field; (field = input.fieldRow[j]); j++) {
       if (field.name === name) {
         return field;
       }
@@ -1054,10 +1058,10 @@ Blockly.Block.prototype.getField = function(name) {
  * Return all variables referenced by this block.
  * @return {!Array<string>} List of variable names.
  */
-Blockly.Block.prototype.getVars = function() {
-  var vars = [];
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
-    for (var j = 0, field; (field = input.fieldRow[j]); j++) {
+Block.prototype.getVars = function() {
+  const vars = [];
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
+    for (let j = 0, field; (field = input.fieldRow[j]); j++) {
       if (field.referencesVariables()) {
         vars.push(field.getValue());
       }
@@ -1068,15 +1072,15 @@ Blockly.Block.prototype.getVars = function() {
 
 /**
  * Return all variables referenced by this block.
- * @return {!Array<!Blockly.VariableModel>} List of variable models.
+ * @return {!Array<!VariableModel>} List of variable models.
  * @package
  */
-Blockly.Block.prototype.getVarModels = function() {
-  var vars = [];
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
-    for (var j = 0, field; (field = input.fieldRow[j]); j++) {
+Block.prototype.getVarModels = function() {
+  const vars = [];
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
+    for (let j = 0, field; (field = input.fieldRow[j]); j++) {
       if (field.referencesVariables()) {
-        var model = this.workspace.getVariableById(
+        const model = this.workspace.getVariableById(
             /** @type {string} */ (field.getValue()));
         // Check if the variable actually exists (and isn't just a potential
         // variable).
@@ -1092,14 +1096,13 @@ Blockly.Block.prototype.getVarModels = function() {
 /**
  * Notification that a variable is renaming but keeping the same ID.  If the
  * variable is in use on this block, rerender to show the new name.
- * @param {!Blockly.VariableModel} variable The variable being renamed.
+ * @param {!VariableModel} variable The variable being renamed.
  * @package
  */
-Blockly.Block.prototype.updateVarName = function(variable) {
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
-    for (var j = 0, field; (field = input.fieldRow[j]); j++) {
-      if (field.referencesVariables() &&
-          variable.getId() == field.getValue()) {
+Block.prototype.updateVarName = function(variable) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
+    for (let j = 0, field; (field = input.fieldRow[j]); j++) {
+      if (field.referencesVariables() && variable.getId() == field.getValue()) {
         field.refreshVariableName();
       }
     }
@@ -1113,11 +1116,10 @@ Blockly.Block.prototype.updateVarName = function(variable) {
  * @param {string} newId ID of new variable.  May be the same as oldId, but with
  *     an updated name.
  */
-Blockly.Block.prototype.renameVarById = function(oldId, newId) {
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
-    for (var j = 0, field; (field = input.fieldRow[j]); j++) {
-      if (field.referencesVariables() &&
-          oldId == field.getValue()) {
+Block.prototype.renameVarById = function(oldId, newId) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
+    for (let j = 0, field; (field = input.fieldRow[j]); j++) {
+      if (field.referencesVariables() && oldId == field.getValue()) {
         field.setValue(newId);
       }
     }
@@ -1129,8 +1131,8 @@ Blockly.Block.prototype.renameVarById = function(oldId, newId) {
  * @param {string} name The name of the field.
  * @return {*} Value of the field or null if field does not exist.
  */
-Blockly.Block.prototype.getFieldValue = function(name) {
-  var field = this.getField(name);
+Block.prototype.getFieldValue = function(name) {
+  const field = this.getField(name);
   if (field) {
     return field.getValue();
   }
@@ -1142,8 +1144,8 @@ Blockly.Block.prototype.getFieldValue = function(name) {
  * @param {*} newValue The value to set.
  * @param {string} name The name of the field to set the value of.
  */
-Blockly.Block.prototype.setFieldValue = function(newValue, name) {
-  var field = this.getField(name);
+Block.prototype.setFieldValue = function(newValue, name) {
+  const field = this.getField(name);
   if (!field) {
     throw Error('Field "' + name + '" not found.');
   }
@@ -1156,24 +1158,26 @@ Blockly.Block.prototype.setFieldValue = function(newValue, name) {
  * @param {(string|Array<string>|null)=} opt_check Statement type or
  *     list of statement types.  Null/undefined if any type could be connected.
  */
-Blockly.Block.prototype.setPreviousStatement = function(newBoolean, opt_check) {
+Block.prototype.setPreviousStatement = function(newBoolean, opt_check) {
   if (newBoolean) {
     if (opt_check === undefined) {
       opt_check = null;
     }
     if (!this.previousConnection) {
       if (this.outputConnection) {
-        throw Error('Remove output connection prior to adding previous ' +
+        throw Error(
+            'Remove output connection prior to adding previous ' +
             'connection.');
       }
       this.previousConnection =
-          this.makeConnection_(Blockly.connectionTypes.PREVIOUS_STATEMENT);
+          this.makeConnection_(connectionTypes.PREVIOUS_STATEMENT);
     }
     this.previousConnection.setCheck(opt_check);
   } else {
     if (this.previousConnection) {
       if (this.previousConnection.isConnected()) {
-        throw Error('Must disconnect previous statement before removing ' +
+        throw Error(
+            'Must disconnect previous statement before removing ' +
             'connection.');
       }
       this.previousConnection.dispose();
@@ -1188,20 +1192,21 @@ Blockly.Block.prototype.setPreviousStatement = function(newBoolean, opt_check) {
  * @param {(string|Array<string>|null)=} opt_check Statement type or
  *     list of statement types.  Null/undefined if any type could be connected.
  */
-Blockly.Block.prototype.setNextStatement = function(newBoolean, opt_check) {
+Block.prototype.setNextStatement = function(newBoolean, opt_check) {
   if (newBoolean) {
     if (opt_check === undefined) {
       opt_check = null;
     }
     if (!this.nextConnection) {
       this.nextConnection =
-          this.makeConnection_(Blockly.connectionTypes.NEXT_STATEMENT);
+          this.makeConnection_(connectionTypes.NEXT_STATEMENT);
     }
     this.nextConnection.setCheck(opt_check);
   } else {
     if (this.nextConnection) {
       if (this.nextConnection.isConnected()) {
-        throw Error('Must disconnect next statement before removing ' +
+        throw Error(
+            'Must disconnect next statement before removing ' +
             'connection.');
       }
       this.nextConnection.dispose();
@@ -1217,18 +1222,19 @@ Blockly.Block.prototype.setNextStatement = function(newBoolean, opt_check) {
  *     of returned types.  Null or undefined if any type could be returned
  *     (e.g. variable get).
  */
-Blockly.Block.prototype.setOutput = function(newBoolean, opt_check) {
+Block.prototype.setOutput = function(newBoolean, opt_check) {
   if (newBoolean) {
     if (opt_check === undefined) {
       opt_check = null;
     }
     if (!this.outputConnection) {
       if (this.previousConnection) {
-        throw Error('Remove previous connection prior to adding output ' +
+        throw Error(
+            'Remove previous connection prior to adding output ' +
             'connection.');
       }
       this.outputConnection =
-          this.makeConnection_(Blockly.connectionTypes.OUTPUT_VALUE);
+          this.makeConnection_(connectionTypes.OUTPUT_VALUE);
     }
     this.outputConnection.setCheck(opt_check);
   } else {
@@ -1246,9 +1252,9 @@ Blockly.Block.prototype.setOutput = function(newBoolean, opt_check) {
  * Set whether value inputs are arranged horizontally or vertically.
  * @param {boolean} newBoolean True if inputs are horizontal.
  */
-Blockly.Block.prototype.setInputsInline = function(newBoolean) {
+Block.prototype.setInputsInline = function(newBoolean) {
   if (this.inputsInline != newBoolean) {
-    Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CHANGE))(
+    Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
         this, 'inline', null, this.inputsInline, newBoolean));
     this.inputsInline = newBoolean;
   }
@@ -1258,22 +1264,22 @@ Blockly.Block.prototype.setInputsInline = function(newBoolean) {
  * Get whether value inputs are arranged horizontally or vertically.
  * @return {boolean} True if inputs are horizontal.
  */
-Blockly.Block.prototype.getInputsInline = function() {
+Block.prototype.getInputsInline = function() {
   if (this.inputsInline != undefined) {
     // Set explicitly.
     return this.inputsInline;
   }
   // Not defined explicitly.  Figure out what would look best.
-  for (var i = 1; i < this.inputList.length; i++) {
-    if (this.inputList[i - 1].type == Blockly.inputTypes.DUMMY &&
-        this.inputList[i].type == Blockly.inputTypes.DUMMY) {
+  for (let i = 1; i < this.inputList.length; i++) {
+    if (this.inputList[i - 1].type == inputTypes.DUMMY &&
+        this.inputList[i].type == inputTypes.DUMMY) {
       // Two dummy inputs in a row.  Don't inline them.
       return false;
     }
   }
-  for (var i = 1; i < this.inputList.length; i++) {
-    if (this.inputList[i - 1].type == Blockly.inputTypes.VALUE &&
-        this.inputList[i].type == Blockly.inputTypes.DUMMY) {
+  for (let i = 1; i < this.inputList.length; i++) {
+    if (this.inputList[i - 1].type == inputTypes.VALUE &&
+        this.inputList[i].type == inputTypes.DUMMY) {
       // Dummy input after a value input.  Inline them.
       return true;
     }
@@ -1285,7 +1291,7 @@ Blockly.Block.prototype.getInputsInline = function() {
  * Set the block's output shape.
  * @param {?number} outputShape Value representing an output shape.
  */
-Blockly.Block.prototype.setOutputShape = function(outputShape) {
+Block.prototype.setOutputShape = function(outputShape) {
   this.outputShape_ = outputShape;
 };
 
@@ -1293,7 +1299,7 @@ Blockly.Block.prototype.setOutputShape = function(outputShape) {
  * Get the block's output shape.
  * @return {?number} Value representing output shape if one exists.
  */
-Blockly.Block.prototype.getOutputShape = function() {
+Block.prototype.getOutputShape = function() {
   return this.outputShape_;
 };
 
@@ -1301,7 +1307,7 @@ Blockly.Block.prototype.getOutputShape = function() {
  * Get whether this block is enabled or not.
  * @return {boolean} True if enabled.
  */
-Blockly.Block.prototype.isEnabled = function() {
+Block.prototype.isEnabled = function() {
   return !this.disabled;
 };
 
@@ -1309,9 +1315,9 @@ Blockly.Block.prototype.isEnabled = function() {
  * Set whether the block is enabled or not.
  * @param {boolean} enabled True if enabled.
  */
-Blockly.Block.prototype.setEnabled = function(enabled) {
+Block.prototype.setEnabled = function(enabled) {
   if (this.isEnabled() != enabled) {
-    Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CHANGE))(
+    Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
         this, 'disabled', null, this.disabled, !enabled));
     this.disabled = !enabled;
   }
@@ -1322,8 +1328,8 @@ Blockly.Block.prototype.setEnabled = function(enabled) {
  * The block's own disabled property is not considered.
  * @return {boolean} True if disabled.
  */
-Blockly.Block.prototype.getInheritedDisabled = function() {
-  var ancestor = this.getSurroundParent();
+Block.prototype.getInheritedDisabled = function() {
+  let ancestor = this.getSurroundParent();
   while (ancestor) {
     if (ancestor.disabled) {
       return true;
@@ -1338,7 +1344,7 @@ Blockly.Block.prototype.getInheritedDisabled = function() {
  * Get whether the block is collapsed or not.
  * @return {boolean} True if collapsed.
  */
-Blockly.Block.prototype.isCollapsed = function() {
+Block.prototype.isCollapsed = function() {
   return this.collapsed_;
 };
 
@@ -1346,9 +1352,9 @@ Blockly.Block.prototype.isCollapsed = function() {
  * Set whether the block is collapsed or not.
  * @param {boolean} collapsed True if collapsed.
  */
-Blockly.Block.prototype.setCollapsed = function(collapsed) {
+Block.prototype.setCollapsed = function(collapsed) {
   if (this.collapsed_ != collapsed) {
-    Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CHANGE))(
+    Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
         this, 'collapsed', null, this.collapsed_, collapsed));
     this.collapsed_ = collapsed;
   }
@@ -1361,29 +1367,29 @@ Blockly.Block.prototype.setCollapsed = function(collapsed) {
  *     empty field. If not specified, '?' is used.
  * @return {string} Text of block.
  */
-Blockly.Block.prototype.toString = function(opt_maxLength, opt_emptyToken) {
-  var text = [];
-  var emptyFieldPlaceholder = opt_emptyToken || '?';
+Block.prototype.toString = function(opt_maxLength, opt_emptyToken) {
+  let text = [];
+  const emptyFieldPlaceholder = opt_emptyToken || '?';
 
   // Temporarily set flag to navigate to all fields.
-  var prevNavigateFields = Blockly.ASTNode.NAVIGATE_ALL_FIELDS;
-  Blockly.ASTNode.NAVIGATE_ALL_FIELDS = true;
+  const prevNavigateFields = ASTNode.NAVIGATE_ALL_FIELDS;
+  ASTNode.NAVIGATE_ALL_FIELDS = true;
 
-  var node = Blockly.ASTNode.createBlockNode(this);
-  var rootNode = node;
+  let node = ASTNode.createBlockNode(this);
+  const rootNode = node;
 
   /**
    * Whether or not to add parentheses around an input.
-   * @param {!Blockly.Connection} connection The connection.
+   * @param {!Connection} connection The connection.
    * @return {boolean} True if we should add parentheses around the input.
    */
   function shouldAddParentheses(connection) {
-    var checks = connection.getCheck();
+    let checks = connection.getCheck();
     if (!checks && connection.targetConnection) {
       checks = connection.targetConnection.getCheck();
     }
-    return !!checks && (checks.indexOf('Boolean') != -1 ||
-        checks.indexOf('Number') != -1);
+    return !!checks &&
+        (checks.indexOf('Boolean') != -1 || checks.indexOf('Number') != -1);
   }
 
   /**
@@ -1399,23 +1405,25 @@ Blockly.Block.prototype.toString = function(opt_maxLength, opt_emptyToken) {
   // Traverse the AST building up our text string.
   while (node) {
     switch (node.getType()) {
-      case Blockly.ASTNode.types.INPUT:
-        var connection = /** @type {!Blockly.Connection} */ (node.getLocation());
+      case ASTNode.types.INPUT: {
+        const connection = /** @type {!Connection} */ (node.getLocation());
         if (!node.in()) {
           text.push(emptyFieldPlaceholder);
         } else if (shouldAddParentheses(connection)) {
           text.push('(');
         }
         break;
-      case Blockly.ASTNode.types.FIELD:
-        var field = /** @type {Blockly.Field} */ (node.getLocation());
-        if (field.name != Blockly.constants.COLLAPSED_FIELD_NAME) {
+      }
+      case ASTNode.types.FIELD: {
+        const field = /** @type {Field} */ (node.getLocation());
+        if (field.name != constants.COLLAPSED_FIELD_NAME) {
           text.push(field.getText());
         }
         break;
+      }
     }
 
-    var current = node;
+    const current = node;
     node = current.in() || current.next();
     if (!node) {
       // Can't go in or next, keep going out until we can go next.
@@ -1425,9 +1433,9 @@ Blockly.Block.prototype.toString = function(opt_maxLength, opt_emptyToken) {
         node = node.out();
         checkRoot();
         // If we hit an input on the way up, possibly close out parentheses.
-        if (node && node.getType() == Blockly.ASTNode.types.INPUT &&
+        if (node && node.getType() == ASTNode.types.INPUT &&
             shouldAddParentheses(
-                /** @type {!Blockly.Connection} */ (node.getLocation()))) {
+                /** @type {!Connection} */ (node.getLocation()))) {
           text.push(')');
         }
       }
@@ -1438,12 +1446,12 @@ Blockly.Block.prototype.toString = function(opt_maxLength, opt_emptyToken) {
   }
 
   // Restore state of NAVIGATE_ALL_FIELDS.
-  Blockly.ASTNode.NAVIGATE_ALL_FIELDS = prevNavigateFields;
+  ASTNode.NAVIGATE_ALL_FIELDS = prevNavigateFields;
 
   // Run through our text array and simplify expression to remove parentheses
   // around single field blocks.
   // E.g. ['repeat', '(', '10', ')', 'times', 'do', '?']
-  for (var i = 2; i < text.length; i++) {
+  for (let i = 2; i < text.length; i++) {
     if (text[i - 2] == '(' && text[i] == ')') {
       text[i - 2] = text[i - 1];
       text.splice(i - 1, 2);
@@ -1470,30 +1478,30 @@ Blockly.Block.prototype.toString = function(opt_maxLength, opt_emptyToken) {
  * Shortcut for appending a value input row.
  * @param {string} name Language-neutral identifier which may used to find this
  *     input again.  Should be unique to this block.
- * @return {!Blockly.Input} The input object created.
+ * @return {!Input} The input object created.
  */
-Blockly.Block.prototype.appendValueInput = function(name) {
-  return this.appendInput_(Blockly.inputTypes.VALUE, name);
+Block.prototype.appendValueInput = function(name) {
+  return this.appendInput_(inputTypes.VALUE, name);
 };
 
 /**
  * Shortcut for appending a statement input row.
  * @param {string} name Language-neutral identifier which may used to find this
  *     input again.  Should be unique to this block.
- * @return {!Blockly.Input} The input object created.
+ * @return {!Input} The input object created.
  */
-Blockly.Block.prototype.appendStatementInput = function(name) {
-  return this.appendInput_(Blockly.inputTypes.STATEMENT, name);
+Block.prototype.appendStatementInput = function(name) {
+  return this.appendInput_(inputTypes.STATEMENT, name);
 };
 
 /**
  * Shortcut for appending a dummy input row.
  * @param {string=} opt_name Language-neutral identifier which may used to find
  *     this input again.  Should be unique to this block.
- * @return {!Blockly.Input} The input object created.
+ * @return {!Input} The input object created.
  */
-Blockly.Block.prototype.appendDummyInput = function(opt_name) {
-  return this.appendInput_(Blockly.inputTypes.DUMMY, opt_name || '');
+Block.prototype.appendDummyInput = function(opt_name) {
+  return this.appendInput_(inputTypes.DUMMY, opt_name || '');
 };
 
 /**
@@ -1501,12 +1509,13 @@ Blockly.Block.prototype.appendDummyInput = function(opt_name) {
  * JSON description.
  * @param {!Object} json Structured data describing the block.
  */
-Blockly.Block.prototype.jsonInit = function(json) {
-  var warningPrefix = json['type'] ? 'Block "' + json['type'] + '": ' : '';
+Block.prototype.jsonInit = function(json) {
+  const warningPrefix = json['type'] ? 'Block "' + json['type'] + '": ' : '';
 
   // Validate inputs.
   if (json['output'] && json['previousStatement']) {
-    throw Error(warningPrefix +
+    throw Error(
+        warningPrefix +
         'Must not have both an output and a previousStatement.');
   }
 
@@ -1527,10 +1536,11 @@ Blockly.Block.prototype.jsonInit = function(json) {
   }
 
   // Interpolate the message blocks.
-  var i = 0;
+  let i = 0;
   while (json['message' + i] !== undefined) {
-    this.interpolate_(json['message' + i], json['args' + i] || [],
-        json['lastDummyAlign' + i], warningPrefix);
+    this.interpolate_(
+        json['message' + i], json['args' + i] || [], json['lastDummyAlign' + i],
+        warningPrefix);
     i++;
   }
 
@@ -1551,17 +1561,17 @@ Blockly.Block.prototype.jsonInit = function(json) {
     this.setNextStatement(true, json['nextStatement']);
   }
   if (json['tooltip'] !== undefined) {
-    var rawValue = json['tooltip'];
-    var localizedText = Blockly.utils.replaceMessageReferences(rawValue);
+    const rawValue = json['tooltip'];
+    const localizedText = utils.replaceMessageReferences(rawValue);
     this.setTooltip(localizedText);
   }
   if (json['enableContextMenu'] !== undefined) {
-    var rawValue = json['enableContextMenu'];
+    const rawValue = json['enableContextMenu'];
     this.contextMenu = !!rawValue;
   }
   if (json['helpUrl'] !== undefined) {
-    var rawValue = json['helpUrl'];
-    var localizedValue = Blockly.utils.replaceMessageReferences(rawValue);
+    const rawValue = json['helpUrl'];
+    const localizedValue = utils.replaceMessageReferences(rawValue);
     this.setHelpUrl(localizedValue);
   }
   if (typeof json['extensions'] == 'string') {
@@ -1574,13 +1584,13 @@ Blockly.Block.prototype.jsonInit = function(json) {
 
   // Add the mutator to the block.
   if (json['mutator'] !== undefined) {
-    Blockly.Extensions.apply(json['mutator'], this, true);
+    Extensions.apply(json['mutator'], this, true);
   }
 
-  var extensionNames = json['extensions'];
+  const extensionNames = json['extensions'];
   if (Array.isArray(extensionNames)) {
-    for (var j = 0; j < extensionNames.length; ++j) {
-      Blockly.Extensions.apply(extensionNames[j], this, false);
+    for (let j = 0; j < extensionNames.length; ++j) {
+      Extensions.apply(extensionNames[j], this, false);
     }
   }
 };
@@ -1591,12 +1601,12 @@ Blockly.Block.prototype.jsonInit = function(json) {
  * @param {string} warningPrefix Warning prefix string identifying block.
  * @private
  */
-Blockly.Block.prototype.jsonInitColour_ = function(json, warningPrefix) {
+Block.prototype.jsonInitColour_ = function(json, warningPrefix) {
   if ('colour' in json) {
     if (json['colour'] === undefined) {
       console.warn(warningPrefix + 'Undefined colour value.');
     } else {
-      var rawValue = json['colour'];
+      const rawValue = json['colour'];
       try {
         this.setColour(rawValue);
       } catch (e) {
@@ -1612,8 +1622,8 @@ Blockly.Block.prototype.jsonInitColour_ = function(json, warningPrefix) {
  * @param {string} warningPrefix Warning prefix string identifying block.
  * @private
  */
-Blockly.Block.prototype.jsonInitStyle_ = function(json, warningPrefix) {
-  var blockStyleName = json['style'];
+Block.prototype.jsonInitStyle_ = function(json, warningPrefix) {
+  const blockStyleName = json['style'];
   try {
     this.setStyle(blockStyleName);
   } catch (styleError) {
@@ -1630,23 +1640,23 @@ Blockly.Block.prototype.jsonInitStyle_ = function(json, warningPrefix) {
  * @param {!Object} mixinObj The key/values pairs to add to this block object.
  * @param {boolean=} opt_disableCheck Option flag to disable overwrite checks.
  */
-Blockly.Block.prototype.mixin = function(mixinObj, opt_disableCheck) {
+Block.prototype.mixin = function(mixinObj, opt_disableCheck) {
   if (opt_disableCheck !== undefined && typeof opt_disableCheck != 'boolean') {
     throw Error('opt_disableCheck must be a boolean if provided');
   }
   if (!opt_disableCheck) {
-    var overwrites = [];
-    for (var key in mixinObj) {
+    const overwrites = [];
+    for (let key in mixinObj) {
       if (this[key] !== undefined) {
         overwrites.push(key);
       }
     }
     if (overwrites.length) {
-      throw Error('Mixin will overwrite block members: ' +
-          JSON.stringify(overwrites));
+      throw Error(
+          'Mixin will overwrite block members: ' + JSON.stringify(overwrites));
     }
   }
-  Blockly.utils.object.mixin(this, mixinObj);
+  object.mixin(this, mixinObj);
 };
 
 /**
@@ -1659,27 +1669,27 @@ Blockly.Block.prototype.mixin = function(mixinObj, opt_disableCheck) {
  * @param {string} warningPrefix Warning prefix string identifying block.
  * @private
  */
-Blockly.Block.prototype.interpolate_ = function(message, args, lastDummyAlign,
-    warningPrefix) {
-  var tokens = Blockly.utils.tokenizeInterpolation(message);
+Block.prototype.interpolate_ = function(
+    message, args, lastDummyAlign, warningPrefix) {
+  const tokens = utils.tokenizeInterpolation(message);
   this.validateTokens_(tokens, args.length);
-  var elements = this.interpolateArguments_(tokens, args, lastDummyAlign);
+  const elements = this.interpolateArguments_(tokens, args, lastDummyAlign);
 
   // An array of [field, fieldName] tuples.
-  var fieldStack = [];
-  for (var i = 0, element; (element = elements[i]); i++) {
+  const fieldStack = [];
+  for (let i = 0, element; (element = elements[i]); i++) {
     if (this.isInputKeyword_(element['type'])) {
-      var input = this.inputFromJson_(element, warningPrefix);
+      const input = this.inputFromJson_(element, warningPrefix);
       // Should never be null, but just in case.
       if (input) {
-        for (var j = 0, tuple; (tuple = fieldStack[j]); j++) {
+        for (let j = 0, tuple; (tuple = fieldStack[j]); j++) {
           input.appendField(tuple[0], tuple[1]);
         }
         fieldStack.length = 0;
       }
     } else {
       // All other types, including ones starting with 'input_' get routed here.
-      var field = this.fieldFromJson_(element);
+      const field = this.fieldFromJson_(element);
       if (field) {
         fieldStack.push([field, element['name']]);
       }
@@ -1695,27 +1705,30 @@ Blockly.Block.prototype.interpolate_ = function(message, args, lastDummyAlign,
  * @param {number} argsCount The number of args that need to be referred to.
  * @private
  */
-Blockly.Block.prototype.validateTokens_ = function(tokens, argsCount) {
-  var visitedArgsHash = [];
-  var visitedArgsCount = 0;
-  for (var i = 0; i < tokens.length; i++) {
-    var token = tokens[i];
+Block.prototype.validateTokens_ = function(tokens, argsCount) {
+  const visitedArgsHash = [];
+  let visitedArgsCount = 0;
+  for (let i = 0; i < tokens.length; i++) {
+    const token = tokens[i];
     if (typeof token != 'number') {
       continue;
     }
     if (token < 1 || token > argsCount) {
-      throw Error('Block "' + this.type + '": ' +
+      throw Error(
+          'Block "' + this.type + '": ' +
           'Message index %' + token + ' out of range.');
     }
     if (visitedArgsHash[token]) {
-      throw Error('Block "' + this.type + '": ' +
+      throw Error(
+          'Block "' + this.type + '": ' +
           'Message index %' + token + ' duplicated.');
     }
     visitedArgsHash[token] = true;
     visitedArgsCount++;
   }
   if (visitedArgsCount != argsCount) {
-    throw Error('Block "' + this.type + '": ' +
+    throw Error(
+        'Block "' + this.type + '": ' +
         'Message does not reference all ' + argsCount + ' arg(s).');
   }
 };
@@ -1732,35 +1745,34 @@ Blockly.Block.prototype.validateTokens_ = function(tokens, argsCount) {
  *     to the block.
  * @private
  */
-Blockly.Block.prototype.interpolateArguments_ =
-    function(tokens, args, lastDummyAlign) {
-      var elements = [];
-      for (var i = 0; i < tokens.length; i++) {
-        var element = tokens[i];
-        if (typeof element == 'number') {
-          element = args[element - 1];
-        }
-        // Args can be strings, which is why this isn't elseif.
-        if (typeof element == 'string') {
-          element = this.stringToFieldJson_(element);
-          if (!element) {
-            continue;
-          }
-        }
-        elements.push(element);
+Block.prototype.interpolateArguments_ = function(tokens, args, lastDummyAlign) {
+  const elements = [];
+  for (let i = 0; i < tokens.length; i++) {
+    let element = tokens[i];
+    if (typeof element == 'number') {
+      element = args[element - 1];
+    }
+    // Args can be strings, which is why this isn't elseif.
+    if (typeof element == 'string') {
+      element = this.stringToFieldJson_(element);
+      if (!element) {
+        continue;
       }
+    }
+    elements.push(element);
+  }
 
-      var length = elements.length;
-      if (length && !this.isInputKeyword_(elements[length - 1]['type'])) {
-        var dummyInput = {'type': 'input_dummy'};
-        if (lastDummyAlign) {
-          dummyInput['align'] = lastDummyAlign;
-        }
-        elements.push(dummyInput);
-      }
+  const length = elements.length;
+  if (length && !this.isInputKeyword_(elements[length - 1]['type'])) {
+    const dummyInput = {'type': 'input_dummy'};
+    if (lastDummyAlign) {
+      dummyInput['align'] = lastDummyAlign;
+    }
+    elements.push(dummyInput);
+  }
 
-      return elements;
-    };
+  return elements;
+};
 
 /**
  * Creates a field from the JSON definition of a field. If a field with the
@@ -1768,15 +1780,15 @@ Blockly.Block.prototype.interpolateArguments_ =
  * the 'alt' property of the JSON definition (if it exists).
  * @param {{alt:(string|undefined)}} element The element to try to turn into a
  *     field.
- * @return {?Blockly.Field} The field defined by the JSON, or null if one
+ * @return {?Field} The field defined by the JSON, or null if one
  *     couldn't be created.
  * @private
  */
-Blockly.Block.prototype.fieldFromJson_ = function(element) {
-  var field = Blockly.fieldRegistry.fromJson(element);
+Block.prototype.fieldFromJson_ = function(element) {
+  const field = fieldRegistry.fromJson(element);
   if (!field && element['alt']) {
     if (typeof element['alt'] == 'string') {
-      var json = this.stringToFieldJson_(element['alt']);
+      const json = this.stringToFieldJson_(element['alt']);
       return json ? this.fieldFromJson_(json) : null;
     }
     return this.fieldFromJson_(element['alt']);
@@ -1790,19 +1802,19 @@ Blockly.Block.prototype.fieldFromJson_ = function(element) {
  * @param {!Object} element The JSON to turn into an input.
  * @param {string} warningPrefix The prefix to add to warnings to help the
  *     developer debug.
- * @return {?Blockly.Input} The input that has been created, or null if one
+ * @return {?Input} The input that has been created, or null if one
  *     could not be created for some reason (should never happen).
  * @private
  */
-Blockly.Block.prototype.inputFromJson_ = function(element, warningPrefix) {
-  var alignmentLookup = {
-    'LEFT': Blockly.constants.ALIGN.LEFT,
-    'RIGHT': Blockly.constants.ALIGN.RIGHT,
-    'CENTRE': Blockly.constants.ALIGN.CENTRE,
-    'CENTER': Blockly.constants.ALIGN.CENTRE
+Block.prototype.inputFromJson_ = function(element, warningPrefix) {
+  const alignmentLookup = {
+    'LEFT': constants.ALIGN.LEFT,
+    'RIGHT': constants.ALIGN.RIGHT,
+    'CENTRE': constants.ALIGN.CENTRE,
+    'CENTER': constants.ALIGN.CENTRE
   };
 
-  var input = null;
+  let input = null;
   switch (element['type']) {
     case 'input_value':
       input = this.appendValueInput(element['name']);
@@ -1823,10 +1835,9 @@ Blockly.Block.prototype.inputFromJson_ = function(element, warningPrefix) {
     input.setCheck(element['check']);
   }
   if (element['align']) {
-    var alignment = alignmentLookup[element['align'].toUpperCase()];
+    const alignment = alignmentLookup[element['align'].toUpperCase()];
     if (alignment === undefined) {
-      console.warn(warningPrefix + 'Illegal align value: ',
-          element['align']);
+      console.warn(warningPrefix + 'Illegal align value: ', element['align']);
     } else {
       input.setAlign(alignment);
     }
@@ -1841,9 +1852,8 @@ Blockly.Block.prototype.inputFromJson_ = function(element, warningPrefix) {
  *     false otherwise.
  * @private
  */
-Blockly.Block.prototype.isInputKeyword_ = function(str) {
-  return str == 'input_value' ||
-      str == 'input_statement' ||
+Block.prototype.isInputKeyword_ = function(str) {
+  return str == 'input_value' || str == 'input_statement' ||
       str == 'input_dummy';
 };
 
@@ -1854,7 +1864,7 @@ Blockly.Block.prototype.isInputKeyword_ = function(str) {
  * @return {?{text: string, type: string}} The JSON definition or null.
  * @private
  */
-Blockly.Block.prototype.stringToFieldJson_ = function(str) {
+Block.prototype.stringToFieldJson_ = function(str) {
   str = str.trim();
   if (str) {
     return {
@@ -1870,19 +1880,18 @@ Blockly.Block.prototype.stringToFieldJson_ = function(str) {
  * @param {number} type One of Blockly.inputTypes.
  * @param {string} name Language-neutral identifier which may used to find this
  *     input again.  Should be unique to this block.
- * @return {!Blockly.Input} The input object created.
+ * @return {!Input} The input object created.
  * @protected
  */
-Blockly.Block.prototype.appendInput_ = function(type, name) {
-  var connection = null;
-  if (type == Blockly.inputTypes.VALUE ||
-      type == Blockly.inputTypes.STATEMENT) {
+Block.prototype.appendInput_ = function(type, name) {
+  let connection = null;
+  if (type == inputTypes.VALUE || type == inputTypes.STATEMENT) {
     connection = this.makeConnection_(type);
   }
-  if (type == Blockly.inputTypes.STATEMENT) {
+  if (type == inputTypes.STATEMENT) {
     this.statementInputCount++;
   }
-  var input = new Blockly.Input(type, name, this, connection);
+  const input = new Input(type, name, this, connection);
   // Append input to list.
   this.inputList.push(input);
   return input;
@@ -1894,14 +1903,14 @@ Blockly.Block.prototype.appendInput_ = function(type, name) {
  * @param {?string} refName Name of input that should be after the moved input,
  *   or null to be the input at the end.
  */
-Blockly.Block.prototype.moveInputBefore = function(name, refName) {
+Block.prototype.moveInputBefore = function(name, refName) {
   if (name == refName) {
     return;
   }
   // Find both inputs.
-  var inputIndex = -1;
-  var refIndex = refName ? -1 : this.inputList.length;
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+  let inputIndex = -1;
+  let refIndex = refName ? -1 : this.inputList.length;
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     if (input.name == name) {
       inputIndex = i;
       if (refIndex != -1) {
@@ -1928,8 +1937,7 @@ Blockly.Block.prototype.moveInputBefore = function(name, refName) {
  * @param {number} inputIndex Index of the input to move.
  * @param {number} refIndex Index of input that should be after the moved input.
  */
-Blockly.Block.prototype.moveNumberedInputBefore = function(
-    inputIndex, refIndex) {
+Block.prototype.moveNumberedInputBefore = function(inputIndex, refIndex) {
   // Validate arguments.
   if (inputIndex == refIndex) {
     throw Error('Can\'t move input to itself.');
@@ -1941,7 +1949,7 @@ Blockly.Block.prototype.moveNumberedInputBefore = function(
     throw RangeError('Reference input ' + refIndex + ' out of bounds.');
   }
   // Remove input.
-  var input = this.inputList[inputIndex];
+  const input = this.inputList[inputIndex];
   this.inputList.splice(inputIndex, 1);
   if (inputIndex < refIndex) {
     refIndex--;
@@ -1954,13 +1962,14 @@ Blockly.Block.prototype.moveNumberedInputBefore = function(
  * Remove an input from this block.
  * @param {string} name The name of the input.
  * @param {boolean=} opt_quiet True to prevent an error if input is not present.
- * @return {boolean} True if operation succeeds, false if input is not present and opt_quiet is true
+ * @return {boolean} True if operation succeeds, false if input is not present
+ *     and opt_quiet is true.
  * @throws {Error} if the input is not present and opt_quiet is not true.
  */
-Blockly.Block.prototype.removeInput = function(name, opt_quiet) {
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+Block.prototype.removeInput = function(name, opt_quiet) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     if (input.name == name) {
-      if (input.type == Blockly.inputTypes.STATEMENT) {
+      if (input.type == inputTypes.STATEMENT) {
         this.statementInputCount--;
       }
       input.dispose();
@@ -1977,10 +1986,10 @@ Blockly.Block.prototype.removeInput = function(name, opt_quiet) {
 /**
  * Fetches the named input object.
  * @param {string} name The name of the input.
- * @return {?Blockly.Input} The input object, or null if input does not exist.
+ * @return {?Input} The input object, or null if input does not exist.
  */
-Blockly.Block.prototype.getInput = function(name) {
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+Block.prototype.getInput = function(name) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     if (input.name == name) {
       return input;
     }
@@ -1992,11 +2001,11 @@ Blockly.Block.prototype.getInput = function(name) {
 /**
  * Fetches the block attached to the named input.
  * @param {string} name The name of the input.
- * @return {?Blockly.Block} The attached value block, or null if the input is
+ * @return {?Block} The attached value block, or null if the input is
  *     either disconnected or if the input does not exist.
  */
-Blockly.Block.prototype.getInputTargetBlock = function(name) {
-  var input = this.getInput(name);
+Block.prototype.getInputTargetBlock = function(name) {
+  const input = this.getInput(name);
   return input && input.connection && input.connection.targetBlock();
 };
 
@@ -2004,7 +2013,7 @@ Blockly.Block.prototype.getInputTargetBlock = function(name) {
  * Returns the comment on this block (or null if there is no comment).
  * @return {?string} Block's comment.
  */
-Blockly.Block.prototype.getCommentText = function() {
+Block.prototype.getCommentText = function() {
   return this.commentModel.text;
 };
 
@@ -2012,11 +2021,11 @@ Blockly.Block.prototype.getCommentText = function() {
  * Set this block's comment text.
  * @param {?string} text The text, or null to delete.
  */
-Blockly.Block.prototype.setCommentText = function(text) {
+Block.prototype.setCommentText = function(text) {
   if (this.commentModel.text == text) {
     return;
   }
-  Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CHANGE))(
+  Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
       this, 'comment', null, this.commentModel.text, text));
   this.commentModel.text = text;
   this.comment = text;  // For backwards compatibility.
@@ -2028,25 +2037,25 @@ Blockly.Block.prototype.setCommentText = function(text) {
  * @param {string=} _opt_id An optional ID for the warning text to be able to
  *     maintain multiple warnings.
  */
-Blockly.Block.prototype.setWarningText = function(_text, _opt_id) {
+Block.prototype.setWarningText = function(_text, _opt_id) {
   // NOP.
 };
 
 /**
  * Give this block a mutator dialog.
- * @param {Blockly.Mutator} _mutator A mutator dialog instance or null to
+ * @param {Mutator} _mutator A mutator dialog instance or null to
  *     remove.
  */
-Blockly.Block.prototype.setMutator = function(_mutator) {
+Block.prototype.setMutator = function(_mutator) {
   // NOP.
 };
 
 /**
  * Return the coordinates of the top-left corner of this block relative to the
  * drawing surface's origin (0,0), in workspace units.
- * @return {!Blockly.utils.Coordinate} Object with .x and .y properties.
+ * @return {!Coordinate} Object with .x and .y properties.
  */
-Blockly.Block.prototype.getRelativeToSurfaceXY = function() {
+Block.prototype.getRelativeToSurfaceXY = function() {
   return this.xy_;
 };
 
@@ -2055,24 +2064,24 @@ Blockly.Block.prototype.getRelativeToSurfaceXY = function() {
  * @param {number} dx Horizontal offset, in workspace units.
  * @param {number} dy Vertical offset, in workspace units.
  */
-Blockly.Block.prototype.moveBy = function(dx, dy) {
+Block.prototype.moveBy = function(dx, dy) {
   if (this.parentBlock_) {
     throw Error('Block has parent.');
   }
-  var event = new (Blockly.Events.get(Blockly.Events.BLOCK_MOVE))(this);
+  const event = new (Events.get(Events.BLOCK_MOVE))(this);
   this.xy_.translate(dx, dy);
   event.recordNew();
-  Blockly.Events.fire(event);
+  Events.fire(event);
 };
 
 /**
  * Create a connection of the specified type.
  * @param {number} type The type of the connection to create.
- * @return {!Blockly.Connection} A new connection of the specified type.
+ * @return {!Connection} A new connection of the specified type.
  * @protected
  */
-Blockly.Block.prototype.makeConnection_ = function(type) {
-  return new Blockly.Connection(this, type);
+Block.prototype.makeConnection_ = function(type) {
+  return new Connection(this, type);
 };
 
 /**
@@ -2082,7 +2091,7 @@ Blockly.Block.prototype.makeConnection_ = function(type) {
  *     whether shadow blocks are counted as filled. Defaults to true.
  * @return {boolean} True if all inputs are filled, false otherwise.
  */
-Blockly.Block.prototype.allInputsFilled = function(opt_shadowBlocksAreFilled) {
+Block.prototype.allInputsFilled = function(opt_shadowBlocksAreFilled) {
   // Account for the shadow block filledness toggle.
   if (opt_shadowBlocksAreFilled === undefined) {
     opt_shadowBlocksAreFilled = true;
@@ -2092,18 +2101,18 @@ Blockly.Block.prototype.allInputsFilled = function(opt_shadowBlocksAreFilled) {
   }
 
   // Recursively check each input block of the current block.
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     if (!input.connection) {
       continue;
     }
-    var target = input.connection.targetBlock();
+    const target = input.connection.targetBlock();
     if (!target || !target.allInputsFilled(opt_shadowBlocksAreFilled)) {
       return false;
     }
   }
 
   // Recursively check the next block after the current block.
-  var next = this.getNextBlock();
+  const next = this.getNextBlock();
   if (next) {
     return next.allInputsFilled(opt_shadowBlocksAreFilled);
   }
@@ -2117,13 +2126,15 @@ Blockly.Block.prototype.allInputsFilled = function(opt_shadowBlocksAreFilled) {
  *
  * Intended to on be used in console logs and errors. If you need a string that
  * uses the user's native language (including block text, field values, and
- * child blocks), use [toString()]{@link Blockly.Block#toString}.
+ * child blocks), use [toString()]{@link Block#toString}.
  * @return {string} The description.
  */
-Blockly.Block.prototype.toDevString = function() {
-  var msg = this.type ? '"' + this.type + '" block' : 'Block';
+Block.prototype.toDevString = function() {
+  let msg = this.type ? '"' + this.type + '" block' : 'Block';
   if (this.id) {
     msg += ' (id="' + this.id + '")';
   }
   return msg;
 };
+
+exports = Block;
diff --git a/tests/deps.js b/tests/deps.js
index ff7e2926e..641b435a5 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -7,7 +7,7 @@ goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'],
 goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator']);
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
-goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.IASTNodeLocation', 'Blockly.IDeletable', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.Workspace', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es5'});
+goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.IASTNodeLocation', 'Blockly.IDeletable', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});

From 7974ff51592ac2eea3f1ab7f2a50f257ef50b143 Mon Sep 17 00:00:00 2001
From: Monica Kozbial <6621618+moniika@users.noreply.github.com>
Date: Fri, 6 Aug 2021 15:46:21 -0700
Subject: [PATCH 553/833] Add labels instead of setting in github action
 (#5324)

Update `tag_module_cleanup.yml` logic to add labels instead of setting labels list.

Fixes: https://github.com/google/blockly/issues/5298
---
 .github/workflows/tag_module_cleanup.yml | 27 +++++++++++++-----------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/tag_module_cleanup.yml b/.github/workflows/tag_module_cleanup.yml
index 94e7ec692..0265070af 100644
--- a/.github/workflows/tag_module_cleanup.yml
+++ b/.github/workflows/tag_module_cleanup.yml
@@ -19,17 +19,20 @@ jobs:
       - uses: actions/github-script@a3e7071a34d7e1f219a8a4de9a5e0a34d1ee1293
         with:
           script: |
-            // 2021 q3 release milestone.
-            // https://github.com/google/blockly/milestone/18
-            const milestoneNumber = 18;
-            // Note that pull requests are accessed through the issues API.
-            const issuesUpdateParams = { 
-              owner: context.repo.owner, 
-              repo: context.repo.repo, 
-              // Adds the milestone
-              milestone: milestoneNumber, 
+            // Note that pull requests are considered issues and "shared"
+            // actions for both features, like manipulating labels and
+            // milestones are provided within the issues API.
+            await github.issues.update({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              // 2021 q3 release milestone.
+              // https://github.com/google/blockly/milestone/18
+              milestone: 18
+            })
+            await github.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
               issue_number: context.issue.number,
-              // Sets the labels
               labels: ['type: cleanup']
-            }
-            await github.issues.update(issuesUpdateParams)
+            })

From 0a9d7c3c79103c3e8f2bd2a9a3e7b8a2d3fa7881 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 3 Aug 2021 15:37:53 -0700
Subject: [PATCH 554/833] Migrate core/events/events_abstract.js to ES6
 const/let

---
 core/events/events_abstract.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/events/events_abstract.js b/core/events/events_abstract.js
index 719f6d937..67287121d 100644
--- a/core/events/events_abstract.js
+++ b/core/events/events_abstract.js
@@ -62,7 +62,7 @@ Blockly.Events.Abstract.prototype.isUiEvent = false;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.Abstract.prototype.toJson = function() {
-  var json = {
+  const json = {
     'type': this.type
   };
   if (this.group) {
@@ -103,8 +103,9 @@ Blockly.Events.Abstract.prototype.run = function(_forward) {
  * @protected
  */
 Blockly.Events.Abstract.prototype.getEventWorkspace_ = function() {
+  let workspace;
   if (this.workspaceId) {
-    var workspace = Blockly.Workspace.getById(this.workspaceId);
+    workspace = Blockly.Workspace.getById(this.workspaceId);
   }
   if (!workspace) {
     throw Error('Workspace is null. Event must have been generated from real' +

From bbc5ce4e89baad6a40d662deb91e4e96cbff229b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 3 Aug 2021 15:39:58 -0700
Subject: [PATCH 555/833] Migrate core/events/events_abstract.js to goog.module

---
 core/events/events_abstract.js | 22 ++++++++++++----------
 tests/deps.js                  |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/core/events/events_abstract.js b/core/events/events_abstract.js
index 67287121d..0b4da07c2 100644
--- a/core/events/events_abstract.js
+++ b/core/events/events_abstract.js
@@ -11,10 +11,10 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.Abstract');
+goog.module('Blockly.Events.Abstract');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
-
 goog.requireType('Blockly.Workspace');
 
 
@@ -22,7 +22,7 @@ goog.requireType('Blockly.Workspace');
  * Abstract class for an event.
  * @constructor
  */
-Blockly.Events.Abstract = function() {
+const Abstract = function() {
 
   /**
    * Whether or not the event is blank (to be populated by fromJson).
@@ -55,13 +55,13 @@ Blockly.Events.Abstract = function() {
  * Whether or not the event is a UI event.
  * @type {boolean}
  */
-Blockly.Events.Abstract.prototype.isUiEvent = false;
+Abstract.prototype.isUiEvent = false;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.Abstract.prototype.toJson = function() {
+Abstract.prototype.toJson = function() {
   const json = {
     'type': this.type
   };
@@ -75,7 +75,7 @@ Blockly.Events.Abstract.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.Abstract.prototype.fromJson = function(json) {
+Abstract.prototype.fromJson = function(json) {
   this.isBlank = false;
   this.group = json['group'];
 };
@@ -84,7 +84,7 @@ Blockly.Events.Abstract.prototype.fromJson = function(json) {
  * Does this event record any change of state?
  * @return {boolean} True if null, false if something changed.
  */
-Blockly.Events.Abstract.prototype.isNull = function() {
+Abstract.prototype.isNull = function() {
   return false;
 };
 
@@ -92,7 +92,7 @@ Blockly.Events.Abstract.prototype.isNull = function() {
  * Run an event.
  * @param {boolean} _forward True if run forward, false if run backward (undo).
  */
-Blockly.Events.Abstract.prototype.run = function(_forward) {
+Abstract.prototype.run = function(_forward) {
   // Defined by subclasses.
 };
 
@@ -102,10 +102,10 @@ Blockly.Events.Abstract.prototype.run = function(_forward) {
  * @throws {Error} if workspace is null.
  * @protected
  */
-Blockly.Events.Abstract.prototype.getEventWorkspace_ = function() {
+Abstract.prototype.getEventWorkspace_ = function() {
   let workspace;
   if (this.workspaceId) {
-    workspace = Blockly.Workspace.getById(this.workspaceId);
+    workspace = goog.module.get('Blockly.Workspace').getById(this.workspaceId);
   }
   if (!workspace) {
     throw Error('Workspace is null. Event must have been generated from real' +
@@ -113,3 +113,5 @@ Blockly.Events.Abstract.prototype.getEventWorkspace_ = function() {
   }
   return workspace;
 };
+
+exports = Abstract;
diff --git a/tests/deps.js b/tests/deps.js
index 641b435a5..9a432a8ee 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -36,7 +36,7 @@ goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockl
 goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style']);
 goog.addDependency('../../core/events/block_events.js', ['Blockly.Events.BlockBase', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Events.Change', 'Blockly.Events.Create', 'Blockly.Events.Delete', 'Blockly.Events.Move'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils']);
-goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events']);
+goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 9fdc8bab151b9bc439f533f1760b621f8b714b5a Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 14:55:32 -0700
Subject: [PATCH 556/833] Migrate core/events/events_abstract.js named requires

---
 core/events/events_abstract.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/events/events_abstract.js b/core/events/events_abstract.js
index 0b4da07c2..315ae3014 100644
--- a/core/events/events_abstract.js
+++ b/core/events/events_abstract.js
@@ -14,8 +14,9 @@
 goog.module('Blockly.Events.Abstract');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.requireType('Blockly.Workspace');
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
 
 
 /**
@@ -42,13 +43,13 @@ const Abstract = function() {
    * perspective, and should be undone together.
    * @type {string}
    */
-  this.group = Blockly.Events.getGroup();
+  this.group = Events.getGroup();
 
   /**
    * Sets whether the event should be added to the undo stack.
    * @type {boolean}
    */
-  this.recordUndo = Blockly.Events.recordUndo;
+  this.recordUndo = Events.recordUndo;
 };
 
 /**
@@ -98,7 +99,7 @@ Abstract.prototype.run = function(_forward) {
 
 /**
  * Get workspace the event belongs to.
- * @return {!Blockly.Workspace} The workspace the event belongs to.
+ * @return {!Workspace} The workspace the event belongs to.
  * @throws {Error} if workspace is null.
  * @protected
  */

From 50a99ce5155670453568c77b422d157398575c7f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 14:55:38 -0700
Subject: [PATCH 557/833] clang-format core/events/events_abstract.js

---
 core/events/events_abstract.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/events/events_abstract.js b/core/events/events_abstract.js
index 315ae3014..9a14e82b2 100644
--- a/core/events/events_abstract.js
+++ b/core/events/events_abstract.js
@@ -24,7 +24,6 @@ const Workspace = goog.requireType('Blockly.Workspace');
  * @constructor
  */
 const Abstract = function() {
-
   /**
    * Whether or not the event is blank (to be populated by fromJson).
    * @type {?boolean}
@@ -63,9 +62,7 @@ Abstract.prototype.isUiEvent = false;
  * @return {!Object} JSON representation.
  */
 Abstract.prototype.toJson = function() {
-  const json = {
-    'type': this.type
-  };
+  const json = {'type': this.type};
   if (this.group) {
     json['group'] = this.group;
   }
@@ -109,7 +106,8 @@ Abstract.prototype.getEventWorkspace_ = function() {
     workspace = goog.module.get('Blockly.Workspace').getById(this.workspaceId);
   }
   if (!workspace) {
-    throw Error('Workspace is null. Event must have been generated from real' +
+    throw Error(
+        'Workspace is null. Event must have been generated from real' +
         ' Blockly events.');
   }
   return workspace;

From b834d9026b17886f862418181983965db5879b19 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 09:35:12 -0700
Subject: [PATCH 558/833] Add requireType calls for Blockly.WorkspaceComment
 and Blockly.WorkspaceCommentSvg

---
 core/bubble_dragger.js           |  4 ++-
 core/contextmenu.js              | 17 +++++----
 core/events/ws_comment_events.js |  4 ++-
 core/inject.js                   |  5 ++-
 core/workspace.js                |  3 +-
 core/workspace_comment.js        | 15 +++++---
 core/workspace_comment_svg.js    | 61 ++++++++++++--------------------
 core/workspace_svg.js            |  6 ++--
 core/xml.js                      | 16 ++++++---
 tests/deps.js                    |  2 +-
 10 files changed, 71 insertions(+), 62 deletions(-)

diff --git a/core/bubble_dragger.js b/core/bubble_dragger.js
index d06c2fdc0..d879e4748 100644
--- a/core/bubble_dragger.js
+++ b/core/bubble_dragger.js
@@ -25,6 +25,8 @@ 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 utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
@@ -236,7 +238,7 @@ BubbleDragger.prototype.fireMoveEvent_ = function() {
   if (this.draggingBubble_.isComment) {
     // TODO (adodson): Resolve build errors when requiring WorkspaceCommentSvg.
     const event = new (Events.get(Events.COMMENT_MOVE))(
-        /** @type {!Blockly.WorkspaceCommentSvg} */ (this.draggingBubble_));
+        /** @type {!WorkspaceCommentSvg} */ (this.draggingBubble_));
     event.setOldCoordinate(this.startXY_);
     event.recordNew();
     Events.fire(event);
diff --git a/core/contextmenu.js b/core/contextmenu.js
index 39d4a8319..cc02adc25 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -33,6 +33,8 @@ const dom = goog.require('Blockly.utils.dom');
 const internalConstants = goog.require('Blockly.internalConstants');
 const userAgent = goog.require('Blockly.utils.userAgent');
 const utils = goog.require('Blockly.utils');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceCommentSvg = goog.requireType('Blockly.WorkspaceCommentSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
 
@@ -242,7 +244,7 @@ exports.callbackFactory = callbackFactory;
 
 /**
  * Make a context menu option for deleting the current workspace comment.
- * @param {!Blockly.WorkspaceCommentSvg} comment The workspace comment where the
+ * @param {!WorkspaceCommentSvg} comment The workspace comment where the
  *     right-click originated.
  * @return {!Object} A menu option, containing text, enabled, and a callback.
  */
@@ -252,7 +254,7 @@ const commentDeleteOption = function(comment) {
     enabled: true,
     callback: function() {
       Events.setGroup(true);
-      comment.dispose(true, true);
+      comment.dispose();
       Events.setGroup(false);
     }
   };
@@ -263,7 +265,7 @@ exports.commentDeleteOption = commentDeleteOption;
 
 /**
  * Make a context menu option for duplicating the current workspace comment.
- * @param {!Blockly.WorkspaceCommentSvg} comment The workspace comment where the
+ * @param {!WorkspaceCommentSvg} comment The workspace comment where the
  *     right-click originated.
  * @return {!Object} A menu option, containing text, enabled, and a callback.
  */
@@ -291,16 +293,17 @@ exports.commentDuplicateOption = commentDuplicateOption;
  *     comments are not bundled in.
  */
 const workspaceCommentOption = function(ws, e) {
-  if (!Blockly.WorkspaceCommentSvg) {
+  const WorkspaceCommentSvg = goog.module.get('Blockly.WorkspaceCommentSvg');
+  if (!WorkspaceCommentSvg) {
     throw Error('Missing require for Blockly.WorkspaceCommentSvg');
   }
   // Helper function to create and position a comment correctly based on the
   // location of the mouse event.
   const addWsComment = function() {
-    const comment = new Blockly.WorkspaceCommentSvg(
+    const comment = new WorkspaceCommentSvg(
         ws, Msg['WORKSPACE_COMMENT_DEFAULT_TEXT'],
-        Blockly.WorkspaceCommentSvg.DEFAULT_SIZE,
-        Blockly.WorkspaceCommentSvg.DEFAULT_SIZE);
+        WorkspaceCommentSvg.DEFAULT_SIZE,
+        WorkspaceCommentSvg.DEFAULT_SIZE);
 
     const injectionDiv = ws.getInjectionDiv();
     // Bounding rect coordinates are in client coordinates, meaning that they
diff --git a/core/events/ws_comment_events.js b/core/events/ws_comment_events.js
index a77c36428..e54441ec7 100644
--- a/core/events/ws_comment_events.js
+++ b/core/events/ws_comment_events.js
@@ -24,6 +24,8 @@ goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.xml');
 goog.require('Blockly.Xml');
 
+goog.requireType('Blockly.WorkspaceComment');
+
 
 /**
  * Abstract class for a comment event.
@@ -232,7 +234,7 @@ Blockly.Events.CommentCreateDeleteHelper = function(event, create) {
   } else {
     var comment = workspace.getCommentById(event.commentId);
     if (comment) {
-      comment.dispose(false, false);
+      comment.dispose();
     } else {
       // Only complain about root-level block.
       console.warn("Can't uncreate non-existent comment: " + event.commentId);
diff --git a/core/inject.js b/core/inject.js
index a1bdffbe1..62be9633e 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -36,6 +36,7 @@ goog.require('Blockly.WidgetDiv');
 
 goog.requireType('Blockly.BlocklyOptions');
 goog.requireType('Blockly.BlockSvg');
+goog.requireType('Blockly.WorkspaceCommentSvg');
 
 
 /**
@@ -215,7 +216,9 @@ Blockly.extractObjectFromEvent_ = function(workspace, e) {
       break;
     case Blockly.Events.COMMENT_CREATE:
     case Blockly.Events.COMMENT_MOVE:
-      object = workspace.getCommentById(e.commentId);
+      object = (
+          /** @type {?Blockly.WorkspaceCommentSvg} */
+          (workspace.getCommentById(e.commentId)));
       break;
   }
   return object;
diff --git a/core/workspace.js b/core/workspace.js
index 4c35f5b83..296989d81 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -29,6 +29,7 @@ goog.requireType('Blockly.Events.Abstract');
 goog.requireType('Blockly.IConnectionChecker');
 goog.requireType('Blockly.utils.toolbox');
 goog.requireType('Blockly.VariableModel');
+goog.requireType('Blockly.WorkspaceComment');
 
 
 /**
@@ -369,7 +370,7 @@ Blockly.Workspace.prototype.clear = function() {
       this.topBlocks_[0].dispose(false);
     }
     while (this.topComments_.length) {
-      this.topComments_[this.topComments_.length - 1].dispose(false);
+      this.topComments_[this.topComments_.length - 1].dispose();
     }
     if (!existingGroup) {
       Blockly.Events.setGroup(false);
diff --git a/core/workspace_comment.js b/core/workspace_comment.js
index 8d9009f94..e7660e44b 100644
--- a/core/workspace_comment.js
+++ b/core/workspace_comment.js
@@ -57,14 +57,14 @@ const WorkspaceComment = function(workspace, content, height, width, opt_id) {
   /**
    * The comment's height in workspace units.  Scale does not change this value.
    * @type {number}
-   * @private
+   * @protected
    */
   this.height_ = height;
 
   /**
    * The comment's width in workspace units.  Scale does not change this value.
    * @type {number}
-   * @private
+   * @protected
    */
   this.width_ = width;
 
@@ -103,6 +103,12 @@ const WorkspaceComment = function(workspace, content, height, width, opt_id) {
    */
   this.content_ = content;
 
+  /**
+   * @protected
+   * @type {boolean}
+   */
+  this.disposed_ = false;
+
   /**
    * @package
    * @type {boolean}
@@ -117,8 +123,7 @@ const WorkspaceComment = function(workspace, content, height, width, opt_id) {
  * @package
  */
 WorkspaceComment.prototype.dispose = function() {
-  if (!this.workspace) {
-    // The comment has already been deleted.
+  if (this.disposed_) {
     return;
   }
 
@@ -128,7 +133,7 @@ WorkspaceComment.prototype.dispose = function() {
 
   // Remove from the list of top comments and the comment database.
   this.workspace.removeTopComment(this);
-  this.workspace = null;
+  this.disposed_ = true;
 };
 
 // Height, width, x, and y are all stored on even non-rendered comments, to
diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 77e8c713d..5702cc14c 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -30,7 +30,7 @@ const Rect = goog.require('Blockly.utils.Rect');
 const Svg = goog.require('Blockly.utils.Svg');
 const Touch = goog.require('Blockly.Touch');
 /* eslint-disable-next-line no-unused-vars */
-const Workspace = goog.requireType('Blockly.Workspace');
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const WorkspaceComment = goog.require('Blockly.WorkspaceComment');
 const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
@@ -69,7 +69,7 @@ const TEXTAREA_OFFSET = 2;
 
 /**
  * Class for a workspace comment's SVG representation.
- * @param {!Workspace} workspace The block's workspace.
+ * @param {!WorkspaceSvg} workspace The block's workspace.
  * @param {string} content The content of this workspace comment.
  * @param {number} height Height of the comment.
  * @param {number} width Width of the comment.
@@ -83,6 +83,11 @@ const TEXTAREA_OFFSET = 2;
  */
 const WorkspaceCommentSvg = function(
     workspace, content, height, width, opt_id) {
+  /**
+   * @type {!WorkspaceSvg}
+   */
+  this.workspace;
+
   /**
    * Mouse up event data.
    * @type {?browserEvents.Data}
@@ -128,7 +133,7 @@ const WorkspaceCommentSvg = function(
    * @type {boolean}
    * @private
    */
-  this.useDragSurface_ = utils.is3dSupported() && !!workspace.blockDragSurface_;
+  this.useDragSurface_ = utils.is3dSupported() && !!workspace.getBlockDragSurface();
 
   WorkspaceCommentSvg.superClass_.constructor.call(
       this, workspace, content, height, width, opt_id);
@@ -158,8 +163,7 @@ WorkspaceCommentSvg.TOP_OFFSET = 10;
  * @package
  */
 WorkspaceCommentSvg.prototype.dispose = function() {
-  if (!this.workspace) {
-    // The comment has already been deleted.
+  if (this.disposed_) {
     return;
   }
   // If this comment is being dragged, unlink the mouse events.
@@ -173,9 +177,6 @@ WorkspaceCommentSvg.prototype.dispose = function() {
   }
 
   dom.removeNode(this.svgGroup_);
-  // Sever JavaScript to DOM connections.
-  this.svgGroup_ = null;
-  this.svgRect_ = null;
   // Dispose of any rendered components
   this.disposeInternal_();
 
@@ -343,21 +344,21 @@ WorkspaceCommentSvg.prototype.getRelativeToSurfaceXY = function() {
   let y = 0;
 
   const dragSurfaceGroup =
-      this.useDragSurface_ ? this.workspace.blockDragSurface_.getGroup() : null;
+      this.useDragSurface_ ? this.workspace.getBlockDragSurface().getGroup() : null;
 
   let element = this.getSvgRoot();
   if (element) {
     do {
       // Loop through this comment and every parent.
-      const xy = utils.getRelativeXY(element);
+      const xy = utils.getRelativeXY(/** @type {!Element} */ (element));
       x += xy.x;
       y += xy.y;
       // If this element is the current element on the drag surface, include
       // the translation of the drag surface itself.
       if (this.useDragSurface_ &&
-          this.workspace.blockDragSurface_.getCurrentBlock() == element) {
+          this.workspace.getBlockDragSurface().getCurrentBlock() == element) {
         const surfaceTranslation =
-            this.workspace.blockDragSurface_.getSurfaceTranslation();
+            this.workspace.getBlockDragSurface().getSurfaceTranslation();
         x += surfaceTranslation.x;
         y += surfaceTranslation.y;
       }
@@ -414,26 +415,9 @@ WorkspaceCommentSvg.prototype.moveToDragSurface = function() {
   // This is in workspace coordinates.
   const xy = this.getRelativeToSurfaceXY();
   this.clearTransformAttributes_();
-  this.workspace.blockDragSurface_.translateSurface(xy.x, xy.y);
+  this.workspace.getBlockDragSurface().translateSurface(xy.x, xy.y);
   // Execute the move on the top-level SVG component
-  this.workspace.blockDragSurface_.setBlocksAndShow(this.getSvgRoot());
-};
-
-/**
- * Move this comment back to the workspace block canvas.
- * Generally should be called at the same time as setDragging(false).
- * Does nothing if useDragSurface_ is false.
- * @param {!Coordinate} newXY The position the comment should take
- *     on on the workspace canvas, in workspace coordinates.
- * @private
- */
-WorkspaceCommentSvg.prototype.moveOffDragSurface = function(newXY) {
-  if (!this.useDragSurface_) {
-    return;
-  }
-  // Translate to current position, turning off 3d.
-  this.translate(newXY.x, newXY.y);
-  this.workspace.blockDragSurface_.clearAndHide(this.workspace.getCanvas());
+  this.workspace.getBlockDragSurface().setBlocksAndShow(this.getSvgRoot());
 };
 
 /**
@@ -616,7 +600,7 @@ WorkspaceCommentSvg.prototype.setAutoLayout = function(_enable) {
 /**
  * Decode an XML comment tag and create a rendered comment on the workspace.
  * @param {!Element} xmlComment XML comment element.
- * @param {!Workspace} workspace The workspace.
+ * @param {!WorkspaceSvg} workspace The workspace.
  * @param {number=} opt_wsWidth The width of the workspace, which is used to
  *     position comments correctly in RTL.
  * @return {!WorkspaceCommentSvg} The created workspace comment.
@@ -632,7 +616,7 @@ WorkspaceCommentSvg.fromXml = function(xmlComment, workspace, opt_wsWidth) {
         workspace, info.content, info.h, info.w, info.id);
     if (workspace.rendered) {
       comment.initSvg(true);
-      comment.render(false);
+      comment.render();
     }
     // Position the comment correctly, taking into account the width of a
     // rendered RTL workspace.
@@ -647,9 +631,10 @@ WorkspaceCommentSvg.fromXml = function(xmlComment, workspace, opt_wsWidth) {
   } finally {
     Events.enable();
   }
-  WorkspaceComment.fireCreateEvent(comment);
 
-  return comment;
+  WorkspaceComment.fireCreateEvent(
+      /** @type {!WorkspaceCommentSvg} */ (comment));
+  return (/** @type {!WorkspaceCommentSvg} */ (comment));
 };
 
 /**
@@ -921,7 +906,7 @@ WorkspaceCommentSvg.prototype.deleteMouseOut_ = function(_e) {
  */
 WorkspaceCommentSvg.prototype.deleteMouseUp_ = function(e) {
   // Delete this comment.
-  this.dispose(true, true);
+  this.dispose();
   // This event has been handled.  No need to bubble up to the document.
   e.stopPropagation();
 };
@@ -943,10 +928,10 @@ WorkspaceCommentSvg.prototype.unbindDragEvents_ = function() {
 
 /**
  * Handle a mouse-up event while dragging a comment's border or resize handle.
- * @param {!Event} e Mouse up event.
+ * @param {!Event} _e Mouse up event.
  * @private
  */
-WorkspaceCommentSvg.prototype.resizeMouseUp_ = function(/* e */) {
+WorkspaceCommentSvg.prototype.resizeMouseUp_ = function(_e) {
   Touch.clearTouchIdentifier();
   this.unbindDragEvents_();
 };
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index e4aa50229..e979e8f51 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -71,6 +71,8 @@ goog.requireType('Blockly.ScrollbarPair');
 goog.requireType('Blockly.Theme');
 goog.requireType('Blockly.Trashcan');
 goog.requireType('Blockly.VariableModel');
+goog.requireType('Blockly.WorkspaceCommentSvg');
+goog.requireType('Blockly.WorkspaceComment');
 goog.requireType('Blockly.ZoomControls');
 
 
@@ -1565,7 +1567,7 @@ Blockly.WorkspaceSvg.prototype.pasteBlock_ = function(xmlBlock) {
 Blockly.WorkspaceSvg.prototype.pasteWorkspaceComment_ = function(xmlComment) {
   Blockly.Events.disable();
   try {
-    var comment = Blockly.WorkspaceCommentSvg.fromXml(xmlComment, this);
+    var comment = goog.module.get('Blockly.WorkspaceCommentSvg').fromXml(xmlComment, this);
     // Move the duplicate to original position.
     var commentX = parseInt(xmlComment.getAttribute('x'), 10);
     var commentY = parseInt(xmlComment.getAttribute('y'), 10);
@@ -1584,7 +1586,7 @@ Blockly.WorkspaceSvg.prototype.pasteWorkspaceComment_ = function(xmlComment) {
     Blockly.Events.enable();
   }
   if (Blockly.Events.isEnabled()) {
-    Blockly.WorkspaceComment.fireCreateEvent(comment);
+    goog.module.get('Blockly.WorkspaceComment').fireCreateEvent(comment);
   }
   comment.select();
 };
diff --git a/core/xml.js b/core/xml.js
index e581bfd01..b32489f0f 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -28,6 +28,8 @@ goog.requireType('Blockly.Connection');
 goog.requireType('Blockly.Field');
 goog.requireType('Blockly.VariableModel');
 goog.requireType('Blockly.Workspace');
+goog.requireType('Blockly.WorkspaceComment');
+goog.requireType('Blockly.WorkspaceCommentSvg');
 
 
 /**
@@ -440,19 +442,23 @@ Blockly.Xml.domToWorkspace = function(xml, workspace) {
         throw TypeError('Shadow block cannot be a top-level block.');
       } else if (name == 'comment') {
         if (workspace.rendered) {
-          if (!Blockly.WorkspaceCommentSvg) {
+          const WorkspaceCommentSvg =
+              goog.module.get('Blockly.WorkspaceCommentSvg');
+          if (!WorkspaceCommentSvg) {
             console.warn('Missing require for Blockly.WorkspaceCommentSvg, ' +
                 'ignoring workspace comment.');
           } else {
-            Blockly.WorkspaceCommentSvg.fromXml(
-                xmlChildElement, workspace, width);
+            WorkspaceCommentSvg.fromXml(
+                xmlChildElement,
+                /** @type {!Blockly.WorkspaceSvg} */ (workspace), width);
           }
         } else {
-          if (!Blockly.WorkspaceComment) {
+          const WorkspaceComment = goog.module.get('Blockly.WorkspaceComment');
+          if (!WorkspaceComment) {
             console.warn('Missing require for Blockly.WorkspaceComment, ' +
                 'ignoring workspace comment.');
           } else {
-            Blockly.WorkspaceComment.fromXml(xmlChildElement, workspace);
+            WorkspaceComment.fromXml(xmlChildElement, workspace);
           }
         }
       } else if (name == 'variables') {
diff --git a/tests/deps.js b/tests/deps.js
index 9a432a8ee..a54d2acc2 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -212,7 +212,7 @@ goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCom
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
-goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
+goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6'});
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);
 

From b636c79ac03923ca457928902caefe0924c7bca7 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 6 Aug 2021 18:00:35 -0700
Subject: [PATCH 559/833] Add description and reorder requires

---
 core/workspace_comment.js | 1 +
 core/workspace_svg.js     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/workspace_comment.js b/core/workspace_comment.js
index e7660e44b..78019bc80 100644
--- a/core/workspace_comment.js
+++ b/core/workspace_comment.js
@@ -104,6 +104,7 @@ const WorkspaceComment = function(workspace, content, height, width, opt_id) {
   this.content_ = content;
 
   /**
+   * Whether this comment has been disposed.
    * @protected
    * @type {boolean}
    */
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index e979e8f51..6def3fc5c 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -71,8 +71,8 @@ goog.requireType('Blockly.ScrollbarPair');
 goog.requireType('Blockly.Theme');
 goog.requireType('Blockly.Trashcan');
 goog.requireType('Blockly.VariableModel');
-goog.requireType('Blockly.WorkspaceCommentSvg');
 goog.requireType('Blockly.WorkspaceComment');
+goog.requireType('Blockly.WorkspaceCommentSvg');
 goog.requireType('Blockly.ZoomControls');
 
 

From 0ffdc6106d87c80628258b87a9fc75808be638de Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 9 Aug 2021 12:24:06 -0700
Subject: [PATCH 560/833] Migrate core/block_svg.js to goog.module syntax
 (#5323)

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

* Migrate core/block_svg.js to goog.module

* Migrate core/block_svg.js to named requires

* clang-format core/block_svg.js

* Migrate to goog.module.get for optional Comment/Warning in core/block_svg.js

* Lint changes in core/block_svg.js
---
 core/block_svg.js | 836 +++++++++++++++++++++++-----------------------
 tests/deps.js     |   2 +-
 2 files changed, 420 insertions(+), 418 deletions(-)

diff --git a/core/block_svg.js b/core/block_svg.js
index fbd3dd5dc..027b0c71b 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -10,93 +10,110 @@
  */
 'use strict';
 
-goog.provide('Blockly.BlockSvg');
+goog.module('Blockly.BlockSvg');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.ASTNode');
-goog.require('Blockly.Block');
-goog.require('Blockly.blockAnimations');
-goog.require('Blockly.blockRendering.IPathObject');
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.common');
-goog.require('Blockly.connectionTypes');
-goog.require('Blockly.constants');
-goog.require('Blockly.ContextMenu');
-goog.require('Blockly.ContextMenuRegistry');
-goog.require('Blockly.Events');
+const ASTNode = goog.require('Blockly.ASTNode');
+const Block = goog.require('Blockly.Block');
+/* 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');
+const Events = goog.require('Blockly.Events');
+/* 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.require('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');
+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');
+/* 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 Xml = goog.require('Blockly.Xml');
+const blockAnimations = goog.require('Blockly.blockAnimations');
+const browserEvents = goog.require('Blockly.browserEvents');
+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 dom = goog.require('Blockly.utils.dom');
+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');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockMove');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.Selected');
-goog.require('Blockly.IASTNodeLocationSvg');
-goog.require('Blockly.IBoundedElement');
-goog.require('Blockly.ICopyable');
-goog.require('Blockly.IDraggable');
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.Msg');
-goog.require('Blockly.RenderedConnection');
-goog.require('Blockly.TabNavigateCursor');
-goog.require('Blockly.Tooltip');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Touch');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.deprecation');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Rect');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.userAgent');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.blockRendering.Debug');
-goog.requireType('Blockly.Comment');
-goog.requireType('Blockly.Connection');
-goog.requireType('Blockly.Field');
-goog.requireType('Blockly.Input');
-goog.requireType('Blockly.Mutator');
-goog.requireType('Blockly.Theme');
-goog.requireType('Blockly.Warning');
-goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
  * Class for a block's SVG representation.
  * Not normally called directly, workspace.newBlock() is preferred.
- * @param {!Blockly.WorkspaceSvg} workspace The block's workspace.
+ * @param {!WorkspaceSvg} workspace The block's workspace.
  * @param {?string} prototypeName Name of the language object containing
  *     type-specific functions for this block.
  * @param {string=} opt_id Optional ID.  Use this ID if provided, otherwise
  *     create a new ID.
- * @extends {Blockly.Block}
- * @implements {Blockly.IASTNodeLocationSvg}
- * @implements {Blockly.IBoundedElement}
- * @implements {Blockly.ICopyable}
- * @implements {Blockly.IDraggable}
+ * @extends {Block}
+ * @implements {IASTNodeLocationSvg}
+ * @implements {IBoundedElement}
+ * @implements {ICopyable}
+ * @implements {IDraggable}
  * @constructor
  */
-Blockly.BlockSvg = function(workspace, prototypeName, opt_id) {
+const BlockSvg = function(workspace, prototypeName, opt_id) {
   // Create core elements for the block.
   /**
    * @type {!SVGGElement}
    * @private
    */
-  this.svgGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G, {}, null);
+  this.svgGroup_ = dom.createSvgElement(Svg.G, {}, null);
   this.svgGroup_.translate_ = '';
 
   /**
    * A block style object.
-   * @type {!Blockly.Theme.BlockStyle}
+   * @type {!Theme.BlockStyle}
    */
   this.style = workspace.getRenderer().getConstants().getBlockStyle(null);
 
   /**
    * The renderer's path object.
-   * @type {Blockly.blockRendering.IPathObject}
+   * @type {IPathObject}
    * @package
    */
-  this.pathObject = workspace.getRenderer().makePathObject(
-      this.svgGroup_, this.style);
+  this.pathObject =
+      workspace.getRenderer().makePathObject(this.svgGroup_, this.style);
 
   /** @type {boolean} */
   this.rendered = false;
@@ -109,14 +126,14 @@ Blockly.BlockSvg = function(workspace, prototypeName, opt_id) {
   this.renderIsInProgress_ = false;
 
 
-  /** @type {!Blockly.WorkspaceSvg} */
+  /** @type {!WorkspaceSvg} */
   this.workspace = workspace;
 
-  /** @type {Blockly.RenderedConnection} */
+  /** @type {RenderedConnection} */
   this.outputConnection = null;
-  /** @type {Blockly.RenderedConnection} */
+  /** @type {RenderedConnection} */
   this.nextConnection = null;
-  /** @type {Blockly.RenderedConnection} */
+  /** @type {RenderedConnection} */
   this.previousConnection = null;
 
   /**
@@ -126,36 +143,35 @@ Blockly.BlockSvg = function(workspace, prototypeName, opt_id) {
    * @private
    */
   this.useDragSurface_ =
-      Blockly.utils.is3dSupported() && !!workspace.getBlockDragSurface();
+      utils.is3dSupported() && !!workspace.getBlockDragSurface();
 
-  var svgPath = this.pathObject.svgPath;
+  const svgPath = this.pathObject.svgPath;
   svgPath.tooltip = this;
-  Blockly.Tooltip.bindMouseEvents(svgPath);
-  Blockly.BlockSvg.superClass_.constructor.call(this,
-      workspace, prototypeName, opt_id);
+  Tooltip.bindMouseEvents(svgPath);
+  BlockSvg.superClass_.constructor.call(this, workspace, prototypeName, opt_id);
 
   // Expose this block's ID on its top-level SVG group.
   if (this.svgGroup_.dataset) {
     this.svgGroup_.dataset['id'] = this.id;
-  } else if (Blockly.utils.userAgent.IE) {
+  } else if (userAgent.IE) {
     // SVGElement.dataset is not available on IE11, but data-* properties
     // can be set with setAttribute().
     this.svgGroup_.setAttribute('data-id', this.id);
   }
 };
-Blockly.utils.object.inherits(Blockly.BlockSvg, Blockly.Block);
+object.inherits(BlockSvg, Block);
 
 /**
  * Height of this block, not including any statement blocks above or below.
  * Height is in workspace units.
  */
-Blockly.BlockSvg.prototype.height = 0;
+BlockSvg.prototype.height = 0;
 
 /**
  * Width of this block, including any connected value blocks.
  * Width is in workspace units.
  */
-Blockly.BlockSvg.prototype.width = 0;
+BlockSvg.prototype.width = 0;
 
 /**
  * Map from IDs for warnings text to PIDs of functions to apply them.
@@ -163,14 +179,14 @@ Blockly.BlockSvg.prototype.width = 0;
  * @type {Object<string, number>}
  * @private
  */
-Blockly.BlockSvg.prototype.warningTextDb_ = null;
+BlockSvg.prototype.warningTextDb_ = null;
 
 /**
  * Constant for identifying rows that are to be rendered inline.
  * Don't collide with Blockly.inputTypes.
  * @const
  */
-Blockly.BlockSvg.INLINE = -1;
+BlockSvg.INLINE = -1;
 
 /**
  * ID to give the "collapsed warnings" warning. Allows us to remove the
@@ -179,7 +195,7 @@ Blockly.BlockSvg.INLINE = -1;
  * @type {string}
  * @const
  */
-Blockly.BlockSvg.COLLAPSED_WARNING_ID = 'TEMP_COLLAPSED_WARNING_';
+BlockSvg.COLLAPSED_WARNING_ID = 'TEMP_COLLAPSED_WARNING_';
 
 /**
  * An optional method called when a mutator dialog is first opened.
@@ -188,53 +204,52 @@ Blockly.BlockSvg.COLLAPSED_WARNING_ID = 'TEMP_COLLAPSED_WARNING_';
  * block with any sub-blocks which are appropriate. This method must also be
  * coupled with defining a `compose` method for the default mutation dialog
  * button and UI to appear.
- * @type {?function(Blockly.WorkspaceSvg):!Blockly.BlockSvg}
+ * @type {?function(WorkspaceSvg):!BlockSvg}
  */
-Blockly.BlockSvg.prototype.decompose;
+BlockSvg.prototype.decompose;
 
 /**
  * An optional method called when a mutator dialog saves its content.
  * This function is called to modify the original block according to new
  * settings. This method must also be coupled with defining a `decompose`
  * method for the default mutation dialog button and UI to appear.
- * @type {?function(!Blockly.BlockSvg)}
+ * @type {?function(!BlockSvg)}
  */
-Blockly.BlockSvg.prototype.compose;
+BlockSvg.prototype.compose;
 
 /**
  * An optional method for defining custom block context menu items.
  * @type {?function(!Array<!Object>)}
  */
-Blockly.BlockSvg.prototype.customContextMenu;
+BlockSvg.prototype.customContextMenu;
 
 /**
  * An property used internally to reference the block's rendering debugger.
- * @type {?Blockly.blockRendering.Debug}
+ * @type {?BlockRenderingDebug}
  * @package
  */
-Blockly.BlockSvg.prototype.renderingDebugger;
+BlockSvg.prototype.renderingDebugger;
 
 /**
  * Create and initialize the SVG representation of the block.
  * May be called more than once.
  */
-Blockly.BlockSvg.prototype.initSvg = function() {
+BlockSvg.prototype.initSvg = function() {
   if (!this.workspace.rendered) {
     throw TypeError('Workspace is headless.');
   }
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     input.init();
   }
-  var icons = this.getIcons();
-  for (var i = 0; i < icons.length; i++) {
+  const icons = this.getIcons();
+  for (let i = 0; i < icons.length; i++) {
     icons[i].createIcon();
   }
   this.applyColour();
   this.pathObject.updateMovable(this.isMovable());
-  var svg = this.getSvgRoot();
+  const svg = this.getSvgRoot();
   if (!this.workspace.options.readOnly && !this.eventsInit_ && svg) {
-    Blockly.browserEvents.conditionalBind(
-        svg, 'mousedown', this, this.onMouseDown_);
+    browserEvents.conditionalBind(svg, 'mousedown', this, this.onMouseDown_);
   }
   this.eventsInit_ = true;
 
@@ -247,7 +262,7 @@ Blockly.BlockSvg.prototype.initSvg = function() {
  * Get the secondary colour of a block.
  * @return {?string} #RRGGBB string.
  */
-Blockly.BlockSvg.prototype.getColourSecondary = function() {
+BlockSvg.prototype.getColourSecondary = function() {
   return this.style.colourSecondary;
 };
 
@@ -255,7 +270,7 @@ Blockly.BlockSvg.prototype.getColourSecondary = function() {
  * Get the tertiary colour of a block.
  * @return {?string} #RRGGBB string.
  */
-Blockly.BlockSvg.prototype.getColourTertiary = function() {
+BlockSvg.prototype.getColourTertiary = function() {
   return this.style.colourTertiary;
 };
 
@@ -264,11 +279,9 @@ Blockly.BlockSvg.prototype.getColourTertiary = function() {
  * @return {?string} #RRGGBB string.
  * @deprecated Use style.colourSecondary. (2020 January 21)
  */
-Blockly.BlockSvg.prototype.getColourShadow = function() {
-  Blockly.utils.deprecation.warn(
-      'BlockSvg.prototype.getColourShadow',
-      'January 2020',
-      'January 2021',
+BlockSvg.prototype.getColourShadow = function() {
+  deprecation.warn(
+      'BlockSvg.prototype.getColourShadow', 'January 2020', 'January 2021',
       'style.colourSecondary');
   return this.getColourSecondary();
 };
@@ -282,25 +295,19 @@ Blockly.BlockSvg.prototype.getColourShadow = function() {
  *     attributes will be defined (#RRGGBB strings).
  * @deprecated Use style.colourTertiary. (2020 January 21)
  */
-Blockly.BlockSvg.prototype.getColourBorder = function() {
-  Blockly.utils.deprecation.warn(
-      'BlockSvg.prototype.getColourBorder',
-      'January 2020',
-      'January 2021',
+BlockSvg.prototype.getColourBorder = function() {
+  deprecation.warn(
+      'BlockSvg.prototype.getColourBorder', 'January 2020', 'January 2021',
       'style.colourTertiary');
-  var colourTertiary = this.getColourTertiary();
-  return {
-    colourBorder: colourTertiary,
-    colourLight: null,
-    colourDark: null
-  };
+  const colourTertiary = this.getColourTertiary();
+  return {colourBorder: colourTertiary, colourLight: null, colourDark: null};
 };
 
 /**
  * Selects this block. Highlights the block visually and fires a select event
  * if the block is not already selected.
  */
-Blockly.BlockSvg.prototype.select = function() {
+BlockSvg.prototype.select = function() {
   if (this.isShadow() && this.getParent()) {
     // Shadow blocks should not be selected.
     this.getParent().select();
@@ -309,20 +316,20 @@ Blockly.BlockSvg.prototype.select = function() {
   if (Blockly.selected == this) {
     return;
   }
-  var oldId = null;
+  let oldId = null;
   if (Blockly.selected) {
     oldId = Blockly.selected.id;
     // Unselect any previously selected block.
-    Blockly.Events.disable();
+    Events.disable();
     try {
       Blockly.selected.unselect();
     } finally {
-      Blockly.Events.enable();
+      Events.enable();
     }
   }
-  var event = new (Blockly.Events.get(Blockly.Events.SELECTED))(oldId, this.id,
-      this.workspace.id);
-  Blockly.Events.fire(event);
+  const event =
+      new (Events.get(Events.SELECTED))(oldId, this.id, this.workspace.id);
+  Events.fire(event);
   Blockly.selected = this;
   this.addSelect();
 };
@@ -331,50 +338,50 @@ Blockly.BlockSvg.prototype.select = function() {
  * Unselects this block. Unhighlights the block and fires a select (false) event
  * if the block is currently selected.
  */
-Blockly.BlockSvg.prototype.unselect = function() {
+BlockSvg.prototype.unselect = function() {
   if (Blockly.selected != this) {
     return;
   }
-  var event = new (Blockly.Events.get(Blockly.Events.SELECTED))(this.id, null,
-      this.workspace.id);
+  const event =
+      new (Events.get(Events.SELECTED))(this.id, null, this.workspace.id);
   event.workspaceId = this.workspace.id;
-  Blockly.Events.fire(event);
+  Events.fire(event);
   Blockly.selected = null;
   this.removeSelect();
 };
 
 /**
  * Block's mutator icon (if any).
- * @type {?Blockly.Mutator}
+ * @type {?Mutator}
  */
-Blockly.BlockSvg.prototype.mutator = null;
+BlockSvg.prototype.mutator = null;
 
 /**
  * Block's comment icon (if any).
- * @type {?Blockly.Comment}
+ * @type {?Comment}
  * @deprecated August 2019. Use getCommentIcon instead.
  */
-Blockly.BlockSvg.prototype.comment = null;
+BlockSvg.prototype.comment = null;
 
 /**
  * Block's comment icon (if any).
- * @type {?Blockly.Comment}
+ * @type {?Comment}
  * @private
  */
-Blockly.BlockSvg.prototype.commentIcon_ = null;
+BlockSvg.prototype.commentIcon_ = null;
 
 /**
  * Block's warning icon (if any).
- * @type {?Blockly.Warning}
+ * @type {?Warning}
  */
-Blockly.BlockSvg.prototype.warning = null;
+BlockSvg.prototype.warning = null;
 
 /**
  * Returns a list of mutator, comment, and warning icons.
- * @return {!Array<!Blockly.Icon>} List of icons.
+ * @return {!Array<!Icon>} List of icons.
  */
-Blockly.BlockSvg.prototype.getIcons = function() {
-  var icons = [];
+BlockSvg.prototype.getIcons = function() {
+  const icons = [];
   if (this.mutator) {
     icons.push(this.mutator);
   }
@@ -389,21 +396,21 @@ Blockly.BlockSvg.prototype.getIcons = function() {
 
 /**
  * Sets the parent of this block to be a new block or null.
- * @param {?Blockly.Block} newParent New parent block.
+ * @param {?Block} newParent New parent block.
  * @package
  * @override
  */
-Blockly.BlockSvg.prototype.setParent = function(newParent) {
-  var oldParent = this.parentBlock_;
+BlockSvg.prototype.setParent = function(newParent) {
+  const oldParent = this.parentBlock_;
   if (newParent == oldParent) {
     return;
   }
 
-  Blockly.utils.dom.startTextWidthCache();
-  Blockly.BlockSvg.superClass_.setParent.call(this, newParent);
-  Blockly.utils.dom.stopTextWidthCache();
+  dom.startTextWidthCache();
+  BlockSvg.superClass_.setParent.call(this, newParent);
+  dom.stopTextWidthCache();
 
-  var svgRoot = this.getSvgRoot();
+  const svgRoot = this.getSvgRoot();
 
   // Bail early if workspace is clearing, or we aren't rendered.
   // We won't need to reattach ourselves anywhere.
@@ -411,10 +418,10 @@ Blockly.BlockSvg.prototype.setParent = function(newParent) {
     return;
   }
 
-  var oldXY = this.getRelativeToSurfaceXY();
+  const oldXY = this.getRelativeToSurfaceXY();
   if (newParent) {
     newParent.getSvgRoot().appendChild(svgRoot);
-    var newXY = this.getRelativeToSurfaceXY();
+    const newXY = this.getRelativeToSurfaceXY();
     // Move the connections to match the child's new position.
     this.moveConnections(newXY.x - oldXY.x, newXY.y - oldXY.y);
   }
@@ -434,37 +441,38 @@ Blockly.BlockSvg.prototype.setParent = function(newParent) {
  * If the block is on the workspace, (0, 0) is the origin of the workspace
  * coordinate system.
  * This does not change with workspace scale.
- * @return {!Blockly.utils.Coordinate} Object with .x and .y properties in
+ * @return {!Coordinate} Object with .x and .y properties in
  *     workspace coordinates.
  */
-Blockly.BlockSvg.prototype.getRelativeToSurfaceXY = function() {
-  var x = 0;
-  var y = 0;
+BlockSvg.prototype.getRelativeToSurfaceXY = function() {
+  let x = 0;
+  let y = 0;
 
-  var dragSurfaceGroup = this.useDragSurface_ ?
-      this.workspace.getBlockDragSurface().getGroup() : null;
+  const dragSurfaceGroup = this.useDragSurface_ ?
+      this.workspace.getBlockDragSurface().getGroup() :
+      null;
 
-  var element = this.getSvgRoot();
+  let element = this.getSvgRoot();
   if (element) {
     do {
       // Loop through this block and every parent.
-      var xy = Blockly.utils.getRelativeXY(element);
+      const xy = utils.getRelativeXY(element);
       x += xy.x;
       y += xy.y;
       // If this element is the current element on the drag surface, include
       // the translation of the drag surface itself.
       if (this.useDragSurface_ &&
           this.workspace.getBlockDragSurface().getCurrentBlock() == element) {
-        var surfaceTranslation =
+        const surfaceTranslation =
             this.workspace.getBlockDragSurface().getSurfaceTranslation();
         x += surfaceTranslation.x;
         y += surfaceTranslation.y;
       }
       element = /** @type {!SVGElement} */ (element.parentNode);
     } while (element && element != this.workspace.getCanvas() &&
-        element != dragSurfaceGroup);
+             element != dragSurfaceGroup);
   }
-  return new Blockly.utils.Coordinate(x, y);
+  return new Coordinate(x, y);
 };
 
 /**
@@ -472,20 +480,21 @@ Blockly.BlockSvg.prototype.getRelativeToSurfaceXY = function() {
  * @param {number} dx Horizontal offset in workspace units.
  * @param {number} dy Vertical offset in workspace units.
  */
-Blockly.BlockSvg.prototype.moveBy = function(dx, dy) {
+BlockSvg.prototype.moveBy = function(dx, dy) {
   if (this.parentBlock_) {
     throw Error('Block has parent.');
   }
-  var eventsEnabled = Blockly.Events.isEnabled();
+  const eventsEnabled = Events.isEnabled();
+  let event;
   if (eventsEnabled) {
-    var event = new (Blockly.Events.get(Blockly.Events.BLOCK_MOVE))(this);
+    event = new (Events.get(Events.BLOCK_MOVE))(this);
   }
-  var xy = this.getRelativeToSurfaceXY();
+  const xy = this.getRelativeToSurfaceXY();
   this.translate(xy.x + dx, xy.y + dy);
   this.moveConnections(dx, dy);
   if (eventsEnabled) {
     event.recordNew();
-    Blockly.Events.fire(event);
+    Events.fire(event);
   }
   this.workspace.resizeContents();
 };
@@ -496,9 +505,8 @@ Blockly.BlockSvg.prototype.moveBy = function(dx, dy) {
  * @param {number} x The x coordinate of the translation in workspace units.
  * @param {number} y The y coordinate of the translation in workspace units.
  */
-Blockly.BlockSvg.prototype.translate = function(x, y) {
-  this.getSvgRoot().setAttribute('transform',
-      'translate(' + x + ',' + y + ')');
+BlockSvg.prototype.translate = function(x, y) {
+  this.getSvgRoot().setAttribute('transform', 'translate(' + x + ',' + y + ')');
 };
 
 /**
@@ -507,7 +515,7 @@ Blockly.BlockSvg.prototype.translate = function(x, y) {
  * Does nothing if useDragSurface_ is false.
  * @package
  */
-Blockly.BlockSvg.prototype.moveToDragSurface = function() {
+BlockSvg.prototype.moveToDragSurface = function() {
   if (!this.useDragSurface_) {
     return;
   }
@@ -515,11 +523,11 @@ Blockly.BlockSvg.prototype.moveToDragSurface = function() {
   // is equal to the current relative-to-surface position,
   // to keep the position in sync as it move on/off the surface.
   // This is in workspace coordinates.
-  var xy = this.getRelativeToSurfaceXY();
+  const xy = this.getRelativeToSurfaceXY();
   this.clearTransformAttributes_();
   this.workspace.getBlockDragSurface().translateSurface(xy.x, xy.y);
   // Execute the move on the top-level SVG component
-  var svg = this.getSvgRoot();
+  const svg = this.getSvgRoot();
   if (svg) {
     this.workspace.getBlockDragSurface().setBlocksAndShow(svg);
   }
@@ -527,10 +535,10 @@ Blockly.BlockSvg.prototype.moveToDragSurface = function() {
 
 /**
  * Move a block to a position.
- * @param {Blockly.utils.Coordinate} xy The position to move to in workspace units.
+ * @param {Coordinate} xy The position to move to in workspace units.
  */
-Blockly.BlockSvg.prototype.moveTo = function(xy) {
-  var curXY = this.getRelativeToSurfaceXY();
+BlockSvg.prototype.moveTo = function(xy) {
+  const curXY = this.getRelativeToSurfaceXY();
   this.moveBy(xy.x - curXY.x, xy.y - curXY.y);
 };
 
@@ -538,11 +546,11 @@ Blockly.BlockSvg.prototype.moveTo = function(xy) {
  * Move this block back to the workspace block canvas.
  * Generally should be called at the same time as setDragging_(false).
  * Does nothing if useDragSurface_ is false.
- * @param {!Blockly.utils.Coordinate} newXY The position the block should take on
+ * @param {!Coordinate} newXY The position the block should take on
  *     on the workspace canvas, in workspace coordinates.
  * @package
  */
-Blockly.BlockSvg.prototype.moveOffDragSurface = function(newXY) {
+BlockSvg.prototype.moveOffDragSurface = function(newXY) {
   if (!this.useDragSurface_) {
     return;
   }
@@ -555,17 +563,17 @@ Blockly.BlockSvg.prototype.moveOffDragSurface = function(newXY) {
  * Move this block during a drag, taking into account whether we are using a
  * drag surface to translate blocks.
  * This block must be a top-level block.
- * @param {!Blockly.utils.Coordinate} newLoc The location to translate to, in
+ * @param {!Coordinate} newLoc The location to translate to, in
  *     workspace coordinates.
  * @package
  */
-Blockly.BlockSvg.prototype.moveDuringDrag = function(newLoc) {
+BlockSvg.prototype.moveDuringDrag = function(newLoc) {
   if (this.useDragSurface_) {
     this.workspace.getBlockDragSurface().translateSurface(newLoc.x, newLoc.y);
   } else {
     this.svgGroup_.translate_ = 'translate(' + newLoc.x + ',' + newLoc.y + ')';
-    this.svgGroup_.setAttribute('transform',
-        this.svgGroup_.translate_ + this.svgGroup_.skew_);
+    this.svgGroup_.setAttribute(
+        'transform', this.svgGroup_.translate_ + this.svgGroup_.skew_);
   }
 };
 
@@ -574,14 +582,14 @@ Blockly.BlockSvg.prototype.moveDuringDrag = function(newLoc) {
  * Used when the block is switching from 3d to 2d transform or vice versa.
  * @private
  */
-Blockly.BlockSvg.prototype.clearTransformAttributes_ = function() {
+BlockSvg.prototype.clearTransformAttributes_ = function() {
   this.getSvgRoot().removeAttribute('transform');
 };
 
 /**
  * Snap this block to the nearest grid point.
  */
-Blockly.BlockSvg.prototype.snapToGrid = function() {
+BlockSvg.prototype.snapToGrid = function() {
   if (!this.workspace) {
     return;  // Deleted block.
   }
@@ -594,18 +602,18 @@ Blockly.BlockSvg.prototype.snapToGrid = function() {
   if (this.isInFlyout) {
     return;  // Don't move blocks around in a flyout.
   }
-  var grid = this.workspace.getGrid();
+  const grid = this.workspace.getGrid();
   if (!grid || !grid.shouldSnap()) {
     return;  // Config says no snapping.
   }
-  var spacing = grid.getSpacing();
-  var half = spacing / 2;
-  var xy = this.getRelativeToSurfaceXY();
-  var dx = Math.round((xy.x - half) / spacing) * spacing + half - xy.x;
-  var dy = Math.round((xy.y - half) / spacing) * spacing + half - xy.y;
-  dx = Math.round(dx);
-  dy = Math.round(dy);
-  if (dx != 0 || dy != 0) {
+  const spacing = grid.getSpacing();
+  const half = spacing / 2;
+  const xy = this.getRelativeToSurfaceXY();
+  const dx =
+      Math.round(Math.round((xy.x - half) / spacing) * spacing + half - xy.x);
+  const dy =
+      Math.round(Math.round((xy.y - half) / spacing) * spacing + half - xy.y);
+  if (dx || dy) {
     this.moveBy(dx, dy);
   }
 };
@@ -614,12 +622,13 @@ Blockly.BlockSvg.prototype.snapToGrid = function() {
  * Returns the coordinates of a bounding box describing the dimensions of this
  * block and any blocks stacked below it.
  * Coordinate system: workspace coordinates.
- * @return {!Blockly.utils.Rect} Object with coordinates of the bounding box.
+ * @return {!Rect} Object with coordinates of the bounding box.
  */
-Blockly.BlockSvg.prototype.getBoundingRectangle = function() {
-  var blockXY = this.getRelativeToSurfaceXY();
-  var blockBounds = this.getHeightWidth();
-  var left, right;
+BlockSvg.prototype.getBoundingRectangle = function() {
+  const blockXY = this.getRelativeToSurfaceXY();
+  const blockBounds = this.getHeightWidth();
+  let left;
+  let right;
   if (this.RTL) {
     left = blockXY.x - blockBounds.width;
     right = blockXY.x;
@@ -627,19 +636,18 @@ Blockly.BlockSvg.prototype.getBoundingRectangle = function() {
     left = blockXY.x;
     right = blockXY.x + blockBounds.width;
   }
-  return new Blockly.utils.Rect(
-      blockXY.y, blockXY.y + blockBounds.height, left, right);
+  return new Rect(blockXY.y, blockXY.y + blockBounds.height, left, right);
 };
 
 /**
  * Notify every input on this block to mark its fields as dirty.
  * A dirty field is a field that needs to be re-rendered.
  */
-Blockly.BlockSvg.prototype.markDirty = function() {
-  this.pathObject.constants =
-    (/** @type {!Blockly.WorkspaceSvg} */ (this.workspace))
-        .getRenderer().getConstants();
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+BlockSvg.prototype.markDirty = function() {
+  this.pathObject.constants = (/** @type {!WorkspaceSvg} */ (this.workspace))
+      .getRenderer()
+      .getConstants();
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     input.markDirty();
   }
 };
@@ -648,11 +656,11 @@ Blockly.BlockSvg.prototype.markDirty = function() {
  * Set whether the block is collapsed or not.
  * @param {boolean} collapsed True if collapsed.
  */
-Blockly.BlockSvg.prototype.setCollapsed = function(collapsed) {
+BlockSvg.prototype.setCollapsed = function(collapsed) {
   if (this.collapsed_ == collapsed) {
     return;
   }
-  Blockly.BlockSvg.superClass_.setCollapsed.call(this, collapsed);
+  BlockSvg.superClass_.setCollapsed.call(this, collapsed);
   if (!collapsed) {
     this.updateCollapsed_();
   } else if (this.rendered) {
@@ -667,12 +675,12 @@ Blockly.BlockSvg.prototype.setCollapsed = function(collapsed) {
  * for that state.
  * @private
  */
-Blockly.BlockSvg.prototype.updateCollapsed_ = function() {
-  var collapsed = this.isCollapsed();
-  var collapsedInputName = Blockly.constants.COLLAPSED_INPUT_NAME;
-  var collapsedFieldName = Blockly.constants.COLLAPSED_FIELD_NAME;
+BlockSvg.prototype.updateCollapsed_ = function() {
+  const collapsed = this.isCollapsed();
+  const collapsedInputName = constants.COLLAPSED_INPUT_NAME;
+  const collapsedFieldName = constants.COLLAPSED_FIELD_NAME;
 
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     if (input.name != collapsedInputName) {
       input.setVisible(!collapsed);
     }
@@ -684,31 +692,31 @@ Blockly.BlockSvg.prototype.updateCollapsed_ = function() {
     return;
   }
 
-  var icons = this.getIcons();
-  for (var i = 0, icon; (icon = icons[i]); i++) {
+  const icons = this.getIcons();
+  for (let i = 0, icon; (icon = icons[i]); i++) {
     icon.setVisible(false);
   }
 
-  var text = this.toString(Blockly.internalConstants.COLLAPSE_CHARS);
-  var field = this.getField(collapsedFieldName);
+  const text = this.toString(internalConstants.COLLAPSE_CHARS);
+  const field = this.getField(collapsedFieldName);
   if (field) {
     field.setValue(text);
     return;
   }
-  var input = this.getInput(collapsedInputName) ||
+  const input = this.getInput(collapsedInputName) ||
       this.appendDummyInput(collapsedInputName);
-  input.appendField(new Blockly.FieldLabel(text), collapsedFieldName);
+  input.appendField(new FieldLabel(text), collapsedFieldName);
 };
 
 /**
  * Open the next (or previous) FieldTextInput.
- * @param {!Blockly.Field} start Current field.
+ * @param {!Field} start Current field.
  * @param {boolean} forward If true go forward, otherwise backward.
  */
-Blockly.BlockSvg.prototype.tab = function(start, forward) {
-  var tabCursor = new Blockly.TabNavigateCursor();
-  tabCursor.setCurNode(Blockly.ASTNode.createFieldNode(start));
-  var currentNode = tabCursor.getCurNode();
+BlockSvg.prototype.tab = function(start, forward) {
+  const tabCursor = new TabNavigateCursor();
+  tabCursor.setCurNode(ASTNode.createFieldNode(start));
+  const currentNode = tabCursor.getCurNode();
 
   if (forward) {
     tabCursor.next();
@@ -716,9 +724,9 @@ Blockly.BlockSvg.prototype.tab = function(start, forward) {
     tabCursor.prev();
   }
 
-  var nextNode = tabCursor.getCurNode();
+  const nextNode = tabCursor.getCurNode();
   if (nextNode && nextNode !== currentNode) {
-    var nextField = /** @type {!Blockly.Field} */ (nextNode.getLocation());
+    const nextField = /** @type {!Field} */ (nextNode.getLocation());
     nextField.showEditor();
 
     // Also move the cursor if we're in keyboard nav mode.
@@ -733,8 +741,8 @@ Blockly.BlockSvg.prototype.tab = function(start, forward) {
  * @param {!Event} e Mouse down event or touch start event.
  * @private
  */
-Blockly.BlockSvg.prototype.onMouseDown_ = function(e) {
-  var gesture = this.workspace && this.workspace.getGesture(e);
+BlockSvg.prototype.onMouseDown_ = function(e) {
+  const gesture = this.workspace && this.workspace.getGesture(e);
   if (gesture) {
     gesture.handleBlockStart(e, this);
   }
@@ -744,8 +752,9 @@ Blockly.BlockSvg.prototype.onMouseDown_ = function(e) {
  * Load the block's help page in a new window.
  * @package
  */
-Blockly.BlockSvg.prototype.showHelp = function() {
-  var url = (typeof this.helpUrl == 'function') ? this.helpUrl() : this.helpUrl;
+BlockSvg.prototype.showHelp = function() {
+  const url =
+      (typeof this.helpUrl == 'function') ? this.helpUrl() : this.helpUrl;
   if (url) {
     window.open(url);
   }
@@ -756,12 +765,12 @@ Blockly.BlockSvg.prototype.showHelp = function() {
  * @return {?Array<!Object>} Context menu options or null if no menu.
  * @protected
  */
-Blockly.BlockSvg.prototype.generateContextMenu = function() {
+BlockSvg.prototype.generateContextMenu = function() {
   if (this.workspace.options.readOnly || !this.contextMenu) {
     return null;
   }
-  var menuOptions = Blockly.ContextMenuRegistry.registry.getContextMenuOptions(
-      Blockly.ContextMenuRegistry.ScopeType.BLOCK, {block: this});
+  const menuOptions = ContextMenuRegistry.registry.getContextMenuOptions(
+      ContextMenuRegistry.ScopeType.BLOCK, {block: this});
 
   // Allow the block to add or modify menuOptions.
   if (this.customContextMenu) {
@@ -776,12 +785,12 @@ Blockly.BlockSvg.prototype.generateContextMenu = function() {
  * @param {!Event} e Mouse event.
  * @package
  */
-Blockly.BlockSvg.prototype.showContextMenu = function(e) {
-  var menuOptions = this.generateContextMenu();
+BlockSvg.prototype.showContextMenu = function(e) {
+  const menuOptions = this.generateContextMenu();
 
   if (menuOptions && menuOptions.length) {
-    Blockly.ContextMenu.show(e, menuOptions, this.RTL);
-    Blockly.ContextMenu.setCurrentBlock(this);
+    ContextMenu.show(e, menuOptions, this.RTL);
+    ContextMenu.setCurrentBlock(this);
   }
 };
 
@@ -794,23 +803,23 @@ Blockly.BlockSvg.prototype.showContextMenu = function(e) {
  *     units.
  * @package
  */
-Blockly.BlockSvg.prototype.moveConnections = function(dx, dy) {
+BlockSvg.prototype.moveConnections = function(dx, dy) {
   if (!this.rendered) {
     // Rendering is required to lay out the blocks.
     // This is probably an invisible block attached to a collapsed block.
     return;
   }
-  var myConnections = this.getConnections_(false);
-  for (var i = 0; i < myConnections.length; i++) {
+  const myConnections = this.getConnections_(false);
+  for (let i = 0; i < myConnections.length; i++) {
     myConnections[i].moveBy(dx, dy);
   }
-  var icons = this.getIcons();
-  for (var i = 0; i < icons.length; i++) {
+  const icons = this.getIcons();
+  for (let i = 0; i < icons.length; i++) {
     icons[i].computeIconLocation();
   }
 
   // Recurse through all blocks attached under this one.
-  for (var i = 0; i < this.childBlocks_.length; i++) {
+  for (let i = 0; i < this.childBlocks_.length; i++) {
     this.childBlocks_[i].moveConnections(dx, dy);
   }
 };
@@ -820,21 +829,21 @@ Blockly.BlockSvg.prototype.moveConnections = function(dx, dy) {
  * @param {boolean} adding True if adding, false if removing.
  * @package
  */
-Blockly.BlockSvg.prototype.setDragging = function(adding) {
+BlockSvg.prototype.setDragging = function(adding) {
   if (adding) {
-    var group = this.getSvgRoot();
+    const group = this.getSvgRoot();
     group.translate_ = '';
     group.skew_ = '';
-    Blockly.common.draggingConnections.push(...this.getConnections_(true));
-    Blockly.utils.dom.addClass(
+    common.draggingConnections.push(...this.getConnections_(true));
+    dom.addClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDragging');
   } else {
-    Blockly.common.draggingConnections.length = 0;
-    Blockly.utils.dom.removeClass(
+    common.draggingConnections.length = 0;
+    dom.removeClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDragging');
   }
   // Recurse through all blocks attached under this one.
-  for (var i = 0; i < this.childBlocks_.length; i++) {
+  for (let i = 0; i < this.childBlocks_.length; i++) {
     this.childBlocks_[i].setDragging(adding);
   }
 };
@@ -843,8 +852,8 @@ Blockly.BlockSvg.prototype.setDragging = function(adding) {
  * Set whether this block is movable or not.
  * @param {boolean} movable True if movable.
  */
-Blockly.BlockSvg.prototype.setMovable = function(movable) {
-  Blockly.BlockSvg.superClass_.setMovable.call(this, movable);
+BlockSvg.prototype.setMovable = function(movable) {
+  BlockSvg.superClass_.setMovable.call(this, movable);
   this.pathObject.updateMovable(movable);
 };
 
@@ -852,10 +861,10 @@ Blockly.BlockSvg.prototype.setMovable = function(movable) {
  * Set whether this block is editable or not.
  * @param {boolean} editable True if editable.
  */
-Blockly.BlockSvg.prototype.setEditable = function(editable) {
-  Blockly.BlockSvg.superClass_.setEditable.call(this, editable);
-  var icons = this.getIcons();
-  for (var i = 0; i < icons.length; i++) {
+BlockSvg.prototype.setEditable = function(editable) {
+  BlockSvg.superClass_.setEditable.call(this, editable);
+  const icons = this.getIcons();
+  for (let i = 0; i < icons.length; i++) {
     icons[i].updateEditable();
   }
 };
@@ -865,8 +874,8 @@ Blockly.BlockSvg.prototype.setEditable = function(editable) {
  * @param {boolean} shadow True if a shadow.
  * @package
  */
-Blockly.BlockSvg.prototype.setShadow = function(shadow) {
-  Blockly.BlockSvg.superClass_.setShadow.call(this, shadow);
+BlockSvg.prototype.setShadow = function(shadow) {
+  BlockSvg.superClass_.setShadow.call(this, shadow);
   this.applyColour();
 };
 
@@ -876,14 +885,14 @@ Blockly.BlockSvg.prototype.setShadow = function(shadow) {
  * @param {boolean} insertionMarker True if an insertion marker.
  * @package
  */
-Blockly.BlockSvg.prototype.setInsertionMarker = function(insertionMarker) {
+BlockSvg.prototype.setInsertionMarker = function(insertionMarker) {
   if (this.isInsertionMarker_ == insertionMarker) {
     return;  // No change.
   }
   this.isInsertionMarker_ = insertionMarker;
   if (this.isInsertionMarker_) {
-    this.setColour(this.workspace.getRenderer().getConstants().
-        INSERTION_MARKER_COLOUR);
+    this.setColour(
+        this.workspace.getRenderer().getConstants().INSERTION_MARKER_COLOUR);
     this.pathObject.updateInsertionMarker(true);
   }
 };
@@ -892,7 +901,7 @@ Blockly.BlockSvg.prototype.setInsertionMarker = function(insertionMarker) {
  * Return the root node of the SVG or null if none exists.
  * @return {!SVGGElement} The root SVG node (probably a group).
  */
-Blockly.BlockSvg.prototype.getSvgRoot = function() {
+BlockSvg.prototype.getSvgRoot = function() {
   return this.svgGroup_;
 };
 
@@ -904,76 +913,76 @@ Blockly.BlockSvg.prototype.getSvgRoot = function() {
  * @param {boolean=} animate If true, show a disposal animation and sound.
  * @suppress {checkTypes}
  */
-Blockly.BlockSvg.prototype.dispose = function(healStack, animate) {
+BlockSvg.prototype.dispose = function(healStack, animate) {
   if (!this.workspace) {
     // The block has already been deleted.
     return;
   }
-  Blockly.Tooltip.dispose();
-  Blockly.Tooltip.unbindMouseEvents(this.pathObject.svgPath);
-  Blockly.utils.dom.startTextWidthCache();
+  Tooltip.dispose();
+  Tooltip.unbindMouseEvents(this.pathObject.svgPath);
+  dom.startTextWidthCache();
   // Save the block's workspace temporarily so we can resize the
   // contents once the block is disposed.
-  var blockWorkspace = this.workspace;
+  const blockWorkspace = this.workspace;
   // If this block is being dragged, unlink the mouse events.
   if (Blockly.selected == this) {
     this.unselect();
     this.workspace.cancelCurrentGesture();
   }
   // If this block has a context menu open, close it.
-  if (Blockly.ContextMenu.getCurrentBlock() == this) {
-    Blockly.ContextMenu.hide();
+  if (ContextMenu.getCurrentBlock() == this) {
+    ContextMenu.hide();
   }
 
   if (animate && this.rendered) {
     this.unplug(healStack);
-    Blockly.blockAnimations.disposeUiEffect(this);
+    blockAnimations.disposeUiEffect(this);
   }
   // Stop rerendering.
   this.rendered = false;
 
   // Clear pending warnings.
   if (this.warningTextDb_) {
-    for (var n in this.warningTextDb_) {
+    for (const n in this.warningTextDb_) {
       clearTimeout(this.warningTextDb_[n]);
     }
     this.warningTextDb_ = null;
   }
 
-  var icons = this.getIcons();
-  for (var i = 0; i < icons.length; i++) {
+  const icons = this.getIcons();
+  for (let i = 0; i < icons.length; i++) {
     icons[i].dispose();
   }
-  Blockly.BlockSvg.superClass_.dispose.call(this, !!healStack);
+  BlockSvg.superClass_.dispose.call(this, !!healStack);
 
-  Blockly.utils.dom.removeNode(this.svgGroup_);
+  dom.removeNode(this.svgGroup_);
   blockWorkspace.resizeContents();
   // Sever JavaScript to DOM connections.
   this.svgGroup_ = null;
-  Blockly.utils.dom.stopTextWidthCache();
+  dom.stopTextWidthCache();
 };
 
 /**
  * Encode a block for copying.
- * @return {?Blockly.ICopyable.CopyData} Copy metadata, or null if the block is
+ * @return {?ICopyable.CopyData} Copy metadata, or null if the block is
  *     an insertion marker.
  * @package
  */
-Blockly.BlockSvg.prototype.toCopyData = function() {
+BlockSvg.prototype.toCopyData = function() {
   if (this.isInsertionMarker_) {
     return null;
   }
-  var xml = /** @type {!Element} */ (Blockly.Xml.blockToDom(this, true));
+  const xml = /** @type {!Element} */ (Xml.blockToDom(this, true));
   // Copy only the selected block and internal blocks.
-  Blockly.Xml.deleteNext(xml);
+  Xml.deleteNext(xml);
   // Encode start position in XML.
-  var xy = this.getRelativeToSurfaceXY();
+  const xy = this.getRelativeToSurfaceXY();
   xml.setAttribute('x', this.RTL ? -xy.x : xy.x);
   xml.setAttribute('y', xy.y);
   return {
     xml: xml,
     source: this.workspace,
-    typeCounts: Blockly.utils.getBlockTypeCounts(this, true)
+    typeCounts: utils.getBlockTypeCounts(this, true)
   };
 };
 
@@ -981,16 +990,16 @@ Blockly.BlockSvg.prototype.toCopyData = function() {
  * Updates the colour of the block to match the block's state.
  * @package
  */
-Blockly.BlockSvg.prototype.applyColour = function() {
+BlockSvg.prototype.applyColour = function() {
   this.pathObject.applyColour(this);
 
-  var icons = this.getIcons();
-  for (var i = 0; i < icons.length; i++) {
+  const icons = this.getIcons();
+  for (let i = 0; i < icons.length; i++) {
     icons[i].applyColour();
   }
 
-  for (var x = 0, input; (input = this.inputList[x]); x++) {
-    for (var y = 0, field; (field = input.fieldRow[y]); y++) {
+  for (let x = 0, input; (input = this.inputList[x]); x++) {
+    for (let y = 0, field; (field = input.fieldRow[y]); y++) {
       field.applyColour();
     }
   }
@@ -1001,13 +1010,13 @@ Blockly.BlockSvg.prototype.applyColour = function() {
  * state.
  * @package
  */
-Blockly.BlockSvg.prototype.updateDisabled = function() {
-  var children = this.getChildren(false);
+BlockSvg.prototype.updateDisabled = function() {
+  const children = this.getChildren(false);
   this.applyColour();
   if (this.isCollapsed()) {
     return;
   }
-  for (var i = 0, child; (child = children[i]); i++) {
+  for (let i = 0, child; (child = children[i]); i++) {
     if (child.rendered) {
       child.updateDisabled();
     }
@@ -1017,9 +1026,9 @@ Blockly.BlockSvg.prototype.updateDisabled = function() {
 /**
  * Get the comment icon attached to this block, or null if the block has no
  * comment.
- * @return {?Blockly.Comment} The comment icon attached to this block, or null.
+ * @return {?Comment} The comment icon attached to this block, or null.
  */
-Blockly.BlockSvg.prototype.getCommentIcon = function() {
+BlockSvg.prototype.getCommentIcon = function() {
   return this.commentIcon_;
 };
 
@@ -1027,16 +1036,17 @@ Blockly.BlockSvg.prototype.getCommentIcon = function() {
  * Set this block's comment text.
  * @param {?string} text The text, or null to delete.
  */
-Blockly.BlockSvg.prototype.setCommentText = function(text) {
-  if (!Blockly.Comment) {
+BlockSvg.prototype.setCommentText = function(text) {
+  const Comment = goog.module.get('Blockly.Comment');
+  if (!Comment) {
     throw Error('Missing require for Blockly.Comment');
   }
   if (this.commentModel.text == text) {
     return;
   }
-  Blockly.BlockSvg.superClass_.setCommentText.call(this, text);
+  BlockSvg.superClass_.setCommentText.call(this, text);
 
-  var shouldHaveComment = text != null;
+  const shouldHaveComment = text != null;
   if (!!this.commentIcon_ == shouldHaveComment) {
     // If the comment's state of existence is correct, but the text is new
     // that means we're just updating a comment.
@@ -1044,7 +1054,7 @@ Blockly.BlockSvg.prototype.setCommentText = function(text) {
     return;
   }
   if (shouldHaveComment) {
-    this.commentIcon_ = new Blockly.Comment(this);
+    this.commentIcon_ = new Comment(this);
     this.comment = this.commentIcon_;  // For backwards compatibility.
   } else {
     this.commentIcon_.dispose();
@@ -1064,8 +1074,9 @@ Blockly.BlockSvg.prototype.setCommentText = function(text) {
  * @param {string=} opt_id An optional ID for the warning text to be able to
  *     maintain multiple warnings.
  */
-Blockly.BlockSvg.prototype.setWarningText = function(text, opt_id) {
-  if (!Blockly.Warning) {
+BlockSvg.prototype.setWarningText = function(text, opt_id) {
+  const Warning = goog.module.get('Blockly.Warning');
+  if (!Warning) {
     throw Error('Missing require for Blockly.Warning');
   }
   if (!this.warningTextDb_) {
@@ -1073,10 +1084,10 @@ Blockly.BlockSvg.prototype.setWarningText = function(text, opt_id) {
     // Only runs once per block (and only those with warnings).
     this.warningTextDb_ = Object.create(null);
   }
-  var id = opt_id || '';
+  const id = opt_id || '';
   if (!id) {
     // Kill all previous pending processes, this edit supersedes them all.
-    for (var n in this.warningTextDb_) {
+    for (const n of Object.keys(this.warningTextDb_)) {
       clearTimeout(this.warningTextDb_[n]);
       delete this.warningTextDb_[n];
     }
@@ -1088,7 +1099,7 @@ Blockly.BlockSvg.prototype.setWarningText = function(text, opt_id) {
   if (this.workspace.isDragging()) {
     // Don't change the warning text during a drag.
     // Wait until the drag finishes.
-    var thisBlock = this;
+    const thisBlock = this;
     this.warningTextDb_[id] = setTimeout(function() {
       if (thisBlock.workspace) {  // Check block wasn't deleted.
         delete thisBlock.warningTextDb_[id];
@@ -1101,11 +1112,11 @@ Blockly.BlockSvg.prototype.setWarningText = function(text, opt_id) {
     text = null;
   }
 
-  var changedState = false;
+  let changedState = false;
   if (typeof text == 'string') {
     // Bubble up to add a warning on top-most collapsed block.
-    var parent = this.getSurroundParent();
-    var collapsedParent = null;
+    let parent = this.getSurroundParent();
+    let collapsedParent = null;
     while (parent) {
       if (parent.isCollapsed()) {
         collapsedParent = parent;
@@ -1113,12 +1124,12 @@ Blockly.BlockSvg.prototype.setWarningText = function(text, opt_id) {
       parent = parent.getSurroundParent();
     }
     if (collapsedParent) {
-      collapsedParent.setWarningText(Blockly.Msg['COLLAPSED_WARNINGS_WARNING'],
-          Blockly.BlockSvg.COLLAPSED_WARNING_ID);
+      collapsedParent.setWarningText(
+          Msg['COLLAPSED_WARNINGS_WARNING'], BlockSvg.COLLAPSED_WARNING_ID);
     }
 
     if (!this.warning) {
-      this.warning = new Blockly.Warning(this);
+      this.warning = new Warning(this);
       changedState = true;
     }
     this.warning.setText(/** @type {string} */ (text), id);
@@ -1128,9 +1139,9 @@ Blockly.BlockSvg.prototype.setWarningText = function(text, opt_id) {
       this.warning.dispose();
       changedState = true;
     } else if (this.warning) {
-      var oldText = this.warning.getText();
+      const oldText = this.warning.getText();
       this.warning.setText('', id);
-      var newText = this.warning.getText();
+      const newText = this.warning.getText();
       if (!newText) {
         this.warning.dispose();
       }
@@ -1146,9 +1157,9 @@ Blockly.BlockSvg.prototype.setWarningText = function(text, opt_id) {
 
 /**
  * Give this block a mutator dialog.
- * @param {?Blockly.Mutator} mutator A mutator dialog instance or null to remove.
+ * @param {?Mutator} mutator A mutator dialog instance or null to remove.
  */
-Blockly.BlockSvg.prototype.setMutator = function(mutator) {
+BlockSvg.prototype.setMutator = function(mutator) {
   if (this.mutator && this.mutator !== mutator) {
     this.mutator.dispose();
   }
@@ -1168,9 +1179,9 @@ Blockly.BlockSvg.prototype.setMutator = function(mutator) {
  * Set whether the block is enabled or not.
  * @param {boolean} enabled True if enabled.
  */
-Blockly.BlockSvg.prototype.setEnabled = function(enabled) {
+BlockSvg.prototype.setEnabled = function(enabled) {
   if (this.isEnabled() != enabled) {
-    Blockly.BlockSvg.superClass_.setEnabled.call(this, enabled);
+    BlockSvg.superClass_.setEnabled.call(this, enabled);
     if (this.rendered && !this.getInheritedDisabled()) {
       this.updateDisabled();
     }
@@ -1182,7 +1193,7 @@ Blockly.BlockSvg.prototype.setEnabled = function(enabled) {
  * often used to visually mark blocks currently being executed.
  * @param {boolean} highlighted True if highlighted.
  */
-Blockly.BlockSvg.prototype.setHighlighted = function(highlighted) {
+BlockSvg.prototype.setHighlighted = function(highlighted) {
   if (!this.rendered) {
     return;
   }
@@ -1192,18 +1203,18 @@ Blockly.BlockSvg.prototype.setHighlighted = function(highlighted) {
 /**
  * Adds the visual "select" effect to the block, but does not actually select
  * it or fire an event.
- * @see Blockly.BlockSvg#select
+ * @see BlockSvg#select
  */
-Blockly.BlockSvg.prototype.addSelect = function() {
+BlockSvg.prototype.addSelect = function() {
   this.pathObject.updateSelected(true);
 };
 
 /**
  * Removes the visual "select" effect from the block, but does not actually
  * unselect it or fire an event.
- * @see Blockly.BlockSvg#unselect
+ * @see BlockSvg#unselect
  */
-Blockly.BlockSvg.prototype.removeSelect = function() {
+BlockSvg.prototype.removeSelect = function() {
   this.pathObject.updateSelected(false);
 };
 
@@ -1213,7 +1224,7 @@ Blockly.BlockSvg.prototype.removeSelect = function() {
  *     otherwise.
  * @package
  */
-Blockly.BlockSvg.prototype.setDeleteStyle = function(enable) {
+BlockSvg.prototype.setDeleteStyle = function(enable) {
   this.pathObject.updateDraggingDelete(enable);
 };
 
@@ -1224,7 +1235,7 @@ Blockly.BlockSvg.prototype.setDeleteStyle = function(enable) {
  * Get the colour of a block.
  * @return {string} #RRGGBB string.
  */
-Blockly.BlockSvg.prototype.getColour = function() {
+BlockSvg.prototype.getColour = function() {
   return this.style.colourPrimary;
 };
 
@@ -1232,10 +1243,11 @@ Blockly.BlockSvg.prototype.getColour = function() {
  * Change the colour of a block.
  * @param {number|string} colour HSV hue value, or #RRGGBB string.
  */
-Blockly.BlockSvg.prototype.setColour = function(colour) {
-  Blockly.BlockSvg.superClass_.setColour.call(this, colour);
-  var styleObj = this.workspace.getRenderer().getConstants()
-      .getBlockStyleForColour(this.colour_);
+BlockSvg.prototype.setColour = function(colour) {
+  BlockSvg.superClass_.setColour.call(this, colour);
+  const styleObj =
+      this.workspace.getRenderer().getConstants().getBlockStyleForColour(
+          this.colour_);
 
   this.pathObject.setStyle(styleObj.style);
   this.style = styleObj.style;
@@ -1249,9 +1261,9 @@ Blockly.BlockSvg.prototype.setColour = function(colour) {
  * @param {string} blockStyleName Name of the block style.
  * @throws {Error} if the block style does not exist.
  */
-Blockly.BlockSvg.prototype.setStyle = function(blockStyleName) {
-  var blockStyle = this.workspace.getRenderer()
-      .getConstants().getBlockStyle(blockStyleName);
+BlockSvg.prototype.setStyle = function(blockStyleName) {
+  const blockStyle =
+      this.workspace.getRenderer().getConstants().getBlockStyle(blockStyleName);
   this.styleName_ = blockStyleName;
 
   if (blockStyle) {
@@ -1274,12 +1286,12 @@ Blockly.BlockSvg.prototype.setStyle = function(blockStyleName) {
  * block group's <g>, it will render on top of any other blocks.
  * @package
  */
-Blockly.BlockSvg.prototype.bringToFront = function() {
-  var block = this;
+BlockSvg.prototype.bringToFront = function() {
+  let block = this;
   do {
-    var root = block.getSvgRoot();
-    var parent = root.parentNode;
-    var childNodes = parent.childNodes;
+    const root = block.getSvgRoot();
+    const parent = root.parentNode;
+    const childNodes = parent.childNodes;
     // Avoid moving the block if it's already at the bottom.
     if (childNodes[childNodes.length - 1] !== root) {
       parent.appendChild(root);
@@ -1294,10 +1306,8 @@ Blockly.BlockSvg.prototype.bringToFront = function() {
  * @param {(string|Array<string>|null)=} opt_check Statement type or
  *     list of statement types.  Null/undefined if any type could be connected.
  */
-Blockly.BlockSvg.prototype.setPreviousStatement = function(newBoolean,
-    opt_check) {
-  Blockly.BlockSvg.superClass_.setPreviousStatement.call(this, newBoolean,
-      opt_check);
+BlockSvg.prototype.setPreviousStatement = function(newBoolean, opt_check) {
+  BlockSvg.superClass_.setPreviousStatement.call(this, newBoolean, opt_check);
 
   if (this.rendered) {
     this.render();
@@ -1311,9 +1321,8 @@ Blockly.BlockSvg.prototype.setPreviousStatement = function(newBoolean,
  * @param {(string|Array<string>|null)=} opt_check Statement type or
  *     list of statement types.  Null/undefined if any type could be connected.
  */
-Blockly.BlockSvg.prototype.setNextStatement = function(newBoolean, opt_check) {
-  Blockly.BlockSvg.superClass_.setNextStatement.call(this, newBoolean,
-      opt_check);
+BlockSvg.prototype.setNextStatement = function(newBoolean, opt_check) {
+  BlockSvg.superClass_.setNextStatement.call(this, newBoolean, opt_check);
 
   if (this.rendered) {
     this.render();
@@ -1328,8 +1337,8 @@ Blockly.BlockSvg.prototype.setNextStatement = function(newBoolean, opt_check) {
  *     of returned types.  Null or undefined if any type could be returned
  *     (e.g. variable get).
  */
-Blockly.BlockSvg.prototype.setOutput = function(newBoolean, opt_check) {
-  Blockly.BlockSvg.superClass_.setOutput.call(this, newBoolean, opt_check);
+BlockSvg.prototype.setOutput = function(newBoolean, opt_check) {
+  BlockSvg.superClass_.setOutput.call(this, newBoolean, opt_check);
 
   if (this.rendered) {
     this.render();
@@ -1341,8 +1350,8 @@ Blockly.BlockSvg.prototype.setOutput = function(newBoolean, opt_check) {
  * Set whether value inputs are arranged horizontally or vertically.
  * @param {boolean} newBoolean True if inputs are horizontal.
  */
-Blockly.BlockSvg.prototype.setInputsInline = function(newBoolean) {
-  Blockly.BlockSvg.superClass_.setInputsInline.call(this, newBoolean);
+BlockSvg.prototype.setInputsInline = function(newBoolean) {
+  BlockSvg.superClass_.setInputsInline.call(this, newBoolean);
 
   if (this.rendered) {
     this.render();
@@ -1354,12 +1363,12 @@ Blockly.BlockSvg.prototype.setInputsInline = function(newBoolean) {
  * Remove an input from this block.
  * @param {string} name The name of the input.
  * @param {boolean=} opt_quiet True to prevent error if input is not present.
- * @return {boolean} True if operation succeeds, false if input is not present and opt_quiet is true
- * @throws {Error} if the input is not present and
- *     opt_quiet is not true.
+ * @return {boolean} True if operation succeeds, false if input is not present
+ *     and opt_quiet is true
+ * @throws {Error} if the input is not present and opt_quiet is not true.
  */
-Blockly.BlockSvg.prototype.removeInput = function(name, opt_quiet) {
-  var removed = Blockly.BlockSvg.superClass_.removeInput.call(this, name, opt_quiet);
+BlockSvg.prototype.removeInput = function(name, opt_quiet) {
+  const removed = BlockSvg.superClass_.removeInput.call(this, name, opt_quiet);
 
   if (this.rendered) {
     this.render();
@@ -1375,10 +1384,8 @@ Blockly.BlockSvg.prototype.removeInput = function(name, opt_quiet) {
  * @param {number} inputIndex Index of the input to move.
  * @param {number} refIndex Index of input that should be after the moved input.
  */
-Blockly.BlockSvg.prototype.moveNumberedInputBefore = function(
-    inputIndex, refIndex) {
-  Blockly.BlockSvg.superClass_.moveNumberedInputBefore.call(this, inputIndex,
-      refIndex);
+BlockSvg.prototype.moveNumberedInputBefore = function(inputIndex, refIndex) {
+  BlockSvg.superClass_.moveNumberedInputBefore.call(this, inputIndex, refIndex);
 
   if (this.rendered) {
     this.render();
@@ -1392,12 +1399,12 @@ Blockly.BlockSvg.prototype.moveNumberedInputBefore = function(
  * @param {number} type One of Blockly.inputTypes.
  * @param {string} name Language-neutral identifier which may used to find this
  *     input again.  Should be unique to this block.
- * @return {!Blockly.Input} The input object created.
+ * @return {!Input} The input object created.
  * @protected
  * @override
  */
-Blockly.BlockSvg.prototype.appendInput_ = function(type, name) {
-  var input = Blockly.BlockSvg.superClass_.appendInput_.call(this, type, name);
+BlockSvg.prototype.appendInput_ = function(type, name) {
+  const input = BlockSvg.superClass_.appendInput_.call(this, type, name);
 
   if (this.rendered) {
     this.render();
@@ -1416,7 +1423,7 @@ Blockly.BlockSvg.prototype.appendInput_ = function(type, name) {
  * @param {boolean} track If true, start tracking. If false, stop tracking.
  * @package
  */
-Blockly.BlockSvg.prototype.setConnectionTracking = function(track) {
+BlockSvg.prototype.setConnectionTracking = function(track) {
   if (this.previousConnection) {
     this.previousConnection.setTracking(track);
   }
@@ -1425,7 +1432,7 @@ Blockly.BlockSvg.prototype.setConnectionTracking = function(track) {
   }
   if (this.nextConnection) {
     this.nextConnection.setTracking(track);
-    var child = this.nextConnection.targetBlock();
+    const child = this.nextConnection.targetBlock();
     if (child) {
       child.setConnectionTracking(track);
     }
@@ -1438,13 +1445,13 @@ Blockly.BlockSvg.prototype.setConnectionTracking = function(track) {
     return;
   }
 
-  for (var i = 0; i < this.inputList.length; i++) {
-    var conn = this.inputList[i].connection;
+  for (let i = 0; i < this.inputList.length; i++) {
+    const conn = this.inputList[i].connection;
     if (conn) {
       conn.setTracking(track);
 
       // Pass tracking on down the chain.
-      var block = conn.targetBlock();
+      const block = conn.targetBlock();
       if (block) {
         block.setConnectionTracking(track);
       }
@@ -1457,11 +1464,11 @@ Blockly.BlockSvg.prototype.setConnectionTracking = function(track) {
  * @param {boolean} all If true, return all connections even hidden ones.
  *     Otherwise, for a non-rendered block return an empty list, and for a
  *     collapsed block don't return inputs connections.
- * @return {!Array<!Blockly.RenderedConnection>} Array of connections.
+ * @return {!Array<!RenderedConnection>} Array of connections.
  * @package
  */
-Blockly.BlockSvg.prototype.getConnections_ = function(all) {
-  var myConnections = [];
+BlockSvg.prototype.getConnections_ = function(all) {
+  const myConnections = [];
   if (all || this.rendered) {
     if (this.outputConnection) {
       myConnections.push(this.outputConnection);
@@ -1473,7 +1480,7 @@ Blockly.BlockSvg.prototype.getConnections_ = function(all) {
       myConnections.push(this.nextConnection);
     }
     if (all || !this.collapsed_) {
-      for (var i = 0, input; (input = this.inputList[i]); i++) {
+      for (let i = 0, input; (input = this.inputList[i]); i++) {
         if (input.connection) {
           myConnections.push(input.connection);
         }
@@ -1488,78 +1495,72 @@ Blockly.BlockSvg.prototype.getConnections_ = function(all) {
  * @param {boolean} ignoreShadows If true,the last connection on a non-shadow
  *     block will be returned. If false, this will follow shadows to find the
  *     last connection.
- * @return {?Blockly.RenderedConnection} The last next connection on the stack,
+ * @return {?RenderedConnection} The last next connection on the stack,
  *     or null.
  * @package
  * @override
  */
-Blockly.BlockSvg.prototype.lastConnectionInStack = function(ignoreShadows) {
-  return /** @type {Blockly.RenderedConnection} */ (
-    Blockly.BlockSvg.superClass_
-        .lastConnectionInStack.call(this, ignoreShadows));
+BlockSvg.prototype.lastConnectionInStack = function(ignoreShadows) {
+  return /** @type {RenderedConnection} */ (
+      BlockSvg.superClass_.lastConnectionInStack.call(this, ignoreShadows));
 };
 
 /**
  * Find the connection on this block that corresponds to the given connection
  * on the other block.
  * Used to match connections between a block and its insertion marker.
- * @param {!Blockly.Block} otherBlock The other block to match against.
- * @param {!Blockly.Connection} conn The other connection to match.
- * @return {?Blockly.RenderedConnection} The matching connection on this block,
+ * @param {!Block} otherBlock The other block to match against.
+ * @param {!Connection} conn The other connection to match.
+ * @return {?RenderedConnection} The matching connection on this block,
  *     or null.
  * @package
  * @override
  */
-Blockly.BlockSvg.prototype.getMatchingConnection = function(otherBlock, conn) {
-  return /** @type {Blockly.RenderedConnection} */ (
-    Blockly.BlockSvg.superClass_.getMatchingConnection.call(this,
-        otherBlock, conn));
+BlockSvg.prototype.getMatchingConnection = function(otherBlock, conn) {
+  return /** @type {RenderedConnection} */ (
+      BlockSvg.superClass_.getMatchingConnection.call(this, otherBlock, conn));
 };
 
 /**
  * Create a connection of the specified type.
  * @param {number} type The type of the connection to create.
- * @return {!Blockly.RenderedConnection} A new connection of the specified type.
+ * @return {!RenderedConnection} A new connection of the specified type.
  * @protected
  */
-Blockly.BlockSvg.prototype.makeConnection_ = function(type) {
-  return new Blockly.RenderedConnection(this, type);
+BlockSvg.prototype.makeConnection_ = function(type) {
+  return new RenderedConnection(this, type);
 };
 
 /**
  * Bump unconnected blocks out of alignment.  Two blocks which aren't actually
  * connected should not coincidentally line up on screen.
  */
-Blockly.BlockSvg.prototype.bumpNeighbours = function() {
+BlockSvg.prototype.bumpNeighbours = function() {
   if (!this.workspace) {
     return;  // Deleted block.
   }
   if (this.workspace.isDragging()) {
     return;  // Don't bump blocks during a drag.
   }
-  var rootBlock = this.getRootBlock();
+  const rootBlock = this.getRootBlock();
   if (rootBlock.isInFlyout) {
     return;  // Don't move blocks around in a flyout.
   }
   // Loop through every connection on this block.
-  var myConnections = this.getConnections_(false);
-  for (var i = 0, connection; (connection = myConnections[i]); i++) {
-
+  const myConnections = this.getConnections_(false);
+  for (let i = 0, connection; (connection = myConnections[i]); i++) {
     // Spider down from this block bumping all sub-blocks.
     if (connection.isConnected() && connection.isSuperior()) {
       connection.targetBlock().bumpNeighbours();
     }
 
-    var neighbours =
-        connection.neighbours(Blockly.internalConstants.SNAP_RADIUS);
-    for (var j = 0, otherConnection; (otherConnection = neighbours[j]); j++) {
-
+    const neighbours = connection.neighbours(internalConstants.SNAP_RADIUS);
+    for (let j = 0, otherConnection; (otherConnection = neighbours[j]); j++) {
       // If both connections are connected, that's probably fine.  But if
       // either one of them is unconnected, then there could be confusion.
       if (!connection.isConnected() || !otherConnection.isConnected()) {
         // Only bump blocks if they are from different tree structures.
         if (otherConnection.getSourceBlock().getRootBlock() != rootBlock) {
-
           // Always bump the inferior block.
           if (connection.isSuperior()) {
             otherConnection.bumpAwayFrom(connection);
@@ -1577,42 +1578,42 @@ Blockly.BlockSvg.prototype.bumpNeighbours = function() {
  * delay.
  * @package
  */
-Blockly.BlockSvg.prototype.scheduleSnapAndBump = function() {
-  var block = this;
+BlockSvg.prototype.scheduleSnapAndBump = function() {
+  const block = this;
   // Ensure that any snap and bump are part of this move's event group.
-  var group = Blockly.Events.getGroup();
+  const group = Events.getGroup();
 
   setTimeout(function() {
-    Blockly.Events.setGroup(group);
+    Events.setGroup(group);
     block.snapToGrid();
-    Blockly.Events.setGroup(false);
-  }, Blockly.internalConstants.BUMP_DELAY / 2);
+    Events.setGroup(false);
+  }, internalConstants.BUMP_DELAY / 2);
 
   setTimeout(function() {
-    Blockly.Events.setGroup(group);
+    Events.setGroup(group);
     block.bumpNeighbours();
-    Blockly.Events.setGroup(false);
-  }, Blockly.internalConstants.BUMP_DELAY);
+    Events.setGroup(false);
+  }, internalConstants.BUMP_DELAY);
 };
 
 /**
  * Position a block so that it doesn't move the target block when connected.
  * The block to position is usually either the first block in a dragged stack or
  * an insertion marker.
- * @param {!Blockly.RenderedConnection} sourceConnection The connection on the
+ * @param {!RenderedConnection} sourceConnection The connection on the
  *     moving block's stack.
- * @param {!Blockly.RenderedConnection} targetConnection The connection that
+ * @param {!RenderedConnection} targetConnection The connection that
  *     should stay stationary as this block is positioned.
  * @package
  */
-Blockly.BlockSvg.prototype.positionNearConnection = function(sourceConnection,
-    targetConnection) {
+BlockSvg.prototype.positionNearConnection = function(
+    sourceConnection, targetConnection) {
   // We only need to position the new block if it's before the existing one,
   // otherwise its position is set by the previous block.
-  if (sourceConnection.type == Blockly.connectionTypes.NEXT_STATEMENT ||
-      sourceConnection.type == Blockly.connectionTypes.INPUT_VALUE) {
-    var dx = targetConnection.x - sourceConnection.x;
-    var dy = targetConnection.y - sourceConnection.y;
+  if (sourceConnection.type == connectionTypes.NEXT_STATEMENT ||
+      sourceConnection.type == connectionTypes.INPUT_VALUE) {
+    const dx = targetConnection.x - sourceConnection.x;
+    const dy = targetConnection.y - sourceConnection.y;
 
     this.moveBy(dx, dy);
   }
@@ -1620,23 +1621,22 @@ Blockly.BlockSvg.prototype.positionNearConnection = function(sourceConnection,
 
 /**
  * Return the parent block or null if this block is at the top level.
- * @return {?Blockly.BlockSvg} The block (if any) that holds the current block.
+ * @return {?BlockSvg} The block (if any) that holds the current block.
  * @override
  */
-Blockly.BlockSvg.prototype.getParent = function() {
-  return /** @type {!Blockly.BlockSvg} */ (
-    Blockly.BlockSvg.superClass_.getParent.call(this));
+BlockSvg.prototype.getParent = function() {
+  return /** @type {!BlockSvg} */ (BlockSvg.superClass_.getParent.call(this));
 };
 
 /**
  * Return the top-most block in this block's tree.
  * This will return itself if this block is at the top level.
- * @return {!Blockly.BlockSvg} The root block.
+ * @return {!BlockSvg} The root block.
  * @override
  */
-Blockly.BlockSvg.prototype.getRootBlock = function() {
-  return /** @type {!Blockly.BlockSvg} */ (
-    Blockly.BlockSvg.superClass_.getRootBlock.call(this));
+BlockSvg.prototype.getRootBlock = function() {
+  return /** @type {!BlockSvg} */ (
+      BlockSvg.superClass_.getRootBlock.call(this));
 };
 
 /**
@@ -1644,14 +1644,14 @@ Blockly.BlockSvg.prototype.getRootBlock = function() {
  * @param {boolean=} opt_bubble If false, just render this block.
  *   If true, also render block's parent, grandparent, etc.  Defaults to true.
  */
-Blockly.BlockSvg.prototype.render = function(opt_bubble) {
+BlockSvg.prototype.render = function(opt_bubble) {
   if (this.renderIsInProgress_) {
     return;  // Don't allow recursive renders.
   }
   this.renderIsInProgress_ = true;
   try {
     this.rendered = true;
-    Blockly.utils.dom.startTextWidthCache();
+    dom.startTextWidthCache();
 
     if (this.isCollapsed()) {
       this.updateCollapsed_();
@@ -1660,7 +1660,7 @@ Blockly.BlockSvg.prototype.render = function(opt_bubble) {
     this.updateConnectionLocations_();
 
     if (opt_bubble !== false) {
-      var parentBlock = this.getParent();
+      const parentBlock = this.getParent();
       if (parentBlock) {
         parentBlock.render(true);
       } else {
@@ -1669,7 +1669,7 @@ Blockly.BlockSvg.prototype.render = function(opt_bubble) {
       }
     }
 
-    Blockly.utils.dom.stopTextWidthCache();
+    dom.stopTextWidthCache();
     this.updateMarkers_();
   } finally {
     this.renderIsInProgress_ = false;
@@ -1680,13 +1680,13 @@ Blockly.BlockSvg.prototype.render = function(opt_bubble) {
  * Redraw any attached marker or cursor svgs if needed.
  * @protected
  */
-Blockly.BlockSvg.prototype.updateMarkers_ = function() {
+BlockSvg.prototype.updateMarkers_ = function() {
   if (this.workspace.keyboardAccessibilityMode && this.pathObject.cursorSvg) {
     this.workspace.getCursor().draw();
   }
   if (this.workspace.keyboardAccessibilityMode && this.pathObject.markerSvg) {
     // TODO(#4592): Update all markers on the block.
-    this.workspace.getMarker(Blockly.MarkerManager.LOCAL_MARKER).draw();
+    this.workspace.getMarker(MarkerManager.LOCAL_MARKER).draw();
   }
 };
 
@@ -1696,8 +1696,8 @@ Blockly.BlockSvg.prototype.updateMarkers_ = function() {
  * connection locations.
  * @private
  */
-Blockly.BlockSvg.prototype.updateConnectionLocations_ = function() {
-  var blockTL = this.getRelativeToSurfaceXY();
+BlockSvg.prototype.updateConnectionLocations_ = function() {
+  const blockTL = this.getRelativeToSurfaceXY();
   // Don't tighten previous or output connections because they are inferior
   // connections.
   if (this.previousConnection) {
@@ -1707,8 +1707,8 @@ Blockly.BlockSvg.prototype.updateConnectionLocations_ = function() {
     this.outputConnection.moveToOffset(blockTL);
   }
 
-  for (var i = 0; i < this.inputList.length; i++) {
-    var conn = this.inputList[i].connection;
+  for (let i = 0; i < this.inputList.length; i++) {
+    const conn = this.inputList[i].connection;
     if (conn) {
       conn.moveToOffset(blockTL);
       if (conn.isConnected()) {
@@ -1731,7 +1731,7 @@ Blockly.BlockSvg.prototype.updateConnectionLocations_ = function() {
  *     block SVG group.
  * @package
  */
-Blockly.BlockSvg.prototype.setCursorSvg = function(cursorSvg) {
+BlockSvg.prototype.setCursorSvg = function(cursorSvg) {
   this.pathObject.setCursorSvg(cursorSvg);
 };
 
@@ -1741,7 +1741,7 @@ Blockly.BlockSvg.prototype.setCursorSvg = function(cursorSvg) {
  *     block SVG group.
  * @package
  */
-Blockly.BlockSvg.prototype.setMarkerSvg = function(markerSvg) {
+BlockSvg.prototype.setMarkerSvg = function(markerSvg) {
   this.pathObject.setMarkerSvg(markerSvg);
 };
 
@@ -1752,15 +1752,15 @@ Blockly.BlockSvg.prototype.setMarkerSvg = function(markerSvg) {
  *    properties in workspace units.
  * @package
  */
-Blockly.BlockSvg.prototype.getHeightWidth = function() {
-  var height = this.height;
-  var width = this.width;
+BlockSvg.prototype.getHeightWidth = function() {
+  let height = this.height;
+  let width = this.width;
   // Recursively add size of subsequent blocks.
-  var nextBlock = this.getNextBlock();
+  const nextBlock = this.getNextBlock();
   if (nextBlock) {
-    var nextHeightWidth = nextBlock.getHeightWidth();
-    var workspace = /** @type {!Blockly.WorkspaceSvg} */ (this.workspace);
-    var tabHeight = workspace.getRenderer().getConstants().NOTCH_HEIGHT;
+    const nextHeightWidth = nextBlock.getHeightWidth();
+    const workspace = /** @type {!WorkspaceSvg} */ (this.workspace);
+    const tabHeight = workspace.getRenderer().getConstants().NOTCH_HEIGHT;
     height += nextHeightWidth.height - tabHeight;
     width = Math.max(width, nextHeightWidth.width);
   }
@@ -1773,17 +1773,19 @@ Blockly.BlockSvg.prototype.getHeightWidth = function() {
  * @param {boolean} add True if highlighting should be added.
  * @package
  */
-Blockly.BlockSvg.prototype.fadeForReplacement = function(add) {
+BlockSvg.prototype.fadeForReplacement = function(add) {
   this.pathObject.updateReplacementFade(add);
 };
 
 /**
  * Visual effect to show that if the dragging block is dropped it will connect
  * to this input.
- * @param {Blockly.Connection} conn The connection on the input to highlight.
+ * @param {Connection} conn The connection on the input to highlight.
  * @param {boolean} add True if highlighting should be added.
  * @package
  */
-Blockly.BlockSvg.prototype.highlightShapeForInput = function(conn, add) {
+BlockSvg.prototype.highlightShapeForInput = function(conn, add) {
   this.pathObject.updateShapeForInputHighlight(conn, add);
 };
+
+exports = BlockSvg;
diff --git a/tests/deps.js b/tests/deps.js
index a54d2acc2..2dceb7137 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -11,7 +11,7 @@ goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode',
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', '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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', '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'});
+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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.MarkerManager', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', '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.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/blockly_options.js', ['Blockly.BlocklyOptions'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});

From b5444b4e89287d34b21ce1f2cf5dc36b54dcf519 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 9 Aug 2021 12:30:07 -0700
Subject: [PATCH 561/833] Migrate core/renderers/geras/path_object.js to
 goog.module syntax (#5306)

* Migrate core/renderers/geras/path_object.js to goog.module

* Migrate core/renderers/geras/path_object.js to named requires

* clang-format core/renderers/geras/path_object.js
---
 core/renderers/geras/path_object.js | 78 ++++++++++++++---------------
 tests/deps.js                       |  2 +-
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/core/renderers/geras/path_object.js b/core/renderers/geras/path_object.js
index 474cad3c0..9d50c672c 100644
--- a/core/renderers/geras/path_object.js
+++ b/core/renderers/geras/path_object.js
@@ -11,32 +11,35 @@
 
 'use strict';
 
-goog.provide('Blockly.geras.PathObject');
+goog.module('Blockly.geras.PathObject');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.PathObject');
-goog.require('Blockly.geras.ConstantProvider');
-goog.require('Blockly.Theme');
-goog.require('Blockly.utils.colour');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Svg');
+const BasePathObject = goog.require('Blockly.blockRendering.PathObject');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.geras.ConstantProvider');
+const Svg = goog.require('Blockly.utils.Svg');
+/* eslint-disable-next-line no-unused-vars */
+const Theme = goog.requireType('Blockly.Theme');
+const colour = goog.require('Blockly.utils.colour');
+const dom = goog.require('Blockly.utils.dom');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object that handles creating and setting each of the SVG elements
  * used by the renderer.
  * @param {!SVGElement} root The root SVG element.
- * @param {!Blockly.Theme.BlockStyle} style The style object to use for
+ * @param {!Theme.BlockStyle} style The style object to use for
  *     colouring.
- * @param {!Blockly.geras.ConstantProvider} constants The renderer's constants.
+ * @param {!ConstantProvider} constants The renderer's constants.
  * @constructor
- * @extends {Blockly.blockRendering.PathObject}
+ * @extends {BasePathObject}
  * @package
  */
-Blockly.geras.PathObject = function(root, style, constants) {
+const PathObject = function(root, style, constants) {
   /**
    * The renderer's constant provider.
-   * @type {!Blockly.geras.ConstantProvider}
+   * @type {!ConstantProvider}
    */
   this.constants = constants;
 
@@ -50,9 +53,8 @@ Blockly.geras.PathObject = function(root, style, constants) {
    * @type {SVGElement}
    * @package
    */
-  this.svgPathDark = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
-      {'class': 'blocklyPathDark', 'transform': 'translate(1,1)'},
+  this.svgPathDark = dom.createSvgElement(
+      Svg.PATH, {'class': 'blocklyPathDark', 'transform': 'translate(1,1)'},
       this.svgRoot);
 
   /**
@@ -60,18 +62,16 @@ Blockly.geras.PathObject = function(root, style, constants) {
    * @type {!SVGElement}
    * @package
    */
-  this.svgPath = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
-      {'class': 'blocklyPath'}, this.svgRoot);
+  this.svgPath =
+      dom.createSvgElement(Svg.PATH, {'class': 'blocklyPath'}, this.svgRoot);
 
   /**
    * The light path of the block.
    * @type {SVGElement}
    * @package
    */
-  this.svgPathLight = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
-      {'class': 'blocklyPathLight'}, this.svgRoot);
+  this.svgPathLight = dom.createSvgElement(
+      Svg.PATH, {'class': 'blocklyPathLight'}, this.svgRoot);
 
   /**
    * The colour of the dark path on the block in '#RRGGBB' format.
@@ -82,18 +82,17 @@ Blockly.geras.PathObject = function(root, style, constants) {
 
   /**
    * The style object to use when colouring block paths.
-   * @type {!Blockly.Theme.BlockStyle}
+   * @type {!Theme.BlockStyle}
    * @package
    */
   this.style = style;
 };
-Blockly.utils.object.inherits(Blockly.geras.PathObject,
-    Blockly.blockRendering.PathObject);
+object.inherits(PathObject, BasePathObject);
 
 /**
  * @override
  */
-Blockly.geras.PathObject.prototype.setPath = function(mainPath) {
+PathObject.prototype.setPath = function(mainPath) {
   this.svgPath.setAttribute('d', mainPath);
   this.svgPathDark.setAttribute('d', mainPath);
 };
@@ -103,14 +102,14 @@ Blockly.geras.PathObject.prototype.setPath = function(mainPath) {
  * @param {string} highlightPath The highlight path.
  * @package
  */
-Blockly.geras.PathObject.prototype.setHighlightPath = function(highlightPath) {
+PathObject.prototype.setHighlightPath = function(highlightPath) {
   this.svgPathLight.setAttribute('d', highlightPath);
 };
 
 /**
  * @override
  */
-Blockly.geras.PathObject.prototype.flipRTL = function() {
+PathObject.prototype.flipRTL = function() {
   // Mirror the block's path.
   this.svgPath.setAttribute('transform', 'scale(-1 1)');
   this.svgPathLight.setAttribute('transform', 'scale(-1 1)');
@@ -120,13 +119,13 @@ Blockly.geras.PathObject.prototype.flipRTL = function() {
 /**
  * @override
  */
-Blockly.geras.PathObject.prototype.applyColour = function(block) {
+PathObject.prototype.applyColour = function(block) {
   this.svgPathLight.style.display = '';
   this.svgPathDark.style.display = '';
   this.svgPathLight.setAttribute('stroke', this.style.colourTertiary);
   this.svgPathDark.setAttribute('fill', this.colourDark);
 
-  Blockly.geras.PathObject.superClass_.applyColour.call(this, block);
+  PathObject.superClass_.applyColour.call(this, block);
 
   this.svgPath.setAttribute('stroke', 'none');
 };
@@ -134,20 +133,19 @@ Blockly.geras.PathObject.prototype.applyColour = function(block) {
 /**
  * @override
  */
-Blockly.geras.PathObject.prototype.setStyle = function(blockStyle) {
+PathObject.prototype.setStyle = function(blockStyle) {
   this.style = blockStyle;
   this.colourDark =
-      Blockly.utils.colour.blend('#000', this.style.colourPrimary, 0.2) ||
-      this.colourDark;
+      colour.blend('#000', this.style.colourPrimary, 0.2) || this.colourDark;
 };
 
 /**
  * @override
  */
-Blockly.geras.PathObject.prototype.updateHighlighted = function(highlighted) {
+PathObject.prototype.updateHighlighted = function(highlighted) {
   if (highlighted) {
-    this.svgPath.setAttribute('filter',
-        'url(#' + this.constants.embossFilterId + ')');
+    this.svgPath.setAttribute(
+        'filter', 'url(#' + this.constants.embossFilterId + ')');
     this.svgPathLight.style.display = 'none';
   } else {
     this.svgPath.setAttribute('filter', 'none');
@@ -158,7 +156,7 @@ Blockly.geras.PathObject.prototype.updateHighlighted = function(highlighted) {
 /**
  * @override
  */
-Blockly.geras.PathObject.prototype.updateShadow_ = function(shadow) {
+PathObject.prototype.updateShadow_ = function(shadow) {
   if (shadow) {
     this.svgPathLight.style.display = 'none';
     this.svgPathDark.setAttribute('fill', this.style.colourSecondary);
@@ -170,9 +168,11 @@ Blockly.geras.PathObject.prototype.updateShadow_ = function(shadow) {
 /**
  * @override
  */
-Blockly.geras.PathObject.prototype.updateDisabled_ = function(disabled) {
-  Blockly.geras.PathObject.superClass_.updateDisabled_.call(this, disabled);
+PathObject.prototype.updateDisabled_ = function(disabled) {
+  PathObject.superClass_.updateDisabled_.call(this, disabled);
   if (disabled) {
     this.svgPath.setAttribute('stroke', 'none');
   }
 };
+
+exports = PathObject;
diff --git a/tests/deps.js b/tests/deps.js
index 2dceb7137..d979a3cbe 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -137,7 +137,7 @@ goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockl
 goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/measurables/inputs.js', ['Blockly.geras.InlineInput', 'Blockly.geras.StatementInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.PathObject', 'Blockly.geras.ConstantProvider', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types']);
 goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);

From fbd7c8ab79459cee6a629dc7ade9aed993c928f4 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 9 Aug 2021 12:43:06 -0700
Subject: [PATCH 562/833] Migrate core/events/workspace_events.js to
 goog.module syntax (#5274)

* Migrate core/events/workspace_events.js to ES6 const/let

* Migrate core/events/workspace_events.js to goog.module

* Migrate core/events/workspace_events.js to named requires

* clang-format core/events/workspace_events.js

* Update build artifact sizes in check_metadata.sh

* Add comment about root cause of build artifact size change

* Migrate core/events/workspace_events.js to ES6 const/let

* Migrate core/events/workspace_events.js to goog.module

* Migrate core/events/workspace_events.js to named requires

* clang-format core/events/workspace_events.js

* Clarify require name for Blockly.Events.Abstract
---
 core/events/workspace_events.js | 41 +++++++++++++++++----------------
 tests/deps.js                   |  2 +-
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/core/events/workspace_events.js b/core/events/workspace_events.js
index bb22097a0..df832602e 100644
--- a/core/events/workspace_events.js
+++ b/core/events/workspace_events.js
@@ -10,14 +10,15 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.FinishedLoading');
+goog.module('Blockly.Events.FinishedLoading');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.Abstract');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.Workspace');
+const Events = goog.require('Blockly.Events');
+const EventsAbstract = goog.require('Blockly.Events.Abstract');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
@@ -25,13 +26,12 @@ goog.requireType('Blockly.Workspace');
  * Used to notify the developer when the workspace has finished loading (i.e
  * domToWorkspace).
  * Finished loading events do not record undo or redo.
- * @param {!Blockly.Workspace=} opt_workspace The workspace that has finished
+ * @param {!Workspace=} opt_workspace The workspace that has finished
  *    loading.  Undefined for a blank event.
- * @extends {Blockly.Events.Abstract}
+ * @extends {EventsAbstract}
  * @constructor
  */
-Blockly.Events.FinishedLoading = function(opt_workspace) {
-
+const FinishedLoading = function(opt_workspace) {
   /**
    * Whether or not the event is blank (to be populated by fromJson).
    * @type {boolean}
@@ -50,26 +50,25 @@ Blockly.Events.FinishedLoading = function(opt_workspace) {
    * perspective, and should be undone together.
    * @type {string}
    */
-  this.group = Blockly.Events.getGroup();
+  this.group = Events.getGroup();
 
   // Workspace events do not undo or redo.
   this.recordUndo = false;
 };
-Blockly.utils.object.inherits(Blockly.Events.FinishedLoading,
-    Blockly.Events.Abstract);
+object.inherits(FinishedLoading, EventsAbstract);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.FinishedLoading.prototype.type = Blockly.Events.FINISHED_LOADING;
+FinishedLoading.prototype.type = Events.FINISHED_LOADING;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.FinishedLoading.prototype.toJson = function() {
-  var json = {
+FinishedLoading.prototype.toJson = function() {
+  const json = {
     'type': this.type,
   };
   if (this.group) {
@@ -85,11 +84,13 @@ Blockly.Events.FinishedLoading.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.FinishedLoading.prototype.fromJson = function(json) {
+FinishedLoading.prototype.fromJson = function(json) {
   this.isBlank = false;
   this.workspaceId = json['workspaceId'];
   this.group = json['group'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.FINISHED_LOADING, Blockly.Events.FinishedLoading);
+registry.register(
+    registry.Type.EVENT, Events.FINISHED_LOADING, FinishedLoading);
+
+exports = FinishedLoading;
diff --git a/tests/deps.js b/tests/deps.js
index d979a3cbe..9a5b768a6 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -48,7 +48,7 @@ goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events
 goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/variable_events.js', ['Blockly.Events.VarBase', 'Blockly.Events.VarCreate', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es5'});
+goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/ws_comment_events.js', ['Blockly.Events.CommentBase', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible', 'Blockly.IRegistrable', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});

From 5f669a76071b96175a18dda745fde640b83e2234 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 11:18:14 -0700
Subject: [PATCH 563/833] Migrate core/workspace.js to ES6 const/let

---
 core/workspace.js | 59 +++++++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/core/workspace.js b/core/workspace.js
index 296989d81..427eebaae 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -53,7 +53,7 @@ Blockly.Workspace = function(opt_options) {
   /** @type {Blockly.utils.toolbox.Position} */
   this.toolboxPosition = this.options.toolboxPosition;
 
-  var connectionCheckerClass = Blockly.registry.getClassFromOptions(
+  const connectionCheckerClass = Blockly.registry.getClassFromOptions(
       Blockly.registry.Type.CONNECTION_CHECKER, this.options, true);
   /**
    * An object that encapsulates logic for safety, type, and dragging checks.
@@ -182,8 +182,8 @@ Blockly.Workspace.SCAN_ANGLE = 3;
  * @private
  */
 Blockly.Workspace.prototype.sortObjects_ = function(a, b) {
-  var aXY = a.getRelativeToSurfaceXY();
-  var bXY = b.getRelativeToSurfaceXY();
+  const aXY = a.getRelativeToSurfaceXY();
+  const bXY = b.getRelativeToSurfaceXY();
   return (aXY.y + Blockly.Workspace.prototype.sortObjects_.offset * aXY.x) -
       (bXY.y + Blockly.Workspace.prototype.sortObjects_.offset * bXY.x);
 };
@@ -214,7 +214,7 @@ Blockly.Workspace.prototype.removeTopBlock = function(block) {
  */
 Blockly.Workspace.prototype.getTopBlocks = function(ordered) {
   // Copy the topBlocks_ list.
-  var blocks = [].concat(this.topBlocks_);
+  const blocks = [].concat(this.topBlocks_);
   if (ordered && blocks.length > 1) {
     this.sortObjects_.offset =
         Math.sin(Blockly.utils.math.toRadians(Blockly.Workspace.SCAN_ANGLE));
@@ -260,7 +260,7 @@ Blockly.Workspace.prototype.getBlocksByType = function(type, ordered) {
   if (!this.typedBlocksDB_[type]) {
     return [];
   }
-  var blocks = this.typedBlocksDB_[type].slice(0);
+  const blocks = this.typedBlocksDB_[type].slice(0);
   if (ordered && blocks.length > 1) {
     this.sortObjects_.offset =
         Math.sin(Blockly.utils.math.toRadians(Blockly.Workspace.SCAN_ANGLE));
@@ -313,7 +313,7 @@ Blockly.Workspace.prototype.removeTopComment = function(comment) {
  */
 Blockly.Workspace.prototype.getTopComments = function(ordered) {
   // Copy the topComments_ list.
-  var comments = [].concat(this.topComments_);
+  const comments = [].concat(this.topComments_);
   if (ordered && comments.length > 1) {
     this.sortObjects_.offset =
         Math.sin(Blockly.utils.math.toRadians(Blockly.Workspace.SCAN_ANGLE));
@@ -332,24 +332,25 @@ Blockly.Workspace.prototype.getTopComments = function(ordered) {
  * @return {!Array<!Blockly.Block>} Array of blocks.
  */
 Blockly.Workspace.prototype.getAllBlocks = function(ordered) {
+  let blocks;
   if (ordered) {
     // Slow, but ordered.
-    var topBlocks = this.getTopBlocks(true);
-    var blocks = [];
-    for (var i = 0; i < topBlocks.length; i++) {
+    const topBlocks = this.getTopBlocks(true);
+    blocks = [];
+    for (let i = 0; i < topBlocks.length; i++) {
       blocks.push.apply(blocks, topBlocks[i].getDescendants(true));
     }
   } else {
     // Fast, but in no particular order.
-    var blocks = this.getTopBlocks(false);
-    for (var i = 0; i < blocks.length; i++) {
+    blocks = this.getTopBlocks(false);
+    for (let i = 0; i < blocks.length; i++) {
       blocks.push.apply(blocks, blocks[i].getChildren(false));
     }
   }
 
   // Insertion markers exist on the workspace for rendering reasons, but aren't
   // "real" blocks from a developer perspective.
-  var filtered = blocks.filter(function(block) {
+  const filtered = blocks.filter(function (block) {
     return !block.isInsertionMarker();
   });
 
@@ -362,7 +363,7 @@ Blockly.Workspace.prototype.getAllBlocks = function(ordered) {
 Blockly.Workspace.prototype.clear = function() {
   this.isClearing = true;
   try {
-    var existingGroup = Blockly.Events.getGroup();
+    const existingGroup = Blockly.Events.getGroup();
     if (!existingGroup) {
       Blockly.Events.setGroup(true);
     }
@@ -533,7 +534,7 @@ Blockly.Workspace.prototype.remainingCapacityOfType = function(type) {
     return Infinity;
   }
 
-  var maxInstanceOfType = (this.options.maxInstances[type] !== undefined) ?
+  const maxInstanceOfType = (this.options.maxInstances[type] !== undefined) ?
       this.options.maxInstances[type] : Infinity;
 
   return maxInstanceOfType - this.getBlocksByType(type, false).length;
@@ -553,8 +554,8 @@ Blockly.Workspace.prototype.isCapacityAvailable = function(typeCountsMap) {
   if (!this.hasBlockLimits()) {
     return true;
   }
-  var copyableBlocksCount = 0;
-  for (var type in typeCountsMap) {
+  let copyableBlocksCount = 0;
+  for (const type in typeCountsMap) {
     if (typeCountsMap[type] > this.remainingCapacityOfType(type)) {
       return false;
     }
@@ -598,26 +599,28 @@ Blockly.Workspace.prototype.getRedoStack = function() {
  * @param {boolean} redo False if undo, true if redo.
  */
 Blockly.Workspace.prototype.undo = function(redo) {
-  var inputStack = redo ? this.redoStack_ : this.undoStack_;
-  var outputStack = redo ? this.undoStack_ : this.redoStack_;
-  var inputEvent = inputStack.pop();
+  const inputStack = redo ? this.redoStack_ : this.undoStack_;
+  const outputStack = redo ? this.undoStack_ : this.redoStack_;
+  const inputEvent = inputStack.pop();
   if (!inputEvent) {
     return;
   }
-  var events = [inputEvent];
+  let events = [inputEvent];
   // Do another undo/redo if the next one is of the same group.
   while (inputStack.length && inputEvent.group &&
       inputEvent.group == inputStack[inputStack.length - 1].group) {
     events.push(inputStack.pop());
   }
   // Push these popped events on the opposite stack.
-  for (var i = 0, event; (event = events[i]); i++) {
+  for (let i = 0; i < events.length; i++) {
+    const event = events[i];
     outputStack.push(event);
   }
   events = Blockly.Events.filter(events, redo);
   Blockly.Events.recordUndo = false;
   try {
-    for (var i = 0, event; (event = events[i]); i++) {
+    for (let i = 0; i < events.length; i++) {
+      const event = events[i];
       event.run(redo);
     }
   } finally {
@@ -668,7 +671,8 @@ Blockly.Workspace.prototype.fireChangeListener = function(event) {
       this.undoStack_.shift();
     }
   }
-  for (var i = 0, func; (func = this.listeners_[i]); i++) {
+  for (let i = 0; i < this.listeners_.length; i++) {
+    const func = this.listeners_[i];
     func(event);
   }
 };
@@ -721,8 +725,9 @@ Blockly.Workspace.prototype.getCommentById = function(id) {
  */
 Blockly.Workspace.prototype.allInputsFilled = function(
     opt_shadowBlocksAreFilled) {
-  var blocks = this.getTopBlocks(false);
-  for (var i = 0, block; (block = blocks[i]); i++) {
+  const blocks = this.getTopBlocks(false);
+  for (let i = 0; i < blocks.length; i++) {
+    const block = blocks[i];
     if (!block.allInputsFilled(opt_shadowBlocksAreFilled)) {
       return false;
     }
@@ -786,8 +791,8 @@ Blockly.Workspace.getById = function(id) {
  * @return {!Array<!Blockly.Workspace>} Array of workspaces.
  */
 Blockly.Workspace.getAll = function() {
-  var workspaces = [];
-  for (var workspaceId in Blockly.Workspace.WorkspaceDB_) {
+  const workspaces = [];
+  for (const workspaceId in Blockly.Workspace.WorkspaceDB_) {
     workspaces.push(Blockly.Workspace.WorkspaceDB_[workspaceId]);
   }
   return workspaces;

From ac4fa41cb39401a8c24729a7a3b23df4dbc9cdfa Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 11:25:25 -0700
Subject: [PATCH 564/833] Migrate core/workspace.js to goog.module

---
 core/workspace.js | 140 ++++++++++++++++++++++++----------------------
 tests/deps.js     |   2 +-
 2 files changed, 73 insertions(+), 69 deletions(-)

diff --git a/core/workspace.js b/core/workspace.js
index 427eebaae..5061e238a 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Workspace');
+goog.module('Blockly.Workspace');
+goog.module.declareLegacyNamespace();
 
 /** @suppress {extraRequire} */
 goog.require('Blockly.ConnectionChecker');
@@ -39,10 +40,10 @@ goog.requireType('Blockly.WorkspaceComment');
  * @constructor
  * @implements {Blockly.IASTNodeLocation}
  */
-Blockly.Workspace = function(opt_options) {
+const Workspace = function(opt_options) {
   /** @type {string} */
   this.id = Blockly.utils.genUid();
-  Blockly.Workspace.WorkspaceDB_[this.id] = this;
+  Workspace.WorkspaceDB_[this.id] = this;
   /** @type {!Blockly.Options} */
   this.options = opt_options ||
       new Blockly.Options(/** @type {!Blockly.BlocklyOptions} */ ({}));
@@ -128,38 +129,38 @@ Blockly.Workspace = function(opt_options) {
  * Returns `true` if the workspace is visible and `false` if it's headless.
  * @type {boolean}
  */
-Blockly.Workspace.prototype.rendered = false;
+Workspace.prototype.rendered = false;
 
 /**
  * Returns `true` if the workspace is currently in the process of a bulk clear.
  * @type {boolean}
  * @package
  */
-Blockly.Workspace.prototype.isClearing = false;
+Workspace.prototype.isClearing = false;
 
 /**
  * Maximum number of undo events in stack. `0` turns off undo, `Infinity` sets
  * it to unlimited.
  * @type {number}
  */
-Blockly.Workspace.prototype.MAX_UNDO = 1024;
+Workspace.prototype.MAX_UNDO = 1024;
 
 /**
  * Set of databases for rapid lookup of connection locations.
  * @type {Array<!Blockly.ConnectionDB>}
  */
-Blockly.Workspace.prototype.connectionDBList = null;
+Workspace.prototype.connectionDBList = null;
 
 /**
  * Dispose of this workspace.
  * Unlink from all DOM elements to prevent memory leaks.
  * @suppress {checkTypes}
  */
-Blockly.Workspace.prototype.dispose = function() {
+Workspace.prototype.dispose = function() {
   this.listeners_.length = 0;
   this.clear();
   // Remove from workspace database.
-  delete Blockly.Workspace.WorkspaceDB_[this.id];
+  delete Workspace.WorkspaceDB_[this.id];
 };
 
 /**
@@ -168,7 +169,7 @@ Blockly.Workspace.prototype.dispose = function() {
  * a left to right bias (reversed in RTL).  Units are in degrees.
  * See: https://tvtropes.org/pmwiki/pmwiki.php/Main/DiagonalBilling
  */
-Blockly.Workspace.SCAN_ANGLE = 3;
+Workspace.SCAN_ANGLE = 3;
 
 /**
  * Compare function for sorting objects (blocks, comments, etc) by position;
@@ -181,18 +182,18 @@ Blockly.Workspace.SCAN_ANGLE = 3;
  *    object a's index.
  * @private
  */
-Blockly.Workspace.prototype.sortObjects_ = function(a, b) {
+Workspace.prototype.sortObjects_ = function(a, b) {
   const aXY = a.getRelativeToSurfaceXY();
   const bXY = b.getRelativeToSurfaceXY();
-  return (aXY.y + Blockly.Workspace.prototype.sortObjects_.offset * aXY.x) -
-      (bXY.y + Blockly.Workspace.prototype.sortObjects_.offset * bXY.x);
+  return (aXY.y + Workspace.prototype.sortObjects_.offset * aXY.x) -
+      (bXY.y + Workspace.prototype.sortObjects_.offset * bXY.x);
 };
 
 /**
  * Adds a block to the list of top blocks.
  * @param {!Blockly.Block} block Block to add.
  */
-Blockly.Workspace.prototype.addTopBlock = function(block) {
+Workspace.prototype.addTopBlock = function(block) {
   this.topBlocks_.push(block);
 };
 
@@ -200,7 +201,7 @@ Blockly.Workspace.prototype.addTopBlock = function(block) {
  * Removes a block from the list of top blocks.
  * @param {!Blockly.Block} block Block to remove.
  */
-Blockly.Workspace.prototype.removeTopBlock = function(block) {
+Workspace.prototype.removeTopBlock = function(block) {
   if (!Blockly.utils.arrayRemove(this.topBlocks_, block)) {
     throw Error('Block not present in workspace\'s list of top-most blocks.');
   }
@@ -212,12 +213,12 @@ Blockly.Workspace.prototype.removeTopBlock = function(block) {
  * @param {boolean} ordered Sort the list if true.
  * @return {!Array<!Blockly.Block>} The top-level block objects.
  */
-Blockly.Workspace.prototype.getTopBlocks = function(ordered) {
+Workspace.prototype.getTopBlocks = function(ordered) {
   // Copy the topBlocks_ list.
   const blocks = [].concat(this.topBlocks_);
   if (ordered && blocks.length > 1) {
     this.sortObjects_.offset =
-        Math.sin(Blockly.utils.math.toRadians(Blockly.Workspace.SCAN_ANGLE));
+        Math.sin(Blockly.utils.math.toRadians(Workspace.SCAN_ANGLE));
     if (this.RTL) {
       this.sortObjects_.offset *= -1;
     }
@@ -230,7 +231,7 @@ Blockly.Workspace.prototype.getTopBlocks = function(ordered) {
  * Add a block to the list of blocks keyed by type.
  * @param {!Blockly.Block} block Block to add.
  */
-Blockly.Workspace.prototype.addTypedBlock = function(block) {
+Workspace.prototype.addTypedBlock = function(block) {
   if (!this.typedBlocksDB_[block.type]) {
     this.typedBlocksDB_[block.type] = [];
   }
@@ -241,7 +242,7 @@ Blockly.Workspace.prototype.addTypedBlock = function(block) {
  * Remove a block from the list of blocks keyed by type.
  * @param {!Blockly.Block} block Block to remove.
  */
-Blockly.Workspace.prototype.removeTypedBlock = function(block) {
+Workspace.prototype.removeTypedBlock = function(block) {
   this.typedBlocksDB_[block.type].splice(this.typedBlocksDB_[block.type]
       .indexOf(block), 1);
   if (!this.typedBlocksDB_[block.type].length) {
@@ -256,14 +257,14 @@ Blockly.Workspace.prototype.removeTypedBlock = function(block) {
  * @param {boolean} ordered Sort the list if true.
  * @return {!Array<!Blockly.Block>} The blocks of the given type.
  */
-Blockly.Workspace.prototype.getBlocksByType = function(type, ordered) {
+Workspace.prototype.getBlocksByType = function(type, ordered) {
   if (!this.typedBlocksDB_[type]) {
     return [];
   }
   const blocks = this.typedBlocksDB_[type].slice(0);
   if (ordered && blocks.length > 1) {
     this.sortObjects_.offset =
-        Math.sin(Blockly.utils.math.toRadians(Blockly.Workspace.SCAN_ANGLE));
+        Math.sin(Blockly.utils.math.toRadians(Workspace.SCAN_ANGLE));
     if (this.RTL) {
       this.sortObjects_.offset *= -1;
     }
@@ -277,7 +278,7 @@ Blockly.Workspace.prototype.getBlocksByType = function(type, ordered) {
  * @param {!Blockly.WorkspaceComment} comment comment to add.
  * @package
  */
-Blockly.Workspace.prototype.addTopComment = function(comment) {
+Workspace.prototype.addTopComment = function(comment) {
   this.topComments_.push(comment);
 
   // Note: If the comment database starts to hold block comments, this may need
@@ -294,7 +295,7 @@ Blockly.Workspace.prototype.addTopComment = function(comment) {
  * @param {!Blockly.WorkspaceComment} comment comment to remove.
  * @package
  */
-Blockly.Workspace.prototype.removeTopComment = function(comment) {
+Workspace.prototype.removeTopComment = function(comment) {
   if (!Blockly.utils.arrayRemove(this.topComments_, comment)) {
     throw Error('Comment not present in workspace\'s list of top-most ' +
         'comments.');
@@ -311,12 +312,12 @@ Blockly.Workspace.prototype.removeTopComment = function(comment) {
  * @return {!Array<!Blockly.WorkspaceComment>} The top-level comment objects.
  * @package
  */
-Blockly.Workspace.prototype.getTopComments = function(ordered) {
+Workspace.prototype.getTopComments = function(ordered) {
   // Copy the topComments_ list.
   const comments = [].concat(this.topComments_);
   if (ordered && comments.length > 1) {
     this.sortObjects_.offset =
-        Math.sin(Blockly.utils.math.toRadians(Blockly.Workspace.SCAN_ANGLE));
+        Math.sin(Blockly.utils.math.toRadians(Workspace.SCAN_ANGLE));
     if (this.RTL) {
       this.sortObjects_.offset *= -1;
     }
@@ -331,7 +332,7 @@ Blockly.Workspace.prototype.getTopComments = function(ordered) {
  * @param {boolean} ordered Sort the list if true.
  * @return {!Array<!Blockly.Block>} Array of blocks.
  */
-Blockly.Workspace.prototype.getAllBlocks = function(ordered) {
+Workspace.prototype.getAllBlocks = function(ordered) {
   let blocks;
   if (ordered) {
     // Slow, but ordered.
@@ -360,7 +361,7 @@ Blockly.Workspace.prototype.getAllBlocks = function(ordered) {
 /**
  * Dispose of all blocks and comments in workspace.
  */
-Blockly.Workspace.prototype.clear = function() {
+Workspace.prototype.clear = function() {
   this.isClearing = true;
   try {
     const existingGroup = Blockly.Events.getGroup();
@@ -392,7 +393,7 @@ Blockly.Workspace.prototype.clear = function() {
  * @param {string} id ID of the variable to rename.
  * @param {string} newName New variable name.
  */
-Blockly.Workspace.prototype.renameVariableById = function(id, newName) {
+Workspace.prototype.renameVariableById = function(id, newName) {
   this.variableMap_.renameVariableById(id, newName);
 };
 
@@ -407,7 +408,7 @@ Blockly.Workspace.prototype.renameVariableById = function(id, newName) {
  *     a UUID.
  * @return {!Blockly.VariableModel} The newly created variable.
  */
-Blockly.Workspace.prototype.createVariable = function(name, opt_type, opt_id) {
+Workspace.prototype.createVariable = function(name, opt_type, opt_id) {
   return this.variableMap_.createVariable(name, opt_type, opt_id);
 };
 
@@ -416,7 +417,7 @@ Blockly.Workspace.prototype.createVariable = function(name, opt_type, opt_id) {
  * @param {string} id ID of the variable to find.
  * @return {!Array<!Blockly.Block>} Array of block usages.
  */
-Blockly.Workspace.prototype.getVariableUsesById = function(id) {
+Workspace.prototype.getVariableUsesById = function(id) {
   return this.variableMap_.getVariableUsesById(id);
 };
 
@@ -425,7 +426,7 @@ Blockly.Workspace.prototype.getVariableUsesById = function(id) {
  * workspace. May prompt the user for confirmation.
  * @param {string} id ID of variable to delete.
  */
-Blockly.Workspace.prototype.deleteVariableById = function(id) {
+Workspace.prototype.deleteVariableById = function(id) {
   this.variableMap_.deleteVariableById(id);
 };
 
@@ -437,7 +438,7 @@ Blockly.Workspace.prototype.deleteVariableById = function(id) {
  * @return {?Blockly.VariableModel} The variable with the given name.
  */
 // TODO (#1559): Possibly delete this function after resolving #1559.
-Blockly.Workspace.prototype.getVariable = function(name, opt_type) {
+Workspace.prototype.getVariable = function(name, opt_type) {
   return this.variableMap_.getVariable(name, opt_type);
 };
 
@@ -446,7 +447,7 @@ Blockly.Workspace.prototype.getVariable = function(name, opt_type) {
  * @param {string} id The ID to check for.
  * @return {?Blockly.VariableModel} The variable with the given ID.
  */
-Blockly.Workspace.prototype.getVariableById = function(id) {
+Workspace.prototype.getVariableById = function(id) {
   return this.variableMap_.getVariableById(id);
 };
 
@@ -457,7 +458,7 @@ Blockly.Workspace.prototype.getVariableById = function(id) {
  * @return {!Array<!Blockly.VariableModel>} The sought after variables of the
  *     passed in type. An empty array if none are found.
  */
-Blockly.Workspace.prototype.getVariablesOfType = function(type) {
+Workspace.prototype.getVariablesOfType = function(type) {
   return this.variableMap_.getVariablesOfType(type);
 };
 
@@ -466,7 +467,7 @@ Blockly.Workspace.prototype.getVariablesOfType = function(type) {
  * @return {!Array<string>} List of variable types.
  * @package
  */
-Blockly.Workspace.prototype.getVariableTypes = function() {
+Workspace.prototype.getVariableTypes = function() {
   return this.variableMap_.getVariableTypes(this);
 };
 
@@ -474,7 +475,7 @@ Blockly.Workspace.prototype.getVariableTypes = function() {
  * Return all variables of all types.
  * @return {!Array<!Blockly.VariableModel>} List of variable models.
  */
-Blockly.Workspace.prototype.getAllVariables = function() {
+Workspace.prototype.getAllVariables = function() {
   return this.variableMap_.getAllVariables();
 };
 
@@ -482,7 +483,7 @@ Blockly.Workspace.prototype.getAllVariables = function() {
  * Returns all variable names of all types.
  * @return {!Array<string>} List of all variable names of all types.
  */
-Blockly.Workspace.prototype.getAllVariableNames = function() {
+Workspace.prototype.getAllVariableNames = function() {
   return this.variableMap_.getAllVariableNames();
 };
 
@@ -494,7 +495,7 @@ Blockly.Workspace.prototype.getAllVariableNames = function() {
  * Not relevant for a headless workspace.
  * @return {number} Width.
  */
-Blockly.Workspace.prototype.getWidth = function() {
+Workspace.prototype.getWidth = function() {
   return 0;
 };
 
@@ -506,8 +507,9 @@ Blockly.Workspace.prototype.getWidth = function() {
  *     create a new ID.
  * @return {!Blockly.Block} The created block.
  */
-Blockly.Workspace.prototype.newBlock = function(prototypeName, opt_id) {
-  return new Blockly.Block(this, prototypeName, opt_id);
+Workspace.prototype.newBlock = function(prototypeName, opt_id) {
+  const Block = goog.module.get('Blockly.Block');
+  return new Block(this, prototypeName, opt_id);
 };
 
 /**
@@ -515,7 +517,7 @@ Blockly.Workspace.prototype.newBlock = function(prototypeName, opt_id) {
  *     the maxBlocks.
  * @return {number} Number of blocks left.
  */
-Blockly.Workspace.prototype.remainingCapacity = function() {
+Workspace.prototype.remainingCapacity = function() {
   if (isNaN(this.options.maxBlocks)) {
     return Infinity;
   }
@@ -529,7 +531,7 @@ Blockly.Workspace.prototype.remainingCapacity = function() {
  * @param {string} type Type of block to return capacity for.
  * @return {number} Number of blocks of type left.
  */
-Blockly.Workspace.prototype.remainingCapacityOfType = function(type) {
+Workspace.prototype.remainingCapacityOfType = function(type) {
   if (!this.options.maxInstances) {
     return Infinity;
   }
@@ -550,7 +552,7 @@ Blockly.Workspace.prototype.remainingCapacityOfType = function(type) {
  * @return {boolean} True if there is capacity for the given map,
  *    false otherwise.
  */
-Blockly.Workspace.prototype.isCapacityAvailable = function(typeCountsMap) {
+Workspace.prototype.isCapacityAvailable = function(typeCountsMap) {
   if (!this.hasBlockLimits()) {
     return true;
   }
@@ -572,7 +574,7 @@ Blockly.Workspace.prototype.isCapacityAvailable = function(typeCountsMap) {
  *    or the maximum number of blocks of specific types.
  * @return {boolean} True if it has block limits, false otherwise.
  */
-Blockly.Workspace.prototype.hasBlockLimits = function() {
+Workspace.prototype.hasBlockLimits = function() {
   return this.options.maxBlocks != Infinity || !!this.options.maxInstances;
 };
 
@@ -581,7 +583,7 @@ Blockly.Workspace.prototype.hasBlockLimits = function() {
  * @return {!Array<!Blockly.Events.Abstract>} undo stack
  * @package
  */
-Blockly.Workspace.prototype.getUndoStack = function() {
+Workspace.prototype.getUndoStack = function() {
   return this.undoStack_;
 };
 
@@ -590,7 +592,7 @@ Blockly.Workspace.prototype.getUndoStack = function() {
  * @return {!Array<!Blockly.Events.Abstract>} redo stack
  * @package
  */
-Blockly.Workspace.prototype.getRedoStack = function() {
+Workspace.prototype.getRedoStack = function() {
   return this.redoStack_;
 };
 
@@ -598,7 +600,7 @@ Blockly.Workspace.prototype.getRedoStack = function() {
  * Undo or redo the previous action.
  * @param {boolean} redo False if undo, true if redo.
  */
-Blockly.Workspace.prototype.undo = function(redo) {
+Workspace.prototype.undo = function(redo) {
   const inputStack = redo ? this.redoStack_ : this.undoStack_;
   const outputStack = redo ? this.undoStack_ : this.redoStack_;
   const inputEvent = inputStack.pop();
@@ -631,7 +633,7 @@ Blockly.Workspace.prototype.undo = function(redo) {
 /**
  * Clear the undo/redo stacks.
  */
-Blockly.Workspace.prototype.clearUndo = function() {
+Workspace.prototype.clearUndo = function() {
   this.undoStack_.length = 0;
   this.redoStack_.length = 0;
   // Stop any events already in the firing queue from being undoable.
@@ -646,7 +648,7 @@ Blockly.Workspace.prototype.clearUndo = function() {
  * @param {!Function} func Function to call.
  * @return {!Function} Obsolete return value, ignore.
  */
-Blockly.Workspace.prototype.addChangeListener = function(func) {
+Workspace.prototype.addChangeListener = function(func) {
   this.listeners_.push(func);
   return func;
 };
@@ -655,7 +657,7 @@ Blockly.Workspace.prototype.addChangeListener = function(func) {
  * Stop listening for this workspace's changes.
  * @param {!Function} func Function to stop calling.
  */
-Blockly.Workspace.prototype.removeChangeListener = function(func) {
+Workspace.prototype.removeChangeListener = function(func) {
   Blockly.utils.arrayRemove(this.listeners_, func);
 };
 
@@ -663,7 +665,7 @@ Blockly.Workspace.prototype.removeChangeListener = function(func) {
  * Fire a change event.
  * @param {!Blockly.Events.Abstract} event Event to fire.
  */
-Blockly.Workspace.prototype.fireChangeListener = function(event) {
+Workspace.prototype.fireChangeListener = function(event) {
   if (event.recordUndo) {
     this.undoStack_.push(event);
     this.redoStack_.length = 0;
@@ -682,7 +684,7 @@ Blockly.Workspace.prototype.fireChangeListener = function(event) {
  * @param {string} id ID of block to find.
  * @return {?Blockly.Block} The sought after block, or null if not found.
  */
-Blockly.Workspace.prototype.getBlockById = function(id) {
+Workspace.prototype.getBlockById = function(id) {
   return this.blockDB_[id] || null;
 };
 
@@ -692,7 +694,7 @@ Blockly.Workspace.prototype.getBlockById = function(id) {
  * @param {Blockly.Block} block The block to set.
  * @package
  */
-Blockly.Workspace.prototype.setBlockById = function(id, block) {
+Workspace.prototype.setBlockById = function(id, block) {
   this.blockDB_[id] = block;
 };
 
@@ -701,7 +703,7 @@ Blockly.Workspace.prototype.setBlockById = function(id, block) {
  * @param {string} id ID of block to delete.
  * @package
  */
-Blockly.Workspace.prototype.removeBlockById = function(id) {
+Workspace.prototype.removeBlockById = function(id) {
   delete this.blockDB_[id];
 };
 
@@ -712,7 +714,7 @@ Blockly.Workspace.prototype.removeBlockById = function(id) {
  *     found.
  * @package
  */
-Blockly.Workspace.prototype.getCommentById = function(id) {
+Workspace.prototype.getCommentById = function(id) {
   return this.commentDB_[id] || null;
 };
 
@@ -723,7 +725,7 @@ Blockly.Workspace.prototype.getCommentById = function(id) {
  *     whether shadow blocks are counted as filled. Defaults to true.
  * @return {boolean} True if all inputs are filled, false otherwise.
  */
-Blockly.Workspace.prototype.allInputsFilled = function(
+Workspace.prototype.allInputsFilled = function(
     opt_shadowBlocksAreFilled) {
   const blocks = this.getTopBlocks(false);
   for (let i = 0; i < blocks.length; i++) {
@@ -741,7 +743,7 @@ Blockly.Workspace.prototype.allInputsFilled = function(
  * @return {?Blockly.VariableMap} The potential variable map.
  * @package
  */
-Blockly.Workspace.prototype.getPotentialVariableMap = function() {
+Workspace.prototype.getPotentialVariableMap = function() {
   return this.potentialVariableMap_;
 };
 
@@ -749,7 +751,7 @@ Blockly.Workspace.prototype.getPotentialVariableMap = function() {
  * Create and store the potential variable map for this workspace.
  * @package
  */
-Blockly.Workspace.prototype.createPotentialVariableMap = function() {
+Workspace.prototype.createPotentialVariableMap = function() {
   this.potentialVariableMap_ = new Blockly.VariableMap(this);
 };
 
@@ -757,7 +759,7 @@ Blockly.Workspace.prototype.createPotentialVariableMap = function() {
  * Return the map of all variables on the workspace.
  * @return {!Blockly.VariableMap} The variable map.
  */
-Blockly.Workspace.prototype.getVariableMap = function() {
+Workspace.prototype.getVariableMap = function() {
   return this.variableMap_;
 };
 
@@ -766,7 +768,7 @@ Blockly.Workspace.prototype.getVariableMap = function() {
  * @param {!Blockly.VariableMap} variableMap The variable map.
  * @package
  */
-Blockly.Workspace.prototype.setVariableMap = function(variableMap) {
+Workspace.prototype.setVariableMap = function(variableMap) {
   this.variableMap_ = variableMap;
 };
 
@@ -775,25 +777,27 @@ Blockly.Workspace.prototype.setVariableMap = function(variableMap) {
  * Database of all workspaces.
  * @private
  */
-Blockly.Workspace.WorkspaceDB_ = Object.create(null);
+Workspace.WorkspaceDB_ = Object.create(null);
 
 /**
  * Find the workspace with the specified ID.
  * @param {string} id ID of workspace to find.
- * @return {?Blockly.Workspace} The sought after workspace or null if not found.
+ * @return {?Workspace} The sought after workspace or null if not found.
  */
-Blockly.Workspace.getById = function(id) {
-  return Blockly.Workspace.WorkspaceDB_[id] || null;
+Workspace.getById = function(id) {
+  return Workspace.WorkspaceDB_[id] || null;
 };
 
 /**
  * Find all workspaces.
- * @return {!Array<!Blockly.Workspace>} Array of workspaces.
+ * @return {!Array<!Workspace>} Array of workspaces.
  */
-Blockly.Workspace.getAll = function() {
+Workspace.getAll = function() {
   const workspaces = [];
-  for (const workspaceId in Blockly.Workspace.WorkspaceDB_) {
-    workspaces.push(Blockly.Workspace.WorkspaceDB_[workspaceId]);
+  for (const workspaceId in Workspace.WorkspaceDB_) {
+    workspaces.push(Workspace.WorkspaceDB_[workspaceId]);
   }
   return workspaces;
 };
+
+exports = Workspace;
diff --git a/tests/deps.js b/tests/deps.js
index 9a5b768a6..74832d0ff 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -205,7 +205,7 @@ goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.B
 goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.common', 'Blockly.utils.dom']);
-goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);
+goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICopyable', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 74b5a12c6d77790cf6dce19207969f890203a628 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 12:08:45 -0700
Subject: [PATCH 565/833] Migrate core/workspace.js named requires

---
 core/workspace.js | 159 ++++++++++++++++++++++++----------------------
 1 file changed, 83 insertions(+), 76 deletions(-)

diff --git a/core/workspace.js b/core/workspace.js
index 5061e238a..a14568a3e 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -13,62 +13,69 @@
 goog.module('Blockly.Workspace');
 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 Block = goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
+/* eslint-disable-next-line no-unused-vars */
+const ConnectionDB = goog.requireType('Blockly.ConnectionDB');
+const Events = goog.require('Blockly.Events');
+const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation');
+/* eslint-disable-next-line no-unused-vars */
+const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');
+const Options = goog.require('Blockly.Options');
+const VariableMap = goog.require('Blockly.VariableMap');
+/* eslint-disable-next-line no-unused-vars */
+const VariableModel = goog.requireType('Blockly.VariableModel');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment');
+const math = goog.require('Blockly.utils.math');
+const registry = goog.require('Blockly.registry');
+/* eslint-disable-next-line no-unused-vars */
+const toolbox = goog.requireType('Blockly.utils.toolbox');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.ConnectionChecker');
-goog.require('Blockly.Events');
-goog.require('Blockly.IASTNodeLocation');
-goog.require('Blockly.Options');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.math');
-goog.require('Blockly.VariableMap');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.BlocklyOptions');
-goog.requireType('Blockly.ConnectionDB');
-goog.requireType('Blockly.Events.Abstract');
-goog.requireType('Blockly.IConnectionChecker');
-goog.requireType('Blockly.utils.toolbox');
-goog.requireType('Blockly.VariableModel');
-goog.requireType('Blockly.WorkspaceComment');
 
 
 /**
  * Class for a workspace.  This is a data structure that contains blocks.
  * There is no UI, and can be created headlessly.
- * @param {!Blockly.Options=} opt_options Dictionary of options.
+ * @param {!Options=} opt_options Dictionary of options.
  * @constructor
- * @implements {Blockly.IASTNodeLocation}
+ * @implements {IASTNodeLocation}
  */
 const Workspace = function(opt_options) {
   /** @type {string} */
-  this.id = Blockly.utils.genUid();
+  this.id = utils.genUid();
   Workspace.WorkspaceDB_[this.id] = this;
-  /** @type {!Blockly.Options} */
+  /** @type {!Options} */
   this.options = opt_options ||
-      new Blockly.Options(/** @type {!Blockly.BlocklyOptions} */ ({}));
+      new Options(/** @type {!BlocklyOptions} */ ({}));
   /** @type {boolean} */
   this.RTL = !!this.options.RTL;
   /** @type {boolean} */
   this.horizontalLayout = !!this.options.horizontalLayout;
-  /** @type {Blockly.utils.toolbox.Position} */
+  /** @type {toolbox.Position} */
   this.toolboxPosition = this.options.toolboxPosition;
 
-  const connectionCheckerClass = Blockly.registry.getClassFromOptions(
-      Blockly.registry.Type.CONNECTION_CHECKER, this.options, true);
+  const connectionCheckerClass = registry.getClassFromOptions(
+      registry.Type.CONNECTION_CHECKER, this.options, true);
   /**
    * An object that encapsulates logic for safety, type, and dragging checks.
-   * @type {!Blockly.IConnectionChecker}
+   * @type {!IConnectionChecker}
    */
   this.connectionChecker = new connectionCheckerClass(this);
 
   /**
-   * @type {!Array<!Blockly.Block>}
+   * @type {!Array<!Block>}
    * @private
    */
   this.topBlocks_ = [];
   /**
-   * @type {!Array<!Blockly.WorkspaceComment>}
+   * @type {!Array<!WorkspaceComment>}
    * @private
    */
   this.topComments_ = [];
@@ -83,12 +90,12 @@ const Workspace = function(opt_options) {
    */
   this.listeners_ = [];
   /**
-   * @type {!Array<!Blockly.Events.Abstract>}
+   * @type {!Array<!Abstract>}
    * @protected
    */
   this.undoStack_ = [];
   /**
-   * @type {!Array<!Blockly.Events.Abstract>}
+   * @type {!Array<!Abstract>}
    * @protected
    */
   this.redoStack_ = [];
@@ -107,19 +114,19 @@ const Workspace = function(opt_options) {
    * A map from variable type to list of variable names.  The lists contain all
    * of the named variables in the workspace, including variables
    * that are not currently in use.
-   * @type {!Blockly.VariableMap}
+   * @type {!VariableMap}
    * @private
    */
-  this.variableMap_ = new Blockly.VariableMap(this);
+  this.variableMap_ = new VariableMap(this);
 
   /**
    * Blocks in the flyout can refer to variables that don't exist in the main
    * workspace.  For instance, the "get item in list" block refers to an "item"
    * variable regardless of whether the variable has been created yet.
-   * A FieldVariable must always refer to a Blockly.VariableModel.  We reconcile
+   * A FieldVariable must always refer to a VariableModel.  We reconcile
    * these by tracking "potential" variables in the flyout.  These variables
    * become real when references to them are dragged into the main workspace.
-   * @type {?Blockly.VariableMap}
+   * @type {?VariableMap}
    * @private
    */
   this.potentialVariableMap_ = null;
@@ -147,7 +154,7 @@ Workspace.prototype.MAX_UNDO = 1024;
 
 /**
  * Set of databases for rapid lookup of connection locations.
- * @type {Array<!Blockly.ConnectionDB>}
+ * @type {Array<!ConnectionDB>}
  */
 Workspace.prototype.connectionDBList = null;
 
@@ -174,9 +181,9 @@ Workspace.SCAN_ANGLE = 3;
 /**
  * Compare function for sorting objects (blocks, comments, etc) by position;
  *    top to bottom (with slight LTR or RTL bias).
- * @param {!Blockly.Block | !Blockly.WorkspaceComment} a The first object to
+ * @param {!Block | !WorkspaceComment} a The first object to
  *    compare.
- * @param {!Blockly.Block | !Blockly.WorkspaceComment} b The second object to
+ * @param {!Block | !WorkspaceComment} b The second object to
  *    compare.
  * @return {number} The comparison value. This tells Array.sort() how to change
  *    object a's index.
@@ -191,7 +198,7 @@ Workspace.prototype.sortObjects_ = function(a, b) {
 
 /**
  * Adds a block to the list of top blocks.
- * @param {!Blockly.Block} block Block to add.
+ * @param {!Block} block Block to add.
  */
 Workspace.prototype.addTopBlock = function(block) {
   this.topBlocks_.push(block);
@@ -199,10 +206,10 @@ Workspace.prototype.addTopBlock = function(block) {
 
 /**
  * Removes a block from the list of top blocks.
- * @param {!Blockly.Block} block Block to remove.
+ * @param {!Block} block Block to remove.
  */
 Workspace.prototype.removeTopBlock = function(block) {
-  if (!Blockly.utils.arrayRemove(this.topBlocks_, block)) {
+  if (!utils.arrayRemove(this.topBlocks_, block)) {
     throw Error('Block not present in workspace\'s list of top-most blocks.');
   }
 };
@@ -211,14 +218,14 @@ Workspace.prototype.removeTopBlock = function(block) {
  * Finds the top-level blocks and returns them.  Blocks are optionally sorted
  * by position; top to bottom (with slight LTR or RTL bias).
  * @param {boolean} ordered Sort the list if true.
- * @return {!Array<!Blockly.Block>} The top-level block objects.
+ * @return {!Array<!Block>} The top-level block objects.
  */
 Workspace.prototype.getTopBlocks = function(ordered) {
   // Copy the topBlocks_ list.
   const blocks = [].concat(this.topBlocks_);
   if (ordered && blocks.length > 1) {
     this.sortObjects_.offset =
-        Math.sin(Blockly.utils.math.toRadians(Workspace.SCAN_ANGLE));
+        Math.sin(math.toRadians(Workspace.SCAN_ANGLE));
     if (this.RTL) {
       this.sortObjects_.offset *= -1;
     }
@@ -229,7 +236,7 @@ Workspace.prototype.getTopBlocks = function(ordered) {
 
 /**
  * Add a block to the list of blocks keyed by type.
- * @param {!Blockly.Block} block Block to add.
+ * @param {!Block} block Block to add.
  */
 Workspace.prototype.addTypedBlock = function(block) {
   if (!this.typedBlocksDB_[block.type]) {
@@ -240,7 +247,7 @@ Workspace.prototype.addTypedBlock = function(block) {
 
 /**
  * Remove a block from the list of blocks keyed by type.
- * @param {!Blockly.Block} block Block to remove.
+ * @param {!Block} block Block to remove.
  */
 Workspace.prototype.removeTypedBlock = function(block) {
   this.typedBlocksDB_[block.type].splice(this.typedBlocksDB_[block.type]
@@ -255,7 +262,7 @@ Workspace.prototype.removeTypedBlock = function(block) {
  * optionally sorted by position; top to bottom (with slight LTR or RTL bias).
  * @param {string} type The type of block to search for.
  * @param {boolean} ordered Sort the list if true.
- * @return {!Array<!Blockly.Block>} The blocks of the given type.
+ * @return {!Array<!Block>} The blocks of the given type.
  */
 Workspace.prototype.getBlocksByType = function(type, ordered) {
   if (!this.typedBlocksDB_[type]) {
@@ -264,7 +271,7 @@ Workspace.prototype.getBlocksByType = function(type, ordered) {
   const blocks = this.typedBlocksDB_[type].slice(0);
   if (ordered && blocks.length > 1) {
     this.sortObjects_.offset =
-        Math.sin(Blockly.utils.math.toRadians(Workspace.SCAN_ANGLE));
+        Math.sin(math.toRadians(Workspace.SCAN_ANGLE));
     if (this.RTL) {
       this.sortObjects_.offset *= -1;
     }
@@ -275,7 +282,7 @@ Workspace.prototype.getBlocksByType = function(type, ordered) {
 
 /**
  * Adds a comment to the list of top comments.
- * @param {!Blockly.WorkspaceComment} comment comment to add.
+ * @param {!WorkspaceComment} comment comment to add.
  * @package
  */
 Workspace.prototype.addTopComment = function(comment) {
@@ -292,11 +299,11 @@ Workspace.prototype.addTopComment = function(comment) {
 
 /**
  * Removes a comment from the list of top comments.
- * @param {!Blockly.WorkspaceComment} comment comment to remove.
+ * @param {!WorkspaceComment} comment comment to remove.
  * @package
  */
 Workspace.prototype.removeTopComment = function(comment) {
-  if (!Blockly.utils.arrayRemove(this.topComments_, comment)) {
+  if (!utils.arrayRemove(this.topComments_, comment)) {
     throw Error('Comment not present in workspace\'s list of top-most ' +
         'comments.');
   }
@@ -309,7 +316,7 @@ Workspace.prototype.removeTopComment = function(comment) {
  * Finds the top-level comments and returns them.  Comments are optionally
  * sorted by position; top to bottom (with slight LTR or RTL bias).
  * @param {boolean} ordered Sort the list if true.
- * @return {!Array<!Blockly.WorkspaceComment>} The top-level comment objects.
+ * @return {!Array<!WorkspaceComment>} The top-level comment objects.
  * @package
  */
 Workspace.prototype.getTopComments = function(ordered) {
@@ -317,7 +324,7 @@ Workspace.prototype.getTopComments = function(ordered) {
   const comments = [].concat(this.topComments_);
   if (ordered && comments.length > 1) {
     this.sortObjects_.offset =
-        Math.sin(Blockly.utils.math.toRadians(Workspace.SCAN_ANGLE));
+        Math.sin(math.toRadians(Workspace.SCAN_ANGLE));
     if (this.RTL) {
       this.sortObjects_.offset *= -1;
     }
@@ -330,7 +337,7 @@ Workspace.prototype.getTopComments = function(ordered) {
  * Find all blocks in workspace.  Blocks are optionally sorted
  * by position; top to bottom (with slight LTR or RTL bias).
  * @param {boolean} ordered Sort the list if true.
- * @return {!Array<!Blockly.Block>} Array of blocks.
+ * @return {!Array<!Block>} Array of blocks.
  */
 Workspace.prototype.getAllBlocks = function(ordered) {
   let blocks;
@@ -364,9 +371,9 @@ Workspace.prototype.getAllBlocks = function(ordered) {
 Workspace.prototype.clear = function() {
   this.isClearing = true;
   try {
-    const existingGroup = Blockly.Events.getGroup();
+    const existingGroup = Events.getGroup();
     if (!existingGroup) {
-      Blockly.Events.setGroup(true);
+      Events.setGroup(true);
     }
     while (this.topBlocks_.length) {
       this.topBlocks_[0].dispose(false);
@@ -375,7 +382,7 @@ Workspace.prototype.clear = function() {
       this.topComments_[this.topComments_.length - 1].dispose();
     }
     if (!existingGroup) {
-      Blockly.Events.setGroup(false);
+      Events.setGroup(false);
     }
     this.variableMap_.clear();
     if (this.potentialVariableMap_) {
@@ -406,7 +413,7 @@ Workspace.prototype.renameVariableById = function(id, newName) {
  *     their type. This will default to '' which is a specific type.
  * @param {?string=} opt_id The unique ID of the variable. This will default to
  *     a UUID.
- * @return {!Blockly.VariableModel} The newly created variable.
+ * @return {!VariableModel} The newly created variable.
  */
 Workspace.prototype.createVariable = function(name, opt_type, opt_id) {
   return this.variableMap_.createVariable(name, opt_type, opt_id);
@@ -415,7 +422,7 @@ Workspace.prototype.createVariable = function(name, opt_type, opt_id) {
 /**
  * Find all the uses of the given variable, which is identified by ID.
  * @param {string} id ID of the variable to find.
- * @return {!Array<!Blockly.Block>} Array of block usages.
+ * @return {!Array<!Block>} Array of block usages.
  */
 Workspace.prototype.getVariableUsesById = function(id) {
   return this.variableMap_.getVariableUsesById(id);
@@ -435,7 +442,7 @@ Workspace.prototype.deleteVariableById = function(id) {
  * @param {string} name The name to check for.
  * @param {string=} opt_type The type of the variable.  If not provided it
  *     defaults to the empty string, which is a specific type.
- * @return {?Blockly.VariableModel} The variable with the given name.
+ * @return {?VariableModel} The variable with the given name.
  */
 // TODO (#1559): Possibly delete this function after resolving #1559.
 Workspace.prototype.getVariable = function(name, opt_type) {
@@ -445,7 +452,7 @@ Workspace.prototype.getVariable = function(name, opt_type) {
 /**
  * Find the variable by the given ID and return it. Return null if not found.
  * @param {string} id The ID to check for.
- * @return {?Blockly.VariableModel} The variable with the given ID.
+ * @return {?VariableModel} The variable with the given ID.
  */
 Workspace.prototype.getVariableById = function(id) {
   return this.variableMap_.getVariableById(id);
@@ -455,7 +462,7 @@ Workspace.prototype.getVariableById = function(id) {
  * Find the variable with the specified type. If type is null, return list of
  *     variables with empty string type.
  * @param {?string} type Type of the variables to find.
- * @return {!Array<!Blockly.VariableModel>} The sought after variables of the
+ * @return {!Array<!VariableModel>} The sought after variables of the
  *     passed in type. An empty array if none are found.
  */
 Workspace.prototype.getVariablesOfType = function(type) {
@@ -473,7 +480,7 @@ Workspace.prototype.getVariableTypes = function() {
 
 /**
  * Return all variables of all types.
- * @return {!Array<!Blockly.VariableModel>} List of variable models.
+ * @return {!Array<!VariableModel>} List of variable models.
  */
 Workspace.prototype.getAllVariables = function() {
   return this.variableMap_.getAllVariables();
@@ -505,7 +512,7 @@ Workspace.prototype.getWidth = function() {
  *     type-specific functions for this block.
  * @param {string=} opt_id Optional ID.  Use this ID if provided, otherwise
  *     create a new ID.
- * @return {!Blockly.Block} The created block.
+ * @return {!Block} The created block.
  */
 Workspace.prototype.newBlock = function(prototypeName, opt_id) {
   const Block = goog.module.get('Blockly.Block');
@@ -580,7 +587,7 @@ Workspace.prototype.hasBlockLimits = function() {
 
 /**
  * Gets the undo stack for workplace.
- * @return {!Array<!Blockly.Events.Abstract>} undo stack
+ * @return {!Array<!Abstract>} undo stack
  * @package
  */
 Workspace.prototype.getUndoStack = function() {
@@ -589,7 +596,7 @@ Workspace.prototype.getUndoStack = function() {
 
 /**
  * Gets the redo stack for workplace.
- * @return {!Array<!Blockly.Events.Abstract>} redo stack
+ * @return {!Array<!Abstract>} redo stack
  * @package
  */
 Workspace.prototype.getRedoStack = function() {
@@ -618,15 +625,15 @@ Workspace.prototype.undo = function(redo) {
     const event = events[i];
     outputStack.push(event);
   }
-  events = Blockly.Events.filter(events, redo);
-  Blockly.Events.recordUndo = false;
+  events = Events.filter(events, redo);
+  Events.recordUndo = false;
   try {
     for (let i = 0; i < events.length; i++) {
       const event = events[i];
       event.run(redo);
     }
   } finally {
-    Blockly.Events.recordUndo = true;
+    Events.recordUndo = true;
   }
 };
 
@@ -637,7 +644,7 @@ Workspace.prototype.clearUndo = function() {
   this.undoStack_.length = 0;
   this.redoStack_.length = 0;
   // Stop any events already in the firing queue from being undoable.
-  Blockly.Events.clearPendingUndo();
+  Events.clearPendingUndo();
 };
 
 /**
@@ -658,12 +665,12 @@ Workspace.prototype.addChangeListener = function(func) {
  * @param {!Function} func Function to stop calling.
  */
 Workspace.prototype.removeChangeListener = function(func) {
-  Blockly.utils.arrayRemove(this.listeners_, func);
+  utils.arrayRemove(this.listeners_, func);
 };
 
 /**
  * Fire a change event.
- * @param {!Blockly.Events.Abstract} event Event to fire.
+ * @param {!Abstract} event Event to fire.
  */
 Workspace.prototype.fireChangeListener = function(event) {
   if (event.recordUndo) {
@@ -682,7 +689,7 @@ Workspace.prototype.fireChangeListener = function(event) {
 /**
  * Find the block on this workspace with the specified ID.
  * @param {string} id ID of block to find.
- * @return {?Blockly.Block} The sought after block, or null if not found.
+ * @return {?Block} The sought after block, or null if not found.
  */
 Workspace.prototype.getBlockById = function(id) {
   return this.blockDB_[id] || null;
@@ -691,7 +698,7 @@ Workspace.prototype.getBlockById = function(id) {
 /**
  * Set a block on this workspace with the specified ID.
  * @param {string} id ID of block to set.
- * @param {Blockly.Block} block The block to set.
+ * @param {Block} block The block to set.
  * @package
  */
 Workspace.prototype.setBlockById = function(id, block) {
@@ -710,7 +717,7 @@ Workspace.prototype.removeBlockById = function(id) {
 /**
  * Find the comment on this workspace with the specified ID.
  * @param {string} id ID of comment to find.
- * @return {?Blockly.WorkspaceComment} The sought after comment, or null if not
+ * @return {?WorkspaceComment} The sought after comment, or null if not
  *     found.
  * @package
  */
@@ -740,7 +747,7 @@ Workspace.prototype.allInputsFilled = function(
 /**
  * Return the variable map that contains "potential" variables.
  * These exist in the flyout but not in the workspace.
- * @return {?Blockly.VariableMap} The potential variable map.
+ * @return {?VariableMap} The potential variable map.
  * @package
  */
 Workspace.prototype.getPotentialVariableMap = function() {
@@ -752,12 +759,12 @@ Workspace.prototype.getPotentialVariableMap = function() {
  * @package
  */
 Workspace.prototype.createPotentialVariableMap = function() {
-  this.potentialVariableMap_ = new Blockly.VariableMap(this);
+  this.potentialVariableMap_ = new VariableMap(this);
 };
 
 /**
  * Return the map of all variables on the workspace.
- * @return {!Blockly.VariableMap} The variable map.
+ * @return {!VariableMap} The variable map.
  */
 Workspace.prototype.getVariableMap = function() {
   return this.variableMap_;
@@ -765,7 +772,7 @@ Workspace.prototype.getVariableMap = function() {
 
 /**
  * Set the map of all variables on the workspace.
- * @param {!Blockly.VariableMap} variableMap The variable map.
+ * @param {!VariableMap} variableMap The variable map.
  * @package
  */
 Workspace.prototype.setVariableMap = function(variableMap) {

From e10be5444f7dce26b616dde94f75778d0870fb16 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 13:11:13 -0700
Subject: [PATCH 566/833] clang-format core/workspace.js

---
 core/workspace.js | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/core/workspace.js b/core/workspace.js
index a14568a3e..25ac6ee5d 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -52,8 +52,8 @@ const Workspace = function(opt_options) {
   this.id = utils.genUid();
   Workspace.WorkspaceDB_[this.id] = this;
   /** @type {!Options} */
-  this.options = opt_options ||
-      new Options(/** @type {!BlocklyOptions} */ ({}));
+  this.options =
+      opt_options || new Options(/** @type {!BlocklyOptions} */ ({}));
   /** @type {boolean} */
   this.RTL = !!this.options.RTL;
   /** @type {boolean} */
@@ -224,8 +224,7 @@ Workspace.prototype.getTopBlocks = function(ordered) {
   // Copy the topBlocks_ list.
   const blocks = [].concat(this.topBlocks_);
   if (ordered && blocks.length > 1) {
-    this.sortObjects_.offset =
-        Math.sin(math.toRadians(Workspace.SCAN_ANGLE));
+    this.sortObjects_.offset = Math.sin(math.toRadians(Workspace.SCAN_ANGLE));
     if (this.RTL) {
       this.sortObjects_.offset *= -1;
     }
@@ -250,8 +249,8 @@ Workspace.prototype.addTypedBlock = function(block) {
  * @param {!Block} block Block to remove.
  */
 Workspace.prototype.removeTypedBlock = function(block) {
-  this.typedBlocksDB_[block.type].splice(this.typedBlocksDB_[block.type]
-      .indexOf(block), 1);
+  this.typedBlocksDB_[block.type].splice(
+      this.typedBlocksDB_[block.type].indexOf(block), 1);
   if (!this.typedBlocksDB_[block.type].length) {
     delete this.typedBlocksDB_[block.type];
   }
@@ -270,8 +269,7 @@ Workspace.prototype.getBlocksByType = function(type, ordered) {
   }
   const blocks = this.typedBlocksDB_[type].slice(0);
   if (ordered && blocks.length > 1) {
-    this.sortObjects_.offset =
-        Math.sin(math.toRadians(Workspace.SCAN_ANGLE));
+    this.sortObjects_.offset = Math.sin(math.toRadians(Workspace.SCAN_ANGLE));
     if (this.RTL) {
       this.sortObjects_.offset *= -1;
     }
@@ -291,7 +289,8 @@ Workspace.prototype.addTopComment = function(comment) {
   // Note: If the comment database starts to hold block comments, this may need
   // to move to a separate function.
   if (this.commentDB_[comment.id]) {
-    console.warn('Overriding an existing comment on this workspace, with id "' +
+    console.warn(
+        'Overriding an existing comment on this workspace, with id "' +
         comment.id + '"');
   }
   this.commentDB_[comment.id] = comment;
@@ -304,7 +303,8 @@ Workspace.prototype.addTopComment = function(comment) {
  */
 Workspace.prototype.removeTopComment = function(comment) {
   if (!utils.arrayRemove(this.topComments_, comment)) {
-    throw Error('Comment not present in workspace\'s list of top-most ' +
+    throw Error(
+        'Comment not present in workspace\'s list of top-most ' +
         'comments.');
   }
   // Note: If the comment database starts to hold block comments, this may need
@@ -323,8 +323,7 @@ Workspace.prototype.getTopComments = function(ordered) {
   // Copy the topComments_ list.
   const comments = [].concat(this.topComments_);
   if (ordered && comments.length > 1) {
-    this.sortObjects_.offset =
-        Math.sin(math.toRadians(Workspace.SCAN_ANGLE));
+    this.sortObjects_.offset = Math.sin(math.toRadians(Workspace.SCAN_ANGLE));
     if (this.RTL) {
       this.sortObjects_.offset *= -1;
     }
@@ -358,7 +357,7 @@ Workspace.prototype.getAllBlocks = function(ordered) {
 
   // Insertion markers exist on the workspace for rendering reasons, but aren't
   // "real" blocks from a developer perspective.
-  const filtered = blocks.filter(function (block) {
+  const filtered = blocks.filter(function(block) {
     return !block.isInsertionMarker();
   });
 
@@ -544,7 +543,8 @@ Workspace.prototype.remainingCapacityOfType = function(type) {
   }
 
   const maxInstanceOfType = (this.options.maxInstances[type] !== undefined) ?
-      this.options.maxInstances[type] : Infinity;
+      this.options.maxInstances[type] :
+      Infinity;
 
   return maxInstanceOfType - this.getBlocksByType(type, false).length;
 };
@@ -617,7 +617,7 @@ Workspace.prototype.undo = function(redo) {
   let events = [inputEvent];
   // Do another undo/redo if the next one is of the same group.
   while (inputStack.length && inputEvent.group &&
-      inputEvent.group == inputStack[inputStack.length - 1].group) {
+         inputEvent.group == inputStack[inputStack.length - 1].group) {
     events.push(inputStack.pop());
   }
   // Push these popped events on the opposite stack.
@@ -732,8 +732,7 @@ Workspace.prototype.getCommentById = function(id) {
  *     whether shadow blocks are counted as filled. Defaults to true.
  * @return {boolean} True if all inputs are filled, false otherwise.
  */
-Workspace.prototype.allInputsFilled = function(
-    opt_shadowBlocksAreFilled) {
+Workspace.prototype.allInputsFilled = function(opt_shadowBlocksAreFilled) {
   const blocks = this.getTopBlocks(false);
   for (let i = 0; i < blocks.length; i++) {
     const block = blocks[i];

From 7eedf623d5458aeee08063d6ef5dc842b4878344 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 14:52:53 -0700
Subject: [PATCH 567/833] Change private static variable to local variable.

---
 core/workspace.js | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/core/workspace.js b/core/workspace.js
index 25ac6ee5d..c1115e011 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -40,6 +40,12 @@ const utils = goog.require('Blockly.utils');
 goog.require('Blockly.ConnectionChecker');
 
 
+/**
+ * Database of all workspaces.
+ * @private
+ */
+const WorkspaceDB_ = Object.create(null);
+
 /**
  * Class for a workspace.  This is a data structure that contains blocks.
  * There is no UI, and can be created headlessly.
@@ -50,7 +56,7 @@ goog.require('Blockly.ConnectionChecker');
 const Workspace = function(opt_options) {
   /** @type {string} */
   this.id = utils.genUid();
-  Workspace.WorkspaceDB_[this.id] = this;
+  WorkspaceDB_[this.id] = this;
   /** @type {!Options} */
   this.options =
       opt_options || new Options(/** @type {!BlocklyOptions} */ ({}));
@@ -167,7 +173,7 @@ Workspace.prototype.dispose = function() {
   this.listeners_.length = 0;
   this.clear();
   // Remove from workspace database.
-  delete Workspace.WorkspaceDB_[this.id];
+  delete WorkspaceDB_[this.id];
 };
 
 /**
@@ -778,20 +784,13 @@ Workspace.prototype.setVariableMap = function(variableMap) {
   this.variableMap_ = variableMap;
 };
 
-
-/**
- * Database of all workspaces.
- * @private
- */
-Workspace.WorkspaceDB_ = Object.create(null);
-
 /**
  * Find the workspace with the specified ID.
  * @param {string} id ID of workspace to find.
  * @return {?Workspace} The sought after workspace or null if not found.
  */
 Workspace.getById = function(id) {
-  return Workspace.WorkspaceDB_[id] || null;
+  return WorkspaceDB_[id] || null;
 };
 
 /**
@@ -800,8 +799,8 @@ Workspace.getById = function(id) {
  */
 Workspace.getAll = function() {
   const workspaces = [];
-  for (const workspaceId in Workspace.WorkspaceDB_) {
-    workspaces.push(Workspace.WorkspaceDB_[workspaceId]);
+  for (const workspaceId in WorkspaceDB_) {
+    workspaces.push(WorkspaceDB_[workspaceId]);
   }
   return workspaces;
 };

From 08a8c0be6d291b2c355669bfbdb0a2da54ea2e76 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 9 Aug 2021 15:02:03 -0700
Subject: [PATCH 568/833] Migrate core/contextmenu_registry.js to goog.module
 syntax (#5149)

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

* Migrate core/contextmenu_registry.js to goog.module

* Migrate core/contextmenu_registry.js to named requires

* clang-format core/contextmenu_registry.js

* Make core/contextmenu_registry.js constructor private
---
 core/contextmenu_registry.js | 108 +++++++++++++++++++----------------
 tests/deps.js                |   2 +-
 2 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/core/contextmenu_registry.js b/core/contextmenu_registry.js
index 38cf08d3c..a97dc30f4 100644
--- a/core/contextmenu_registry.js
+++ b/core/contextmenu_registry.js
@@ -11,91 +11,97 @@
 'use strict';
 
 /**
- * @name Blockly.ContextMenuRegistry
+ * @name ContextMenuRegistry
  * @namespace
  */
-goog.provide('Blockly.ContextMenuRegistry');
+goog.module('Blockly.ContextMenuRegistry');
+goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.BlockSvg');
-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');
 
 
 /**
  * Class for the registry of context menu items. This is intended to be a
  * singleton. You should not create a new instance, and only access this class
- * from Blockly.ContextMenuRegistry.registry.
+ * from ContextMenuRegistry.registry.
  * @constructor
+ * @private
  */
-Blockly.ContextMenuRegistry = function() {
+const ContextMenuRegistry = function() {
   // Singleton instance should be registered once.
-  Blockly.ContextMenuRegistry.registry = this;
+  ContextMenuRegistry.registry = this;
 
   /**
    * Registry of all registered RegistryItems, keyed by ID.
-   * @type {!Object<string, !Blockly.ContextMenuRegistry.RegistryItem>}
+   * @type {!Object<string, !ContextMenuRegistry.RegistryItem>}
    * @private
    */
   this.registry_ = Object.create(null);
 };
 
 /**
- * Where this menu item should be rendered. If the menu item should be rendered in multiple
- * scopes, e.g. on both a block and a workspace, it should be registered for each scope.
+ * Where this menu item should be rendered. If the menu item should be rendered
+ * in multiple scopes, e.g. on both a block and a workspace, it should be
+ * registered for each scope.
  * @enum {string}
  */
-Blockly.ContextMenuRegistry.ScopeType = {
+ContextMenuRegistry.ScopeType = {
   BLOCK: 'block',
   WORKSPACE: 'workspace',
 };
 
 /**
- * The actual workspace/block where the menu is being rendered. This is passed to callback and
- * displayText functions that depend on this information.
+ * The actual workspace/block where the menu is being rendered. This is passed
+ * to callback and displayText functions that depend on this information.
  * @typedef {{
- *    block: (Blockly.BlockSvg|undefined),
- *    workspace: (Blockly.WorkspaceSvg|undefined)
+ *    block: (BlockSvg|undefined),
+ *    workspace: (WorkspaceSvg|undefined)
  * }}
  */
-Blockly.ContextMenuRegistry.Scope;
+ContextMenuRegistry.Scope;
 
 /**
  * A menu item as entered in the registry.
  * @typedef {{
- *    callback: function(!Blockly.ContextMenuRegistry.Scope),
- *    scopeType: !Blockly.ContextMenuRegistry.ScopeType,
- *    displayText: ((function(!Blockly.ContextMenuRegistry.Scope):string)|string),
- *    preconditionFn: function(!Blockly.ContextMenuRegistry.Scope):string,
+ *    callback: function(!ContextMenuRegistry.Scope),
+ *    scopeType: !ContextMenuRegistry.ScopeType,
+ *    displayText: ((function(!ContextMenuRegistry.Scope):string)|string),
+ *    preconditionFn: function(!ContextMenuRegistry.Scope):string,
  *    weight: number,
  *    id: string
  * }}
-*/
-Blockly.ContextMenuRegistry.RegistryItem;
+ */
+ContextMenuRegistry.RegistryItem;
 
 /**
  * A menu item as presented to contextmenu.js.
  * @typedef {{
  *    text: string,
  *    enabled: boolean,
- *    callback: function(!Blockly.ContextMenuRegistry.Scope),
- *    scope: !Blockly.ContextMenuRegistry.Scope,
+ *    callback: function(!ContextMenuRegistry.Scope),
+ *    scope: !ContextMenuRegistry.Scope,
  *    weight: number
  * }}
  */
-Blockly.ContextMenuRegistry.ContextMenuOption;
+ContextMenuRegistry.ContextMenuOption;
 
 /**
  * Singleton instance of this class. All interactions with this class should be
  * done on this object.
- * @type {?Blockly.ContextMenuRegistry}
+ * @type {?ContextMenuRegistry}
  */
-Blockly.ContextMenuRegistry.registry = null;
+ContextMenuRegistry.registry = null;
 
 /**
  * Registers a RegistryItem.
- * @param {!Blockly.ContextMenuRegistry.RegistryItem} item Context menu item to register.
+ * @param {!ContextMenuRegistry.RegistryItem} item Context menu item to
+ *     register.
  * @throws {Error} if an item with the given ID already exists.
  */
-Blockly.ContextMenuRegistry.prototype.register = function(item) {
+ContextMenuRegistry.prototype.register = function(item) {
   if (this.registry_[item.id]) {
     throw Error('Menu item with ID "' + item.id + '" is already registered.');
   }
@@ -107,7 +113,7 @@ Blockly.ContextMenuRegistry.prototype.register = function(item) {
  * @param {string} id The ID of the RegistryItem to remove.
  * @throws {Error} if an item with the given ID does not exist.
  */
-Blockly.ContextMenuRegistry.prototype.unregister = function(id) {
+ContextMenuRegistry.prototype.unregister = function(id) {
   if (!this.registry_[id]) {
     throw new Error('Menu item with ID "' + id + '" not found.');
   }
@@ -116,33 +122,37 @@ Blockly.ContextMenuRegistry.prototype.unregister = function(id) {
 
 /**
  * @param {string} id The ID of the RegistryItem to get.
- * @return {?Blockly.ContextMenuRegistry.RegistryItem} RegistryItem or null if not found
+ * @return {?ContextMenuRegistry.RegistryItem} RegistryItem or null if not found
  */
-Blockly.ContextMenuRegistry.prototype.getItem = function(id) {
+ContextMenuRegistry.prototype.getItem = function(id) {
   return this.registry_[id] || null;
 };
 
 /**
- * Gets the valid context menu options for the given scope type (e.g. block or workspace) and scope.
- * Blocks are only shown if the preconditionFn shows they should not be hidden.
- * @param {!Blockly.ContextMenuRegistry.ScopeType} scopeType Type of scope where menu should be
- *     shown (e.g. on a block or on a workspace)
- * @param {!Blockly.ContextMenuRegistry.Scope} scope Current scope of context menu
+ * Gets the valid context menu options for the given scope type (e.g. block or
+ * workspace) and scope. Blocks are only shown if the preconditionFn shows they
+ * should not be hidden.
+ * @param {!ContextMenuRegistry.ScopeType} scopeType Type of scope where menu
+ *     should be shown (e.g. on a block or on a workspace)
+ * @param {!ContextMenuRegistry.Scope} scope Current scope of context menu
  *     (i.e., the exact workspace or block being clicked on)
- * @return {!Array<!Blockly.ContextMenuRegistry.ContextMenuOption>} the list of ContextMenuOptions
+ * @return {!Array<!ContextMenuRegistry.ContextMenuOption>} the list of
+ *     ContextMenuOptions
  */
-Blockly.ContextMenuRegistry.prototype.getContextMenuOptions = function(scopeType, scope) {
-  var menuOptions = [];
-  var registry = this.registry_;
+ContextMenuRegistry.prototype.getContextMenuOptions = function(
+    scopeType, scope) {
+  const menuOptions = [];
+  const registry = this.registry_;
   Object.keys(registry).forEach(function(id) {
-    var item = registry[id];
+    const item = registry[id];
     if (scopeType == item.scopeType) {
-      var precondition = item.preconditionFn(scope);
+      const precondition = item.preconditionFn(scope);
       if (precondition != 'hidden') {
-        var displayText = typeof item.displayText == 'function' ?
-                            item.displayText(scope) : item.displayText;
-        /** @type {!Blockly.ContextMenuRegistry.ContextMenuOption} */
-        var menuOption = {
+        const displayText = typeof item.displayText == 'function' ?
+            item.displayText(scope) :
+            item.displayText;
+        /** @type {!ContextMenuRegistry.ContextMenuOption} */
+        const menuOption = {
           text: displayText,
           enabled: (precondition == 'enabled'),
           callback: item.callback,
@@ -160,4 +170,6 @@ Blockly.ContextMenuRegistry.prototype.getContextMenuOptions = function(scopeType
 };
 
 // Creates and assigns the singleton instance.
-new Blockly.ContextMenuRegistry();
+new ContextMenuRegistry();
+
+exports = ContextMenuRegistry;
diff --git a/tests/deps.js b/tests/deps.js
index 74832d0ff..2a958d44f 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -29,7 +29,7 @@ goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes']
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es5'});
+goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});

From 440be28b4a454aeb7b0c07652070785665cb86b7 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 14:26:08 -0700
Subject: [PATCH 569/833] Migrate core/renderers/common/block_rendering.js to
 ES6 const/let

---
 core/renderers/common/block_rendering.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/renderers/common/block_rendering.js b/core/renderers/common/block_rendering.js
index d1ee94a14..8ff48cb86 100644
--- a/core/renderers/common/block_rendering.js
+++ b/core/renderers/common/block_rendering.js
@@ -75,9 +75,9 @@ Blockly.blockRendering.stopDebugger = function() {
  */
 
 Blockly.blockRendering.init = function(name, theme, opt_rendererOverrides) {
-  var rendererClass = Blockly.registry.getClass(
+  const rendererClass = Blockly.registry.getClass(
       Blockly.registry.Type.RENDERER, name);
-  var renderer = new rendererClass(name);
+  const renderer = new rendererClass(name);
   renderer.init(theme, opt_rendererOverrides);
   return renderer;
 };

From a4a3b6a068536f5662469e103dda81cbf682fe8e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 14:36:00 -0700
Subject: [PATCH 570/833] Migrate core/renderers/common/block_rendering.js to
 goog.module

---
 core/renderers/common/block_rendering.js | 37 ++++++++++++++++++------
 core/renderers/common/drawer.js          |  2 +-
 core/renderers/common/renderer.js        |  2 +-
 core/renderers/geras/drawer.js           |  2 +-
 core/renderers/zelos/drawer.js           |  2 +-
 tests/deps.js                            |  2 +-
 6 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/core/renderers/common/block_rendering.js b/core/renderers/common/block_rendering.js
index 8ff48cb86..5dc8d33f8 100644
--- a/core/renderers/common/block_rendering.js
+++ b/core/renderers/common/block_rendering.js
@@ -14,7 +14,8 @@
  * The top level namespace for block rendering.
  * @namespace Blockly.blockRendering
  */
-goog.provide('Blockly.blockRendering');
+goog.module('Blockly.blockRendering');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.registry');
 
@@ -27,7 +28,16 @@ goog.requireType('Blockly.Theme');
  * @type {boolean}
  * @package
  */
-Blockly.blockRendering.useDebugger = false;
+let useDebugger = false;
+/**
+ * Returns whether the debugger is turned on.
+ * @return {boolean} Whether the debugger is turned on.
+ */
+const isDebuggerEnabled = function() {
+  return useDebugger;
+};
+/** @package */
+exports.isDebuggerEnabled = isDebuggerEnabled;
 
 /**
  * Registers a new renderer.
@@ -36,33 +46,40 @@ Blockly.blockRendering.useDebugger = false;
  *     to register.
  * @throws {Error} if a renderer with the same name has already been registered.
  */
-Blockly.blockRendering.register = function(name, rendererClass) {
+const register = function(name, rendererClass) {
   Blockly.registry.register(Blockly.registry.Type.RENDERER, name,
       rendererClass);
 };
+exports.register = register;
 
 /**
  * Unregisters the renderer registered with the given name.
  * @param {string} name The name of the renderer.
  */
-Blockly.blockRendering.unregister = function(name) {
+const unregister = function(name) {
   Blockly.registry.unregister(Blockly.registry.Type.RENDERER, name);
 };
+exports.unregister = unregister;
+
 /**
  * Turn on the blocks debugger.
  * @package
  */
-Blockly.blockRendering.startDebugger = function() {
-  Blockly.blockRendering.useDebugger = true;
+const startDebugger = function() {
+  useDebugger = true;
 };
+/** @package */
+exports.startDebugger = startDebugger;
 
 /**
  * Turn off the blocks debugger.
  * @package
  */
-Blockly.blockRendering.stopDebugger = function() {
-  Blockly.blockRendering.useDebugger = false;
+const stopDebugger = function() {
+  useDebugger = false;
 };
+/** @package */
+exports.stopDebugger = stopDebugger;
 
 /**
  * Initialize anything needed for rendering (constants, etc).
@@ -74,10 +91,12 @@ Blockly.blockRendering.stopDebugger = function() {
  * @package
  */
 
-Blockly.blockRendering.init = function(name, theme, opt_rendererOverrides) {
+const init = function(name, theme, opt_rendererOverrides) {
   const rendererClass = Blockly.registry.getClass(
       Blockly.registry.Type.RENDERER, name);
   const renderer = new rendererClass(name);
   renderer.init(theme, opt_rendererOverrides);
   return renderer;
 };
+/** @package */
+exports.init = init;
diff --git a/core/renderers/common/drawer.js b/core/renderers/common/drawer.js
index 2dde92d3f..92e659ab7 100644
--- a/core/renderers/common/drawer.js
+++ b/core/renderers/common/drawer.js
@@ -73,7 +73,7 @@ Drawer.prototype.draw = function() {
   if (this.info_.RTL) {
     this.block_.pathObject.flipRTL();
   }
-  if (Blockly.blockRendering.useDebugger) {
+  if (Blockly.blockRendering.isDebuggerEnabled()) {
     this.block_.renderingDebugger.drawDebug(this.block_, this.info_);
   }
   this.recordSizeOnBlock_();
diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js
index 37e4a883a..b4be1af87 100644
--- a/core/renderers/common/renderer.js
+++ b/core/renderers/common/renderer.js
@@ -285,7 +285,7 @@ Blockly.blockRendering.Renderer.prototype.getConnectionPreviewMethod = function(
  * @package
  */
 Blockly.blockRendering.Renderer.prototype.render = function(block) {
-  if (Blockly.blockRendering.useDebugger && !block.renderingDebugger) {
+  if (Blockly.blockRendering.isDebuggerEnabled() && !block.renderingDebugger) {
     block.renderingDebugger = this.makeDebugger_();
   }
   var info = this.makeRenderInfo_(block);
diff --git a/core/renderers/geras/drawer.js b/core/renderers/geras/drawer.js
index 360d123ce..b1ebc59a6 100644
--- a/core/renderers/geras/drawer.js
+++ b/core/renderers/geras/drawer.js
@@ -54,7 +54,7 @@ Blockly.geras.Drawer.prototype.draw = function() {
   if (this.info_.RTL) {
     pathObject.flipRTL();
   }
-  if (Blockly.blockRendering.useDebugger) {
+  if (Blockly.blockRendering.isDebuggerEnabled()) {
     this.block_.renderingDebugger.drawDebug(this.block_, this.info_);
   }
   this.recordSizeOnBlock_();
diff --git a/core/renderers/zelos/drawer.js b/core/renderers/zelos/drawer.js
index 20bad30e4..be1a4fa04 100644
--- a/core/renderers/zelos/drawer.js
+++ b/core/renderers/zelos/drawer.js
@@ -53,7 +53,7 @@ Blockly.zelos.Drawer.prototype.draw = function() {
   if (this.info_.RTL) {
     pathObject.flipRTL();
   }
-  if (Blockly.blockRendering.useDebugger) {
+  if (Blockly.blockRendering.isDebuggerEnabled()) {
     this.block_.renderingDebugger.drawDebug(this.block_, this.info_);
   }
   this.recordSizeOnBlock_();
diff --git a/tests/deps.js b/tests/deps.js
index 2a958d44f..4ab382ba8 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -122,7 +122,7 @@ goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'],
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.xml']);
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry']);
+goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});

From f565120efb6919ff6d3046d860514e7260ce3d9c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 14:39:58 -0700
Subject: [PATCH 571/833] Migrate core/renderers/common/block_rendering.js
 named requires

---
 core/renderers/common/block_rendering.js | 25 +++++++++++-------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/core/renderers/common/block_rendering.js b/core/renderers/common/block_rendering.js
index 5dc8d33f8..f91802584 100644
--- a/core/renderers/common/block_rendering.js
+++ b/core/renderers/common/block_rendering.js
@@ -10,17 +10,14 @@
  */
 'use strict';
 
-/**
- * The top level namespace for block rendering.
- * @namespace Blockly.blockRendering
- */
 goog.module('Blockly.blockRendering');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.registry');
-
-goog.requireType('Blockly.blockRendering.Renderer');
-goog.requireType('Blockly.Theme');
+/* eslint-disable-next-line no-unused-vars */
+const Renderer = goog.requireType('Blockly.blockRendering.Renderer');
+/* eslint-disable-next-line no-unused-vars */
+const Theme = goog.requireType('Blockly.Theme');
+const registry = goog.require('Blockly.registry');
 
 
 /**
@@ -47,7 +44,7 @@ exports.isDebuggerEnabled = isDebuggerEnabled;
  * @throws {Error} if a renderer with the same name has already been registered.
  */
 const register = function(name, rendererClass) {
-  Blockly.registry.register(Blockly.registry.Type.RENDERER, name,
+  registry.register(registry.Type.RENDERER, name,
       rendererClass);
 };
 exports.register = register;
@@ -57,7 +54,7 @@ exports.register = register;
  * @param {string} name The name of the renderer.
  */
 const unregister = function(name) {
-  Blockly.registry.unregister(Blockly.registry.Type.RENDERER, name);
+  registry.unregister(registry.Type.RENDERER, name);
 };
 exports.unregister = unregister;
 
@@ -84,16 +81,16 @@ exports.stopDebugger = stopDebugger;
 /**
  * Initialize anything needed for rendering (constants, etc).
  * @param {!string} name Name of the renderer to initialize.
- * @param {!Blockly.Theme} theme The workspace theme object.
+ * @param {!Theme} theme The workspace theme object.
  * @param {Object=} opt_rendererOverrides Rendering constant overrides.
- * @return {!Blockly.blockRendering.Renderer} The new instance of a renderer.
+ * @return {!Renderer} The new instance of a renderer.
  *     Already initialized.
  * @package
  */
 
 const init = function(name, theme, opt_rendererOverrides) {
-  const rendererClass = Blockly.registry.getClass(
-      Blockly.registry.Type.RENDERER, name);
+  const rendererClass = registry.getClass(
+      registry.Type.RENDERER, name);
   const renderer = new rendererClass(name);
   renderer.init(theme, opt_rendererOverrides);
   return renderer;

From 70d8ca2a2071f745ec802f8b90cedac7d41c63e0 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 14:40:06 -0700
Subject: [PATCH 572/833] clang-format core/renderers/common/block_rendering.js

---
 core/renderers/common/block_rendering.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/renderers/common/block_rendering.js b/core/renderers/common/block_rendering.js
index f91802584..77b2e8ced 100644
--- a/core/renderers/common/block_rendering.js
+++ b/core/renderers/common/block_rendering.js
@@ -44,8 +44,7 @@ exports.isDebuggerEnabled = isDebuggerEnabled;
  * @throws {Error} if a renderer with the same name has already been registered.
  */
 const register = function(name, rendererClass) {
-  registry.register(registry.Type.RENDERER, name,
-      rendererClass);
+  registry.register(registry.Type.RENDERER, name, rendererClass);
 };
 exports.register = register;
 
@@ -89,8 +88,7 @@ exports.stopDebugger = stopDebugger;
  */
 
 const init = function(name, theme, opt_rendererOverrides) {
-  const rendererClass = registry.getClass(
-      registry.Type.RENDERER, name);
+  const rendererClass = registry.getClass(registry.Type.RENDERER, name);
   const renderer = new rendererClass(name);
   renderer.init(theme, opt_rendererOverrides);
   return renderer;

From 1487698343a349bd5baff96cdbb38daf13a06fb3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 15:27:40 -0700
Subject: [PATCH 573/833] Remove extra newline and remove unecessary package
 annotation

---
 core/renderers/common/block_rendering.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/renderers/common/block_rendering.js b/core/renderers/common/block_rendering.js
index 77b2e8ced..c00d58523 100644
--- a/core/renderers/common/block_rendering.js
+++ b/core/renderers/common/block_rendering.js
@@ -23,7 +23,6 @@ const registry = goog.require('Blockly.registry');
 /**
  * Whether or not the debugger is turned on.
  * @type {boolean}
- * @package
  */
 let useDebugger = false;
 /**
@@ -86,7 +85,6 @@ exports.stopDebugger = stopDebugger;
  *     Already initialized.
  * @package
  */
-
 const init = function(name, theme, opt_rendererOverrides) {
   const rendererClass = registry.getClass(registry.Type.RENDERER, name);
   const renderer = new rendererClass(name);

From abbc1b3de38b71cf367c805259520be38f4beb4e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 14:05:30 -0700
Subject: [PATCH 574/833] Split classes from core/events/block_events.js into
 multiple files

---
 core/events/block_events.js        | 573 -----------------------------
 core/events/events_block_base.js   |  66 ++++
 core/events/events_block_change.js | 143 +++++++
 core/events/events_block_create.js | 107 ++++++
 core/events/events_block_delete.js | 111 ++++++
 core/events/events_block_move.js   | 187 ++++++++++
 tests/deps.js                      |   6 +-
 tests/mocha/event_test.js          | 193 ++--------
 tests/mocha/trashcan_test.js       |   2 +-
 9 files changed, 652 insertions(+), 736 deletions(-)
 delete mode 100644 core/events/block_events.js
 create mode 100644 core/events/events_block_base.js
 create mode 100644 core/events/events_block_change.js
 create mode 100644 core/events/events_block_create.js
 create mode 100644 core/events/events_block_delete.js
 create mode 100644 core/events/events_block_move.js

diff --git a/core/events/block_events.js b/core/events/block_events.js
deleted file mode 100644
index 8be1dae30..000000000
--- a/core/events/block_events.js
+++ /dev/null
@@ -1,573 +0,0 @@
-/**
- * @license
- * Copyright 2018 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Classes for all types of block events.
- * @author fenichel@google.com (Rachel Fenichel)
- */
-'use strict';
-
-goog.provide('Blockly.Events.BlockBase');
-goog.provide('Blockly.Events.BlockChange');
-goog.provide('Blockly.Events.BlockCreate');
-goog.provide('Blockly.Events.BlockDelete');
-goog.provide('Blockly.Events.BlockMove');
-goog.provide('Blockly.Events.Change');  // Deprecated.
-goog.provide('Blockly.Events.Create');  // Deprecated.
-goog.provide('Blockly.Events.Delete');  // Deprecated.
-goog.provide('Blockly.Events.Move');  // Deprecated.
-
-goog.require('Blockly.connectionTypes');
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.Abstract');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.xml');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.Block');
-
-
-/**
- * Abstract class for a block event.
- * @param {!Blockly.Block=} opt_block The block this event corresponds to.
- *     Undefined for a blank event.
- * @extends {Blockly.Events.Abstract}
- * @constructor
- */
-Blockly.Events.BlockBase = function(opt_block) {
-  Blockly.Events.BlockBase.superClass_.constructor.call(this);
-  this.isBlank = typeof opt_block == 'undefined';
-
-  /**
-   * The block ID for the block this event pertains to
-   * @type {string}
-   */
-  this.blockId = this.isBlank ? '' : opt_block.id;
-
-  /**
-   * The workspace identifier for this event.
-   * @type {string}
-   */
-  this.workspaceId = this.isBlank ? '' : opt_block.workspace.id;
-};
-Blockly.utils.object.inherits(Blockly.Events.BlockBase,
-    Blockly.Events.Abstract);
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Blockly.Events.BlockBase.prototype.toJson = function() {
-  var json = Blockly.Events.BlockBase.superClass_.toJson.call(this);
-  json['blockId'] = this.blockId;
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.BlockBase.prototype.fromJson = function(json) {
-  Blockly.Events.BlockBase.superClass_.fromJson.call(this, json);
-  this.blockId = json['blockId'];
-};
-
-/**
- * Class for a block change event.
- * @param {!Blockly.Block=} opt_block The changed block.  Undefined for a blank
- *     event.
- * @param {string=} opt_element One of 'field', 'comment', 'disabled', etc.
- * @param {?string=} opt_name Name of input or field affected, or null.
- * @param {*=} opt_oldValue Previous value of element.
- * @param {*=} opt_newValue New value of element.
- * @extends {Blockly.Events.BlockBase}
- * @constructor
- */
-Blockly.Events.BlockChange = function(opt_block, opt_element, opt_name, opt_oldValue,
-    opt_newValue) {
-  Blockly.Events.Change.superClass_.constructor.call(this, opt_block);
-  if (!opt_block) {
-    return;  // Blank event to be populated by fromJson.
-  }
-  this.element = typeof opt_element == 'undefined' ? '' : opt_element;
-  this.name = typeof opt_name == 'undefined' ? '' : opt_name;
-  this.oldValue = typeof opt_oldValue == 'undefined' ? '' : opt_oldValue;
-  this.newValue = typeof opt_newValue == 'undefined' ? '' : opt_newValue;
-};
-Blockly.utils.object.inherits(Blockly.Events.BlockChange, Blockly.Events.BlockBase);
-
-/**
- * Class for a block change event.
- * @param {!Blockly.Block=} opt_block The changed block.  Undefined for a blank
- *     event.
- * @param {string=} opt_element One of 'field', 'comment', 'disabled', etc.
- * @param {?string=} opt_name Name of input or field affected, or null.
- * @param {*=} opt_oldValue Previous value of element.
- * @param {*=} opt_newValue New value of element.
- * @extends {Blockly.Events.BlockBase}
- * @constructor
- */
-Blockly.Events.Change = Blockly.Events.BlockChange;
-
-/**
- * Type of this event.
- * @type {string}
- */
-Blockly.Events.BlockChange.prototype.type = Blockly.Events.CHANGE;
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Blockly.Events.BlockChange.prototype.toJson = function() {
-  var json = Blockly.Events.BlockChange.superClass_.toJson.call(this);
-  json['element'] = this.element;
-  if (this.name) {
-    json['name'] = this.name;
-  }
-  json['oldValue'] = this.oldValue;
-  json['newValue'] = this.newValue;
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.BlockChange.prototype.fromJson = function(json) {
-  Blockly.Events.BlockChange.superClass_.fromJson.call(this, json);
-  this.element = json['element'];
-  this.name = json['name'];
-  this.oldValue = json['oldValue'];
-  this.newValue = json['newValue'];
-};
-
-/**
- * Does this event record any change of state?
- * @return {boolean} False if something changed.
- */
-Blockly.Events.BlockChange.prototype.isNull = function() {
-  return this.oldValue == this.newValue;
-};
-
-/**
- * Run a change event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-Blockly.Events.BlockChange.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
-  var block = workspace.getBlockById(this.blockId);
-  if (!block) {
-    console.warn("Can't change non-existent block: " + this.blockId);
-    return;
-  }
-  if (block.mutator) {
-    // Close the mutator (if open) since we don't want to update it.
-    block.mutator.setVisible(false);
-  }
-  var value = forward ? this.newValue : this.oldValue;
-  switch (this.element) {
-    case 'field':
-      var field = block.getField(this.name);
-      if (field) {
-        field.setValue(value);
-      } else {
-        console.warn("Can't set non-existent field: " + this.name);
-      }
-      break;
-    case 'comment':
-      block.setCommentText(/** @type {string} */ (value) || null);
-      break;
-    case 'collapsed':
-      block.setCollapsed(!!value);
-      break;
-    case 'disabled':
-      block.setEnabled(!value);
-      break;
-    case 'inline':
-      block.setInputsInline(!!value);
-      break;
-    case 'mutation':
-      var oldMutation = '';
-      if (block.mutationToDom) {
-        var oldMutationDom = block.mutationToDom();
-        oldMutation = oldMutationDom && Blockly.Xml.domToText(oldMutationDom);
-      }
-      if (block.domToMutation) {
-        var dom = Blockly.Xml.textToDom(/** @type {string} */ (value) || '<mutation/>');
-        block.domToMutation(dom);
-      }
-      Blockly.Events.fire(new Blockly.Events.BlockChange(
-          block, 'mutation', null, oldMutation, value));
-      break;
-    default:
-      console.warn('Unknown change type: ' + this.element);
-  }
-};
-
-/**
- * Class for a block creation event.
- * @param {!Blockly.Block=} opt_block The created block.  Undefined for a blank
- *     event.
- * @extends {Blockly.Events.BlockBase}
- * @constructor
- */
-Blockly.Events.Create = function(opt_block) {
-  Blockly.Events.Create.superClass_.constructor.call(this, opt_block);
-  if (!opt_block) {
-    return;  // Blank event to be populated by fromJson.
-  }
-  if (opt_block.isShadow()) {
-    // Moving shadow blocks is handled via disconnection.
-    this.recordUndo = false;
-  }
-
-  if (opt_block.workspace.rendered) {
-    this.xml = Blockly.Xml.blockToDomWithXY(opt_block);
-  } else {
-    this.xml = Blockly.Xml.blockToDom(opt_block);
-  }
-  this.ids = Blockly.Events.getDescendantIds(opt_block);
-};
-Blockly.utils.object.inherits(Blockly.Events.Create, Blockly.Events.BlockBase);
-
-/**
- * Class for a block creation event.
- * @param {!Blockly.Block=} block The created block. Undefined for a blank
- *     event.
- * @extends {Blockly.Events.BlockBase}
- * @constructor
- */
-Blockly.Events.BlockCreate = Blockly.Events.Create;
-
-/**
- * Type of this event.
- * @type {string}
- */
-Blockly.Events.Create.prototype.type = Blockly.Events.CREATE;
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Blockly.Events.Create.prototype.toJson = function() {
-  var json = Blockly.Events.Create.superClass_.toJson.call(this);
-  json['xml'] = Blockly.Xml.domToText(this.xml);
-  json['ids'] = this.ids;
-  if (!this.recordUndo) {
-    json['recordUndo'] = this.recordUndo;
-  }
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.Create.prototype.fromJson = function(json) {
-  Blockly.Events.Create.superClass_.fromJson.call(this, json);
-  this.xml = Blockly.Xml.textToDom(json['xml']);
-  this.ids = json['ids'];
-  if (json['recordUndo'] !== undefined) {
-    this.recordUndo = json['recordUndo'];
-  }
-};
-
-/**
- * Run a creation event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-Blockly.Events.Create.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
-  if (forward) {
-    var xml = Blockly.utils.xml.createElement('xml');
-    xml.appendChild(this.xml);
-    Blockly.Xml.domToWorkspace(xml, workspace);
-  } else {
-    for (var i = 0, id; (id = this.ids[i]); i++) {
-      var block = workspace.getBlockById(id);
-      if (block) {
-        block.dispose(false);
-      } else if (id == this.blockId) {
-        // Only complain about root-level block.
-        console.warn("Can't uncreate non-existent block: " + id);
-      }
-    }
-  }
-};
-
-/**
- * Class for a block deletion event.
- * @param {!Blockly.Block=} opt_block The deleted block.  Undefined for a blank
- *     event.
- * @extends {Blockly.Events.BlockBase}
- * @constructor
- */
-Blockly.Events.Delete = function(opt_block) {
-  Blockly.Events.Delete.superClass_.constructor.call(this, opt_block);
-  if (!opt_block) {
-    return;  // Blank event to be populated by fromJson.
-  }
-  if (opt_block.getParent()) {
-    throw Error('Connected blocks cannot be deleted.');
-  }
-  if (opt_block.isShadow()) {
-    // Respawning shadow blocks is handled via disconnection.
-    this.recordUndo = false;
-  }
-
-  if (opt_block.workspace.rendered) {
-    this.oldXml = Blockly.Xml.blockToDomWithXY(opt_block);
-  } else {
-    this.oldXml = Blockly.Xml.blockToDom(opt_block);
-  }
-  this.ids = Blockly.Events.getDescendantIds(opt_block);
-};
-Blockly.utils.object.inherits(Blockly.Events.Delete, Blockly.Events.BlockBase);
-
-/**
- * Class for a block deletion event.
- * @param {?Blockly.Block} block The deleted block.  Null for a blank event.
- * @extends {Blockly.Events.BlockBase}
- * @constructor
- */
-Blockly.Events.BlockDelete = Blockly.Events.Delete;
-
-/**
- * Type of this event.
- * @type {string}
- */
-Blockly.Events.Delete.prototype.type = Blockly.Events.DELETE;
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Blockly.Events.Delete.prototype.toJson = function() {
-  var json = Blockly.Events.Delete.superClass_.toJson.call(this);
-  json['oldXml'] = Blockly.Xml.domToText(this.oldXml);
-  json['ids'] = this.ids;
-  if (!this.recordUndo) {
-    json['recordUndo'] = this.recordUndo;
-  }
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.Delete.prototype.fromJson = function(json) {
-  Blockly.Events.Delete.superClass_.fromJson.call(this, json);
-  this.oldXml = Blockly.Xml.textToDom(json['oldXml']);
-  this.ids = json['ids'];
-  if (json['recordUndo'] !== undefined) {
-    this.recordUndo = json['recordUndo'];
-  }
-};
-
-/**
- * Run a deletion event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-Blockly.Events.Delete.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
-  if (forward) {
-    for (var i = 0, id; (id = this.ids[i]); i++) {
-      var block = workspace.getBlockById(id);
-      if (block) {
-        block.dispose(false);
-      } else if (id == this.blockId) {
-        // Only complain about root-level block.
-        console.warn("Can't delete non-existent block: " + id);
-      }
-    }
-  } else {
-    var xml = Blockly.utils.xml.createElement('xml');
-    xml.appendChild(this.oldXml);
-    Blockly.Xml.domToWorkspace(xml, workspace);
-  }
-};
-
-/**
- * Class for a block move event.  Created before the move.
- * @param {!Blockly.Block=} opt_block The moved block.  Undefined for a blank
- *     event.
- * @extends {Blockly.Events.BlockBase}
- * @constructor
- */
-Blockly.Events.Move = function(opt_block) {
-  Blockly.Events.Move.superClass_.constructor.call(this, opt_block);
-  if (!opt_block) {
-    return;  // Blank event to be populated by fromJson.
-  }
-  if (opt_block.isShadow()) {
-    // Moving shadow blocks is handled via disconnection.
-    this.recordUndo = false;
-  }
-
-  var location = this.currentLocation_();
-  this.oldParentId = location.parentId;
-  this.oldInputName = location.inputName;
-  this.oldCoordinate = location.coordinate;
-};
-Blockly.utils.object.inherits(Blockly.Events.Move, Blockly.Events.BlockBase);
-
-/**
- * Class for a block move event.  Created before the move.
- * @param {?Blockly.Block} block The moved block.  Null for a blank event.
- * @extends {Blockly.Events.BlockBase}
- * @constructor
- */
-Blockly.Events.BlockMove = Blockly.Events.Move;
-
-/**
- * Type of this event.
- * @type {string}
- */
-Blockly.Events.Move.prototype.type = Blockly.Events.MOVE;
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Blockly.Events.Move.prototype.toJson = function() {
-  var json = Blockly.Events.Move.superClass_.toJson.call(this);
-  if (this.newParentId) {
-    json['newParentId'] = this.newParentId;
-  }
-  if (this.newInputName) {
-    json['newInputName'] = this.newInputName;
-  }
-  if (this.newCoordinate) {
-    json['newCoordinate'] = Math.round(this.newCoordinate.x) + ',' +
-        Math.round(this.newCoordinate.y);
-  }
-  if (!this.recordUndo) {
-    json['recordUndo'] = this.recordUndo;
-  }
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.Move.prototype.fromJson = function(json) {
-  Blockly.Events.Move.superClass_.fromJson.call(this, json);
-  this.newParentId = json['newParentId'];
-  this.newInputName = json['newInputName'];
-  if (json['newCoordinate']) {
-    var xy = json['newCoordinate'].split(',');
-    this.newCoordinate =
-        new Blockly.utils.Coordinate(Number(xy[0]), Number(xy[1]));
-  }
-  if (json['recordUndo'] !== undefined) {
-    this.recordUndo = json['recordUndo'];
-  }
-};
-
-/**
- * Record the block's new location.  Called after the move.
- */
-Blockly.Events.Move.prototype.recordNew = function() {
-  var location = this.currentLocation_();
-  this.newParentId = location.parentId;
-  this.newInputName = location.inputName;
-  this.newCoordinate = location.coordinate;
-};
-
-/**
- * Returns the parentId and input if the block is connected,
- *   or the XY location if disconnected.
- * @return {!Object} Collection of location info.
- * @private
- */
-Blockly.Events.Move.prototype.currentLocation_ = function() {
-  var workspace = this.getEventWorkspace_();
-  var block = workspace.getBlockById(this.blockId);
-  var location = {};
-  var parent = block.getParent();
-  if (parent) {
-    location.parentId = parent.id;
-    var input = parent.getInputWithBlock(block);
-    if (input) {
-      location.inputName = input.name;
-    }
-  } else {
-    location.coordinate = block.getRelativeToSurfaceXY();
-  }
-  return location;
-};
-
-/**
- * Does this event record any change of state?
- * @return {boolean} False if something changed.
- */
-Blockly.Events.Move.prototype.isNull = function() {
-  return this.oldParentId == this.newParentId &&
-      this.oldInputName == this.newInputName &&
-      Blockly.utils.Coordinate.equals(this.oldCoordinate, this.newCoordinate);
-};
-
-/**
- * Run a move event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-Blockly.Events.Move.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
-  var block = workspace.getBlockById(this.blockId);
-  if (!block) {
-    console.warn("Can't move non-existent block: " + this.blockId);
-    return;
-  }
-  var parentId = forward ? this.newParentId : this.oldParentId;
-  var inputName = forward ? this.newInputName : this.oldInputName;
-  var coordinate = forward ? this.newCoordinate : this.oldCoordinate;
-  var parentBlock = null;
-  if (parentId) {
-    parentBlock = workspace.getBlockById(parentId);
-    if (!parentBlock) {
-      console.warn("Can't connect to non-existent block: " + parentId);
-      return;
-    }
-  }
-  if (block.getParent()) {
-    block.unplug();
-  }
-  if (coordinate) {
-    var xy = block.getRelativeToSurfaceXY();
-    block.moveBy(coordinate.x - xy.x, coordinate.y - xy.y);
-  } else {
-    var blockConnection = block.outputConnection || block.previousConnection;
-    var parentConnection;
-    var connectionType = blockConnection.type;
-    if (inputName) {
-      var input = parentBlock.getInput(inputName);
-      if (input) {
-        parentConnection = input.connection;
-      }
-    } else if (connectionType == Blockly.connectionTypes.PREVIOUS_STATEMENT) {
-      parentConnection = parentBlock.nextConnection;
-    }
-    if (parentConnection) {
-      blockConnection.connect(parentConnection);
-    } else {
-      console.warn("Can't connect to non-existent input: " + inputName);
-    }
-  }
-};
-
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.CREATE,
-    Blockly.Events.Create);
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.DELETE,
-    Blockly.Events.Delete);
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.CHANGE,
-    Blockly.Events.BlockChange);
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.MOVE,
-    Blockly.Events.Move);
diff --git a/core/events/events_block_base.js b/core/events/events_block_base.js
new file mode 100644
index 000000000..c1c0ebb61
--- /dev/null
+++ b/core/events/events_block_base.js
@@ -0,0 +1,66 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Base class for all types of block events.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.provide('Blockly.Events.BlockBase');
+
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.Abstract');
+goog.require('Blockly.Events.BlockBase');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.Block');
+
+
+/**
+ * Abstract class for a block event.
+ * @param {!Blockly.Block=} opt_block The block this event corresponds to.
+ *     Undefined for a blank event.
+ * @extends {Blockly.Events.Abstract}
+ * @constructor
+ */
+Blockly.Events.BlockBase = function(opt_block) {
+  Blockly.Events.BlockBase.superClass_.constructor.call(this);
+  this.isBlank = typeof opt_block == 'undefined';
+
+  /**
+   * The block ID for the block this event pertains to
+   * @type {string}
+   */
+  this.blockId = this.isBlank ? '' : opt_block.id;
+
+  /**
+   * The workspace identifier for this event.
+   * @type {string}
+   */
+  this.workspaceId = this.isBlank ? '' : opt_block.workspace.id;
+};
+Blockly.utils.object.inherits(Blockly.Events.BlockBase,
+    Blockly.Events.Abstract);
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+Blockly.Events.BlockBase.prototype.toJson = function() {
+  var json = Blockly.Events.BlockBase.superClass_.toJson.call(this);
+  json['blockId'] = this.blockId;
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+Blockly.Events.BlockBase.prototype.fromJson = function(json) {
+  Blockly.Events.BlockBase.superClass_.fromJson.call(this, json);
+  this.blockId = json['blockId'];
+};
diff --git a/core/events/events_block_change.js b/core/events/events_block_change.js
new file mode 100644
index 000000000..82868aac2
--- /dev/null
+++ b/core/events/events_block_change.js
@@ -0,0 +1,143 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Classes for all types of block events.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.provide('Blockly.Events.BlockChange');
+
+goog.require('Blockly.Events');
+goog.require('Blockly.utils.object');
+goog.require('Blockly.Xml');
+
+goog.requireType('Blockly.Block');
+
+
+/**
+ * Class for a block change event.
+ * @param {!Blockly.Block=} opt_block The changed block.  Undefined for a blank
+ *     event.
+ * @param {string=} opt_element One of 'field', 'comment', 'disabled', etc.
+ * @param {?string=} opt_name Name of input or field affected, or null.
+ * @param {*=} opt_oldValue Previous value of element.
+ * @param {*=} opt_newValue New value of element.
+ * @extends {Blockly.Events.BlockBase}
+ * @constructor
+ */
+Blockly.Events.BlockChange = function(opt_block, opt_element, opt_name, opt_oldValue,
+    opt_newValue) {
+  Blockly.Events.BlockChange.superClass_.constructor.call(this, opt_block);
+  if (!opt_block) {
+    return;  // Blank event to be populated by fromJson.
+  }
+  this.element = typeof opt_element == 'undefined' ? '' : opt_element;
+  this.name = typeof opt_name == 'undefined' ? '' : opt_name;
+  this.oldValue = typeof opt_oldValue == 'undefined' ? '' : opt_oldValue;
+  this.newValue = typeof opt_newValue == 'undefined' ? '' : opt_newValue;
+};
+Blockly.utils.object.inherits(Blockly.Events.BlockChange, Blockly.Events.BlockBase);
+
+/**
+ * Type of this event.
+ * @type {string}
+ */
+Blockly.Events.BlockChange.prototype.type = Blockly.Events.BLOCK_CHANGE;
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+Blockly.Events.BlockChange.prototype.toJson = function() {
+  var json = Blockly.Events.BlockChange.superClass_.toJson.call(this);
+  json['element'] = this.element;
+  if (this.name) {
+    json['name'] = this.name;
+  }
+  json['oldValue'] = this.oldValue;
+  json['newValue'] = this.newValue;
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+Blockly.Events.BlockChange.prototype.fromJson = function(json) {
+  Blockly.Events.BlockChange.superClass_.fromJson.call(this, json);
+  this.element = json['element'];
+  this.name = json['name'];
+  this.oldValue = json['oldValue'];
+  this.newValue = json['newValue'];
+};
+
+/**
+ * Does this event record any change of state?
+ * @return {boolean} False if something changed.
+ */
+Blockly.Events.BlockChange.prototype.isNull = function() {
+  return this.oldValue == this.newValue;
+};
+
+/**
+ * Run a change event.
+ * @param {boolean} forward True if run forward, false if run backward (undo).
+ */
+Blockly.Events.BlockChange.prototype.run = function(forward) {
+  var workspace = this.getEventWorkspace_();
+  var block = workspace.getBlockById(this.blockId);
+  if (!block) {
+    console.warn("Can't change non-existent block: " + this.blockId);
+    return;
+  }
+  if (block.mutator) {
+    // Close the mutator (if open) since we don't want to update it.
+    block.mutator.setVisible(false);
+  }
+  var value = forward ? this.newValue : this.oldValue;
+  switch (this.element) {
+    case 'field':
+      var field = block.getField(this.name);
+      if (field) {
+        field.setValue(value);
+      } else {
+        console.warn("Can't set non-existent field: " + this.name);
+      }
+      break;
+    case 'comment':
+      block.setCommentText(/** @type {string} */ (value) || null);
+      break;
+    case 'collapsed':
+      block.setCollapsed(!!value);
+      break;
+    case 'disabled':
+      block.setEnabled(!value);
+      break;
+    case 'inline':
+      block.setInputsInline(!!value);
+      break;
+    case 'mutation':
+      var oldMutation = '';
+      if (block.mutationToDom) {
+        var oldMutationDom = block.mutationToDom();
+        oldMutation = oldMutationDom && Blockly.Xml.domToText(oldMutationDom);
+      }
+      if (block.domToMutation) {
+        var dom = Blockly.Xml.textToDom(/** @type {string} */ (value) || '<mutation/>');
+        block.domToMutation(dom);
+      }
+      Blockly.Events.fire(new Blockly.Events.BlockChange(
+          block, 'mutation', null, oldMutation, value));
+      break;
+    default:
+      console.warn('Unknown change type: ' + this.element);
+  }
+};
+
+Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.CHANGE,
+    Blockly.Events.BlockChange);
diff --git a/core/events/events_block_create.js b/core/events/events_block_create.js
new file mode 100644
index 000000000..301068afe
--- /dev/null
+++ b/core/events/events_block_create.js
@@ -0,0 +1,107 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Classes for all types of block events.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.provide('Blockly.Events.BlockCreate');
+
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.BlockBase');
+goog.require('Blockly.utils.object');
+goog.require('Blockly.utils.xml');
+goog.require('Blockly.Xml');
+
+goog.requireType('Blockly.Block');
+
+
+/**
+ * Class for a block creation event.
+ * @param {!Blockly.Block=} opt_block The created block.  Undefined for a blank
+ *     event.
+ * @extends {Blockly.Events.BlockBase}
+ * @constructor
+ */
+Blockly.Events.BlockCreate = function(opt_block) {
+  Blockly.Events.BlockCreate.superClass_.constructor.call(this, opt_block);
+  if (!opt_block) {
+    return;  // Blank event to be populated by fromJson.
+  }
+  if (opt_block.isShadow()) {
+    // Moving shadow blocks is handled via disconnection.
+    this.recordUndo = false;
+  }
+
+  if (opt_block.workspace.rendered) {
+    this.xml = Blockly.Xml.blockToDomWithXY(opt_block);
+  } else {
+    this.xml = Blockly.Xml.blockToDom(opt_block);
+  }
+  this.ids = Blockly.Events.getDescendantIds(opt_block);
+};
+Blockly.utils.object.inherits(Blockly.Events.BlockCreate, Blockly.Events.BlockBase);
+
+/**
+ * Type of this event.
+ * @type {string}
+ */
+Blockly.Events.BlockCreate.prototype.type = Blockly.Events.BLOCK_CREATE;
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+Blockly.Events.BlockCreate.prototype.toJson = function() {
+  var json = Blockly.Events.BlockCreate.superClass_.toJson.call(this);
+  json['xml'] = Blockly.Xml.domToText(this.xml);
+  json['ids'] = this.ids;
+  if (!this.recordUndo) {
+    json['recordUndo'] = this.recordUndo;
+  }
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+Blockly.Events.BlockCreate.prototype.fromJson = function(json) {
+  Blockly.Events.BlockCreate.superClass_.fromJson.call(this, json);
+  this.xml = Blockly.Xml.textToDom(json['xml']);
+  this.ids = json['ids'];
+  if (json['recordUndo'] !== undefined) {
+    this.recordUndo = json['recordUndo'];
+  }
+};
+
+/**
+ * Run a creation event.
+ * @param {boolean} forward True if run forward, false if run backward (undo).
+ */
+Blockly.Events.BlockCreate.prototype.run = function(forward) {
+  var workspace = this.getEventWorkspace_();
+  if (forward) {
+    var xml = Blockly.utils.xml.createElement('xml');
+    xml.appendChild(this.xml);
+    Blockly.Xml.domToWorkspace(xml, workspace);
+  } else {
+    for (var i = 0, id; (id = this.ids[i]); i++) {
+      var block = workspace.getBlockById(id);
+      if (block) {
+        block.dispose(false);
+      } else if (id == this.blockId) {
+        // Only complain about root-level block.
+        console.warn("Can't uncreate non-existent block: " + id);
+      }
+    }
+  }
+};
+
+Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.CREATE,
+    Blockly.Events.BlockCreate);
diff --git a/core/events/events_block_delete.js b/core/events/events_block_delete.js
new file mode 100644
index 000000000..38d1d6345
--- /dev/null
+++ b/core/events/events_block_delete.js
@@ -0,0 +1,111 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Classes for all types of block events.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.provide('Blockly.Events.BlockDelete');
+
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.BlockBase');
+goog.require('Blockly.registry');
+goog.require('Blockly.utils.object');
+goog.require('Blockly.utils.xml');
+goog.require('Blockly.Xml');
+
+goog.requireType('Blockly.Block');
+
+
+/**
+ * Class for a block deletion event.
+ * @param {!Blockly.Block=} opt_block The deleted block.  Undefined for a blank
+ *     event.
+ * @extends {Blockly.Events.BlockBase}
+ * @constructor
+ */
+Blockly.Events.BlockDelete = function(opt_block) {
+  Blockly.Events.BlockDelete.superClass_.constructor.call(this, opt_block);
+  if (!opt_block) {
+    return;  // Blank event to be populated by fromJson.
+  }
+  if (opt_block.getParent()) {
+    throw Error('Connected blocks cannot be deleted.');
+  }
+  if (opt_block.isShadow()) {
+    // Respawning shadow blocks is handled via disconnection.
+    this.recordUndo = false;
+  }
+
+  if (opt_block.workspace.rendered) {
+    this.oldXml = Blockly.Xml.blockToDomWithXY(opt_block);
+  } else {
+    this.oldXml = Blockly.Xml.blockToDom(opt_block);
+  }
+  this.ids = Blockly.Events.getDescendantIds(opt_block);
+};
+Blockly.utils.object.inherits(Blockly.Events.BlockDelete, Blockly.Events.BlockBase);
+
+/**
+ * Type of this event.
+ * @type {string}
+ */
+Blockly.Events.BlockDelete.prototype.type = Blockly.Events.BLOCK_DELETE;
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+Blockly.Events.BlockDelete.prototype.toJson = function() {
+  var json = Blockly.Events.BlockDelete.superClass_.toJson.call(this);
+  json['oldXml'] = Blockly.Xml.domToText(this.oldXml);
+  json['ids'] = this.ids;
+  if (!this.recordUndo) {
+    json['recordUndo'] = this.recordUndo;
+  }
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+Blockly.Events.BlockDelete.prototype.fromJson = function(json) {
+  Blockly.Events.BlockDelete.superClass_.fromJson.call(this, json);
+  this.oldXml = Blockly.Xml.textToDom(json['oldXml']);
+  this.ids = json['ids'];
+  if (json['recordUndo'] !== undefined) {
+    this.recordUndo = json['recordUndo'];
+  }
+};
+
+/**
+ * Run a deletion event.
+ * @param {boolean} forward True if run forward, false if run backward (undo).
+ */
+Blockly.Events.BlockDelete.prototype.run = function(forward) {
+  var workspace = this.getEventWorkspace_();
+  if (forward) {
+    for (var i = 0, id; (id = this.ids[i]); i++) {
+      var block = workspace.getBlockById(id);
+      if (block) {
+        block.dispose(false);
+      } else if (id == this.blockId) {
+        // Only complain about root-level block.
+        console.warn("Can't delete non-existent block: " + id);
+      }
+    }
+  } else {
+    var xml = Blockly.utils.xml.createElement('xml');
+    xml.appendChild(this.oldXml);
+    Blockly.Xml.domToWorkspace(xml, workspace);
+  }
+};
+
+Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.DELETE,
+    Blockly.Events.BlockDelete);
diff --git a/core/events/events_block_move.js b/core/events/events_block_move.js
new file mode 100644
index 000000000..d3121e115
--- /dev/null
+++ b/core/events/events_block_move.js
@@ -0,0 +1,187 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Classes for a block move event.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.provide('Blockly.Events.BlockMove');
+
+goog.require('Blockly.connectionTypes');
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.BlockBase');
+goog.require('Blockly.registry');
+goog.require('Blockly.utils.Coordinate');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.Block');
+
+
+/**
+ * Class for a block move event.  Created before the move.
+ * @param {!Blockly.Block=} opt_block The moved block.  Undefined for a blank
+ *     event.
+ * @extends {Blockly.Events.BlockBase}
+ * @constructor
+ */
+Blockly.Events.BlockMove = function(opt_block) {
+  Blockly.Events.BlockMove.superClass_.constructor.call(this, opt_block);
+  if (!opt_block) {
+    return;  // Blank event to be populated by fromJson.
+  }
+  if (opt_block.isShadow()) {
+    // Moving shadow blocks is handled via disconnection.
+    this.recordUndo = false;
+  }
+
+  var location = this.currentLocation_();
+  this.oldParentId = location.parentId;
+  this.oldInputName = location.inputName;
+  this.oldCoordinate = location.coordinate;
+};
+Blockly.utils.object.inherits(Blockly.Events.BlockMove, Blockly.Events.BlockBase);
+
+/**
+ * Type of this event.
+ * @type {string}
+ */
+Blockly.Events.BlockMove.prototype.type = Blockly.Events.BLOCK_MOVE;
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+Blockly.Events.BlockMove.prototype.toJson = function() {
+  var json = Blockly.Events.BlockMove.superClass_.toJson.call(this);
+  if (this.newParentId) {
+    json['newParentId'] = this.newParentId;
+  }
+  if (this.newInputName) {
+    json['newInputName'] = this.newInputName;
+  }
+  if (this.newCoordinate) {
+    json['newCoordinate'] = Math.round(this.newCoordinate.x) + ',' +
+        Math.round(this.newCoordinate.y);
+  }
+  if (!this.recordUndo) {
+    json['recordUndo'] = this.recordUndo;
+  }
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+Blockly.Events.BlockMove.prototype.fromJson = function(json) {
+  Blockly.Events.BlockMove.superClass_.fromJson.call(this, json);
+  this.newParentId = json['newParentId'];
+  this.newInputName = json['newInputName'];
+  if (json['newCoordinate']) {
+    var xy = json['newCoordinate'].split(',');
+    this.newCoordinate =
+        new Blockly.utils.Coordinate(Number(xy[0]), Number(xy[1]));
+  }
+  if (json['recordUndo'] !== undefined) {
+    this.recordUndo = json['recordUndo'];
+  }
+};
+
+/**
+ * Record the block's new location.  Called after the move.
+ */
+Blockly.Events.BlockMove.prototype.recordNew = function() {
+  var location = this.currentLocation_();
+  this.newParentId = location.parentId;
+  this.newInputName = location.inputName;
+  this.newCoordinate = location.coordinate;
+};
+
+/**
+ * Returns the parentId and input if the block is connected,
+ *   or the XY location if disconnected.
+ * @return {!Object} Collection of location info.
+ * @private
+ */
+Blockly.Events.BlockMove.prototype.currentLocation_ = function() {
+  var workspace = this.getEventWorkspace_();
+  var block = workspace.getBlockById(this.blockId);
+  var location = {};
+  var parent = block.getParent();
+  if (parent) {
+    location.parentId = parent.id;
+    var input = parent.getInputWithBlock(block);
+    if (input) {
+      location.inputName = input.name;
+    }
+  } else {
+    location.coordinate = block.getRelativeToSurfaceXY();
+  }
+  return location;
+};
+
+/**
+ * Does this event record any change of state?
+ * @return {boolean} False if something changed.
+ */
+Blockly.Events.BlockMove.prototype.isNull = function() {
+  return this.oldParentId == this.newParentId &&
+      this.oldInputName == this.newInputName &&
+      Blockly.utils.Coordinate.equals(this.oldCoordinate, this.newCoordinate);
+};
+
+/**
+ * Run a move event.
+ * @param {boolean} forward True if run forward, false if run backward (undo).
+ */
+Blockly.Events.BlockMove.prototype.run = function(forward) {
+  var workspace = this.getEventWorkspace_();
+  var block = workspace.getBlockById(this.blockId);
+  if (!block) {
+    console.warn("Can't move non-existent block: " + this.blockId);
+    return;
+  }
+  var parentId = forward ? this.newParentId : this.oldParentId;
+  var inputName = forward ? this.newInputName : this.oldInputName;
+  var coordinate = forward ? this.newCoordinate : this.oldCoordinate;
+  var parentBlock = null;
+  if (parentId) {
+    parentBlock = workspace.getBlockById(parentId);
+    if (!parentBlock) {
+      console.warn("Can't connect to non-existent block: " + parentId);
+      return;
+    }
+  }
+  if (block.getParent()) {
+    block.unplug();
+  }
+  if (coordinate) {
+    var xy = block.getRelativeToSurfaceXY();
+    block.moveBy(coordinate.x - xy.x, coordinate.y - xy.y);
+  } else {
+    var blockConnection = block.outputConnection || block.previousConnection;
+    var parentConnection;
+    var connectionType = blockConnection.type;
+    if (inputName) {
+      var input = parentBlock.getInput(inputName);
+      if (input) {
+        parentConnection = input.connection;
+      }
+    } else if (connectionType == Blockly.connectionTypes.PREVIOUS_STATEMENT) {
+      parentConnection = parentBlock.nextConnection;
+    }
+    if (parentConnection) {
+      blockConnection.connect(parentConnection);
+    } else {
+      console.warn("Can't connect to non-existent input: " + inputName);
+    }
+  }
+};
+
+Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.MOVE,
+    Blockly.Events.BlockMove);
diff --git a/tests/deps.js b/tests/deps.js
index 4ab382ba8..542c8355d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -34,10 +34,14 @@ goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'mo
 goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style']);
-goog.addDependency('../../core/events/block_events.js', ['Blockly.Events.BlockBase', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Events.Change', 'Blockly.Events.Create', 'Blockly.Events.Delete', 'Blockly.Events.Move'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils']);
 goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.BlockBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Events.BlockBase', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.utils.object', 'Blockly.utils.xml']);
+goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/event_test.js b/tests/mocha/event_test.js
index 81ab69519..febcaf1c3 100644
--- a/tests/mocha/event_test.js
+++ b/tests/mocha/event_test.js
@@ -109,32 +109,10 @@ suite('Events', function() {
             });
       });
 
-      test('Create', function() {
-        var event = new Blockly.Events.Create(this.block);
-        sinon.assert.calledOnce(this.genUidStub);
-        assertEventEquals(event, Blockly.Events.CREATE,
-            this.workspace.id, this.TEST_BLOCK_ID,
-            {
-              'recordUndo': true,
-              'group': '',
-            });
-      });
-
       test('Block create', function() {
         var event = new Blockly.Events.BlockCreate(this.block);
         sinon.assert.calledOnce(this.genUidStub);
-        assertEventEquals(event, Blockly.Events.CREATE,
-            this.workspace.id, this.TEST_BLOCK_ID,
-            {
-              'recordUndo': true,
-              'group': '',
-            });
-      });
-
-      test('Delete', function() {
-        var event = new Blockly.Events.Delete(this.block);
-        sinon.assert.calledOnce(this.genUidStub);
-        assertEventEquals(event, Blockly.Events.DELETE,
+        assertEventEquals(event, Blockly.Events.BLOCK_CREATE,
             this.workspace.id, this.TEST_BLOCK_ID,
             {
               'recordUndo': true,
@@ -145,7 +123,7 @@ suite('Events', function() {
       test('Block delete', function() {
         var event = new Blockly.Events.BlockDelete(this.block);
         sinon.assert.calledOnce(this.genUidStub);
-        assertEventEquals(event, Blockly.Events.DELETE,
+        assertEventEquals(event, Blockly.Events.BLOCK_DELETE,
             this.workspace.id, this.TEST_BLOCK_ID,
             {
               'recordUndo': true,
@@ -181,30 +159,14 @@ suite('Events', function() {
             }, true);
       });
 
-      suite('Move', function() {
-        test('Move by coordinate', function() {
-          var coordinate = new Blockly.utils.Coordinate(3, 4);
-          this.block.xy_ = coordinate;
-
-          var event = new Blockly.Events.Move(this.block);
-          sinon.assert.calledOnce(this.genUidStub);
-          assertEventEquals(event, Blockly.Events.MOVE, this.workspace.id,
-              this.TEST_BLOCK_ID, {
-                'oldParentId': undefined,
-                'oldInputName': undefined,
-                'oldCoordinate': coordinate,
-                'recordUndo': true,
-                'group': ''
-              });
-        });
-
-        test('Block move by coordinate', function() {
+      suite('Block Move', function() {
+        test('by coordinate', function() {
           var coordinate = new Blockly.utils.Coordinate(3, 4);
           this.block.xy_ = coordinate;
 
           var event = new Blockly.Events.BlockMove(this.block);
           sinon.assert.calledOnce(this.genUidStub);
-          assertEventEquals(event, Blockly.Events.MOVE, this.workspace.id,
+          assertEventEquals(event, Blockly.Events.BLOCK_MOVE, this.workspace.id,
               this.TEST_BLOCK_ID, {
                 'oldParentId': undefined,
                 'oldInputName': undefined,
@@ -214,22 +176,14 @@ suite('Events', function() {
               });
         });
 
-        suite('Move by parent', function() {
-          setup(function() {
+        test('by parent', function() {
+          try {
             this.parentBlock = createSimpleTestBlock(this.workspace);
-
             this.block.parentBlock_ = this.parentBlock;
             this.block.xy_ = new Blockly.utils.Coordinate(3, 4);
-          });
-          teardown(function() {
-            // This needs to be cleared, otherwise workspace.dispose will fail.
-            this.block.parentBlock_ = null;
-          });
-
-          test('Move by parent', function() {
-            var event = new Blockly.Events.Move(this.block);
+            var event = new Blockly.Events.BlockMove(this.block);
             sinon.assert.calledTwice(this.genUidStub);
-            assertEventEquals(event, Blockly.Events.MOVE, this.workspace.id,
+            assertEventEquals(event, Blockly.Events.BLOCK_MOVE, this.workspace.id,
                 this.TEST_BLOCK_ID, {
                   'oldParentId': this.TEST_PARENT_ID,
                   'oldInputName': undefined,
@@ -237,21 +191,10 @@ suite('Events', function() {
                   'recordUndo': true,
                   'group': ''
                 });
-          });
-
-          test('Block move by parent', function() {
-            var event = new Blockly.Events.BlockMove(this.block);
-            sinon.assert.calledTwice(this.genUidStub);
-            assertEventEquals(event, Blockly.Events.MOVE, this.workspace.id,
-                this.TEST_BLOCK_ID,
-                {
-                  'oldParentId': this.TEST_PARENT_ID,
-                  'oldInputName': undefined,
-                  'oldCoordinate': undefined,
-                  'recordUndo': true,
-                  'group': ''
-                });
-          });
+          } finally {
+            // This needs to be cleared, otherwise workspace.dispose will fail.
+            this.block.parentBlock_ = null;
+          }
         });
       });
     });
@@ -279,28 +222,11 @@ suite('Events', function() {
             });
       });
 
-      test('Change', function() {
-        var event = new Blockly.Events.Change(
-            this.block, 'field', 'FIELD_NAME', 'old', 'new');
-        sinon.assert.calledOnce(this.genUidStub);
-        assertEventEquals(event, Blockly.Events.CHANGE,
-            this.workspace.id, this.TEST_BLOCK_ID,
-            {
-              'varId': undefined,
-              'element': 'field',
-              'name': 'FIELD_NAME',
-              'oldValue': 'old',
-              'newValue': 'new',
-              'recordUndo': true,
-              'group': '',
-            });
-      });
-
       test('Block change', function() {
         var event = new Blockly.Events.BlockChange(
             this.block, 'field', 'FIELD_NAME', 'old', 'new');
         sinon.assert.calledOnce(this.genUidStub);
-        assertEventEquals(event, Blockly.Events.CHANGE,
+        assertEventEquals(event, Blockly.Events.BLOCK_CHANGE,
             this.workspace.id, this.TEST_BLOCK_ID,
             {
               'varId': undefined,
@@ -313,32 +239,10 @@ suite('Events', function() {
             });
       });
 
-      test('Create', function() {
-        var event = new Blockly.Events.Create(this.block);
-        sinon.assert.calledOnce(this.genUidStub);
-        assertEventEquals(event, Blockly.Events.CREATE,
-            this.workspace.id, this.TEST_BLOCK_ID,
-            {
-              'recordUndo': false,
-              'group': '',
-            });
-      });
-
       test('Block create', function() {
         var event = new Blockly.Events.BlockCreate(this.block);
         sinon.assert.calledOnce(this.genUidStub);
-        assertEventEquals(event, Blockly.Events.CREATE,
-            this.workspace.id, this.TEST_BLOCK_ID,
-            {
-              'recordUndo': false,
-              'group': '',
-            });
-      });
-
-      test('Delete', function() {
-        var event = new Blockly.Events.Delete(this.block);
-        sinon.assert.calledOnce(this.genUidStub);
-        assertEventEquals(event, Blockly.Events.DELETE,
+        assertEventEquals(event, Blockly.Events.BLOCK_CREATE,
             this.workspace.id, this.TEST_BLOCK_ID,
             {
               'recordUndo': false,
@@ -349,7 +253,7 @@ suite('Events', function() {
       test('Block delete', function() {
         var event = new Blockly.Events.BlockDelete(this.block);
         sinon.assert.calledOnce(this.genUidStub);
-        assertEventEquals(event, Blockly.Events.DELETE,
+        assertEventEquals(event, Blockly.Events.BLOCK_DELETE,
             this.workspace.id, this.TEST_BLOCK_ID,
             {
               'recordUndo': false,
@@ -357,35 +261,14 @@ suite('Events', function() {
             });
       });
 
-      suite('Move', function() {
-        setup(function() {
+      test('Block move', function() {
+        try {
           this.parentBlock = createSimpleTestBlock(this.workspace);
           this.block.parentBlock_ = this.parentBlock;
           this.block.xy_ = new Blockly.utils.Coordinate(3, 4);
-        });
-
-        teardown(function() {
-          // This needs to be cleared, otherwise workspace.dispose will fail.
-          this.block.parentBlock_ = null;
-        });
-
-        test('Move', function() {
-          var event = new Blockly.Events.Move(this.block);
-          sinon.assert.calledTwice(this.genUidStub);
-          assertEventEquals(event, Blockly.Events.MOVE, this.workspace.id,
-              this.TEST_BLOCK_ID, {
-                'oldParentId': this.TEST_PARENT_ID,
-                'oldInputName': undefined,
-                'oldCoordinate': undefined,
-                'recordUndo': false,
-                'group': ''
-              });
-        });
-
-        test('Block move', function() {
           var event = new Blockly.Events.BlockMove(this.block);
           sinon.assert.calledTwice(this.genUidStub);
-          assertEventEquals(event, Blockly.Events.MOVE, this.workspace.id,
+          assertEventEquals(event, Blockly.Events.BLOCK_MOVE, this.workspace.id,
               this.TEST_BLOCK_ID,
               {
                 'oldParentId': this.TEST_PARENT_ID,
@@ -394,7 +277,10 @@ suite('Events', function() {
                 'recordUndo': false,
                 'group': ''
               });
-        });
+        } finally {
+          // This needs to be cleared, otherwise workspace.dispose will fail.
+          this.block.parentBlock_ = null;
+        }
       });
     });
 
@@ -408,25 +294,10 @@ suite('Events', function() {
             this.workspace, 'field_variable_test_block');
       });
 
-      test('Change', function() {
-        var event = new Blockly.Events.Change(
-            this.block, 'field', 'VAR', 'id1', 'id2');
-        assertEventEquals(event, Blockly.Events.CHANGE, this.workspace.id,
-            this.TEST_BLOCK_ID,
-            {
-              'element': 'field',
-              'name': 'VAR',
-              'oldValue': 'id1',
-              'newValue': 'id2',
-              'recordUndo': true,
-              'group': ''
-            });
-      });
-
       test('Block change', function() {
         var event = new Blockly.Events.BlockChange(
             this.block, 'field', 'VAR', 'id1', 'id2');
-        assertEventEquals(event, Blockly.Events.CHANGE, this.workspace.id,
+        assertEventEquals(event, Blockly.Events.BLOCK_CHANGE, this.workspace.id,
             this.TEST_BLOCK_ID,
             {
               'element': 'field',
@@ -889,7 +760,7 @@ suite('Events', function() {
       chai.assert.equal(filteredEvents[1].newCoordinate.y, 1);
     });
 
-    test('Merge move events', function() {
+    test('Merge block move events', function() {
       var block = this.workspace.newBlock('field_variable_test_block', '1');
       var events = [];
       addMoveEvent(events, block, 0, 0);
@@ -900,11 +771,11 @@ suite('Events', function() {
       chai.assert.equal(filteredEvents[0].newCoordinate.y, 1);
     });
 
-    test('Merge change events', function() {
+    test('Merge block change events', function() {
       var block1 = this.workspace.newBlock('field_variable_test_block', '1');
       var events = [
-        new Blockly.Events.Change(block1, 'field', 'VAR', 'item', 'item1'),
-        new Blockly.Events.Change(block1, 'field', 'VAR', 'item1', 'item2')
+        new Blockly.Events.BlockChange(block1, 'field', 'VAR', 'item', 'item1'),
+        new Blockly.Events.BlockChange(block1, 'field', 'VAR', 'item1', 'item2')
       ];
       var filteredEvents = Blockly.Events.filter(events, true);
       chai.assert.equal(filteredEvents.length, 1);  // second change event merged into first
@@ -1042,11 +913,11 @@ suite('Events', function() {
         sinon.assert.calledTwice(genUidStub);
 
         assertNthCallEventArgEquals(
-            this.eventsFireSpy, 0, Blockly.Events.Delete,
+            this.eventsFireSpy, 0, Blockly.Events.BlockDelete,
             {oldXml: expectedOldXml, group: ''},
             workspaceSvg.id, expectedId);
         assertNthCallEventArgEquals(
-            changeListenerSpy, 0, Blockly.Events.Delete,
+            changeListenerSpy, 0, Blockly.Events.BlockDelete,
             {oldXml: expectedOldXml, group: ''},
             workspaceSvg.id, expectedId);
 
@@ -1086,7 +957,7 @@ suite('Events', function() {
           {group: TEST_GROUP_ID, varId: TEST_VAR_ID, varName: TEST_VAR_NAME},
           this.workspace.id, undefined);
       assertNthCallEventArgEquals(
-          this.changeListenerSpy, 1, Blockly.Events.Create,
+          this.changeListenerSpy, 1, Blockly.Events.BlockCreate,
           {group: TEST_GROUP_ID}, this.workspace.id, TEST_BLOCK_ID);
 
       // Expect the workspace to have a variable with ID 'test_var_id'.
@@ -1131,7 +1002,7 @@ suite('Events', function() {
           {group: TEST_GROUP_ID, varId: TEST_VAR_ID, varName: TEST_VAR_NAME},
           this.workspace.id, undefined);
       assertNthCallEventArgEquals(
-          this.changeListenerSpy, 1, Blockly.Events.Create,
+          this.changeListenerSpy, 1, Blockly.Events.BlockCreate,
           {group: TEST_GROUP_ID}, this.workspace.id, TEST_BLOCK_ID);
 
       // Finished loading event should not be part of event group.
diff --git a/tests/mocha/trashcan_test.js b/tests/mocha/trashcan_test.js
index 9e0122d71..3a8bed245 100644
--- a/tests/mocha/trashcan_test.js
+++ b/tests/mocha/trashcan_test.js
@@ -10,7 +10,7 @@ suite("Trashcan", function() {
         '<xml xmlns="https://developers.google.com/blockly/xml">' +
         xmlString + '</xml>');
     xml = xml.children[0];
-    var event = new Blockly.Events.Delete();
+    var event = new Blockly.Events.BlockDelete();
     event.oldXml = xml;
     event.workspaceId = workspace.id;
     Blockly.Events.fire(event);

From 20dad54d38f3181b3e852ba3f6b9797b06000ca8 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 15:41:52 -0700
Subject: [PATCH 575/833] Migrate core/events/block_events.js to ES6 const/let

---
 core/events/events_block_base.js   |  2 +-
 core/events/events_block_change.js | 23 +++++++++--------
 core/events/events_block_create.js | 11 ++++----
 core/events/events_block_delete.js | 11 ++++----
 core/events/events_block_move.js   | 40 +++++++++++++++---------------
 5 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/core/events/events_block_base.js b/core/events/events_block_base.js
index c1c0ebb61..2ba798689 100644
--- a/core/events/events_block_base.js
+++ b/core/events/events_block_base.js
@@ -51,7 +51,7 @@ Blockly.utils.object.inherits(Blockly.Events.BlockBase,
  * @return {!Object} JSON representation.
  */
 Blockly.Events.BlockBase.prototype.toJson = function() {
-  var json = Blockly.Events.BlockBase.superClass_.toJson.call(this);
+  const json = Blockly.Events.BlockBase.superClass_.toJson.call(this);
   json['blockId'] = this.blockId;
   return json;
 };
diff --git a/core/events/events_block_change.js b/core/events/events_block_change.js
index 82868aac2..6938712b0 100644
--- a/core/events/events_block_change.js
+++ b/core/events/events_block_change.js
@@ -54,7 +54,7 @@ Blockly.Events.BlockChange.prototype.type = Blockly.Events.BLOCK_CHANGE;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.BlockChange.prototype.toJson = function() {
-  var json = Blockly.Events.BlockChange.superClass_.toJson.call(this);
+  const json = Blockly.Events.BlockChange.superClass_.toJson.call(this);
   json['element'] = this.element;
   if (this.name) {
     json['name'] = this.name;
@@ -89,8 +89,8 @@ Blockly.Events.BlockChange.prototype.isNull = function() {
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
 Blockly.Events.BlockChange.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
-  var block = workspace.getBlockById(this.blockId);
+  const workspace = this.getEventWorkspace_();
+  const block = workspace.getBlockById(this.blockId);
   if (!block) {
     console.warn("Can't change non-existent block: " + this.blockId);
     return;
@@ -99,16 +99,17 @@ Blockly.Events.BlockChange.prototype.run = function(forward) {
     // Close the mutator (if open) since we don't want to update it.
     block.mutator.setVisible(false);
   }
-  var value = forward ? this.newValue : this.oldValue;
+  const value = forward ? this.newValue : this.oldValue;
   switch (this.element) {
-    case 'field':
-      var field = block.getField(this.name);
+    case 'field': {
+      const field = block.getField(this.name);
       if (field) {
         field.setValue(value);
       } else {
         console.warn("Can't set non-existent field: " + this.name);
       }
       break;
+    }
     case 'comment':
       block.setCommentText(/** @type {string} */ (value) || null);
       break;
@@ -121,19 +122,21 @@ Blockly.Events.BlockChange.prototype.run = function(forward) {
     case 'inline':
       block.setInputsInline(!!value);
       break;
-    case 'mutation':
-      var oldMutation = '';
+    case 'mutation': {
+      let oldMutation = '';
       if (block.mutationToDom) {
-        var oldMutationDom = block.mutationToDom();
+        const oldMutationDom = block.mutationToDom();
         oldMutation = oldMutationDom && Blockly.Xml.domToText(oldMutationDom);
       }
       if (block.domToMutation) {
-        var dom = Blockly.Xml.textToDom(/** @type {string} */ (value) || '<mutation/>');
+        const dom = Blockly.Xml.textToDom(/** @type {string} */
+            (value) || '<mutation/>');
         block.domToMutation(dom);
       }
       Blockly.Events.fire(new Blockly.Events.BlockChange(
           block, 'mutation', null, oldMutation, value));
       break;
+    }
     default:
       console.warn('Unknown change type: ' + this.element);
   }
diff --git a/core/events/events_block_create.js b/core/events/events_block_create.js
index 301068afe..119f9c0a8 100644
--- a/core/events/events_block_create.js
+++ b/core/events/events_block_create.js
@@ -58,7 +58,7 @@ Blockly.Events.BlockCreate.prototype.type = Blockly.Events.BLOCK_CREATE;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.BlockCreate.prototype.toJson = function() {
-  var json = Blockly.Events.BlockCreate.superClass_.toJson.call(this);
+  const json = Blockly.Events.BlockCreate.superClass_.toJson.call(this);
   json['xml'] = Blockly.Xml.domToText(this.xml);
   json['ids'] = this.ids;
   if (!this.recordUndo) {
@@ -85,14 +85,15 @@ Blockly.Events.BlockCreate.prototype.fromJson = function(json) {
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
 Blockly.Events.BlockCreate.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
+  const workspace = this.getEventWorkspace_();
   if (forward) {
-    var xml = Blockly.utils.xml.createElement('xml');
+    const xml = Blockly.utils.xml.createElement('xml');
     xml.appendChild(this.xml);
     Blockly.Xml.domToWorkspace(xml, workspace);
   } else {
-    for (var i = 0, id; (id = this.ids[i]); i++) {
-      var block = workspace.getBlockById(id);
+    for (let i = 0; i < this.ids.length; i++) {
+      const id = this.ids[i];
+      const block = workspace.getBlockById(id);
       if (block) {
         block.dispose(false);
       } else if (id == this.blockId) {
diff --git a/core/events/events_block_delete.js b/core/events/events_block_delete.js
index 38d1d6345..120ac7ddc 100644
--- a/core/events/events_block_delete.js
+++ b/core/events/events_block_delete.js
@@ -62,7 +62,7 @@ Blockly.Events.BlockDelete.prototype.type = Blockly.Events.BLOCK_DELETE;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.BlockDelete.prototype.toJson = function() {
-  var json = Blockly.Events.BlockDelete.superClass_.toJson.call(this);
+  const json = Blockly.Events.BlockDelete.superClass_.toJson.call(this);
   json['oldXml'] = Blockly.Xml.domToText(this.oldXml);
   json['ids'] = this.ids;
   if (!this.recordUndo) {
@@ -89,10 +89,11 @@ Blockly.Events.BlockDelete.prototype.fromJson = function(json) {
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
 Blockly.Events.BlockDelete.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
+  const workspace = this.getEventWorkspace_();
   if (forward) {
-    for (var i = 0, id; (id = this.ids[i]); i++) {
-      var block = workspace.getBlockById(id);
+    for (let i = 0; i < this.ids.length; i++) {
+      const id = this.ids[i];
+      const block = workspace.getBlockById(id);
       if (block) {
         block.dispose(false);
       } else if (id == this.blockId) {
@@ -101,7 +102,7 @@ Blockly.Events.BlockDelete.prototype.run = function(forward) {
       }
     }
   } else {
-    var xml = Blockly.utils.xml.createElement('xml');
+    const xml = Blockly.utils.xml.createElement('xml');
     xml.appendChild(this.oldXml);
     Blockly.Xml.domToWorkspace(xml, workspace);
   }
diff --git a/core/events/events_block_move.js b/core/events/events_block_move.js
index d3121e115..4318e443e 100644
--- a/core/events/events_block_move.js
+++ b/core/events/events_block_move.js
@@ -39,7 +39,7 @@ Blockly.Events.BlockMove = function(opt_block) {
     this.recordUndo = false;
   }
 
-  var location = this.currentLocation_();
+  const location = this.currentLocation_();
   this.oldParentId = location.parentId;
   this.oldInputName = location.inputName;
   this.oldCoordinate = location.coordinate;
@@ -57,7 +57,7 @@ Blockly.Events.BlockMove.prototype.type = Blockly.Events.BLOCK_MOVE;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.BlockMove.prototype.toJson = function() {
-  var json = Blockly.Events.BlockMove.superClass_.toJson.call(this);
+  const json = Blockly.Events.BlockMove.superClass_.toJson.call(this);
   if (this.newParentId) {
     json['newParentId'] = this.newParentId;
   }
@@ -83,7 +83,7 @@ Blockly.Events.BlockMove.prototype.fromJson = function(json) {
   this.newParentId = json['newParentId'];
   this.newInputName = json['newInputName'];
   if (json['newCoordinate']) {
-    var xy = json['newCoordinate'].split(',');
+    const xy = json['newCoordinate'].split(',');
     this.newCoordinate =
         new Blockly.utils.Coordinate(Number(xy[0]), Number(xy[1]));
   }
@@ -96,7 +96,7 @@ Blockly.Events.BlockMove.prototype.fromJson = function(json) {
  * Record the block's new location.  Called after the move.
  */
 Blockly.Events.BlockMove.prototype.recordNew = function() {
-  var location = this.currentLocation_();
+  const location = this.currentLocation_();
   this.newParentId = location.parentId;
   this.newInputName = location.inputName;
   this.newCoordinate = location.coordinate;
@@ -109,13 +109,13 @@ Blockly.Events.BlockMove.prototype.recordNew = function() {
  * @private
  */
 Blockly.Events.BlockMove.prototype.currentLocation_ = function() {
-  var workspace = this.getEventWorkspace_();
-  var block = workspace.getBlockById(this.blockId);
-  var location = {};
-  var parent = block.getParent();
+  const workspace = this.getEventWorkspace_();
+  const block = workspace.getBlockById(this.blockId);
+  const location = {};
+  const parent = block.getParent();
   if (parent) {
     location.parentId = parent.id;
-    var input = parent.getInputWithBlock(block);
+    const input = parent.getInputWithBlock(block);
     if (input) {
       location.inputName = input.name;
     }
@@ -140,16 +140,16 @@ Blockly.Events.BlockMove.prototype.isNull = function() {
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
 Blockly.Events.BlockMove.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
-  var block = workspace.getBlockById(this.blockId);
+  const workspace = this.getEventWorkspace_();
+  const block = workspace.getBlockById(this.blockId);
   if (!block) {
     console.warn("Can't move non-existent block: " + this.blockId);
     return;
   }
-  var parentId = forward ? this.newParentId : this.oldParentId;
-  var inputName = forward ? this.newInputName : this.oldInputName;
-  var coordinate = forward ? this.newCoordinate : this.oldCoordinate;
-  var parentBlock = null;
+  const parentId = forward ? this.newParentId : this.oldParentId;
+  const inputName = forward ? this.newInputName : this.oldInputName;
+  const coordinate = forward ? this.newCoordinate : this.oldCoordinate;
+  let parentBlock;
   if (parentId) {
     parentBlock = workspace.getBlockById(parentId);
     if (!parentBlock) {
@@ -161,14 +161,14 @@ Blockly.Events.BlockMove.prototype.run = function(forward) {
     block.unplug();
   }
   if (coordinate) {
-    var xy = block.getRelativeToSurfaceXY();
+    const xy = block.getRelativeToSurfaceXY();
     block.moveBy(coordinate.x - xy.x, coordinate.y - xy.y);
   } else {
-    var blockConnection = block.outputConnection || block.previousConnection;
-    var parentConnection;
-    var connectionType = blockConnection.type;
+    const blockConnection = block.outputConnection || block.previousConnection;
+    let parentConnection;
+    const connectionType = blockConnection.type;
     if (inputName) {
-      var input = parentBlock.getInput(inputName);
+      const input = parentBlock.getInput(inputName);
       if (input) {
         parentConnection = input.connection;
       }

From fd0385dd63b5edee14364d7f224bdd1bd6a1b755 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 15:42:12 -0700
Subject: [PATCH 576/833] Migrate core/events/block_events.js to goog.module

---
 core/events/events_block_base.js   | 21 ++++++++++----------
 core/events/events_block_change.js | 30 ++++++++++++++++-------------
 core/events/events_block_create.js | 26 ++++++++++++++-----------
 core/events/events_block_delete.js | 25 +++++++++++++-----------
 core/events/events_block_move.js   | 31 ++++++++++++++++--------------
 tests/deps.js                      | 10 +++++-----
 6 files changed, 79 insertions(+), 64 deletions(-)

diff --git a/core/events/events_block_base.js b/core/events/events_block_base.js
index 2ba798689..6fe90fdca 100644
--- a/core/events/events_block_base.js
+++ b/core/events/events_block_base.js
@@ -10,11 +10,10 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.BlockBase');
+goog.module('Blockly.Events.BlockBase');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
 goog.require('Blockly.Events.Abstract');
-goog.require('Blockly.Events.BlockBase');
 goog.require('Blockly.utils.object');
 
 goog.requireType('Blockly.Block');
@@ -27,8 +26,8 @@ goog.requireType('Blockly.Block');
  * @extends {Blockly.Events.Abstract}
  * @constructor
  */
-Blockly.Events.BlockBase = function(opt_block) {
-  Blockly.Events.BlockBase.superClass_.constructor.call(this);
+const BlockBase = function(opt_block) {
+  BlockBase.superClass_.constructor.call(this);
   this.isBlank = typeof opt_block == 'undefined';
 
   /**
@@ -43,15 +42,15 @@ Blockly.Events.BlockBase = function(opt_block) {
    */
   this.workspaceId = this.isBlank ? '' : opt_block.workspace.id;
 };
-Blockly.utils.object.inherits(Blockly.Events.BlockBase,
+Blockly.utils.object.inherits(BlockBase,
     Blockly.Events.Abstract);
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.BlockBase.prototype.toJson = function() {
-  const json = Blockly.Events.BlockBase.superClass_.toJson.call(this);
+BlockBase.prototype.toJson = function() {
+  const json = BlockBase.superClass_.toJson.call(this);
   json['blockId'] = this.blockId;
   return json;
 };
@@ -60,7 +59,9 @@ Blockly.Events.BlockBase.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.BlockBase.prototype.fromJson = function(json) {
-  Blockly.Events.BlockBase.superClass_.fromJson.call(this, json);
+BlockBase.prototype.fromJson = function(json) {
+  BlockBase.superClass_.fromJson.call(this, json);
   this.blockId = json['blockId'];
 };
+
+exports = BlockBase;
diff --git a/core/events/events_block_change.js b/core/events/events_block_change.js
index 6938712b0..c9071580a 100644
--- a/core/events/events_block_change.js
+++ b/core/events/events_block_change.js
@@ -10,9 +10,11 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.BlockChange');
+goog.module('Blockly.Events.BlockChange');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
+goog.require('Blockly.registry');
 goog.require('Blockly.utils.object');
 goog.require('Blockly.Xml');
 
@@ -30,9 +32,9 @@ goog.requireType('Blockly.Block');
  * @extends {Blockly.Events.BlockBase}
  * @constructor
  */
-Blockly.Events.BlockChange = function(opt_block, opt_element, opt_name, opt_oldValue,
+const BlockChange = function(opt_block, opt_element, opt_name, opt_oldValue,
     opt_newValue) {
-  Blockly.Events.BlockChange.superClass_.constructor.call(this, opt_block);
+  BlockChange.superClass_.constructor.call(this, opt_block);
   if (!opt_block) {
     return;  // Blank event to be populated by fromJson.
   }
@@ -41,20 +43,20 @@ Blockly.Events.BlockChange = function(opt_block, opt_element, opt_name, opt_oldV
   this.oldValue = typeof opt_oldValue == 'undefined' ? '' : opt_oldValue;
   this.newValue = typeof opt_newValue == 'undefined' ? '' : opt_newValue;
 };
-Blockly.utils.object.inherits(Blockly.Events.BlockChange, Blockly.Events.BlockBase);
+Blockly.utils.object.inherits(BlockChange, Blockly.Events.BlockBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.BlockChange.prototype.type = Blockly.Events.BLOCK_CHANGE;
+BlockChange.prototype.type = Blockly.Events.BLOCK_CHANGE;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.BlockChange.prototype.toJson = function() {
-  const json = Blockly.Events.BlockChange.superClass_.toJson.call(this);
+BlockChange.prototype.toJson = function() {
+  const json = BlockChange.superClass_.toJson.call(this);
   json['element'] = this.element;
   if (this.name) {
     json['name'] = this.name;
@@ -68,8 +70,8 @@ Blockly.Events.BlockChange.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.BlockChange.prototype.fromJson = function(json) {
-  Blockly.Events.BlockChange.superClass_.fromJson.call(this, json);
+BlockChange.prototype.fromJson = function(json) {
+  BlockChange.superClass_.fromJson.call(this, json);
   this.element = json['element'];
   this.name = json['name'];
   this.oldValue = json['oldValue'];
@@ -80,7 +82,7 @@ Blockly.Events.BlockChange.prototype.fromJson = function(json) {
  * Does this event record any change of state?
  * @return {boolean} False if something changed.
  */
-Blockly.Events.BlockChange.prototype.isNull = function() {
+BlockChange.prototype.isNull = function() {
   return this.oldValue == this.newValue;
 };
 
@@ -88,7 +90,7 @@ Blockly.Events.BlockChange.prototype.isNull = function() {
  * Run a change event.
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
-Blockly.Events.BlockChange.prototype.run = function(forward) {
+BlockChange.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   const block = workspace.getBlockById(this.blockId);
   if (!block) {
@@ -133,7 +135,7 @@ Blockly.Events.BlockChange.prototype.run = function(forward) {
             (value) || '<mutation/>');
         block.domToMutation(dom);
       }
-      Blockly.Events.fire(new Blockly.Events.BlockChange(
+      Blockly.Events.fire(new BlockChange(
           block, 'mutation', null, oldMutation, value));
       break;
     }
@@ -143,4 +145,6 @@ Blockly.Events.BlockChange.prototype.run = function(forward) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.CHANGE,
-    Blockly.Events.BlockChange);
+    BlockChange);
+
+exports = BlockChange;
diff --git a/core/events/events_block_create.js b/core/events/events_block_create.js
index 119f9c0a8..6d3597e68 100644
--- a/core/events/events_block_create.js
+++ b/core/events/events_block_create.js
@@ -10,10 +10,12 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.BlockCreate');
+goog.module('Blockly.Events.BlockCreate');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockBase');
+goog.require('Blockly.registry');
 goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.xml');
 goog.require('Blockly.Xml');
@@ -28,8 +30,8 @@ goog.requireType('Blockly.Block');
  * @extends {Blockly.Events.BlockBase}
  * @constructor
  */
-Blockly.Events.BlockCreate = function(opt_block) {
-  Blockly.Events.BlockCreate.superClass_.constructor.call(this, opt_block);
+const BlockCreate = function(opt_block) {
+  BlockCreate.superClass_.constructor.call(this, opt_block);
   if (!opt_block) {
     return;  // Blank event to be populated by fromJson.
   }
@@ -45,20 +47,20 @@ Blockly.Events.BlockCreate = function(opt_block) {
   }
   this.ids = Blockly.Events.getDescendantIds(opt_block);
 };
-Blockly.utils.object.inherits(Blockly.Events.BlockCreate, Blockly.Events.BlockBase);
+Blockly.utils.object.inherits(BlockCreate, Blockly.Events.BlockBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.BlockCreate.prototype.type = Blockly.Events.BLOCK_CREATE;
+BlockCreate.prototype.type = Blockly.Events.BLOCK_CREATE;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.BlockCreate.prototype.toJson = function() {
-  const json = Blockly.Events.BlockCreate.superClass_.toJson.call(this);
+BlockCreate.prototype.toJson = function() {
+  const json = BlockCreate.superClass_.toJson.call(this);
   json['xml'] = Blockly.Xml.domToText(this.xml);
   json['ids'] = this.ids;
   if (!this.recordUndo) {
@@ -71,8 +73,8 @@ Blockly.Events.BlockCreate.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.BlockCreate.prototype.fromJson = function(json) {
-  Blockly.Events.BlockCreate.superClass_.fromJson.call(this, json);
+BlockCreate.prototype.fromJson = function(json) {
+  BlockCreate.superClass_.fromJson.call(this, json);
   this.xml = Blockly.Xml.textToDom(json['xml']);
   this.ids = json['ids'];
   if (json['recordUndo'] !== undefined) {
@@ -84,7 +86,7 @@ Blockly.Events.BlockCreate.prototype.fromJson = function(json) {
  * Run a creation event.
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
-Blockly.Events.BlockCreate.prototype.run = function(forward) {
+BlockCreate.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   if (forward) {
     const xml = Blockly.utils.xml.createElement('xml');
@@ -105,4 +107,6 @@ Blockly.Events.BlockCreate.prototype.run = function(forward) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.CREATE,
-    Blockly.Events.BlockCreate);
+    BlockCreate);
+
+exports = BlockCreate;
diff --git a/core/events/events_block_delete.js b/core/events/events_block_delete.js
index 120ac7ddc..7cd483fb8 100644
--- a/core/events/events_block_delete.js
+++ b/core/events/events_block_delete.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.BlockDelete');
+goog.module('Blockly.Events.BlockDelete');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockBase');
@@ -29,8 +30,8 @@ goog.requireType('Blockly.Block');
  * @extends {Blockly.Events.BlockBase}
  * @constructor
  */
-Blockly.Events.BlockDelete = function(opt_block) {
-  Blockly.Events.BlockDelete.superClass_.constructor.call(this, opt_block);
+const BlockDelete = function(opt_block) {
+  BlockDelete.superClass_.constructor.call(this, opt_block);
   if (!opt_block) {
     return;  // Blank event to be populated by fromJson.
   }
@@ -49,20 +50,20 @@ Blockly.Events.BlockDelete = function(opt_block) {
   }
   this.ids = Blockly.Events.getDescendantIds(opt_block);
 };
-Blockly.utils.object.inherits(Blockly.Events.BlockDelete, Blockly.Events.BlockBase);
+Blockly.utils.object.inherits(BlockDelete, Blockly.Events.BlockBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.BlockDelete.prototype.type = Blockly.Events.BLOCK_DELETE;
+BlockDelete.prototype.type = Blockly.Events.BLOCK_DELETE;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.BlockDelete.prototype.toJson = function() {
-  const json = Blockly.Events.BlockDelete.superClass_.toJson.call(this);
+BlockDelete.prototype.toJson = function() {
+  const json = BlockDelete.superClass_.toJson.call(this);
   json['oldXml'] = Blockly.Xml.domToText(this.oldXml);
   json['ids'] = this.ids;
   if (!this.recordUndo) {
@@ -75,8 +76,8 @@ Blockly.Events.BlockDelete.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.BlockDelete.prototype.fromJson = function(json) {
-  Blockly.Events.BlockDelete.superClass_.fromJson.call(this, json);
+BlockDelete.prototype.fromJson = function(json) {
+  BlockDelete.superClass_.fromJson.call(this, json);
   this.oldXml = Blockly.Xml.textToDom(json['oldXml']);
   this.ids = json['ids'];
   if (json['recordUndo'] !== undefined) {
@@ -88,7 +89,7 @@ Blockly.Events.BlockDelete.prototype.fromJson = function(json) {
  * Run a deletion event.
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
-Blockly.Events.BlockDelete.prototype.run = function(forward) {
+BlockDelete.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   if (forward) {
     for (let i = 0; i < this.ids.length; i++) {
@@ -109,4 +110,6 @@ Blockly.Events.BlockDelete.prototype.run = function(forward) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.DELETE,
-    Blockly.Events.BlockDelete);
+    BlockDelete);
+
+exports = BlockDelete;
diff --git a/core/events/events_block_move.js b/core/events/events_block_move.js
index 4318e443e..c2e3b544f 100644
--- a/core/events/events_block_move.js
+++ b/core/events/events_block_move.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.BlockMove');
+goog.module('Blockly.Events.BlockMove');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.connectionTypes');
 goog.require('Blockly.Events');
@@ -29,8 +30,8 @@ goog.requireType('Blockly.Block');
  * @extends {Blockly.Events.BlockBase}
  * @constructor
  */
-Blockly.Events.BlockMove = function(opt_block) {
-  Blockly.Events.BlockMove.superClass_.constructor.call(this, opt_block);
+const BlockMove = function(opt_block) {
+  BlockMove.superClass_.constructor.call(this, opt_block);
   if (!opt_block) {
     return;  // Blank event to be populated by fromJson.
   }
@@ -44,20 +45,20 @@ Blockly.Events.BlockMove = function(opt_block) {
   this.oldInputName = location.inputName;
   this.oldCoordinate = location.coordinate;
 };
-Blockly.utils.object.inherits(Blockly.Events.BlockMove, Blockly.Events.BlockBase);
+Blockly.utils.object.inherits(BlockMove, Blockly.Events.BlockBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.BlockMove.prototype.type = Blockly.Events.BLOCK_MOVE;
+BlockMove.prototype.type = Blockly.Events.BLOCK_MOVE;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.BlockMove.prototype.toJson = function() {
-  const json = Blockly.Events.BlockMove.superClass_.toJson.call(this);
+BlockMove.prototype.toJson = function() {
+  const json = BlockMove.superClass_.toJson.call(this);
   if (this.newParentId) {
     json['newParentId'] = this.newParentId;
   }
@@ -78,8 +79,8 @@ Blockly.Events.BlockMove.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.BlockMove.prototype.fromJson = function(json) {
-  Blockly.Events.BlockMove.superClass_.fromJson.call(this, json);
+BlockMove.prototype.fromJson = function(json) {
+  BlockMove.superClass_.fromJson.call(this, json);
   this.newParentId = json['newParentId'];
   this.newInputName = json['newInputName'];
   if (json['newCoordinate']) {
@@ -95,7 +96,7 @@ Blockly.Events.BlockMove.prototype.fromJson = function(json) {
 /**
  * Record the block's new location.  Called after the move.
  */
-Blockly.Events.BlockMove.prototype.recordNew = function() {
+BlockMove.prototype.recordNew = function() {
   const location = this.currentLocation_();
   this.newParentId = location.parentId;
   this.newInputName = location.inputName;
@@ -108,7 +109,7 @@ Blockly.Events.BlockMove.prototype.recordNew = function() {
  * @return {!Object} Collection of location info.
  * @private
  */
-Blockly.Events.BlockMove.prototype.currentLocation_ = function() {
+BlockMove.prototype.currentLocation_ = function() {
   const workspace = this.getEventWorkspace_();
   const block = workspace.getBlockById(this.blockId);
   const location = {};
@@ -129,7 +130,7 @@ Blockly.Events.BlockMove.prototype.currentLocation_ = function() {
  * Does this event record any change of state?
  * @return {boolean} False if something changed.
  */
-Blockly.Events.BlockMove.prototype.isNull = function() {
+BlockMove.prototype.isNull = function() {
   return this.oldParentId == this.newParentId &&
       this.oldInputName == this.newInputName &&
       Blockly.utils.Coordinate.equals(this.oldCoordinate, this.newCoordinate);
@@ -139,7 +140,7 @@ Blockly.Events.BlockMove.prototype.isNull = function() {
  * Run a move event.
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
-Blockly.Events.BlockMove.prototype.run = function(forward) {
+BlockMove.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   const block = workspace.getBlockById(this.blockId);
   if (!block) {
@@ -184,4 +185,6 @@ Blockly.Events.BlockMove.prototype.run = function(forward) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.MOVE,
-    Blockly.Events.BlockMove);
+    BlockMove);
+
+exports = BlockMove;
diff --git a/tests/deps.js b/tests/deps.js
index 542c8355d..d75d74f9e 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -36,12 +36,12 @@ goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockl
 goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style']);
 goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils']);
 goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.BlockBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Events.BlockBase', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.utils.object', 'Blockly.utils.xml']);
-goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml']);
+goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.BlockBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 7889b02d9bd6d555717073ae4614c904a1e16432 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 15:42:29 -0700
Subject: [PATCH 577/833] Migrate core/events/block_events.js named requires

---
 core/events/events_block_base.js   | 16 ++++++------
 core/events/events_block_change.js | 28 ++++++++++----------
 core/events/events_block_create.js | 42 +++++++++++++++---------------
 core/events/events_block_delete.js | 42 +++++++++++++++---------------
 core/events/events_block_move.js   | 32 +++++++++++------------
 5 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/core/events/events_block_base.js b/core/events/events_block_base.js
index 6fe90fdca..76fa09c97 100644
--- a/core/events/events_block_base.js
+++ b/core/events/events_block_base.js
@@ -13,17 +13,17 @@
 goog.module('Blockly.Events.BlockBase');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events.Abstract');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.Block');
+const Abstract = goog.require('Blockly.Events.Abstract');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * Abstract class for a block event.
- * @param {!Blockly.Block=} opt_block The block this event corresponds to.
+ * @param {!Block=} opt_block The block this event corresponds to.
  *     Undefined for a blank event.
- * @extends {Blockly.Events.Abstract}
+ * @extends {Abstract}
  * @constructor
  */
 const BlockBase = function(opt_block) {
@@ -42,8 +42,8 @@ const BlockBase = function(opt_block) {
    */
   this.workspaceId = this.isBlank ? '' : opt_block.workspace.id;
 };
-Blockly.utils.object.inherits(BlockBase,
-    Blockly.Events.Abstract);
+object.inherits(BlockBase,
+    Abstract);
 
 /**
  * Encode the event as JSON.
diff --git a/core/events/events_block_change.js b/core/events/events_block_change.js
index c9071580a..5e12919c0 100644
--- a/core/events/events_block_change.js
+++ b/core/events/events_block_change.js
@@ -13,23 +13,23 @@
 goog.module('Blockly.Events.BlockChange');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const Events = goog.require('Blockly.Events');
+const Xml = goog.require('Blockly.Xml');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
  * Class for a block change event.
- * @param {!Blockly.Block=} opt_block The changed block.  Undefined for a blank
+ * @param {!Block=} opt_block The changed block.  Undefined for a blank
  *     event.
  * @param {string=} opt_element One of 'field', 'comment', 'disabled', etc.
  * @param {?string=} opt_name Name of input or field affected, or null.
  * @param {*=} opt_oldValue Previous value of element.
  * @param {*=} opt_newValue New value of element.
- * @extends {Blockly.Events.BlockBase}
+ * @extends {Events.BlockBase}
  * @constructor
  */
 const BlockChange = function(opt_block, opt_element, opt_name, opt_oldValue,
@@ -43,13 +43,13 @@ const BlockChange = function(opt_block, opt_element, opt_name, opt_oldValue,
   this.oldValue = typeof opt_oldValue == 'undefined' ? '' : opt_oldValue;
   this.newValue = typeof opt_newValue == 'undefined' ? '' : opt_newValue;
 };
-Blockly.utils.object.inherits(BlockChange, Blockly.Events.BlockBase);
+object.inherits(BlockChange, Events.BlockBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-BlockChange.prototype.type = Blockly.Events.BLOCK_CHANGE;
+BlockChange.prototype.type = Events.BLOCK_CHANGE;
 
 /**
  * Encode the event as JSON.
@@ -128,14 +128,14 @@ BlockChange.prototype.run = function(forward) {
       let oldMutation = '';
       if (block.mutationToDom) {
         const oldMutationDom = block.mutationToDom();
-        oldMutation = oldMutationDom && Blockly.Xml.domToText(oldMutationDom);
+        oldMutation = oldMutationDom && Xml.domToText(oldMutationDom);
       }
       if (block.domToMutation) {
-        const dom = Blockly.Xml.textToDom(/** @type {string} */
+        const dom = Xml.textToDom(/** @type {string} */
             (value) || '<mutation/>');
         block.domToMutation(dom);
       }
-      Blockly.Events.fire(new BlockChange(
+      Events.fire(new BlockChange(
           block, 'mutation', null, oldMutation, value));
       break;
     }
@@ -144,7 +144,7 @@ BlockChange.prototype.run = function(forward) {
   }
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.CHANGE,
+registry.register(registry.Type.EVENT, Events.CHANGE,
     BlockChange);
 
 exports = BlockChange;
diff --git a/core/events/events_block_create.js b/core/events/events_block_create.js
index 6d3597e68..460afc2c1 100644
--- a/core/events/events_block_create.js
+++ b/core/events/events_block_create.js
@@ -13,21 +13,21 @@
 goog.module('Blockly.Events.BlockCreate');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.BlockBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.xml');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const BlockBase = goog.require('Blockly.Events.BlockBase');
+const Events = goog.require('Blockly.Events');
+const Xml = goog.require('Blockly.Xml');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
+const xml = goog.require('Blockly.utils.xml');
 
 
 /**
  * Class for a block creation event.
- * @param {!Blockly.Block=} opt_block The created block.  Undefined for a blank
+ * @param {!Block=} opt_block The created block.  Undefined for a blank
  *     event.
- * @extends {Blockly.Events.BlockBase}
+ * @extends {BlockBase}
  * @constructor
  */
 const BlockCreate = function(opt_block) {
@@ -41,19 +41,19 @@ const BlockCreate = function(opt_block) {
   }
 
   if (opt_block.workspace.rendered) {
-    this.xml = Blockly.Xml.blockToDomWithXY(opt_block);
+    this.xml = Xml.blockToDomWithXY(opt_block);
   } else {
-    this.xml = Blockly.Xml.blockToDom(opt_block);
+    this.xml = Xml.blockToDom(opt_block);
   }
-  this.ids = Blockly.Events.getDescendantIds(opt_block);
+  this.ids = Events.getDescendantIds(opt_block);
 };
-Blockly.utils.object.inherits(BlockCreate, Blockly.Events.BlockBase);
+object.inherits(BlockCreate, BlockBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-BlockCreate.prototype.type = Blockly.Events.BLOCK_CREATE;
+BlockCreate.prototype.type = Events.BLOCK_CREATE;
 
 /**
  * Encode the event as JSON.
@@ -61,7 +61,7 @@ BlockCreate.prototype.type = Blockly.Events.BLOCK_CREATE;
  */
 BlockCreate.prototype.toJson = function() {
   const json = BlockCreate.superClass_.toJson.call(this);
-  json['xml'] = Blockly.Xml.domToText(this.xml);
+  json['xml'] = Xml.domToText(this.xml);
   json['ids'] = this.ids;
   if (!this.recordUndo) {
     json['recordUndo'] = this.recordUndo;
@@ -75,7 +75,7 @@ BlockCreate.prototype.toJson = function() {
  */
 BlockCreate.prototype.fromJson = function(json) {
   BlockCreate.superClass_.fromJson.call(this, json);
-  this.xml = Blockly.Xml.textToDom(json['xml']);
+  this.xml = Xml.textToDom(json['xml']);
   this.ids = json['ids'];
   if (json['recordUndo'] !== undefined) {
     this.recordUndo = json['recordUndo'];
@@ -89,9 +89,9 @@ BlockCreate.prototype.fromJson = function(json) {
 BlockCreate.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   if (forward) {
-    const xml = Blockly.utils.xml.createElement('xml');
-    xml.appendChild(this.xml);
-    Blockly.Xml.domToWorkspace(xml, workspace);
+    const xmlEl = xml.createElement('xml');
+    xmlEl.appendChild(this.xml);
+    Xml.domToWorkspace(xmlEl, workspace);
   } else {
     for (let i = 0; i < this.ids.length; i++) {
       const id = this.ids[i];
@@ -106,7 +106,7 @@ BlockCreate.prototype.run = function(forward) {
   }
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.CREATE,
+registry.register(registry.Type.EVENT, Events.CREATE,
     BlockCreate);
 
 exports = BlockCreate;
diff --git a/core/events/events_block_delete.js b/core/events/events_block_delete.js
index 7cd483fb8..f2bf510e7 100644
--- a/core/events/events_block_delete.js
+++ b/core/events/events_block_delete.js
@@ -13,21 +13,21 @@
 goog.module('Blockly.Events.BlockDelete');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.BlockBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.xml');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const BlockBase = goog.require('Blockly.Events.BlockBase');
+const Events = goog.require('Blockly.Events');
+const Xml = goog.require('Blockly.Xml');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
+const xml = goog.require('Blockly.utils.xml');
 
 
 /**
  * Class for a block deletion event.
- * @param {!Blockly.Block=} opt_block The deleted block.  Undefined for a blank
+ * @param {!Block=} opt_block The deleted block.  Undefined for a blank
  *     event.
- * @extends {Blockly.Events.BlockBase}
+ * @extends {BlockBase}
  * @constructor
  */
 const BlockDelete = function(opt_block) {
@@ -44,19 +44,19 @@ const BlockDelete = function(opt_block) {
   }
 
   if (opt_block.workspace.rendered) {
-    this.oldXml = Blockly.Xml.blockToDomWithXY(opt_block);
+    this.oldXml = Xml.blockToDomWithXY(opt_block);
   } else {
-    this.oldXml = Blockly.Xml.blockToDom(opt_block);
+    this.oldXml = Xml.blockToDom(opt_block);
   }
-  this.ids = Blockly.Events.getDescendantIds(opt_block);
+  this.ids = Events.getDescendantIds(opt_block);
 };
-Blockly.utils.object.inherits(BlockDelete, Blockly.Events.BlockBase);
+object.inherits(BlockDelete, BlockBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-BlockDelete.prototype.type = Blockly.Events.BLOCK_DELETE;
+BlockDelete.prototype.type = Events.BLOCK_DELETE;
 
 /**
  * Encode the event as JSON.
@@ -64,7 +64,7 @@ BlockDelete.prototype.type = Blockly.Events.BLOCK_DELETE;
  */
 BlockDelete.prototype.toJson = function() {
   const json = BlockDelete.superClass_.toJson.call(this);
-  json['oldXml'] = Blockly.Xml.domToText(this.oldXml);
+  json['oldXml'] = Xml.domToText(this.oldXml);
   json['ids'] = this.ids;
   if (!this.recordUndo) {
     json['recordUndo'] = this.recordUndo;
@@ -78,7 +78,7 @@ BlockDelete.prototype.toJson = function() {
  */
 BlockDelete.prototype.fromJson = function(json) {
   BlockDelete.superClass_.fromJson.call(this, json);
-  this.oldXml = Blockly.Xml.textToDom(json['oldXml']);
+  this.oldXml = Xml.textToDom(json['oldXml']);
   this.ids = json['ids'];
   if (json['recordUndo'] !== undefined) {
     this.recordUndo = json['recordUndo'];
@@ -103,13 +103,13 @@ BlockDelete.prototype.run = function(forward) {
       }
     }
   } else {
-    const xml = Blockly.utils.xml.createElement('xml');
-    xml.appendChild(this.oldXml);
-    Blockly.Xml.domToWorkspace(xml, workspace);
+    const xmlEl = xml.createElement('xml');
+    xmlEl.appendChild(this.oldXml);
+    Xml.domToWorkspace(xmlEl, workspace);
   }
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.DELETE,
+registry.register(registry.Type.EVENT, Events.DELETE,
     BlockDelete);
 
 exports = BlockDelete;
diff --git a/core/events/events_block_move.js b/core/events/events_block_move.js
index c2e3b544f..766d72f96 100644
--- a/core/events/events_block_move.js
+++ b/core/events/events_block_move.js
@@ -13,21 +13,21 @@
 goog.module('Blockly.Events.BlockMove');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.connectionTypes');
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.BlockBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const BlockBase = goog.require('Blockly.Events.BlockBase');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Events = goog.require('Blockly.Events');
+const connectionTypes = goog.require('Blockly.connectionTypes');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
  * Class for a block move event.  Created before the move.
- * @param {!Blockly.Block=} opt_block The moved block.  Undefined for a blank
+ * @param {!Block=} opt_block The moved block.  Undefined for a blank
  *     event.
- * @extends {Blockly.Events.BlockBase}
+ * @extends {BlockBase}
  * @constructor
  */
 const BlockMove = function(opt_block) {
@@ -45,13 +45,13 @@ const BlockMove = function(opt_block) {
   this.oldInputName = location.inputName;
   this.oldCoordinate = location.coordinate;
 };
-Blockly.utils.object.inherits(BlockMove, Blockly.Events.BlockBase);
+object.inherits(BlockMove, BlockBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-BlockMove.prototype.type = Blockly.Events.BLOCK_MOVE;
+BlockMove.prototype.type = Events.BLOCK_MOVE;
 
 /**
  * Encode the event as JSON.
@@ -86,7 +86,7 @@ BlockMove.prototype.fromJson = function(json) {
   if (json['newCoordinate']) {
     const xy = json['newCoordinate'].split(',');
     this.newCoordinate =
-        new Blockly.utils.Coordinate(Number(xy[0]), Number(xy[1]));
+        new Coordinate(Number(xy[0]), Number(xy[1]));
   }
   if (json['recordUndo'] !== undefined) {
     this.recordUndo = json['recordUndo'];
@@ -133,7 +133,7 @@ BlockMove.prototype.currentLocation_ = function() {
 BlockMove.prototype.isNull = function() {
   return this.oldParentId == this.newParentId &&
       this.oldInputName == this.newInputName &&
-      Blockly.utils.Coordinate.equals(this.oldCoordinate, this.newCoordinate);
+      Coordinate.equals(this.oldCoordinate, this.newCoordinate);
 };
 
 /**
@@ -173,7 +173,7 @@ BlockMove.prototype.run = function(forward) {
       if (input) {
         parentConnection = input.connection;
       }
-    } else if (connectionType == Blockly.connectionTypes.PREVIOUS_STATEMENT) {
+    } else if (connectionType == connectionTypes.PREVIOUS_STATEMENT) {
       parentConnection = parentBlock.nextConnection;
     }
     if (parentConnection) {
@@ -184,7 +184,7 @@ BlockMove.prototype.run = function(forward) {
   }
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.MOVE,
+registry.register(registry.Type.EVENT, Events.MOVE,
     BlockMove);
 
 exports = BlockMove;

From 5acdd5e4bc5b10d858c2a467743068995594c661 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 15:43:06 -0700
Subject: [PATCH 578/833] clang-format core/events/block_events.js

---
 core/events/events_block_base.js   |  3 +--
 core/events/events_block_change.js | 16 +++++++---------
 core/events/events_block_create.js |  5 ++---
 core/events/events_block_delete.js |  5 ++---
 core/events/events_block_move.js   | 12 +++++-------
 5 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/core/events/events_block_base.js b/core/events/events_block_base.js
index 76fa09c97..1f22a4ed8 100644
--- a/core/events/events_block_base.js
+++ b/core/events/events_block_base.js
@@ -42,8 +42,7 @@ const BlockBase = function(opt_block) {
    */
   this.workspaceId = this.isBlank ? '' : opt_block.workspace.id;
 };
-object.inherits(BlockBase,
-    Abstract);
+object.inherits(BlockBase, Abstract);
 
 /**
  * Encode the event as JSON.
diff --git a/core/events/events_block_change.js b/core/events/events_block_change.js
index 5e12919c0..38d8b5c67 100644
--- a/core/events/events_block_change.js
+++ b/core/events/events_block_change.js
@@ -32,8 +32,8 @@ const registry = goog.require('Blockly.registry');
  * @extends {Events.BlockBase}
  * @constructor
  */
-const BlockChange = function(opt_block, opt_element, opt_name, opt_oldValue,
-    opt_newValue) {
+const BlockChange = function(
+    opt_block, opt_element, opt_name, opt_oldValue, opt_newValue) {
   BlockChange.superClass_.constructor.call(this, opt_block);
   if (!opt_block) {
     return;  // Blank event to be populated by fromJson.
@@ -94,7 +94,7 @@ BlockChange.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   const block = workspace.getBlockById(this.blockId);
   if (!block) {
-    console.warn("Can't change non-existent block: " + this.blockId);
+    console.warn('Can\'t change non-existent block: ' + this.blockId);
     return;
   }
   if (block.mutator) {
@@ -108,7 +108,7 @@ BlockChange.prototype.run = function(forward) {
       if (field) {
         field.setValue(value);
       } else {
-        console.warn("Can't set non-existent field: " + this.name);
+        console.warn('Can\'t set non-existent field: ' + this.name);
       }
       break;
     }
@@ -132,11 +132,10 @@ BlockChange.prototype.run = function(forward) {
       }
       if (block.domToMutation) {
         const dom = Xml.textToDom(/** @type {string} */
-            (value) || '<mutation/>');
+                                  (value) || '<mutation/>');
         block.domToMutation(dom);
       }
-      Events.fire(new BlockChange(
-          block, 'mutation', null, oldMutation, value));
+      Events.fire(new BlockChange(block, 'mutation', null, oldMutation, value));
       break;
     }
     default:
@@ -144,7 +143,6 @@ BlockChange.prototype.run = function(forward) {
   }
 };
 
-registry.register(registry.Type.EVENT, Events.CHANGE,
-    BlockChange);
+registry.register(registry.Type.EVENT, Events.CHANGE, BlockChange);
 
 exports = BlockChange;
diff --git a/core/events/events_block_create.js b/core/events/events_block_create.js
index 460afc2c1..e3531dabe 100644
--- a/core/events/events_block_create.js
+++ b/core/events/events_block_create.js
@@ -100,13 +100,12 @@ BlockCreate.prototype.run = function(forward) {
         block.dispose(false);
       } else if (id == this.blockId) {
         // Only complain about root-level block.
-        console.warn("Can't uncreate non-existent block: " + id);
+        console.warn('Can\'t uncreate non-existent block: ' + id);
       }
     }
   }
 };
 
-registry.register(registry.Type.EVENT, Events.CREATE,
-    BlockCreate);
+registry.register(registry.Type.EVENT, Events.CREATE, BlockCreate);
 
 exports = BlockCreate;
diff --git a/core/events/events_block_delete.js b/core/events/events_block_delete.js
index f2bf510e7..57275b31a 100644
--- a/core/events/events_block_delete.js
+++ b/core/events/events_block_delete.js
@@ -99,7 +99,7 @@ BlockDelete.prototype.run = function(forward) {
         block.dispose(false);
       } else if (id == this.blockId) {
         // Only complain about root-level block.
-        console.warn("Can't delete non-existent block: " + id);
+        console.warn('Can\'t delete non-existent block: ' + id);
       }
     }
   } else {
@@ -109,7 +109,6 @@ BlockDelete.prototype.run = function(forward) {
   }
 };
 
-registry.register(registry.Type.EVENT, Events.DELETE,
-    BlockDelete);
+registry.register(registry.Type.EVENT, Events.DELETE, BlockDelete);
 
 exports = BlockDelete;
diff --git a/core/events/events_block_move.js b/core/events/events_block_move.js
index 766d72f96..8ab5c5367 100644
--- a/core/events/events_block_move.js
+++ b/core/events/events_block_move.js
@@ -85,8 +85,7 @@ BlockMove.prototype.fromJson = function(json) {
   this.newInputName = json['newInputName'];
   if (json['newCoordinate']) {
     const xy = json['newCoordinate'].split(',');
-    this.newCoordinate =
-        new Coordinate(Number(xy[0]), Number(xy[1]));
+    this.newCoordinate = new Coordinate(Number(xy[0]), Number(xy[1]));
   }
   if (json['recordUndo'] !== undefined) {
     this.recordUndo = json['recordUndo'];
@@ -144,7 +143,7 @@ BlockMove.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   const block = workspace.getBlockById(this.blockId);
   if (!block) {
-    console.warn("Can't move non-existent block: " + this.blockId);
+    console.warn('Can\'t move non-existent block: ' + this.blockId);
     return;
   }
   const parentId = forward ? this.newParentId : this.oldParentId;
@@ -154,7 +153,7 @@ BlockMove.prototype.run = function(forward) {
   if (parentId) {
     parentBlock = workspace.getBlockById(parentId);
     if (!parentBlock) {
-      console.warn("Can't connect to non-existent block: " + parentId);
+      console.warn('Can\'t connect to non-existent block: ' + parentId);
       return;
     }
   }
@@ -179,12 +178,11 @@ BlockMove.prototype.run = function(forward) {
     if (parentConnection) {
       blockConnection.connect(parentConnection);
     } else {
-      console.warn("Can't connect to non-existent input: " + inputName);
+      console.warn('Can\'t connect to non-existent input: ' + inputName);
     }
   }
 };
 
-registry.register(registry.Type.EVENT, Events.MOVE,
-    BlockMove);
+registry.register(registry.Type.EVENT, Events.MOVE, BlockMove);
 
 exports = BlockMove;

From 2f71d18e8afee2ca7c8b589332743dc25c355789 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 15:51:32 -0700
Subject: [PATCH 579/833] Update jsdoc comment for classes

---
 core/events/events_block_change.js | 2 +-
 core/events/events_block_create.js | 2 +-
 core/events/events_block_delete.js | 2 +-
 core/events/events_block_move.js   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/events/events_block_change.js b/core/events/events_block_change.js
index 38d8b5c67..3814a0d27 100644
--- a/core/events/events_block_change.js
+++ b/core/events/events_block_change.js
@@ -5,7 +5,7 @@
  */
 
 /**
- * @fileoverview Classes for all types of block events.
+ * @fileoverview Class for a block change event.
  * @author fenichel@google.com (Rachel Fenichel)
  */
 'use strict';
diff --git a/core/events/events_block_create.js b/core/events/events_block_create.js
index e3531dabe..2a6afb003 100644
--- a/core/events/events_block_create.js
+++ b/core/events/events_block_create.js
@@ -5,7 +5,7 @@
  */
 
 /**
- * @fileoverview Classes for all types of block events.
+ * @fileoverview Class for a block creation event.
  * @author fenichel@google.com (Rachel Fenichel)
  */
 'use strict';
diff --git a/core/events/events_block_delete.js b/core/events/events_block_delete.js
index 57275b31a..f44caa7f0 100644
--- a/core/events/events_block_delete.js
+++ b/core/events/events_block_delete.js
@@ -5,7 +5,7 @@
  */
 
 /**
- * @fileoverview Classes for all types of block events.
+ * @fileoverview Class for a block delete event.
  * @author fenichel@google.com (Rachel Fenichel)
  */
 'use strict';
diff --git a/core/events/events_block_move.js b/core/events/events_block_move.js
index 8ab5c5367..f026c080b 100644
--- a/core/events/events_block_move.js
+++ b/core/events/events_block_move.js
@@ -5,7 +5,7 @@
  */
 
 /**
- * @fileoverview Classes for a block move event.
+ * @fileoverview Class for a block move event.
  * @author fenichel@google.com (Rachel Fenichel)
  */
 'use strict';

From d1ab960f0fabdd11419e56b1afdc137434951cb3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 6 Aug 2021 16:21:02 -0700
Subject: [PATCH 580/833] Split classes from core/events/variable_events.js
 into multiple files

---
 core/events/events_var_base.js   |  64 ++++++++
 core/events/events_var_create.js |  82 ++++++++++
 core/events/events_var_delete.js |  82 ++++++++++
 core/events/events_var_rename.js |  83 ++++++++++
 core/events/variable_events.js   | 250 -------------------------------
 tests/deps.js                    |   5 +-
 6 files changed, 315 insertions(+), 251 deletions(-)
 create mode 100644 core/events/events_var_base.js
 create mode 100644 core/events/events_var_create.js
 create mode 100644 core/events/events_var_delete.js
 create mode 100644 core/events/events_var_rename.js
 delete mode 100644 core/events/variable_events.js

diff --git a/core/events/events_var_base.js b/core/events/events_var_base.js
new file mode 100644
index 000000000..202218269
--- /dev/null
+++ b/core/events/events_var_base.js
@@ -0,0 +1,64 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Abstract class for a variable event.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.provide('Blockly.Events.VarBase');
+
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.Abstract');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.VariableModel');
+
+
+/**
+ * Abstract class for a variable event.
+ * @param {!Blockly.VariableModel=} opt_variable The variable this event
+ *     corresponds to.  Undefined for a blank event.
+ * @extends {Blockly.Events.Abstract}
+ * @constructor
+ */
+Blockly.Events.VarBase = function(opt_variable) {
+  Blockly.Events.VarBase.superClass_.constructor.call(this);
+  this.isBlank = typeof opt_variable == 'undefined';
+
+  /**
+   * The variable id for the variable this event pertains to.
+   * @type {string}
+   */
+  this.varId = this.isBlank ? '' : opt_variable.getId();
+
+  /**
+   * The workspace identifier for this event.
+   * @type {string}
+   */
+  this.workspaceId = this.isBlank ? '' : opt_variable.workspace.id;
+};
+Blockly.utils.object.inherits(Blockly.Events.VarBase, Blockly.Events.Abstract);
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+Blockly.Events.VarBase.prototype.toJson = function() {
+  var json = Blockly.Events.VarBase.superClass_.toJson.call(this);
+  json['varId'] = this.varId;
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+Blockly.Events.VarBase.prototype.fromJson = function(json) {
+  Blockly.Events.VarBase.superClass_.toJson.call(this);
+  this.varId = json['varId'];
+};
diff --git a/core/events/events_var_create.js b/core/events/events_var_create.js
new file mode 100644
index 000000000..a228a1b92
--- /dev/null
+++ b/core/events/events_var_create.js
@@ -0,0 +1,82 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class for a variable creation event.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.provide('Blockly.Events.VarCreate');
+
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.VarBase');
+goog.require('Blockly.registry');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.VariableModel');
+
+
+/**
+ * Class for a variable creation event.
+ * @param {!Blockly.VariableModel=} opt_variable The created variable. Undefined
+ *     for a blank event.
+ * @extends {Blockly.Events.VarBase}
+ * @constructor
+ */
+Blockly.Events.VarCreate = function(opt_variable) {
+  Blockly.Events.VarCreate.superClass_.constructor.call(this, opt_variable);
+  if (!opt_variable) {
+    return;  // Blank event to be populated by fromJson.
+  }
+
+  this.varType = opt_variable.type;
+  this.varName = opt_variable.name;
+};
+Blockly.utils.object.inherits(Blockly.Events.VarCreate, Blockly.Events.VarBase);
+
+/**
+ * Type of this event.
+ * @type {string}
+ */
+Blockly.Events.VarCreate.prototype.type = Blockly.Events.VAR_CREATE;
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+Blockly.Events.VarCreate.prototype.toJson = function() {
+  var json = Blockly.Events.VarCreate.superClass_.toJson.call(this);
+  json['varType'] = this.varType;
+  json['varName'] = this.varName;
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+Blockly.Events.VarCreate.prototype.fromJson = function(json) {
+  Blockly.Events.VarCreate.superClass_.fromJson.call(this, json);
+  this.varType = json['varType'];
+  this.varName = json['varName'];
+};
+
+/**
+ * Run a variable creation event.
+ * @param {boolean} forward True if run forward, false if run backward (undo).
+ */
+Blockly.Events.VarCreate.prototype.run = function(forward) {
+  var workspace = this.getEventWorkspace_();
+  if (forward) {
+    workspace.createVariable(this.varName, this.varType, this.varId);
+  } else {
+    workspace.deleteVariableById(this.varId);
+  }
+};
+
+Blockly.registry.register(Blockly.registry.Type.EVENT,
+    Blockly.Events.VAR_CREATE, Blockly.Events.VarCreate);
diff --git a/core/events/events_var_delete.js b/core/events/events_var_delete.js
new file mode 100644
index 000000000..87a57b1b9
--- /dev/null
+++ b/core/events/events_var_delete.js
@@ -0,0 +1,82 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Classes for all types of variable events.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.provide('Blockly.Events.VarDelete');
+
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.VarBase');
+goog.require('Blockly.registry');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.VariableModel');
+
+
+/**
+ * Class for a variable deletion event.
+ * @param {!Blockly.VariableModel=} opt_variable The deleted variable. Undefined
+ *     for a blank event.
+ * @extends {Blockly.Events.VarBase}
+ * @constructor
+ */
+Blockly.Events.VarDelete = function(opt_variable) {
+  Blockly.Events.VarDelete.superClass_.constructor.call(this, opt_variable);
+  if (!opt_variable) {
+    return;  // Blank event to be populated by fromJson.
+  }
+
+  this.varType = opt_variable.type;
+  this.varName = opt_variable.name;
+};
+Blockly.utils.object.inherits(Blockly.Events.VarDelete, Blockly.Events.VarBase);
+
+/**
+ * Type of this event.
+ * @type {string}
+ */
+Blockly.Events.VarDelete.prototype.type = Blockly.Events.VAR_DELETE;
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+Blockly.Events.VarDelete.prototype.toJson = function() {
+  var json = Blockly.Events.VarDelete.superClass_.toJson.call(this);
+  json['varType'] = this.varType;
+  json['varName'] = this.varName;
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+Blockly.Events.VarDelete.prototype.fromJson = function(json) {
+  Blockly.Events.VarDelete.superClass_.fromJson.call(this, json);
+  this.varType = json['varType'];
+  this.varName = json['varName'];
+};
+
+/**
+ * Run a variable deletion event.
+ * @param {boolean} forward True if run forward, false if run backward (undo).
+ */
+Blockly.Events.VarDelete.prototype.run = function(forward) {
+  var workspace = this.getEventWorkspace_();
+  if (forward) {
+    workspace.deleteVariableById(this.varId);
+  } else {
+    workspace.createVariable(this.varName, this.varType, this.varId);
+  }
+};
+
+Blockly.registry.register(Blockly.registry.Type.EVENT,
+    Blockly.Events.VAR_DELETE, Blockly.Events.VarDelete);
diff --git a/core/events/events_var_rename.js b/core/events/events_var_rename.js
new file mode 100644
index 000000000..60368e0af
--- /dev/null
+++ b/core/events/events_var_rename.js
@@ -0,0 +1,83 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class for a variable rename event.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.provide('Blockly.Events.VarRename');
+
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.VarBase');
+goog.require('Blockly.registry');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.VariableModel');
+
+
+/**
+ * Class for a variable rename event.
+ * @param {!Blockly.VariableModel=} opt_variable The renamed variable. Undefined
+ *     for a blank event.
+ * @param {string=} newName The new name the variable will be changed to.
+ * @extends {Blockly.Events.VarBase}
+ * @constructor
+ */
+Blockly.Events.VarRename = function(opt_variable, newName) {
+  Blockly.Events.VarRename.superClass_.constructor.call(this, opt_variable);
+  if (!opt_variable) {
+    return;  // Blank event to be populated by fromJson.
+  }
+
+  this.oldName = opt_variable.name;
+  this.newName = typeof newName == 'undefined' ? '' : newName;
+};
+Blockly.utils.object.inherits(Blockly.Events.VarRename, Blockly.Events.VarBase);
+
+/**
+ * Type of this event.
+ * @type {string}
+ */
+Blockly.Events.VarRename.prototype.type = Blockly.Events.VAR_RENAME;
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+Blockly.Events.VarRename.prototype.toJson = function() {
+  var json = Blockly.Events.VarRename.superClass_.toJson.call(this);
+  json['oldName'] = this.oldName;
+  json['newName'] = this.newName;
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+Blockly.Events.VarRename.prototype.fromJson = function(json) {
+  Blockly.Events.VarRename.superClass_.fromJson.call(this, json);
+  this.oldName = json['oldName'];
+  this.newName = json['newName'];
+};
+
+/**
+ * Run a variable rename event.
+ * @param {boolean} forward True if run forward, false if run backward (undo).
+ */
+Blockly.Events.VarRename.prototype.run = function(forward) {
+  var workspace = this.getEventWorkspace_();
+  if (forward) {
+    workspace.renameVariableById(this.varId, this.newName);
+  } else {
+    workspace.renameVariableById(this.varId, this.oldName);
+  }
+};
+
+Blockly.registry.register(Blockly.registry.Type.EVENT,
+    Blockly.Events.VAR_RENAME, Blockly.Events.VarRename);
diff --git a/core/events/variable_events.js b/core/events/variable_events.js
deleted file mode 100644
index 4f7af9258..000000000
--- a/core/events/variable_events.js
+++ /dev/null
@@ -1,250 +0,0 @@
-/**
- * @license
- * Copyright 2018 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Classes for all types of variable events.
- * @author fenichel@google.com (Rachel Fenichel)
- */
-'use strict';
-
-goog.provide('Blockly.Events.VarBase');
-goog.provide('Blockly.Events.VarCreate');
-goog.provide('Blockly.Events.VarDelete');
-goog.provide('Blockly.Events.VarRename');
-
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.Abstract');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.VariableModel');
-
-
-/**
- * Abstract class for a variable event.
- * @param {!Blockly.VariableModel=} opt_variable The variable this event
- *     corresponds to.  Undefined for a blank event.
- * @extends {Blockly.Events.Abstract}
- * @constructor
- */
-Blockly.Events.VarBase = function(opt_variable) {
-  Blockly.Events.VarBase.superClass_.constructor.call(this);
-  this.isBlank = typeof opt_variable == 'undefined';
-
-  /**
-   * The variable id for the variable this event pertains to.
-   * @type {string}
-   */
-  this.varId = this.isBlank ? '' : opt_variable.getId();
-
-  /**
-   * The workspace identifier for this event.
-   * @type {string}
-   */
-  this.workspaceId = this.isBlank ? '' : opt_variable.workspace.id;
-};
-Blockly.utils.object.inherits(Blockly.Events.VarBase, Blockly.Events.Abstract);
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Blockly.Events.VarBase.prototype.toJson = function() {
-  var json = Blockly.Events.VarBase.superClass_.toJson.call(this);
-  json['varId'] = this.varId;
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.VarBase.prototype.fromJson = function(json) {
-  Blockly.Events.VarBase.superClass_.toJson.call(this);
-  this.varId = json['varId'];
-};
-
-/**
- * Class for a variable creation event.
- * @param {!Blockly.VariableModel=} opt_variable The created variable. Undefined
- *     for a blank event.
- * @extends {Blockly.Events.VarBase}
- * @constructor
- */
-Blockly.Events.VarCreate = function(opt_variable) {
-  Blockly.Events.VarCreate.superClass_.constructor.call(this, opt_variable);
-  if (!opt_variable) {
-    return;  // Blank event to be populated by fromJson.
-  }
-
-  this.varType = opt_variable.type;
-  this.varName = opt_variable.name;
-};
-Blockly.utils.object.inherits(Blockly.Events.VarCreate, Blockly.Events.VarBase);
-
-/**
- * Type of this event.
- * @type {string}
- */
-Blockly.Events.VarCreate.prototype.type = Blockly.Events.VAR_CREATE;
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Blockly.Events.VarCreate.prototype.toJson = function() {
-  var json = Blockly.Events.VarCreate.superClass_.toJson.call(this);
-  json['varType'] = this.varType;
-  json['varName'] = this.varName;
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.VarCreate.prototype.fromJson = function(json) {
-  Blockly.Events.VarCreate.superClass_.fromJson.call(this, json);
-  this.varType = json['varType'];
-  this.varName = json['varName'];
-};
-
-/**
- * Run a variable creation event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-Blockly.Events.VarCreate.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
-  if (forward) {
-    workspace.createVariable(this.varName, this.varType, this.varId);
-  } else {
-    workspace.deleteVariableById(this.varId);
-  }
-};
-
-/**
- * Class for a variable deletion event.
- * @param {!Blockly.VariableModel=} opt_variable The deleted variable. Undefined
- *     for a blank event.
- * @extends {Blockly.Events.VarBase}
- * @constructor
- */
-Blockly.Events.VarDelete = function(opt_variable) {
-  Blockly.Events.VarDelete.superClass_.constructor.call(this, opt_variable);
-  if (!opt_variable) {
-    return;  // Blank event to be populated by fromJson.
-  }
-
-  this.varType = opt_variable.type;
-  this.varName = opt_variable.name;
-};
-Blockly.utils.object.inherits(Blockly.Events.VarDelete, Blockly.Events.VarBase);
-
-/**
- * Type of this event.
- * @type {string}
- */
-Blockly.Events.VarDelete.prototype.type = Blockly.Events.VAR_DELETE;
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Blockly.Events.VarDelete.prototype.toJson = function() {
-  var json = Blockly.Events.VarDelete.superClass_.toJson.call(this);
-  json['varType'] = this.varType;
-  json['varName'] = this.varName;
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.VarDelete.prototype.fromJson = function(json) {
-  Blockly.Events.VarDelete.superClass_.fromJson.call(this, json);
-  this.varType = json['varType'];
-  this.varName = json['varName'];
-};
-
-/**
- * Run a variable deletion event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-Blockly.Events.VarDelete.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
-  if (forward) {
-    workspace.deleteVariableById(this.varId);
-  } else {
-    workspace.createVariable(this.varName, this.varType, this.varId);
-  }
-};
-
-/**
- * Class for a variable rename event.
- * @param {!Blockly.VariableModel=} opt_variable The renamed variable. Undefined
- *     for a blank event.
- * @param {string=} newName The new name the variable will be changed to.
- * @extends {Blockly.Events.VarBase}
- * @constructor
- */
-Blockly.Events.VarRename = function(opt_variable, newName) {
-  Blockly.Events.VarRename.superClass_.constructor.call(this, opt_variable);
-  if (!opt_variable) {
-    return;  // Blank event to be populated by fromJson.
-  }
-
-  this.oldName = opt_variable.name;
-  this.newName = typeof newName == 'undefined' ? '' : newName;
-};
-Blockly.utils.object.inherits(Blockly.Events.VarRename, Blockly.Events.VarBase);
-
-/**
- * Type of this event.
- * @type {string}
- */
-Blockly.Events.VarRename.prototype.type = Blockly.Events.VAR_RENAME;
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Blockly.Events.VarRename.prototype.toJson = function() {
-  var json = Blockly.Events.VarRename.superClass_.toJson.call(this);
-  json['oldName'] = this.oldName;
-  json['newName'] = this.newName;
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.VarRename.prototype.fromJson = function(json) {
-  Blockly.Events.VarRename.superClass_.fromJson.call(this, json);
-  this.oldName = json['oldName'];
-  this.newName = json['newName'];
-};
-
-/**
- * Run a variable rename event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-Blockly.Events.VarRename.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
-  if (forward) {
-    workspace.renameVariableById(this.varId, this.newName);
-  } else {
-    workspace.renameVariableById(this.varId, this.oldName);
-  }
-};
-
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VAR_CREATE, Blockly.Events.VarCreate);
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VAR_DELETE, Blockly.Events.VarDelete);
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VAR_RENAME, Blockly.Events.VarRename);
diff --git a/tests/deps.js b/tests/deps.js
index d75d74f9e..6fe187c7d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -49,9 +49,12 @@ goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Sele
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_base.js', ['Blockly.Events.VarBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_var_create.js', ['Blockly.Events.VarCreate'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.VarDelete'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/variable_events.js', ['Blockly.Events.VarBase', 'Blockly.Events.VarCreate', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/ws_comment_events.js', ['Blockly.Events.CommentBase', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});

From 6e821fb9fce95d21f7f194d060f6dfe2890d31af Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 6 Aug 2021 16:33:44 -0700
Subject: [PATCH 581/833] Migrate core/events/block_events.js to ES6 const/let

---
 core/events/events_var_base.js   | 2 +-
 core/events/events_var_create.js | 4 ++--
 core/events/events_var_delete.js | 4 ++--
 core/events/events_var_rename.js | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/events/events_var_base.js b/core/events/events_var_base.js
index 202218269..3effcbce7 100644
--- a/core/events/events_var_base.js
+++ b/core/events/events_var_base.js
@@ -49,7 +49,7 @@ Blockly.utils.object.inherits(Blockly.Events.VarBase, Blockly.Events.Abstract);
  * @return {!Object} JSON representation.
  */
 Blockly.Events.VarBase.prototype.toJson = function() {
-  var json = Blockly.Events.VarBase.superClass_.toJson.call(this);
+  const json = Blockly.Events.VarBase.superClass_.toJson.call(this);
   json['varId'] = this.varId;
   return json;
 };
diff --git a/core/events/events_var_create.js b/core/events/events_var_create.js
index a228a1b92..69811feeb 100644
--- a/core/events/events_var_create.js
+++ b/core/events/events_var_create.js
@@ -49,7 +49,7 @@ Blockly.Events.VarCreate.prototype.type = Blockly.Events.VAR_CREATE;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.VarCreate.prototype.toJson = function() {
-  var json = Blockly.Events.VarCreate.superClass_.toJson.call(this);
+  const json = Blockly.Events.VarCreate.superClass_.toJson.call(this);
   json['varType'] = this.varType;
   json['varName'] = this.varName;
   return json;
@@ -70,7 +70,7 @@ Blockly.Events.VarCreate.prototype.fromJson = function(json) {
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
 Blockly.Events.VarCreate.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
+  const workspace = this.getEventWorkspace_();
   if (forward) {
     workspace.createVariable(this.varName, this.varType, this.varId);
   } else {
diff --git a/core/events/events_var_delete.js b/core/events/events_var_delete.js
index 87a57b1b9..284e499b3 100644
--- a/core/events/events_var_delete.js
+++ b/core/events/events_var_delete.js
@@ -49,7 +49,7 @@ Blockly.Events.VarDelete.prototype.type = Blockly.Events.VAR_DELETE;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.VarDelete.prototype.toJson = function() {
-  var json = Blockly.Events.VarDelete.superClass_.toJson.call(this);
+  const json = Blockly.Events.VarDelete.superClass_.toJson.call(this);
   json['varType'] = this.varType;
   json['varName'] = this.varName;
   return json;
@@ -70,7 +70,7 @@ Blockly.Events.VarDelete.prototype.fromJson = function(json) {
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
 Blockly.Events.VarDelete.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
+  const workspace = this.getEventWorkspace_();
   if (forward) {
     workspace.deleteVariableById(this.varId);
   } else {
diff --git a/core/events/events_var_rename.js b/core/events/events_var_rename.js
index 60368e0af..90329f0be 100644
--- a/core/events/events_var_rename.js
+++ b/core/events/events_var_rename.js
@@ -50,7 +50,7 @@ Blockly.Events.VarRename.prototype.type = Blockly.Events.VAR_RENAME;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.VarRename.prototype.toJson = function() {
-  var json = Blockly.Events.VarRename.superClass_.toJson.call(this);
+  const json = Blockly.Events.VarRename.superClass_.toJson.call(this);
   json['oldName'] = this.oldName;
   json['newName'] = this.newName;
   return json;
@@ -71,7 +71,7 @@ Blockly.Events.VarRename.prototype.fromJson = function(json) {
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
 Blockly.Events.VarRename.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
+  const workspace = this.getEventWorkspace_();
   if (forward) {
     workspace.renameVariableById(this.varId, this.newName);
   } else {

From 9ac531ba5859cbafeab901c7a83914493a665617 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 6 Aug 2021 16:36:01 -0700
Subject: [PATCH 582/833] Migrate core/events/block_events.js to goog.module

---
 core/events/events_var_base.js   | 20 +++++++++++---------
 core/events/events_var_create.js | 25 ++++++++++++++-----------
 core/events/events_var_delete.js | 25 ++++++++++++++-----------
 core/events/events_var_rename.js | 25 ++++++++++++++-----------
 tests/deps.js                    |  8 ++++----
 5 files changed, 57 insertions(+), 46 deletions(-)

diff --git a/core/events/events_var_base.js b/core/events/events_var_base.js
index 3effcbce7..f4de12429 100644
--- a/core/events/events_var_base.js
+++ b/core/events/events_var_base.js
@@ -10,9 +10,9 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.VarBase');
+goog.module('Blockly.Events.VarBase');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
 goog.require('Blockly.Events.Abstract');
 goog.require('Blockly.utils.object');
 
@@ -26,8 +26,8 @@ goog.requireType('Blockly.VariableModel');
  * @extends {Blockly.Events.Abstract}
  * @constructor
  */
-Blockly.Events.VarBase = function(opt_variable) {
-  Blockly.Events.VarBase.superClass_.constructor.call(this);
+const VarBase = function(opt_variable) {
+  VarBase.superClass_.constructor.call(this);
   this.isBlank = typeof opt_variable == 'undefined';
 
   /**
@@ -42,14 +42,14 @@ Blockly.Events.VarBase = function(opt_variable) {
    */
   this.workspaceId = this.isBlank ? '' : opt_variable.workspace.id;
 };
-Blockly.utils.object.inherits(Blockly.Events.VarBase, Blockly.Events.Abstract);
+Blockly.utils.object.inherits(VarBase, Blockly.Events.Abstract);
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.VarBase.prototype.toJson = function() {
-  const json = Blockly.Events.VarBase.superClass_.toJson.call(this);
+VarBase.prototype.toJson = function() {
+  const json = VarBase.superClass_.toJson.call(this);
   json['varId'] = this.varId;
   return json;
 };
@@ -58,7 +58,9 @@ Blockly.Events.VarBase.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.VarBase.prototype.fromJson = function(json) {
-  Blockly.Events.VarBase.superClass_.toJson.call(this);
+VarBase.prototype.fromJson = function(json) {
+  VarBase.superClass_.toJson.call(this);
   this.varId = json['varId'];
 };
+
+exports = VarBase;
diff --git a/core/events/events_var_create.js b/core/events/events_var_create.js
index 69811feeb..3fd79d64c 100644
--- a/core/events/events_var_create.js
+++ b/core/events/events_var_create.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.VarCreate');
+goog.module('Blockly.Events.VarCreate');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.VarBase');
@@ -27,8 +28,8 @@ goog.requireType('Blockly.VariableModel');
  * @extends {Blockly.Events.VarBase}
  * @constructor
  */
-Blockly.Events.VarCreate = function(opt_variable) {
-  Blockly.Events.VarCreate.superClass_.constructor.call(this, opt_variable);
+const VarCreate = function(opt_variable) {
+  VarCreate.superClass_.constructor.call(this, opt_variable);
   if (!opt_variable) {
     return;  // Blank event to be populated by fromJson.
   }
@@ -36,20 +37,20 @@ Blockly.Events.VarCreate = function(opt_variable) {
   this.varType = opt_variable.type;
   this.varName = opt_variable.name;
 };
-Blockly.utils.object.inherits(Blockly.Events.VarCreate, Blockly.Events.VarBase);
+Blockly.utils.object.inherits(VarCreate, Blockly.Events.VarBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.VarCreate.prototype.type = Blockly.Events.VAR_CREATE;
+VarCreate.prototype.type = Blockly.Events.VAR_CREATE;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.VarCreate.prototype.toJson = function() {
-  const json = Blockly.Events.VarCreate.superClass_.toJson.call(this);
+VarCreate.prototype.toJson = function() {
+  const json = VarCreate.superClass_.toJson.call(this);
   json['varType'] = this.varType;
   json['varName'] = this.varName;
   return json;
@@ -59,8 +60,8 @@ Blockly.Events.VarCreate.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.VarCreate.prototype.fromJson = function(json) {
-  Blockly.Events.VarCreate.superClass_.fromJson.call(this, json);
+VarCreate.prototype.fromJson = function(json) {
+  VarCreate.superClass_.fromJson.call(this, json);
   this.varType = json['varType'];
   this.varName = json['varName'];
 };
@@ -69,7 +70,7 @@ Blockly.Events.VarCreate.prototype.fromJson = function(json) {
  * Run a variable creation event.
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
-Blockly.Events.VarCreate.prototype.run = function(forward) {
+VarCreate.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   if (forward) {
     workspace.createVariable(this.varName, this.varType, this.varId);
@@ -79,4 +80,6 @@ Blockly.Events.VarCreate.prototype.run = function(forward) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VAR_CREATE, Blockly.Events.VarCreate);
+    Blockly.Events.VAR_CREATE, VarCreate);
+
+exports = VarCreate;
diff --git a/core/events/events_var_delete.js b/core/events/events_var_delete.js
index 284e499b3..fa2af41a6 100644
--- a/core/events/events_var_delete.js
+++ b/core/events/events_var_delete.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.VarDelete');
+goog.module('Blockly.Events.VarDelete');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.VarBase');
@@ -27,8 +28,8 @@ goog.requireType('Blockly.VariableModel');
  * @extends {Blockly.Events.VarBase}
  * @constructor
  */
-Blockly.Events.VarDelete = function(opt_variable) {
-  Blockly.Events.VarDelete.superClass_.constructor.call(this, opt_variable);
+const VarDelete = function(opt_variable) {
+  VarDelete.superClass_.constructor.call(this, opt_variable);
   if (!opt_variable) {
     return;  // Blank event to be populated by fromJson.
   }
@@ -36,20 +37,20 @@ Blockly.Events.VarDelete = function(opt_variable) {
   this.varType = opt_variable.type;
   this.varName = opt_variable.name;
 };
-Blockly.utils.object.inherits(Blockly.Events.VarDelete, Blockly.Events.VarBase);
+Blockly.utils.object.inherits(VarDelete, Blockly.Events.VarBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.VarDelete.prototype.type = Blockly.Events.VAR_DELETE;
+VarDelete.prototype.type = Blockly.Events.VAR_DELETE;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.VarDelete.prototype.toJson = function() {
-  const json = Blockly.Events.VarDelete.superClass_.toJson.call(this);
+VarDelete.prototype.toJson = function() {
+  const json = VarDelete.superClass_.toJson.call(this);
   json['varType'] = this.varType;
   json['varName'] = this.varName;
   return json;
@@ -59,8 +60,8 @@ Blockly.Events.VarDelete.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.VarDelete.prototype.fromJson = function(json) {
-  Blockly.Events.VarDelete.superClass_.fromJson.call(this, json);
+VarDelete.prototype.fromJson = function(json) {
+  VarDelete.superClass_.fromJson.call(this, json);
   this.varType = json['varType'];
   this.varName = json['varName'];
 };
@@ -69,7 +70,7 @@ Blockly.Events.VarDelete.prototype.fromJson = function(json) {
  * Run a variable deletion event.
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
-Blockly.Events.VarDelete.prototype.run = function(forward) {
+VarDelete.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   if (forward) {
     workspace.deleteVariableById(this.varId);
@@ -79,4 +80,6 @@ Blockly.Events.VarDelete.prototype.run = function(forward) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VAR_DELETE, Blockly.Events.VarDelete);
+    Blockly.Events.VAR_DELETE, VarDelete);
+
+exports = VarDelete;
diff --git a/core/events/events_var_rename.js b/core/events/events_var_rename.js
index 90329f0be..418164167 100644
--- a/core/events/events_var_rename.js
+++ b/core/events/events_var_rename.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.VarRename');
+goog.module('Blockly.Events.VarRename');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.VarBase');
@@ -28,8 +29,8 @@ goog.requireType('Blockly.VariableModel');
  * @extends {Blockly.Events.VarBase}
  * @constructor
  */
-Blockly.Events.VarRename = function(opt_variable, newName) {
-  Blockly.Events.VarRename.superClass_.constructor.call(this, opt_variable);
+const VarRename = function(opt_variable, newName) {
+  VarRename.superClass_.constructor.call(this, opt_variable);
   if (!opt_variable) {
     return;  // Blank event to be populated by fromJson.
   }
@@ -37,20 +38,20 @@ Blockly.Events.VarRename = function(opt_variable, newName) {
   this.oldName = opt_variable.name;
   this.newName = typeof newName == 'undefined' ? '' : newName;
 };
-Blockly.utils.object.inherits(Blockly.Events.VarRename, Blockly.Events.VarBase);
+Blockly.utils.object.inherits(VarRename, Blockly.Events.VarBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.VarRename.prototype.type = Blockly.Events.VAR_RENAME;
+VarRename.prototype.type = Blockly.Events.VAR_RENAME;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.VarRename.prototype.toJson = function() {
-  const json = Blockly.Events.VarRename.superClass_.toJson.call(this);
+VarRename.prototype.toJson = function() {
+  const json = VarRename.superClass_.toJson.call(this);
   json['oldName'] = this.oldName;
   json['newName'] = this.newName;
   return json;
@@ -60,8 +61,8 @@ Blockly.Events.VarRename.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.VarRename.prototype.fromJson = function(json) {
-  Blockly.Events.VarRename.superClass_.fromJson.call(this, json);
+VarRename.prototype.fromJson = function(json) {
+  VarRename.superClass_.fromJson.call(this, json);
   this.oldName = json['oldName'];
   this.newName = json['newName'];
 };
@@ -70,7 +71,7 @@ Blockly.Events.VarRename.prototype.fromJson = function(json) {
  * Run a variable rename event.
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
-Blockly.Events.VarRename.prototype.run = function(forward) {
+VarRename.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   if (forward) {
     workspace.renameVariableById(this.varId, this.newName);
@@ -80,4 +81,6 @@ Blockly.Events.VarRename.prototype.run = function(forward) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VAR_RENAME, Blockly.Events.VarRename);
+    Blockly.Events.VAR_RENAME, VarRename);
+
+exports = VarRename;
diff --git a/tests/deps.js b/tests/deps.js
index 6fe187c7d..7b93512dd 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -49,10 +49,10 @@ goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Sele
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_var_base.js', ['Blockly.Events.VarBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_var_create.js', ['Blockly.Events.VarCreate'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.VarDelete'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_var_base.js', ['Blockly.Events.VarBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_create.js', ['Blockly.Events.VarCreate'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.VarDelete'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From dc2438eb28bdfc4fa1c4d454842bcfcdfa7d50ac Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 6 Aug 2021 17:02:18 -0700
Subject: [PATCH 583/833] Migrate core/events/block_events.js named requires

---
 core/events/events_var_base.js   | 14 +++++++-------
 core/events/events_var_create.js | 24 ++++++++++++------------
 core/events/events_var_delete.js | 24 ++++++++++++------------
 core/events/events_var_rename.js | 24 ++++++++++++------------
 4 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/core/events/events_var_base.js b/core/events/events_var_base.js
index f4de12429..cedf349b7 100644
--- a/core/events/events_var_base.js
+++ b/core/events/events_var_base.js
@@ -13,17 +13,17 @@
 goog.module('Blockly.Events.VarBase');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events.Abstract');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.VariableModel');
+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');
 
 
 /**
  * Abstract class for a variable event.
- * @param {!Blockly.VariableModel=} opt_variable The variable this event
+ * @param {!VariableModel=} opt_variable The variable this event
  *     corresponds to.  Undefined for a blank event.
- * @extends {Blockly.Events.Abstract}
+ * @extends {Abstract}
  * @constructor
  */
 const VarBase = function(opt_variable) {
@@ -42,7 +42,7 @@ const VarBase = function(opt_variable) {
    */
   this.workspaceId = this.isBlank ? '' : opt_variable.workspace.id;
 };
-Blockly.utils.object.inherits(VarBase, Blockly.Events.Abstract);
+object.inherits(VarBase, Abstract);
 
 /**
  * Encode the event as JSON.
diff --git a/core/events/events_var_create.js b/core/events/events_var_create.js
index 3fd79d64c..1d5c3ca75 100644
--- a/core/events/events_var_create.js
+++ b/core/events/events_var_create.js
@@ -13,19 +13,19 @@
 goog.module('Blockly.Events.VarCreate');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.VarBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.VariableModel');
+const Events = goog.require('Blockly.Events');
+const VarBase = goog.require('Blockly.Events.VarBase');
+/* eslint-disable-next-line no-unused-vars */
+const VariableModel = goog.requireType('Blockly.VariableModel');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
  * Class for a variable creation event.
- * @param {!Blockly.VariableModel=} opt_variable The created variable. Undefined
+ * @param {!VariableModel=} opt_variable The created variable. Undefined
  *     for a blank event.
- * @extends {Blockly.Events.VarBase}
+ * @extends {VarBase}
  * @constructor
  */
 const VarCreate = function(opt_variable) {
@@ -37,13 +37,13 @@ const VarCreate = function(opt_variable) {
   this.varType = opt_variable.type;
   this.varName = opt_variable.name;
 };
-Blockly.utils.object.inherits(VarCreate, Blockly.Events.VarBase);
+object.inherits(VarCreate, VarBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-VarCreate.prototype.type = Blockly.Events.VAR_CREATE;
+VarCreate.prototype.type = Events.VAR_CREATE;
 
 /**
  * Encode the event as JSON.
@@ -79,7 +79,7 @@ VarCreate.prototype.run = function(forward) {
   }
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VAR_CREATE, VarCreate);
+registry.register(registry.Type.EVENT,
+    Events.VAR_CREATE, VarCreate);
 
 exports = VarCreate;
diff --git a/core/events/events_var_delete.js b/core/events/events_var_delete.js
index fa2af41a6..cd93ccf39 100644
--- a/core/events/events_var_delete.js
+++ b/core/events/events_var_delete.js
@@ -13,19 +13,19 @@
 goog.module('Blockly.Events.VarDelete');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.VarBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.VariableModel');
+const Events = goog.require('Blockly.Events');
+const VarBase = goog.require('Blockly.Events.VarBase');
+/* eslint-disable-next-line no-unused-vars */
+const VariableModel = goog.requireType('Blockly.VariableModel');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
  * Class for a variable deletion event.
- * @param {!Blockly.VariableModel=} opt_variable The deleted variable. Undefined
+ * @param {!VariableModel=} opt_variable The deleted variable. Undefined
  *     for a blank event.
- * @extends {Blockly.Events.VarBase}
+ * @extends {VarBase}
  * @constructor
  */
 const VarDelete = function(opt_variable) {
@@ -37,13 +37,13 @@ const VarDelete = function(opt_variable) {
   this.varType = opt_variable.type;
   this.varName = opt_variable.name;
 };
-Blockly.utils.object.inherits(VarDelete, Blockly.Events.VarBase);
+object.inherits(VarDelete, VarBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-VarDelete.prototype.type = Blockly.Events.VAR_DELETE;
+VarDelete.prototype.type = Events.VAR_DELETE;
 
 /**
  * Encode the event as JSON.
@@ -79,7 +79,7 @@ VarDelete.prototype.run = function(forward) {
   }
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VAR_DELETE, VarDelete);
+registry.register(registry.Type.EVENT,
+    Events.VAR_DELETE, VarDelete);
 
 exports = VarDelete;
diff --git a/core/events/events_var_rename.js b/core/events/events_var_rename.js
index 418164167..1f7d0b982 100644
--- a/core/events/events_var_rename.js
+++ b/core/events/events_var_rename.js
@@ -13,20 +13,20 @@
 goog.module('Blockly.Events.VarRename');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.VarBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.VariableModel');
+const Events = goog.require('Blockly.Events');
+const VarBase = goog.require('Blockly.Events.VarBase');
+/* eslint-disable-next-line no-unused-vars */
+const VariableModel = goog.requireType('Blockly.VariableModel');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
  * Class for a variable rename event.
- * @param {!Blockly.VariableModel=} opt_variable The renamed variable. Undefined
+ * @param {!VariableModel=} opt_variable The renamed variable. Undefined
  *     for a blank event.
  * @param {string=} newName The new name the variable will be changed to.
- * @extends {Blockly.Events.VarBase}
+ * @extends {VarBase}
  * @constructor
  */
 const VarRename = function(opt_variable, newName) {
@@ -38,13 +38,13 @@ const VarRename = function(opt_variable, newName) {
   this.oldName = opt_variable.name;
   this.newName = typeof newName == 'undefined' ? '' : newName;
 };
-Blockly.utils.object.inherits(VarRename, Blockly.Events.VarBase);
+object.inherits(VarRename, VarBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-VarRename.prototype.type = Blockly.Events.VAR_RENAME;
+VarRename.prototype.type = Events.VAR_RENAME;
 
 /**
  * Encode the event as JSON.
@@ -80,7 +80,7 @@ VarRename.prototype.run = function(forward) {
   }
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VAR_RENAME, VarRename);
+registry.register(registry.Type.EVENT,
+    Events.VAR_RENAME, VarRename);
 
 exports = VarRename;

From d7840db7361c63cb1db1b7a4dbec19cacbe01857 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 6 Aug 2021 17:03:01 -0700
Subject: [PATCH 584/833] clang-formant core/events/variable_events.js

---
 core/events/events_var_create.js | 3 +--
 core/events/events_var_delete.js | 3 +--
 core/events/events_var_rename.js | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/core/events/events_var_create.js b/core/events/events_var_create.js
index 1d5c3ca75..8db58be74 100644
--- a/core/events/events_var_create.js
+++ b/core/events/events_var_create.js
@@ -79,7 +79,6 @@ VarCreate.prototype.run = function(forward) {
   }
 };
 
-registry.register(registry.Type.EVENT,
-    Events.VAR_CREATE, VarCreate);
+registry.register(registry.Type.EVENT, Events.VAR_CREATE, VarCreate);
 
 exports = VarCreate;
diff --git a/core/events/events_var_delete.js b/core/events/events_var_delete.js
index cd93ccf39..48497bdd7 100644
--- a/core/events/events_var_delete.js
+++ b/core/events/events_var_delete.js
@@ -79,7 +79,6 @@ VarDelete.prototype.run = function(forward) {
   }
 };
 
-registry.register(registry.Type.EVENT,
-    Events.VAR_DELETE, VarDelete);
+registry.register(registry.Type.EVENT, Events.VAR_DELETE, VarDelete);
 
 exports = VarDelete;
diff --git a/core/events/events_var_rename.js b/core/events/events_var_rename.js
index 1f7d0b982..9fa5f7058 100644
--- a/core/events/events_var_rename.js
+++ b/core/events/events_var_rename.js
@@ -80,7 +80,6 @@ VarRename.prototype.run = function(forward) {
   }
 };
 
-registry.register(registry.Type.EVENT,
-    Events.VAR_RENAME, VarRename);
+registry.register(registry.Type.EVENT, Events.VAR_RENAME, VarRename);
 
 exports = VarRename;

From 8875dbd50c35fb8d7263076a35512844a624873a Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 28 Jul 2021 16:21:59 -0700
Subject: [PATCH 585/833] Migrate core/toolbox/toolbox.js to ES6 const/let

---
 core/toolbox/toolbox.js | 117 ++++++++++++++++++++--------------------
 1 file changed, 60 insertions(+), 57 deletions(-)

diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index 826482eaf..535e0065b 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -195,8 +195,8 @@ Blockly.Toolbox.prototype.onShortcut = function(_shortcut) {
  * @public
  */
 Blockly.Toolbox.prototype.init = function() {
-  var workspace = this.workspace_;
-  var svg = workspace.getParentSvg();
+  const workspace = this.workspace_;
+  const svg = workspace.getParentSvg();
 
   this.flyout_ = this.createFlyout_();
 
@@ -206,7 +206,7 @@ Blockly.Toolbox.prototype.init = function() {
   this.flyout_.init(workspace);
 
   this.render(this.toolboxDef_);
-  var themeManager = workspace.getThemeManager();
+  const themeManager = workspace.getThemeManager();
   themeManager.subscribe(this.HtmlDiv, 'toolboxBackgroundColour',
       'background-color');
   themeManager.subscribe(this.HtmlDiv, 'toolboxForegroundColour', 'color');
@@ -228,9 +228,9 @@ Blockly.Toolbox.prototype.init = function() {
  * @protected
  */
 Blockly.Toolbox.prototype.createDom_ = function(workspace) {
-  var svg = workspace.getParentSvg();
+  const svg = workspace.getParentSvg();
 
-  var container = this.createContainer_();
+  const container = this.createContainer_();
 
   this.contentsDiv_ = this.createContentsContainer_();
   this.contentsDiv_.tabIndex = 0;
@@ -249,7 +249,7 @@ Blockly.Toolbox.prototype.createDom_ = function(workspace) {
  * @protected
  */
 Blockly.Toolbox.prototype.createContainer_ = function() {
-  var toolboxContainer = document.createElement('div');
+  const toolboxContainer = document.createElement('div');
   toolboxContainer.setAttribute('layout', this.isHorizontal() ? 'h' : 'v');
   Blockly.utils.dom.addClass(toolboxContainer, 'blocklyToolboxDiv');
   Blockly.utils.dom.addClass(toolboxContainer, 'blocklyNonSelectable');
@@ -263,7 +263,7 @@ Blockly.Toolbox.prototype.createContainer_ = function() {
  * @protected
  */
 Blockly.Toolbox.prototype.createContentsContainer_ = function() {
-  var contentsContainer = document.createElement('div');
+  const contentsContainer = document.createElement('div');
   Blockly.utils.dom.addClass(contentsContainer, 'blocklyToolboxContents');
   if (this.isHorizontal()) {
     contentsContainer.style.flexDirection = 'row';
@@ -281,13 +281,13 @@ Blockly.Toolbox.prototype.createContentsContainer_ = function() {
 Blockly.Toolbox.prototype.attachEvents_ = function(container,
     contentsContainer) {
   // Clicking on toolbox closes popups.
-  var clickEvent = Blockly.browserEvents.conditionalBind(
+  const clickEvent = Blockly.browserEvents.conditionalBind(
       container, 'click', this, this.onClick_,
       /* opt_noCaptureIdentifier */ false,
       /* opt_noPreventDefault */ true);
   this.boundEvents_.push(clickEvent);
 
-  var keyDownEvent = Blockly.browserEvents.conditionalBind(
+  const keyDownEvent = Blockly.browserEvents.conditionalBind(
       contentsContainer, 'keydown', this, this.onKeyDown_,
       /* opt_noCaptureIdentifier */ false,
       /* opt_noPreventDefault */ true);
@@ -304,10 +304,10 @@ Blockly.Toolbox.prototype.onClick_ = function(e) {
     // Close flyout.
     Blockly.hideChaff(false);
   } else {
-    var targetElement = e.target;
-    var itemId = targetElement.getAttribute('id');
+    const targetElement = e.target;
+    const itemId = targetElement.getAttribute('id');
     if (itemId) {
-      var item = this.getToolboxItemById(itemId);
+      const item = this.getToolboxItemById(itemId);
       if (item.isSelectable()) {
         this.setSelectedItem(item);
         item.onClick(e);
@@ -325,7 +325,7 @@ Blockly.Toolbox.prototype.onClick_ = function(e) {
  * @protected
  */
 Blockly.Toolbox.prototype.onKeyDown_ = function(e) {
-  var handled = false;
+  let handled = false;
   switch (e.keyCode) {
     case Blockly.utils.KeyCodes.DOWN:
       handled = this.selectNext_();
@@ -342,7 +342,7 @@ Blockly.Toolbox.prototype.onKeyDown_ = function(e) {
     case Blockly.utils.KeyCodes.ENTER:
     case Blockly.utils.KeyCodes.SPACE:
       if (this.selectedItem_ && this.selectedItem_.isCollapsible()) {
-        var collapsibleItem = /** @type {!Blockly.ICollapsibleToolboxItem} */ (this.selectedItem_);
+        const collapsibleItem = /** @type {!Blockly.ICollapsibleToolboxItem} */ (this.selectedItem_);
         collapsibleItem.toggleExpanded();
         handled = true;
       }
@@ -368,9 +368,9 @@ Blockly.Toolbox.prototype.onKeyDown_ = function(e) {
  * @protected
  */
 Blockly.Toolbox.prototype.createFlyout_ = function() {
-  var workspace = this.workspace_;
+  const workspace = this.workspace_;
   // TODO (#4247): Look into adding a makeFlyout method to Blockly Options.
-  var workspaceOptions = new Blockly.Options(
+  const workspaceOptions = new Blockly.Options(
       /** @type {!Blockly.BlocklyOptions} */
       ({
         'parentWorkspace': workspace,
@@ -386,7 +386,7 @@ Blockly.Toolbox.prototype.createFlyout_ = function() {
   // Options takes in either 'end' or 'start'. This has already been parsed to
   // be either 0 or 1, so set it after.
   workspaceOptions.toolboxPosition = workspace.options.toolboxPosition;
-  var FlyoutClass = null;
+  let FlyoutClass = null;
   if (workspace.horizontalLayout) {
     FlyoutClass = Blockly.registry.getClassFromOptions(
         Blockly.registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX, workspace.options,
@@ -407,8 +407,8 @@ Blockly.Toolbox.prototype.createFlyout_ = function() {
  */
 Blockly.Toolbox.prototype.render = function(toolboxDef) {
   this.toolboxDef_ = toolboxDef;
-  for (var i = 0; i < this.contents_.length; i++) {
-    var toolboxItem = this.contents_[i];
+  for (let i = 0; i < this.contents_.length; i++) {
+    const toolboxItem = this.contents_[i];
     if (toolboxItem) {
       toolboxItem.dispose();
     }
@@ -429,8 +429,9 @@ Blockly.Toolbox.prototype.render = function(toolboxDef) {
 Blockly.Toolbox.prototype.renderContents_ = function(toolboxDef) {
   // This is for performance reasons. By using document fragment we only have to
   // add to the DOM once.
-  var fragment = document.createDocumentFragment();
-  for (var i = 0, toolboxItemDef; (toolboxItemDef = toolboxDef[i]); i++) {
+  const fragment = document.createDocumentFragment();
+  for (let i = 0; i < toolboxDef.length; i++) {
+    const toolboxItemDef = toolboxDef[i];
     this.createToolboxItem_(toolboxItemDef, fragment);
   }
   this.contentsDiv_.appendChild(fragment);
@@ -445,7 +446,7 @@ Blockly.Toolbox.prototype.renderContents_ = function(toolboxDef) {
  * @private
  */
 Blockly.Toolbox.prototype.createToolboxItem_ = function(toolboxItemDef, fragment) {
-  var registryName = toolboxItemDef['kind'];
+  let registryName = toolboxItemDef['kind'];
 
   // Categories that are collapsible are created using a class registered under
   // a different name.
@@ -455,13 +456,13 @@ Blockly.Toolbox.prototype.createToolboxItem_ = function(toolboxItemDef, fragment
     registryName = Blockly.CollapsibleToolboxCategory.registrationName;
   }
 
-  var ToolboxItemClass = Blockly.registry.getClass(
+  const ToolboxItemClass = Blockly.registry.getClass(
       Blockly.registry.Type.TOOLBOX_ITEM, registryName.toLowerCase());
   if (ToolboxItemClass) {
-    var toolboxItem = new ToolboxItemClass(toolboxItemDef, this);
+    const toolboxItem = new ToolboxItemClass(toolboxItemDef, this);
     this.addToolboxItem_(toolboxItem);
     toolboxItem.init();
-    var toolboxItemDom = toolboxItem.getDiv();
+    const toolboxItemDom = toolboxItem.getDiv();
     if (toolboxItemDom) {
       fragment.appendChild(toolboxItemDom);
     }
@@ -482,9 +483,11 @@ Blockly.Toolbox.prototype.addToolboxItem_ = function(toolboxItem) {
   this.contents_.push(toolboxItem);
   this.contentMap_[toolboxItem.getId()] = toolboxItem;
   if (toolboxItem.isCollapsible()) {
-    var collapsibleItem = /** @type {Blockly.ICollapsibleToolboxItem} */
+    const collapsibleItem = /** @type {Blockly.ICollapsibleToolboxItem} */
         (toolboxItem);
-    for (var i = 0, child; (child = collapsibleItem.getChildToolboxItems()[i]); i++) {
+    const childToolboxItems = collapsibleItem.getChildToolboxItems();
+    for (let i = 0; i < childToolboxItems.length; i++) {
+      const child = childToolboxItems[i];
       this.addToolboxItem_(child);
     }
   }
@@ -531,13 +534,13 @@ Blockly.Toolbox.prototype.getClientRect = function() {
   // BIG_NUM is offscreen padding so that blocks dragged beyond the toolbox
   // area are still deleted.  Must be smaller than Infinity, but larger than
   // the largest screen size.
-  var BIG_NUM = 10000000;
-  var toolboxRect = this.HtmlDiv.getBoundingClientRect();
+  const BIG_NUM = 10000000;
+  const toolboxRect = this.HtmlDiv.getBoundingClientRect();
 
-  var top = toolboxRect.top;
-  var bottom = top + toolboxRect.height;
-  var left = toolboxRect.left;
-  var right = left + toolboxRect.width;
+  const top = toolboxRect.top;
+  const bottom = top + toolboxRect.height;
+  const left = toolboxRect.left;
+  const right = left + toolboxRect.width;
 
   // Assumes that the toolbox is on the SVG edge.  If this changes
   // (e.g. toolboxes in mutators) then this code will need to be more complex.
@@ -567,7 +570,7 @@ Blockly.Toolbox.prototype.getClientRect = function() {
  */
 Blockly.Toolbox.prototype.wouldDelete = function(element, _couldConnect) {
   if (element instanceof Blockly.BlockSvg) {
-    var block = /** @type {Blockly.BlockSvg} */ (element);
+    const block = /** @type {Blockly.BlockSvg} */ (element);
     // Prefer dragging to the toolbox over connecting to other blocks.
     this.updateWouldDelete_(!block.getParent() && block.isDeletable());
   } else {
@@ -636,7 +639,7 @@ Blockly.Toolbox.prototype.updateWouldDelete_ = function(wouldDelete) {
  * @protected
  */
 Blockly.Toolbox.prototype.updateCursorDeleteStyle_ = function(addStyle) {
-  var style = this.wouldDelete_ ? 'blocklyToolboxDelete' :
+  const style = this.wouldDelete_ ? 'blocklyToolboxDelete' :
       'blocklyToolboxGrab';
   if (addStyle) {
     this.addStyle(style);
@@ -728,8 +731,8 @@ Blockly.Toolbox.prototype.isHorizontal = function() {
  * @public
  */
 Blockly.Toolbox.prototype.position = function() {
-  var workspaceMetrics = this.workspace_.getMetrics();
-  var toolboxDiv = this.HtmlDiv;
+  const workspaceMetrics = this.workspace_.getMetrics();
+  const toolboxDiv = this.HtmlDiv;
   if (!toolboxDiv) {
     // Not initialized yet.
     return;
@@ -765,12 +768,12 @@ Blockly.Toolbox.prototype.position = function() {
 Blockly.Toolbox.prototype.handleToolboxItemResize = function() {
   // Reposition the workspace so that (0,0) is in the correct position relative
   // to the new absolute edge (ie toolbox edge).
-  var workspace = this.workspace_;
-  var rect = this.HtmlDiv.getBoundingClientRect();
-  var newX = this.toolboxPosition == Blockly.utils.toolbox.Position.LEFT ?
+  const workspace = this.workspace_;
+  const rect = this.HtmlDiv.getBoundingClientRect();
+  const newX = this.toolboxPosition == Blockly.utils.toolbox.Position.LEFT ?
       workspace.scrollX + rect.width :
       workspace.scrollX;
-  var newY = this.toolboxPosition == Blockly.utils.toolbox.Position.TOP ?
+  const newY = this.toolboxPosition == Blockly.utils.toolbox.Position.TOP ?
       workspace.scrollY + rect.height :
       workspace.scrollY;
   workspace.translate(newX, newY);
@@ -793,8 +796,8 @@ Blockly.Toolbox.prototype.clearSelection = function() {
  * @package
  */
 Blockly.Toolbox.prototype.refreshTheme = function() {
-  for (var i = 0; i < this.contents_.length; i++) {
-    var child = this.contents_[i];
+  for (let i = 0; i < this.contents_.length; i++) {
+    const child = this.contents_[i];
     if (child.refreshTheme) {
       child.refreshTheme();
     }
@@ -849,7 +852,7 @@ Blockly.Toolbox.prototype.autoHide = function(onlyClosePopups) {
  * @public
  */
 Blockly.Toolbox.prototype.setSelectedItem = function(newItem) {
-  var oldItem = this.selectedItem_;
+  const oldItem = this.selectedItem_;
 
   if ((!newItem && !oldItem) || (newItem && !newItem.isSelectable())) {
     return;
@@ -934,7 +937,7 @@ Blockly.Toolbox.prototype.selectItem_ = function(oldItem, newItem) {
  */
 Blockly.Toolbox.prototype.selectItemByPosition = function(position) {
   if (position > -1 && position < this.contents_.length) {
-    var item = this.contents_[position];
+    const item = this.contents_[position];
     if (item.isSelectable()) {
       this.setSelectedItem(item);
     }
@@ -966,13 +969,13 @@ Blockly.Toolbox.prototype.updateFlyout_ = function(oldItem, newItem) {
  * @private
  */
 Blockly.Toolbox.prototype.fireSelectEvent_ = function(oldItem, newItem) {
-  var oldElement = oldItem && oldItem.getName();
-  var newElement = newItem && newItem.getName();
+  const oldElement = oldItem && oldItem.getName();
+  let newElement = newItem && newItem.getName();
   // In this case the toolbox closes, so the newElement should be null.
   if (oldItem == newItem) {
     newElement = null;
   }
-  var event = new (Blockly.Events.get(Blockly.Events.TOOLBOX_ITEM_SELECT))(
+  const event = new (Blockly.Events.get(Blockly.Events.TOOLBOX_ITEM_SELECT))(
       oldElement, newElement, this.workspace_.id);
   Blockly.Events.fire(event);
 };
@@ -988,7 +991,7 @@ Blockly.Toolbox.prototype.selectParent_ = function() {
   }
 
   if (this.selectedItem_.isCollapsible() && this.selectedItem_.isExpanded()) {
-    var collapsibleItem = /** @type {!Blockly.ICollapsibleToolboxItem} */ (this.selectedItem_);
+    const collapsibleItem = /** @type {!Blockly.ICollapsibleToolboxItem} */ (this.selectedItem_);
     collapsibleItem.setExpanded(false);
     return true;
   } else if (this.selectedItem_.getParent() &&
@@ -1009,7 +1012,7 @@ Blockly.Toolbox.prototype.selectChild_ = function() {
   if (!this.selectedItem_ || !this.selectedItem_.isCollapsible()) {
     return false;
   }
-  var collapsibleItem = /** @type {Blockly.ICollapsibleToolboxItem} */
+  const collapsibleItem = /** @type {Blockly.ICollapsibleToolboxItem} */
       (this.selectedItem_);
   if (!collapsibleItem.isExpanded()) {
     collapsibleItem.setExpanded(true);
@@ -1030,9 +1033,9 @@ Blockly.Toolbox.prototype.selectNext_ = function() {
     return false;
   }
 
-  var nextItemIdx = this.contents_.indexOf(this.selectedItem_) + 1;
+  let nextItemIdx = this.contents_.indexOf(this.selectedItem_) + 1;
   if (nextItemIdx > -1 && nextItemIdx < this.contents_.length) {
-    var nextItem = this.contents_[nextItemIdx];
+    let nextItem = this.contents_[nextItemIdx];
     while (nextItem && !nextItem.isSelectable()) {
       nextItem = this.contents_[++nextItemIdx];
     }
@@ -1054,9 +1057,9 @@ Blockly.Toolbox.prototype.selectPrevious_ = function() {
     return false;
   }
 
-  var prevItemIdx = this.contents_.indexOf(this.selectedItem_) - 1;
+  let prevItemIdx = this.contents_.indexOf(this.selectedItem_) - 1;
   if (prevItemIdx > -1 && prevItemIdx < this.contents_.length) {
-    var prevItem = this.contents_[prevItemIdx];
+    let prevItem = this.contents_[prevItemIdx];
     while (prevItem && !prevItem.isSelectable()) {
       prevItem = this.contents_[--prevItemIdx];
     }
@@ -1075,12 +1078,12 @@ Blockly.Toolbox.prototype.selectPrevious_ = function() {
 Blockly.Toolbox.prototype.dispose = function() {
   this.workspace_.getComponentManager().removeComponent('toolbox');
   this.flyout_.dispose();
-  for (var i = 0; i < this.contents_.length; i++) {
-    var toolboxItem = this.contents_[i];
+  for (let i = 0; i < this.contents_.length; i++) {
+    const toolboxItem = this.contents_[i];
     toolboxItem.dispose();
   }
 
-  for (var j = 0; j < this.boundEvents_.length; j++) {
+  for (let j = 0; j < this.boundEvents_.length; j++) {
     Blockly.browserEvents.unbind(this.boundEvents_[j]);
   }
   this.boundEvents_ = [];

From ec1567020b21d943cd62fa831aee0e6d18d18363 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 28 Jul 2021 16:22:10 -0700
Subject: [PATCH 586/833] Migrate core/toolbox/toolbox.js to goog.module

---
 core/toolbox/toolbox.js | 118 ++++++++++++++++++++--------------------
 tests/deps.js           |   2 +-
 2 files changed, 61 insertions(+), 59 deletions(-)

diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index 535e0065b..c57588eec 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -10,14 +10,14 @@
  */
 'use strict';
 
-goog.provide('Blockly.Toolbox');
+goog.module('Blockly.Toolbox');
+goog.module.declareLegacyNamespace();
 
+goog.require('Blockly');
 goog.require('Blockly.BlockSvg');
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.CollapsibleToolboxCategory');
 goog.require('Blockly.ComponentManager');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.Css');
 goog.require('Blockly.DeleteArea');
 goog.require('Blockly.Events');
@@ -58,8 +58,8 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @implements {Blockly.IToolbox}
  * @extends {Blockly.DeleteArea}
  */
-Blockly.Toolbox = function(workspace) {
-  Blockly.Toolbox.superClass_.constructor.call(this);
+const Toolbox = function(workspace) {
+  Toolbox.superClass_.constructor.call(this);
   /**
    * The workspace this toolbox is on.
    * @type {!Blockly.WorkspaceSvg}
@@ -178,7 +178,7 @@ Blockly.Toolbox = function(workspace) {
    */
   this.boundEvents_ = [];
 };
-Blockly.utils.object.inherits(Blockly.Toolbox, Blockly.DeleteArea);
+Blockly.utils.object.inherits(Toolbox, Blockly.DeleteArea);
 
 /**
  * Handles the given keyboard shortcut.
@@ -186,7 +186,7 @@ Blockly.utils.object.inherits(Blockly.Toolbox, Blockly.DeleteArea);
  * @return {boolean} True if the shortcut has been handled, false otherwise.
  * @public
  */
-Blockly.Toolbox.prototype.onShortcut = function(_shortcut) {
+Toolbox.prototype.onShortcut = function(_shortcut) {
   return false;
 };
 
@@ -194,7 +194,7 @@ Blockly.Toolbox.prototype.onShortcut = function(_shortcut) {
  * Initializes the toolbox
  * @public
  */
-Blockly.Toolbox.prototype.init = function() {
+Toolbox.prototype.init = function() {
   const workspace = this.workspace_;
   const svg = workspace.getParentSvg();
 
@@ -227,7 +227,7 @@ Blockly.Toolbox.prototype.init = function() {
  * @return {!Element} The HTML container for the toolbox.
  * @protected
  */
-Blockly.Toolbox.prototype.createDom_ = function(workspace) {
+Toolbox.prototype.createDom_ = function(workspace) {
   const svg = workspace.getParentSvg();
 
   const container = this.createContainer_();
@@ -248,7 +248,7 @@ Blockly.Toolbox.prototype.createDom_ = function(workspace) {
  * @return {!Element} The HTML container for the toolbox.
  * @protected
  */
-Blockly.Toolbox.prototype.createContainer_ = function() {
+Toolbox.prototype.createContainer_ = function() {
   const toolboxContainer = document.createElement('div');
   toolboxContainer.setAttribute('layout', this.isHorizontal() ? 'h' : 'v');
   Blockly.utils.dom.addClass(toolboxContainer, 'blocklyToolboxDiv');
@@ -262,7 +262,7 @@ Blockly.Toolbox.prototype.createContainer_ = function() {
  * @return {!Element} The HTML container for the toolbox contents.
  * @protected
  */
-Blockly.Toolbox.prototype.createContentsContainer_ = function() {
+Toolbox.prototype.createContentsContainer_ = function() {
   const contentsContainer = document.createElement('div');
   Blockly.utils.dom.addClass(contentsContainer, 'blocklyToolboxContents');
   if (this.isHorizontal()) {
@@ -278,7 +278,7 @@ Blockly.Toolbox.prototype.createContentsContainer_ = function() {
  *     of the toolbox.
  * @protected
  */
-Blockly.Toolbox.prototype.attachEvents_ = function(container,
+Toolbox.prototype.attachEvents_ = function(container,
     contentsContainer) {
   // Clicking on toolbox closes popups.
   const clickEvent = Blockly.browserEvents.conditionalBind(
@@ -299,7 +299,7 @@ Blockly.Toolbox.prototype.attachEvents_ = function(container,
  * @param {!Event} e Click event to handle.
  * @protected
  */
-Blockly.Toolbox.prototype.onClick_ = function(e) {
+Toolbox.prototype.onClick_ = function(e) {
   if (Blockly.utils.isRightButton(e) || e.target == this.HtmlDiv) {
     // Close flyout.
     Blockly.hideChaff(false);
@@ -324,7 +324,7 @@ Blockly.Toolbox.prototype.onClick_ = function(e) {
  * @param {!KeyboardEvent} e The key down event.
  * @protected
  */
-Blockly.Toolbox.prototype.onKeyDown_ = function(e) {
+Toolbox.prototype.onKeyDown_ = function(e) {
   let handled = false;
   switch (e.keyCode) {
     case Blockly.utils.KeyCodes.DOWN:
@@ -367,7 +367,7 @@ Blockly.Toolbox.prototype.onKeyDown_ = function(e) {
  *     `Blockly.VerticalFlyout`, and no flyout plugin is specified.
  * @protected
  */
-Blockly.Toolbox.prototype.createFlyout_ = function() {
+Toolbox.prototype.createFlyout_ = function() {
   const workspace = this.workspace_;
   // TODO (#4247): Look into adding a makeFlyout method to Blockly Options.
   const workspaceOptions = new Blockly.Options(
@@ -405,7 +405,7 @@ Blockly.Toolbox.prototype.createFlyout_ = function() {
  *     for creating a toolbox.
  * @package
  */
-Blockly.Toolbox.prototype.render = function(toolboxDef) {
+Toolbox.prototype.render = function(toolboxDef) {
   this.toolboxDef_ = toolboxDef;
   for (let i = 0; i < this.contents_.length; i++) {
     const toolboxItem = this.contents_[i];
@@ -426,7 +426,7 @@ Blockly.Toolbox.prototype.render = function(toolboxDef) {
  *     holding objects containing information on the contents of the toolbox.
  * @protected
  */
-Blockly.Toolbox.prototype.renderContents_ = function(toolboxDef) {
+Toolbox.prototype.renderContents_ = function(toolboxDef) {
   // This is for performance reasons. By using document fragment we only have to
   // add to the DOM once.
   const fragment = document.createDocumentFragment();
@@ -445,7 +445,7 @@ Blockly.Toolbox.prototype.renderContents_ = function(toolboxDef) {
  *     toolbox elements to.
  * @private
  */
-Blockly.Toolbox.prototype.createToolboxItem_ = function(toolboxItemDef, fragment) {
+Toolbox.prototype.createToolboxItem_ = function(toolboxItemDef, fragment) {
   let registryName = toolboxItemDef['kind'];
 
   // Categories that are collapsible are created using a class registered under
@@ -479,7 +479,7 @@ Blockly.Toolbox.prototype.createToolboxItem_ = function(toolboxItemDef, fragment
  * @param {!Blockly.IToolboxItem} toolboxItem The item in the toolbox.
  * @protected
  */
-Blockly.Toolbox.prototype.addToolboxItem_ = function(toolboxItem) {
+Toolbox.prototype.addToolboxItem_ = function(toolboxItem) {
   this.contents_.push(toolboxItem);
   this.contentMap_[toolboxItem.getId()] = toolboxItem;
   if (toolboxItem.isCollapsible()) {
@@ -498,7 +498,7 @@ Blockly.Toolbox.prototype.addToolboxItem_ = function(toolboxItem) {
  * @return {!Array<!Blockly.IToolboxItem>} The list of items in the toolbox.
  * @public
  */
-Blockly.Toolbox.prototype.getToolboxItems = function() {
+Toolbox.prototype.getToolboxItems = function() {
   return this.contents_;
 };
 
@@ -507,7 +507,7 @@ Blockly.Toolbox.prototype.getToolboxItems = function() {
  * @param {string} style The name of the class to add.
  * @package
  */
-Blockly.Toolbox.prototype.addStyle = function(style) {
+Toolbox.prototype.addStyle = function(style) {
   Blockly.utils.dom.addClass(/** @type {!Element} */ (this.HtmlDiv), style);
 };
 
@@ -516,7 +516,7 @@ Blockly.Toolbox.prototype.addStyle = function(style) {
  * @param {string} style The name of the class to remove.
  * @package
  */
-Blockly.Toolbox.prototype.removeStyle = function(style) {
+Toolbox.prototype.removeStyle = function(style) {
   Blockly.utils.dom.removeClass(/** @type {!Element} */ (this.HtmlDiv), style);
 };
 
@@ -526,7 +526,7 @@ Blockly.Toolbox.prototype.removeStyle = function(style) {
  * @return {?Blockly.utils.Rect} The component's bounding box. Null if drag
  *   target area should be ignored.
  */
-Blockly.Toolbox.prototype.getClientRect = function() {
+Toolbox.prototype.getClientRect = function() {
   if (!this.HtmlDiv || !this.isVisible_) {
     return null;
   }
@@ -568,7 +568,7 @@ Blockly.Toolbox.prototype.getClientRect = function() {
  *     this area.
  * @override
  */
-Blockly.Toolbox.prototype.wouldDelete = function(element, _couldConnect) {
+Toolbox.prototype.wouldDelete = function(element, _couldConnect) {
   if (element instanceof Blockly.BlockSvg) {
     const block = /** @type {Blockly.BlockSvg} */ (element);
     // Prefer dragging to the toolbox over connecting to other blocks.
@@ -585,7 +585,7 @@ Blockly.Toolbox.prototype.wouldDelete = function(element, _couldConnect) {
  *   dragged.
  * @override
  */
-Blockly.Toolbox.prototype.onDragEnter = function(_dragElement) {
+Toolbox.prototype.onDragEnter = function(_dragElement) {
   this.updateCursorDeleteStyle_(true);
 };
 
@@ -595,7 +595,7 @@ Blockly.Toolbox.prototype.onDragEnter = function(_dragElement) {
  *   dragged.
  * @override
  */
-Blockly.Toolbox.prototype.onDragExit = function(_dragElement) {
+Toolbox.prototype.onDragExit = function(_dragElement) {
   this.updateCursorDeleteStyle_(false);
 };
 
@@ -607,7 +607,7 @@ Blockly.Toolbox.prototype.onDragExit = function(_dragElement) {
  *   dragged.
  * @override
  */
-Blockly.Toolbox.prototype.onDrop = function(_dragElement) {
+Toolbox.prototype.onDrop = function(_dragElement) {
   this.updateCursorDeleteStyle_(false);
 };
 
@@ -617,7 +617,7 @@ Blockly.Toolbox.prototype.onDrop = function(_dragElement) {
  * @protected
  * @override
  */
-Blockly.Toolbox.prototype.updateWouldDelete_ = function(wouldDelete) {
+Toolbox.prototype.updateWouldDelete_ = function(wouldDelete) {
   if (wouldDelete === this.wouldDelete_) {
     return;
   }
@@ -638,7 +638,7 @@ Blockly.Toolbox.prototype.updateWouldDelete_ = function(wouldDelete) {
  * @param {boolean} addStyle Whether the style should be added or removed.
  * @protected
  */
-Blockly.Toolbox.prototype.updateCursorDeleteStyle_ = function(addStyle) {
+Toolbox.prototype.updateCursorDeleteStyle_ = function(addStyle) {
   const style = this.wouldDelete_ ? 'blocklyToolboxDelete' :
       'blocklyToolboxGrab';
   if (addStyle) {
@@ -655,7 +655,7 @@ Blockly.Toolbox.prototype.updateCursorDeleteStyle_ = function(addStyle) {
  *     if no item exists.
  * @public
  */
-Blockly.Toolbox.prototype.getToolboxItemById = function(id) {
+Toolbox.prototype.getToolboxItemById = function(id) {
   return this.contentMap_[id] || null;
 };
 
@@ -664,7 +664,7 @@ Blockly.Toolbox.prototype.getToolboxItemById = function(id) {
  * @return {number} The width of the toolbox.
  * @public
  */
-Blockly.Toolbox.prototype.getWidth = function() {
+Toolbox.prototype.getWidth = function() {
   return this.width_;
 };
 
@@ -673,7 +673,7 @@ Blockly.Toolbox.prototype.getWidth = function() {
  * @return {number} The width of the toolbox.
  * @public
  */
-Blockly.Toolbox.prototype.getHeight = function() {
+Toolbox.prototype.getHeight = function() {
   return this.height_;
 };
 
@@ -682,7 +682,7 @@ Blockly.Toolbox.prototype.getHeight = function() {
  * @return {?Blockly.IFlyout} The toolbox flyout.
  * @public
  */
-Blockly.Toolbox.prototype.getFlyout = function() {
+Toolbox.prototype.getFlyout = function() {
   return this.flyout_;
 };
 
@@ -691,7 +691,7 @@ Blockly.Toolbox.prototype.getFlyout = function() {
  * @return {!Blockly.WorkspaceSvg} The parent workspace for the toolbox.
  * @public
  */
-Blockly.Toolbox.prototype.getWorkspace = function() {
+Toolbox.prototype.getWorkspace = function() {
   return this.workspace_;
 };
 
@@ -701,7 +701,7 @@ Blockly.Toolbox.prototype.getWorkspace = function() {
  *     currently selected.
  * @public
  */
-Blockly.Toolbox.prototype.getSelectedItem = function() {
+Toolbox.prototype.getSelectedItem = function() {
   return this.selectedItem_;
 };
 
@@ -711,7 +711,7 @@ Blockly.Toolbox.prototype.getSelectedItem = function() {
  *     item was previously selected.
  * @public
  */
-Blockly.Toolbox.prototype.getPreviouslySelectedItem = function() {
+Toolbox.prototype.getPreviouslySelectedItem = function() {
   return this.previouslySelectedItem_;
 };
 
@@ -721,7 +721,7 @@ Blockly.Toolbox.prototype.getPreviouslySelectedItem = function() {
  *     vertical.
  * @public
  */
-Blockly.Toolbox.prototype.isHorizontal = function() {
+Toolbox.prototype.isHorizontal = function() {
   return this.horizontalLayout_;
 };
 
@@ -730,7 +730,7 @@ Blockly.Toolbox.prototype.isHorizontal = function() {
  * the workspace is in rtl.
  * @public
  */
-Blockly.Toolbox.prototype.position = function() {
+Toolbox.prototype.position = function() {
   const workspaceMetrics = this.workspace_.getMetrics();
   const toolboxDiv = this.HtmlDiv;
   if (!toolboxDiv) {
@@ -765,7 +765,7 @@ Blockly.Toolbox.prototype.position = function() {
  * Handles resizing the toolbox when a toolbox item resizes.
  * @package
  */
-Blockly.Toolbox.prototype.handleToolboxItemResize = function() {
+Toolbox.prototype.handleToolboxItemResize = function() {
   // Reposition the workspace so that (0,0) is in the correct position relative
   // to the new absolute edge (ie toolbox edge).
   const workspace = this.workspace_;
@@ -787,7 +787,7 @@ Blockly.Toolbox.prototype.handleToolboxItemResize = function() {
  * Unhighlights any previously selected item.
  * @public
  */
-Blockly.Toolbox.prototype.clearSelection = function() {
+Toolbox.prototype.clearSelection = function() {
   this.setSelectedItem(null);
 };
 
@@ -795,7 +795,7 @@ Blockly.Toolbox.prototype.clearSelection = function() {
  * Updates the category colours and background colour of selected categories.
  * @package
  */
-Blockly.Toolbox.prototype.refreshTheme = function() {
+Toolbox.prototype.refreshTheme = function() {
   for (let i = 0; i < this.contents_.length; i++) {
     const child = this.contents_[i];
     if (child.refreshTheme) {
@@ -810,7 +810,7 @@ Blockly.Toolbox.prototype.refreshTheme = function() {
  * procedures.
  * @public
  */
-Blockly.Toolbox.prototype.refreshSelection = function() {
+Toolbox.prototype.refreshSelection = function() {
   if (this.selectedItem_ && this.selectedItem_.isSelectable() &&
       this.selectedItem_.getContents().length) {
     this.flyout_.show(this.selectedItem_.getContents());
@@ -822,7 +822,7 @@ Blockly.Toolbox.prototype.refreshSelection = function() {
  * @param {boolean} isVisible True if toolbox should be visible.
  * @public
  */
-Blockly.Toolbox.prototype.setVisible = function(isVisible) {
+Toolbox.prototype.setVisible = function(isVisible) {
   if (this.isVisible_ === isVisible) {
     return;
   }
@@ -839,7 +839,7 @@ Blockly.Toolbox.prototype.setVisible = function(isVisible) {
  * @param {boolean} onlyClosePopups Whether only popups should be closed.
  *     Flyouts should not be closed if this is true.
  */
-Blockly.Toolbox.prototype.autoHide = function(onlyClosePopups) {
+Toolbox.prototype.autoHide = function(onlyClosePopups) {
   if (!onlyClosePopups && this.flyout_ && this.flyout_.autoClose) {
     this.clearSelection();
   }
@@ -851,7 +851,7 @@ Blockly.Toolbox.prototype.autoHide = function(onlyClosePopups) {
  * @param {?Blockly.IToolboxItem} newItem The toolbox item to select.
  * @public
  */
-Blockly.Toolbox.prototype.setSelectedItem = function(newItem) {
+Toolbox.prototype.setSelectedItem = function(newItem) {
   const oldItem = this.selectedItem_;
 
   if ((!newItem && !oldItem) || (newItem && !newItem.isSelectable())) {
@@ -880,7 +880,7 @@ Blockly.Toolbox.prototype.setSelectedItem = function(newItem) {
  * @return {boolean} True if the old item should be deselected, false otherwise.
  * @protected
  */
-Blockly.Toolbox.prototype.shouldDeselectItem_ = function(oldItem, newItem) {
+Toolbox.prototype.shouldDeselectItem_ = function(oldItem, newItem) {
   // Deselect the old item unless the old item is collapsible and has been
   // previously clicked on.
   return oldItem != null && (!oldItem.isCollapsible() || oldItem != newItem);
@@ -895,7 +895,7 @@ Blockly.Toolbox.prototype.shouldDeselectItem_ = function(oldItem, newItem) {
  * @return {boolean} True if the new item should be selected, false otherwise.
  * @protected
  */
-Blockly.Toolbox.prototype.shouldSelectItem_ = function(oldItem, newItem) {
+Toolbox.prototype.shouldSelectItem_ = function(oldItem, newItem) {
   // Select the new item unless the old item equals the new item.
   return newItem != null && newItem != oldItem;
 };
@@ -906,7 +906,7 @@ Blockly.Toolbox.prototype.shouldSelectItem_ = function(oldItem, newItem) {
  *     toolbox item which should be deselected.
  * @protected
  */
-Blockly.Toolbox.prototype.deselectItem_ = function(item) {
+Toolbox.prototype.deselectItem_ = function(item) {
   this.selectedItem_ = null;
   this.previouslySelectedItem_ = item;
   item.setSelected(false);
@@ -922,7 +922,7 @@ Blockly.Toolbox.prototype.deselectItem_ = function(item) {
  *     item.
  * @protected
  */
-Blockly.Toolbox.prototype.selectItem_ = function(oldItem, newItem) {
+Toolbox.prototype.selectItem_ = function(oldItem, newItem) {
   this.selectedItem_ = newItem;
   this.previouslySelectedItem_ = oldItem;
   newItem.setSelected(true);
@@ -935,7 +935,7 @@ Blockly.Toolbox.prototype.selectItem_ = function(oldItem, newItem) {
  * @param {number} position The position of the item to select.
  * @public
  */
-Blockly.Toolbox.prototype.selectItemByPosition = function(position) {
+Toolbox.prototype.selectItemByPosition = function(position) {
   if (position > -1 && position < this.contents_.length) {
     const item = this.contents_[position];
     if (item.isSelectable()) {
@@ -950,7 +950,7 @@ Blockly.Toolbox.prototype.selectItemByPosition = function(position) {
  * @param {?Blockly.ISelectableToolboxItem} newItem The newly selected toolbox item.
  * @protected
  */
-Blockly.Toolbox.prototype.updateFlyout_ = function(oldItem, newItem) {
+Toolbox.prototype.updateFlyout_ = function(oldItem, newItem) {
   if ((oldItem == newItem && !newItem.isCollapsible()) || !newItem ||
       !newItem.getContents().length) {
     this.flyout_.hide();
@@ -968,7 +968,7 @@ Blockly.Toolbox.prototype.updateFlyout_ = function(oldItem, newItem) {
  *     item.
  * @private
  */
-Blockly.Toolbox.prototype.fireSelectEvent_ = function(oldItem, newItem) {
+Toolbox.prototype.fireSelectEvent_ = function(oldItem, newItem) {
   const oldElement = oldItem && oldItem.getName();
   let newElement = newItem && newItem.getName();
   // In this case the toolbox closes, so the newElement should be null.
@@ -985,7 +985,7 @@ Blockly.Toolbox.prototype.fireSelectEvent_ = function(oldItem, newItem) {
  * @return {boolean} True if a parent category was selected, false otherwise.
  * @private
  */
-Blockly.Toolbox.prototype.selectParent_ = function() {
+Toolbox.prototype.selectParent_ = function() {
   if (!this.selectedItem_) {
     return false;
   }
@@ -1008,7 +1008,7 @@ Blockly.Toolbox.prototype.selectParent_ = function() {
  * @return {boolean} True if a child category was selected, false otherwise.
  * @private
  */
-Blockly.Toolbox.prototype.selectChild_ = function() {
+Toolbox.prototype.selectChild_ = function() {
   if (!this.selectedItem_ || !this.selectedItem_.isCollapsible()) {
     return false;
   }
@@ -1028,7 +1028,7 @@ Blockly.Toolbox.prototype.selectChild_ = function() {
  * @return {boolean} True if a next category was selected, false otherwise.
  * @private
  */
-Blockly.Toolbox.prototype.selectNext_ = function() {
+Toolbox.prototype.selectNext_ = function() {
   if (!this.selectedItem_) {
     return false;
   }
@@ -1052,7 +1052,7 @@ Blockly.Toolbox.prototype.selectNext_ = function() {
  * @return {boolean} True if a previous category was selected, false otherwise.
  * @private
  */
-Blockly.Toolbox.prototype.selectPrevious_ = function() {
+Toolbox.prototype.selectPrevious_ = function() {
   if (!this.selectedItem_) {
     return false;
   }
@@ -1075,7 +1075,7 @@ Blockly.Toolbox.prototype.selectPrevious_ = function() {
  * Disposes of this toolbox.
  * @public
  */
-Blockly.Toolbox.prototype.dispose = function() {
+Toolbox.prototype.dispose = function() {
   this.workspace_.getComponentManager().removeComponent('toolbox');
   this.flyout_.dispose();
   for (let i = 0; i < this.contents_.length; i++) {
@@ -1132,4 +1132,6 @@ Blockly.Css.register([
 ]);
 
 Blockly.registry.register(Blockly.registry.Type.TOOLBOX,
-    Blockly.registry.DEFAULT, Blockly.Toolbox);
+    Blockly.registry.DEFAULT, Toolbox);
+
+exports = Toolbox;
diff --git a/tests/deps.js b/tests/deps.js
index 7b93512dd..8cdafbc4c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -179,7 +179,7 @@ goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Bl
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly', 'Blockly.Css', 'Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem', 'Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.string']);

From a2e9509542f39e33600c6c61d31cc75bb311c662 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 09:22:44 -0700
Subject: [PATCH 587/833] Migrate core/toolbox/toolbox.js named requires

---
 core/toolbox/toolbox.js | 268 ++++++++++++++++++++--------------------
 1 file changed, 133 insertions(+), 135 deletions(-)

diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index c57588eec..fa9e80f57 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -13,56 +13,54 @@
 goog.module('Blockly.Toolbox');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly');
-goog.require('Blockly.BlockSvg');
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.CollapsibleToolboxCategory');
-goog.require('Blockly.ComponentManager');
-goog.require('Blockly.Css');
-goog.require('Blockly.DeleteArea');
-goog.require('Blockly.Events');
+const Blockly = goog.require('Blockly');
+const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
+const BlockSvg = goog.require('Blockly.BlockSvg');
+const CollapsibleToolboxCategory = goog.require('Blockly.CollapsibleToolboxCategory');
+const ComponentManager = goog.require('Blockly.ComponentManager');
+const Css = goog.require('Blockly.Css');const DeleteArea = goog.require('Blockly.DeleteArea');
+const Events = goog.require('Blockly.Events');
+const IAutoHideable = goog.require('Blockly.IAutoHideable');
+const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');
+const IDraggable = goog.requireType('Blockly.IDraggable');
+const IFlyout = goog.requireType('Blockly.IFlyout');
+const IKeyboardAccessible = goog.require('Blockly.IKeyboardAccessible');
+const ISelectableToolboxItem = goog.requireType('Blockly.ISelectableToolboxItem');
+const IStyleable = goog.require('Blockly.IStyleable');
+const IToolbox = goog.require('Blockly.IToolbox');
+const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
+const Options = goog.require('Blockly.Options');
+const Rect = goog.require('Blockly.utils.Rect');
+const ShortcutRegistry = goog.requireType('Blockly.ShortcutRegistry');
+const Touch = goog.require('Blockly.Touch');
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const aria = goog.require('Blockly.utils.aria');
+const browserEvents = goog.require('Blockly.browserEvents');
+const dom = goog.require('Blockly.utils.dom');
+const registry = goog.require('Blockly.registry');
+const utils = goog.require('Blockly.utils');
+const toolbox = goog.require('Blockly.utils.toolbox');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.ToolboxItemSelect');
-goog.require('Blockly.IAutoHideable');
-goog.require('Blockly.IKeyboardAccessible');
-goog.require('Blockly.IStyleable');
-goog.require('Blockly.IToolbox');
-goog.require('Blockly.Options');
-goog.require('Blockly.registry');
-goog.require('Blockly.Touch');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.aria');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Rect');
-goog.require('Blockly.utils.toolbox');
-
-goog.requireType('Blockly.BlocklyOptions');
-goog.requireType('Blockly.ICollapsibleToolboxItem');
-goog.requireType('Blockly.IDraggable');
-goog.requireType('Blockly.IFlyout');
-goog.requireType('Blockly.ISelectableToolboxItem');
-goog.requireType('Blockly.IToolboxItem');
-goog.requireType('Blockly.ShortcutRegistry');
-goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
  * Class for a Toolbox.
  * Creates the toolbox's DOM.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace in which to create new
+ * @param {!WorkspaceSvg} workspace The workspace in which to create new
  *     blocks.
  * @constructor
- * @implements {Blockly.IAutoHideable}
- * @implements {Blockly.IKeyboardAccessible}
- * @implements {Blockly.IStyleable}
- * @implements {Blockly.IToolbox}
- * @extends {Blockly.DeleteArea}
+ * @implements {IAutoHideable}
+ * @implements {IKeyboardAccessible}
+ * @implements {IStyleable}
+ * @implements {IToolbox}
+ * @extends {DeleteArea}
  */
 const Toolbox = function(workspace) {
   Toolbox.superClass_.constructor.call(this);
   /**
    * The workspace this toolbox is on.
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @protected
    */
   this.workspace_ = workspace;
@@ -76,7 +74,7 @@ const Toolbox = function(workspace) {
 
   /**
    * The JSON describing the contents of this toolbox.
-   * @type {!Blockly.utils.toolbox.ToolboxInfo}
+   * @type {!toolbox.ToolboxInfo}
    * @protected
    */
   this.toolboxDef_ = workspace.options.languageTree || {'contents': []};
@@ -110,7 +108,7 @@ const Toolbox = function(workspace) {
 
   /**
    * The list of items in the toolbox.
-   * @type {!Array<!Blockly.IToolboxItem>}
+   * @type {!Array<!IToolboxItem>}
    * @protected
    */
   this.contents_ = [];
@@ -137,34 +135,34 @@ const Toolbox = function(workspace) {
 
   /**
    * The flyout for the toolbox.
-   * @type {?Blockly.IFlyout}
+   * @type {?IFlyout}
    * @private
    */
   this.flyout_ = null;
 
   /**
    * A map from toolbox item IDs to toolbox items.
-   * @type {!Object<string, !Blockly.IToolboxItem>}
+   * @type {!Object<string, !IToolboxItem>}
    * @protected
    */
   this.contentMap_ = Object.create(null);
 
   /**
    * Position of the toolbox and flyout relative to the workspace.
-   * @type {!Blockly.utils.toolbox.Position}
+   * @type {!toolbox.Position}
    */
   this.toolboxPosition = workspace.options.toolboxPosition;
 
   /**
    * The currently selected item.
-   * @type {?Blockly.ISelectableToolboxItem}
+   * @type {?ISelectableToolboxItem}
    * @protected
    */
   this.selectedItem_ = null;
 
   /**
    * The previously selected item.
-   * @type {?Blockly.ISelectableToolboxItem}
+   * @type {?ISelectableToolboxItem}
    * @protected
    */
   this.previouslySelectedItem_ = null;
@@ -173,16 +171,16 @@ const Toolbox = function(workspace) {
    * Array holding info needed to unbind event handlers.
    * Used for disposing.
    * Ex: [[node, name, func], [node, name, func]].
-   * @type {!Array<!Blockly.browserEvents.Data>}
+   * @type {!Array<!browserEvents.Data>}
    * @protected
    */
   this.boundEvents_ = [];
 };
-Blockly.utils.object.inherits(Toolbox, Blockly.DeleteArea);
+utils.object.inherits(Toolbox, DeleteArea);
 
 /**
  * Handles the given keyboard shortcut.
- * @param {!Blockly.ShortcutRegistry.KeyboardShortcut} _shortcut The shortcut to be handled.
+ * @param {!ShortcutRegistry.KeyboardShortcut} _shortcut The shortcut to be handled.
  * @return {boolean} True if the shortcut has been handled, false otherwise.
  * @public
  */
@@ -201,7 +199,7 @@ Toolbox.prototype.init = function() {
   this.flyout_ = this.createFlyout_();
 
   this.HtmlDiv = this.createDom_(this.workspace_);
-  Blockly.utils.dom.insertAfter(this.flyout_.createDom('svg'), svg);
+  dom.insertAfter(this.flyout_.createDom('svg'), svg);
   this.setVisible(true);
   this.flyout_.init(workspace);
 
@@ -214,16 +212,16 @@ Toolbox.prototype.init = function() {
     component: this,
     weight: 1,
     capabilities: [
-      Blockly.ComponentManager.Capability.AUTOHIDEABLE,
-      Blockly.ComponentManager.Capability.DELETE_AREA,
-      Blockly.ComponentManager.Capability.DRAG_TARGET
+      ComponentManager.Capability.AUTOHIDEABLE,
+      ComponentManager.Capability.DELETE_AREA,
+      ComponentManager.Capability.DRAG_TARGET
     ]
   });
 };
 
 /**
  * Creates the DOM for the toolbox.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace this toolbox is on.
+ * @param {!WorkspaceSvg} workspace The workspace this toolbox is on.
  * @return {!Element} The HTML container for the toolbox.
  * @protected
  */
@@ -234,7 +232,7 @@ Toolbox.prototype.createDom_ = function(workspace) {
 
   this.contentsDiv_ = this.createContentsContainer_();
   this.contentsDiv_.tabIndex = 0;
-  Blockly.utils.aria.setRole(this.contentsDiv_, Blockly.utils.aria.Role.TREE);
+  aria.setRole(this.contentsDiv_, aria.Role.TREE);
   container.appendChild(this.contentsDiv_);
 
   svg.parentNode.insertBefore(container, svg);
@@ -251,8 +249,8 @@ Toolbox.prototype.createDom_ = function(workspace) {
 Toolbox.prototype.createContainer_ = function() {
   const toolboxContainer = document.createElement('div');
   toolboxContainer.setAttribute('layout', this.isHorizontal() ? 'h' : 'v');
-  Blockly.utils.dom.addClass(toolboxContainer, 'blocklyToolboxDiv');
-  Blockly.utils.dom.addClass(toolboxContainer, 'blocklyNonSelectable');
+  dom.addClass(toolboxContainer, 'blocklyToolboxDiv');
+  dom.addClass(toolboxContainer, 'blocklyNonSelectable');
   toolboxContainer.setAttribute('dir', this.RTL ? 'RTL' : 'LTR');
   return toolboxContainer;
 };
@@ -264,7 +262,7 @@ Toolbox.prototype.createContainer_ = function() {
  */
 Toolbox.prototype.createContentsContainer_ = function() {
   const contentsContainer = document.createElement('div');
-  Blockly.utils.dom.addClass(contentsContainer, 'blocklyToolboxContents');
+  dom.addClass(contentsContainer, 'blocklyToolboxContents');
   if (this.isHorizontal()) {
     contentsContainer.style.flexDirection = 'row';
   }
@@ -281,13 +279,13 @@ Toolbox.prototype.createContentsContainer_ = function() {
 Toolbox.prototype.attachEvents_ = function(container,
     contentsContainer) {
   // Clicking on toolbox closes popups.
-  const clickEvent = Blockly.browserEvents.conditionalBind(
+  const clickEvent = browserEvents.conditionalBind(
       container, 'click', this, this.onClick_,
       /* opt_noCaptureIdentifier */ false,
       /* opt_noPreventDefault */ true);
   this.boundEvents_.push(clickEvent);
 
-  const keyDownEvent = Blockly.browserEvents.conditionalBind(
+  const keyDownEvent = browserEvents.conditionalBind(
       contentsContainer, 'keydown', this, this.onKeyDown_,
       /* opt_noCaptureIdentifier */ false,
       /* opt_noPreventDefault */ true);
@@ -300,7 +298,7 @@ Toolbox.prototype.attachEvents_ = function(container,
  * @protected
  */
 Toolbox.prototype.onClick_ = function(e) {
-  if (Blockly.utils.isRightButton(e) || e.target == this.HtmlDiv) {
+  if (utils.isRightButton(e) || e.target == this.HtmlDiv) {
     // Close flyout.
     Blockly.hideChaff(false);
   } else {
@@ -316,7 +314,7 @@ Toolbox.prototype.onClick_ = function(e) {
     // Just close popups.
     Blockly.hideChaff(true);
   }
-  Blockly.Touch.clearTouchIdentifier();  // Don't block future drags.
+  Touch.clearTouchIdentifier();  // Don't block future drags.
 };
 
 /**
@@ -327,22 +325,22 @@ Toolbox.prototype.onClick_ = function(e) {
 Toolbox.prototype.onKeyDown_ = function(e) {
   let handled = false;
   switch (e.keyCode) {
-    case Blockly.utils.KeyCodes.DOWN:
+    case utils.KeyCodes.DOWN:
       handled = this.selectNext_();
       break;
-    case Blockly.utils.KeyCodes.UP:
+    case utils.KeyCodes.UP:
       handled = this.selectPrevious_();
       break;
-    case Blockly.utils.KeyCodes.LEFT:
+    case utils.KeyCodes.LEFT:
       handled = this.selectParent_();
       break;
-    case Blockly.utils.KeyCodes.RIGHT:
+    case utils.KeyCodes.RIGHT:
       handled = this.selectChild_();
       break;
-    case Blockly.utils.KeyCodes.ENTER:
-    case Blockly.utils.KeyCodes.SPACE:
+    case utils.KeyCodes.ENTER:
+    case utils.KeyCodes.SPACE:
       if (this.selectedItem_ && this.selectedItem_.isCollapsible()) {
-        const collapsibleItem = /** @type {!Blockly.ICollapsibleToolboxItem} */ (this.selectedItem_);
+        const collapsibleItem = /** @type {!ICollapsibleToolboxItem} */ (this.selectedItem_);
         collapsibleItem.toggleExpanded();
         handled = true;
       }
@@ -362,7 +360,7 @@ Toolbox.prototype.onKeyDown_ = function(e) {
 
 /**
  * Creates the flyout based on the toolbox layout.
- * @return {!Blockly.IFlyout} The flyout for the toolbox.
+ * @return {!IFlyout} The flyout for the toolbox.
  * @throws {Error} If missing a require for `Blockly.HorizontalFlyout`,
  *     `Blockly.VerticalFlyout`, and no flyout plugin is specified.
  * @protected
@@ -370,8 +368,8 @@ Toolbox.prototype.onKeyDown_ = function(e) {
 Toolbox.prototype.createFlyout_ = function() {
   const workspace = this.workspace_;
   // TODO (#4247): Look into adding a makeFlyout method to Blockly Options.
-  const workspaceOptions = new Blockly.Options(
-      /** @type {!Blockly.BlocklyOptions} */
+  const workspaceOptions = new Options(
+      /** @type {!BlocklyOptions} */
       ({
         'parentWorkspace': workspace,
         'rtl': workspace.RTL,
@@ -388,12 +386,12 @@ Toolbox.prototype.createFlyout_ = function() {
   workspaceOptions.toolboxPosition = workspace.options.toolboxPosition;
   let FlyoutClass = null;
   if (workspace.horizontalLayout) {
-    FlyoutClass = Blockly.registry.getClassFromOptions(
-        Blockly.registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX, workspace.options,
+    FlyoutClass = registry.getClassFromOptions(
+        registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX, workspace.options,
         true);
   } else {
-    FlyoutClass = Blockly.registry.getClassFromOptions(
-        Blockly.registry.Type.FLYOUTS_VERTICAL_TOOLBOX, workspace.options,
+    FlyoutClass = registry.getClassFromOptions(
+        registry.Type.FLYOUTS_VERTICAL_TOOLBOX, workspace.options,
         true);
   }
   return new FlyoutClass(workspaceOptions);
@@ -401,7 +399,7 @@ Toolbox.prototype.createFlyout_ = function() {
 
 /**
  * Fills the toolbox with new toolbox items and removes any old contents.
- * @param {!Blockly.utils.toolbox.ToolboxInfo} toolboxDef Object holding information
+ * @param {!toolbox.ToolboxInfo} toolboxDef Object holding information
  *     for creating a toolbox.
  * @package
  */
@@ -422,7 +420,7 @@ Toolbox.prototype.render = function(toolboxDef) {
 
 /**
  * Adds all the toolbox items to the toolbox.
- * @param {!Array<!Blockly.utils.toolbox.ToolboxItemInfo>} toolboxDef Array
+ * @param {!Array<!toolbox.ToolboxItemInfo>} toolboxDef Array
  *     holding objects containing information on the contents of the toolbox.
  * @protected
  */
@@ -439,7 +437,7 @@ Toolbox.prototype.renderContents_ = function(toolboxDef) {
 
 /**
  * Creates and renders the toolbox item.
- * @param {!Blockly.utils.toolbox.ToolboxItemInfo} toolboxItemDef Any information
+ * @param {!toolbox.ToolboxItemInfo} toolboxItemDef Any information
  *    that can be used to create an item in the toolbox.
  * @param {!DocumentFragment} fragment The document fragment to add the child
  *     toolbox elements to.
@@ -451,13 +449,13 @@ Toolbox.prototype.createToolboxItem_ = function(toolboxItemDef, fragment) {
   // Categories that are collapsible are created using a class registered under
   // a different name.
   if (registryName.toUpperCase() == 'CATEGORY' &&
-      Blockly.utils.toolbox.isCategoryCollapsible(
-      /** @type {!Blockly.utils.toolbox.CategoryInfo} */(toolboxItemDef))) {
-    registryName = Blockly.CollapsibleToolboxCategory.registrationName;
+      toolbox.isCategoryCollapsible(
+      /** @type {!toolbox.CategoryInfo} */(toolboxItemDef))) {
+    registryName = CollapsibleToolboxCategory.registrationName;
   }
 
-  const ToolboxItemClass = Blockly.registry.getClass(
-      Blockly.registry.Type.TOOLBOX_ITEM, registryName.toLowerCase());
+  const ToolboxItemClass = registry.getClass(
+      registry.Type.TOOLBOX_ITEM, registryName.toLowerCase());
   if (ToolboxItemClass) {
     const toolboxItem = new ToolboxItemClass(toolboxItemDef, this);
     this.addToolboxItem_(toolboxItem);
@@ -476,14 +474,14 @@ Toolbox.prototype.createToolboxItem_ = function(toolboxItemDef, fragment) {
 
 /**
  * Adds an item to the toolbox.
- * @param {!Blockly.IToolboxItem} toolboxItem The item in the toolbox.
+ * @param {!IToolboxItem} toolboxItem The item in the toolbox.
  * @protected
  */
 Toolbox.prototype.addToolboxItem_ = function(toolboxItem) {
   this.contents_.push(toolboxItem);
   this.contentMap_[toolboxItem.getId()] = toolboxItem;
   if (toolboxItem.isCollapsible()) {
-    const collapsibleItem = /** @type {Blockly.ICollapsibleToolboxItem} */
+    const collapsibleItem = /** @type {ICollapsibleToolboxItem} */
         (toolboxItem);
     const childToolboxItems = collapsibleItem.getChildToolboxItems();
     for (let i = 0; i < childToolboxItems.length; i++) {
@@ -495,7 +493,7 @@ Toolbox.prototype.addToolboxItem_ = function(toolboxItem) {
 
 /**
  * Gets the items in the toolbox.
- * @return {!Array<!Blockly.IToolboxItem>} The list of items in the toolbox.
+ * @return {!Array<!IToolboxItem>} The list of items in the toolbox.
  * @public
  */
 Toolbox.prototype.getToolboxItems = function() {
@@ -508,7 +506,7 @@ Toolbox.prototype.getToolboxItems = function() {
  * @package
  */
 Toolbox.prototype.addStyle = function(style) {
-  Blockly.utils.dom.addClass(/** @type {!Element} */ (this.HtmlDiv), style);
+  dom.addClass(/** @type {!Element} */ (this.HtmlDiv), style);
 };
 
 /**
@@ -517,13 +515,13 @@ Toolbox.prototype.addStyle = function(style) {
  * @package
  */
 Toolbox.prototype.removeStyle = function(style) {
-  Blockly.utils.dom.removeClass(/** @type {!Element} */ (this.HtmlDiv), style);
+  dom.removeClass(/** @type {!Element} */ (this.HtmlDiv), style);
 };
 
 /**
  * Returns the bounding rectangle of the drag target area in pixel units
  * relative to viewport.
- * @return {?Blockly.utils.Rect} The component's bounding box. Null if drag
+ * @return {?Rect} The component's bounding box. Null if drag
  *   target area should be ignored.
  */
 Toolbox.prototype.getClientRect = function() {
@@ -544,14 +542,14 @@ Toolbox.prototype.getClientRect = function() {
 
   // Assumes that the toolbox is on the SVG edge.  If this changes
   // (e.g. toolboxes in mutators) then this code will need to be more complex.
-  if (this.toolboxPosition == Blockly.utils.toolbox.Position.TOP) {
-    return new Blockly.utils.Rect(-BIG_NUM, bottom, -BIG_NUM, BIG_NUM);
-  } else if (this.toolboxPosition == Blockly.utils.toolbox.Position.BOTTOM) {
-    return new Blockly.utils.Rect(top, BIG_NUM, -BIG_NUM, BIG_NUM);
-  } else if (this.toolboxPosition == Blockly.utils.toolbox.Position.LEFT) {
-    return new Blockly.utils.Rect(-BIG_NUM, BIG_NUM, -BIG_NUM, right);
+  if (this.toolboxPosition == toolbox.Position.TOP) {
+    return new Rect(-BIG_NUM, bottom, -BIG_NUM, BIG_NUM);
+  } else if (this.toolboxPosition == toolbox.Position.BOTTOM) {
+    return new Rect(top, BIG_NUM, -BIG_NUM, BIG_NUM);
+  } else if (this.toolboxPosition == toolbox.Position.LEFT) {
+    return new Rect(-BIG_NUM, BIG_NUM, -BIG_NUM, right);
   } else {  // Right
-    return new Blockly.utils.Rect(-BIG_NUM, BIG_NUM, left, BIG_NUM);
+    return new Rect(-BIG_NUM, BIG_NUM, left, BIG_NUM);
   }
 };
 
@@ -560,7 +558,7 @@ Toolbox.prototype.getClientRect = function() {
  * this area.
  * This method should check if the element is deletable and is always called
  * before onDragEnter/onDragOver/onDragExit.
- * @param {!Blockly.IDraggable} element The block or bubble currently being
+ * @param {!IDraggable} element The block or bubble currently being
  *   dragged.
  * @param {boolean} _couldConnect Whether the element could could connect to
  *     another.
@@ -569,8 +567,8 @@ Toolbox.prototype.getClientRect = function() {
  * @override
  */
 Toolbox.prototype.wouldDelete = function(element, _couldConnect) {
-  if (element instanceof Blockly.BlockSvg) {
-    const block = /** @type {Blockly.BlockSvg} */ (element);
+  if (element instanceof BlockSvg) {
+    const block = /** @type {BlockSvg} */ (element);
     // Prefer dragging to the toolbox over connecting to other blocks.
     this.updateWouldDelete_(!block.getParent() && block.isDeletable());
   } else {
@@ -581,7 +579,7 @@ Toolbox.prototype.wouldDelete = function(element, _couldConnect) {
 
 /**
  * Handles when a cursor with a block or bubble enters this drag target.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  * @override
  */
@@ -591,7 +589,7 @@ Toolbox.prototype.onDragEnter = function(_dragElement) {
 
 /**
  * Handles when a cursor with a block or bubble exits this drag target.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  * @override
  */
@@ -603,7 +601,7 @@ Toolbox.prototype.onDragExit = function(_dragElement) {
 /**
  * Handles when a block or bubble is dropped on this component.
  * Should not handle delete here.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  * @override
  */
@@ -651,7 +649,7 @@ Toolbox.prototype.updateCursorDeleteStyle_ = function(addStyle) {
 /**
  * Gets the toolbox item with the given ID.
  * @param {string} id The ID of the toolbox item.
- * @return {?Blockly.IToolboxItem} The toolbox item with the given ID, or null
+ * @return {?IToolboxItem} The toolbox item with the given ID, or null
  *     if no item exists.
  * @public
  */
@@ -679,7 +677,7 @@ Toolbox.prototype.getHeight = function() {
 
 /**
  * Gets the toolbox flyout.
- * @return {?Blockly.IFlyout} The toolbox flyout.
+ * @return {?IFlyout} The toolbox flyout.
  * @public
  */
 Toolbox.prototype.getFlyout = function() {
@@ -688,7 +686,7 @@ Toolbox.prototype.getFlyout = function() {
 
 /**
  * Gets the workspace for the toolbox.
- * @return {!Blockly.WorkspaceSvg} The parent workspace for the toolbox.
+ * @return {!WorkspaceSvg} The parent workspace for the toolbox.
  * @public
  */
 Toolbox.prototype.getWorkspace = function() {
@@ -697,7 +695,7 @@ Toolbox.prototype.getWorkspace = function() {
 
 /**
  * Gets the selected item.
- * @return {?Blockly.ISelectableToolboxItem} The selected item, or null if no item is
+ * @return {?ISelectableToolboxItem} The selected item, or null if no item is
  *     currently selected.
  * @public
  */
@@ -707,7 +705,7 @@ Toolbox.prototype.getSelectedItem = function() {
 
 /**
  * Gets the previously selected item.
- * @return {?Blockly.ISelectableToolboxItem} The previously selected item, or null if no
+ * @return {?ISelectableToolboxItem} The previously selected item, or null if no
  *     item was previously selected.
  * @public
  */
@@ -744,13 +742,13 @@ Toolbox.prototype.position = function() {
     toolboxDiv.style.width = '100%';
     this.height_ = toolboxDiv.offsetHeight;
     this.width_ = workspaceMetrics.viewWidth;
-    if (this.toolboxPosition == Blockly.utils.toolbox.Position.TOP) {
+    if (this.toolboxPosition == toolbox.Position.TOP) {
       toolboxDiv.style.top = '0';
     } else {  // Bottom
       toolboxDiv.style.bottom = '0';
     }
   } else {
-    if (this.toolboxPosition == Blockly.utils.toolbox.Position.RIGHT) {
+    if (this.toolboxPosition == toolbox.Position.RIGHT) {
       toolboxDiv.style.right = '0';
     } else {  // Left
       toolboxDiv.style.left = '0';
@@ -770,10 +768,10 @@ Toolbox.prototype.handleToolboxItemResize = function() {
   // to the new absolute edge (ie toolbox edge).
   const workspace = this.workspace_;
   const rect = this.HtmlDiv.getBoundingClientRect();
-  const newX = this.toolboxPosition == Blockly.utils.toolbox.Position.LEFT ?
+  const newX = this.toolboxPosition == toolbox.Position.LEFT ?
       workspace.scrollX + rect.width :
       workspace.scrollX;
-  const newY = this.toolboxPosition == Blockly.utils.toolbox.Position.TOP ?
+  const newY = this.toolboxPosition == toolbox.Position.TOP ?
       workspace.scrollY + rect.height :
       workspace.scrollY;
   workspace.translate(newX, newY);
@@ -848,7 +846,7 @@ Toolbox.prototype.autoHide = function(onlyClosePopups) {
 /**
  * Sets the given item as selected.
  * No-op if the item is not selectable.
- * @param {?Blockly.IToolboxItem} newItem The toolbox item to select.
+ * @param {?IToolboxItem} newItem The toolbox item to select.
  * @public
  */
 Toolbox.prototype.setSelectedItem = function(newItem) {
@@ -857,7 +855,7 @@ Toolbox.prototype.setSelectedItem = function(newItem) {
   if ((!newItem && !oldItem) || (newItem && !newItem.isSelectable())) {
     return;
   }
-  newItem = /** @type {Blockly.ISelectableToolboxItem} */ (newItem);
+  newItem = /** @type {ISelectableToolboxItem} */ (newItem);
 
   if (this.shouldDeselectItem_(oldItem, newItem) && oldItem != null) {
     this.deselectItem_(oldItem);
@@ -873,9 +871,9 @@ Toolbox.prototype.setSelectedItem = function(newItem) {
 
 /**
  * Decides whether the old item should be deselected.
- * @param {?Blockly.ISelectableToolboxItem} oldItem The previously selected
+ * @param {?ISelectableToolboxItem} oldItem The previously selected
  *     toolbox item.
- * @param {?Blockly.ISelectableToolboxItem} newItem The newly selected toolbox
+ * @param {?ISelectableToolboxItem} newItem The newly selected toolbox
  *     item.
  * @return {boolean} True if the old item should be deselected, false otherwise.
  * @protected
@@ -888,9 +886,9 @@ Toolbox.prototype.shouldDeselectItem_ = function(oldItem, newItem) {
 
 /**
  * Decides whether the new item should be selected.
- * @param {?Blockly.ISelectableToolboxItem} oldItem The previously selected
+ * @param {?ISelectableToolboxItem} oldItem The previously selected
  *     toolbox item.
- * @param {?Blockly.ISelectableToolboxItem} newItem The newly selected toolbox
+ * @param {?ISelectableToolboxItem} newItem The newly selected toolbox
  *     item.
  * @return {boolean} True if the new item should be selected, false otherwise.
  * @protected
@@ -902,7 +900,7 @@ Toolbox.prototype.shouldSelectItem_ = function(oldItem, newItem) {
 
 /**
  * Deselects the given item, marks it as unselected, and updates aria state.
- * @param {!Blockly.ISelectableToolboxItem} item The previously selected
+ * @param {!ISelectableToolboxItem} item The previously selected
  *     toolbox item which should be deselected.
  * @protected
  */
@@ -910,15 +908,15 @@ Toolbox.prototype.deselectItem_ = function(item) {
   this.selectedItem_ = null;
   this.previouslySelectedItem_ = item;
   item.setSelected(false);
-  Blockly.utils.aria.setState(/** @type {!Element} */ (this.contentsDiv_),
-      Blockly.utils.aria.State.ACTIVEDESCENDANT, '');
+  aria.setState(/** @type {!Element} */ (this.contentsDiv_),
+      aria.State.ACTIVEDESCENDANT, '');
 };
 
 /**
  * Selects the given item, marks it selected, and updates aria state.
- * @param {?Blockly.ISelectableToolboxItem} oldItem The previously selected
+ * @param {?ISelectableToolboxItem} oldItem The previously selected
  *     toolbox item.
- * @param {!Blockly.ISelectableToolboxItem} newItem The newly selected toolbox
+ * @param {!ISelectableToolboxItem} newItem The newly selected toolbox
  *     item.
  * @protected
  */
@@ -926,8 +924,8 @@ Toolbox.prototype.selectItem_ = function(oldItem, newItem) {
   this.selectedItem_ = newItem;
   this.previouslySelectedItem_ = oldItem;
   newItem.setSelected(true);
-  Blockly.utils.aria.setState(/** @type {!Element} */ (this.contentsDiv_),
-      Blockly.utils.aria.State.ACTIVEDESCENDANT, newItem.getId());
+  aria.setState(/** @type {!Element} */ (this.contentsDiv_),
+      aria.State.ACTIVEDESCENDANT, newItem.getId());
 };
 
 /**
@@ -946,8 +944,8 @@ Toolbox.prototype.selectItemByPosition = function(position) {
 
 /**
  * Decides whether to hide or show the flyout depending on the selected item.
- * @param {?Blockly.ISelectableToolboxItem} oldItem The previously selected toolbox item.
- * @param {?Blockly.ISelectableToolboxItem} newItem The newly selected toolbox item.
+ * @param {?ISelectableToolboxItem} oldItem The previously selected toolbox item.
+ * @param {?ISelectableToolboxItem} newItem The newly selected toolbox item.
  * @protected
  */
 Toolbox.prototype.updateFlyout_ = function(oldItem, newItem) {
@@ -962,9 +960,9 @@ Toolbox.prototype.updateFlyout_ = function(oldItem, newItem) {
 
 /**
  * Emits an event when a new toolbox item is selected.
- * @param {?Blockly.ISelectableToolboxItem} oldItem The previously selected
+ * @param {?ISelectableToolboxItem} oldItem The previously selected
  *     toolbox item.
- * @param {?Blockly.ISelectableToolboxItem} newItem The newly selected toolbox
+ * @param {?ISelectableToolboxItem} newItem The newly selected toolbox
  *     item.
  * @private
  */
@@ -975,9 +973,9 @@ Toolbox.prototype.fireSelectEvent_ = function(oldItem, newItem) {
   if (oldItem == newItem) {
     newElement = null;
   }
-  const event = new (Blockly.Events.get(Blockly.Events.TOOLBOX_ITEM_SELECT))(
+  const event = new (Events.get(Events.TOOLBOX_ITEM_SELECT))(
       oldElement, newElement, this.workspace_.id);
-  Blockly.Events.fire(event);
+  Events.fire(event);
 };
 
 /**
@@ -991,7 +989,7 @@ Toolbox.prototype.selectParent_ = function() {
   }
 
   if (this.selectedItem_.isCollapsible() && this.selectedItem_.isExpanded()) {
-    const collapsibleItem = /** @type {!Blockly.ICollapsibleToolboxItem} */ (this.selectedItem_);
+    const collapsibleItem = /** @type {!ICollapsibleToolboxItem} */ (this.selectedItem_);
     collapsibleItem.setExpanded(false);
     return true;
   } else if (this.selectedItem_.getParent() &&
@@ -1012,7 +1010,7 @@ Toolbox.prototype.selectChild_ = function() {
   if (!this.selectedItem_ || !this.selectedItem_.isCollapsible()) {
     return false;
   }
-  const collapsibleItem = /** @type {Blockly.ICollapsibleToolboxItem} */
+  const collapsibleItem = /** @type {ICollapsibleToolboxItem} */
       (this.selectedItem_);
   if (!collapsibleItem.isExpanded()) {
     collapsibleItem.setExpanded(true);
@@ -1084,19 +1082,19 @@ Toolbox.prototype.dispose = function() {
   }
 
   for (let j = 0; j < this.boundEvents_.length; j++) {
-    Blockly.browserEvents.unbind(this.boundEvents_[j]);
+    browserEvents.unbind(this.boundEvents_[j]);
   }
   this.boundEvents_ = [];
   this.contents_ = [];
 
   this.workspace_.getThemeManager().unsubscribe(this.HtmlDiv);
-  Blockly.utils.dom.removeNode(this.HtmlDiv);
+  dom.removeNode(this.HtmlDiv);
 };
 
 /**
  * CSS for Toolbox.  See css.js for use.
  */
-Blockly.Css.register([
+Css.register([
   /* eslint-disable indent */
   '.blocklyToolboxDelete {',
     'cursor: url("<<<PATH>>>/handdelete.cur"), auto;',
@@ -1131,7 +1129,7 @@ Blockly.Css.register([
   /* eslint-enable indent */
 ]);
 
-Blockly.registry.register(Blockly.registry.Type.TOOLBOX,
-    Blockly.registry.DEFAULT, Toolbox);
+registry.register(registry.Type.TOOLBOX,
+    registry.DEFAULT, Toolbox);
 
 exports = Toolbox;

From 6863d7fa0825eb0fb4655081a4fbd789d2427276 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 11:22:29 -0700
Subject: [PATCH 588/833] clang-format core/toolbox/toolbox.js

---
 core/toolbox/toolbox.js | 87 ++++++++++++++++++-----------------------
 1 file changed, 39 insertions(+), 48 deletions(-)

diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index fa9e80f57..1edb72fc2 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -18,7 +18,8 @@ const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
 const BlockSvg = goog.require('Blockly.BlockSvg');
 const CollapsibleToolboxCategory = goog.require('Blockly.CollapsibleToolboxCategory');
 const ComponentManager = goog.require('Blockly.ComponentManager');
-const Css = goog.require('Blockly.Css');const DeleteArea = goog.require('Blockly.DeleteArea');
+const Css = goog.require('Blockly.Css');
+const DeleteArea = goog.require('Blockly.DeleteArea');
 const Events = goog.require('Blockly.Events');
 const IAutoHideable = goog.require('Blockly.IAutoHideable');
 const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');
@@ -180,7 +181,8 @@ utils.object.inherits(Toolbox, DeleteArea);
 
 /**
  * Handles the given keyboard shortcut.
- * @param {!ShortcutRegistry.KeyboardShortcut} _shortcut The shortcut to be handled.
+ * @param {!ShortcutRegistry.KeyboardShortcut} _shortcut The shortcut to be
+ *     handled.
  * @return {boolean} True if the shortcut has been handled, false otherwise.
  * @public
  */
@@ -205,8 +207,8 @@ Toolbox.prototype.init = function() {
 
   this.render(this.toolboxDef_);
   const themeManager = workspace.getThemeManager();
-  themeManager.subscribe(this.HtmlDiv, 'toolboxBackgroundColour',
-      'background-color');
+  themeManager.subscribe(
+      this.HtmlDiv, 'toolboxBackgroundColour', 'background-color');
   themeManager.subscribe(this.HtmlDiv, 'toolboxForegroundColour', 'color');
   this.workspace_.getComponentManager().addComponent({
     component: this,
@@ -276,8 +278,7 @@ Toolbox.prototype.createContentsContainer_ = function() {
  *     of the toolbox.
  * @protected
  */
-Toolbox.prototype.attachEvents_ = function(container,
-    contentsContainer) {
+Toolbox.prototype.attachEvents_ = function(container, contentsContainer) {
   // Clicking on toolbox closes popups.
   const clickEvent = browserEvents.conditionalBind(
       container, 'click', this, this.onClick_,
@@ -340,7 +341,8 @@ Toolbox.prototype.onKeyDown_ = function(e) {
     case utils.KeyCodes.ENTER:
     case utils.KeyCodes.SPACE:
       if (this.selectedItem_ && this.selectedItem_.isCollapsible()) {
-        const collapsibleItem = /** @type {!ICollapsibleToolboxItem} */ (this.selectedItem_);
+        const collapsibleItem =
+            /** @type {!ICollapsibleToolboxItem} */ (this.selectedItem_);
         collapsibleItem.toggleExpanded();
         handled = true;
       }
@@ -387,12 +389,10 @@ Toolbox.prototype.createFlyout_ = function() {
   let FlyoutClass = null;
   if (workspace.horizontalLayout) {
     FlyoutClass = registry.getClassFromOptions(
-        registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX, workspace.options,
-        true);
+        registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX, workspace.options, true);
   } else {
     FlyoutClass = registry.getClassFromOptions(
-        registry.Type.FLYOUTS_VERTICAL_TOOLBOX, workspace.options,
-        true);
+        registry.Type.FLYOUTS_VERTICAL_TOOLBOX, workspace.options, true);
   }
   return new FlyoutClass(workspaceOptions);
 };
@@ -450,12 +450,12 @@ Toolbox.prototype.createToolboxItem_ = function(toolboxItemDef, fragment) {
   // a different name.
   if (registryName.toUpperCase() == 'CATEGORY' &&
       toolbox.isCategoryCollapsible(
-      /** @type {!toolbox.CategoryInfo} */(toolboxItemDef))) {
+          /** @type {!toolbox.CategoryInfo} */ (toolboxItemDef))) {
     registryName = CollapsibleToolboxCategory.registrationName;
   }
 
-  const ToolboxItemClass = registry.getClass(
-      registry.Type.TOOLBOX_ITEM, registryName.toLowerCase());
+  const ToolboxItemClass =
+      registry.getClass(registry.Type.TOOLBOX_ITEM, registryName.toLowerCase());
   if (ToolboxItemClass) {
     const toolboxItem = new ToolboxItemClass(toolboxItemDef, this);
     this.addToolboxItem_(toolboxItem);
@@ -637,8 +637,8 @@ Toolbox.prototype.updateWouldDelete_ = function(wouldDelete) {
  * @protected
  */
 Toolbox.prototype.updateCursorDeleteStyle_ = function(addStyle) {
-  const style = this.wouldDelete_ ? 'blocklyToolboxDelete' :
-      'blocklyToolboxGrab';
+  const style =
+      this.wouldDelete_ ? 'blocklyToolboxDelete' : 'blocklyToolboxGrab';
   if (addStyle) {
     this.addStyle(style);
   } else {
@@ -908,8 +908,9 @@ Toolbox.prototype.deselectItem_ = function(item) {
   this.selectedItem_ = null;
   this.previouslySelectedItem_ = item;
   item.setSelected(false);
-  aria.setState(/** @type {!Element} */ (this.contentsDiv_),
-      aria.State.ACTIVEDESCENDANT, '');
+  aria.setState(
+      /** @type {!Element} */ (this.contentsDiv_), aria.State.ACTIVEDESCENDANT,
+      '');
 };
 
 /**
@@ -924,8 +925,9 @@ Toolbox.prototype.selectItem_ = function(oldItem, newItem) {
   this.selectedItem_ = newItem;
   this.previouslySelectedItem_ = oldItem;
   newItem.setSelected(true);
-  aria.setState(/** @type {!Element} */ (this.contentsDiv_),
-      aria.State.ACTIVEDESCENDANT, newItem.getId());
+  aria.setState(
+      /** @type {!Element} */ (this.contentsDiv_), aria.State.ACTIVEDESCENDANT,
+      newItem.getId());
 };
 
 /**
@@ -944,7 +946,8 @@ Toolbox.prototype.selectItemByPosition = function(position) {
 
 /**
  * Decides whether to hide or show the flyout depending on the selected item.
- * @param {?ISelectableToolboxItem} oldItem The previously selected toolbox item.
+ * @param {?ISelectableToolboxItem} oldItem The previously selected toolbox
+ *     item.
  * @param {?ISelectableToolboxItem} newItem The newly selected toolbox item.
  * @protected
  */
@@ -989,10 +992,12 @@ Toolbox.prototype.selectParent_ = function() {
   }
 
   if (this.selectedItem_.isCollapsible() && this.selectedItem_.isExpanded()) {
-    const collapsibleItem = /** @type {!ICollapsibleToolboxItem} */ (this.selectedItem_);
+    const collapsibleItem =
+        /** @type {!ICollapsibleToolboxItem} */ (this.selectedItem_);
     collapsibleItem.setExpanded(false);
     return true;
-  } else if (this.selectedItem_.getParent() &&
+  } else if (
+      this.selectedItem_.getParent() &&
       this.selectedItem_.getParent().isSelectable()) {
     this.setSelectedItem(this.selectedItem_.getParent());
     return true;
@@ -1096,40 +1101,26 @@ Toolbox.prototype.dispose = function() {
  */
 Css.register([
   /* eslint-disable indent */
-  '.blocklyToolboxDelete {',
-    'cursor: url("<<<PATH>>>/handdelete.cur"), auto;',
+  '.blocklyToolboxDelete {', 'cursor: url("<<<PATH>>>/handdelete.cur"), auto;',
   '}',
 
-  '.blocklyToolboxGrab {',
-    'cursor: url("<<<PATH>>>/handclosed.cur"), auto;',
-    'cursor: grabbing;',
-    'cursor: -webkit-grabbing;',
-  '}',
+  '.blocklyToolboxGrab {', 'cursor: url("<<<PATH>>>/handclosed.cur"), auto;',
+  'cursor: grabbing;', 'cursor: -webkit-grabbing;', '}',
 
   /* Category tree in Toolbox. */
-  '.blocklyToolboxDiv {',
-    'background-color: #ddd;',
-    'overflow-x: visible;',
-    'overflow-y: auto;',
-    'padding: 4px 0 4px 0;',
-    'position: absolute;',
-    'z-index: 70;', /* so blocks go under toolbox when dragging */
-    '-webkit-tap-highlight-color: transparent;', /* issue #1345 */
+  '.blocklyToolboxDiv {', 'background-color: #ddd;', 'overflow-x: visible;',
+  'overflow-y: auto;', 'padding: 4px 0 4px 0;', 'position: absolute;',
+  'z-index: 70;', /* so blocks go under toolbox when dragging */
+  '-webkit-tap-highlight-color: transparent;', /* issue #1345 */
   '}',
 
-  '.blocklyToolboxContents {',
-    'display: flex;',
-    'flex-wrap: wrap;',
-    'flex-direction: column;',
-  '}',
+  '.blocklyToolboxContents {', 'display: flex;', 'flex-wrap: wrap;',
+  'flex-direction: column;', '}',
 
-  '.blocklyToolboxContents:focus {',
-    'outline: none;',
-  '}',
+  '.blocklyToolboxContents:focus {', 'outline: none;', '}',
   /* eslint-enable indent */
 ]);
 
-registry.register(registry.Type.TOOLBOX,
-    registry.DEFAULT, Toolbox);
+registry.register(registry.Type.TOOLBOX, registry.DEFAULT, Toolbox);
 
 exports = Toolbox;

From 6ad723afbc23aa0cedeaa41911b311c72d21276f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 18:29:34 -0700
Subject: [PATCH 589/833] Add eslint disable

---
 core/toolbox/toolbox.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index 1edb72fc2..abab56d26 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -14,6 +14,7 @@ goog.module('Blockly.Toolbox');
 goog.module.declareLegacyNamespace();
 
 const Blockly = goog.require('Blockly');
+/* eslint-disable-next-line no-unused-vars */
 const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
 const BlockSvg = goog.require('Blockly.BlockSvg');
 const CollapsibleToolboxCategory = goog.require('Blockly.CollapsibleToolboxCategory');
@@ -22,18 +23,25 @@ const Css = goog.require('Blockly.Css');
 const DeleteArea = goog.require('Blockly.DeleteArea');
 const Events = goog.require('Blockly.Events');
 const IAutoHideable = goog.require('Blockly.IAutoHideable');
+/* eslint-disable-next-line no-unused-vars */
 const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');
+/* eslint-disable-next-line no-unused-vars */
 const IDraggable = goog.requireType('Blockly.IDraggable');
+/* eslint-disable-next-line no-unused-vars */
 const IFlyout = goog.requireType('Blockly.IFlyout');
 const IKeyboardAccessible = goog.require('Blockly.IKeyboardAccessible');
+/* eslint-disable-next-line no-unused-vars */
 const ISelectableToolboxItem = goog.requireType('Blockly.ISelectableToolboxItem');
 const IStyleable = goog.require('Blockly.IStyleable');
 const IToolbox = goog.require('Blockly.IToolbox');
+/* eslint-disable-next-line no-unused-vars */
 const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 const Options = goog.require('Blockly.Options');
 const Rect = goog.require('Blockly.utils.Rect');
+/* eslint-disable-next-line no-unused-vars */
 const ShortcutRegistry = goog.requireType('Blockly.ShortcutRegistry');
 const Touch = goog.require('Blockly.Touch');
+/* 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');

From 6bae1ce9f982c965181bcaa3accb9e55542dc825 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Tue, 10 Aug 2021 08:09:46 -0700
Subject: [PATCH 590/833] Migrate core/workspace_svg.js to goog.module syntax
 (#5334)

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

* Migrate core/workspace_svg.js to goog.module

* Migrate core/workspace_svg.js to named requires

* clang-format core/workspace_svg.js
---
 core/workspace_svg.js | 1219 +++++++++++++++++++++--------------------
 tests/deps.js         |    2 +-
 2 files changed, 631 insertions(+), 590 deletions(-)

diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 6def3fc5c..5010aff79 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -10,100 +10,128 @@
  */
 'use strict';
 
-goog.provide('Blockly.WorkspaceSvg');
+goog.module('Blockly.WorkspaceSvg');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering');
-goog.require('Blockly.BlockSvg');
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.common');
-goog.require('Blockly.ComponentManager');
-goog.require('Blockly.ConnectionDB');
-goog.require('Blockly.ContextMenu');
-goog.require('Blockly.ContextMenuRegistry');
-goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+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 BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
+const Classic = goog.require('Blockly.Themes.Classic');
+const ComponentManager = goog.require('Blockly.ComponentManager');
+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 Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const FlyoutButton = goog.requireType('Blockly.FlyoutButton');
+const Gesture = goog.require('Blockly.Gesture');
+const Grid = goog.require('Blockly.Grid');
+/* eslint-disable-next-line no-unused-vars */
+const IASTNodeLocationSvg = goog.require('Blockly.IASTNodeLocationSvg');
+/* eslint-disable-next-line no-unused-vars */
+const IBoundedElement = goog.requireType('Blockly.IBoundedElement');
+/* eslint-disable-next-line no-unused-vars */
+const IDragTarget = goog.requireType('Blockly.IDragTarget');
+/* eslint-disable-next-line no-unused-vars */
+const IFlyout = goog.requireType('Blockly.IFlyout');
+/* eslint-disable-next-line no-unused-vars */
+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');
+const Options = goog.require('Blockly.Options');
+/* eslint-disable-next-line no-unused-vars */
+const Procedures = goog.requireType('Blockly.Procedures');
+const Rect = goog.require('Blockly.utils.Rect');
+/* eslint-disable-next-line no-unused-vars */
+const Renderer = goog.requireType('Blockly.blockRendering.Renderer');
+/* eslint-disable-next-line no-unused-vars */
+const ScrollbarPair = goog.requireType('Blockly.ScrollbarPair');
+const Size = goog.require('Blockly.utils.Size');
+const Svg = goog.require('Blockly.utils.Svg');
+/* eslint-disable-next-line no-unused-vars */
+const Theme = goog.requireType('Blockly.Theme');
+const ThemeManager = goog.require('Blockly.ThemeManager');
+const TouchGesture = goog.require('Blockly.TouchGesture');
+/* eslint-disable-next-line no-unused-vars */
+const Trashcan = goog.requireType('Blockly.Trashcan');
+/* eslint-disable-next-line no-unused-vars */
+const VariableModel = goog.requireType('Blockly.VariableModel');
+/* eslint-disable-next-line no-unused-vars */
+const Variables = goog.requireType('Blockly.Variables');
+/* eslint-disable-next-line no-unused-vars */
+const VariablesDynamic = goog.requireType('Blockly.VariablesDynamic');
+const Workspace = goog.require('Blockly.Workspace');
+const WorkspaceAudio = goog.require('Blockly.WorkspaceAudio');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceCommentSvg = goog.requireType('Blockly.WorkspaceCommentSvg');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceDragSurfaceSvg = goog.requireType('Blockly.WorkspaceDragSurfaceSvg');
+const Xml = goog.require('Blockly.Xml');
+/* eslint-disable-next-line no-unused-vars */
+const ZoomControls = goog.requireType('Blockly.ZoomControls');
+const blockRendering = goog.require('Blockly.blockRendering');
+const browserEvents = goog.require('Blockly.browserEvents');
+const common = goog.require('Blockly.common');
+const dom = goog.require('Blockly.utils.dom');
+const internalConstants = goog.require('Blockly.internalConstants');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
+const toolbox = goog.require('Blockly.utils.toolbox');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.ThemeChange');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.ViewportChange');
-goog.require('Blockly.Gesture');
-goog.require('Blockly.Grid');
-goog.require('Blockly.IASTNodeLocationSvg');
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.MarkerManager');
 /** @suppress {extraRequire} */
 goog.require('Blockly.MetricsManager');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Msg');
-goog.require('Blockly.Options');
-goog.require('Blockly.registry');
-goog.require('Blockly.ThemeManager');
-goog.require('Blockly.Themes.Classic');
-goog.require('Blockly.TouchGesture');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Metrics');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Rect');
-goog.require('Blockly.utils.Size');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.toolbox');
-goog.require('Blockly.Workspace');
-goog.require('Blockly.WorkspaceAudio');
-goog.require('Blockly.WorkspaceDragSurfaceSvg');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.BlockDragSurfaceSvg');
-goog.requireType('Blockly.BlocklyOptions');
-goog.requireType('Blockly.blockRendering.Renderer');
-goog.requireType('Blockly.Cursor');
-goog.requireType('Blockly.FlyoutButton');
-goog.requireType('Blockly.IBoundedElement');
-goog.requireType('Blockly.IDragTarget');
-goog.requireType('Blockly.IFlyout');
-goog.requireType('Blockly.IMetricsManager');
-goog.requireType('Blockly.IToolbox');
-goog.requireType('Blockly.Marker');
-goog.requireType('Blockly.ScrollbarPair');
-goog.requireType('Blockly.Theme');
-goog.requireType('Blockly.Trashcan');
-goog.requireType('Blockly.VariableModel');
-goog.requireType('Blockly.WorkspaceComment');
-goog.requireType('Blockly.WorkspaceCommentSvg');
-goog.requireType('Blockly.ZoomControls');
 
 
 /**
  * Class for a workspace.  This is an onscreen area with optional trashcan,
  * scrollbars, bubbles, and dragging.
- * @param {!Blockly.Options} options Dictionary of options.
- * @param {Blockly.BlockDragSurfaceSvg=} opt_blockDragSurface Drag surface for
+ * @param {!Options} options Dictionary of options.
+ * @param {BlockDragSurfaceSvg=} opt_blockDragSurface Drag surface for
  *     blocks.
- * @param {Blockly.WorkspaceDragSurfaceSvg=} opt_wsDragSurface Drag surface for
+ * @param {WorkspaceDragSurfaceSvg=} opt_wsDragSurface Drag surface for
  *     the workspace.
- * @extends {Blockly.Workspace}
- * @implements {Blockly.IASTNodeLocationSvg}
+ * @extends {Workspace}
+ * @implements {IASTNodeLocationSvg}
  * @constructor
  */
-Blockly.WorkspaceSvg = function(
+const WorkspaceSvg = function(
     options, opt_blockDragSurface, opt_wsDragSurface) {
-  Blockly.WorkspaceSvg.superClass_.constructor.call(this, options);
+  WorkspaceSvg.superClass_.constructor.call(this, options);
 
-  var MetricsManagerClass = Blockly.registry.getClassFromOptions(
-      Blockly.registry.Type.METRICS_MANAGER, options, true);
+  const MetricsManagerClass = registry.getClassFromOptions(
+      registry.Type.METRICS_MANAGER, options, true);
   /**
    * Object in charge of calculating metrics for the workspace.
-   * @type {!Blockly.IMetricsManager}
+   * @type {!IMetricsManager}
    * @private
    */
   this.metricsManager_ = new MetricsManagerClass(this);
 
   /**
    * Method to get all the metrics that have to do with a workspace.
-   * @type {function():!Blockly.utils.Metrics}
+   * @type {function():!Metrics}
    * @package
    */
   this.getMetrics = options.getMetrics ||
@@ -115,15 +143,15 @@ Blockly.WorkspaceSvg = function(
    * @package
    */
   this.setMetrics =
-      options.setMetrics || Blockly.WorkspaceSvg.setTopLevelWorkspaceMetrics_;
+      options.setMetrics || WorkspaceSvg.setTopLevelWorkspaceMetrics_;
 
   /**
-   * @type {!Blockly.ComponentManager}
+   * @type {!ComponentManager}
    * @private
    */
-  this.componentManager_ = new Blockly.ComponentManager();
+  this.componentManager_ = new ComponentManager();
 
-  this.connectionDBList = Blockly.ConnectionDB.init(this.connectionChecker);
+  this.connectionDBList = ConnectionDB.init(this.connectionChecker);
 
   if (opt_blockDragSurface) {
     this.blockDragSurface_ = opt_blockDragSurface;
@@ -134,90 +162,94 @@ Blockly.WorkspaceSvg = function(
   }
 
   this.useWorkspaceDragSurface_ =
-      !!this.workspaceDragSurface_ && Blockly.utils.is3dSupported();
+      !!this.workspaceDragSurface_ && utils.is3dSupported();
 
   /**
    * List of currently highlighted blocks.  Block highlighting is often used to
    * visually mark blocks currently being executed.
-   * @type {!Array<!Blockly.BlockSvg>}
+   * @type {!Array<!BlockSvg>}
    * @private
    */
   this.highlightedBlocks_ = [];
 
   /**
    * Object in charge of loading, storing, and playing audio for a workspace.
-   * @type {!Blockly.WorkspaceAudio}
+   * @type {!WorkspaceAudio}
    * @private
    */
-  this.audioManager_ = new Blockly.WorkspaceAudio(
-      /** @type {Blockly.WorkspaceSvg} */ (options.parentWorkspace));
+  this.audioManager_ = new WorkspaceAudio(
+      /** @type {WorkspaceSvg} */ (options.parentWorkspace));
 
   /**
    * This workspace's grid object or null.
-   * @type {Blockly.Grid}
+   * @type {Grid}
    * @private
    */
   this.grid_ = this.options.gridPattern ?
-      new Blockly.Grid(this.options.gridPattern, options.gridOptions) : null;
+      new Grid(this.options.gridPattern, options.gridOptions) :
+      null;
 
   /**
    * Manager in charge of markers and cursors.
-   * @type {!Blockly.MarkerManager}
+   * @type {!MarkerManager}
    * @private
    */
-  this.markerManager_ = new Blockly.MarkerManager(this);
+  this.markerManager_ = new MarkerManager(this);
 
   /**
-  * Map from function names to callbacks, for deciding what to do when a custom
-  * toolbox category is opened.
-  * @type {!Object<string, ?function(!Blockly.Workspace):!Array<!Element>>}
-  * @private
-  */
+   * Map from function names to callbacks, for deciding what to do when a custom
+   * toolbox category is opened.
+   * @type {!Object<string, ?function(!Workspace):!Array<!Element>>}
+   * @private
+   */
   this.toolboxCategoryCallbacks_ = Object.create(null);
 
   /**
-  * Map from function names to callbacks, for deciding what to do when a button
-  * is clicked.
-  * @type {!Object<string, ?function(!Blockly.FlyoutButton)>}
-  * @private
-  */
+   * Map from function names to callbacks, for deciding what to do when a button
+   * is clicked.
+   * @type {!Object<string, ?function(!FlyoutButton)>}
+   * @private
+   */
   this.flyoutButtonCallbacks_ = Object.create(null);
 
-  if (Blockly.Variables && Blockly.Variables.flyoutCategory) {
+  const Variables = goog.module.get('Blockly.Variables');
+  if (Variables && Variables.flyoutCategory) {
     this.registerToolboxCategoryCallback(
-        Blockly.internalConstants.VARIABLE_CATEGORY_NAME,
-        Blockly.Variables.flyoutCategory);
+        internalConstants.VARIABLE_CATEGORY_NAME, Variables.flyoutCategory);
   }
-  if (Blockly.VariablesDynamic && Blockly.VariablesDynamic.flyoutCategory) {
+
+  const VariablesDynamic = goog.module.get('Blockly.VariablesDynamic');
+  if (VariablesDynamic && VariablesDynamic.flyoutCategory) {
     this.registerToolboxCategoryCallback(
-        Blockly.internalConstants.VARIABLE_DYNAMIC_CATEGORY_NAME,
-        Blockly.VariablesDynamic.flyoutCategory);
+        internalConstants.VARIABLE_DYNAMIC_CATEGORY_NAME,
+        VariablesDynamic.flyoutCategory);
   }
-  if (Blockly.Procedures && Blockly.Procedures.flyoutCategory) {
+
+  const Procedures = goog.module.get('Blockly.Procedures');
+  if (Procedures && Procedures.flyoutCategory) {
     this.registerToolboxCategoryCallback(
-        Blockly.internalConstants.PROCEDURE_CATEGORY_NAME,
-        Blockly.Procedures.flyoutCategory);
-    this.addChangeListener(Blockly.Procedures.mutatorOpenListener);
+        internalConstants.PROCEDURE_CATEGORY_NAME, Procedures.flyoutCategory);
+    this.addChangeListener(Procedures.mutatorOpenListener);
   }
 
   /**
    * Object in charge of storing and updating the workspace theme.
-   * @type {!Blockly.ThemeManager}
+   * @type {!ThemeManager}
    * @protected
    */
   this.themeManager_ = this.options.parentWorkspace ?
       this.options.parentWorkspace.getThemeManager() :
-      new Blockly.ThemeManager(this,
-          this.options.theme || Blockly.Themes.Classic);
+      new ThemeManager(this, this.options.theme || Classic);
   this.themeManager_.subscribeWorkspace(this);
 
   /**
    * The block renderer used for rendering blocks on this workspace.
-   * @type {!Blockly.blockRendering.Renderer}
+   * @type {!Renderer}
    * @private
    */
-  this.renderer_ = Blockly.blockRendering.init(this.options.renderer || 'geras',
-      this.getTheme(), this.options.rendererOverrides);
+  this.renderer_ = blockRendering.init(
+      this.options.renderer || 'geras', this.getTheme(),
+      this.options.rendererOverrides);
 
   /**
    * Cached parent SVG.
@@ -234,7 +266,7 @@ Blockly.WorkspaceSvg = function(
 
   /**
    * The list of top-level bounded elements on the workspace.
-   * @type {!Array<!Blockly.IBoundedElement>}
+   * @type {!Array<!IBoundedElement>}
    * @private
    */
   this.topBoundedElements_ = [];
@@ -243,8 +275,8 @@ Blockly.WorkspaceSvg = function(
    * The recorded drag targets.
    * @type {!Array<
    * {
-   *   component: !Blockly.IDragTarget,
-   *   clientRect: !Blockly.utils.Rect
+   *   component: !IDragTarget,
+   *   clientRect: !Rect
    * }>}
    * @private
    */
@@ -253,28 +285,28 @@ Blockly.WorkspaceSvg = function(
   /**
    * The cached size of the parent svg element.
    * Used to compute svg metrics.
-   * @type {!Blockly.utils.Size}
+   * @type {!Size}
    * @private
    */
-  this.cachedParentSvgSize_ = new Blockly.utils.Size(0, 0);
+  this.cachedParentSvgSize_ = new Size(0, 0);
 };
-Blockly.utils.object.inherits(Blockly.WorkspaceSvg, Blockly.Workspace);
+object.inherits(WorkspaceSvg, Workspace);
 
 /**
  * A wrapper function called when a resize event occurs.
  * You can pass the result to `eventHandling.unbind`.
- * @type {?Blockly.browserEvents.Data}
+ * @type {?browserEvents.Data}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.resizeHandlerWrapper_ = null;
+WorkspaceSvg.prototype.resizeHandlerWrapper_ = null;
 
 /**
  * The render status of an SVG workspace.
  * Returns `false` for headless workspaces and true for instances of
- * `Blockly.WorkspaceSvg`.
+ * `WorkspaceSvg`.
  * @type {boolean}
  */
-Blockly.WorkspaceSvg.prototype.rendered = true;
+WorkspaceSvg.prototype.rendered = true;
 
 /**
  * Whether the workspace is visible.  False if the workspace has been hidden
@@ -282,20 +314,20 @@ Blockly.WorkspaceSvg.prototype.rendered = true;
  * @type {boolean}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.isVisible_ = true;
+WorkspaceSvg.prototype.isVisible_ = true;
 
 /**
  * Is this workspace the surface for a flyout?
  * @type {boolean}
  */
-Blockly.WorkspaceSvg.prototype.isFlyout = false;
+WorkspaceSvg.prototype.isFlyout = false;
 
 /**
  * Is this workspace the surface for a mutator?
  * @type {boolean}
  * @package
  */
-Blockly.WorkspaceSvg.prototype.isMutator = false;
+WorkspaceSvg.prototype.isMutator = false;
 
 /**
  * Whether this workspace has resizes enabled.
@@ -303,7 +335,7 @@ Blockly.WorkspaceSvg.prototype.isMutator = false;
  * @type {boolean}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.resizesEnabled_ = true;
+WorkspaceSvg.prototype.resizesEnabled_ = true;
 
 /**
  * Current horizontal scrolling offset in pixel units, relative to the
@@ -337,7 +369,7 @@ Blockly.WorkspaceSvg.prototype.resizesEnabled_ = true;
  *
  * @type {number}
  */
-Blockly.WorkspaceSvg.prototype.scrollX = 0;
+WorkspaceSvg.prototype.scrollX = 0;
 
 /**
  * Current vertical scrolling offset in pixel units, relative to the
@@ -371,109 +403,109 @@ Blockly.WorkspaceSvg.prototype.scrollX = 0;
  *
  * @type {number}
  */
-Blockly.WorkspaceSvg.prototype.scrollY = 0;
+WorkspaceSvg.prototype.scrollY = 0;
 
 /**
  * Horizontal scroll value when scrolling started in pixel units.
  * @type {number}
  */
-Blockly.WorkspaceSvg.prototype.startScrollX = 0;
+WorkspaceSvg.prototype.startScrollX = 0;
 
 /**
  * Vertical scroll value when scrolling started in pixel units.
  * @type {number}
  */
-Blockly.WorkspaceSvg.prototype.startScrollY = 0;
+WorkspaceSvg.prototype.startScrollY = 0;
 
 /**
  * Distance from mouse to object being dragged.
- * @type {Blockly.utils.Coordinate}
+ * @type {Coordinate}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.dragDeltaXY_ = null;
+WorkspaceSvg.prototype.dragDeltaXY_ = null;
 
 /**
  * Current scale.
  * @type {number}
  */
-Blockly.WorkspaceSvg.prototype.scale = 1;
+WorkspaceSvg.prototype.scale = 1;
 
 /**
  * Cached scale value. Used to detect changes in viewport.
  * @type {number}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.oldScale_ = 1;
+WorkspaceSvg.prototype.oldScale_ = 1;
 
 /**
  * Cached viewport top value. Used to detect changes in viewport.
  * @type {number}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.oldTop_ = 0;
+WorkspaceSvg.prototype.oldTop_ = 0;
 
 /**
  * Cached viewport left value. Used to detect changes in viewport.
  * @type {number}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.oldLeft_ = 0;
+WorkspaceSvg.prototype.oldLeft_ = 0;
 
 /**
  * The workspace's trashcan (if any).
- * @type {Blockly.Trashcan}
+ * @type {Trashcan}
  */
-Blockly.WorkspaceSvg.prototype.trashcan = null;
+WorkspaceSvg.prototype.trashcan = null;
 
 /**
  * This workspace's scrollbars, if they exist.
- * @type {Blockly.ScrollbarPair}
+ * @type {ScrollbarPair}
  */
-Blockly.WorkspaceSvg.prototype.scrollbar = null;
+WorkspaceSvg.prototype.scrollbar = null;
 
 /**
  * Fixed flyout providing blocks which may be dragged into this workspace.
- * @type {Blockly.IFlyout}
+ * @type {IFlyout}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.flyout_ = null;
+WorkspaceSvg.prototype.flyout_ = null;
 
 /**
  * Category-based toolbox providing blocks which may be dragged into this
  * workspace.
- * @type {Blockly.IToolbox}
+ * @type {IToolbox}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.toolbox_ = null;
+WorkspaceSvg.prototype.toolbox_ = null;
 
 /**
  * The current gesture in progress on this workspace, if any.
- * @type {Blockly.TouchGesture}
+ * @type {TouchGesture}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.currentGesture_ = null;
+WorkspaceSvg.prototype.currentGesture_ = null;
 
 /**
  * This workspace's surface for dragging blocks, if it exists.
- * @type {Blockly.BlockDragSurfaceSvg}
+ * @type {BlockDragSurfaceSvg}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.blockDragSurface_ = null;
+WorkspaceSvg.prototype.blockDragSurface_ = null;
 
 /**
  * This workspace's drag surface, if it exists.
- * @type {Blockly.WorkspaceDragSurfaceSvg}
+ * @type {WorkspaceDragSurfaceSvg}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.workspaceDragSurface_ = null;
+WorkspaceSvg.prototype.workspaceDragSurface_ = null;
 
 /**
-  * Whether to move workspace to the drag surface when it is dragged.
-  * True if it should move, false if it should be translated directly.
-  * @type {boolean}
-  * @private
-  */
-Blockly.WorkspaceSvg.prototype.useWorkspaceDragSurface_ = false;
+ * Whether to move workspace to the drag surface when it is dragged.
+ * True if it should move, false if it should be translated directly.
+ * @type {boolean}
+ * @private
+ */
+WorkspaceSvg.prototype.useWorkspaceDragSurface_ = false;
 
 /**
  * Whether the drag surface is actively in use. When true, calls to
@@ -483,7 +515,7 @@ Blockly.WorkspaceSvg.prototype.useWorkspaceDragSurface_ = false;
  * @type {boolean}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.isDragSurfaceActive_ = false;
+WorkspaceSvg.prototype.isDragSurfaceActive_ = false;
 
 /**
  * The first parent div with 'injectionDiv' in the name, or null if not set.
@@ -491,16 +523,16 @@ Blockly.WorkspaceSvg.prototype.isDragSurfaceActive_ = false;
  * @type {Element}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.injectionDiv_ = null;
+WorkspaceSvg.prototype.injectionDiv_ = null;
 
 /**
  * Last known position of the page scroll.
  * This is used to determine whether we have recalculated screen coordinate
  * stuff since the page scrolled.
- * @type {Blockly.utils.Coordinate}
+ * @type {Coordinate}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.lastRecordedPageScroll_ = null;
+WorkspaceSvg.prototype.lastRecordedPageScroll_ = null;
 
 /**
  * Developers may define this function to add custom menu options to the
@@ -508,63 +540,63 @@ Blockly.WorkspaceSvg.prototype.lastRecordedPageScroll_ = null;
  * @param {!Array<!Object>} options List of menu options to add to.
  * @param {!Event} e The right-click event that triggered the context menu.
  */
-Blockly.WorkspaceSvg.prototype.configureContextMenu;
+WorkspaceSvg.prototype.configureContextMenu;
 
 /**
  * In a flyout, the target workspace where blocks should be placed after a drag.
  * Otherwise null.
- * @type {Blockly.WorkspaceSvg}
+ * @type {WorkspaceSvg}
  * @package
  */
-Blockly.WorkspaceSvg.prototype.targetWorkspace = null;
+WorkspaceSvg.prototype.targetWorkspace = null;
 
 /**
  * Inverted screen CTM, for use in mouseToSvg.
  * @type {?SVGMatrix}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.inverseScreenCTM_ = null;
+WorkspaceSvg.prototype.inverseScreenCTM_ = null;
 
 /**
  * Inverted screen CTM is dirty, recalculate it.
  * @type {boolean}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.inverseScreenCTMDirty_ = true;
+WorkspaceSvg.prototype.inverseScreenCTMDirty_ = true;
 
 /**
  * Get the marker manager for this workspace.
- * @return {!Blockly.MarkerManager} The marker manager.
+ * @return {!MarkerManager} The marker manager.
  */
-Blockly.WorkspaceSvg.prototype.getMarkerManager = function() {
+WorkspaceSvg.prototype.getMarkerManager = function() {
   return this.markerManager_;
 };
 
 /**
  * Gets the metrics manager for this workspace.
- * @return {!Blockly.IMetricsManager} The metrics manager.
+ * @return {!IMetricsManager} The metrics manager.
  * @public
  */
-Blockly.WorkspaceSvg.prototype.getMetricsManager = function() {
+WorkspaceSvg.prototype.getMetricsManager = function() {
   return this.metricsManager_;
 };
 
 /**
  * Sets the metrics manager for the workspace.
- * @param {!Blockly.IMetricsManager} metricsManager The metrics manager.
+ * @param {!IMetricsManager} metricsManager The metrics manager.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.setMetricsManager = function(metricsManager) {
+WorkspaceSvg.prototype.setMetricsManager = function(metricsManager) {
   this.metricsManager_ = metricsManager;
   this.getMetrics = this.metricsManager_.getMetrics.bind(this.metricsManager_);
 };
 
 /**
  * Gets the component manager for this workspace.
- * @return {!Blockly.ComponentManager} The component manager.
+ * @return {!ComponentManager} The component manager.
  * @public
  */
-Blockly.WorkspaceSvg.prototype.getComponentManager = function() {
+WorkspaceSvg.prototype.getComponentManager = function() {
   return this.componentManager_;
 };
 
@@ -574,7 +606,7 @@ Blockly.WorkspaceSvg.prototype.getComponentManager = function() {
  *     workspace SVG group.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.setCursorSvg = function(cursorSvg) {
+WorkspaceSvg.prototype.setCursorSvg = function(cursorSvg) {
   this.markerManager_.setCursorSvg(cursorSvg);
 };
 
@@ -584,18 +616,18 @@ Blockly.WorkspaceSvg.prototype.setCursorSvg = function(cursorSvg) {
  *     workspace SVG group.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.setMarkerSvg = function(markerSvg) {
+WorkspaceSvg.prototype.setMarkerSvg = function(markerSvg) {
   this.markerManager_.setMarkerSvg(markerSvg);
 };
 
 /**
  * Get the marker with the given ID.
  * @param {string} id The ID of the marker.
- * @return {?Blockly.Marker} The marker with the given ID or null if no marker
+ * @return {?Marker} The marker with the given ID or null if no marker
  *     with the given ID exists.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getMarker = function(id) {
+WorkspaceSvg.prototype.getMarker = function(id) {
   if (this.markerManager_) {
     return this.markerManager_.getMarker(id);
   }
@@ -604,9 +636,9 @@ Blockly.WorkspaceSvg.prototype.getMarker = function(id) {
 
 /**
  * The cursor for this workspace.
- * @return {?Blockly.Cursor} The cursor for the workspace.
+ * @return {?Cursor} The cursor for the workspace.
  */
-Blockly.WorkspaceSvg.prototype.getCursor = function() {
+WorkspaceSvg.prototype.getCursor = function() {
   if (this.markerManager_) {
     return this.markerManager_.getCursor();
   }
@@ -615,38 +647,38 @@ Blockly.WorkspaceSvg.prototype.getCursor = function() {
 
 /**
  * Get the block renderer attached to this workspace.
- * @return {!Blockly.blockRendering.Renderer} The renderer attached to this
+ * @return {!Renderer} The renderer attached to this
  *     workspace.
  */
-Blockly.WorkspaceSvg.prototype.getRenderer = function() {
+WorkspaceSvg.prototype.getRenderer = function() {
   return this.renderer_;
 };
 
 /**
  * Get the theme manager for this workspace.
- * @return {!Blockly.ThemeManager} The theme manager for this workspace.
+ * @return {!ThemeManager} The theme manager for this workspace.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getThemeManager = function() {
+WorkspaceSvg.prototype.getThemeManager = function() {
   return this.themeManager_;
 };
 
 /**
  * Get the workspace theme object.
- * @return {!Blockly.Theme} The workspace theme object.
+ * @return {!Theme} The workspace theme object.
  */
-Blockly.WorkspaceSvg.prototype.getTheme = function() {
+WorkspaceSvg.prototype.getTheme = function() {
   return this.themeManager_.getTheme();
 };
 
 /**
  * Set the workspace theme object.
- * If no theme is passed, default to the `Blockly.Themes.Classic` theme.
- * @param {Blockly.Theme} theme The workspace theme object.
+ * If no theme is passed, default to the `Classic` theme.
+ * @param {Theme} theme The workspace theme object.
  */
-Blockly.WorkspaceSvg.prototype.setTheme = function(theme) {
+WorkspaceSvg.prototype.setTheme = function(theme) {
   if (!theme) {
-    theme = /** @type {!Blockly.Theme} */ (Blockly.Themes.Classic);
+    theme = /** @type {!Theme} */ (Classic);
   }
   this.themeManager_.setTheme(theme);
 };
@@ -655,17 +687,15 @@ Blockly.WorkspaceSvg.prototype.setTheme = function(theme) {
  * Refresh all blocks on the workspace after a theme update.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.refreshTheme = function() {
+WorkspaceSvg.prototype.refreshTheme = function() {
   if (this.svgGroup_) {
     this.renderer_.refreshDom(this.svgGroup_, this.getTheme());
   }
 
   // Update all blocks in workspace that have a style name.
-  this.updateBlockStyles_(this.getAllBlocks(false).filter(
-      function(block) {
-        return !!block.getStyleName();
-      }
-  ));
+  this.updateBlockStyles_(this.getAllBlocks(false).filter(function(block) {
+    return !!block.getStyleName();
+  }));
 
   // Update current toolbox selection.
   this.refreshToolboxSelection();
@@ -678,20 +708,20 @@ Blockly.WorkspaceSvg.prototype.refreshTheme = function() {
     this.setVisible(true);
   }
 
-  var event = new (Blockly.Events.get(Blockly.Events.THEME_CHANGE))(
-      this.getTheme().name, this.id);
-  Blockly.Events.fire(event);
+  const event =
+      new (Events.get(Events.THEME_CHANGE))(this.getTheme().name, this.id);
+  Events.fire(event);
 };
 
 /**
  * Updates all the blocks with new style.
- * @param {!Array<!Blockly.Block>} blocks List of blocks to update the style
+ * @param {!Array<!Block>} blocks List of blocks to update the style
  *     on.
  * @private
  */
-Blockly.WorkspaceSvg.prototype.updateBlockStyles_ = function(blocks) {
-  for (var i = 0, block; (block = blocks[i]); i++) {
-    var blockStyleName = block.getStyleName();
+WorkspaceSvg.prototype.updateBlockStyles_ = function(blocks) {
+  for (let i = 0, block; (block = blocks[i]); i++) {
+    const blockStyleName = block.getStyleName();
     if (blockStyleName) {
       block.setStyle(blockStyleName);
       if (block.mutator) {
@@ -705,11 +735,11 @@ Blockly.WorkspaceSvg.prototype.updateBlockStyles_ = function(blocks) {
  * Getter for the inverted screen CTM.
  * @return {?SVGMatrix} The matrix to use in mouseToSvg
  */
-Blockly.WorkspaceSvg.prototype.getInverseScreenCTM = function() {
+WorkspaceSvg.prototype.getInverseScreenCTM = function() {
   // Defer getting the screen CTM until we actually need it, this should
   // avoid forced reflows from any calls to updateInverseScreenCTM.
   if (this.inverseScreenCTMDirty_) {
-    var ctm = this.getParentSvg().getScreenCTM();
+    const ctm = this.getParentSvg().getScreenCTM();
     if (ctm) {
       this.inverseScreenCTM_ = ctm.inverse();
       this.inverseScreenCTMDirty_ = false;
@@ -722,7 +752,7 @@ Blockly.WorkspaceSvg.prototype.getInverseScreenCTM = function() {
 /**
  * Mark the inverse screen CTM as dirty.
  */
-Blockly.WorkspaceSvg.prototype.updateInverseScreenCTM = function() {
+WorkspaceSvg.prototype.updateInverseScreenCTM = function() {
   this.inverseScreenCTMDirty_ = true;
 };
 
@@ -731,7 +761,7 @@ Blockly.WorkspaceSvg.prototype.updateInverseScreenCTM = function() {
  * @return {boolean} Whether the workspace is visible.
  *     False if the workspace has been hidden by calling `setVisible(false)`.
  */
-Blockly.WorkspaceSvg.prototype.isVisible = function() {
+WorkspaceSvg.prototype.isVisible = function() {
   return this.isVisible_;
 };
 
@@ -740,23 +770,22 @@ Blockly.WorkspaceSvg.prototype.isVisible = function() {
  * scales that after canvas SVG element, if it's a descendant.
  * The origin (0,0) is the top-left corner of the Blockly SVG.
  * @param {!SVGElement} element SVG element to find the coordinates of.
- * @return {!Blockly.utils.Coordinate} Object with .x and .y properties.
+ * @return {!Coordinate} Object with .x and .y properties.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getSvgXY = function(element) {
-  var x = 0;
-  var y = 0;
-  var scale = 1;
-  if (Blockly.utils.dom.containsNode(this.getCanvas(), element) ||
-      Blockly.utils.dom.containsNode(this.getBubbleCanvas(), element)) {
+WorkspaceSvg.prototype.getSvgXY = function(element) {
+  let x = 0;
+  let y = 0;
+  let scale = 1;
+  if (dom.containsNode(this.getCanvas(), element) ||
+      dom.containsNode(this.getBubbleCanvas(), element)) {
     // Before the SVG canvas, scale the coordinates.
     scale = this.scale;
   }
   do {
     // Loop through this block and every parent.
-    var xy = Blockly.utils.getRelativeXY(element);
-    if (element == this.getCanvas() ||
-        element == this.getBubbleCanvas()) {
+    const xy = utils.getRelativeXY(element);
+    if (element == this.getCanvas() || element == this.getBubbleCanvas()) {
       // After the SVG canvas, don't scale the coordinates.
       scale = 1;
     }
@@ -764,18 +793,18 @@ Blockly.WorkspaceSvg.prototype.getSvgXY = function(element) {
     y += xy.y * scale;
     element = /** @type {!SVGElement} */ (element.parentNode);
   } while (element && element != this.getParentSvg());
-  return new Blockly.utils.Coordinate(x, y);
+  return new Coordinate(x, y);
 };
 
 /**
  * Gets the size of the workspace's parent SVG element.
- * @return {!Blockly.utils.Size} The cached width and height of the workspace's
+ * @return {!Size} The cached width and height of the workspace's
  *     parent SVG element.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getCachedParentSvgSize = function() {
-  var size = this.cachedParentSvgSize_;
-  return new Blockly.utils.Size(size.width, size.height);
+WorkspaceSvg.prototype.getCachedParentSvgSize = function() {
+  const size = this.cachedParentSvgSize_;
+  return new Size(size.width, size.height);
 };
 
 /**
@@ -783,11 +812,11 @@ Blockly.WorkspaceSvg.prototype.getCachedParentSvgSize = function() {
  * origin in pixels.
  * The workspace origin is where a block would render at position (0, 0).
  * It is not the upper left corner of the workspace SVG.
- * @return {!Blockly.utils.Coordinate} Offset in pixels.
+ * @return {!Coordinate} Offset in pixels.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getOriginOffsetInPixels = function() {
-  return Blockly.utils.getInjectionDivXY_(this.getCanvas());
+WorkspaceSvg.prototype.getOriginOffsetInPixels = function() {
+  return utils.getInjectionDivXY_(this.getCanvas());
 };
 
 /**
@@ -798,13 +827,13 @@ Blockly.WorkspaceSvg.prototype.getOriginOffsetInPixels = function() {
  * @return {!Element} The first parent div with 'injectionDiv' in the name.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getInjectionDiv = function() {
+WorkspaceSvg.prototype.getInjectionDiv = function() {
   // NB: it would be better to pass this in at createDom, but is more likely to
   // break existing uses of Blockly.
   if (!this.injectionDiv_) {
-    var element = this.svgGroup_;
+    let element = this.svgGroup_;
     while (element) {
-      var classes = element.getAttribute('class') || '';
+      const classes = element.getAttribute('class') || '';
       if ((' ' + classes + ' ').indexOf(' injectionDiv ') != -1) {
         this.injectionDiv_ = element;
         break;
@@ -820,16 +849,16 @@ Blockly.WorkspaceSvg.prototype.getInjectionDiv = function() {
  * @return {?SVGElement} The SVG group for the workspace.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getBlockCanvas = function() {
+WorkspaceSvg.prototype.getBlockCanvas = function() {
   return this.svgBlockCanvas_;
 };
 
 /**
  * Save resize handler data so we can delete it later in dispose.
- * @param {!Blockly.browserEvents.Data} handler Data that can be passed to
+ * @param {!browserEvents.Data} handler Data that can be passed to
  *     eventHandling.unbind.
  */
-Blockly.WorkspaceSvg.prototype.setResizeHandlerWrapper = function(handler) {
+WorkspaceSvg.prototype.setResizeHandlerWrapper = function(handler) {
   this.resizeHandlerWrapper_ = handler;
 };
 
@@ -839,7 +868,7 @@ Blockly.WorkspaceSvg.prototype.setResizeHandlerWrapper = function(handler) {
  *     'blocklyMutatorBackground'.
  * @return {!Element} The workspace's SVG group.
  */
-Blockly.WorkspaceSvg.prototype.createDom = function(opt_backgroundClass) {
+WorkspaceSvg.prototype.createDom = function(opt_backgroundClass) {
   /**
    * <g class="blocklyWorkspace">
    *   <rect class="blocklyMainBackground" height="100%" width="100%"></rect>
@@ -849,17 +878,16 @@ Blockly.WorkspaceSvg.prototype.createDom = function(opt_backgroundClass) {
    * </g>
    * @type {SVGElement}
    */
-  this.svgGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
-      {'class': 'blocklyWorkspace'}, null);
+  this.svgGroup_ =
+      dom.createSvgElement(Svg.G, {'class': 'blocklyWorkspace'}, null);
 
   // Note that a <g> alone does not receive mouse events--it must have a
   // valid target inside it.  If no background class is specified, as in the
   // flyout, the workspace will not receive mouse events.
   if (opt_backgroundClass) {
     /** @type {SVGElement} */
-    this.svgBackground_ = Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.RECT,
+    this.svgBackground_ = dom.createSvgElement(
+        Svg.RECT,
         {'height': '100%', 'width': '100%', 'class': opt_backgroundClass},
         this.svgGroup_);
 
@@ -867,43 +895,41 @@ Blockly.WorkspaceSvg.prototype.createDom = function(opt_backgroundClass) {
       this.svgBackground_.style.fill =
           'url(#' + this.grid_.getPatternId() + ')';
     } else {
-      this.themeManager_.subscribe(this.svgBackground_,
-          'workspaceBackgroundColour', 'fill');
+      this.themeManager_.subscribe(
+          this.svgBackground_, 'workspaceBackgroundColour', 'fill');
     }
   }
   /** @type {SVGElement} */
-  this.svgBlockCanvas_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
-      {'class': 'blocklyBlockCanvas'}, this.svgGroup_);
+  this.svgBlockCanvas_ = dom.createSvgElement(
+      Svg.G, {'class': 'blocklyBlockCanvas'}, this.svgGroup_);
   /** @type {SVGElement} */
-  this.svgBubbleCanvas_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
-      {'class': 'blocklyBubbleCanvas'}, this.svgGroup_);
+  this.svgBubbleCanvas_ = dom.createSvgElement(
+      Svg.G, {'class': 'blocklyBubbleCanvas'}, this.svgGroup_);
 
   if (!this.isFlyout) {
-    Blockly.browserEvents.conditionalBind(
+    browserEvents.conditionalBind(
         this.svgGroup_, 'mousedown', this, this.onMouseDown_, false, true);
     // This no-op works around https://bugs.webkit.org/show_bug.cgi?id=226683,
     // which otherwise prevents zoom/scroll events from being observed in
     // Safari. Once that bug is fixed it should be removed.
     document.body.addEventListener('wheel', function() {});
-    Blockly.browserEvents.conditionalBind(
+    browserEvents.conditionalBind(
         this.svgGroup_, 'wheel', this, this.onMouseWheel_);
   }
 
   // Determine if there needs to be a category tree, or a simple list of
   // blocks.  This cannot be changed later, since the UI is very different.
   if (this.options.hasCategories) {
-    var ToolboxClass = Blockly.registry.getClassFromOptions(
-        Blockly.registry.Type.TOOLBOX, this.options, true);
+    const ToolboxClass =
+        registry.getClassFromOptions(registry.Type.TOOLBOX, this.options, true);
     this.toolbox_ = new ToolboxClass(this);
   }
   if (this.grid_) {
     this.grid_.update(this.scale);
   }
   this.recordDragTargets();
-  var CursorClass = Blockly.registry.getClassFromOptions(
-      Blockly.registry.Type.CURSOR, this.options);
+  const CursorClass =
+      registry.getClassFromOptions(registry.Type.CURSOR, this.options);
 
   CursorClass && this.markerManager_.setCursor(new CursorClass());
 
@@ -916,14 +942,14 @@ Blockly.WorkspaceSvg.prototype.createDom = function(opt_backgroundClass) {
  * Unlink from all DOM elements to prevent memory leaks.
  * @suppress {checkTypes}
  */
-Blockly.WorkspaceSvg.prototype.dispose = function() {
+WorkspaceSvg.prototype.dispose = function() {
   // Stop rerendering.
   this.rendered = false;
   if (this.currentGesture_) {
     this.currentGesture_.cancel();
   }
   if (this.svgGroup_) {
-    Blockly.utils.dom.removeNode(this.svgGroup_);
+    dom.removeNode(this.svgGroup_);
     this.svgGroup_ = null;
   }
   this.svgBlockCanvas_ = null;
@@ -966,7 +992,7 @@ Blockly.WorkspaceSvg.prototype.dispose = function() {
     this.markerManager_ = null;
   }
 
-  Blockly.WorkspaceSvg.superClass_.dispose.call(this);
+  WorkspaceSvg.superClass_.dispose.call(this);
 
   // Dispose of theme manager after all blocks and mutators are disposed of.
   if (this.themeManager_) {
@@ -986,13 +1012,13 @@ Blockly.WorkspaceSvg.prototype.dispose = function() {
   if (!this.options.parentWorkspace) {
     // Top-most workspace.  Dispose of the div that the
     // SVG is injected into (i.e. injectionDiv).
-    var parentSvg = this.getParentSvg();
+    const parentSvg = this.getParentSvg();
     if (parentSvg && parentSvg.parentNode) {
-      Blockly.utils.dom.removeNode(parentSvg.parentNode);
+      dom.removeNode(parentSvg.parentNode);
     }
   }
   if (this.resizeHandlerWrapper_) {
-    Blockly.browserEvents.unbind(this.resizeHandlerWrapper_);
+    browserEvents.unbind(this.resizeHandlerWrapper_);
     this.resizeHandlerWrapper_ = null;
   }
 };
@@ -1001,30 +1027,31 @@ Blockly.WorkspaceSvg.prototype.dispose = function() {
  * Obtain a newly created block.
  *
  * This block's SVG must still be initialized
- * ([initSvg]{@link Blockly.BlockSvg#initSvg}) and it must be rendered
- * ([render]{@link Blockly.BlockSvg#render}) before the block will be visible.
+ * ([initSvg]{@link BlockSvg#initSvg}) and it must be rendered
+ * ([render]{@link BlockSvg#render}) before the block will be visible.
  * @param {!string} prototypeName Name of the language object containing
  *     type-specific functions for this block.
  * @param {string=} opt_id Optional ID.  Use this ID if provided, otherwise
  *     create a new ID.
- * @return {!Blockly.BlockSvg} The created block.
+ * @return {!BlockSvg} The created block.
  * @override
  */
-Blockly.WorkspaceSvg.prototype.newBlock = function(prototypeName, opt_id) {
-  return new Blockly.BlockSvg(this, prototypeName, opt_id);
+WorkspaceSvg.prototype.newBlock = function(prototypeName, opt_id) {
+  return new BlockSvg(this, prototypeName, opt_id);
 };
 
 /**
  * Add a trashcan.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.addTrashcan = function() {
-  if (!Blockly.Trashcan) {
+WorkspaceSvg.prototype.addTrashcan = function() {
+  const Trashcan = goog.module.get('Blockly.Trashcan');
+  if (!Trashcan) {
     throw Error('Missing require for Blockly.Trashcan');
   }
-  /** @type {Blockly.Trashcan} */
-  this.trashcan = new Blockly.Trashcan(this);
-  var svgTrashcan = this.trashcan.createDom();
+  /** @type {Trashcan} */
+  this.trashcan = new Trashcan(this);
+  const svgTrashcan = this.trashcan.createDom();
   this.svgGroup_.insertBefore(svgTrashcan, this.svgBlockCanvas_);
 };
 
@@ -1032,28 +1059,29 @@ Blockly.WorkspaceSvg.prototype.addTrashcan = function() {
  * Add zoom controls.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.addZoomControls = function() {
-  if (!Blockly.ZoomControls) {
+WorkspaceSvg.prototype.addZoomControls = function() {
+  const ZoomControls = goog.module.get('Blockly.ZoomControls');
+  if (!ZoomControls) {
     throw Error('Missing require for Blockly.ZoomControls');
   }
-  /** @type {Blockly.ZoomControls} */
-  this.zoomControls_ = new Blockly.ZoomControls(this);
-  var svgZoomControls = this.zoomControls_.createDom();
+  /** @type {ZoomControls} */
+  this.zoomControls_ = new ZoomControls(this);
+  const svgZoomControls = this.zoomControls_.createDom();
   this.svgGroup_.appendChild(svgZoomControls);
 };
 
 /**
  * Add a flyout element in an element with the given tag name.
  * @param {string|
- * !Blockly.utils.Svg<!SVGSVGElement>|
- * !Blockly.utils.Svg<!SVGGElement>} tagName What type of tag the
+ * !Svg<!SVGSVGElement>|
+ * !Svg<!SVGGElement>} tagName What type of tag the
  *     flyout belongs in.
  * @return {!Element} The element containing the flyout DOM.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.addFlyout = function(tagName) {
-  var workspaceOptions = new Blockly.Options(
-      /** @type {!Blockly.BlocklyOptions} */
+WorkspaceSvg.prototype.addFlyout = function(tagName) {
+  const workspaceOptions = new Options(
+      /** @type {!BlocklyOptions} */
       ({
         'parentWorkspace': this,
         'rtl': this.RTL,
@@ -1067,12 +1095,12 @@ Blockly.WorkspaceSvg.prototype.addFlyout = function(tagName) {
       }));
   workspaceOptions.toolboxPosition = this.options.toolboxPosition;
   if (this.horizontalLayout) {
-    var HorizontalFlyout = Blockly.registry.getClassFromOptions(
-        Blockly.registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX, this.options, true);
+    const HorizontalFlyout = registry.getClassFromOptions(
+        registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX, this.options, true);
     this.flyout_ = new HorizontalFlyout(workspaceOptions);
   } else {
-    var VerticalFlyout = Blockly.registry.getClassFromOptions(
-        Blockly.registry.Type.FLYOUTS_VERTICAL_TOOLBOX, this.options, true);
+    const VerticalFlyout = registry.getClassFromOptions(
+        registry.Type.FLYOUTS_VERTICAL_TOOLBOX, this.options, true);
     this.flyout_ = new VerticalFlyout(workspaceOptions);
   }
   this.flyout_.autoClose = false;
@@ -1089,10 +1117,10 @@ Blockly.WorkspaceSvg.prototype.addFlyout = function(tagName) {
  * owned by either the toolbox or the workspace, depending on toolbox
  * configuration.  It will be null if there is no flyout.
  * @param {boolean=} opt_own Whether to only return the workspace's own flyout.
- * @return {?Blockly.IFlyout} The flyout on this workspace.
+ * @return {?IFlyout} The flyout on this workspace.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getFlyout = function(opt_own) {
+WorkspaceSvg.prototype.getFlyout = function(opt_own) {
   if (this.flyout_ || opt_own) {
     return this.flyout_;
   }
@@ -1104,10 +1132,10 @@ Blockly.WorkspaceSvg.prototype.getFlyout = function(opt_own) {
 
 /**
  * Getter for the toolbox associated with this workspace, if one exists.
- * @return {?Blockly.IToolbox} The toolbox on this workspace.
+ * @return {?IToolbox} The toolbox on this workspace.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getToolbox = function() {
+WorkspaceSvg.prototype.getToolbox = function() {
   return this.toolbox_;
 };
 
@@ -1116,7 +1144,7 @@ Blockly.WorkspaceSvg.prototype.getToolbox = function() {
  * because something has changed (e.g. scroll position, window size).
  * @private
  */
-Blockly.WorkspaceSvg.prototype.updateScreenCalculations_ = function() {
+WorkspaceSvg.prototype.updateScreenCalculations_ = function() {
   this.updateInverseScreenCTM();
   this.recordDragTargets();
 };
@@ -1127,7 +1155,7 @@ Blockly.WorkspaceSvg.prototype.updateScreenCalculations_ = function() {
  * workspace contents if needed.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.resizeContents = function() {
+WorkspaceSvg.prototype.resizeContents = function() {
   if (!this.resizesEnabled_ || !this.rendered) {
     return;
   }
@@ -1144,7 +1172,7 @@ Blockly.WorkspaceSvg.prototype.resizeContents = function() {
  * requires recalculating dimensions and positions of the
  * trash, zoom, toolbox, etc. (e.g. window resize).
  */
-Blockly.WorkspaceSvg.prototype.resize = function() {
+WorkspaceSvg.prototype.resize = function() {
   if (this.toolbox_) {
     this.toolbox_.position();
   }
@@ -1152,13 +1180,13 @@ Blockly.WorkspaceSvg.prototype.resize = function() {
     this.flyout_.position();
   }
 
-  var positionables = this.componentManager_.getComponents(
-      Blockly.ComponentManager.Capability.POSITIONABLE, true);
-  var metrics = this.getMetricsManager().getUiMetrics();
-  var savedPositions = [];
-  for (var i = 0, positionable; (positionable = positionables[i]); i++) {
+  const positionables = this.componentManager_.getComponents(
+      ComponentManager.Capability.POSITIONABLE, true);
+  const metrics = this.getMetricsManager().getUiMetrics();
+  const savedPositions = [];
+  for (let i = 0, positionable; (positionable = positionables[i]); i++) {
     positionable.position(metrics, savedPositions);
-    var boundingRect = positionable.getBoundingRectangle();
+    const boundingRect = positionable.getBoundingRectangle();
     if (boundingRect) {
       savedPositions.push(boundingRect);
     }
@@ -1175,12 +1203,10 @@ Blockly.WorkspaceSvg.prototype.resize = function() {
  * scroll position.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.updateScreenCalculationsIfScrolled =
-    function() {
-    /* eslint-disable indent */
-  var currScroll = Blockly.utils.getDocumentScroll();
-  if (!Blockly.utils.Coordinate.equals(
-      this.lastRecordedPageScroll_, currScroll)) {
+WorkspaceSvg.prototype.updateScreenCalculationsIfScrolled = function() {
+  /* eslint-disable indent */
+  const currScroll = utils.getDocumentScroll();
+  if (!Coordinate.equals(this.lastRecordedPageScroll_, currScroll)) {
     this.lastRecordedPageScroll_ = currScroll;
     this.updateScreenCalculations_();
   }
@@ -1190,7 +1216,7 @@ Blockly.WorkspaceSvg.prototype.updateScreenCalculationsIfScrolled =
  * Get the SVG element that forms the drawing surface.
  * @return {!SVGGElement} SVG group element.
  */
-Blockly.WorkspaceSvg.prototype.getCanvas = function() {
+WorkspaceSvg.prototype.getCanvas = function() {
   return /** @type {!SVGGElement} */ (this.svgBlockCanvas_);
 };
 
@@ -1201,16 +1227,18 @@ Blockly.WorkspaceSvg.prototype.getCanvas = function() {
  * @param {?number} height The height of the parent SVG element
  * @package
  */
-Blockly.WorkspaceSvg.prototype.setCachedParentSvgSize = function(width, height) {
-  var svg = this.getParentSvg();
+WorkspaceSvg.prototype.setCachedParentSvgSize = function(width, height) {
+  const svg = this.getParentSvg();
   if (width) {
     this.cachedParentSvgSize_.width = width;
-    // This is set to support the public (but deprecated) Blockly.svgSize method.
+    // This is set to support the public (but deprecated) Blockly.svgSize
+    // method.
     svg.cachedWidth_ = width;
   }
   if (height) {
     this.cachedParentSvgSize_.height = height;
-    // This is set to support the public (but deprecated) Blockly.svgSize method.
+    // This is set to support the public (but deprecated) Blockly.svgSize
+    // method.
     svg.cachedHeight_ = height;
   }
 };
@@ -1219,7 +1247,7 @@ Blockly.WorkspaceSvg.prototype.setCachedParentSvgSize = function(width, height)
  * Get the SVG element that forms the bubble surface.
  * @return {!SVGGElement} SVG group element.
  */
-Blockly.WorkspaceSvg.prototype.getBubbleCanvas = function() {
+WorkspaceSvg.prototype.getBubbleCanvas = function() {
   return /** @type {!SVGGElement} */ (this.svgBubbleCanvas_);
 };
 
@@ -1229,9 +1257,9 @@ Blockly.WorkspaceSvg.prototype.getBubbleCanvas = function() {
  * into the DOM.
  * @return {!SVGElement} SVG element.
  */
-Blockly.WorkspaceSvg.prototype.getParentSvg = function() {
+WorkspaceSvg.prototype.getParentSvg = function() {
   if (!this.cachedParentSvg_) {
-    var element = this.svgGroup_;
+    let element = this.svgGroup_;
     while (element) {
       if (element.tagName == 'svg') {
         this.cachedParentSvg_ = element;
@@ -1248,26 +1276,25 @@ Blockly.WorkspaceSvg.prototype.getParentSvg = function() {
  * viewport values.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.maybeFireViewportChangeEvent = function() {
-  if (!Blockly.Events.isEnabled()) {
+WorkspaceSvg.prototype.maybeFireViewportChangeEvent = function() {
+  if (!Events.isEnabled()) {
     return;
   }
-  var scale = this.scale;
-  var top = -this.scrollY;
-  var left = -this.scrollX;
-  if (scale == this.oldScale_ &&
-      Math.abs(top - this.oldTop_) < 1 &&
+  const scale = this.scale;
+  const top = -this.scrollY;
+  const left = -this.scrollX;
+  if (scale == this.oldScale_ && Math.abs(top - this.oldTop_) < 1 &&
       Math.abs(left - this.oldLeft_) < 1) {
     // Ignore sub-pixel changes in top and left. Due to #4192 there are a lot of
     // negligible changes in viewport top/left.
     return;
   }
-  var event = new (Blockly.Events.get(Blockly.Events.VIEWPORT_CHANGE))(top,
-      left, scale, this.id, this.oldScale_);
+  const event = new (Events.get(Events.VIEWPORT_CHANGE))(
+      top, left, scale, this.id, this.oldScale_);
   this.oldScale_ = scale;
   this.oldTop_ = top;
   this.oldLeft_ = left;
-  Blockly.Events.fire(event);
+  Events.fire(event);
 };
 
 /**
@@ -1277,11 +1304,11 @@ Blockly.WorkspaceSvg.prototype.maybeFireViewportChangeEvent = function() {
  * @param {number} y Vertical translation, in pixel units relative to the
  *    top left of the Blockly div.
  */
-Blockly.WorkspaceSvg.prototype.translate = function(x, y) {
+WorkspaceSvg.prototype.translate = function(x, y) {
   if (this.useWorkspaceDragSurface_ && this.isDragSurfaceActive_) {
-    this.workspaceDragSurface_.translateSurface(x,y);
+    this.workspaceDragSurface_.translateSurface(x, y);
   } else {
-    var translation = 'translate(' + x + ',' + y + ') ' +
+    const translation = 'translate(' + x + ',' + y + ') ' +
         'scale(' + this.scale + ')';
     this.svgBlockCanvas_.setAttribute('transform', translation);
     this.svgBubbleCanvas_.setAttribute('transform', translation);
@@ -1304,7 +1331,7 @@ Blockly.WorkspaceSvg.prototype.translate = function(x, y) {
  * Does nothing if the workspace drag surface is not enabled.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.resetDragSurface = function() {
+WorkspaceSvg.prototype.resetDragSurface = function() {
   // Don't do anything if we aren't using a drag surface.
   if (!this.useWorkspaceDragSurface_) {
     return;
@@ -1312,9 +1339,9 @@ Blockly.WorkspaceSvg.prototype.resetDragSurface = function() {
 
   this.isDragSurfaceActive_ = false;
 
-  var trans = this.workspaceDragSurface_.getSurfaceTranslation();
+  const trans = this.workspaceDragSurface_.getSurfaceTranslation();
   this.workspaceDragSurface_.clearAndHide(this.svgGroup_);
-  var translation = 'translate(' + trans.x + ',' + trans.y + ') ' +
+  const translation = 'translate(' + trans.x + ',' + trans.y + ') ' +
       'scale(' + this.scale + ')';
   this.svgBlockCanvas_.setAttribute('transform', translation);
   this.svgBubbleCanvas_.setAttribute('transform', translation);
@@ -1326,7 +1353,7 @@ Blockly.WorkspaceSvg.prototype.resetDragSurface = function() {
  * Does nothing if the drag surface is not enabled.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.setupDragSurface = function() {
+WorkspaceSvg.prototype.setupDragSurface = function() {
   // Don't do anything if we aren't using a drag surface.
   if (!this.useWorkspaceDragSurface_) {
     return;
@@ -1345,23 +1372,24 @@ Blockly.WorkspaceSvg.prototype.setupDragSurface = function() {
 
   // Figure out where we want to put the canvas back.  The order
   // in the is important because things are layered.
-  var previousElement =
-    /** @type {Element} */ (this.svgBlockCanvas_.previousSibling);
-  var width = parseInt(this.getParentSvg().getAttribute('width'), 10);
-  var height = parseInt(this.getParentSvg().getAttribute('height'), 10);
-  var coord = Blockly.utils.getRelativeXY(this.getCanvas());
-  this.workspaceDragSurface_.setContentsAndShow(this.getCanvas(),
-      this.getBubbleCanvas(), previousElement, width, height, this.scale);
+  const previousElement =
+      /** @type {Element} */ (this.svgBlockCanvas_.previousSibling);
+  const width = parseInt(this.getParentSvg().getAttribute('width'), 10);
+  const height = parseInt(this.getParentSvg().getAttribute('height'), 10);
+  const coord = utils.getRelativeXY(this.getCanvas());
+  this.workspaceDragSurface_.setContentsAndShow(
+      this.getCanvas(), this.getBubbleCanvas(), previousElement, width, height,
+      this.scale);
   this.workspaceDragSurface_.translateSurface(coord.x, coord.y);
 };
 
 /**
  * Gets the drag surface blocks are moved to when a drag is started.
- * @return {?Blockly.BlockDragSurfaceSvg} This workspace's block drag surface,
+ * @return {?BlockDragSurfaceSvg} This workspace's block drag surface,
  *     if one is in use.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getBlockDragSurface = function() {
+WorkspaceSvg.prototype.getBlockDragSurface = function() {
   return this.blockDragSurface_;
 };
 
@@ -1370,8 +1398,8 @@ Blockly.WorkspaceSvg.prototype.getBlockDragSurface = function() {
  * Intended for LTR/RTL compatibility in XML.
  * @return {number} Width.
  */
-Blockly.WorkspaceSvg.prototype.getWidth = function() {
-  var metrics = this.getMetrics();
+WorkspaceSvg.prototype.getWidth = function() {
+  const metrics = this.getMetrics();
   return metrics ? metrics.viewWidth / this.scale : 0;
 };
 
@@ -1380,7 +1408,7 @@ Blockly.WorkspaceSvg.prototype.getWidth = function() {
  * Currently only intended for main workspace.
  * @param {boolean} isVisible True if workspace should be visible.
  */
-Blockly.WorkspaceSvg.prototype.setVisible = function(isVisible) {
+WorkspaceSvg.prototype.setVisible = function(isVisible) {
   this.isVisible_ = isVisible;
   if (!this.svgGroup_) {
     return;
@@ -1404,9 +1432,9 @@ Blockly.WorkspaceSvg.prototype.setVisible = function(isVisible) {
     this.toolbox_.setVisible(isVisible);
   }
   if (isVisible) {
-    var blocks = this.getAllBlocks(false);
+    const blocks = this.getAllBlocks(false);
     // Tell each block on the workspace to mark its fields as dirty.
-    for (var i = blocks.length - 1; i >= 0; i--) {
+    for (let i = blocks.length - 1; i >= 0; i--) {
       blocks[i].markDirty();
     }
 
@@ -1422,17 +1450,17 @@ Blockly.WorkspaceSvg.prototype.setVisible = function(isVisible) {
 /**
  * Render all blocks in workspace.
  */
-Blockly.WorkspaceSvg.prototype.render = function() {
+WorkspaceSvg.prototype.render = function() {
   // Generate list of all blocks.
-  var blocks = this.getAllBlocks(false);
+  const blocks = this.getAllBlocks(false);
   // Render each block.
-  for (var i = blocks.length - 1; i >= 0; i--) {
+  for (let i = blocks.length - 1; i >= 0; i--) {
     blocks[i].render(false);
   }
 
   if (this.currentGesture_) {
-    var imList = this.currentGesture_.getInsertionMarkers();
-    for (var i = 0; i < imList.length; i++) {
+    const imList = this.currentGesture_.getInsertionMarkers();
+    for (let i = 0; i < imList.length; i++) {
       imList[i].render(false);
     }
   }
@@ -1449,21 +1477,21 @@ Blockly.WorkspaceSvg.prototype.render = function() {
  * automatically unhighlight all others.  If true or false, manually
  * highlight/unhighlight the specified block.
  */
-Blockly.WorkspaceSvg.prototype.highlightBlock = function(id, opt_state) {
+WorkspaceSvg.prototype.highlightBlock = function(id, opt_state) {
   if (opt_state === undefined) {
     // Unhighlight all blocks.
-    for (var i = 0, block; (block = this.highlightedBlocks_[i]); i++) {
+    for (let i = 0, block; (block = this.highlightedBlocks_[i]); i++) {
       block.setHighlighted(false);
     }
     this.highlightedBlocks_.length = 0;
   }
   // Highlight/unhighlight the specified block.
-  var block = id ? this.getBlockById(id) : null;
+  const block = id ? this.getBlockById(id) : null;
   if (block) {
-    var state = (opt_state === undefined) || opt_state;
+    const state = (opt_state === undefined) || opt_state;
     // Using Set here would be great, but at the cost of IE10 support.
     if (!state) {
-      Blockly.utils.arrayRemove(this.highlightedBlocks_, block);
+      utils.arrayRemove(this.highlightedBlocks_, block);
     } else if (this.highlightedBlocks_.indexOf(block) == -1) {
       this.highlightedBlocks_.push(block);
     }
@@ -1476,12 +1504,14 @@ Blockly.WorkspaceSvg.prototype.highlightBlock = function(id, opt_state) {
  * @param {!Element|!DocumentFragment} xmlBlock XML block element or an empty
  *     DocumentFragment if the block was an insertion marker.
  */
-Blockly.WorkspaceSvg.prototype.paste = function(xmlBlock) {
-  if (!this.rendered || !xmlBlock.tagName || xmlBlock.getElementsByTagName('block').length >=
-      this.remainingCapacity()) {
+WorkspaceSvg.prototype.paste = function(xmlBlock) {
+  if (!this.rendered || !xmlBlock.tagName ||
+      xmlBlock.getElementsByTagName('block').length >=
+          this.remainingCapacity()) {
     return;
   }
-  // The check above for tagName rules out the possibility of this being a DocumentFragment.
+  // The check above for tagName rules out the possibility of this being a
+  // DocumentFragment.
   xmlBlock = /** @type {!Element} */ (xmlBlock);
   if (this.currentGesture_) {
     this.currentGesture_.cancel();  // Dragging while pasting?  No.
@@ -1498,25 +1528,27 @@ Blockly.WorkspaceSvg.prototype.paste = function(xmlBlock) {
  * @param {!Element} xmlBlock XML block element.
  * @private
  */
-Blockly.WorkspaceSvg.prototype.pasteBlock_ = function(xmlBlock) {
-  Blockly.Events.disable();
+WorkspaceSvg.prototype.pasteBlock_ = function(xmlBlock) {
+  Events.disable();
+  let block;
   try {
-    var block = Blockly.Xml.domToBlock(xmlBlock, this);
+    block = Xml.domToBlock(xmlBlock, this);
 
     // Move the duplicate to original position.
-    var blockX = parseInt(xmlBlock.getAttribute('x'), 10);
-    var blockY = parseInt(xmlBlock.getAttribute('y'), 10);
+    let blockX = parseInt(xmlBlock.getAttribute('x'), 10);
+    let blockY = parseInt(xmlBlock.getAttribute('y'), 10);
     if (!isNaN(blockX) && !isNaN(blockY)) {
       if (this.RTL) {
         blockX = -blockX;
       }
       // Offset block until not clobbering another block and not in connection
       // distance with neighbouring blocks.
+      let collide;
       do {
-        var collide = false;
-        var allBlocks = this.getAllBlocks(false);
-        for (var i = 0, otherBlock; (otherBlock = allBlocks[i]); i++) {
-          var otherXY = otherBlock.getRelativeToSurfaceXY();
+        collide = false;
+        const allBlocks = this.getAllBlocks(false);
+        for (let i = 0, otherBlock; (otherBlock = allBlocks[i]); i++) {
+          const otherXY = otherBlock.getRelativeToSurfaceXY();
           if (Math.abs(blockX - otherXY.x) <= 1 &&
               Math.abs(blockY - otherXY.y) <= 1) {
             collide = true;
@@ -1525,11 +1557,10 @@ Blockly.WorkspaceSvg.prototype.pasteBlock_ = function(xmlBlock) {
         }
         if (!collide) {
           // Check for blocks in snap range to any of its connections.
-          var connections = block.getConnections_(false);
-          for (var i = 0, connection; (connection = connections[i]); i++) {
-            var neighbour = connection.closest(
-                Blockly.internalConstants.SNAP_RADIUS,
-                new Blockly.utils.Coordinate(blockX, blockY));
+          const connections = block.getConnections_(false);
+          for (let i = 0, connection; (connection = connections[i]); i++) {
+            const neighbour = connection.closest(
+                internalConstants.SNAP_RADIUS, new Coordinate(blockX, blockY));
             if (neighbour.connection) {
               collide = true;
               break;
@@ -1538,21 +1569,20 @@ Blockly.WorkspaceSvg.prototype.pasteBlock_ = function(xmlBlock) {
         }
         if (collide) {
           if (this.RTL) {
-            blockX -= Blockly.internalConstants.SNAP_RADIUS;
+            blockX -= internalConstants.SNAP_RADIUS;
           } else {
-            blockX += Blockly.internalConstants.SNAP_RADIUS;
+            blockX += internalConstants.SNAP_RADIUS;
           }
-          blockY += Blockly.internalConstants.SNAP_RADIUS * 2;
+          blockY += internalConstants.SNAP_RADIUS * 2;
         }
       } while (collide);
       block.moveBy(blockX, blockY);
     }
   } finally {
-    Blockly.Events.enable();
+    Events.enable();
   }
-  if (Blockly.Events.isEnabled() && !block.isShadow()) {
-    Blockly.Events.fire(
-        new (Blockly.Events.get(Blockly.Events.BLOCK_CREATE))(block));
+  if (Events.isEnabled() && !block.isShadow()) {
+    Events.fire(new (Events.get(Events.BLOCK_CREATE))(block));
   }
   block.select();
 };
@@ -1564,13 +1594,15 @@ Blockly.WorkspaceSvg.prototype.pasteBlock_ = function(xmlBlock) {
  * @suppress {checkTypes} Suppress checks while workspace comments are not
  *     bundled in.
  */
-Blockly.WorkspaceSvg.prototype.pasteWorkspaceComment_ = function(xmlComment) {
-  Blockly.Events.disable();
+WorkspaceSvg.prototype.pasteWorkspaceComment_ = function(xmlComment) {
+  Events.disable();
+  let comment;
   try {
-    var comment = goog.module.get('Blockly.WorkspaceCommentSvg').fromXml(xmlComment, this);
+    comment = goog.module.get('Blockly.WorkspaceCommentSvg')
+                  .fromXml(xmlComment, this);
     // Move the duplicate to original position.
-    var commentX = parseInt(xmlComment.getAttribute('x'), 10);
-    var commentY = parseInt(xmlComment.getAttribute('y'), 10);
+    let commentX = parseInt(xmlComment.getAttribute('x'), 10);
+    let commentY = parseInt(xmlComment.getAttribute('y'), 10);
     if (!isNaN(commentX) && !isNaN(commentY)) {
       if (this.RTL) {
         commentX = -commentX;
@@ -1583,9 +1615,9 @@ Blockly.WorkspaceSvg.prototype.pasteWorkspaceComment_ = function(xmlComment) {
       comment.moveBy(commentX, commentY);
     }
   } finally {
-    Blockly.Events.enable();
+    Events.enable();
   }
-  if (Blockly.Events.isEnabled()) {
+  if (Events.isEnabled()) {
     goog.module.get('Blockly.WorkspaceComment').fireCreateEvent(comment);
   }
   comment.select();
@@ -1595,8 +1627,8 @@ Blockly.WorkspaceSvg.prototype.pasteWorkspaceComment_ = function(xmlComment) {
  * Refresh the toolbox unless there's a drag in progress.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.refreshToolboxSelection = function() {
-  var ws = this.isFlyout ? this.targetWorkspace : this;
+WorkspaceSvg.prototype.refreshToolboxSelection = function() {
+  const ws = this.isFlyout ? this.targetWorkspace : this;
   if (ws && !ws.currentGesture_ && ws.toolbox_ && ws.toolbox_.getFlyout()) {
     ws.toolbox_.refreshSelection();
   }
@@ -1608,8 +1640,8 @@ Blockly.WorkspaceSvg.prototype.refreshToolboxSelection = function() {
  * @param {string} id ID of the variable to rename.
  * @param {string} newName New variable name.
  */
-Blockly.WorkspaceSvg.prototype.renameVariableById = function(id, newName) {
-  Blockly.WorkspaceSvg.superClass_.renameVariableById.call(this, id, newName);
+WorkspaceSvg.prototype.renameVariableById = function(id, newName) {
+  WorkspaceSvg.superClass_.renameVariableById.call(this, id, newName);
   this.refreshToolboxSelection();
 };
 
@@ -1618,8 +1650,8 @@ Blockly.WorkspaceSvg.prototype.renameVariableById = function(id, newName) {
  *     immediately that the variable is deleted.
  * @param {string} id ID of variable to delete.
  */
-Blockly.WorkspaceSvg.prototype.deleteVariableById = function(id) {
-  Blockly.WorkspaceSvg.superClass_.deleteVariableById.call(this, id);
+WorkspaceSvg.prototype.deleteVariableById = function(id) {
+  WorkspaceSvg.superClass_.deleteVariableById.call(this, id);
   this.refreshToolboxSelection();
 };
 
@@ -1632,11 +1664,10 @@ Blockly.WorkspaceSvg.prototype.deleteVariableById = function(id) {
  *     their type. This will default to '' which is a specific type.
  * @param {?string=} opt_id The unique ID of the variable. This will default to
  *     a UUID.
- * @return {!Blockly.VariableModel} The newly created variable.
+ * @return {!VariableModel} The newly created variable.
  */
-Blockly.WorkspaceSvg.prototype.createVariable = function(name,
-    opt_type, opt_id) {
-  var newVar = Blockly.WorkspaceSvg.superClass_.createVariable.call(
+WorkspaceSvg.prototype.createVariable = function(name, opt_type, opt_id) {
+  const newVar = WorkspaceSvg.superClass_.createVariable.call(
       this, name, opt_type, opt_id);
   this.refreshToolboxSelection();
   return newVar;
@@ -1646,11 +1677,9 @@ Blockly.WorkspaceSvg.prototype.createVariable = function(name,
  * Make a list of all the delete areas for this workspace.
  * @deprecated Use workspace.recordDragTargets. (2021 June)
  */
-Blockly.WorkspaceSvg.prototype.recordDeleteAreas = function() {
-  Blockly.utils.deprecation.warn(
-      'WorkspaceSvg.prototype.recordDeleteAreas',
-      'June 2021',
-      'June 2022',
+WorkspaceSvg.prototype.recordDeleteAreas = function() {
+  utils.deprecation.warn(
+      'WorkspaceSvg.prototype.recordDeleteAreas', 'June 2021', 'June 2022',
       'WorkspaceSvg.prototype.recordDragTargets');
   this.recordDragTargets();
 };
@@ -1658,13 +1687,13 @@ Blockly.WorkspaceSvg.prototype.recordDeleteAreas = function() {
 /**
  * Make a list of all the delete areas for this workspace.
  */
-Blockly.WorkspaceSvg.prototype.recordDragTargets = function() {
-  var dragTargets = this.componentManager_.getComponents(
-      Blockly.ComponentManager.Capability.DRAG_TARGET, true);
+WorkspaceSvg.prototype.recordDragTargets = function() {
+  const dragTargets = this.componentManager_.getComponents(
+      ComponentManager.Capability.DRAG_TARGET, true);
 
   this.dragTargetAreas_ = [];
-  for (var i = 0, targetArea; (targetArea = dragTargets[i]); i++) {
-    var rect = targetArea.getClientRect();
+  for (let i = 0, targetArea; (targetArea = dragTargets[i]); i++) {
+    const rect = targetArea.getClientRect();
     if (rect) {
       this.dragTargetAreas_.push({
         component: targetArea,
@@ -1678,11 +1707,11 @@ Blockly.WorkspaceSvg.prototype.recordDragTargets = function() {
 /**
  * Returns the drag target the mouse event is over.
  * @param {!Event} e Mouse move event.
- * @return {?Blockly.IDragTarget} Null if not over a drag target, or the drag
+ * @return {?IDragTarget} Null if not over a drag target, or the drag
  *     target the event is over.
  */
-Blockly.WorkspaceSvg.prototype.getDragTarget = function(e) {
-  for (var i = 0, targetArea; (targetArea = this.dragTargetAreas_[i]); i++) {
+WorkspaceSvg.prototype.getDragTarget = function(e) {
+  for (let i = 0, targetArea; (targetArea = this.dragTargetAreas_[i]); i++) {
     if (targetArea.clientRect.contains(e.clientX, e.clientY)) {
       return targetArea.component;
     }
@@ -1695,8 +1724,8 @@ Blockly.WorkspaceSvg.prototype.getDragTarget = function(e) {
  * @param {!Event} e Mouse down event.
  * @private
  */
-Blockly.WorkspaceSvg.prototype.onMouseDown_ = function(e) {
-  var gesture = this.getGesture(e);
+WorkspaceSvg.prototype.onMouseDown_ = function(e) {
+  const gesture = this.getGesture(e);
   if (gesture) {
     gesture.handleWsStart(e, this);
   }
@@ -1705,38 +1734,38 @@ Blockly.WorkspaceSvg.prototype.onMouseDown_ = function(e) {
 /**
  * Start tracking a drag of an object on this workspace.
  * @param {!Event} e Mouse down event.
- * @param {!Blockly.utils.Coordinate} xy Starting location of object.
+ * @param {!Coordinate} xy Starting location of object.
  */
-Blockly.WorkspaceSvg.prototype.startDrag = function(e, xy) {
+WorkspaceSvg.prototype.startDrag = function(e, xy) {
   // Record the starting offset between the bubble's location and the mouse.
-  var point = Blockly.utils.mouseToSvg(e, this.getParentSvg(),
-      this.getInverseScreenCTM());
+  const point =
+      utils.mouseToSvg(e, this.getParentSvg(), this.getInverseScreenCTM());
   // Fix scale of mouse event.
   point.x /= this.scale;
   point.y /= this.scale;
-  this.dragDeltaXY_ = Blockly.utils.Coordinate.difference(xy, point);
+  this.dragDeltaXY_ = Coordinate.difference(xy, point);
 };
 
 /**
  * Track a drag of an object on this workspace.
  * @param {!Event} e Mouse move event.
- * @return {!Blockly.utils.Coordinate} New location of object.
+ * @return {!Coordinate} New location of object.
  */
-Blockly.WorkspaceSvg.prototype.moveDrag = function(e) {
-  var point = Blockly.utils.mouseToSvg(e, this.getParentSvg(),
-      this.getInverseScreenCTM());
+WorkspaceSvg.prototype.moveDrag = function(e) {
+  const point =
+      utils.mouseToSvg(e, this.getParentSvg(), this.getInverseScreenCTM());
   // Fix scale of mouse event.
   point.x /= this.scale;
   point.y /= this.scale;
-  return Blockly.utils.Coordinate.sum(
-      /** @type {!Blockly.utils.Coordinate} */ (this.dragDeltaXY_), point);
+  return Coordinate.sum(
+      /** @type {!Coordinate} */ (this.dragDeltaXY_), point);
 };
 
 /**
  * Is the user currently dragging a block or scrolling the flyout/workspace?
  * @return {boolean} True if currently dragging or scrolling.
  */
-Blockly.WorkspaceSvg.prototype.isDragging = function() {
+WorkspaceSvg.prototype.isDragging = function() {
   return this.currentGesture_ != null && this.currentGesture_.isDragging();
 };
 
@@ -1744,7 +1773,7 @@ Blockly.WorkspaceSvg.prototype.isDragging = function() {
  * Is this workspace draggable?
  * @return {boolean} True if this workspace may be dragged.
  */
-Blockly.WorkspaceSvg.prototype.isDraggable = function() {
+WorkspaceSvg.prototype.isDraggable = function() {
   return this.options.moveOptions && this.options.moveOptions.drag;
 };
 
@@ -1758,7 +1787,7 @@ Blockly.WorkspaceSvg.prototype.isDraggable = function() {
  * since the X Y coordinates are decided programmatically.
  * @return {boolean} True if the workspace is movable, false otherwise.
  */
-Blockly.WorkspaceSvg.prototype.isMovable = function() {
+WorkspaceSvg.prototype.isMovable = function() {
   return (this.options.moveOptions && !!this.options.moveOptions.scrollbars) ||
       (this.options.moveOptions && this.options.moveOptions.wheel) ||
       (this.options.moveOptions && this.options.moveOptions.drag) ||
@@ -1771,10 +1800,11 @@ Blockly.WorkspaceSvg.prototype.isMovable = function() {
  * @return {boolean} True if the workspace is movable horizontally, false
  *    otherwise.
  */
-Blockly.WorkspaceSvg.prototype.isMovableHorizontally = function() {
-  var hasScrollbars = !!this.scrollbar;
-  return this.isMovable() && (!hasScrollbars ||
-      (hasScrollbars && this.scrollbar.canScrollHorizontally()));
+WorkspaceSvg.prototype.isMovableHorizontally = function() {
+  const hasScrollbars = !!this.scrollbar;
+  return this.isMovable() &&
+      (!hasScrollbars ||
+       (hasScrollbars && this.scrollbar.canScrollHorizontally()));
 };
 
 /**
@@ -1782,10 +1812,11 @@ Blockly.WorkspaceSvg.prototype.isMovableHorizontally = function() {
  * @return {boolean} True if the workspace is movable vertically, false
  *    otherwise.
  */
-Blockly.WorkspaceSvg.prototype.isMovableVertically = function() {
-  var hasScrollbars = !!this.scrollbar;
-  return this.isMovable() && (!hasScrollbars ||
-      (hasScrollbars && this.scrollbar.canScrollVertically()));
+WorkspaceSvg.prototype.isMovableVertically = function() {
+  const hasScrollbars = !!this.scrollbar;
+  return this.isMovable() &&
+      (!hasScrollbars ||
+       (hasScrollbars && this.scrollbar.canScrollVertically()));
 };
 
 /**
@@ -1793,33 +1824,35 @@ Blockly.WorkspaceSvg.prototype.isMovableVertically = function() {
  * @param {!Event} e Mouse wheel event.
  * @private
  */
-Blockly.WorkspaceSvg.prototype.onMouseWheel_ = function(e) {
+WorkspaceSvg.prototype.onMouseWheel_ = function(e) {
   // Don't scroll or zoom anything if drag is in progress.
-  if (Blockly.Gesture.inProgress()) {
+  if (Gesture.inProgress()) {
     e.preventDefault();
     e.stopPropagation();
     return;
   }
-  var canWheelZoom = this.options.zoomOptions && this.options.zoomOptions.wheel;
-  var canWheelMove = this.options.moveOptions && this.options.moveOptions.wheel;
+  const canWheelZoom =
+      this.options.zoomOptions && this.options.zoomOptions.wheel;
+  const canWheelMove =
+      this.options.moveOptions && this.options.moveOptions.wheel;
   if (!canWheelZoom && !canWheelMove) {
     return;
   }
 
-  var scrollDelta = Blockly.utils.getScrollDeltaPixels(e);
+  const scrollDelta = utils.getScrollDeltaPixels(e);
   if (canWheelZoom && (e.ctrlKey || !canWheelMove)) {
     // Zoom.
     // The vertical scroll distance that corresponds to a click of a zoom
     // button.
-    var PIXELS_PER_ZOOM_STEP = 50;
-    var delta = -scrollDelta.y / PIXELS_PER_ZOOM_STEP;
-    var position = Blockly.utils.mouseToSvg(e, this.getParentSvg(),
-        this.getInverseScreenCTM());
+    const PIXELS_PER_ZOOM_STEP = 50;
+    const delta = -scrollDelta.y / PIXELS_PER_ZOOM_STEP;
+    const position =
+        utils.mouseToSvg(e, this.getParentSvg(), this.getInverseScreenCTM());
     this.zoom(position.x, position.y, delta);
   } else {
     // Scroll.
-    var x = this.scrollX - scrollDelta.x;
-    var y = this.scrollY - scrollDelta.y;
+    let x = this.scrollX - scrollDelta.x;
+    let y = this.scrollY - scrollDelta.y;
 
     if (e.shiftKey && !scrollDelta.x) {
       // Scroll horizontally (based on vertical scroll delta).
@@ -1837,26 +1870,26 @@ Blockly.WorkspaceSvg.prototype.onMouseWheel_ = function(e) {
  * Calculate the bounding box for the blocks on the workspace.
  * Coordinate system: workspace coordinates.
  *
- * @return {!Blockly.utils.Rect} Contains the position and size of the
+ * @return {!Rect} Contains the position and size of the
  *   bounding box containing the blocks on the workspace.
  */
-Blockly.WorkspaceSvg.prototype.getBlocksBoundingBox = function() {
-  var topElements = this.getTopBoundedElements();
+WorkspaceSvg.prototype.getBlocksBoundingBox = function() {
+  const topElements = this.getTopBoundedElements();
   // There are no blocks, return empty rectangle.
   if (!topElements.length) {
-    return new Blockly.utils.Rect(0, 0, 0, 0);
+    return new Rect(0, 0, 0, 0);
   }
 
   // Initialize boundary using the first block.
-  var boundary = topElements[0].getBoundingRectangle();
+  const boundary = topElements[0].getBoundingRectangle();
 
   // Start at 1 since the 0th block was used for initialization.
-  for (var i = 1; i < topElements.length; i++) {
-    var topElement = topElements[i];
+  for (let i = 1; i < topElements.length; i++) {
+    const topElement = topElements[i];
     if (topElement.isInsertionMarker && topElement.isInsertionMarker()) {
       continue;
     }
-    var blockBoundary = topElement.getBoundingRectangle();
+    const blockBoundary = topElement.getBoundingRectangle();
     if (blockBoundary.top < boundary.top) {
       boundary.top = blockBoundary.top;
     }
@@ -1876,23 +1909,22 @@ Blockly.WorkspaceSvg.prototype.getBlocksBoundingBox = function() {
 /**
  * Clean up the workspace by ordering all the blocks in a column.
  */
-Blockly.WorkspaceSvg.prototype.cleanUp = function() {
+WorkspaceSvg.prototype.cleanUp = function() {
   this.setResizesEnabled(false);
-  Blockly.Events.setGroup(true);
-  var topBlocks = this.getTopBlocks(true);
-  var cursorY = 0;
-  for (var i = 0, block; (block = topBlocks[i]); i++) {
+  Events.setGroup(true);
+  const topBlocks = this.getTopBlocks(true);
+  let cursorY = 0;
+  for (let i = 0, block; (block = topBlocks[i]); i++) {
     if (!block.isMovable()) {
       continue;
     }
-    var xy = block.getRelativeToSurfaceXY();
+    const xy = block.getRelativeToSurfaceXY();
     block.moveBy(-xy.x, cursorY - xy.y);
     block.snapToGrid();
-    cursorY = block.getRelativeToSurfaceXY().y +
-        block.getHeightWidth().height +
+    cursorY = block.getRelativeToSurfaceXY().y + block.getHeightWidth().height +
         this.renderer_.getConstants().MIN_BLOCK_HEIGHT;
   }
-  Blockly.Events.setGroup(false);
+  Events.setGroup(false);
   this.setResizesEnabled(true);
 };
 
@@ -1901,29 +1933,29 @@ Blockly.WorkspaceSvg.prototype.cleanUp = function() {
  * @param {!Event} e Mouse event.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.showContextMenu = function(e) {
+WorkspaceSvg.prototype.showContextMenu = function(e) {
   if (this.options.readOnly || this.isFlyout) {
     return;
   }
-  var menuOptions = Blockly.ContextMenuRegistry.registry.getContextMenuOptions(
-      Blockly.ContextMenuRegistry.ScopeType.WORKSPACE, {workspace: this});
+  const menuOptions = ContextMenuRegistry.registry.getContextMenuOptions(
+      ContextMenuRegistry.ScopeType.WORKSPACE, {workspace: this});
 
   // Allow the developer to add or modify menuOptions.
   if (this.configureContextMenu) {
     this.configureContextMenu(menuOptions, e);
   }
 
-  Blockly.ContextMenu.show(e, menuOptions, this.RTL);
+  ContextMenu.show(e, menuOptions, this.RTL);
 };
 
 /**
  * Modify the block tree on the existing toolbox.
- * @param {?Blockly.utils.toolbox.ToolboxDefinition} toolboxDef
+ * @param {?toolbox.ToolboxDefinition} toolboxDef
  *    DOM tree of toolbox contents, string of toolbox contents, or JSON
  *    representing toolbox definition.
  */
-Blockly.WorkspaceSvg.prototype.updateToolbox = function(toolboxDef) {
-  var parsedToolboxDef = Blockly.utils.toolbox.convertToolboxDefToJson(toolboxDef);
+WorkspaceSvg.prototype.updateToolbox = function(toolboxDef) {
+  const parsedToolboxDef = toolbox.convertToolboxDefToJson(toolboxDef);
 
   if (!parsedToolboxDef) {
     if (this.options.languageTree) {
@@ -1935,7 +1967,7 @@ Blockly.WorkspaceSvg.prototype.updateToolbox = function(toolboxDef) {
     throw Error('Existing toolbox is null.  Can\'t create new toolbox.');
   }
 
-  if (Blockly.utils.toolbox.hasCategories(parsedToolboxDef)) {
+  if (toolbox.hasCategories(parsedToolboxDef)) {
     if (!this.toolbox_) {
       throw Error('Existing toolbox has no categories.  Can\'t change mode.');
     }
@@ -1953,11 +1985,11 @@ Blockly.WorkspaceSvg.prototype.updateToolbox = function(toolboxDef) {
 /**
  * Mark this workspace as the currently focused main workspace.
  */
-Blockly.WorkspaceSvg.prototype.markFocused = function() {
+WorkspaceSvg.prototype.markFocused = function() {
   if (this.options.parentWorkspace) {
     this.options.parentWorkspace.markFocused();
   } else {
-    Blockly.common.setMainWorkspace(this);
+    common.setMainWorkspace(this);
     // We call e.preventDefault in many event handlers which means we
     // need to explicitly grab focus (e.g from a textarea) because
     // the browser will not do it for us.  How to do this is browser dependent.
@@ -1969,7 +2001,7 @@ Blockly.WorkspaceSvg.prototype.markFocused = function() {
  * Set the workspace to have focus in the browser.
  * @private
  */
-Blockly.WorkspaceSvg.prototype.setBrowserFocus = function() {
+WorkspaceSvg.prototype.setBrowserFocus = function() {
   // Blur whatever was focused since explicitly grabbing focus below does not
   // work in Edge.
   // In IE, SVGs can't be blurred or focused. Check to make sure the current
@@ -1980,7 +2012,7 @@ Blockly.WorkspaceSvg.prototype.setBrowserFocus = function() {
   }
   try {
     // Focus the workspace SVG - this is for Chrome and Firefox.
-    this.getParentSvg().focus({preventScroll:true});
+    this.getParentSvg().focus({preventScroll: true});
   } catch (e) {
     // IE and Edge do not support focus on SVG elements. When that fails
     // above, get the injectionDiv (the workspace's parent) and focus that
@@ -1992,7 +2024,7 @@ Blockly.WorkspaceSvg.prototype.setBrowserFocus = function() {
     } catch (e) {
       // setActive support was discontinued in Edge so when that fails, call
       // focus instead.
-      this.getParentSvg().parentNode.focus({preventScroll:true});
+      this.getParentSvg().parentNode.focus({preventScroll: true});
     }
   }
 };
@@ -2009,11 +2041,11 @@ Blockly.WorkspaceSvg.prototype.setBrowserFocus = function() {
  *     the workspace options. Negative amount values zoom out, and positive
  *     amount values zoom in.
  */
-Blockly.WorkspaceSvg.prototype.zoom = function(x, y, amount) {
+WorkspaceSvg.prototype.zoom = function(x, y, amount) {
   // Scale factor.
-  var speed = this.options.zoomOptions.scaleSpeed;
-  var scaleChange = Math.pow(speed, amount);
-  var newScale = this.scale * scaleChange;
+  const speed = this.options.zoomOptions.scaleSpeed;
+  let scaleChange = Math.pow(speed, amount);
+  const newScale = this.scale * scaleChange;
   if (this.scale == newScale) {
     return;  // No change in zoom.
   }
@@ -2028,8 +2060,8 @@ Blockly.WorkspaceSvg.prototype.zoom = function(x, y, amount) {
   // Transform the x/y coordinates from the parentSVG's space into the
   // canvas' space, so that they are in workspace units relative to the top
   // left of the visible portion of the workspace.
-  var matrix = this.getCanvas().getCTM();
-  var center = this.getParentSvg().createSVGPoint();
+  let matrix = this.getCanvas().getCTM();
+  let center = this.getParentSvg().createSVGPoint();
   center.x = x;
   center.y = y;
   center = center.matrixTransform(matrix.inverse());
@@ -2040,7 +2072,7 @@ Blockly.WorkspaceSvg.prototype.zoom = function(x, y, amount) {
   // position (relative to the center) after we zoom.
   // newScale and matrix.a should be identical (within a rounding error).
   matrix = matrix.translate(x * (1 - scaleChange), y * (1 - scaleChange))
-      .scale(scaleChange);
+               .scale(scaleChange);
   // scrollX and scrollY are in pixels.
   // The scrollX and scrollY still need to have absoluteLeft and absoluteTop
   // subtracted from them, but we'll leave that for setScale so that they're
@@ -2054,19 +2086,21 @@ Blockly.WorkspaceSvg.prototype.zoom = function(x, y, amount) {
  * Zooming the blocks centered in the center of view with zooming in or out.
  * @param {number} type Type of zooming (-1 zooming out and 1 zooming in).
  */
-Blockly.WorkspaceSvg.prototype.zoomCenter = function(type) {
-  var metrics = this.getMetrics();
+WorkspaceSvg.prototype.zoomCenter = function(type) {
+  const metrics = this.getMetrics();
+  let x;
+  let y;
   if (this.flyout_) {
     // If you want blocks in the center of the view (visible portion of the
     // workspace) to stay centered when the size of the view decreases (i.e.
     // when the size of the flyout increases) you need the center of the
     // *blockly div* to stay in the same pixel-position.
     // Note: This only works because of how scrollCenter positions blocks.
-    var x = metrics.svgWidth ? metrics.svgWidth / 2 : 0;
-    var y = metrics.svgHeight ? metrics.svgHeight / 2 : 0;
+    x = metrics.svgWidth ? metrics.svgWidth / 2 : 0;
+    y = metrics.svgHeight ? metrics.svgHeight / 2 : 0;
   } else {
-    var x = (metrics.viewWidth / 2) + metrics.absoluteLeft;
-    var y = (metrics.viewHeight / 2) + metrics.absoluteTop;
+    x = (metrics.viewWidth / 2) + metrics.absoluteLeft;
+    y = (metrics.viewHeight / 2) + metrics.absoluteTop;
   }
   this.zoom(x, y, type);
 };
@@ -2074,19 +2108,20 @@ Blockly.WorkspaceSvg.prototype.zoomCenter = function(type) {
 /**
  * Zoom the blocks to fit in the workspace if possible.
  */
-Blockly.WorkspaceSvg.prototype.zoomToFit = function() {
+WorkspaceSvg.prototype.zoomToFit = function() {
   if (!this.isMovable()) {
-    console.warn('Tried to move a non-movable workspace. This could result' +
+    console.warn(
+        'Tried to move a non-movable workspace. This could result' +
         ' in blocks becoming inaccessible.');
     return;
   }
 
-  var metrics = this.getMetrics();
-  var workspaceWidth = metrics.viewWidth;
-  var workspaceHeight = metrics.viewHeight;
-  var blocksBox = this.getBlocksBoundingBox();
-  var blocksWidth = blocksBox.right - blocksBox.left;
-  var blocksHeight = blocksBox.bottom - blocksBox.top;
+  const metrics = this.getMetrics();
+  let workspaceWidth = metrics.viewWidth;
+  let workspaceHeight = metrics.viewHeight;
+  const blocksBox = this.getBlocksBoundingBox();
+  let blocksWidth = blocksBox.right - blocksBox.left;
+  let blocksHeight = blocksBox.bottom - blocksBox.top;
   if (!blocksWidth) {
     return;  // Prevents zooming to infinity.
   }
@@ -2107,14 +2142,14 @@ Blockly.WorkspaceSvg.prototype.zoomToFit = function() {
   }
 
   // Scale Units: (pixels / workspaceUnit)
-  var ratioX = workspaceWidth / blocksWidth;
-  var ratioY = workspaceHeight / blocksHeight;
-  Blockly.Events.disable();
+  const ratioX = workspaceWidth / blocksWidth;
+  const ratioY = workspaceHeight / blocksHeight;
+  Events.disable();
   try {
     this.setScale(Math.min(ratioX, ratioY));
     this.scrollCenter();
   } finally {
-    Blockly.Events.enable();
+    Events.enable();
   }
   this.maybeFireViewportChangeEvent();
 };
@@ -2124,11 +2159,11 @@ Blockly.WorkspaceSvg.prototype.zoomToFit = function() {
  * transform changes.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.beginCanvasTransition = function() {
-  Blockly.utils.dom.addClass(
+WorkspaceSvg.prototype.beginCanvasTransition = function() {
+  dom.addClass(
       /** @type {!SVGElement} */ (this.svgBlockCanvas_),
       'blocklyCanvasTransitioning');
-  Blockly.utils.dom.addClass(
+  dom.addClass(
       /** @type {!SVGElement} */ (this.svgBubbleCanvas_),
       'blocklyCanvasTransitioning');
 };
@@ -2137,11 +2172,11 @@ Blockly.WorkspaceSvg.prototype.beginCanvasTransition = function() {
  * Remove transition class from the block and bubble canvas.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.endCanvasTransition = function() {
-  Blockly.utils.dom.removeClass(
+WorkspaceSvg.prototype.endCanvasTransition = function() {
+  dom.removeClass(
       /** @type {!SVGElement} */ (this.svgBlockCanvas_),
       'blocklyCanvasTransitioning');
-  Blockly.utils.dom.removeClass(
+  dom.removeClass(
       /** @type {!SVGElement} */ (this.svgBubbleCanvas_),
       'blocklyCanvasTransitioning');
 };
@@ -2149,16 +2184,17 @@ Blockly.WorkspaceSvg.prototype.endCanvasTransition = function() {
 /**
  * Center the workspace.
  */
-Blockly.WorkspaceSvg.prototype.scrollCenter = function() {
+WorkspaceSvg.prototype.scrollCenter = function() {
   if (!this.isMovable()) {
-    console.warn('Tried to move a non-movable workspace. This could result' +
+    console.warn(
+        'Tried to move a non-movable workspace. This could result' +
         ' in blocks becoming inaccessible.');
     return;
   }
 
-  var metrics = this.getMetrics();
-  var x = (metrics.scrollWidth - metrics.viewWidth) / 2;
-  var y = (metrics.scrollHeight - metrics.viewHeight) / 2;
+  const metrics = this.getMetrics();
+  let x = (metrics.scrollWidth - metrics.viewWidth) / 2;
+  let y = (metrics.scrollHeight - metrics.viewHeight) / 2;
 
   // Convert from workspace directions to canvas directions.
   x = -x - metrics.scrollLeft;
@@ -2171,52 +2207,53 @@ Blockly.WorkspaceSvg.prototype.scrollCenter = function() {
  * @param {?string} id ID of block center on.
  * @public
  */
-Blockly.WorkspaceSvg.prototype.centerOnBlock = function(id) {
+WorkspaceSvg.prototype.centerOnBlock = function(id) {
   if (!this.isMovable()) {
-    console.warn('Tried to move a non-movable workspace. This could result' +
+    console.warn(
+        'Tried to move a non-movable workspace. This could result' +
         ' in blocks becoming inaccessible.');
     return;
   }
 
-  var block = id ? this.getBlockById(id) : null;
+  const block = id ? this.getBlockById(id) : null;
   if (!block) {
     return;
   }
 
   // XY is in workspace coordinates.
-  var xy = block.getRelativeToSurfaceXY();
+  const xy = block.getRelativeToSurfaceXY();
   // Height/width is in workspace units.
-  var heightWidth = block.getHeightWidth();
+  const heightWidth = block.getHeightWidth();
 
   // Find the enter of the block in workspace units.
-  var blockCenterY = xy.y + heightWidth.height / 2;
+  const blockCenterY = xy.y + heightWidth.height / 2;
 
   // In RTL the block's position is the top right of the block, not top left.
-  var multiplier = this.RTL ? -1 : 1;
-  var blockCenterX = xy.x + (multiplier * heightWidth.width / 2);
+  const multiplier = this.RTL ? -1 : 1;
+  const blockCenterX = xy.x + (multiplier * heightWidth.width / 2);
 
   // Workspace scale, used to convert from workspace coordinates to pixels.
-  var scale = this.scale;
+  const scale = this.scale;
 
   // Center of block in pixels, relative to workspace origin (center 0,0).
   // Scrolling to here would put the block in the top-left corner of the
   // visible workspace.
-  var pixelX = blockCenterX * scale;
-  var pixelY = blockCenterY * scale;
+  const pixelX = blockCenterX * scale;
+  const pixelY = blockCenterY * scale;
 
-  var metrics = this.getMetrics();
+  const metrics = this.getMetrics();
 
   // viewHeight and viewWidth are in pixels.
-  var halfViewWidth = metrics.viewWidth / 2;
-  var halfViewHeight = metrics.viewHeight / 2;
+  const halfViewWidth = metrics.viewWidth / 2;
+  const halfViewHeight = metrics.viewHeight / 2;
 
   // Put the block in the center of the visible workspace instead.
-  var scrollToCenterX = pixelX - halfViewWidth;
-  var scrollToCenterY = pixelY - halfViewHeight;
+  const scrollToCenterX = pixelX - halfViewWidth;
+  const scrollToCenterY = pixelY - halfViewHeight;
 
   // Convert from workspace directions to canvas directions.
-  var x = -scrollToCenterX;
-  var y = -scrollToCenterY;
+  const x = -scrollToCenterX;
+  const y = -scrollToCenterY;
 
   this.scroll(x, y);
 };
@@ -2225,11 +2262,12 @@ Blockly.WorkspaceSvg.prototype.centerOnBlock = function(id) {
  * Set the workspace's zoom factor.
  * @param {number} newScale Zoom factor. Units: (pixels / workspaceUnit).
  */
-Blockly.WorkspaceSvg.prototype.setScale = function(newScale) {
+WorkspaceSvg.prototype.setScale = function(newScale) {
   if (this.options.zoomOptions.maxScale &&
       newScale > this.options.zoomOptions.maxScale) {
     newScale = this.options.zoomOptions.maxScale;
-  } else if (this.options.zoomOptions.minScale &&
+  } else if (
+      this.options.zoomOptions.minScale &&
       newScale < this.options.zoomOptions.minScale) {
     newScale = this.options.zoomOptions.minScale;
   }
@@ -2237,7 +2275,7 @@ Blockly.WorkspaceSvg.prototype.setScale = function(newScale) {
 
   Blockly.hideChaff(false);
   // Get the flyout, if any, whether our own or owned by the toolbox.
-  var flyout = this.getFlyout(false);
+  const flyout = this.getFlyout(false);
   if (flyout && flyout.isVisible()) {
     flyout.reflow();
     this.recordDragTargets();
@@ -2249,7 +2287,7 @@ Blockly.WorkspaceSvg.prototype.setScale = function(newScale) {
   // We call scroll instead of scrollbar.resize() so that we can center the
   // zoom correctly without scrollbars, but scroll does not resize the
   // scrollbars so we have to call resizeView/resizeContent as well.
-  var metrics = this.getMetrics();
+  const metrics = this.getMetrics();
 
   this.scrollX -= metrics.absoluteLeft;
   this.scrollY -= metrics.absoluteTop;
@@ -2274,7 +2312,7 @@ Blockly.WorkspaceSvg.prototype.setScale = function(newScale) {
  * the parent to get the workspace scale.
  * @return {number} The workspace zoom factor. Units: (pixels / workspaceUnit).
  */
-Blockly.WorkspaceSvg.prototype.getScale = function() {
+WorkspaceSvg.prototype.getScale = function() {
   if (this.options.parentWorkspace) {
     return this.options.parentWorkspace.getScale();
   }
@@ -2289,19 +2327,20 @@ Blockly.WorkspaceSvg.prototype.getScale = function() {
  * @param {number} y Target Y to scroll to.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.scroll = function(x, y) {
+WorkspaceSvg.prototype.scroll = function(x, y) {
   Blockly.hideChaff(/* opt_onlyClosePopups */ true);
 
   // Keep scrolling within the bounds of the content.
-  var metrics = this.getMetrics();
+  const metrics = this.getMetrics();
   // Canvas coordinates (aka scroll coordinates) have inverse directionality
   // to workspace coordinates so we have to inverse them.
   x = Math.min(x, -metrics.scrollLeft);
   y = Math.min(y, -metrics.scrollTop);
-  var maxXDisplacement = Math.max(0, metrics.scrollWidth - metrics.viewWidth);
-  var maxXScroll = metrics.scrollLeft + maxXDisplacement;
-  var maxYDisplacement = Math.max(0, metrics.scrollHeight - metrics.viewHeight);
-  var maxYScroll = metrics.scrollTop + maxYDisplacement;
+  const maxXDisplacement = Math.max(0, metrics.scrollWidth - metrics.viewWidth);
+  const maxXScroll = metrics.scrollLeft + maxXDisplacement;
+  const maxYDisplacement =
+      Math.max(0, metrics.scrollHeight - metrics.viewHeight);
+  const maxYScroll = metrics.scrollTop + maxYDisplacement;
   x = Math.max(x, -maxXScroll);
   y = Math.max(y, -maxYScroll);
   this.scrollX = x;
@@ -2329,25 +2368,25 @@ Blockly.WorkspaceSvg.prototype.scroll = function(x, y) {
  * @param {!Object} xyRatio Contains an x and/or y property which is a float
  *     between 0 and 1 specifying the degree of scrolling.
  * @private
- * @this {Blockly.WorkspaceSvg}
+ * @this {WorkspaceSvg}
  */
-Blockly.WorkspaceSvg.setTopLevelWorkspaceMetrics_ = function(xyRatio) {
-  var metrics = this.getMetrics();
+WorkspaceSvg.setTopLevelWorkspaceMetrics_ = function(xyRatio) {
+  const metrics = this.getMetrics();
 
   if (typeof xyRatio.x == 'number') {
     this.scrollX =
         -(metrics.scrollLeft +
-            (metrics.scrollWidth - metrics.viewWidth) * xyRatio.x);
+          (metrics.scrollWidth - metrics.viewWidth) * xyRatio.x);
   }
   if (typeof xyRatio.y == 'number') {
     this.scrollY =
         -(metrics.scrollTop +
-            (metrics.scrollHeight - metrics.viewHeight) * xyRatio.y);
+          (metrics.scrollHeight - metrics.viewHeight) * xyRatio.y);
   }
   // We have to shift the translation so that when the canvas is at 0, 0 the
   // workspace origin is not underneath the toolbox.
-  var x = this.scrollX + metrics.absoluteLeft;
-  var y = this.scrollY + metrics.absoluteTop;
+  const x = this.scrollX + metrics.absoluteLeft;
+  const y = this.scrollY + metrics.absoluteTop;
   // We could call scroll here, but that has extra checks we don't need to do.
   this.translate(x, y);
 };
@@ -2355,84 +2394,84 @@ Blockly.WorkspaceSvg.setTopLevelWorkspaceMetrics_ = function(xyRatio) {
 /**
  * Find the block on this workspace with the specified ID.
  * @param {string} id ID of block to find.
- * @return {?Blockly.BlockSvg} The sought after block, or null if not found.
+ * @return {?BlockSvg} The sought after block, or null if not found.
  * @override
  */
-Blockly.WorkspaceSvg.prototype.getBlockById = function(id) {
-  return /** @type {Blockly.BlockSvg} */ (
-    Blockly.WorkspaceSvg.superClass_.getBlockById.call(this, id));
+WorkspaceSvg.prototype.getBlockById = function(id) {
+  return /** @type {BlockSvg} */ (
+      WorkspaceSvg.superClass_.getBlockById.call(this, id));
 };
 
 /**
  * Finds the top-level blocks and returns them.  Blocks are optionally sorted
  * by position; top to bottom (with slight LTR or RTL bias).
  * @param {boolean} ordered Sort the list if true.
- * @return {!Array<!Blockly.BlockSvg>} The top-level block objects.
+ * @return {!Array<!BlockSvg>} The top-level block objects.
  * @override
  */
-Blockly.WorkspaceSvg.prototype.getTopBlocks = function(ordered) {
-  return Blockly.WorkspaceSvg.superClass_.getTopBlocks.call(this, ordered);
+WorkspaceSvg.prototype.getTopBlocks = function(ordered) {
+  return WorkspaceSvg.superClass_.getTopBlocks.call(this, ordered);
 };
 
 /**
  * Adds a block to the list of top blocks.
- * @param {!Blockly.Block} block Block to add.
+ * @param {!Block} block Block to add.
  */
-Blockly.WorkspaceSvg.prototype.addTopBlock = function(block) {
-  this.addTopBoundedElement(/** @type {!Blockly.BlockSvg} */ (block));
-  Blockly.WorkspaceSvg.superClass_.addTopBlock.call(this, block);
+WorkspaceSvg.prototype.addTopBlock = function(block) {
+  this.addTopBoundedElement(/** @type {!BlockSvg} */ (block));
+  WorkspaceSvg.superClass_.addTopBlock.call(this, block);
 };
 
 /**
  * Removes a block from the list of top blocks.
- * @param {!Blockly.Block} block Block to remove.
+ * @param {!Block} block Block to remove.
  */
-Blockly.WorkspaceSvg.prototype.removeTopBlock = function(block) {
-  this.removeTopBoundedElement(/** @type {!Blockly.BlockSvg} */ (block));
-  Blockly.WorkspaceSvg.superClass_.removeTopBlock.call(this, block);
+WorkspaceSvg.prototype.removeTopBlock = function(block) {
+  this.removeTopBoundedElement(/** @type {!BlockSvg} */ (block));
+  WorkspaceSvg.superClass_.removeTopBlock.call(this, block);
 };
 
 /**
  * Adds a comment to the list of top comments.
- * @param {!Blockly.WorkspaceComment} comment comment to add.
+ * @param {!WorkspaceComment} comment comment to add.
  */
-Blockly.WorkspaceSvg.prototype.addTopComment = function(comment) {
+WorkspaceSvg.prototype.addTopComment = function(comment) {
   this.addTopBoundedElement(
-      /** @type {!Blockly.WorkspaceCommentSvg} */ (comment));
-  Blockly.WorkspaceSvg.superClass_.addTopComment.call(this, comment);
+      /** @type {!WorkspaceCommentSvg} */ (comment));
+  WorkspaceSvg.superClass_.addTopComment.call(this, comment);
 };
 
 /**
  * Removes a comment from the list of top comments.
- * @param {!Blockly.WorkspaceComment} comment comment to remove.
+ * @param {!WorkspaceComment} comment comment to remove.
  */
-Blockly.WorkspaceSvg.prototype.removeTopComment = function(comment) {
+WorkspaceSvg.prototype.removeTopComment = function(comment) {
   this.removeTopBoundedElement(
-      /** @type {!Blockly.WorkspaceCommentSvg} */ (comment));
-  Blockly.WorkspaceSvg.superClass_.removeTopComment.call(this, comment);
+      /** @type {!WorkspaceCommentSvg} */ (comment));
+  WorkspaceSvg.superClass_.removeTopComment.call(this, comment);
 };
 
 /**
  * Adds a bounded element to the list of top bounded elements.
- * @param {!Blockly.IBoundedElement} element Bounded element to add.
+ * @param {!IBoundedElement} element Bounded element to add.
  */
-Blockly.WorkspaceSvg.prototype.addTopBoundedElement = function(element) {
+WorkspaceSvg.prototype.addTopBoundedElement = function(element) {
   this.topBoundedElements_.push(element);
 };
 
 /**
  * Removes a bounded element from the list of top bounded elements.
- * @param {!Blockly.IBoundedElement} element Bounded element to remove.
+ * @param {!IBoundedElement} element Bounded element to remove.
  */
-Blockly.WorkspaceSvg.prototype.removeTopBoundedElement = function(element) {
-  Blockly.utils.arrayRemove(this.topBoundedElements_, element);
+WorkspaceSvg.prototype.removeTopBoundedElement = function(element) {
+  utils.arrayRemove(this.topBoundedElements_, element);
 };
 
 /**
  * Finds the top-level bounded elements and returns them.
- * @return {!Array<!Blockly.IBoundedElement>} The top-level bounded elements.
+ * @return {!Array<!IBoundedElement>} The top-level bounded elements.
  */
-Blockly.WorkspaceSvg.prototype.getTopBoundedElements = function() {
+WorkspaceSvg.prototype.getTopBoundedElements = function() {
   return [].concat(this.topBoundedElements_);
 };
 
@@ -2443,8 +2482,8 @@ Blockly.WorkspaceSvg.prototype.getTopBoundedElements = function() {
  * Use to avoid resizing during a batch operation, for performance.
  * @param {boolean} enabled Whether resizes should be enabled.
  */
-Blockly.WorkspaceSvg.prototype.setResizesEnabled = function(enabled) {
-  var reenabled = (!this.resizesEnabled_ && enabled);
+WorkspaceSvg.prototype.setResizesEnabled = function(enabled) {
+  const reenabled = (!this.resizesEnabled_ && enabled);
   this.resizesEnabled_ = enabled;
   if (reenabled) {
     // Newly enabled.  Trigger a resize.
@@ -2455,9 +2494,9 @@ Blockly.WorkspaceSvg.prototype.setResizesEnabled = function(enabled) {
 /**
  * Dispose of all blocks in workspace, with an optimization to prevent resizes.
  */
-Blockly.WorkspaceSvg.prototype.clear = function() {
+WorkspaceSvg.prototype.clear = function() {
   this.setResizesEnabled(false);
-  Blockly.WorkspaceSvg.superClass_.clear.call(this);
+  WorkspaceSvg.superClass_.clear.call(this);
   this.topBoundedElements_ = [];
   this.setResizesEnabled(true);
 };
@@ -2470,10 +2509,10 @@ Blockly.WorkspaceSvg.prototype.clear = function() {
  * should be matched by a call to
  * registerButtonCallback("CREATE_VARIABLE", yourCallbackFunction).
  * @param {string} key The name to use to look up this function.
- * @param {function(!Blockly.FlyoutButton)} func The function to call when the
+ * @param {function(!FlyoutButton)} func The function to call when the
  *     given button is clicked.
  */
-Blockly.WorkspaceSvg.prototype.registerButtonCallback = function(key, func) {
+WorkspaceSvg.prototype.registerButtonCallback = function(key, func) {
   if (typeof func != 'function') {
     throw TypeError('Button callbacks must be functions.');
   }
@@ -2484,11 +2523,11 @@ Blockly.WorkspaceSvg.prototype.registerButtonCallback = function(key, func) {
  * Get the callback function associated with a given key, for clicks on buttons
  * and labels in the flyout.
  * @param {string} key The name to use to look up the function.
- * @return {?function(!Blockly.FlyoutButton)} The function corresponding to the
+ * @return {?function(!FlyoutButton)} The function corresponding to the
  *     given key for this workspace; null if no callback is registered.
  */
-Blockly.WorkspaceSvg.prototype.getButtonCallback = function(key) {
-  var result = this.flyoutButtonCallbacks_[key];
+WorkspaceSvg.prototype.getButtonCallback = function(key) {
+  const result = this.flyoutButtonCallbacks_[key];
   return result ? result : null;
 };
 
@@ -2496,7 +2535,7 @@ Blockly.WorkspaceSvg.prototype.getButtonCallback = function(key) {
  * Remove a callback for a click on a button in the flyout.
  * @param {string} key The name associated with the callback function.
  */
-Blockly.WorkspaceSvg.prototype.removeButtonCallback = function(key) {
+WorkspaceSvg.prototype.removeButtonCallback = function(key) {
   this.flyoutButtonCallbacks_[key] = null;
 };
 
@@ -2505,11 +2544,10 @@ Blockly.WorkspaceSvg.prototype.removeButtonCallback = function(key) {
  * custom toolbox categories in this workspace.  See the variable and procedure
  * categories as an example.
  * @param {string} key The name to use to look up this function.
- * @param {function(!Blockly.Workspace):!Array<!Element>} func The function to
+ * @param {function(!Workspace):!Array<!Element>} func The function to
  *     call when the given toolbox category is opened.
  */
-Blockly.WorkspaceSvg.prototype.registerToolboxCategoryCallback = function(key,
-    func) {
+WorkspaceSvg.prototype.registerToolboxCategoryCallback = function(key, func) {
   if (typeof func != 'function') {
     throw TypeError('Toolbox category callbacks must be functions.');
   }
@@ -2520,11 +2558,11 @@ Blockly.WorkspaceSvg.prototype.registerToolboxCategoryCallback = function(key,
  * Get the callback function associated with a given key, for populating
  * custom toolbox categories in this workspace.
  * @param {string} key The name to use to look up the function.
- * @return {?function(!Blockly.Workspace):!Array<!Element>} The function
+ * @return {?function(!Workspace):!Array<!Element>} The function
  *     corresponding to the given key for this workspace, or null if no function
  *     is registered.
  */
-Blockly.WorkspaceSvg.prototype.getToolboxCategoryCallback = function(key) {
+WorkspaceSvg.prototype.getToolboxCategoryCallback = function(key) {
   return this.toolboxCategoryCallbacks_[key] || null;
 };
 
@@ -2532,7 +2570,7 @@ Blockly.WorkspaceSvg.prototype.getToolboxCategoryCallback = function(key) {
  * Remove a callback for a click on a custom category's name in the toolbox.
  * @param {string} key The name associated with the callback function.
  */
-Blockly.WorkspaceSvg.prototype.removeToolboxCategoryCallback = function(key) {
+WorkspaceSvg.prototype.removeToolboxCategoryCallback = function(key) {
   this.toolboxCategoryCallbacks_[key] = null;
 };
 
@@ -2540,15 +2578,16 @@ Blockly.WorkspaceSvg.prototype.removeToolboxCategoryCallback = function(key) {
  * Look up the gesture that is tracking this touch stream on this workspace.
  * May create a new gesture.
  * @param {!Event} e Mouse event or touch event.
- * @return {?Blockly.TouchGesture} The gesture that is tracking this touch
+ * @return {?TouchGesture} The gesture that is tracking this touch
  *     stream, or null if no valid gesture exists.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getGesture = function(e) {
-  var isStart = (e.type == 'mousedown' || e.type == 'touchstart' ||
-      e.type == 'pointerdown');
+WorkspaceSvg.prototype.getGesture = function(e) {
+  const isStart =
+      (e.type == 'mousedown' || e.type == 'touchstart' ||
+       e.type == 'pointerdown');
 
-  var gesture = this.currentGesture_;
+  const gesture = this.currentGesture_;
   if (gesture) {
     if (isStart && gesture.hasStarted()) {
       console.warn('Tried to start the same gesture twice.');
@@ -2563,7 +2602,7 @@ Blockly.WorkspaceSvg.prototype.getGesture = function(e) {
   // No gesture existed on this workspace, but this looks like the start of a
   // new gesture.
   if (isStart) {
-    this.currentGesture_ = new Blockly.TouchGesture(e, this);
+    this.currentGesture_ = new TouchGesture(e, this);
     return this.currentGesture_;
   }
   // No gesture existed and this event couldn't be the start of a new gesture.
@@ -2574,7 +2613,7 @@ Blockly.WorkspaceSvg.prototype.getGesture = function(e) {
  * Clear the reference to the current gesture.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.clearGesture = function() {
+WorkspaceSvg.prototype.clearGesture = function() {
   this.currentGesture_ = null;
 };
 
@@ -2582,7 +2621,7 @@ Blockly.WorkspaceSvg.prototype.clearGesture = function() {
  * Cancel the current gesture, if one exists.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.cancelCurrentGesture = function() {
+WorkspaceSvg.prototype.cancelCurrentGesture = function() {
   if (this.currentGesture_) {
     this.currentGesture_.cancel();
   }
@@ -2590,17 +2629,19 @@ Blockly.WorkspaceSvg.prototype.cancelCurrentGesture = function() {
 
 /**
  * Get the audio manager for this workspace.
- * @return {!Blockly.WorkspaceAudio} The audio manager for this workspace.
+ * @return {!WorkspaceAudio} The audio manager for this workspace.
  */
-Blockly.WorkspaceSvg.prototype.getAudioManager = function() {
+WorkspaceSvg.prototype.getAudioManager = function() {
   return this.audioManager_;
 };
 
 /**
  * Get the grid object for this workspace, or null if there is none.
- * @return {?Blockly.Grid} The grid object for this workspace.
+ * @return {?Grid} The grid object for this workspace.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getGrid = function() {
+WorkspaceSvg.prototype.getGrid = function() {
   return this.grid_;
 };
+
+exports = WorkspaceSvg;
diff --git a/tests/deps.js b/tests/deps.js
index 8cdafbc4c..780484321 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -218,7 +218,7 @@ goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICopyable', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6'});
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);

From ee53e8e8121ec02b46b3a86693be8007b9778d57 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 16:17:48 -0700
Subject: [PATCH 591/833] Update optional requires

---
 core/extensions.js  | 6 ++++--
 core/flyout_base.js | 4 +++-
 tests/deps.js       | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/extensions.js b/core/extensions.js
index bb9ef6731..42dc9d9f6 100644
--- a/core/extensions.js
+++ b/core/extensions.js
@@ -23,6 +23,7 @@ goog.module.declareLegacyNamespace();
 /* eslint-disable-next-line no-unused-vars */
 const Block = goog.requireType('Blockly.Block');
 const utils = goog.require('Blockly.utils');
+goog.requireType('Blockly.Mutator');
 
 
 /**
@@ -102,10 +103,11 @@ const registerMutator = function(name, mixinObj, opt_helperFn, opt_blockList) {
   // Sanity checks passed.
   register(name, function() {
     if (hasMutatorDialog) {
-      if (!Blockly.Mutator) {
+      const Mutator = goog.module.get('Blockly.Mutator');
+      if (!Mutator) {
         throw Error(errorPrefix + 'Missing require for Blockly.Mutator');
       }
-      this.setMutator(new Blockly.Mutator(opt_blockList || []));
+      this.setMutator(new Mutator(opt_blockList || []));
     }
     // Mixin the object.
     this.mixin(mixinObj);
diff --git a/core/flyout_base.js b/core/flyout_base.js
index 2e6908174..8ce566544 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -22,7 +22,8 @@ const ComponentManager = goog.require('Blockly.ComponentManager');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const DeleteArea = goog.require('Blockly.DeleteArea');
 const Events = goog.require('Blockly.Events');
-const FlyoutButton = goog.require('Blockly.FlyoutButton');
+/* 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');
@@ -659,6 +660,7 @@ Flyout.prototype.getDynamicCategoryContents_ = function(categoryName) {
  * @private
  */
 Flyout.prototype.createButton_ = function(btnInfo, isLabel) {
+  const FlyoutButton = goog.module.get('Blockly.FlyoutButton');
   if (!FlyoutButton) {
     throw Error('Missing require for Blockly.FlyoutButton');
   }
diff --git a/tests/deps.js b/tests/deps.js
index 780484321..b36473969 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -71,7 +71,7 @@ goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Bloc
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly', 'Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutButton', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly', 'Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});

From a7fcf881faa74223006a9cd264962ea8d13e175f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 16:14:38 -0700
Subject: [PATCH 592/833] Add missing eslint disable line for required
 interface

---
 core/workspace.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/workspace.js b/core/workspace.js
index c1115e011..32125974e 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -22,6 +22,7 @@ const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
 /* eslint-disable-next-line no-unused-vars */
 const ConnectionDB = goog.requireType('Blockly.ConnectionDB');
 const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
 const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation');
 /* eslint-disable-next-line no-unused-vars */
 const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');

From a04debf2751c37f6c06807a0edd20672cd442186 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Tue, 10 Aug 2021 15:11:56 -0700
Subject: [PATCH 593/833] Fix issue that prevented Mocha and generator tests
 from running on certain configurations (#5344)

* Fix issue that prevented Mocha and generator tests from running on certain configurations

* Link to Blockly issue re: --disable-gpu flag
---
 tests/generators/run_generators_in_browser.js | 5 ++++-
 tests/mocha/run_mocha_tests_in_browser.js     | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/generators/run_generators_in_browser.js b/tests/generators/run_generators_in_browser.js
index 2ab48ee2e..97dcf9727 100644
--- a/tests/generators/run_generators_in_browser.js
+++ b/tests/generators/run_generators_in_browser.js
@@ -51,8 +51,11 @@ async function runGeneratorsInBrowser() {
       args: ['--headless', '--no-sandbox', '--disable-dev-shm-usage', '--allow-file-access-from-files']
     };
   } else {
+    // --disable-gpu is needed to prevent Chrome from hanging on Linux with
+    // NVIDIA drivers older than v295.20. See 
+    // https://github.com/google/blockly/issues/5345 for details.   
     options.capabilities['goog:chromeOptions'] = {
-      args: ['--allow-file-access-from-files']
+      args: ['--allow-file-access-from-files', '--disable-gpu']
     };
   }
 
diff --git a/tests/mocha/run_mocha_tests_in_browser.js b/tests/mocha/run_mocha_tests_in_browser.js
index 253b79f01..3034f38cc 100644
--- a/tests/mocha/run_mocha_tests_in_browser.js
+++ b/tests/mocha/run_mocha_tests_in_browser.js
@@ -36,8 +36,11 @@ async function runMochaTestsInBrowser() {
       ]
     };
   } else {
+    // --disable-gpu is needed to prevent Chrome from hanging on Linux with
+    // NVIDIA drivers older than v295.20. See 
+    // https://github.com/google/blockly/issues/5345 for details.
     options.capabilities['goog:chromeOptions'] = {
-      args: ['--allow-file-access-from-files']
+      args: ['--allow-file-access-from-files', '--disable-gpu']
     };
   }
 

From 18283e816faba04b9a3695a5270e959aebd3f79e Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 11 Aug 2021 08:11:44 -0700
Subject: [PATCH 594/833] Migrate core/renderers/measurables/base.js to
 goog.module syntax (#5308)

* Migrate core/renderers/measurables/base.js to goog.module

* Migrate core/renderers/measurables/base.js to named requires
---
 core/renderers/measurables/base.js | 19 +++++++++++--------
 tests/deps.js                      |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/core/renderers/measurables/base.js b/core/renderers/measurables/base.js
index 22247d9ff..b3a16d061 100644
--- a/core/renderers/measurables/base.js
+++ b/core/renderers/measurables/base.js
@@ -11,36 +11,39 @@
 
 'use strict';
 
-goog.provide('Blockly.blockRendering.Measurable');
+goog.module('Blockly.blockRendering.Measurable');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.Types');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const Types = goog.require('Blockly.blockRendering.Types');
 
 
 /**
  * The base class to represent a part of a block that takes up space during
  * rendering.  The constructor for each non-spacer Measurable records the size
  * of the block element (e.g. field, statement input).
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
  * @package
  * @constructor
  */
-Blockly.blockRendering.Measurable = function(constants) {
+const Measurable = function(constants) {
   this.width = 0;
   this.height = 0;
-  this.type = Blockly.blockRendering.Types.NONE;
+  this.type = Types.NONE;
 
   this.xPos = 0;
   this.centerline = 0;
 
   /**
    * The renderer's constant provider.
-   * @type {!Blockly.blockRendering.ConstantProvider}
+   * @type {!ConstantProvider}
    * @protected
    */
   this.constants_ = constants;
 
   this.notchOffset = this.constants_.NOTCH_OFFSET_LEFT;
 };
+
+exports = Measurable;
diff --git a/tests/deps.js b/tests/deps.js
index b36473969..f9423f309 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -146,7 +146,7 @@ goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderI
 goog.addDependency('../../core/renderers/geras/measurables/inputs.js', ['Blockly.geras.InlineInput', 'Blockly.geras.StatementInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types']);
+goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/inputs.js', ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/row_elements.js', ['Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);

From 0f7f597758890c6bcf927fbf5abda604214daad2 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 11 Aug 2021 08:26:04 -0700
Subject: [PATCH 595/833] Migrate core/renderers/geras/drawer.js to goog.module
 syntax (#5300)

* Migrate core/renderers/geras/drawer.js to ES6 const/let

* Migrate core/renderers/geras/drawer.js to goog.module

* Migrate core/renderers/geras/drawer.js to named requires

* clang-format core/renderers/geras/drawer.js

* Remove Blockly prefix on call to blockRendering in core/renderers/geras/drawer.js
---
 core/renderers/geras/drawer.js | 123 +++++++++++++++++----------------
 tests/deps.js                  |   2 +-
 2 files changed, 64 insertions(+), 61 deletions(-)

diff --git a/core/renderers/geras/drawer.js b/core/renderers/geras/drawer.js
index b1ebc59a6..8c4781890 100644
--- a/core/renderers/geras/drawer.js
+++ b/core/renderers/geras/drawer.js
@@ -10,51 +10,54 @@
  */
 'use strict';
 
-goog.provide('Blockly.geras.Drawer');
+goog.module('Blockly.geras.Drawer');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.Drawer');
-goog.require('Blockly.geras.Highlighter');
-goog.require('Blockly.geras.RenderInfo');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.svgPaths');
-
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.geras.PathObject');
+const BaseDrawer = goog.require('Blockly.blockRendering.Drawer');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const Highlighter = goog.require('Blockly.geras.Highlighter');
+/* eslint-disable-next-line no-unused-vars */
+const PathObject = goog.requireType('Blockly.geras.PathObject');
+/* eslint-disable-next-line no-unused-vars */
+const RenderInfo = goog.requireType('Blockly.geras.RenderInfo');
+const blockRendering = goog.require('Blockly.blockRendering');
+const object = goog.require('Blockly.utils.object');
+const svgPaths = goog.require('Blockly.utils.svgPaths');
 
 
 /**
  * An object that draws a block based on the given rendering information.
- * @param {!Blockly.BlockSvg} block The block to render.
- * @param {!Blockly.geras.RenderInfo} info An object containing all
+ * @param {!BlockSvg} block The block to render.
+ * @param {!RenderInfo} info An object containing all
  *   information needed to render this block.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Drawer}
+ * @extends {BaseDrawer}
  */
-Blockly.geras.Drawer = function(block, info) {
-  Blockly.geras.Drawer.superClass_.constructor.call(this, block, info);
+const Drawer = function(block, info) {
+  Drawer.superClass_.constructor.call(this, block, info);
   // Unlike Thrasos, Geras has highlights and drop shadows.
-  this.highlighter_ = new Blockly.geras.Highlighter(info);
+  this.highlighter_ = new Highlighter(info);
 };
-Blockly.utils.object.inherits(Blockly.geras.Drawer,
-    Blockly.blockRendering.Drawer);
+object.inherits(Drawer, BaseDrawer);
 
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.draw = function() {
+Drawer.prototype.draw = function() {
   this.hideHiddenIcons_();
   this.drawOutline_();
   this.drawInternals_();
 
-  var pathObject =
-    /** @type {!Blockly.geras.PathObject} */ (this.block_.pathObject);
+  const pathObject =
+      /** @type {!PathObject} */ (this.block_.pathObject);
   pathObject.setPath(this.outlinePath_ + '\n' + this.inlinePath_);
   pathObject.setHighlightPath(this.highlighter_.getPath());
   if (this.info_.RTL) {
     pathObject.flipRTL();
   }
-  if (Blockly.blockRendering.isDebuggerEnabled()) {
+  if (blockRendering.isDebuggerEnabled()) {
     this.block_.renderingDebugger.drawDebug(this.block_, this.info_);
   }
   this.recordSizeOnBlock_();
@@ -63,58 +66,57 @@ Blockly.geras.Drawer.prototype.draw = function() {
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.drawTop_ = function() {
+Drawer.prototype.drawTop_ = function() {
   this.highlighter_.drawTopCorner(this.info_.topRow);
   this.highlighter_.drawRightSideRow(this.info_.topRow);
 
-  Blockly.geras.Drawer.superClass_.drawTop_.call(this);
+  Drawer.superClass_.drawTop_.call(this);
 };
 
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.drawJaggedEdge_ = function(row) {
+Drawer.prototype.drawJaggedEdge_ = function(row) {
   this.highlighter_.drawJaggedEdge_(row);
 
-  Blockly.geras.Drawer.superClass_.drawJaggedEdge_.call(this, row);
+  Drawer.superClass_.drawJaggedEdge_.call(this, row);
 };
 
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.drawValueInput_ = function(row) {
+Drawer.prototype.drawValueInput_ = function(row) {
   this.highlighter_.drawValueInput(row);
 
-  Blockly.geras.Drawer.superClass_.drawValueInput_.call(this, row);
+  Drawer.superClass_.drawValueInput_.call(this, row);
 };
 
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.drawStatementInput_ = function(row) {
+Drawer.prototype.drawStatementInput_ = function(row) {
   this.highlighter_.drawStatementInput(row);
 
-  Blockly.geras.Drawer.superClass_.drawStatementInput_.call(this, row);
+  Drawer.superClass_.drawStatementInput_.call(this, row);
 };
 
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.drawRightSideRow_ = function(row) {
+Drawer.prototype.drawRightSideRow_ = function(row) {
   this.highlighter_.drawRightSideRow(row);
 
-  this.outlinePath_ +=
-      Blockly.utils.svgPaths.lineOnAxis('H', row.xPos + row.width) +
-      Blockly.utils.svgPaths.lineOnAxis('V', row.yPos + row.height);
+  this.outlinePath_ += svgPaths.lineOnAxis('H', row.xPos + row.width) +
+      svgPaths.lineOnAxis('V', row.yPos + row.height);
 };
 
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.drawBottom_ = function() {
+Drawer.prototype.drawBottom_ = function() {
   this.highlighter_.drawBottomRow(this.info_.bottomRow);
 
-  Blockly.geras.Drawer.superClass_.drawBottom_.call(this);
+  Drawer.superClass_.drawBottom_.call(this);
 };
 
 /**
@@ -123,65 +125,64 @@ Blockly.geras.Drawer.prototype.drawBottom_ = function() {
  * @protected
  * @override
  */
-Blockly.geras.Drawer.prototype.drawLeft_ = function() {
+Drawer.prototype.drawLeft_ = function() {
   this.highlighter_.drawLeft();
 
-  Blockly.geras.Drawer.superClass_.drawLeft_.call(this);
+  Drawer.superClass_.drawLeft_.call(this);
 };
 
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.drawInlineInput_ = function(input) {
+Drawer.prototype.drawInlineInput_ = function(input) {
   this.highlighter_.drawInlineInput(input);
 
-  Blockly.geras.Drawer.superClass_.drawInlineInput_.call(this, input);
+  Drawer.superClass_.drawInlineInput_.call(this, input);
 };
 
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.positionInlineInputConnection_ = function(input) {
-  var yPos = input.centerline - input.height / 2;
+Drawer.prototype.positionInlineInputConnection_ = function(input) {
+  const yPos = input.centerline - input.height / 2;
   // Move the connection.
   if (input.connectionModel) {
     // xPos already contains info about startX
-    var connX = input.xPos + input.connectionWidth +
-        this.constants_.DARK_PATH_OFFSET;
+    let connX =
+        input.xPos + input.connectionWidth + this.constants_.DARK_PATH_OFFSET;
     if (this.info_.RTL) {
       connX *= -1;
     }
     input.connectionModel.setOffsetInBlock(
-        connX, yPos + input.connectionOffsetY +
-        this.constants_.DARK_PATH_OFFSET);
+        connX,
+        yPos + input.connectionOffsetY + this.constants_.DARK_PATH_OFFSET);
   }
 };
 
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.positionStatementInputConnection_ = function(row) {
-  var input = row.getLastInput();
+Drawer.prototype.positionStatementInputConnection_ = function(row) {
+  const input = row.getLastInput();
   if (input.connectionModel) {
-    var connX = row.xPos + row.statementEdge + input.notchOffset;
+    let connX = row.xPos + row.statementEdge + input.notchOffset;
     if (this.info_.RTL) {
       connX *= -1;
     } else {
       connX += this.constants_.DARK_PATH_OFFSET;
     }
-    input.connectionModel.setOffsetInBlock(connX,
-        row.yPos + this.constants_.DARK_PATH_OFFSET);
+    input.connectionModel.setOffsetInBlock(
+        connX, row.yPos + this.constants_.DARK_PATH_OFFSET);
   }
 };
 
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.positionExternalValueConnection_ = function(row) {
-  var input = row.getLastInput();
+Drawer.prototype.positionExternalValueConnection_ = function(row) {
+  const input = row.getLastInput();
   if (input.connectionModel) {
-    var connX = row.xPos + row.width +
-        this.constants_.DARK_PATH_OFFSET;
+    let connX = row.xPos + row.width + this.constants_.DARK_PATH_OFFSET;
     if (this.info_.RTL) {
       connX *= -1;
     }
@@ -192,15 +193,17 @@ Blockly.geras.Drawer.prototype.positionExternalValueConnection_ = function(row)
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.positionNextConnection_ = function() {
-  var bottomRow = this.info_.bottomRow;
+Drawer.prototype.positionNextConnection_ = function() {
+  const bottomRow = this.info_.bottomRow;
 
   if (bottomRow.connection) {
-    var connInfo = bottomRow.connection;
-    var x = connInfo.xPos;  // Already contains info about startX.
-    var connX = (this.info_.RTL ? -x : x) +
-        (this.constants_.DARK_PATH_OFFSET / 2);
+    const connInfo = bottomRow.connection;
+    const x = connInfo.xPos;  // Already contains info about startX.
+    const connX =
+        (this.info_.RTL ? -x : x) + (this.constants_.DARK_PATH_OFFSET / 2);
     connInfo.connectionModel.setOffsetInBlock(
         connX, bottomRow.baseline + this.constants_.DARK_PATH_OFFSET);
   }
 };
+
+exports = Drawer;
diff --git a/tests/deps.js b/tests/deps.js
index f9423f309..fe3dc6e7b 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -139,7 +139,7 @@ goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockR
 goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.geras.RenderInfo', 'Blockly.utils.object', 'Blockly.utils.svgPaths']);
+goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 228ecb0f2d20b783030dc608cf8392986f78e470 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 11 Aug 2021 08:30:05 -0700
Subject: [PATCH 596/833] Migrate core/renderers/geras/renderer.js to
 goog.module syntax (#5307)

* Migrate core/renderers/geras/renderer.js to goog.module

* Migrate core/renderers/geras/renderer.js to named requires

* clang-format core/renderers/geras/renderer.js
---
 core/renderers/geras/renderer.js | 109 ++++++++++++++++---------------
 tests/deps.js                    |   2 +-
 2 files changed, 58 insertions(+), 53 deletions(-)

diff --git a/core/renderers/geras/renderer.js b/core/renderers/geras/renderer.js
index 659cb42b6..7c505e8c8 100644
--- a/core/renderers/geras/renderer.js
+++ b/core/renderers/geras/renderer.js
@@ -10,21 +10,25 @@
  */
 'use strict';
 
-goog.provide('Blockly.geras.Renderer');
+goog.module('Blockly.geras.Renderer');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering');
-goog.require('Blockly.blockRendering.Renderer');
-goog.require('Blockly.geras.ConstantProvider');
-goog.require('Blockly.geras.Drawer');
-goog.require('Blockly.geras.HighlightConstantProvider');
-goog.require('Blockly.geras.PathObject');
-goog.require('Blockly.geras.RenderInfo');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.blockRendering.RenderInfo');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.Theme');
+const BaseRenderer = goog.require('Blockly.blockRendering.Renderer');
+/* eslint-disable-next-line no-unused-vars */
+const BaseRenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
+/* eslint-disable-next-line no-unused-vars */
+const BaseConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const ConstantProvider = goog.require('Blockly.geras.ConstantProvider');
+const Drawer = goog.require('Blockly.geras.Drawer');
+const HighlightConstantProvider = goog.require('Blockly.geras.HighlightConstantProvider');
+const PathObject = goog.require('Blockly.geras.PathObject');
+const RenderInfo = goog.require('Blockly.geras.RenderInfo');
+/* eslint-disable-next-line no-unused-vars */
+const Theme = goog.requireType('Blockly.Theme');
+const blockRendering = goog.require('Blockly.blockRendering');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -32,20 +36,19 @@ goog.requireType('Blockly.Theme');
  * @param {string} name The renderer name.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Renderer}
+ * @extends {BaseRenderer}
  */
-Blockly.geras.Renderer = function(name) {
-  Blockly.geras.Renderer.superClass_.constructor.call(this, name);
+const Renderer = function(name) {
+  Renderer.superClass_.constructor.call(this, name);
 
   /**
    * The renderer's highlight constant provider.
-   * @type {Blockly.geras.HighlightConstantProvider}
+   * @type {HighlightConstantProvider}
    * @private
    */
   this.highlightConstants_ = null;
 };
-Blockly.utils.object.inherits(Blockly.geras.Renderer,
-    Blockly.blockRendering.Renderer);
+object.inherits(Renderer, BaseRenderer);
 
 /**
  * Initialize the renderer.  Geras has a highlight provider in addition to
@@ -53,10 +56,8 @@ Blockly.utils.object.inherits(Blockly.geras.Renderer,
  * @package
  * @override
  */
-Blockly.geras.Renderer.prototype.init = function(theme,
-    opt_rendererOverrides) {
-  Blockly.geras.Renderer.superClass_.init.call(this, theme,
-      opt_rendererOverrides);
+Renderer.prototype.init = function(theme, opt_rendererOverrides) {
+  Renderer.superClass_.init.call(this, theme, opt_rendererOverrides);
   this.highlightConstants_ = this.makeHighlightConstants_();
   this.highlightConstants_.init();
 };
@@ -64,80 +65,84 @@ Blockly.geras.Renderer.prototype.init = function(theme,
 /**
  * @override
  */
-Blockly.geras.Renderer.prototype.refreshDom = function(svg, theme) {
-  Blockly.geras.Renderer.superClass_.refreshDom.call(this, svg, theme);
+Renderer.prototype.refreshDom = function(svg, theme) {
+  Renderer.superClass_.refreshDom.call(this, svg, theme);
   this.getHighlightConstants().init();
 };
 
 /**
  * @override
  */
-Blockly.geras.Renderer.prototype.makeConstants_ = function() {
-  return new Blockly.geras.ConstantProvider();
+Renderer.prototype.makeConstants_ = function() {
+  return new ConstantProvider();
 };
 
 /**
  * Create a new instance of the renderer's render info object.
- * @param {!Blockly.BlockSvg} block The block to measure.
- * @return {!Blockly.geras.RenderInfo} The render info object.
+ * @param {!BlockSvg} block The block to measure.
+ * @return {!RenderInfo} The render info object.
  * @protected
  * @override
  */
-Blockly.geras.Renderer.prototype.makeRenderInfo_ = function(block) {
-  return new Blockly.geras.RenderInfo(this, block);
+Renderer.prototype.makeRenderInfo_ = function(block) {
+  return new RenderInfo(this, block);
 };
 
 /**
  * Create a new instance of the renderer's drawer.
- * @param {!Blockly.BlockSvg} block The block to render.
- * @param {!Blockly.blockRendering.RenderInfo} info An object containing all
+ * @param {!BlockSvg} block The block to render.
+ * @param {!BaseRenderInfo} info An object containing all
  *   information needed to render this block.
- * @return {!Blockly.geras.Drawer} The drawer.
+ * @return {!Drawer} The drawer.
  * @protected
  * @override
  */
-Blockly.geras.Renderer.prototype.makeDrawer_ = function(block, info) {
-  return new Blockly.geras.Drawer(block,
-      /** @type {!Blockly.geras.RenderInfo} */ (info));
+Renderer.prototype.makeDrawer_ = function(block, info) {
+  return new Drawer(
+      block,
+      /** @type {!RenderInfo} */ (info));
 };
 
 /**
  * Create a new instance of a renderer path object.
  * @param {!SVGElement} root The root SVG element.
- * @param {!Blockly.Theme.BlockStyle} style The style object to use for
+ * @param {!Theme.BlockStyle} style The style object to use for
  *     colouring.
- * @return {!Blockly.geras.PathObject} The renderer path object.
+ * @return {!PathObject} The renderer path object.
  * @package
  * @override
  */
-Blockly.geras.Renderer.prototype.makePathObject = function(root, style) {
-  return new Blockly.geras.PathObject(root, style,
-      /** @type {!Blockly.geras.ConstantProvider} */ (this.getConstants()));
+Renderer.prototype.makePathObject = function(root, style) {
+  return new PathObject(
+      root, style,
+      /** @type {!ConstantProvider} */ (this.getConstants()));
 };
 
 /**
  * Create a new instance of the renderer's highlight constant provider.
- * @return {!Blockly.geras.HighlightConstantProvider} The highlight constant
+ * @return {!HighlightConstantProvider} The highlight constant
  *     provider.
  * @protected
  */
-Blockly.geras.Renderer.prototype.makeHighlightConstants_ = function() {
-  return new Blockly.geras.HighlightConstantProvider(
-      /** @type {!Blockly.blockRendering.ConstantProvider} */
+Renderer.prototype.makeHighlightConstants_ = function() {
+  return new HighlightConstantProvider(
+      /** @type {!BaseConstantProvider} */
       (this.getConstants()));
 };
 
 /**
  * Get the renderer's highlight constant provider.  We assume that when this is
  * called, the renderer has already been initialized.
- * @return {!Blockly.geras.HighlightConstantProvider} The highlight constant
+ * @return {!HighlightConstantProvider} The highlight constant
  *     provider.
  * @package
  */
-Blockly.geras.Renderer.prototype.getHighlightConstants = function() {
+Renderer.prototype.getHighlightConstants = function() {
   return (
-    /** @type {!Blockly.geras.HighlightConstantProvider} */
-    (this.highlightConstants_));
+      /** @type {!HighlightConstantProvider} */
+      (this.highlightConstants_));
 };
 
-Blockly.blockRendering.register('geras', Blockly.geras.Renderer);
+blockRendering.register('geras', Renderer);
+
+exports = Renderer;
diff --git a/tests/deps.js b/tests/deps.js
index fe3dc6e7b..0f257cd6f 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -145,7 +145,7 @@ goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.
 goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/measurables/inputs.js', ['Blockly.geras.InlineInput', 'Blockly.geras.StatementInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/inputs.js', ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);

From 4b6ccf868c6f992a68a6bfbc900f38a40cdc6d6a Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 11 Aug 2021 08:35:01 -0700
Subject: [PATCH 597/833] Migrate core/events/events_theme_change.js to
 goog.module syntax (#5279)

* Migrate core/events/events_theme_change.js to ES6 const/let

* Migrate core/events/events_theme_change.js to goog.module

* Migrate core/events/events_theme_change.js to named requires

* clang-format core/events/events_theme_change.js
---
 core/events/events_theme_change.js | 34 ++++++++++++++++--------------
 tests/deps.js                      |  2 +-
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/core/events/events_theme_change.js b/core/events/events_theme_change.js
index c0ecd889f..c58d11158 100644
--- a/core/events/events_theme_change.js
+++ b/core/events/events_theme_change.js
@@ -10,12 +10,13 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.ThemeChange');
+goog.module('Blockly.Events.ThemeChange');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
@@ -23,11 +24,11 @@ goog.require('Blockly.utils.object');
  * @param {string=} opt_themeName The theme name. Undefined for a blank event.
  * @param {string=} opt_workspaceId The workspace identifier for this event.
  *    event. Undefined for a blank event.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @constructor
  */
-Blockly.Events.ThemeChange = function(opt_themeName, opt_workspaceId) {
-  Blockly.Events.ThemeChange.superClass_.constructor.call(this, opt_workspaceId);
+const ThemeChange = function(opt_themeName, opt_workspaceId) {
+  ThemeChange.superClass_.constructor.call(this, opt_workspaceId);
 
   /**
    * The theme name.
@@ -35,20 +36,20 @@ Blockly.Events.ThemeChange = function(opt_themeName, opt_workspaceId) {
    */
   this.themeName = opt_themeName;
 };
-Blockly.utils.object.inherits(Blockly.Events.ThemeChange, Blockly.Events.UiBase);
+object.inherits(ThemeChange, UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.ThemeChange.prototype.type = Blockly.Events.THEME_CHANGE;
+ThemeChange.prototype.type = Events.THEME_CHANGE;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.ThemeChange.prototype.toJson = function() {
-  var json = Blockly.Events.ThemeChange.superClass_.toJson.call(this);
+ThemeChange.prototype.toJson = function() {
+  const json = ThemeChange.superClass_.toJson.call(this);
   json['themeName'] = this.themeName;
   return json;
 };
@@ -57,10 +58,11 @@ Blockly.Events.ThemeChange.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.ThemeChange.prototype.fromJson = function(json) {
-  Blockly.Events.ThemeChange.superClass_.fromJson.call(this, json);
+ThemeChange.prototype.fromJson = function(json) {
+  ThemeChange.superClass_.fromJson.call(this, json);
   this.themeName = json['themeName'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.THEME_CHANGE, Blockly.Events.ThemeChange);
+registry.register(registry.Type.EVENT, Events.THEME_CHANGE, ThemeChange);
+
+exports = ThemeChange;
diff --git a/tests/deps.js b/tests/deps.js
index 0f257cd6f..cdbc2a718 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -46,7 +46,7 @@ goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.B
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_var_base.js', ['Blockly.Events.VarBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From a5729043c1ee922f89a3ea68556e3c5887798436 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 11 Aug 2021 08:40:01 -0700
Subject: [PATCH 598/833] Migrate core/events/events_block_drag.js to
 goog.module syntax (#5286)

* Migrate core/events/events_block_drag.js to ES6 const/let

* Migrate core/events/events_block_drag.js to goog.module

* Migrate core/events/events_block_drag.js to named requires

* clang-format core/events/events_block_drag.js
---
 core/events/events_block_drag.js | 46 +++++++++++++++++---------------
 tests/deps.js                    |  2 +-
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/core/events/events_block_drag.js b/core/events/events_block_drag.js
index 9d256822a..6fd3f0a9f 100644
--- a/core/events/events_block_drag.js
+++ b/core/events/events_block_drag.js
@@ -10,30 +10,31 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.BlockDrag');
+goog.module('Blockly.Events.BlockDrag');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
  * Class for a block drag event.
- * @param {!Blockly.Block=} opt_block The top block in the stack that is being
+ * @param {!Block=} opt_block The top block in the stack that is being
  *    dragged. Undefined for a blank event.
  * @param {boolean=} opt_isStart Whether this is the start of a block drag.
  *    Undefined for a blank event.
- * @param {!Array<!Blockly.Block>=} opt_blocks The blocks affected by this
+ * @param {!Array<!Block>=} opt_blocks The blocks affected by this
  *    drag. Undefined for a blank event.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @constructor
  */
-Blockly.Events.BlockDrag = function(opt_block, opt_isStart, opt_blocks) {
-  var workspaceId = opt_block ? opt_block.workspace.id : undefined;
-  Blockly.Events.BlockDrag.superClass_.constructor.call(this, workspaceId);
+const BlockDrag = function(opt_block, opt_isStart, opt_blocks) {
+  const workspaceId = opt_block ? opt_block.workspace.id : undefined;
+  BlockDrag.superClass_.constructor.call(this, workspaceId);
   this.blockId = opt_block ? opt_block.id : null;
 
   /**
@@ -44,24 +45,24 @@ Blockly.Events.BlockDrag = function(opt_block, opt_isStart, opt_blocks) {
 
   /**
    * The blocks affected by this drag event.
-   * @type {!Array<!Blockly.Block>|undefined}
+   * @type {!Array<!Block>|undefined}
    */
   this.blocks = opt_blocks;
 };
-Blockly.utils.object.inherits(Blockly.Events.BlockDrag, Blockly.Events.UiBase);
+object.inherits(BlockDrag, UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.BlockDrag.prototype.type = Blockly.Events.BLOCK_DRAG;
+BlockDrag.prototype.type = Events.BLOCK_DRAG;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.BlockDrag.prototype.toJson = function() {
-  var json = Blockly.Events.BlockDrag.superClass_.toJson.call(this);
+BlockDrag.prototype.toJson = function() {
+  const json = BlockDrag.superClass_.toJson.call(this);
   json['isStart'] = this.isStart;
   json['blockId'] = this.blockId;
   json['blocks'] = this.blocks;
@@ -72,12 +73,13 @@ Blockly.Events.BlockDrag.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.BlockDrag.prototype.fromJson = function(json) {
-  Blockly.Events.BlockDrag.superClass_.fromJson.call(this, json);
+BlockDrag.prototype.fromJson = function(json) {
+  BlockDrag.superClass_.fromJson.call(this, json);
   this.isStart = json['isStart'];
   this.blockId = json['blockId'];
   this.blocks = json['blocks'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.BLOCK_DRAG, Blockly.Events.BlockDrag);
+registry.register(registry.Type.EVENT, Events.BLOCK_DRAG, BlockDrag);
+
+exports = BlockDrag;
diff --git a/tests/deps.js b/tests/deps.js
index cdbc2a718..26cac9d15 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -40,7 +40,7 @@ goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.Bl
 goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 4c40378b9ad33444c3680944e49332282fc8646c Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Wed, 11 Aug 2021 18:50:45 +0100
Subject: [PATCH 599/833] Use `goog.requireType` when importing interfaces
 (etc.) (#5343)

* Use goog.requireType when importing I* interfaces

Interfaces have no code, so should never be referred to outside of
(JSDoc) comments, and so the modules that define only interfaces never
need to be goog.require'd - goog.requireType is always sufficient.

This commit fixes imports of all modules whose name matches
/(.*\.)?I[A-Z]*/ - i.e., the hungarian-notation named ones in
core/interfaces/.

* Use goog.requireType when only using import for type specifications

Where a module is imported only to used in JSDoc comments it can
(and should) be goog.requireType'd instead of goog.require'd.

* Remove spurious eslint-disable no-unused-vars

There were a few cases where modules were being imported with
goog.require (because they are referred to in code, not just JSDoc
comments) but were prefaced by a spurious eslint suppress.

Remove these, restoring the invariant that an import gets an eslint
if and only if it is a requireType.

* Remove obsolete Closure Compiler error group

stricterMissingRequire has been superceded by missingRequire, and now
causes a Java null pointer exception if supplied.
---
 core/block.js                                 |  4 +-
 core/block_dragger.js                         |  2 +-
 core/block_svg.js                             | 10 +--
 core/bubble.js                                |  2 +-
 core/connection.js                            |  2 +-
 core/connection_checker.js                    |  2 +-
 core/connection_db.js                         |  2 +-
 core/delete_area.js                           |  2 +-
 core/drag_target.js                           |  2 +-
 core/field.js                                 |  8 +-
 core/flyout_base.js                           |  4 +-
 core/gesture.js                               |  1 -
 core/input.js                                 |  2 +-
 core/interfaces/i_ast_node_location_svg.js    |  2 +-
 .../i_ast_node_location_with_block.js         |  2 +-
 core/interfaces/i_autohideable.js             |  2 +-
 core/interfaces/i_bubble.js                   |  4 +-
 core/interfaces/i_collapsible_toolbox_item.js |  2 +-
 core/interfaces/i_delete_area.js              |  2 +-
 core/interfaces/i_drag_target.js              |  2 +-
 core/interfaces/i_draggable.js                |  2 +-
 core/interfaces/i_flyout.js                   |  2 +-
 core/interfaces/i_positionable.js             |  2 +-
 core/interfaces/i_selectable_toolbox_item.js  |  2 +-
 core/interfaces/i_toolbox.js                  |  2 +-
 core/metrics_manager.js                       |  2 +-
 core/renderers/common/drawer.js               |  2 +-
 core/renderers/common/info.js                 |  5 +-
 core/renderers/common/path_object.js          |  2 +-
 core/renderers/common/renderer.js             |  4 +-
 core/toolbox/category.js                      |  2 +-
 core/toolbox/collapsible_category.js          |  2 +-
 core/toolbox/toolbox.js                       | 12 ++-
 core/toolbox/toolbox_item.js                  |  2 +-
 core/trashcan.js                              |  4 +-
 core/workspace.js                             |  2 +-
 core/workspace_comment_svg.js                 |  6 +-
 core/workspace_svg.js                         |  2 +-
 core/zoom_controls.js                         |  2 +-
 scripts/gulpfiles/build_tasks.js              |  1 -
 tests/deps.js                                 | 76 +++++++++----------
 41 files changed, 98 insertions(+), 97 deletions(-)

diff --git a/core/block.js b/core/block.js
index adddfe5ec..0f610c2e7 100644
--- a/core/block.js
+++ b/core/block.js
@@ -26,9 +26,9 @@ 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');
+const IASTNodeLocation = goog.requireType('Blockly.IASTNodeLocation');
 /* eslint-disable-next-line no-unused-vars */
-const IDeletable = goog.require('Blockly.IDeletable');
+const IDeletable = goog.requireType('Blockly.IDeletable');
 const Input = goog.require('Blockly.Input');
 /* eslint-disable-next-line no-unused-vars */
 const Mutator = goog.requireType('Blockly.Mutator');
diff --git a/core/block_dragger.js b/core/block_dragger.js
index 6e5ac10c1..32a6f4922 100644
--- a/core/block_dragger.js
+++ b/core/block_dragger.js
@@ -17,7 +17,7 @@ goog.module.declareLegacyNamespace();
 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');
+const IBlockDragger = goog.requireType('Blockly.IBlockDragger');
 /* eslint-disable-next-line no-unused-vars */
 const IDragTarget = goog.requireType('Blockly.IDragTarget');
 const InsertionMarkerManager = goog.require('Blockly.InsertionMarkerManager');
diff --git a/core/block_svg.js b/core/block_svg.js
index 027b0c71b..4c2545eb1 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -29,15 +29,15 @@ const Events = goog.require('Blockly.Events');
 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');
+const IASTNodeLocationSvg = goog.requireType('Blockly.IASTNodeLocationSvg');
 /* eslint-disable-next-line no-unused-vars */
-const IBoundedElement = goog.require('Blockly.IBoundedElement');
+const IBoundedElement = goog.requireType('Blockly.IBoundedElement');
 /* eslint-disable-next-line no-unused-vars */
-const ICopyable = goog.require('Blockly.ICopyable');
+const ICopyable = goog.requireType('Blockly.ICopyable');
 /* eslint-disable-next-line no-unused-vars */
-const IDraggable = goog.require('Blockly.IDraggable');
+const IDraggable = goog.requireType('Blockly.IDraggable');
 /* eslint-disable-next-line no-unused-vars */
-const IPathObject = goog.require('Blockly.blockRendering.IPathObject');
+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 */
diff --git a/core/bubble.js b/core/bubble.js
index 161b2fb29..40e516639 100644
--- a/core/bubble.js
+++ b/core/bubble.js
@@ -13,7 +13,7 @@
 goog.provide('Blockly.Bubble');
 
 goog.require('Blockly.browserEvents');
-goog.require('Blockly.IBubble');
+goog.requireType('Blockly.IBubble');
 goog.require('Blockly.Scrollbar');
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
diff --git a/core/connection.js b/core/connection.js
index f272b59e0..ae7ad8051 100644
--- a/core/connection.js
+++ b/core/connection.js
@@ -17,7 +17,7 @@ goog.module.declareLegacyNamespace();
 const Block = goog.requireType('Blockly.Block');
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocationWithBlock = goog.require('Blockly.IASTNodeLocationWithBlock');
+const IASTNodeLocationWithBlock = goog.requireType('Blockly.IASTNodeLocationWithBlock');
 /* eslint-disable-next-line no-unused-vars */
 const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/connection_checker.js b/core/connection_checker.js
index 76162b017..e3fbc1929 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -16,7 +16,7 @@ goog.module.declareLegacyNamespace();
 
 const Connection = goog.require('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
-const IConnectionChecker = goog.require('Blockly.IConnectionChecker');
+const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');
 /* eslint-disable-next-line no-unused-vars */
 const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 const common = goog.require('Blockly.common');
diff --git a/core/connection_db.js b/core/connection_db.js
index d3bc0507d..c0ee7f500 100644
--- a/core/connection_db.js
+++ b/core/connection_db.js
@@ -20,7 +20,7 @@ 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.require('Blockly.RenderedConnection');
+const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 const connectionTypes = goog.require('Blockly.connectionTypes');
 /** @suppress {extraRequire} */
 goog.require('Blockly.constants');
diff --git a/core/delete_area.js b/core/delete_area.js
index 248ef2fd2..6dbe50db6 100644
--- a/core/delete_area.js
+++ b/core/delete_area.js
@@ -18,7 +18,7 @@ goog.module.declareLegacyNamespace();
 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');
+const IDeleteArea = goog.requireType('Blockly.IDeleteArea');
 /* eslint-disable-next-line no-unused-vars */
 const IDraggable = goog.requireType('Blockly.IDraggable');
 const object = goog.require('Blockly.utils.object');
diff --git a/core/drag_target.js b/core/drag_target.js
index 18e29b40a..e5a0f578b 100644
--- a/core/drag_target.js
+++ b/core/drag_target.js
@@ -16,7 +16,7 @@ goog.module('Blockly.DragTarget');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const IDragTarget = goog.require('Blockly.IDragTarget');
+const IDragTarget = goog.requireType('Blockly.IDragTarget');
 /* eslint-disable-next-line no-unused-vars */
 const IDraggable = goog.requireType('Blockly.IDraggable');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/field.js b/core/field.js
index 77e0ab88c..79496526e 100644
--- a/core/field.js
+++ b/core/field.js
@@ -26,15 +26,15 @@ const Coordinate = goog.requireType('Blockly.utils.Coordinate');
 const DropDownDiv = goog.require('Blockly.DropDownDiv');
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocationSvg = goog.require('Blockly.IASTNodeLocationSvg');
+const IASTNodeLocationSvg = goog.requireType('Blockly.IASTNodeLocationSvg');
 /* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocationWithBlock = goog.require('Blockly.IASTNodeLocationWithBlock');
+const IASTNodeLocationWithBlock = goog.requireType('Blockly.IASTNodeLocationWithBlock');
 /* eslint-disable-next-line no-unused-vars */
-const IKeyboardAccessible = goog.require('Blockly.IKeyboardAccessible');
+const IKeyboardAccessible = goog.requireType('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 IRegistrable = goog.requireType('Blockly.IRegistrable');
 const MarkerManager = goog.require('Blockly.MarkerManager');
 const Rect = goog.require('Blockly.utils.Rect');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/flyout_base.js b/core/flyout_base.js
index 8ce566544..c37d2a1ef 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -14,7 +14,7 @@ goog.module('Blockly.Flyout');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const Block = goog.require('Blockly.Block');
+const Block = goog.requireType('Blockly.Block');
 const Blockly = goog.require('Blockly');
 /* eslint-disable-next-line no-unused-vars */
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
@@ -26,7 +26,7 @@ const Events = goog.require('Blockly.Events');
 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');
+const IFlyout = goog.requireType('Blockly.IFlyout');
 /* eslint-disable-next-line no-unused-vars */
 const Options = goog.requireType('Blockly.Options');
 const ScrollbarPair = goog.require('Blockly.ScrollbarPair');
diff --git a/core/gesture.js b/core/gesture.js
index ae01b62cc..855dc76de 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -31,7 +31,6 @@ const IBubble = goog.requireType('Blockly.IBubble');
 const IFlyout = goog.requireType('Blockly.IFlyout');
 const Tooltip = goog.require('Blockly.Tooltip');
 const Touch = goog.require('Blockly.Touch');
-/* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.require('Blockly.Workspace');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
diff --git a/core/input.js b/core/input.js
index afa7a3358..9eb3892f8 100644
--- a/core/input.js
+++ b/core/input.js
@@ -18,7 +18,7 @@ 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 Connection = goog.require('Blockly.Connection');
+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 */
diff --git a/core/interfaces/i_ast_node_location_svg.js b/core/interfaces/i_ast_node_location_svg.js
index 526fbffa3..53d65a529 100644
--- a/core/interfaces/i_ast_node_location_svg.js
+++ b/core/interfaces/i_ast_node_location_svg.js
@@ -15,7 +15,7 @@ goog.module('Blockly.IASTNodeLocationSvg');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation');
+const IASTNodeLocation = goog.requireType('Blockly.IASTNodeLocation');
 
 
 /**
diff --git a/core/interfaces/i_ast_node_location_with_block.js b/core/interfaces/i_ast_node_location_with_block.js
index 002db0ad8..0bef06154 100644
--- a/core/interfaces/i_ast_node_location_with_block.js
+++ b/core/interfaces/i_ast_node_location_with_block.js
@@ -18,7 +18,7 @@ goog.module.declareLegacyNamespace();
 /* 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');
+const IASTNodeLocation = goog.requireType('Blockly.IASTNodeLocation');
 
 
 /**
diff --git a/core/interfaces/i_autohideable.js b/core/interfaces/i_autohideable.js
index 0ccbf310a..c3c7a8125 100644
--- a/core/interfaces/i_autohideable.js
+++ b/core/interfaces/i_autohideable.js
@@ -16,7 +16,7 @@ goog.module('Blockly.IAutoHideable');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const IComponent = goog.require('Blockly.IComponent');
+const IComponent = goog.requireType('Blockly.IComponent');
 
 
 /**
diff --git a/core/interfaces/i_bubble.js b/core/interfaces/i_bubble.js
index b6e9736d7..a7578fc09 100644
--- a/core/interfaces/i_bubble.js
+++ b/core/interfaces/i_bubble.js
@@ -19,9 +19,9 @@ 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');
+const IContextMenu = goog.requireType('Blockly.IContextMenu');
 /* eslint-disable-next-line no-unused-vars */
-const IDraggable = goog.require('Blockly.IDraggable');
+const IDraggable = goog.requireType('Blockly.IDraggable');
 
 
 /**
diff --git a/core/interfaces/i_collapsible_toolbox_item.js b/core/interfaces/i_collapsible_toolbox_item.js
index 45bd3ae3e..5915a05b4 100644
--- a/core/interfaces/i_collapsible_toolbox_item.js
+++ b/core/interfaces/i_collapsible_toolbox_item.js
@@ -15,7 +15,7 @@ goog.module('Blockly.ICollapsibleToolboxItem');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const ISelectableToolboxItem = goog.require('Blockly.ISelectableToolboxItem');
+const ISelectableToolboxItem = goog.requireType('Blockly.ISelectableToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
 const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 
diff --git a/core/interfaces/i_delete_area.js b/core/interfaces/i_delete_area.js
index 845d7dddb..fbe54559a 100644
--- a/core/interfaces/i_delete_area.js
+++ b/core/interfaces/i_delete_area.js
@@ -18,7 +18,7 @@ goog.module.declareLegacyNamespace();
 /* eslint-disable-next-line no-unused-vars */
 const IDraggable = goog.requireType('Blockly.IDraggable');
 /* eslint-disable-next-line no-unused-vars */
-const IDragTarget = goog.require('Blockly.IDragTarget');
+const IDragTarget = goog.requireType('Blockly.IDragTarget');
 
 
 /**
diff --git a/core/interfaces/i_drag_target.js b/core/interfaces/i_drag_target.js
index 6b777781d..a47798841 100644
--- a/core/interfaces/i_drag_target.js
+++ b/core/interfaces/i_drag_target.js
@@ -16,7 +16,7 @@ goog.module('Blockly.IDragTarget');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const IComponent = goog.require('Blockly.IComponent');
+const IComponent = goog.requireType('Blockly.IComponent');
 /* eslint-disable-next-line no-unused-vars */
 const IDraggable = goog.requireType('Blockly.IDraggable');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_draggable.js b/core/interfaces/i_draggable.js
index 5d7e17d53..5e6702a1c 100644
--- a/core/interfaces/i_draggable.js
+++ b/core/interfaces/i_draggable.js
@@ -15,7 +15,7 @@ goog.module('Blockly.IDraggable');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const IDeletable = goog.require('Blockly.IDeletable');
+const IDeletable = goog.requireType('Blockly.IDeletable');
 
 
 /**
diff --git a/core/interfaces/i_flyout.js b/core/interfaces/i_flyout.js
index 7c0c47421..405f0e482 100644
--- a/core/interfaces/i_flyout.js
+++ b/core/interfaces/i_flyout.js
@@ -19,7 +19,7 @@ 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');
+const IRegistrable = goog.requireType('Blockly.IRegistrable');
 /* eslint-disable-next-line no-unused-vars */
 const Svg = goog.requireType('Blockly.utils.Svg');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_positionable.js b/core/interfaces/i_positionable.js
index 56b9515c3..ba1a4d2b5 100644
--- a/core/interfaces/i_positionable.js
+++ b/core/interfaces/i_positionable.js
@@ -15,7 +15,7 @@ goog.module('Blockly.IPositionable');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const IComponent = goog.require('Blockly.IComponent');
+const IComponent = goog.requireType('Blockly.IComponent');
 /* eslint-disable-next-line no-unused-vars */
 const MetricsManager = goog.requireType('Blockly.MetricsManager');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_selectable_toolbox_item.js b/core/interfaces/i_selectable_toolbox_item.js
index 837aad148..2e286889f 100644
--- a/core/interfaces/i_selectable_toolbox_item.js
+++ b/core/interfaces/i_selectable_toolbox_item.js
@@ -15,7 +15,7 @@ goog.module('Blockly.ISelectableToolboxItem');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const IToolboxItem = goog.require('Blockly.IToolboxItem');
+const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
 const toolbox = goog.requireType('Blockly.utils.toolbox');
 
diff --git a/core/interfaces/i_toolbox.js b/core/interfaces/i_toolbox.js
index d6d6ec626..ee645ba34 100644
--- a/core/interfaces/i_toolbox.js
+++ b/core/interfaces/i_toolbox.js
@@ -17,7 +17,7 @@ goog.module.declareLegacyNamespace();
 /* eslint-disable-next-line no-unused-vars */
 const IFlyout = goog.requireType('Blockly.IFlyout');
 /* eslint-disable-next-line no-unused-vars */
-const IRegistrable = goog.require('Blockly.IRegistrable');
+const IRegistrable = goog.requireType('Blockly.IRegistrable');
 /* eslint-disable-next-line no-unused-vars */
 const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/metrics_manager.js b/core/metrics_manager.js
index 841114d14..1288588df 100644
--- a/core/metrics_manager.js
+++ b/core/metrics_manager.js
@@ -13,7 +13,7 @@
 goog.provide('Blockly.FlyoutMetricsManager');
 goog.provide('Blockly.MetricsManager');
 
-goog.require('Blockly.IMetricsManager');
+goog.requireType('Blockly.IMetricsManager');
 goog.require('Blockly.registry');
 goog.require('Blockly.utils.Size');
 goog.require('Blockly.utils.toolbox');
diff --git a/core/renderers/common/drawer.js b/core/renderers/common/drawer.js
index 92e659ab7..af03eaf2e 100644
--- a/core/renderers/common/drawer.js
+++ b/core/renderers/common/drawer.js
@@ -26,7 +26,7 @@ const InlineInput = goog.requireType('Blockly.blockRendering.InlineInput');
 /* eslint-disable-next-line no-unused-vars */
 const RenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
 /* eslint-disable-next-line no-unused-vars */
-const Row = goog.require('Blockly.blockRendering.Row');
+const Row = goog.requireType('Blockly.blockRendering.Row');
 const Types = goog.require('Blockly.blockRendering.Types');
 const svgPaths = goog.require('Blockly.utils.svgPaths');
 
diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js
index 06f9d7009..b5da1701d 100644
--- a/core/renderers/common/info.js
+++ b/core/renderers/common/info.js
@@ -29,7 +29,7 @@ const InputRow = goog.require('Blockly.blockRendering.InputRow');
 const InRowSpacer = goog.require('Blockly.blockRendering.InRowSpacer');
 const JaggedEdge = goog.require('Blockly.blockRendering.JaggedEdge');
 /* eslint-disable-next-line no-unused-vars */
-const Measurable = goog.require('Blockly.blockRendering.Measurable');
+const Measurable = goog.requireType('Blockly.blockRendering.Measurable');
 const NextConnection = goog.require('Blockly.blockRendering.NextConnection');
 const OutputConnection = goog.require('Blockly.blockRendering.OutputConnection');
 const PreviousConnection = goog.require('Blockly.blockRendering.PreviousConnection');
@@ -37,10 +37,9 @@ const PreviousConnection = goog.require('Blockly.blockRendering.PreviousConnecti
 const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 /* eslint-disable-next-line no-unused-vars */
 const Renderer = goog.requireType('Blockly.blockRendering.Renderer');
-/* eslint-disable-next-line no-unused-vars */
 const RoundCorner = goog.require('Blockly.blockRendering.RoundCorner');
 /* eslint-disable-next-line no-unused-vars */
-const Row = goog.require('Blockly.blockRendering.Row');
+const Row = goog.requireType('Blockly.blockRendering.Row');
 const SpacerRow = goog.require('Blockly.blockRendering.SpacerRow');
 const SquareCorner = goog.require('Blockly.blockRendering.SquareCorner');
 const StatementInput = goog.require('Blockly.blockRendering.StatementInput');
diff --git a/core/renderers/common/path_object.js b/core/renderers/common/path_object.js
index 7b1f6af9d..d8d36c9dc 100644
--- a/core/renderers/common/path_object.js
+++ b/core/renderers/common/path_object.js
@@ -21,7 +21,7 @@ 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 IPathObject = goog.require('Blockly.blockRendering.IPathObject');
+const IPathObject = goog.requireType('Blockly.blockRendering.IPathObject');
 const Svg = goog.require('Blockly.utils.Svg');
 /* eslint-disable-next-line no-unused-vars */
 const Theme = goog.requireType('Blockly.Theme');
diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js
index b4be1af87..f72a88437 100644
--- a/core/renderers/common/renderer.js
+++ b/core/renderers/common/renderer.js
@@ -15,13 +15,13 @@ goog.provide('Blockly.blockRendering.Renderer');
 goog.require('Blockly.blockRendering.ConstantProvider');
 goog.require('Blockly.blockRendering.Debug');
 goog.require('Blockly.blockRendering.Drawer');
-goog.require('Blockly.blockRendering.IPathObject');
+goog.requireType('Blockly.blockRendering.IPathObject');
 goog.require('Blockly.blockRendering.MarkerSvg');
 goog.require('Blockly.blockRendering.PathObject');
 goog.require('Blockly.blockRendering.RenderInfo');
 goog.require('Blockly.connectionTypes');
 goog.require('Blockly.InsertionMarkerManager');
-goog.require('Blockly.IRegistrable');
+goog.requireType('Blockly.IRegistrable');
 
 goog.requireType('Blockly.Block');
 goog.requireType('Blockly.BlockSvg');
diff --git a/core/toolbox/category.js b/core/toolbox/category.js
index 5c8076383..962a5cb85 100644
--- a/core/toolbox/category.js
+++ b/core/toolbox/category.js
@@ -18,7 +18,7 @@ const Css = goog.require('Blockly.Css');
 /* eslint-disable-next-line no-unused-vars */
 const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
-const ISelectableToolboxItem = goog.require('Blockly.ISelectableToolboxItem');
+const ISelectableToolboxItem = goog.requireType('Blockly.ISelectableToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
 const IToolbox = goog.requireType('Blockly.IToolbox');
 const ToolboxItem = goog.require('Blockly.ToolboxItem');
diff --git a/core/toolbox/collapsible_category.js b/core/toolbox/collapsible_category.js
index ae243f1e6..923d681b2 100644
--- a/core/toolbox/collapsible_category.js
+++ b/core/toolbox/collapsible_category.js
@@ -14,7 +14,7 @@ goog.module('Blockly.CollapsibleToolboxCategory');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const ICollapsibleToolboxItem = goog.require('Blockly.ICollapsibleToolboxItem');
+const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
 const IToolbox = goog.requireType('Blockly.IToolbox');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index abab56d26..37808a80d 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -22,18 +22,22 @@ const ComponentManager = goog.require('Blockly.ComponentManager');
 const Css = goog.require('Blockly.Css');
 const DeleteArea = goog.require('Blockly.DeleteArea');
 const Events = goog.require('Blockly.Events');
-const IAutoHideable = goog.require('Blockly.IAutoHideable');
+/* eslint-disable-next-line no-unused-vars */
+const IAutoHideable = goog.requireType('Blockly.IAutoHideable');
 /* eslint-disable-next-line no-unused-vars */
 const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
 const IDraggable = goog.requireType('Blockly.IDraggable');
 /* eslint-disable-next-line no-unused-vars */
 const IFlyout = goog.requireType('Blockly.IFlyout');
-const IKeyboardAccessible = goog.require('Blockly.IKeyboardAccessible');
+/* eslint-disable-next-line no-unused-vars */
+const IKeyboardAccessible = goog.requireType('Blockly.IKeyboardAccessible');
 /* eslint-disable-next-line no-unused-vars */
 const ISelectableToolboxItem = goog.requireType('Blockly.ISelectableToolboxItem');
-const IStyleable = goog.require('Blockly.IStyleable');
-const IToolbox = goog.require('Blockly.IToolbox');
+/* eslint-disable-next-line no-unused-vars */
+const IStyleable = goog.requireType('Blockly.IStyleable');
+/* eslint-disable-next-line no-unused-vars */
+const IToolbox = goog.requireType('Blockly.IToolbox');
 /* eslint-disable-next-line no-unused-vars */
 const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 const Options = goog.require('Blockly.Options');
diff --git a/core/toolbox/toolbox_item.js b/core/toolbox/toolbox_item.js
index 0fdbfd424..7cffe6540 100644
--- a/core/toolbox/toolbox_item.js
+++ b/core/toolbox/toolbox_item.js
@@ -19,7 +19,7 @@ const IdGenerator = goog.require('Blockly.utils.IdGenerator');
 /* eslint-disable-next-line no-unused-vars */
 const IToolbox = goog.requireType('Blockly.IToolbox');
 /* eslint-disable-next-line no-unused-vars */
-const IToolboxItem = goog.require('Blockly.IToolboxItem');
+const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/trashcan.js b/core/trashcan.js
index 7e60d841d..49596ae83 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -21,13 +21,13 @@ const ComponentManager = goog.require('Blockly.ComponentManager');
 const DeleteArea = goog.require('Blockly.DeleteArea');
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
-const IAutoHideable = goog.require('Blockly.IAutoHideable');
+const IAutoHideable = goog.requireType('Blockly.IAutoHideable');
 /* eslint-disable-next-line no-unused-vars */
 const IDraggable = goog.requireType('Blockly.IDraggable');
 /* eslint-disable-next-line no-unused-vars */
 const IFlyout = goog.requireType('Blockly.IFlyout');
 /* eslint-disable-next-line no-unused-vars */
-const IPositionable = goog.require('Blockly.IPositionable');
+const IPositionable = goog.requireType('Blockly.IPositionable');
 /* eslint-disable-next-line no-unused-vars */
 const MetricsManager = goog.requireType('Blockly.MetricsManager');
 const Options = goog.require('Blockly.Options');
diff --git a/core/workspace.js b/core/workspace.js
index 32125974e..77b50967e 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -23,7 +23,7 @@ const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
 const ConnectionDB = goog.requireType('Blockly.ConnectionDB');
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation');
+const IASTNodeLocation = goog.requireType('Blockly.IASTNodeLocation');
 /* eslint-disable-next-line no-unused-vars */
 const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');
 const Options = goog.require('Blockly.Options');
diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 5702cc14c..0b68db82e 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -21,11 +21,11 @@ const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Css = goog.require('Blockly.Css');
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
-const IBoundedElement = goog.require('Blockly.IBoundedElement');
+const IBoundedElement = goog.requireType('Blockly.IBoundedElement');
 /* eslint-disable-next-line no-unused-vars */
-const IBubble = goog.require('Blockly.IBubble');
+const IBubble = goog.requireType('Blockly.IBubble');
 /* eslint-disable-next-line no-unused-vars */
-const ICopyable = goog.require('Blockly.ICopyable');
+const ICopyable = goog.requireType('Blockly.ICopyable');
 const Rect = goog.require('Blockly.utils.Rect');
 const Svg = goog.require('Blockly.utils.Svg');
 const Touch = goog.require('Blockly.Touch');
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 5010aff79..419879bad 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -34,7 +34,7 @@ const FlyoutButton = goog.requireType('Blockly.FlyoutButton');
 const Gesture = goog.require('Blockly.Gesture');
 const Grid = goog.require('Blockly.Grid');
 /* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocationSvg = goog.require('Blockly.IASTNodeLocationSvg');
+const IASTNodeLocationSvg = goog.requireType('Blockly.IASTNodeLocationSvg');
 /* eslint-disable-next-line no-unused-vars */
 const IBoundedElement = goog.requireType('Blockly.IBoundedElement');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/zoom_controls.js b/core/zoom_controls.js
index 1b7a568cc..eb27b17e3 100644
--- a/core/zoom_controls.js
+++ b/core/zoom_controls.js
@@ -17,7 +17,7 @@ const ComponentManager = goog.require('Blockly.ComponentManager');
 const Css = goog.require('Blockly.Css');
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
-const IPositionable = goog.require('Blockly.IPositionable');
+const IPositionable = goog.requireType('Blockly.IPositionable');
 const Rect = goog.require('Blockly.utils.Rect');
 const Svg = goog.require('Blockly.utils.Svg');
 const Touch = goog.require('Blockly.Touch');
diff --git a/scripts/gulpfiles/build_tasks.js b/scripts/gulpfiles/build_tasks.js
index e6f496544..318304189 100644
--- a/scripts/gulpfiles/build_tasks.js
+++ b/scripts/gulpfiles/build_tasks.js
@@ -90,7 +90,6 @@ var JSCOMP_ERROR = [
   // 'strictMissingProperties',
   'strictModuleDepCheck',
   // 'strictPrimitiveOperators',
-  // 'stricterMissingRequire',
   'suspiciousCode',
   'typeInvalidation',
   'undefinedNames',
diff --git a/tests/deps.js b/tests/deps.js
index 26cac9d15..874dcb83d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -7,32 +7,32 @@ goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'],
 goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator']);
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
-goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.IASTNodeLocation', 'Blockly.IDeletable', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', '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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.MarkerManager', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', '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/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', '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.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 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'});
-goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.RenderedConnection', 'Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style']);
 goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils']);
 goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
@@ -58,7 +58,7 @@ goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Bloc
 goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/ws_comment_events.js', ['Blockly.Events.CommentBase', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible', 'Blockly.IRegistrable', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.IdGenerator', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -71,7 +71,7 @@ goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Bloc
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly', 'Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
@@ -80,36 +80,36 @@ goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.Block
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.Connection', 'Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.internalConstants'], {'lang': 'es5'});
 goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], ['Blockly.IASTNodeLocation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], ['Blockly.IASTNodeLocation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], ['Blockly.IContextMenu', 'Blockly.IDraggable'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_collapsible_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem'], ['Blockly.ISelectableToolboxItem'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_collapsible_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_copyable.js', ['Blockly.ICopyable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_deletable.js', ['Blockly.IDeletable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], ['Blockly.IDeletable'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], ['Blockly.IRegistrable'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_keyboard_accessible.js', ['Blockly.IKeyboardAccessible'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_selectable_toolbox_item.js', ['Blockly.ISelectableToolboxItem'], ['Blockly.IToolboxItem'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_selectable_toolbox_item.js', ['Blockly.ISelectableToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], ['Blockly.IRegistrable'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.IToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstants'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
@@ -120,7 +120,7 @@ goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.T
 goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], [], {'lang': 'es6', 'module': 'goog'});
 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.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/metrics_manager.js', ['Blockly.FlyoutMetricsManager', 'Blockly.MetricsManager'], ['Blockly.IMetricsManager', 'Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/metrics_manager.js', ['Blockly.FlyoutMetricsManager', 'Blockly.MetricsManager'], ['Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global']);
 goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', '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', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
@@ -132,12 +132,12 @@ goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnec
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
-goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
+goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
@@ -176,15 +176,15 @@ goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry'
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly', 'Blockly.Css', 'Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly', 'Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem', 'Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
-goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], [], {'lang': 'es6', 'module': 'goog'});
@@ -212,14 +212,14 @@ goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.B
 goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.common', 'Blockly.utils.dom']);
-goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICopyable', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6'});
-goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);
 

From 7c45b039f3482f07f3229bb5aac5b301b671e32f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 16:07:12 -0700
Subject: [PATCH 600/833] Migrate core/renderers/minimalist/drawer.js to
 goog.module

---
 core/renderers/minimalist/drawer.js | 15 ++++++++++-----
 tests/deps.js                       |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/renderers/minimalist/drawer.js b/core/renderers/minimalist/drawer.js
index 592710d6d..033f90741 100644
--- a/core/renderers/minimalist/drawer.js
+++ b/core/renderers/minimalist/drawer.js
@@ -9,12 +9,15 @@
  */
 'use strict';
 
-goog.provide('Blockly.minimalist.Drawer');
+goog.module('Blockly.minimalist.Drawer');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.Drawer');
-goog.require('Blockly.minimalist.RenderInfo');
 goog.require('Blockly.utils.object');
 
+goog.requireType('Blockly.BlockSvg');
+goog.requireType('Blockly.minimalist.RenderInfo');
+
 
 /**
  * An object that draws a block based on the given rendering information.
@@ -25,8 +28,10 @@ goog.require('Blockly.utils.object');
  * @constructor
  * @extends {Blockly.blockRendering.Drawer}
  */
-Blockly.minimalist.Drawer = function(block, info) {
-  Blockly.minimalist.Drawer.superClass_.constructor.call(this, block, info);
+const Drawer = function(block, info) {
+  Drawer.superClass_.constructor.call(this, block, info);
 };
-Blockly.utils.object.inherits(Blockly.minimalist.Drawer,
+Blockly.utils.object.inherits(Drawer,
     Blockly.blockRendering.Drawer);
+
+exports = Drawer;
diff --git a/tests/deps.js b/tests/deps.js
index 874dcb83d..8c0415c0e 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -153,7 +153,7 @@ goog.addDependency('../../core/renderers/measurables/row_elements.js', ['Blockly
 goog.addDependency('../../core/renderers/measurables/rows.js', ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist', 'Blockly.minimalist.RenderInfo'], ['Blockly.utils.object']);
 goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos', 'Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);

From 8aa437b44a0cca0c01c3495f31791623d9585c38 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 16:27:06 -0700
Subject: [PATCH 601/833] Migrate core/renderers/minimalist/drawer.js named
 requires

---
 core/renderers/minimalist/drawer.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/renderers/minimalist/drawer.js b/core/renderers/minimalist/drawer.js
index 033f90741..d0cd3a417 100644
--- a/core/renderers/minimalist/drawer.js
+++ b/core/renderers/minimalist/drawer.js
@@ -12,26 +12,26 @@
 goog.module('Blockly.minimalist.Drawer');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.Drawer');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.minimalist.RenderInfo');
+const BaseDrawer = goog.require('Blockly.blockRendering.Drawer');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const RenderInfo = goog.requireType('Blockly.minimalist.RenderInfo');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object that draws a block based on the given rendering information.
- * @param {!Blockly.BlockSvg} block The block to render.
- * @param {!Blockly.minimalist.RenderInfo} info An object containing all
+ * @param {!BlockSvg} block The block to render.
+ * @param {!RenderInfo} info An object containing all
  *   information needed to render this block.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Drawer}
+ * @extends {BaseDrawer}
  */
 const Drawer = function(block, info) {
   Drawer.superClass_.constructor.call(this, block, info);
 };
-Blockly.utils.object.inherits(Drawer,
-    Blockly.blockRendering.Drawer);
+object.inherits(Drawer, BaseDrawer);
 
 exports = Drawer;

From 684047d22f97388f8197b4d84c7a33ca5bc09874 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 15:35:44 -0700
Subject: [PATCH 602/833] Migrate core/renderers/common/renderer.js to ES6
 const/let

---
 core/renderers/common/renderer.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js
index f72a88437..f136238df 100644
--- a/core/renderers/common/renderer.js
+++ b/core/renderers/common/renderer.js
@@ -108,7 +108,7 @@ Blockly.blockRendering.Renderer.prototype.createDom = function(svg, theme) {
  * @package
  */
 Blockly.blockRendering.Renderer.prototype.refreshDom = function(svg, theme) {
-  var previousConstants = this.getConstants();
+  const previousConstants = this.getConstants();
   previousConstants.dispose();
   this.constants_ = this.makeConstants_();
   if (this.overrides) {
@@ -244,8 +244,9 @@ Blockly.blockRendering.Renderer.prototype.shouldHighlightConnection =
  */
 Blockly.blockRendering.Renderer.prototype.orphanCanConnectAtEnd =
     function(topBlock, orphanBlock, localType) {
-      var orphanConnection = localType === Blockly.connectionTypes.OUTPUT_VALUE ?
-          orphanBlock.outputConnection : orphanBlock.previousConnection;
+      const orphanConnection = (
+          localType === Blockly.connectionTypes.OUTPUT_VALUE ?
+              orphanBlock.outputConnection : orphanBlock.previousConnection);
       return !!Blockly.Connection.getConnectionForOrphanedConnection(
           /** @type {!Blockly.Block} **/ (topBlock),
           /** @type {!Blockly.Connection} **/ (orphanConnection));
@@ -288,7 +289,7 @@ Blockly.blockRendering.Renderer.prototype.render = function(block) {
   if (Blockly.blockRendering.isDebuggerEnabled() && !block.renderingDebugger) {
     block.renderingDebugger = this.makeDebugger_();
   }
-  var info = this.makeRenderInfo_(block);
+  const info = this.makeRenderInfo_(block);
   info.measure();
   this.makeDrawer_(block, info).draw();
 };

From c1bf49ae5c4248fccdb3f7d41a5b5fe1dbc9deed Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 15:36:22 -0700
Subject: [PATCH 603/833] Migrate core/renderers/common/renderer.js to
 goog.module

---
 core/renderers/common/renderer.js | 55 +++++++++++++++++--------------
 tests/deps.js                     |  2 +-
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js
index f136238df..eb64e0e50 100644
--- a/core/renderers/common/renderer.js
+++ b/core/renderers/common/renderer.js
@@ -10,26 +10,28 @@
  */
 'use strict';
 
-goog.provide('Blockly.blockRendering.Renderer');
+goog.module('Blockly.blockRendering.Renderer');
+goog.module.declareLegacyNamespace();
 
+goog.require('Blockly.blockRendering');
 goog.require('Blockly.blockRendering.ConstantProvider');
-goog.require('Blockly.blockRendering.Debug');
 goog.require('Blockly.blockRendering.Drawer');
-goog.requireType('Blockly.blockRendering.IPathObject');
 goog.require('Blockly.blockRendering.MarkerSvg');
 goog.require('Blockly.blockRendering.PathObject');
 goog.require('Blockly.blockRendering.RenderInfo');
+goog.require('Blockly.Connection');
 goog.require('Blockly.connectionTypes');
 goog.require('Blockly.InsertionMarkerManager');
-goog.requireType('Blockly.IRegistrable');
+goog.require('Blockly.utils.object');
 
 goog.requireType('Blockly.Block');
 goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.Connection');
+goog.requireType('Blockly.blockRendering.Debug');
+goog.requireType('Blockly.blockRendering.IPathObject');
+goog.requireType('Blockly.IRegistrable');
 goog.requireType('Blockly.Marker');
 goog.requireType('Blockly.RenderedConnection');
 goog.requireType('Blockly.Theme');
-goog.requireType('Blockly.utils.object');
 goog.requireType('Blockly.WorkspaceSvg');
 
 
@@ -40,7 +42,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @constructor
  * @implements {Blockly.IRegistrable}
  */
-Blockly.blockRendering.Renderer = function(name) {
+const Renderer = function(name) {
 
   /**
    * The renderer name.
@@ -69,7 +71,7 @@ Blockly.blockRendering.Renderer = function(name) {
  * @return {string} The CSS class name.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.getClassName = function() {
+Renderer.prototype.getClassName = function() {
   return this.name + '-renderer';
 };
 
@@ -79,7 +81,7 @@ Blockly.blockRendering.Renderer.prototype.getClassName = function() {
  * @param {Object=} opt_rendererOverrides Rendering constant overrides.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.init = function(theme,
+Renderer.prototype.init = function(theme,
     opt_rendererOverrides) {
   this.constants_ = this.makeConstants_();
   if (opt_rendererOverrides) {
@@ -96,7 +98,7 @@ Blockly.blockRendering.Renderer.prototype.init = function(theme,
  * @param {!Blockly.Theme} theme The workspace theme object.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.createDom = function(svg, theme) {
+Renderer.prototype.createDom = function(svg, theme) {
   this.constants_.createDom(svg, this.name + '-' + theme.name,
       '.' + this.getClassName() + '.' + theme.getClassName());
 };
@@ -107,7 +109,7 @@ Blockly.blockRendering.Renderer.prototype.createDom = function(svg, theme) {
  * @param {!Blockly.Theme} theme The workspace theme object.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.refreshDom = function(svg, theme) {
+Renderer.prototype.refreshDom = function(svg, theme) {
   const previousConstants = this.getConstants();
   previousConstants.dispose();
   this.constants_ = this.makeConstants_();
@@ -126,7 +128,7 @@ Blockly.blockRendering.Renderer.prototype.refreshDom = function(svg, theme) {
  * Delete all DOM elements that this renderer and its constants created.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.dispose = function() {
+Renderer.prototype.dispose = function() {
   if (this.constants_) {
     this.constants_.dispose();
   }
@@ -137,7 +139,7 @@ Blockly.blockRendering.Renderer.prototype.dispose = function() {
  * @return {!Blockly.blockRendering.ConstantProvider} The constant provider.
  * @protected
  */
-Blockly.blockRendering.Renderer.prototype.makeConstants_ = function() {
+Renderer.prototype.makeConstants_ = function() {
   return new Blockly.blockRendering.ConstantProvider();
 };
 
@@ -147,7 +149,7 @@ Blockly.blockRendering.Renderer.prototype.makeConstants_ = function() {
  * @return {!Blockly.blockRendering.RenderInfo} The render info object.
  * @protected
  */
-Blockly.blockRendering.Renderer.prototype.makeRenderInfo_ = function(block) {
+Renderer.prototype.makeRenderInfo_ = function(block) {
   return new Blockly.blockRendering.RenderInfo(this, block);
 };
 
@@ -159,7 +161,7 @@ Blockly.blockRendering.Renderer.prototype.makeRenderInfo_ = function(block) {
  * @return {!Blockly.blockRendering.Drawer} The drawer.
  * @protected
  */
-Blockly.blockRendering.Renderer.prototype.makeDrawer_ = function(block, info) {
+Renderer.prototype.makeDrawer_ = function(block, info) {
   return new Blockly.blockRendering.Drawer(block, info);
 };
 
@@ -169,11 +171,12 @@ Blockly.blockRendering.Renderer.prototype.makeDrawer_ = function(block, info) {
  * @suppress {strictModuleDepCheck} Debug renderer only included in playground.
  * @protected
  */
-Blockly.blockRendering.Renderer.prototype.makeDebugger_ = function() {
-  if (!Blockly.blockRendering.Debug) {
+Renderer.prototype.makeDebugger_ = function() {
+  const Debug = goog.module.get('Blockly.blockRendering.Debug');
+  if (!Debug) {
     throw Error('Missing require for Blockly.blockRendering.Debug');
   }
-  return new Blockly.blockRendering.Debug(this.getConstants());
+  return new Debug(this.getConstants());
 };
 
 /**
@@ -184,7 +187,7 @@ Blockly.blockRendering.Renderer.prototype.makeDebugger_ = function() {
  *     the marker.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.makeMarkerDrawer = function(
+Renderer.prototype.makeMarkerDrawer = function(
     workspace, marker) {
   return new Blockly.blockRendering.MarkerSvg(workspace, this.getConstants(), marker);
 };
@@ -197,7 +200,7 @@ Blockly.blockRendering.Renderer.prototype.makeMarkerDrawer = function(
  * @return {!Blockly.blockRendering.IPathObject} The renderer path object.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.makePathObject = function(root,
+Renderer.prototype.makePathObject = function(root,
     style) {
   return new Blockly.blockRendering.PathObject(root, style,
       /** @type {!Blockly.blockRendering.ConstantProvider} */ (this.constants_));
@@ -210,7 +213,7 @@ Blockly.blockRendering.Renderer.prototype.makePathObject = function(root,
  * @return {!Blockly.blockRendering.ConstantProvider} The constant provider.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.getConstants = function() {
+Renderer.prototype.getConstants = function() {
   return (
     /** @type {!Blockly.blockRendering.ConstantProvider} */
     (this.constants_));
@@ -223,7 +226,7 @@ Blockly.blockRendering.Renderer.prototype.getConstants = function() {
  * @return {boolean} True if we should highlight the connection.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.shouldHighlightConnection =
+Renderer.prototype.shouldHighlightConnection =
     function(_conn) {
     /* eslint-disable indent */
   return true;
@@ -242,7 +245,7 @@ Blockly.blockRendering.Renderer.prototype.shouldHighlightConnection =
  * @return {boolean} Whether there is a home for the orphan or not.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.orphanCanConnectAtEnd =
+Renderer.prototype.orphanCanConnectAtEnd =
     function(topBlock, orphanBlock, localType) {
       const orphanConnection = (
           localType === Blockly.connectionTypes.OUTPUT_VALUE ?
@@ -263,7 +266,7 @@ Blockly.blockRendering.Renderer.prototype.orphanCanConnectAtEnd =
  *     to display.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.getConnectionPreviewMethod = function(
+Renderer.prototype.getConnectionPreviewMethod = function(
     closest, local, topBlock) {
   if (local.type == Blockly.connectionTypes.OUTPUT_VALUE ||
       local.type == Blockly.connectionTypes.PREVIOUS_STATEMENT) {
@@ -285,7 +288,7 @@ Blockly.blockRendering.Renderer.prototype.getConnectionPreviewMethod = function(
  * @param {!Blockly.BlockSvg} block The block to render.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.render = function(block) {
+Renderer.prototype.render = function(block) {
   if (Blockly.blockRendering.isDebuggerEnabled() && !block.renderingDebugger) {
     block.renderingDebugger = this.makeDebugger_();
   }
@@ -293,3 +296,5 @@ Blockly.blockRendering.Renderer.prototype.render = function(block) {
   info.measure();
   this.makeDrawer_(block, info).draw();
 };
+
+exports = Renderer;
diff --git a/tests/deps.js b/tests/deps.js
index 8c0415c0e..8db3435f9 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -137,7 +137,7 @@ goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blo
 goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
+goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});

From 15c512f6ea0e7deac9f8c8a41336762cd3717a22 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 16:04:15 -0700
Subject: [PATCH 604/833] Migrate core/renderers/common/renderer.js named
 requires

---
 core/renderers/common/renderer.js | 140 ++++++++++++++++--------------
 1 file changed, 74 insertions(+), 66 deletions(-)

diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js
index eb64e0e50..57ef23f11 100644
--- a/core/renderers/common/renderer.js
+++ b/core/renderers/common/renderer.js
@@ -13,26 +13,34 @@
 goog.module('Blockly.blockRendering.Renderer');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering');
-goog.require('Blockly.blockRendering.ConstantProvider');
-goog.require('Blockly.blockRendering.Drawer');
-goog.require('Blockly.blockRendering.MarkerSvg');
-goog.require('Blockly.blockRendering.PathObject');
-goog.require('Blockly.blockRendering.RenderInfo');
-goog.require('Blockly.Connection');
-goog.require('Blockly.connectionTypes');
-goog.require('Blockly.InsertionMarkerManager');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.blockRendering.Debug');
-goog.requireType('Blockly.blockRendering.IPathObject');
-goog.requireType('Blockly.IRegistrable');
-goog.requireType('Blockly.Marker');
-goog.requireType('Blockly.RenderedConnection');
-goog.requireType('Blockly.Theme');
-goog.requireType('Blockly.WorkspaceSvg');
+/* 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.require('Blockly.Connection');
+const ConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const Debug = goog.requireType('Blockly.blockRendering.Debug');
+const Drawer = goog.require('Blockly.blockRendering.Drawer');
+const InsertionMarkerManager = goog.require('Blockly.InsertionMarkerManager');
+/* eslint-disable-next-line no-unused-vars */
+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 */
+const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
+const RenderInfo = goog.require('Blockly.blockRendering.RenderInfo');
+/* eslint-disable-next-line no-unused-vars */
+const Theme = goog.requireType('Blockly.Theme');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const blockRendering = goog.require('Blockly.blockRendering');
+const connectionTypes = goog.require('Blockly.connectionTypes');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -40,7 +48,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @param {string} name The renderer name.
  * @package
  * @constructor
- * @implements {Blockly.IRegistrable}
+ * @implements {IRegistrable}
  */
 const Renderer = function(name) {
 
@@ -53,7 +61,7 @@ const Renderer = function(name) {
 
   /**
    * The renderer's constant provider.
-   * @type {Blockly.blockRendering.ConstantProvider}
+   * @type {ConstantProvider}
    * @private
    */
   this.constants_ = null;
@@ -77,7 +85,7 @@ Renderer.prototype.getClassName = function() {
 
 /**
  * Initialize the renderer.
- * @param {!Blockly.Theme} theme The workspace theme object.
+ * @param {!Theme} theme The workspace theme object.
  * @param {Object=} opt_rendererOverrides Rendering constant overrides.
  * @package
  */
@@ -86,7 +94,7 @@ Renderer.prototype.init = function(theme,
   this.constants_ = this.makeConstants_();
   if (opt_rendererOverrides) {
     this.overrides = opt_rendererOverrides;
-    Blockly.utils.object.mixin(this.constants_, opt_rendererOverrides);
+    object.mixin(this.constants_, opt_rendererOverrides);
   }
   this.constants_.setTheme(theme);
   this.constants_.init();
@@ -95,7 +103,7 @@ Renderer.prototype.init = function(theme,
 /**
  * Create any DOM elements that this renderer needs.
  * @param {!SVGElement} svg The root of the workspace's SVG.
- * @param {!Blockly.Theme} theme The workspace theme object.
+ * @param {!Theme} theme The workspace theme object.
  * @package
  */
 Renderer.prototype.createDom = function(svg, theme) {
@@ -106,7 +114,7 @@ Renderer.prototype.createDom = function(svg, theme) {
 /**
  * Refresh the renderer after a theme change.
  * @param {!SVGElement} svg The root of the workspace's SVG.
- * @param {!Blockly.Theme} theme The workspace theme object.
+ * @param {!Theme} theme The workspace theme object.
  * @package
  */
 Renderer.prototype.refreshDom = function(svg, theme) {
@@ -114,7 +122,7 @@ Renderer.prototype.refreshDom = function(svg, theme) {
   previousConstants.dispose();
   this.constants_ = this.makeConstants_();
   if (this.overrides) {
-    Blockly.utils.object.mixin(this.constants_, this.overrides);
+    object.mixin(this.constants_, this.overrides);
   }
   // Ensure the constant provider's random identifier does not change.
   this.constants_.randomIdentifier = previousConstants.randomIdentifier;
@@ -136,38 +144,38 @@ Renderer.prototype.dispose = function() {
 
 /**
  * Create a new instance of the renderer's constant provider.
- * @return {!Blockly.blockRendering.ConstantProvider} The constant provider.
+ * @return {!ConstantProvider} The constant provider.
  * @protected
  */
 Renderer.prototype.makeConstants_ = function() {
-  return new Blockly.blockRendering.ConstantProvider();
+  return new ConstantProvider();
 };
 
 /**
  * Create a new instance of the renderer's render info object.
- * @param {!Blockly.BlockSvg} block The block to measure.
- * @return {!Blockly.blockRendering.RenderInfo} The render info object.
+ * @param {!BlockSvg} block The block to measure.
+ * @return {!RenderInfo} The render info object.
  * @protected
  */
 Renderer.prototype.makeRenderInfo_ = function(block) {
-  return new Blockly.blockRendering.RenderInfo(this, block);
+  return new RenderInfo(this, block);
 };
 
 /**
  * Create a new instance of the renderer's drawer.
- * @param {!Blockly.BlockSvg} block The block to render.
- * @param {!Blockly.blockRendering.RenderInfo} info An object containing all
+ * @param {!BlockSvg} block The block to render.
+ * @param {!RenderInfo} info An object containing all
  *   information needed to render this block.
- * @return {!Blockly.blockRendering.Drawer} The drawer.
+ * @return {!Drawer} The drawer.
  * @protected
  */
 Renderer.prototype.makeDrawer_ = function(block, info) {
-  return new Blockly.blockRendering.Drawer(block, info);
+  return new Drawer(block, info);
 };
 
 /**
  * Create a new instance of the renderer's debugger.
- * @return {!Blockly.blockRendering.Debug} The renderer debugger.
+ * @return {!Debug} The renderer debugger.
  * @suppress {strictModuleDepCheck} Debug renderer only included in playground.
  * @protected
  */
@@ -181,47 +189,47 @@ Renderer.prototype.makeDebugger_ = function() {
 
 /**
  * Create a new instance of the renderer's marker drawer.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace the marker belongs to.
- * @param {!Blockly.Marker} marker The marker.
- * @return {!Blockly.blockRendering.MarkerSvg} The object in charge of drawing
+ * @param {!WorkspaceSvg} workspace The workspace the marker belongs to.
+ * @param {!Marker} marker The marker.
+ * @return {!MarkerSvg} The object in charge of drawing
  *     the marker.
  * @package
  */
 Renderer.prototype.makeMarkerDrawer = function(
     workspace, marker) {
-  return new Blockly.blockRendering.MarkerSvg(workspace, this.getConstants(), marker);
+  return new MarkerSvg(workspace, this.getConstants(), marker);
 };
 
 /**
  * Create a new instance of a renderer path object.
  * @param {!SVGElement} root The root SVG element.
- * @param {!Blockly.Theme.BlockStyle} style The style object to use for
+ * @param {!Theme.BlockStyle} style The style object to use for
  *     colouring.
- * @return {!Blockly.blockRendering.IPathObject} The renderer path object.
+ * @return {!IPathObject} The renderer path object.
  * @package
  */
 Renderer.prototype.makePathObject = function(root,
     style) {
-  return new Blockly.blockRendering.PathObject(root, style,
-      /** @type {!Blockly.blockRendering.ConstantProvider} */ (this.constants_));
+  return new PathObject(root, style,
+      /** @type {!ConstantProvider} */ (this.constants_));
 
 };
 
 /**
  * Get the current renderer's constant provider.  We assume that when this is
  * called, the renderer has already been initialized.
- * @return {!Blockly.blockRendering.ConstantProvider} The constant provider.
+ * @return {!ConstantProvider} The constant provider.
  * @package
  */
 Renderer.prototype.getConstants = function() {
   return (
-    /** @type {!Blockly.blockRendering.ConstantProvider} */
+    /** @type {!ConstantProvider} */
     (this.constants_));
 };
 
 /**
  * Determine whether or not to highlight a connection.
- * @param {Blockly.Connection} _conn The connection to determine whether or not
+ * @param {Connection} _conn The connection to determine whether or not
  *     to highlight.
  * @return {boolean} True if we should highlight the connection.
  * @package
@@ -237,9 +245,9 @@ Renderer.prototype.shouldHighlightConnection =
  * block-clump. If the clump is a row the end is the last input. If the clump
  * is a stack, the end is the last next connection. If the clump is neither,
  * then this returns false.
- * @param {!Blockly.BlockSvg} topBlock The top block of the block clump we want to try and
+ * @param {!BlockSvg} topBlock The top block of the block clump we want to try and
  *     connect to.
- * @param {!Blockly.BlockSvg} orphanBlock The orphan block that wants to find
+ * @param {!BlockSvg} orphanBlock The orphan block that wants to find
  *     a home.
  * @param {number} localType The type of the connection being dragged.
  * @return {boolean} Whether there is a home for the orphan or not.
@@ -248,48 +256,48 @@ Renderer.prototype.shouldHighlightConnection =
 Renderer.prototype.orphanCanConnectAtEnd =
     function(topBlock, orphanBlock, localType) {
       const orphanConnection = (
-          localType === Blockly.connectionTypes.OUTPUT_VALUE ?
+          localType === connectionTypes.OUTPUT_VALUE ?
               orphanBlock.outputConnection : orphanBlock.previousConnection);
-      return !!Blockly.Connection.getConnectionForOrphanedConnection(
-          /** @type {!Blockly.Block} **/ (topBlock),
-          /** @type {!Blockly.Connection} **/ (orphanConnection));
+      return !!Connection.getConnectionForOrphanedConnection(
+          /** @type {!Block} **/ (topBlock),
+          /** @type {!Connection} **/ (orphanConnection));
     };
 
 /**
  * Chooses a connection preview method based on the available connection, the
  * current dragged connection, and the block being dragged.
- * @param {!Blockly.RenderedConnection} closest The available connection.
- * @param {!Blockly.RenderedConnection} local The connection currently being
+ * @param {!RenderedConnection} closest The available connection.
+ * @param {!RenderedConnection} local The connection currently being
  *     dragged.
- * @param {!Blockly.BlockSvg} topBlock The block currently being dragged.
- * @return {!Blockly.InsertionMarkerManager.PREVIEW_TYPE} The preview type
+ * @param {!BlockSvg} topBlock The block currently being dragged.
+ * @return {!InsertionMarkerManager.PREVIEW_TYPE} The preview type
  *     to display.
  * @package
  */
 Renderer.prototype.getConnectionPreviewMethod = function(
     closest, local, topBlock) {
-  if (local.type == Blockly.connectionTypes.OUTPUT_VALUE ||
-      local.type == Blockly.connectionTypes.PREVIOUS_STATEMENT) {
+  if (local.type == connectionTypes.OUTPUT_VALUE ||
+      local.type == connectionTypes.PREVIOUS_STATEMENT) {
     if (!closest.isConnected() ||
         this.orphanCanConnectAtEnd(
             topBlock,
-            /** @type {!Blockly.BlockSvg} */ (closest.targetBlock()),
+            /** @type {!BlockSvg} */ (closest.targetBlock()),
             local.type)) {
-      return Blockly.InsertionMarkerManager.PREVIEW_TYPE.INSERTION_MARKER;
+      return InsertionMarkerManager.PREVIEW_TYPE.INSERTION_MARKER;
     }
-    return Blockly.InsertionMarkerManager.PREVIEW_TYPE.REPLACEMENT_FADE;
+    return InsertionMarkerManager.PREVIEW_TYPE.REPLACEMENT_FADE;
   }
 
-  return Blockly.InsertionMarkerManager.PREVIEW_TYPE.INSERTION_MARKER;
+  return InsertionMarkerManager.PREVIEW_TYPE.INSERTION_MARKER;
 };
 
 /**
  * Render the block.
- * @param {!Blockly.BlockSvg} block The block to render.
+ * @param {!BlockSvg} block The block to render.
  * @package
  */
 Renderer.prototype.render = function(block) {
-  if (Blockly.blockRendering.isDebuggerEnabled() && !block.renderingDebugger) {
+  if (blockRendering.isDebuggerEnabled() && !block.renderingDebugger) {
     block.renderingDebugger = this.makeDebugger_();
   }
   const info = this.makeRenderInfo_(block);

From 62fff867d8f08436b4ac57c4001d19a3d2bcc07b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 16:05:01 -0700
Subject: [PATCH 605/833] clang-format core/renderers/common/renderer.js

---
 core/renderers/common/renderer.js | 54 +++++++++++++------------------
 1 file changed, 23 insertions(+), 31 deletions(-)

diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js
index 57ef23f11..0fdd2d00f 100644
--- a/core/renderers/common/renderer.js
+++ b/core/renderers/common/renderer.js
@@ -51,7 +51,6 @@ const object = goog.require('Blockly.utils.object');
  * @implements {IRegistrable}
  */
 const Renderer = function(name) {
-
   /**
    * The renderer name.
    * @type {string}
@@ -89,8 +88,7 @@ Renderer.prototype.getClassName = function() {
  * @param {Object=} opt_rendererOverrides Rendering constant overrides.
  * @package
  */
-Renderer.prototype.init = function(theme,
-    opt_rendererOverrides) {
+Renderer.prototype.init = function(theme, opt_rendererOverrides) {
   this.constants_ = this.makeConstants_();
   if (opt_rendererOverrides) {
     this.overrides = opt_rendererOverrides;
@@ -107,7 +105,8 @@ Renderer.prototype.init = function(theme,
  * @package
  */
 Renderer.prototype.createDom = function(svg, theme) {
-  this.constants_.createDom(svg, this.name + '-' + theme.name,
+  this.constants_.createDom(
+      svg, this.name + '-' + theme.name,
       '.' + this.getClassName() + '.' + theme.getClassName());
 };
 
@@ -195,8 +194,7 @@ Renderer.prototype.makeDebugger_ = function() {
  *     the marker.
  * @package
  */
-Renderer.prototype.makeMarkerDrawer = function(
-    workspace, marker) {
+Renderer.prototype.makeMarkerDrawer = function(workspace, marker) {
   return new MarkerSvg(workspace, this.getConstants(), marker);
 };
 
@@ -208,11 +206,9 @@ Renderer.prototype.makeMarkerDrawer = function(
  * @return {!IPathObject} The renderer path object.
  * @package
  */
-Renderer.prototype.makePathObject = function(root,
-    style) {
-  return new PathObject(root, style,
-      /** @type {!ConstantProvider} */ (this.constants_));
-
+Renderer.prototype.makePathObject = function(root, style) {
+  return new PathObject(
+      root, style, /** @type {!ConstantProvider} */ (this.constants_));
 };
 
 /**
@@ -222,9 +218,7 @@ Renderer.prototype.makePathObject = function(root,
  * @package
  */
 Renderer.prototype.getConstants = function() {
-  return (
-    /** @type {!ConstantProvider} */
-    (this.constants_));
+  return /** @type {!ConstantProvider} */ (this.constants_);
 };
 
 /**
@@ -234,34 +228,33 @@ Renderer.prototype.getConstants = function() {
  * @return {boolean} True if we should highlight the connection.
  * @package
  */
-Renderer.prototype.shouldHighlightConnection =
-    function(_conn) {
-    /* eslint-disable indent */
+Renderer.prototype.shouldHighlightConnection = function(_conn) {
   return true;
-}; /* eslint-enable indent */
+};
 
 /**
  * Checks if an orphaned block can connect to the "end" of the topBlock's
  * block-clump. If the clump is a row the end is the last input. If the clump
  * is a stack, the end is the last next connection. If the clump is neither,
  * then this returns false.
- * @param {!BlockSvg} topBlock The top block of the block clump we want to try and
- *     connect to.
+ * @param {!BlockSvg} topBlock The top block of the block clump we want to try
+ *     and connect to.
  * @param {!BlockSvg} orphanBlock The orphan block that wants to find
  *     a home.
  * @param {number} localType The type of the connection being dragged.
  * @return {boolean} Whether there is a home for the orphan or not.
  * @package
  */
-Renderer.prototype.orphanCanConnectAtEnd =
-    function(topBlock, orphanBlock, localType) {
-      const orphanConnection = (
-          localType === connectionTypes.OUTPUT_VALUE ?
-              orphanBlock.outputConnection : orphanBlock.previousConnection);
-      return !!Connection.getConnectionForOrphanedConnection(
-          /** @type {!Block} **/ (topBlock),
-          /** @type {!Connection} **/ (orphanConnection));
-    };
+Renderer.prototype.orphanCanConnectAtEnd = function(
+    topBlock, orphanBlock, localType) {
+  const orphanConnection =
+      (localType === connectionTypes.OUTPUT_VALUE ?
+           orphanBlock.outputConnection :
+           orphanBlock.previousConnection);
+  return !!Connection.getConnectionForOrphanedConnection(
+      /** @type {!Block} **/ (topBlock),
+      /** @type {!Connection} **/ (orphanConnection));
+};
 
 /**
  * Chooses a connection preview method based on the available connection, the
@@ -281,8 +274,7 @@ Renderer.prototype.getConnectionPreviewMethod = function(
     if (!closest.isConnected() ||
         this.orphanCanConnectAtEnd(
             topBlock,
-            /** @type {!BlockSvg} */ (closest.targetBlock()),
-            local.type)) {
+            /** @type {!BlockSvg} */ (closest.targetBlock()), local.type)) {
       return InsertionMarkerManager.PREVIEW_TYPE.INSERTION_MARKER;
     }
     return InsertionMarkerManager.PREVIEW_TYPE.REPLACEMENT_FADE;

From 09573bcf160de31dc4fc0164b4d21013fe733fe9 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 15:43:41 -0700
Subject: [PATCH 606/833] Split classes from
 core/renderers/measurables/inputs.js

---
 .../measurables/external_value_input.js       |  53 ++++++
 core/renderers/measurables/inline_input.js    |  63 +++++++
 .../renderers/measurables/input_connection.js |  55 ++++++
 core/renderers/measurables/inputs.js          | 162 ------------------
 core/renderers/measurables/statement_input.js |  50 ++++++
 tests/deps.js                                 |   5 +-
 6 files changed, 225 insertions(+), 163 deletions(-)
 create mode 100644 core/renderers/measurables/external_value_input.js
 create mode 100644 core/renderers/measurables/inline_input.js
 create mode 100644 core/renderers/measurables/input_connection.js
 delete mode 100644 core/renderers/measurables/inputs.js
 create mode 100644 core/renderers/measurables/statement_input.js

diff --git a/core/renderers/measurables/external_value_input.js b/core/renderers/measurables/external_value_input.js
new file mode 100644
index 000000000..52fb78a0a
--- /dev/null
+++ b/core/renderers/measurables/external_value_input.js
@@ -0,0 +1,53 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class representing external value inputs with connections on a
+ * rendered block.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.provide('Blockly.blockRendering.ExternalValueInput');
+
+goog.require('Blockly.blockRendering.InputConnection');
+goog.require('Blockly.blockRendering.Types');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.Input');
+
+
+/**
+ * An object containing information about the space an external value input
+ * takes up during rendering
+ * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ *   constants provider.
+ * @param {!Blockly.Input} input The external value input to measure and store
+ *     information for.
+ * @package
+ * @constructor
+ * @extends {Blockly.blockRendering.InputConnection}
+ */
+Blockly.blockRendering.ExternalValueInput = function(constants, input) {
+  Blockly.blockRendering.ExternalValueInput.superClass_.constructor.call(this,
+      constants, input);
+  this.type |= Blockly.blockRendering.Types.EXTERNAL_VALUE_INPUT;
+  if (!this.connectedBlock) {
+    this.height = this.shape.height;
+  } else {
+    this.height =
+        this.connectedBlockHeight - this.constants_.TAB_OFFSET_FROM_TOP -
+        this.constants_.MEDIUM_PADDING;
+  }
+  this.width = this.shape.width +
+      this.constants_.EXTERNAL_VALUE_INPUT_PADDING;
+
+  this.connectionOffsetY = this.constants_.TAB_OFFSET_FROM_TOP;
+  this.connectionHeight = this.shape.height;
+  this.connectionWidth = this.shape.width;
+};
+Blockly.utils.object.inherits(Blockly.blockRendering.ExternalValueInput,
+    Blockly.blockRendering.InputConnection);
diff --git a/core/renderers/measurables/inline_input.js b/core/renderers/measurables/inline_input.js
new file mode 100644
index 000000000..59a4bf670
--- /dev/null
+++ b/core/renderers/measurables/inline_input.js
@@ -0,0 +1,63 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class representing inline inputs with connections on a rendered
+ * block.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.provide('Blockly.blockRendering.InlineInput');
+
+goog.require('Blockly.blockRendering.InputConnection');
+goog.require('Blockly.blockRendering.Types');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.Input');
+
+
+/**
+ * An object containing information about the space an inline input takes up
+ * during rendering
+ * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ *   constants provider.
+ * @param {!Blockly.Input} input The inline input to measure and store
+ *     information for.
+ * @package
+ * @constructor
+ * @extends {Blockly.blockRendering.InputConnection}
+ */
+Blockly.blockRendering.InlineInput = function(constants, input) {
+  Blockly.blockRendering.InlineInput.superClass_.constructor.call(this,
+      constants, input);
+  this.type |= Blockly.blockRendering.Types.INLINE_INPUT;
+
+  if (!this.connectedBlock) {
+    this.height = this.constants_.EMPTY_INLINE_INPUT_HEIGHT;
+    this.width = this.constants_.EMPTY_INLINE_INPUT_PADDING;
+  } else {
+    // We allow the dark path to show on the parent block so that the child
+    // block looks embossed.  This takes up an extra pixel in both x and y.
+    this.width = this.connectedBlockWidth;
+    this.height = this.connectedBlockHeight;
+  }
+
+  this.connectionHeight = !this.isDynamicShape ? this.shape.height :
+      this.shape.height(this.height);
+  this.connectionWidth = !this.isDynamicShape ? this.shape.width :
+      this.shape.width(this.height);
+  if (!this.connectedBlock) {
+    this.width += this.connectionWidth * (this.isDynamicShape ? 2 : 1);
+  }
+  this.connectionOffsetY = this.isDynamicShape ?
+      this.shape.connectionOffsetY(this.connectionHeight) :
+      this.constants_.TAB_OFFSET_FROM_TOP;
+  this.connectionOffsetX = this.isDynamicShape ?
+      this.shape.connectionOffsetX(this.connectionWidth) : 0;
+};
+Blockly.utils.object.inherits(Blockly.blockRendering.InlineInput,
+    Blockly.blockRendering.InputConnection);
diff --git a/core/renderers/measurables/input_connection.js b/core/renderers/measurables/input_connection.js
new file mode 100644
index 000000000..9a9edc887
--- /dev/null
+++ b/core/renderers/measurables/input_connection.js
@@ -0,0 +1,55 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class representing inputs with connections on a rendered block.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.provide('Blockly.blockRendering.InputConnection');
+
+goog.require('Blockly.blockRendering.Connection');
+goog.require('Blockly.blockRendering.Types');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.Input');
+
+
+/**
+ * The base class to represent an input that takes up space on a block
+ * during rendering
+ * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ *   constants provider.
+ * @param {!Blockly.Input} input The input to measure and store information for.
+ * @package
+ * @constructor
+ * @extends {Blockly.blockRendering.Connection}
+ */
+Blockly.blockRendering.InputConnection = function(constants, input) {
+  Blockly.blockRendering.InputConnection.superClass_.constructor.call(this,
+      constants, input.connection);
+
+  this.type |= Blockly.blockRendering.Types.INPUT;
+  this.input = input;
+  this.align = input.align;
+  this.connectedBlock = input.connection && input.connection.targetBlock() ?
+      input.connection.targetBlock() : null;
+
+  if (this.connectedBlock) {
+    var bBox = this.connectedBlock.getHeightWidth();
+    this.connectedBlockWidth = bBox.width;
+    this.connectedBlockHeight = bBox.height;
+  } else {
+    this.connectedBlockWidth = 0;
+    this.connectedBlockHeight = 0;
+  }
+
+  this.connectionOffsetX = 0;
+  this.connectionOffsetY = 0;
+};
+Blockly.utils.object.inherits(Blockly.blockRendering.InputConnection,
+    Blockly.blockRendering.Connection);
diff --git a/core/renderers/measurables/inputs.js b/core/renderers/measurables/inputs.js
deleted file mode 100644
index 5f845d65b..000000000
--- a/core/renderers/measurables/inputs.js
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Objects representing inputs with connections on a rendered
- * block.
- * @author fenichel@google.com (Rachel Fenichel)
- */
-
-goog.provide('Blockly.blockRendering.ExternalValueInput');
-goog.provide('Blockly.blockRendering.InlineInput');
-goog.provide('Blockly.blockRendering.InputConnection');
-goog.provide('Blockly.blockRendering.StatementInput');
-
-goog.require('Blockly.blockRendering.Connection');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.Input');
-
-
-/**
- * The base class to represent an input that takes up space on a block
- * during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @param {!Blockly.Input} input The input to measure and store information for.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.Connection}
- */
-Blockly.blockRendering.InputConnection = function(constants, input) {
-  Blockly.blockRendering.InputConnection.superClass_.constructor.call(this,
-      constants, input.connection);
-
-  this.type |= Blockly.blockRendering.Types.INPUT;
-  this.input = input;
-  this.align = input.align;
-  this.connectedBlock = input.connection && input.connection.targetBlock() ?
-      input.connection.targetBlock() : null;
-
-  if (this.connectedBlock) {
-    var bBox = this.connectedBlock.getHeightWidth();
-    this.connectedBlockWidth = bBox.width;
-    this.connectedBlockHeight = bBox.height;
-  } else {
-    this.connectedBlockWidth = 0;
-    this.connectedBlockHeight = 0;
-  }
-
-  this.connectionOffsetX = 0;
-  this.connectionOffsetY = 0;
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.InputConnection,
-    Blockly.blockRendering.Connection);
-
-/**
- * An object containing information about the space an inline input takes up
- * during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @param {!Blockly.Input} input The inline input to measure and store
- *     information for.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.InputConnection}
- */
-Blockly.blockRendering.InlineInput = function(constants, input) {
-  Blockly.blockRendering.InlineInput.superClass_.constructor.call(this,
-      constants, input);
-  this.type |= Blockly.blockRendering.Types.INLINE_INPUT;
-
-  if (!this.connectedBlock) {
-    this.height = this.constants_.EMPTY_INLINE_INPUT_HEIGHT;
-    this.width = this.constants_.EMPTY_INLINE_INPUT_PADDING;
-  } else {
-    // We allow the dark path to show on the parent block so that the child
-    // block looks embossed.  This takes up an extra pixel in both x and y.
-    this.width = this.connectedBlockWidth;
-    this.height = this.connectedBlockHeight;
-  }
-
-  this.connectionHeight = !this.isDynamicShape ? this.shape.height :
-      this.shape.height(this.height);
-  this.connectionWidth = !this.isDynamicShape ? this.shape.width :
-      this.shape.width(this.height);
-  if (!this.connectedBlock) {
-    this.width += this.connectionWidth * (this.isDynamicShape ? 2 : 1);
-  }
-  this.connectionOffsetY = this.isDynamicShape ?
-      this.shape.connectionOffsetY(this.connectionHeight) :
-      this.constants_.TAB_OFFSET_FROM_TOP;
-  this.connectionOffsetX = this.isDynamicShape ?
-      this.shape.connectionOffsetX(this.connectionWidth) : 0;
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.InlineInput,
-    Blockly.blockRendering.InputConnection);
-
-/**
- * An object containing information about the space a statement input takes up
- * during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @param {!Blockly.Input} input The statement input to measure and store
- *     information for.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.InputConnection}
- */
-Blockly.blockRendering.StatementInput = function(constants, input) {
-  Blockly.blockRendering.StatementInput.superClass_.constructor.call(this,
-      constants, input);
-  this.type |= Blockly.blockRendering.Types.STATEMENT_INPUT;
-
-  if (!this.connectedBlock) {
-    this.height = this.constants_.EMPTY_STATEMENT_INPUT_HEIGHT;
-  } else {
-    // We allow the dark path to show on the parent block so that the child
-    // block looks embossed.  This takes up an extra pixel in both x and y.
-    this.height =
-        this.connectedBlockHeight + this.constants_.STATEMENT_BOTTOM_SPACER;
-  }
-  this.width = this.constants_.STATEMENT_INPUT_NOTCH_OFFSET + this.shape.width;
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.StatementInput,
-    Blockly.blockRendering.InputConnection);
-
-/**
- * An object containing information about the space an external value input
- * takes up during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @param {!Blockly.Input} input The external value input to measure and store
- *     information for.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.InputConnection}
- */
-Blockly.blockRendering.ExternalValueInput = function(constants, input) {
-  Blockly.blockRendering.ExternalValueInput.superClass_.constructor.call(this,
-      constants, input);
-  this.type |= Blockly.blockRendering.Types.EXTERNAL_VALUE_INPUT;
-  if (!this.connectedBlock) {
-    this.height = this.shape.height;
-  } else {
-    this.height =
-        this.connectedBlockHeight - this.constants_.TAB_OFFSET_FROM_TOP -
-        this.constants_.MEDIUM_PADDING;
-  }
-  this.width = this.shape.width +
-      this.constants_.EXTERNAL_VALUE_INPUT_PADDING;
-
-  this.connectionOffsetY = this.constants_.TAB_OFFSET_FROM_TOP;
-  this.connectionHeight = this.shape.height;
-  this.connectionWidth = this.shape.width;
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.ExternalValueInput,
-    Blockly.blockRendering.InputConnection);
diff --git a/core/renderers/measurables/statement_input.js b/core/renderers/measurables/statement_input.js
new file mode 100644
index 000000000..6bd1c23fa
--- /dev/null
+++ b/core/renderers/measurables/statement_input.js
@@ -0,0 +1,50 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class representing statement inputs with connections on a
+ * rendered block.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.provide('Blockly.blockRendering.StatementInput');
+
+goog.require('Blockly.blockRendering.InputConnection');
+goog.require('Blockly.blockRendering.Types');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.Input');
+
+
+/**
+ * An object containing information about the space a statement input takes up
+ * during rendering
+ * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ *   constants provider.
+ * @param {!Blockly.Input} input The statement input to measure and store
+ *     information for.
+ * @package
+ * @constructor
+ * @extends {Blockly.blockRendering.InputConnection}
+ */
+Blockly.blockRendering.StatementInput = function(constants, input) {
+  Blockly.blockRendering.StatementInput.superClass_.constructor.call(this,
+      constants, input);
+  this.type |= Blockly.blockRendering.Types.STATEMENT_INPUT;
+
+  if (!this.connectedBlock) {
+    this.height = this.constants_.EMPTY_STATEMENT_INPUT_HEIGHT;
+  } else {
+    // We allow the dark path to show on the parent block so that the child
+    // block looks embossed.  This takes up an extra pixel in both x and y.
+    this.height =
+        this.connectedBlockHeight + this.constants_.STATEMENT_BOTTOM_SPACER;
+  }
+  this.width = this.constants_.STATEMENT_INPUT_NOTCH_OFFSET + this.shape.width;
+};
+Blockly.utils.object.inherits(Blockly.blockRendering.StatementInput,
+    Blockly.blockRendering.InputConnection);
diff --git a/tests/deps.js b/tests/deps.js
index 8db3435f9..590b1a3d5 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -148,9 +148,12 @@ goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.
 goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/inputs.js', ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/external_value_input.js', ['Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/inline_input.js', ['Blockly.blockRendering.InlineInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/input_connection.js', ['Blockly.blockRendering.InputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/row_elements.js', ['Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/rows.js', ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 3081c40a029aff68291c2e2b559163ae9fa8d8e5 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 15:45:38 -0700
Subject: [PATCH 607/833] Migrate
 core/renderers/measurables/input_connection.js to ES6 const/let

---
 core/renderers/measurables/input_connection.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/renderers/measurables/input_connection.js b/core/renderers/measurables/input_connection.js
index 9a9edc887..420c508ca 100644
--- a/core/renderers/measurables/input_connection.js
+++ b/core/renderers/measurables/input_connection.js
@@ -40,7 +40,7 @@ Blockly.blockRendering.InputConnection = function(constants, input) {
       input.connection.targetBlock() : null;
 
   if (this.connectedBlock) {
-    var bBox = this.connectedBlock.getHeightWidth();
+    const bBox = this.connectedBlock.getHeightWidth();
     this.connectedBlockWidth = bBox.width;
     this.connectedBlockHeight = bBox.height;
   } else {

From 59dee77fa8faa29cb975027f00182ae52bf426a0 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 15:47:42 -0700
Subject: [PATCH 608/833] Migrate core/renderers/measurables/inputs.js to
 goog.module

---
 core/renderers/measurables/external_value_input.js | 11 +++++++----
 core/renderers/measurables/inline_input.js         | 11 +++++++----
 core/renderers/measurables/input_connection.js     | 11 +++++++----
 core/renderers/measurables/statement_input.js      | 11 +++++++----
 tests/deps.js                                      |  8 ++++----
 5 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/core/renderers/measurables/external_value_input.js b/core/renderers/measurables/external_value_input.js
index 52fb78a0a..9832d0659 100644
--- a/core/renderers/measurables/external_value_input.js
+++ b/core/renderers/measurables/external_value_input.js
@@ -10,7 +10,8 @@
  * @author fenichel@google.com (Rachel Fenichel)
  */
 
-goog.provide('Blockly.blockRendering.ExternalValueInput');
+goog.module('Blockly.blockRendering.ExternalValueInput');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.InputConnection');
 goog.require('Blockly.blockRendering.Types');
@@ -31,8 +32,8 @@ goog.requireType('Blockly.Input');
  * @constructor
  * @extends {Blockly.blockRendering.InputConnection}
  */
-Blockly.blockRendering.ExternalValueInput = function(constants, input) {
-  Blockly.blockRendering.ExternalValueInput.superClass_.constructor.call(this,
+const ExternalValueInput = function(constants, input) {
+  ExternalValueInput.superClass_.constructor.call(this,
       constants, input);
   this.type |= Blockly.blockRendering.Types.EXTERNAL_VALUE_INPUT;
   if (!this.connectedBlock) {
@@ -49,5 +50,7 @@ Blockly.blockRendering.ExternalValueInput = function(constants, input) {
   this.connectionHeight = this.shape.height;
   this.connectionWidth = this.shape.width;
 };
-Blockly.utils.object.inherits(Blockly.blockRendering.ExternalValueInput,
+Blockly.utils.object.inherits(ExternalValueInput,
     Blockly.blockRendering.InputConnection);
+
+exports = ExternalValueInput;
diff --git a/core/renderers/measurables/inline_input.js b/core/renderers/measurables/inline_input.js
index 59a4bf670..3b3974d79 100644
--- a/core/renderers/measurables/inline_input.js
+++ b/core/renderers/measurables/inline_input.js
@@ -10,7 +10,8 @@
  * @author fenichel@google.com (Rachel Fenichel)
  */
 
-goog.provide('Blockly.blockRendering.InlineInput');
+goog.module('Blockly.blockRendering.InlineInput');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.InputConnection');
 goog.require('Blockly.blockRendering.Types');
@@ -31,8 +32,8 @@ goog.requireType('Blockly.Input');
  * @constructor
  * @extends {Blockly.blockRendering.InputConnection}
  */
-Blockly.blockRendering.InlineInput = function(constants, input) {
-  Blockly.blockRendering.InlineInput.superClass_.constructor.call(this,
+const InlineInput = function(constants, input) {
+  InlineInput.superClass_.constructor.call(this,
       constants, input);
   this.type |= Blockly.blockRendering.Types.INLINE_INPUT;
 
@@ -59,5 +60,7 @@ Blockly.blockRendering.InlineInput = function(constants, input) {
   this.connectionOffsetX = this.isDynamicShape ?
       this.shape.connectionOffsetX(this.connectionWidth) : 0;
 };
-Blockly.utils.object.inherits(Blockly.blockRendering.InlineInput,
+Blockly.utils.object.inherits(InlineInput,
     Blockly.blockRendering.InputConnection);
+
+exports = InlineInput;
diff --git a/core/renderers/measurables/input_connection.js b/core/renderers/measurables/input_connection.js
index 420c508ca..67ed3c361 100644
--- a/core/renderers/measurables/input_connection.js
+++ b/core/renderers/measurables/input_connection.js
@@ -9,7 +9,8 @@
  * @author fenichel@google.com (Rachel Fenichel)
  */
 
-goog.provide('Blockly.blockRendering.InputConnection');
+goog.module('Blockly.blockRendering.InputConnection');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.Connection');
 goog.require('Blockly.blockRendering.Types');
@@ -29,8 +30,8 @@ goog.requireType('Blockly.Input');
  * @constructor
  * @extends {Blockly.blockRendering.Connection}
  */
-Blockly.blockRendering.InputConnection = function(constants, input) {
-  Blockly.blockRendering.InputConnection.superClass_.constructor.call(this,
+const InputConnection = function(constants, input) {
+  InputConnection.superClass_.constructor.call(this,
       constants, input.connection);
 
   this.type |= Blockly.blockRendering.Types.INPUT;
@@ -51,5 +52,7 @@ Blockly.blockRendering.InputConnection = function(constants, input) {
   this.connectionOffsetX = 0;
   this.connectionOffsetY = 0;
 };
-Blockly.utils.object.inherits(Blockly.blockRendering.InputConnection,
+Blockly.utils.object.inherits(InputConnection,
     Blockly.blockRendering.Connection);
+
+exports = InputConnection;
diff --git a/core/renderers/measurables/statement_input.js b/core/renderers/measurables/statement_input.js
index 6bd1c23fa..9c3252216 100644
--- a/core/renderers/measurables/statement_input.js
+++ b/core/renderers/measurables/statement_input.js
@@ -10,7 +10,8 @@
  * @author fenichel@google.com (Rachel Fenichel)
  */
 
-goog.provide('Blockly.blockRendering.StatementInput');
+goog.module('Blockly.blockRendering.StatementInput');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.InputConnection');
 goog.require('Blockly.blockRendering.Types');
@@ -31,8 +32,8 @@ goog.requireType('Blockly.Input');
  * @constructor
  * @extends {Blockly.blockRendering.InputConnection}
  */
-Blockly.blockRendering.StatementInput = function(constants, input) {
-  Blockly.blockRendering.StatementInput.superClass_.constructor.call(this,
+const StatementInput = function(constants, input) {
+  StatementInput.superClass_.constructor.call(this,
       constants, input);
   this.type |= Blockly.blockRendering.Types.STATEMENT_INPUT;
 
@@ -46,5 +47,7 @@ Blockly.blockRendering.StatementInput = function(constants, input) {
   }
   this.width = this.constants_.STATEMENT_INPUT_NOTCH_OFFSET + this.shape.width;
 };
-Blockly.utils.object.inherits(Blockly.blockRendering.StatementInput,
+Blockly.utils.object.inherits(StatementInput,
     Blockly.blockRendering.InputConnection);
+
+exports = StatementInput;
diff --git a/tests/deps.js b/tests/deps.js
index 590b1a3d5..f5ad9dd09 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -148,12 +148,12 @@ goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.
 goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/external_value_input.js', ['Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/inline_input.js', ['Blockly.blockRendering.InlineInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/input_connection.js', ['Blockly.blockRendering.InputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/external_value_input.js', ['Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/inline_input.js', ['Blockly.blockRendering.InlineInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/input_connection.js', ['Blockly.blockRendering.InputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/row_elements.js', ['Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/rows.js', ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 35cf6482e3799e86c822645fe8191c0d32e55e51 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 15:50:15 -0700
Subject: [PATCH 609/833] Migrate core/renderers/measurables/inputs.js named
 requires

---
 .../measurables/external_value_input.js       | 25 ++++++++++---------
 core/renderers/measurables/inline_input.js    | 25 ++++++++++---------
 .../renderers/measurables/input_connection.js | 25 ++++++++++---------
 core/renderers/measurables/statement_input.js | 25 ++++++++++---------
 4 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/core/renderers/measurables/external_value_input.js b/core/renderers/measurables/external_value_input.js
index 9832d0659..b0f7c9841 100644
--- a/core/renderers/measurables/external_value_input.js
+++ b/core/renderers/measurables/external_value_input.js
@@ -13,29 +13,30 @@
 goog.module('Blockly.blockRendering.ExternalValueInput');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.InputConnection');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.Input');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const Input = goog.requireType('Blockly.Input');
+const InputConnection = goog.require('Blockly.blockRendering.InputConnection');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object containing information about the space an external value input
  * takes up during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
- * @param {!Blockly.Input} input The external value input to measure and store
+ * @param {!Input} input The external value input to measure and store
  *     information for.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.InputConnection}
+ * @extends {InputConnection}
  */
 const ExternalValueInput = function(constants, input) {
   ExternalValueInput.superClass_.constructor.call(this,
       constants, input);
-  this.type |= Blockly.blockRendering.Types.EXTERNAL_VALUE_INPUT;
+  this.type |= Types.EXTERNAL_VALUE_INPUT;
   if (!this.connectedBlock) {
     this.height = this.shape.height;
   } else {
@@ -50,7 +51,7 @@ const ExternalValueInput = function(constants, input) {
   this.connectionHeight = this.shape.height;
   this.connectionWidth = this.shape.width;
 };
-Blockly.utils.object.inherits(ExternalValueInput,
-    Blockly.blockRendering.InputConnection);
+object.inherits(ExternalValueInput,
+    InputConnection);
 
 exports = ExternalValueInput;
diff --git a/core/renderers/measurables/inline_input.js b/core/renderers/measurables/inline_input.js
index 3b3974d79..7b623e701 100644
--- a/core/renderers/measurables/inline_input.js
+++ b/core/renderers/measurables/inline_input.js
@@ -13,29 +13,30 @@
 goog.module('Blockly.blockRendering.InlineInput');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.InputConnection');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.Input');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const Input = goog.requireType('Blockly.Input');
+const InputConnection = goog.require('Blockly.blockRendering.InputConnection');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object containing information about the space an inline input takes up
  * during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
- * @param {!Blockly.Input} input The inline input to measure and store
+ * @param {!Input} input The inline input to measure and store
  *     information for.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.InputConnection}
+ * @extends {InputConnection}
  */
 const InlineInput = function(constants, input) {
   InlineInput.superClass_.constructor.call(this,
       constants, input);
-  this.type |= Blockly.blockRendering.Types.INLINE_INPUT;
+  this.type |= Types.INLINE_INPUT;
 
   if (!this.connectedBlock) {
     this.height = this.constants_.EMPTY_INLINE_INPUT_HEIGHT;
@@ -60,7 +61,7 @@ const InlineInput = function(constants, input) {
   this.connectionOffsetX = this.isDynamicShape ?
       this.shape.connectionOffsetX(this.connectionWidth) : 0;
 };
-Blockly.utils.object.inherits(InlineInput,
-    Blockly.blockRendering.InputConnection);
+object.inherits(InlineInput,
+    InputConnection);
 
 exports = InlineInput;
diff --git a/core/renderers/measurables/input_connection.js b/core/renderers/measurables/input_connection.js
index 67ed3c361..80efc5d15 100644
--- a/core/renderers/measurables/input_connection.js
+++ b/core/renderers/measurables/input_connection.js
@@ -12,29 +12,30 @@
 goog.module('Blockly.blockRendering.InputConnection');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.Connection');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.Input');
+const Connection = goog.require('Blockly.blockRendering.Connection');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const Input = goog.requireType('Blockly.Input');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * The base class to represent an input that takes up space on a block
  * during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
- * @param {!Blockly.Input} input The input to measure and store information for.
+ * @param {!Input} input The input to measure and store information for.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Connection}
+ * @extends {Connection}
  */
 const InputConnection = function(constants, input) {
   InputConnection.superClass_.constructor.call(this,
       constants, input.connection);
 
-  this.type |= Blockly.blockRendering.Types.INPUT;
+  this.type |= Types.INPUT;
   this.input = input;
   this.align = input.align;
   this.connectedBlock = input.connection && input.connection.targetBlock() ?
@@ -52,7 +53,7 @@ const InputConnection = function(constants, input) {
   this.connectionOffsetX = 0;
   this.connectionOffsetY = 0;
 };
-Blockly.utils.object.inherits(InputConnection,
-    Blockly.blockRendering.Connection);
+object.inherits(InputConnection,
+    Connection);
 
 exports = InputConnection;
diff --git a/core/renderers/measurables/statement_input.js b/core/renderers/measurables/statement_input.js
index 9c3252216..d094bc342 100644
--- a/core/renderers/measurables/statement_input.js
+++ b/core/renderers/measurables/statement_input.js
@@ -13,29 +13,30 @@
 goog.module('Blockly.blockRendering.StatementInput');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.InputConnection');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.Input');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const Input = goog.requireType('Blockly.Input');
+const InputConnection = goog.require('Blockly.blockRendering.InputConnection');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object containing information about the space a statement input takes up
  * during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
- * @param {!Blockly.Input} input The statement input to measure and store
+ * @param {!Input} input The statement input to measure and store
  *     information for.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.InputConnection}
+ * @extends {InputConnection}
  */
 const StatementInput = function(constants, input) {
   StatementInput.superClass_.constructor.call(this,
       constants, input);
-  this.type |= Blockly.blockRendering.Types.STATEMENT_INPUT;
+  this.type |= Types.STATEMENT_INPUT;
 
   if (!this.connectedBlock) {
     this.height = this.constants_.EMPTY_STATEMENT_INPUT_HEIGHT;
@@ -47,7 +48,7 @@ const StatementInput = function(constants, input) {
   }
   this.width = this.constants_.STATEMENT_INPUT_NOTCH_OFFSET + this.shape.width;
 };
-Blockly.utils.object.inherits(StatementInput,
-    Blockly.blockRendering.InputConnection);
+object.inherits(StatementInput,
+    InputConnection);
 
 exports = StatementInput;

From 88a7779cb28e8ef85541baa792a0f337c73b148d Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 15:58:46 -0700
Subject: [PATCH 610/833] clang-format core/renderers/measurables/inputs.js

---
 .../measurables/external_value_input.js         | 14 +++++---------
 core/renderers/measurables/inline_input.js      | 17 ++++++++---------
 core/renderers/measurables/input_connection.js  | 10 +++++-----
 core/renderers/measurables/statement_input.js   |  6 ++----
 4 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/core/renderers/measurables/external_value_input.js b/core/renderers/measurables/external_value_input.js
index b0f7c9841..8835716c4 100644
--- a/core/renderers/measurables/external_value_input.js
+++ b/core/renderers/measurables/external_value_input.js
@@ -34,24 +34,20 @@ const object = goog.require('Blockly.utils.object');
  * @extends {InputConnection}
  */
 const ExternalValueInput = function(constants, input) {
-  ExternalValueInput.superClass_.constructor.call(this,
-      constants, input);
+  ExternalValueInput.superClass_.constructor.call(this, constants, input);
   this.type |= Types.EXTERNAL_VALUE_INPUT;
   if (!this.connectedBlock) {
     this.height = this.shape.height;
   } else {
-    this.height =
-        this.connectedBlockHeight - this.constants_.TAB_OFFSET_FROM_TOP -
-        this.constants_.MEDIUM_PADDING;
+    this.height = this.connectedBlockHeight -
+        this.constants_.TAB_OFFSET_FROM_TOP - this.constants_.MEDIUM_PADDING;
   }
-  this.width = this.shape.width +
-      this.constants_.EXTERNAL_VALUE_INPUT_PADDING;
+  this.width = this.shape.width + this.constants_.EXTERNAL_VALUE_INPUT_PADDING;
 
   this.connectionOffsetY = this.constants_.TAB_OFFSET_FROM_TOP;
   this.connectionHeight = this.shape.height;
   this.connectionWidth = this.shape.width;
 };
-object.inherits(ExternalValueInput,
-    InputConnection);
+object.inherits(ExternalValueInput, InputConnection);
 
 exports = ExternalValueInput;
diff --git a/core/renderers/measurables/inline_input.js b/core/renderers/measurables/inline_input.js
index 7b623e701..01ac0527d 100644
--- a/core/renderers/measurables/inline_input.js
+++ b/core/renderers/measurables/inline_input.js
@@ -34,8 +34,7 @@ const object = goog.require('Blockly.utils.object');
  * @extends {InputConnection}
  */
 const InlineInput = function(constants, input) {
-  InlineInput.superClass_.constructor.call(this,
-      constants, input);
+  InlineInput.superClass_.constructor.call(this, constants, input);
   this.type |= Types.INLINE_INPUT;
 
   if (!this.connectedBlock) {
@@ -48,10 +47,10 @@ const InlineInput = function(constants, input) {
     this.height = this.connectedBlockHeight;
   }
 
-  this.connectionHeight = !this.isDynamicShape ? this.shape.height :
-      this.shape.height(this.height);
-  this.connectionWidth = !this.isDynamicShape ? this.shape.width :
-      this.shape.width(this.height);
+  this.connectionHeight =
+      !this.isDynamicShape ? this.shape.height : this.shape.height(this.height);
+  this.connectionWidth =
+      !this.isDynamicShape ? this.shape.width : this.shape.width(this.height);
   if (!this.connectedBlock) {
     this.width += this.connectionWidth * (this.isDynamicShape ? 2 : 1);
   }
@@ -59,9 +58,9 @@ const InlineInput = function(constants, input) {
       this.shape.connectionOffsetY(this.connectionHeight) :
       this.constants_.TAB_OFFSET_FROM_TOP;
   this.connectionOffsetX = this.isDynamicShape ?
-      this.shape.connectionOffsetX(this.connectionWidth) : 0;
+      this.shape.connectionOffsetX(this.connectionWidth) :
+      0;
 };
-object.inherits(InlineInput,
-    InputConnection);
+object.inherits(InlineInput, InputConnection);
 
 exports = InlineInput;
diff --git a/core/renderers/measurables/input_connection.js b/core/renderers/measurables/input_connection.js
index 80efc5d15..e6353c643 100644
--- a/core/renderers/measurables/input_connection.js
+++ b/core/renderers/measurables/input_connection.js
@@ -32,14 +32,15 @@ const object = goog.require('Blockly.utils.object');
  * @extends {Connection}
  */
 const InputConnection = function(constants, input) {
-  InputConnection.superClass_.constructor.call(this,
-      constants, input.connection);
+  InputConnection.superClass_.constructor.call(
+      this, constants, input.connection);
 
   this.type |= Types.INPUT;
   this.input = input;
   this.align = input.align;
   this.connectedBlock = input.connection && input.connection.targetBlock() ?
-      input.connection.targetBlock() : null;
+      input.connection.targetBlock() :
+      null;
 
   if (this.connectedBlock) {
     const bBox = this.connectedBlock.getHeightWidth();
@@ -53,7 +54,6 @@ const InputConnection = function(constants, input) {
   this.connectionOffsetX = 0;
   this.connectionOffsetY = 0;
 };
-object.inherits(InputConnection,
-    Connection);
+object.inherits(InputConnection, Connection);
 
 exports = InputConnection;
diff --git a/core/renderers/measurables/statement_input.js b/core/renderers/measurables/statement_input.js
index d094bc342..6050496d7 100644
--- a/core/renderers/measurables/statement_input.js
+++ b/core/renderers/measurables/statement_input.js
@@ -34,8 +34,7 @@ const object = goog.require('Blockly.utils.object');
  * @extends {InputConnection}
  */
 const StatementInput = function(constants, input) {
-  StatementInput.superClass_.constructor.call(this,
-      constants, input);
+  StatementInput.superClass_.constructor.call(this, constants, input);
   this.type |= Types.STATEMENT_INPUT;
 
   if (!this.connectedBlock) {
@@ -48,7 +47,6 @@ const StatementInput = function(constants, input) {
   }
   this.width = this.constants_.STATEMENT_INPUT_NOTCH_OFFSET + this.shape.width;
 };
-object.inherits(StatementInput,
-    InputConnection);
+object.inherits(StatementInput, InputConnection);
 
 exports = StatementInput;

From 87568c58696df25b8d3933b67badf2cf22f479ea Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 14:44:42 -0700
Subject: [PATCH 611/833] Split classes from
 core/renderers/geras/measurables/input.js into multiple files

---
 .../{inputs.js => inline_input.js}            | 30 +------------
 .../geras/measurables/statement_input.js      | 45 +++++++++++++++++++
 tests/deps.js                                 |  3 +-
 3 files changed, 49 insertions(+), 29 deletions(-)
 rename core/renderers/geras/measurables/{inputs.js => inline_input.js} (54%)
 create mode 100644 core/renderers/geras/measurables/statement_input.js

diff --git a/core/renderers/geras/measurables/inputs.js b/core/renderers/geras/measurables/inline_input.js
similarity index 54%
rename from core/renderers/geras/measurables/inputs.js
rename to core/renderers/geras/measurables/inline_input.js
index 6aca47b77..3a3cd861c 100644
--- a/core/renderers/geras/measurables/inputs.js
+++ b/core/renderers/geras/measurables/inline_input.js
@@ -5,17 +5,15 @@
  */
 
 /**
- * @fileoverview Objects representing inputs with connections on a rendered
- * block.
+ * @fileoverview Objects representing inline inputs with connections on a
+ * rendered block.
  * @author kozbial@google.com (Monica Kozbial)
  */
 'use strict';
 
 goog.provide('Blockly.geras.InlineInput');
-goog.provide('Blockly.geras.StatementInput');
 
 goog.require('Blockly.blockRendering.InlineInput');
-goog.require('Blockly.blockRendering.StatementInput');
 goog.require('Blockly.utils.object');
 
 goog.requireType('Blockly.blockRendering.ConstantProvider');
@@ -46,27 +44,3 @@ Blockly.geras.InlineInput = function(constants, input) {
 };
 Blockly.utils.object.inherits(Blockly.geras.InlineInput,
     Blockly.blockRendering.InlineInput);
-
-/**
- * An object containing information about the space a statement input takes up
- * during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @param {!Blockly.Input} input The statement input to measure and store
- *     information for.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.StatementInput}
- */
-Blockly.geras.StatementInput = function(constants, input) {
-  Blockly.geras.StatementInput.superClass_.constructor.call(
-      this, constants, input);
-
-  if (this.connectedBlock) {
-    // We allow the dark path to show on the parent block so that the child
-    // block looks embossed.  This takes up an extra pixel in both x and y.
-    this.height += this.constants_.DARK_PATH_OFFSET;
-  }
-};
-Blockly.utils.object.inherits(Blockly.geras.StatementInput,
-    Blockly.blockRendering.StatementInput);
diff --git a/core/renderers/geras/measurables/statement_input.js b/core/renderers/geras/measurables/statement_input.js
new file mode 100644
index 000000000..e309b3207
--- /dev/null
+++ b/core/renderers/geras/measurables/statement_input.js
@@ -0,0 +1,45 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Objects representing statement inputs with connections on a
+ * rendered block.
+ * @author kozbial@google.com (Monica Kozbial)
+ */
+'use strict';
+
+goog.provide('Blockly.geras.StatementInput');
+
+goog.require('Blockly.blockRendering.StatementInput');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.Input');
+
+
+/**
+ * An object containing information about the space a statement input takes up
+ * during rendering
+ * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ *   constants provider.
+ * @param {!Blockly.Input} input The statement input to measure and store
+ *     information for.
+ * @package
+ * @constructor
+ * @extends {Blockly.blockRendering.StatementInput}
+ */
+Blockly.geras.StatementInput = function(constants, input) {
+  Blockly.geras.StatementInput.superClass_.constructor.call(
+      this, constants, input);
+
+  if (this.connectedBlock) {
+    // We allow the dark path to show on the parent block so that the child
+    // block looks embossed.  This takes up an extra pixel in both x and y.
+    this.height += this.constants_.DARK_PATH_OFFSET;
+  }
+};
+Blockly.utils.object.inherits(Blockly.geras.StatementInput,
+    Blockly.blockRendering.StatementInput);
diff --git a/tests/deps.js b/tests/deps.js
index f5ad9dd09..7d7c19c1d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -143,7 +143,8 @@ goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawe
 goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/measurables/inputs.js', ['Blockly.geras.InlineInput', 'Blockly.geras.StatementInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/geras/measurables/inline_input.js', ['Blockly.geras.InlineInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/geras/measurables/statement_input.js', ['Blockly.geras.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});

From 26d4431ae54598ab66d1b68b17dae139f9042f0b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 14:45:47 -0700
Subject: [PATCH 612/833] Migrate core/renderers/geras/measurables/input.js to
 goog.module

---
 core/renderers/geras/measurables/inline_input.js    | 11 +++++++----
 core/renderers/geras/measurables/statement_input.js | 11 +++++++----
 tests/deps.js                                       |  4 ++--
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/core/renderers/geras/measurables/inline_input.js b/core/renderers/geras/measurables/inline_input.js
index 3a3cd861c..f8f4c6b9c 100644
--- a/core/renderers/geras/measurables/inline_input.js
+++ b/core/renderers/geras/measurables/inline_input.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.geras.InlineInput');
+goog.module('Blockly.geras.InlineInput');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.InlineInput');
 goog.require('Blockly.utils.object');
@@ -31,8 +32,8 @@ goog.requireType('Blockly.Input');
  * @constructor
  * @extends {Blockly.blockRendering.InlineInput}
  */
-Blockly.geras.InlineInput = function(constants, input) {
-  Blockly.geras.InlineInput.superClass_.constructor.call(
+const InlineInput = function(constants, input) {
+  InlineInput.superClass_.constructor.call(
       this, constants, input);
 
   if (this.connectedBlock) {
@@ -42,5 +43,7 @@ Blockly.geras.InlineInput = function(constants, input) {
     this.height += this.constants_.DARK_PATH_OFFSET;
   }
 };
-Blockly.utils.object.inherits(Blockly.geras.InlineInput,
+Blockly.utils.object.inherits(InlineInput,
     Blockly.blockRendering.InlineInput);
+
+exports = InlineInput;
diff --git a/core/renderers/geras/measurables/statement_input.js b/core/renderers/geras/measurables/statement_input.js
index e309b3207..289c0004a 100644
--- a/core/renderers/geras/measurables/statement_input.js
+++ b/core/renderers/geras/measurables/statement_input.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.geras.StatementInput');
+goog.module('Blockly.geras.StatementInput');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.StatementInput');
 goog.require('Blockly.utils.object');
@@ -31,8 +32,8 @@ goog.requireType('Blockly.Input');
  * @constructor
  * @extends {Blockly.blockRendering.StatementInput}
  */
-Blockly.geras.StatementInput = function(constants, input) {
-  Blockly.geras.StatementInput.superClass_.constructor.call(
+const StatementInput = function(constants, input) {
+  StatementInput.superClass_.constructor.call(
       this, constants, input);
 
   if (this.connectedBlock) {
@@ -41,5 +42,7 @@ Blockly.geras.StatementInput = function(constants, input) {
     this.height += this.constants_.DARK_PATH_OFFSET;
   }
 };
-Blockly.utils.object.inherits(Blockly.geras.StatementInput,
+Blockly.utils.object.inherits(StatementInput,
     Blockly.blockRendering.StatementInput);
+
+exports = StatementInput;
diff --git a/tests/deps.js b/tests/deps.js
index 7d7c19c1d..2c964f3c8 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -143,8 +143,8 @@ goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawe
 goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/measurables/inline_input.js', ['Blockly.geras.InlineInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/geras/measurables/statement_input.js', ['Blockly.geras.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/geras/measurables/inline_input.js', ['Blockly.geras.InlineInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/measurables/statement_input.js', ['Blockly.geras.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});

From 8f83073cdb9f859109257a933792d6e527f05e68 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 14:48:28 -0700
Subject: [PATCH 613/833] Migrate core/renderers/geras/measurables/input.js
 named requires

---
 .../geras/measurables/inline_input.js         | 20 +++++++++----------
 .../geras/measurables/statement_input.js      | 20 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/core/renderers/geras/measurables/inline_input.js b/core/renderers/geras/measurables/inline_input.js
index f8f4c6b9c..95c97afd0 100644
--- a/core/renderers/geras/measurables/inline_input.js
+++ b/core/renderers/geras/measurables/inline_input.js
@@ -14,23 +14,24 @@
 goog.module('Blockly.geras.InlineInput');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.InlineInput');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.Input');
+const BaseInlineInput = goog.require('Blockly.blockRendering.InlineInput');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const Input = goog.requireType('Blockly.Input');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object containing information about the space an inline input takes up
  * during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
- * @param {!Blockly.Input} input The inline input to measure and store
+ * @param {!Input} input The inline input to measure and store
  *     information for.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.InlineInput}
+ * @extends {BaseInlineInput}
  */
 const InlineInput = function(constants, input) {
   InlineInput.superClass_.constructor.call(
@@ -43,7 +44,6 @@ const InlineInput = function(constants, input) {
     this.height += this.constants_.DARK_PATH_OFFSET;
   }
 };
-Blockly.utils.object.inherits(InlineInput,
-    Blockly.blockRendering.InlineInput);
+object.inherits(InlineInput, BaseInlineInput);
 
 exports = InlineInput;
diff --git a/core/renderers/geras/measurables/statement_input.js b/core/renderers/geras/measurables/statement_input.js
index 289c0004a..1ebbcaab0 100644
--- a/core/renderers/geras/measurables/statement_input.js
+++ b/core/renderers/geras/measurables/statement_input.js
@@ -14,23 +14,24 @@
 goog.module('Blockly.geras.StatementInput');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.StatementInput');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.Input');
+const BaseStatementInput = goog.require('Blockly.blockRendering.StatementInput');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const Input = goog.requireType('Blockly.Input');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object containing information about the space a statement input takes up
  * during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
- * @param {!Blockly.Input} input The statement input to measure and store
+ * @param {!Input} input The statement input to measure and store
  *     information for.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.StatementInput}
+ * @extends {BaseStatementInput}
  */
 const StatementInput = function(constants, input) {
   StatementInput.superClass_.constructor.call(
@@ -42,7 +43,6 @@ const StatementInput = function(constants, input) {
     this.height += this.constants_.DARK_PATH_OFFSET;
   }
 };
-Blockly.utils.object.inherits(StatementInput,
-    Blockly.blockRendering.StatementInput);
+object.inherits(StatementInput, BaseStatementInput);
 
 exports = StatementInput;

From bdf16d88e09758ca8ec4952f447ef3b59d54ad72 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 14:52:40 -0700
Subject: [PATCH 614/833] clang-format
 core/renderers/geras/measurables/input.js

---
 core/renderers/geras/measurables/inline_input.js    | 3 +--
 core/renderers/geras/measurables/statement_input.js | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/renderers/geras/measurables/inline_input.js b/core/renderers/geras/measurables/inline_input.js
index 95c97afd0..b0e3dd776 100644
--- a/core/renderers/geras/measurables/inline_input.js
+++ b/core/renderers/geras/measurables/inline_input.js
@@ -34,8 +34,7 @@ const object = goog.require('Blockly.utils.object');
  * @extends {BaseInlineInput}
  */
 const InlineInput = function(constants, input) {
-  InlineInput.superClass_.constructor.call(
-      this, constants, input);
+  InlineInput.superClass_.constructor.call(this, constants, input);
 
   if (this.connectedBlock) {
     // We allow the dark path to show on the parent block so that the child
diff --git a/core/renderers/geras/measurables/statement_input.js b/core/renderers/geras/measurables/statement_input.js
index 1ebbcaab0..1c49f2b42 100644
--- a/core/renderers/geras/measurables/statement_input.js
+++ b/core/renderers/geras/measurables/statement_input.js
@@ -34,8 +34,7 @@ const object = goog.require('Blockly.utils.object');
  * @extends {BaseStatementInput}
  */
 const StatementInput = function(constants, input) {
-  StatementInput.superClass_.constructor.call(
-      this, constants, input);
+  StatementInput.superClass_.constructor.call(this, constants, input);
 
   if (this.connectedBlock) {
     // We allow the dark path to show on the parent block so that the child

From cf96aac58e252299ec83dc771118aef99d2455a1 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 11 Aug 2021 14:04:02 -0700
Subject: [PATCH 615/833] Migrate core/procedures.js to goog.module syntax
 (#5265)

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

* Migrate core/procedures.js to goog.module

* Migrate core/procedures.js to named requires

* clang-format core/procedures.js

* Rename xml to utilsXml to disambiguate from Xml
---
 core/procedures.js | 315 ++++++++++++++++++++++-----------------------
 tests/deps.js      |   2 +-
 2 files changed, 158 insertions(+), 159 deletions(-)

diff --git a/core/procedures.js b/core/procedures.js
index 3323bb130..e63618e7c 100644
--- a/core/procedures.js
+++ b/core/procedures.js
@@ -14,38 +14,35 @@
  * @name Blockly.Procedures
  * @namespace
  */
-goog.provide('Blockly.Procedures');
+goog.module('Blockly.Procedures');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Blocks');
-goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Abstract = goog.requireType('Blockly.Events.Abstract');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const Blocks = goog.require('Blockly.Blocks');
+const Events = goog.require('Blockly.Events');
+/* 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');
+const Variables = goog.require('Blockly.Variables');
+const Workspace = goog.require('Blockly.Workspace');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const Xml = goog.require('Blockly.Xml');
+const utilsXml = goog.require('Blockly.utils.xml');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
-goog.require('Blockly.Field');
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.Msg');
-goog.require('Blockly.Names');
-goog.require('Blockly.utils.xml');
-goog.require('Blockly.Workspace');
-goog.require('Blockly.Xml');
 
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.Events.Abstract');
-goog.requireType('Blockly.WorkspaceSvg');
-
-
-/**
- * Constant to separate procedure names from variables and generated functions
- * when running generators.
- * @deprecated Use Blockly.internalConstants.PROCEDURE_CATEGORY_NAME
- */
-Blockly.Procedures.NAME_TYPE =
-    Blockly.internalConstants.PROCEDURE_CATEGORY_NAME;
 
 /**
  * The default argument for a procedures_mutatorarg block.
  * @type {string}
  */
-Blockly.Procedures.DEFAULT_ARG = 'x';
+const DEFAULT_ARG = 'x';
+exports.DEFAULT_ARG = DEFAULT_ARG;
 
 /**
  * Procedure block type.
@@ -55,28 +52,32 @@ Blockly.Procedures.DEFAULT_ARG = 'x';
  *    getProcedureDef: function():!Array
  * }}
  */
-Blockly.Procedures.ProcedureBlock;
+let ProcedureBlock;
+exports.ProcedureBlock = ProcedureBlock;
 
 /**
  * Find all user-created procedure definitions in a workspace.
- * @param {!Blockly.Workspace} root Root workspace.
+ * @param {!Workspace} root Root workspace.
  * @return {!Array<!Array<!Array>>} Pair of arrays, the
  *     first contains procedures without return variables, the second with.
  *     Each procedure is defined by a three-element list of name, parameter
  *     list, and return value boolean.
  */
-Blockly.Procedures.allProcedures = function(root) {
-  var proceduresNoReturn = root.getBlocksByType('procedures_defnoreturn', false)
-      .map(function(block) {
-        return /** @type {!Blockly.Procedures.ProcedureBlock} */ (block).getProcedureDef();
+const allProcedures = function(root) {
+  const proceduresNoReturn =
+      root.getBlocksByType('procedures_defnoreturn', false)
+          .map(function(block) {
+            return /** @type {!ProcedureBlock} */ (block).getProcedureDef();
+          });
+  const proceduresReturn =
+      root.getBlocksByType('procedures_defreturn', false).map(function(block) {
+        return /** @type {!ProcedureBlock} */ (block).getProcedureDef();
       });
-  var proceduresReturn = root.getBlocksByType('procedures_defreturn', false).map(function(block) {
-    return /** @type {!Blockly.Procedures.ProcedureBlock} */ (block).getProcedureDef();
-  });
-  proceduresNoReturn.sort(Blockly.Procedures.procTupleComparator_);
-  proceduresReturn.sort(Blockly.Procedures.procTupleComparator_);
+  proceduresNoReturn.sort(procTupleComparator);
+  proceduresReturn.sort(procTupleComparator);
   return [proceduresNoReturn, proceduresReturn];
 };
+exports.allProcedures = allProcedures;
 
 /**
  * Comparison function for case-insensitive sorting of the first element of
@@ -84,9 +85,8 @@ Blockly.Procedures.allProcedures = function(root) {
  * @param {!Array} ta First tuple.
  * @param {!Array} tb Second tuple.
  * @return {number} -1, 0, or 1 to signify greater than, equality, or less than.
- * @private
  */
-Blockly.Procedures.procTupleComparator_ = function(ta, tb) {
+const procTupleComparator = function(ta, tb) {
   return ta[0].localeCompare(tb[0], undefined, {sensitivity: 'base'});
 };
 
@@ -95,18 +95,18 @@ Blockly.Procedures.procTupleComparator_ = function(ta, tb) {
  * Take the proposed procedure name, and return a legal name i.e. one that
  * is not empty and doesn't collide with other procedures.
  * @param {string} name Proposed procedure name.
- * @param {!Blockly.Block} block Block to disambiguate.
+ * @param {!Block} block Block to disambiguate.
  * @return {string} Non-colliding name.
  */
-Blockly.Procedures.findLegalName = function(name, block) {
+const findLegalName = function(name, block) {
   if (block.isInFlyout) {
     // Flyouts can have multiple procedures called 'do something'.
     return name;
   }
-  name = name || Blockly.Msg['UNNAMED_KEY'] || 'unnamed';
-  while (!Blockly.Procedures.isLegalName_(name, block.workspace, block)) {
+  name = name || Msg['UNNAMED_KEY'] || 'unnamed';
+  while (!isLegalName(name, block.workspace, block)) {
     // Collision with another procedure.
-    var r = name.match(/^(.*?)(\d+)$/);
+    const r = name.match(/^(.*?)(\d+)$/);
     if (!r) {
       name += '2';
     } else {
@@ -115,68 +115,68 @@ Blockly.Procedures.findLegalName = function(name, block) {
   }
   return name;
 };
+exports.findLegalName = findLegalName;
 
 /**
  * Does this procedure have a legal name?  Illegal names include names of
  * procedures already defined.
  * @param {string} name The questionable name.
- * @param {!Blockly.Workspace} workspace The workspace to scan for collisions.
- * @param {Blockly.Block=} opt_exclude Optional block to exclude from
+ * @param {!Workspace} workspace The workspace to scan for collisions.
+ * @param {Block=} opt_exclude Optional block to exclude from
  *     comparisons (one doesn't want to collide with oneself).
  * @return {boolean} True if the name is legal.
- * @private
  */
-Blockly.Procedures.isLegalName_ = function(name, workspace, opt_exclude) {
-  return !Blockly.Procedures.isNameUsed(name, workspace, opt_exclude);
+const isLegalName = function(name, workspace, opt_exclude) {
+  return !isNameUsed(name, workspace, opt_exclude);
 };
 
 /**
  * Return if the given name is already a procedure name.
  * @param {string} name The questionable name.
- * @param {!Blockly.Workspace} workspace The workspace to scan for collisions.
- * @param {Blockly.Block=} opt_exclude Optional block to exclude from
+ * @param {!Workspace} workspace The workspace to scan for collisions.
+ * @param {Block=} opt_exclude Optional block to exclude from
  *     comparisons (one doesn't want to collide with oneself).
  * @return {boolean} True if the name is used, otherwise return false.
  */
-Blockly.Procedures.isNameUsed = function(name, workspace, opt_exclude) {
-  var blocks = workspace.getAllBlocks(false);
+const isNameUsed = function(name, workspace, opt_exclude) {
+  const blocks = workspace.getAllBlocks(false);
   // Iterate through every block and check the name.
-  for (var i = 0; i < blocks.length; i++) {
+  for (let i = 0; i < blocks.length; i++) {
     if (blocks[i] == opt_exclude) {
       continue;
     }
     if (blocks[i].getProcedureDef) {
-      var procedureBlock = /** @type {!Blockly.Procedures.ProcedureBlock} */ (
-        blocks[i]);
-      var procName = procedureBlock.getProcedureDef();
-      if (Blockly.Names.equals(procName[0], name)) {
+      const procedureBlock = /** @type {!ProcedureBlock} */ (blocks[i]);
+      const procName = procedureBlock.getProcedureDef();
+      if (Names.equals(procName[0], name)) {
         return true;
       }
     }
   }
   return false;
 };
+exports.isNameUsed = isNameUsed;
 
 /**
  * Rename a procedure.  Called by the editable field.
  * @param {string} name The proposed new name.
  * @return {string} The accepted name.
- * @this {Blockly.Field}
+ * @this {Field}
  */
-Blockly.Procedures.rename = function(name) {
+const rename = function(name) {
   // Strip leading and trailing whitespace.  Beyond this, all names are legal.
   name = name.trim();
 
-  var legalName = Blockly.Procedures.findLegalName(name,
-      /** @type {!Blockly.Block} */ (this.getSourceBlock()));
-  var oldName = this.getValue();
+  const legalName = findLegalName(
+      name,
+      /** @type {!Block} */ (this.getSourceBlock()));
+  const oldName = this.getValue();
   if (oldName != name && oldName != legalName) {
     // Rename any callers.
-    var blocks = this.getSourceBlock().workspace.getAllBlocks(false);
-    for (var i = 0; i < blocks.length; i++) {
+    const blocks = this.getSourceBlock().workspace.getAllBlocks(false);
+    for (let i = 0; i < blocks.length; i++) {
       if (blocks[i].renameProcedure) {
-        var procedureBlock = /** @type {!Blockly.Procedures.ProcedureBlock} */ (
-          blocks[i]);
+        const procedureBlock = /** @type {!ProcedureBlock} */ (blocks[i]);
         procedureBlock.renameProcedure(
             /** @type {string} */ (oldName), legalName);
       }
@@ -184,45 +184,46 @@ Blockly.Procedures.rename = function(name) {
   }
   return legalName;
 };
+exports.rename = rename;
 
 /**
  * Construct the blocks required by the flyout for the procedure category.
- * @param {!Blockly.Workspace} workspace The workspace containing procedures.
+ * @param {!Workspace} workspace The workspace containing procedures.
  * @return {!Array<!Element>} Array of XML block elements.
  */
-Blockly.Procedures.flyoutCategory = function(workspace) {
-  var xmlList = [];
-  if (Blockly.Blocks['procedures_defnoreturn']) {
+const flyoutCategory = function(workspace) {
+  const xmlList = [];
+  if (Blocks['procedures_defnoreturn']) {
     // <block type="procedures_defnoreturn" gap="16">
     //     <field name="NAME">do something</field>
     // </block>
-    var block = Blockly.utils.xml.createElement('block');
+    const block = utilsXml.createElement('block');
     block.setAttribute('type', 'procedures_defnoreturn');
     block.setAttribute('gap', 16);
-    var nameField = Blockly.utils.xml.createElement('field');
+    const nameField = utilsXml.createElement('field');
     nameField.setAttribute('name', 'NAME');
-    nameField.appendChild(Blockly.utils.xml.createTextNode(
-        Blockly.Msg['PROCEDURES_DEFNORETURN_PROCEDURE']));
+    nameField.appendChild(
+      utilsXml.createTextNode(Msg['PROCEDURES_DEFNORETURN_PROCEDURE']));
     block.appendChild(nameField);
     xmlList.push(block);
   }
-  if (Blockly.Blocks['procedures_defreturn']) {
+  if (Blocks['procedures_defreturn']) {
     // <block type="procedures_defreturn" gap="16">
     //     <field name="NAME">do something</field>
     // </block>
-    var block = Blockly.utils.xml.createElement('block');
+    const block = utilsXml.createElement('block');
     block.setAttribute('type', 'procedures_defreturn');
     block.setAttribute('gap', 16);
-    var nameField = Blockly.utils.xml.createElement('field');
+    const nameField = utilsXml.createElement('field');
     nameField.setAttribute('name', 'NAME');
-    nameField.appendChild(Blockly.utils.xml.createTextNode(
-        Blockly.Msg['PROCEDURES_DEFRETURN_PROCEDURE']));
+    nameField.appendChild(
+      utilsXml.createTextNode(Msg['PROCEDURES_DEFRETURN_PROCEDURE']));
     block.appendChild(nameField);
     xmlList.push(block);
   }
-  if (Blockly.Blocks['procedures_ifreturn']) {
+  if (Blocks['procedures_ifreturn']) {
     // <block type="procedures_ifreturn" gap="16"></block>
-    var block = Blockly.utils.xml.createElement('block');
+    const block = utilsXml.createElement('block');
     block.setAttribute('type', 'procedures_ifreturn');
     block.setAttribute('gap', 16);
     xmlList.push(block);
@@ -233,22 +234,22 @@ Blockly.Procedures.flyoutCategory = function(workspace) {
   }
 
   function populateProcedures(procedureList, templateName) {
-    for (var i = 0; i < procedureList.length; i++) {
-      var name = procedureList[i][0];
-      var args = procedureList[i][1];
+    for (let i = 0; i < procedureList.length; i++) {
+      const name = procedureList[i][0];
+      const args = procedureList[i][1];
       // <block type="procedures_callnoreturn" gap="16">
       //   <mutation name="do something">
       //     <arg name="x"></arg>
       //   </mutation>
       // </block>
-      var block = Blockly.utils.xml.createElement('block');
+      const block = utilsXml.createElement('block');
       block.setAttribute('type', templateName);
       block.setAttribute('gap', 16);
-      var mutation = Blockly.utils.xml.createElement('mutation');
+      const mutation = utilsXml.createElement('mutation');
       mutation.setAttribute('name', name);
       block.appendChild(mutation);
-      for (var j = 0; j < args.length; j++) {
-        var arg = Blockly.utils.xml.createElement('arg');
+      for (let j = 0; j < args.length; j++) {
+        const arg = utilsXml.createElement('arg');
         arg.setAttribute('name', args[j]);
         mutation.appendChild(arg);
       }
@@ -256,157 +257,155 @@ Blockly.Procedures.flyoutCategory = function(workspace) {
     }
   }
 
-  var tuple = Blockly.Procedures.allProcedures(workspace);
+  const tuple = allProcedures(workspace);
   populateProcedures(tuple[0], 'procedures_callnoreturn');
   populateProcedures(tuple[1], 'procedures_callreturn');
   return xmlList;
 };
+exports.flyoutCategory = flyoutCategory;
 
 /**
  * Updates the procedure mutator's flyout so that the arg block is not a
  * duplicate of another arg.
- * @param {!Blockly.Workspace} workspace The procedure mutator's workspace. This
+ * @param {!Workspace} workspace The procedure mutator's workspace. This
  *     workspace's flyout is what is being updated.
- * @private
  */
-Blockly.Procedures.updateMutatorFlyout_ = function(workspace) {
-  var usedNames = [];
-  var blocks = workspace.getBlocksByType('procedures_mutatorarg', false);
-  for (var i = 0, block; (block = blocks[i]); i++) {
+const updateMutatorFlyout = function(workspace) {
+  const usedNames = [];
+  const blocks = workspace.getBlocksByType('procedures_mutatorarg', false);
+  for (let i = 0, block; (block = blocks[i]); i++) {
     usedNames.push(block.getFieldValue('NAME'));
   }
 
-  var xml = Blockly.utils.xml.createElement('xml');
-  var argBlock = Blockly.utils.xml.createElement('block');
+  const xmlElement = utilsXml.createElement('xml');
+  const argBlock = utilsXml.createElement('block');
   argBlock.setAttribute('type', 'procedures_mutatorarg');
-  var nameField = Blockly.utils.xml.createElement('field');
+  const nameField = utilsXml.createElement('field');
   nameField.setAttribute('name', 'NAME');
-  var argValue = Blockly.Variables.generateUniqueNameFromOptions(
-      Blockly.Procedures.DEFAULT_ARG, usedNames);
-  var fieldContent = Blockly.utils.xml.createTextNode(argValue);
+  const argValue =
+      Variables.generateUniqueNameFromOptions(DEFAULT_ARG, usedNames);
+  const fieldContent = utilsXml.createTextNode(argValue);
 
   nameField.appendChild(fieldContent);
   argBlock.appendChild(nameField);
-  xml.appendChild(argBlock);
+  xmlElement.appendChild(argBlock);
 
-  workspace.updateToolbox(xml);
+  workspace.updateToolbox(xmlElement);
 };
 
 /**
  * Listens for when a procedure mutator is opened. Then it triggers a flyout
  * update and adds a mutator change listener to the mutator workspace.
- * @param {!Blockly.Events.Abstract} e The event that triggered this listener.
- * @package
+ * @param {!Abstract} e The event that triggered this listener.
  */
-Blockly.Procedures.mutatorOpenListener = function(e) {
-  if (!(e.type == Blockly.Events.BUBBLE_OPEN && e.bubbleType === 'mutator' &&
-      e.isOpen)) {
+const mutatorOpenListener = function(e) {
+  if (!(e.type == Events.BUBBLE_OPEN && e.bubbleType === 'mutator' &&
+        e.isOpen)) {
     return;
   }
-  var workspaceId = /** @type {string} */ (e.workspaceId);
-  var block = Blockly.Workspace.getById(workspaceId)
-      .getBlockById(e.blockId);
-  var type = block.type;
+  const workspaceId = /** @type {string} */ (e.workspaceId);
+  const block = Workspace.getById(workspaceId).getBlockById(e.blockId);
+  const type = block.type;
   if (type != 'procedures_defnoreturn' && type != 'procedures_defreturn') {
     return;
   }
-  var workspace = block.mutator.getWorkspace();
-  Blockly.Procedures.updateMutatorFlyout_(workspace);
-  workspace.addChangeListener(Blockly.Procedures.mutatorChangeListener_);
+  const workspace = block.mutator.getWorkspace();
+  updateMutatorFlyout(workspace);
+  workspace.addChangeListener(mutatorChangeListener);
 };
+/** @package */
+exports.mutatorOpenListener = mutatorOpenListener;
 
 /**
  * Listens for changes in a procedure mutator and triggers flyout updates when
  * necessary.
- * @param {!Blockly.Events.Abstract} e The event that triggered this listener.
- * @private
+ * @param {!Abstract} e The event that triggered this listener.
  */
-Blockly.Procedures.mutatorChangeListener_ = function(e) {
-  if (e.type != Blockly.Events.BLOCK_CREATE &&
-      e.type != Blockly.Events.BLOCK_DELETE &&
-      e.type != Blockly.Events.BLOCK_CHANGE) {
+const mutatorChangeListener = function(e) {
+  if (e.type != Events.BLOCK_CREATE && e.type != Events.BLOCK_DELETE &&
+      e.type != Events.BLOCK_CHANGE) {
     return;
   }
-  var workspaceId = /** @type {string} */ (e.workspaceId);
-  var workspace = /** @type {!Blockly.WorkspaceSvg} */
-      (Blockly.Workspace.getById(workspaceId));
-  Blockly.Procedures.updateMutatorFlyout_(workspace);
+  const workspaceId = /** @type {string} */ (e.workspaceId);
+  const workspace = /** @type {!WorkspaceSvg} */
+      (Workspace.getById(workspaceId));
+  updateMutatorFlyout(workspace);
 };
 
 /**
  * Find all the callers of a named procedure.
  * @param {string} name Name of procedure.
- * @param {!Blockly.Workspace} workspace The workspace to find callers in.
- * @return {!Array<!Blockly.Block>} Array of caller blocks.
+ * @param {!Workspace} workspace The workspace to find callers in.
+ * @return {!Array<!Block>} Array of caller blocks.
  */
-Blockly.Procedures.getCallers = function(name, workspace) {
-  var callers = [];
-  var blocks = workspace.getAllBlocks(false);
+const getCallers = function(name, workspace) {
+  const callers = [];
+  const blocks = workspace.getAllBlocks(false);
   // Iterate through every block and check the name.
-  for (var i = 0; i < blocks.length; i++) {
+  for (let i = 0; i < blocks.length; i++) {
     if (blocks[i].getProcedureCall) {
-      var procedureBlock = /** @type {!Blockly.Procedures.ProcedureBlock} */ (
-        blocks[i]);
-      var procName = procedureBlock.getProcedureCall();
+      const procedureBlock = /** @type {!ProcedureBlock} */ (blocks[i]);
+      const procName = procedureBlock.getProcedureCall();
       // Procedure name may be null if the block is only half-built.
-      if (procName && Blockly.Names.equals(procName, name)) {
+      if (procName && Names.equals(procName, name)) {
         callers.push(blocks[i]);
       }
     }
   }
   return callers;
 };
+exports.getCallers = getCallers;
 
 /**
  * When a procedure definition changes its parameters, find and edit all its
  * callers.
- * @param {!Blockly.Block} defBlock Procedure definition block.
+ * @param {!Block} defBlock Procedure definition block.
  */
-Blockly.Procedures.mutateCallers = function(defBlock) {
-  var oldRecordUndo = Blockly.Events.recordUndo;
-  var procedureBlock = /** @type {!Blockly.Procedures.ProcedureBlock} */ (
-    defBlock);
-  var name = procedureBlock.getProcedureDef()[0];
-  var xmlElement = defBlock.mutationToDom(true);
-  var callers = Blockly.Procedures.getCallers(name, defBlock.workspace);
-  for (var i = 0, caller; (caller = callers[i]); i++) {
-    var oldMutationDom = caller.mutationToDom();
-    var oldMutation = oldMutationDom && Blockly.Xml.domToText(oldMutationDom);
+const mutateCallers = function(defBlock) {
+  const oldRecordUndo = Events.recordUndo;
+  const procedureBlock = /** @type {!ProcedureBlock} */ (defBlock);
+  const name = procedureBlock.getProcedureDef()[0];
+  const xmlElement = defBlock.mutationToDom(true);
+  const callers = getCallers(name, defBlock.workspace);
+  for (let i = 0, caller; (caller = callers[i]); i++) {
+    const oldMutationDom = caller.mutationToDom();
+    const oldMutation = oldMutationDom && Xml.domToText(oldMutationDom);
     caller.domToMutation(xmlElement);
-    var newMutationDom = caller.mutationToDom();
-    var newMutation = newMutationDom && Blockly.Xml.domToText(newMutationDom);
+    const newMutationDom = caller.mutationToDom();
+    const newMutation = newMutationDom && Xml.domToText(newMutationDom);
     if (oldMutation != newMutation) {
       // Fire a mutation on every caller block.  But don't record this as an
       // undo action since it is deterministically tied to the procedure's
       // definition mutation.
-      Blockly.Events.recordUndo = false;
-      Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CHANGE))(
+      Events.recordUndo = false;
+      Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
           caller, 'mutation', null, oldMutation, newMutation));
-      Blockly.Events.recordUndo = oldRecordUndo;
+      Events.recordUndo = oldRecordUndo;
     }
   }
 };
+exports.mutateCallers = mutateCallers;
 
 /**
  * Find the definition block for the named procedure.
  * @param {string} name Name of procedure.
- * @param {!Blockly.Workspace} workspace The workspace to search.
- * @return {?Blockly.Block} The procedure definition block, or null not found.
+ * @param {!Workspace} workspace The workspace to search.
+ * @return {?Block} The procedure definition block, or null not found.
  */
-Blockly.Procedures.getDefinition = function(name, workspace) {
+const getDefinition = function(name, workspace) {
   // Do not assume procedure is a top block. Some languages allow nested
   // procedures. Also do not assume it is one of the built-in blocks. Only
   // rely on getProcedureDef.
-  var blocks = workspace.getAllBlocks(false);
-  for (var i = 0; i < blocks.length; i++) {
+  const blocks = workspace.getAllBlocks(false);
+  for (let i = 0; i < blocks.length; i++) {
     if (blocks[i].getProcedureDef) {
-      var procedureBlock = /** @type {!Blockly.Procedures.ProcedureBlock} */ (
-        blocks[i]);
-      var tuple = procedureBlock.getProcedureDef();
-      if (tuple && Blockly.Names.equals(tuple[0], name)) {
+      const procedureBlock = /** @type {!ProcedureBlock} */ (blocks[i]);
+      const tuple = procedureBlock.getProcedureDef();
+      if (tuple && Names.equals(tuple[0], name)) {
         return blocks[i];  // Can't use procedureBlock var due to type check.
       }
     }
   }
   return null;
 };
+exports.getDefinition = getDefinition;
diff --git a/tests/deps.js b/tests/deps.js
index 2c964f3c8..4e2796458 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -126,7 +126,7 @@ goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubbl
 goog.addDependency('../../core/names.js', ['Blockly.Names'], ['Blockly.Msg', 'Blockly.Variables', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.xml']);
+goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});

From 3bdcfd98217cba2d7dcf2720373f880dbb8ae1e0 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 3 Aug 2021 16:23:49 -0700
Subject: [PATCH 616/833] Split core/ui_events.js into multiple files

---
 core/events/{ui_events.js => events_ui.js} | 45 ++---------------
 core/events/events_ui_base.js              | 58 ++++++++++++++++++++++
 tests/deps.js                              |  3 +-
 3 files changed, 64 insertions(+), 42 deletions(-)
 rename core/events/{ui_events.js => events_ui.js} (64%)
 create mode 100644 core/events/events_ui_base.js

diff --git a/core/events/ui_events.js b/core/events/events_ui.js
similarity index 64%
rename from core/events/ui_events.js
rename to core/events/events_ui.js
index 5d649a22f..be8500b33 100644
--- a/core/events/ui_events.js
+++ b/core/events/events_ui.js
@@ -5,59 +5,22 @@
  */
 
 /**
- * @fileoverview Events fired as a result of UI actions in Blockly's editor.
+ * @fileoverview (Deprecated) Events fired as a result of UI actions in
+ * Blockly's editor.
  * @author fraser@google.com (Neil Fraser)
  */
 'use strict';
 
 goog.provide('Blockly.Events.Ui');
-goog.provide('Blockly.Events.UiBase');
 
 goog.require('Blockly.Events');
-goog.require('Blockly.Events.Abstract');
+goog.require('Blockly.Events.UiBase');
 goog.require('Blockly.registry');
 goog.require('Blockly.utils.object');
 
 goog.requireType('Blockly.Block');
 
 
-/**
- * Base class for a UI event.
- * UI events are events that don't need to be sent over the wire for multi-user
- * editing to work (e.g. scrolling the workspace, zooming, opening toolbox
- * categories).
- * UI events do not undo or redo.
- * @param {string=} opt_workspaceId The workspace identifier for this event.
- *    Undefined for a blank event.
- * @extends {Blockly.Events.Abstract}
- * @constructor
- */
-Blockly.Events.UiBase = function(opt_workspaceId) {
-  Blockly.Events.UiBase.superClass_.constructor.call(this);
-
-  /**
-   * Whether or not the event is blank (to be populated by fromJson).
-   * @type {boolean}
-   */
-  this.isBlank = typeof opt_workspaceId == 'undefined';
-
-  /**
-   * The workspace identifier for this event.
-   * @type {string}
-   */
-  this.workspaceId = opt_workspaceId ? opt_workspaceId : '';
-
-  // UI events do not undo or redo.
-  this.recordUndo = false;
-};
-Blockly.utils.object.inherits(Blockly.Events.UiBase, Blockly.Events.Abstract);
-
-/**
- * Whether or not the event is a UI event.
- * @type {boolean}
- */
-Blockly.Events.UiBase.prototype.isUiEvent = true;
-
 /**
  * Class for a UI event.
  * @param {?Blockly.Block=} opt_block The affected block.  Null for UI events
@@ -116,4 +79,4 @@ Blockly.Events.Ui.prototype.fromJson = function(json) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.UI,
-    Blockly.Events.Ui);
+    Blockly.Events.Ui);
\ No newline at end of file
diff --git a/core/events/events_ui_base.js b/core/events/events_ui_base.js
new file mode 100644
index 000000000..b286b9283
--- /dev/null
+++ b/core/events/events_ui_base.js
@@ -0,0 +1,58 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Base class for events fired as a result of UI actions in
+ * Blockly's editor.
+ * @author fraser@google.com (Neil Fraser)
+ */
+'use strict';
+
+goog.provide('Blockly.Events.UiBase');
+
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.Abstract');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.Block');
+
+
+/**
+ * Base class for a UI event.
+ * UI events are events that don't need to be sent over the wire for multi-user
+ * editing to work (e.g. scrolling the workspace, zooming, opening toolbox
+ * categories).
+ * UI events do not undo or redo.
+ * @param {string=} opt_workspaceId The workspace identifier for this event.
+ *    Undefined for a blank event.
+ * @extends {Blockly.Events.Abstract}
+ * @constructor
+ */
+Blockly.Events.UiBase = function(opt_workspaceId) {
+  Blockly.Events.UiBase.superClass_.constructor.call(this);
+
+  /**
+   * Whether or not the event is blank (to be populated by fromJson).
+   * @type {boolean}
+   */
+  this.isBlank = typeof opt_workspaceId == 'undefined';
+
+  /**
+   * The workspace identifier for this event.
+   * @type {string}
+   */
+  this.workspaceId = opt_workspaceId ? opt_workspaceId : '';
+
+  // UI events do not undo or redo.
+  this.recordUndo = false;
+};
+Blockly.utils.object.inherits(Blockly.Events.UiBase, Blockly.Events.Abstract);
+
+/**
+ * Whether or not the event is a UI event.
+ * @type {boolean}
+ */
+Blockly.Events.UiBase.prototype.isUiEvent = true;
diff --git a/tests/deps.js b/tests/deps.js
index 4e2796458..9d4b8a6bd 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -49,12 +49,13 @@ goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Sele
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_ui.js', ['Blockly.Events.Ui'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_ui_base.js', ['Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_var_base.js', ['Blockly.Events.VarBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_var_create.js', ['Blockly.Events.VarCreate'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.VarDelete'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/ws_comment_events.js', ['Blockly.Events.CommentBase', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});

From aa83199a55d4449f0ec99e85973b11dfe57f2622 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 3 Aug 2021 16:25:33 -0700
Subject: [PATCH 617/833] Migrate core/events/events_ui.js to ES6 const/let

---
 core/events/events_ui.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/events/events_ui.js b/core/events/events_ui.js
index be8500b33..b28d86a2e 100644
--- a/core/events/events_ui.js
+++ b/core/events/events_ui.js
@@ -35,7 +35,7 @@ goog.requireType('Blockly.Block');
  */
 Blockly.Events.Ui = function(opt_block, opt_element, opt_oldValue,
     opt_newValue) {
-  var workspaceId = opt_block ? opt_block.workspace.id : undefined;
+  const workspaceId = opt_block ? opt_block.workspace.id : undefined;
   Blockly.Events.Ui.superClass_.constructor.call(this, workspaceId);
 
   this.blockId = opt_block ? opt_block.id : null;
@@ -56,7 +56,7 @@ Blockly.Events.Ui.prototype.type = Blockly.Events.UI;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.Ui.prototype.toJson = function() {
-  var json = Blockly.Events.Ui.superClass_.toJson.call(this);
+  const json = Blockly.Events.Ui.superClass_.toJson.call(this);
   json['element'] = this.element;
   if (this.newValue !== undefined) {
     json['newValue'] = this.newValue;

From e16a0a4bce83dac71e6c1aeae4168d3620fda82f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 3 Aug 2021 16:26:34 -0700
Subject: [PATCH 618/833] Migrate core/events/events_ui.js and
 core/events/events_ui_base.js to goog.module

---
 core/events/events_ui.js      | 22 ++++++++++++----------
 core/events/events_ui_base.js | 16 ++++++++--------
 tests/deps.js                 |  4 ++--
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/core/events/events_ui.js b/core/events/events_ui.js
index b28d86a2e..5504b61d6 100644
--- a/core/events/events_ui.js
+++ b/core/events/events_ui.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.Ui');
+goog.module('Blockly.Events.Ui');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.UiBase');
@@ -33,30 +34,30 @@ goog.requireType('Blockly.Block');
  * @deprecated December 2020. Instead use a more specific UI event.
  * @constructor
  */
-Blockly.Events.Ui = function(opt_block, opt_element, opt_oldValue,
+const Ui = function(opt_block, opt_element, opt_oldValue,
     opt_newValue) {
   const workspaceId = opt_block ? opt_block.workspace.id : undefined;
-  Blockly.Events.Ui.superClass_.constructor.call(this, workspaceId);
+  Ui.superClass_.constructor.call(this, workspaceId);
 
   this.blockId = opt_block ? opt_block.id : null;
   this.element = typeof opt_element == 'undefined' ? '' : opt_element;
   this.oldValue = typeof opt_oldValue == 'undefined' ? '' : opt_oldValue;
   this.newValue = typeof opt_newValue == 'undefined' ? '' : opt_newValue;
 };
-Blockly.utils.object.inherits(Blockly.Events.Ui, Blockly.Events.UiBase);
+Blockly.utils.object.inherits(Ui, Blockly.Events.UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.Ui.prototype.type = Blockly.Events.UI;
+Ui.prototype.type = Blockly.Events.UI;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.Ui.prototype.toJson = function() {
-  const json = Blockly.Events.Ui.superClass_.toJson.call(this);
+Ui.prototype.toJson = function() {
+  const json = Ui.superClass_.toJson.call(this);
   json['element'] = this.element;
   if (this.newValue !== undefined) {
     json['newValue'] = this.newValue;
@@ -71,12 +72,13 @@ Blockly.Events.Ui.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.Ui.prototype.fromJson = function(json) {
-  Blockly.Events.Ui.superClass_.fromJson.call(this, json);
+Ui.prototype.fromJson = function(json) {
+  Ui.superClass_.fromJson.call(this, json);
   this.element = json['element'];
   this.newValue = json['newValue'];
   this.blockId = json['blockId'];
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.UI,
-    Blockly.Events.Ui);
\ No newline at end of file
+    Ui);
+exports = Ui;
diff --git a/core/events/events_ui_base.js b/core/events/events_ui_base.js
index b286b9283..9d54f0dcf 100644
--- a/core/events/events_ui_base.js
+++ b/core/events/events_ui_base.js
@@ -11,14 +11,12 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.UiBase');
+goog.module('Blockly.Events.UiBase');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
 goog.require('Blockly.Events.Abstract');
 goog.require('Blockly.utils.object');
 
-goog.requireType('Blockly.Block');
-
 
 /**
  * Base class for a UI event.
@@ -31,8 +29,8 @@ goog.requireType('Blockly.Block');
  * @extends {Blockly.Events.Abstract}
  * @constructor
  */
-Blockly.Events.UiBase = function(opt_workspaceId) {
-  Blockly.Events.UiBase.superClass_.constructor.call(this);
+const UiBase = function(opt_workspaceId) {
+  UiBase.superClass_.constructor.call(this);
 
   /**
    * Whether or not the event is blank (to be populated by fromJson).
@@ -49,10 +47,12 @@ Blockly.Events.UiBase = function(opt_workspaceId) {
   // UI events do not undo or redo.
   this.recordUndo = false;
 };
-Blockly.utils.object.inherits(Blockly.Events.UiBase, Blockly.Events.Abstract);
+Blockly.utils.object.inherits(UiBase, Blockly.Events.Abstract);
 
 /**
  * Whether or not the event is a UI event.
  * @type {boolean}
  */
-Blockly.Events.UiBase.prototype.isUiEvent = true;
+UiBase.prototype.isUiEvent = true;
+
+exports = UiBase;
diff --git a/tests/deps.js b/tests/deps.js
index 9d4b8a6bd..3da6c1e78 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -49,8 +49,8 @@ goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Sele
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_ui.js', ['Blockly.Events.Ui'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_ui_base.js', ['Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_ui.js', ['Blockly.Events.Ui'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_ui_base.js', ['Blockly.Events.UiBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_var_base.js', ['Blockly.Events.VarBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_var_create.js', ['Blockly.Events.VarCreate'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.VarDelete'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 2826d70cac2e910916fb255f9fe443282f85f2e9 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 3 Aug 2021 16:34:38 -0700
Subject: [PATCH 619/833] Migrate core/events/events_ui_base.js named requires

---
 core/events/events_ui.js      | 22 +++++++++++-----------
 core/events/events_ui_base.js |  8 ++++----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/core/events/events_ui.js b/core/events/events_ui.js
index 5504b61d6..b191b986f 100644
--- a/core/events/events_ui.js
+++ b/core/events/events_ui.js
@@ -14,23 +14,23 @@
 goog.module('Blockly.Events.Ui');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
  * Class for a UI event.
- * @param {?Blockly.Block=} opt_block The affected block.  Null for UI events
+ * @param {?Block=} opt_block The affected block.  Null for UI events
  *     that do not have an associated block.  Undefined for a blank event.
  * @param {string=} opt_element One of 'selected', 'comment', 'mutatorOpen',
  *     etc.
  * @param {*=} opt_oldValue Previous value of element.
  * @param {*=} opt_newValue New value of element.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @deprecated December 2020. Instead use a more specific UI event.
  * @constructor
  */
@@ -44,13 +44,13 @@ const Ui = function(opt_block, opt_element, opt_oldValue,
   this.oldValue = typeof opt_oldValue == 'undefined' ? '' : opt_oldValue;
   this.newValue = typeof opt_newValue == 'undefined' ? '' : opt_newValue;
 };
-Blockly.utils.object.inherits(Ui, Blockly.Events.UiBase);
+object.inherits(Ui, UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Ui.prototype.type = Blockly.Events.UI;
+Ui.prototype.type = Events.UI;
 
 /**
  * Encode the event as JSON.
@@ -79,6 +79,6 @@ Ui.prototype.fromJson = function(json) {
   this.blockId = json['blockId'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.UI,
+registry.register(registry.Type.EVENT, Events.UI,
     Ui);
 exports = Ui;
diff --git a/core/events/events_ui_base.js b/core/events/events_ui_base.js
index 9d54f0dcf..5bcf7270c 100644
--- a/core/events/events_ui_base.js
+++ b/core/events/events_ui_base.js
@@ -14,8 +14,8 @@
 goog.module('Blockly.Events.UiBase');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events.Abstract');
-goog.require('Blockly.utils.object');
+const Abstract = goog.require('Blockly.Events.Abstract');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -26,7 +26,7 @@ goog.require('Blockly.utils.object');
  * UI events do not undo or redo.
  * @param {string=} opt_workspaceId The workspace identifier for this event.
  *    Undefined for a blank event.
- * @extends {Blockly.Events.Abstract}
+ * @extends {Abstract}
  * @constructor
  */
 const UiBase = function(opt_workspaceId) {
@@ -47,7 +47,7 @@ const UiBase = function(opt_workspaceId) {
   // UI events do not undo or redo.
   this.recordUndo = false;
 };
-Blockly.utils.object.inherits(UiBase, Blockly.Events.Abstract);
+object.inherits(UiBase, Abstract);
 
 /**
  * Whether or not the event is a UI event.

From 75eab4f395fb85c14b6040f6d8a8797d7df5fe4c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 3 Aug 2021 16:36:55 -0700
Subject: [PATCH 620/833] clang-format core/events/events_ui.js

---
 core/events/events_ui.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/events/events_ui.js b/core/events/events_ui.js
index b191b986f..425b69ce4 100644
--- a/core/events/events_ui.js
+++ b/core/events/events_ui.js
@@ -34,8 +34,7 @@ const registry = goog.require('Blockly.registry');
  * @deprecated December 2020. Instead use a more specific UI event.
  * @constructor
  */
-const Ui = function(opt_block, opt_element, opt_oldValue,
-    opt_newValue) {
+const Ui = function(opt_block, opt_element, opt_oldValue, opt_newValue) {
   const workspaceId = opt_block ? opt_block.workspace.id : undefined;
   Ui.superClass_.constructor.call(this, workspaceId);
 
@@ -79,6 +78,5 @@ Ui.prototype.fromJson = function(json) {
   this.blockId = json['blockId'];
 };
 
-registry.register(registry.Type.EVENT, Events.UI,
-    Ui);
+registry.register(registry.Type.EVENT, Events.UI, Ui);
 exports = Ui;

From 2ba3b0ba97b32e04384fa4519c9ec5c60114064f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 15:17:14 -0700
Subject: [PATCH 621/833] Add newline to core/events/events_ui.js

---
 core/events/events_ui.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/events/events_ui.js b/core/events/events_ui.js
index 425b69ce4..5598f30a0 100644
--- a/core/events/events_ui.js
+++ b/core/events/events_ui.js
@@ -79,4 +79,5 @@ Ui.prototype.fromJson = function(json) {
 };
 
 registry.register(registry.Type.EVENT, Events.UI, Ui);
+
 exports = Ui;

From fdd9011637b58f03d50eeea61cc411750b534aea Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 16:56:12 -0700
Subject: [PATCH 622/833] Migrate core/insertion_marker_manager.js to ES6
 const/let

---
 core/insertion_marker_manager.js | 109 ++++++++++++++++---------------
 1 file changed, 55 insertions(+), 54 deletions(-)

diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js
index 614f7e70b..ebe2b8900 100644
--- a/core/insertion_marker_manager.js
+++ b/core/insertion_marker_manager.js
@@ -225,12 +225,12 @@ Blockly.InsertionMarkerManager.prototype.applyConnections = function() {
     if (this.topBlock_.rendered) {
       // Trigger a connection animation.
       // Determine which connection is inferior (lower in the source stack).
-      var inferiorConnection = this.localConnection_.isSuperior() ?
+      const inferiorConnection = this.localConnection_.isSuperior() ?
           this.closestConnection_ : this.localConnection_;
       Blockly.blockAnimations.connectionUiEffect(
           inferiorConnection.getSourceBlock());
       // Bring the just-edited stack to the front.
-      var rootBlock = this.topBlock_.getRootBlock();
+      const rootBlock = this.topBlock_.getRootBlock();
       rootBlock.bringToFront();
     }
   }
@@ -245,11 +245,11 @@ Blockly.InsertionMarkerManager.prototype.applyConnections = function() {
  * @package
  */
 Blockly.InsertionMarkerManager.prototype.update = function(dxy, dragTarget) {
-  var candidate = this.getCandidate_(dxy);
+  const candidate = this.getCandidate_(dxy);
 
   this.wouldDeleteBlock_ = this.shouldDelete_(candidate, dragTarget);
 
-  var shouldUpdate = this.wouldDeleteBlock_ ||
+  const shouldUpdate = this.wouldDeleteBlock_ ||
       this.shouldUpdatePreviews_(candidate, dxy);
 
   if (shouldUpdate) {
@@ -270,14 +270,15 @@ Blockly.InsertionMarkerManager.prototype.update = function(dxy, dragTarget) {
  * @private
  */
 Blockly.InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlock) {
-  var imType = sourceBlock.type;
+  const imType = sourceBlock.type;
 
   Blockly.Events.disable();
+  let result;
   try {
-    var result = this.workspace_.newBlock(imType);
+    result = this.workspace_.newBlock(imType);
     result.setInsertionMarker(true);
     if (sourceBlock.mutationToDom) {
-      var oldMutationDom = sourceBlock.mutationToDom();
+      const oldMutationDom = sourceBlock.mutationToDom();
       if (oldMutationDom) {
         result.domToMutation(oldMutationDom);
       }
@@ -285,19 +286,19 @@ Blockly.InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlo
     // Copy field values from the other block.  These values may impact the
     // rendered size of the insertion marker.  Note that we do not care about
     // child blocks here.
-    for (var i = 0; i < sourceBlock.inputList.length; i++) {
-      var sourceInput = sourceBlock.inputList[i];
+    for (let i = 0; i < sourceBlock.inputList.length; i++) {
+      const sourceInput = sourceBlock.inputList[i];
       if (sourceInput.name == Blockly.constants.COLLAPSED_INPUT_NAME) {
         continue;  // Ignore the collapsed input.
       }
-      var resultInput = result.inputList[i];
+      const resultInput = result.inputList[i];
       if (!resultInput) {
         throw new Error(Blockly.InsertionMarkerManager.DUPLICATE_BLOCK_ERROR
             .replace('%1', 'an input'));
       }
-      for (var j = 0; j < sourceInput.fieldRow.length; j++) {
-        var sourceField = sourceInput.fieldRow[j];
-        var resultField = resultInput.fieldRow[j];
+      for (let j = 0; j < sourceInput.fieldRow.length; j++) {
+        const sourceField = sourceInput.fieldRow[j];
+        const resultField = resultInput.fieldRow[j];
         if (!resultField) {
           throw new Error(Blockly.InsertionMarkerManager.DUPLICATE_BLOCK_ERROR
               .replace('%1', 'a field'));
@@ -328,9 +329,9 @@ Blockly.InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlo
  * @private
  */
 Blockly.InsertionMarkerManager.prototype.initAvailableConnections_ = function() {
-  var available = this.topBlock_.getConnections_(false);
+  const available = this.topBlock_.getConnections_(false);
   // Also check the last connection on this stack
-  var lastOnStack = this.topBlock_.lastConnectionInStack(true);
+  const lastOnStack = this.topBlock_.lastConnectionInStack(true);
   if (lastOnStack && lastOnStack != this.topBlock_.nextConnection) {
     available.push(lastOnStack);
     this.lastOnStack_ = lastOnStack;
@@ -359,9 +360,9 @@ Blockly.InsertionMarkerManager.prototype.initAvailableConnections_ = function()
  */
 Blockly.InsertionMarkerManager.prototype.shouldUpdatePreviews_ = function(
     candidate, dxy) {
-  var candidateLocal = candidate.local;
-  var candidateClosest = candidate.closest;
-  var radius = candidate.radius;
+  const candidateLocal = candidate.local;
+  const candidateClosest = candidate.closest;
+  const radius = candidate.radius;
 
   // Found a connection!
   if (candidateLocal && candidateClosest) {
@@ -373,9 +374,9 @@ Blockly.InsertionMarkerManager.prototype.shouldUpdatePreviews_ = function(
           this.localConnection_ == candidateLocal) {
         return false;
       }
-      var xDiff = this.localConnection_.x + dxy.x - this.closestConnection_.x;
-      var yDiff = this.localConnection_.y + dxy.y - this.closestConnection_.y;
-      var curDistance = Math.sqrt(xDiff * xDiff + yDiff * yDiff);
+      const xDiff = this.localConnection_.x + dxy.x - this.closestConnection_.x;
+      const yDiff = this.localConnection_.y + dxy.y - this.closestConnection_.y;
+      const curDistance = Math.sqrt(xDiff * xDiff + yDiff * yDiff);
       // Slightly prefer the existing preview over a new preview.
       return !(
           candidateClosest &&
@@ -406,13 +407,13 @@ Blockly.InsertionMarkerManager.prototype.shouldUpdatePreviews_ = function(
  * @private
  */
 Blockly.InsertionMarkerManager.prototype.getCandidate_ = function(dxy) {
-  var radius = this.getStartRadius_();
-  var candidateClosest = null;
-  var candidateLocal = null;
+  let radius = this.getStartRadius_();
+  let candidateClosest = null;
+  let candidateLocal = null;
 
-  for (var i = 0; i < this.availableConnections_.length; i++) {
-    var myConnection = this.availableConnections_[i];
-    var neighbour = myConnection.closest(radius, dxy);
+  for (let i = 0; i < this.availableConnections_.length; i++) {
+    const myConnection = this.availableConnections_[i];
+    const neighbour = myConnection.closest(radius, dxy);
     if (neighbour.connection) {
       candidateClosest = neighbour.connection;
       candidateLocal = myConnection;
@@ -458,8 +459,8 @@ Blockly.InsertionMarkerManager.prototype.getStartRadius_ = function() {
 Blockly.InsertionMarkerManager.prototype.shouldDelete_ = function(
     candidate, dragTarget) {
   if (dragTarget) {
-    var componentManager = this.workspace_.getComponentManager();
-    var isDeleteArea = componentManager.hasCapability(dragTarget.id,
+    const componentManager = this.workspace_.getComponentManager();
+    const isDeleteArea = componentManager.hasCapability(dragTarget.id,
         Blockly.ComponentManager.Capability.DELETE_AREA);
     if (isDeleteArea) {
       return (
@@ -484,8 +485,8 @@ Blockly.InsertionMarkerManager.prototype.maybeShowPreview_ = function(candidate)
   if (this.wouldDeleteBlock_) {
     return;
   }
-  var closest = candidate.closest;
-  var local = candidate.local;
+  const closest = candidate.closest;
+  const local = candidate.local;
 
   // Nothing to connect to.
   if (!closest) {
@@ -510,9 +511,9 @@ Blockly.InsertionMarkerManager.prototype.maybeShowPreview_ = function(candidate)
  * @private
  */
 Blockly.InsertionMarkerManager.prototype.showPreview_ = function() {
-  var closest = this.closestConnection_;
-  var renderer = this.workspace_.getRenderer();
-  var method = renderer.getConnectionPreviewMethod(
+  const closest = this.closestConnection_;
+  const renderer = this.workspace_.getRenderer();
+  const method = renderer.getConnectionPreviewMethod(
       /** @type {!Blockly.RenderedConnection} */ (closest),
       /** @type {!Blockly.RenderedConnection} */ (this.localConnection_),
       this.topBlock_);
@@ -552,9 +553,9 @@ Blockly.InsertionMarkerManager.prototype.maybeHidePreview_ = function(candidate)
   } else {
     // If there's a new preview and there was an preview before, and either
     // connection has changed, remove the old preview.
-    var hadPreview = this.closestConnection_ && this.localConnection_;
-    var closestChanged = this.closestConnection_ != candidate.closest;
-    var localChanged = this.localConnection_ != candidate.local;
+    const hadPreview = this.closestConnection_ && this.localConnection_;
+    const closestChanged = this.closestConnection_ != candidate.closest;
+    const localChanged = this.localConnection_ != candidate.local;
 
     // Also hide if we had a preview before but now we're going to delete instead.
     if (hadPreview && (closestChanged || localChanged || this.wouldDeleteBlock_)) {
@@ -594,12 +595,12 @@ Blockly.InsertionMarkerManager.prototype.hidePreview_ = function() {
  * @private
  */
 Blockly.InsertionMarkerManager.prototype.showInsertionMarker_ = function() {
-  var local = this.localConnection_;
-  var closest = this.closestConnection_;
+  const local = this.localConnection_;
+  const closest = this.closestConnection_;
 
-  var isLastInStack = this.lastOnStack_ && local == this.lastOnStack_;
-  var imBlock = isLastInStack ? this.lastMarker_ : this.firstMarker_;
-  var imConn = imBlock.getMatchingConnection(local.getSourceBlock(), local);
+  const isLastInStack = this.lastOnStack_ && local == this.lastOnStack_;
+  const imBlock = isLastInStack ? this.lastMarker_ : this.firstMarker_;
+  const imConn = imBlock.getMatchingConnection(local.getSourceBlock(), local);
 
   if (imConn == this.markerConnection_) {
     throw Error('Made it to showInsertionMarker_ even though the marker isn\'t ' +
@@ -635,16 +636,16 @@ Blockly.InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
     return;
   }
 
-  var imConn = this.markerConnection_;
-  var imBlock = imConn.getSourceBlock();
-  var markerNext = imBlock.nextConnection;
-  var markerPrev = imBlock.previousConnection;
-  var markerOutput = imBlock.outputConnection;
+  const imConn = this.markerConnection_;
+  const imBlock = imConn.getSourceBlock();
+  const markerNext = imBlock.nextConnection;
+  const markerPrev = imBlock.previousConnection;
+  const markerOutput = imBlock.outputConnection;
 
-  var isFirstInStatementStack =
+  const isFirstInStatementStack =
       (imConn == markerNext && !(markerPrev && markerPrev.targetConnection));
 
-  var isFirstInOutputStack =
+  const isFirstInOutputStack =
       imConn.type == Blockly.connectionTypes.INPUT_VALUE &&
       !(markerOutput && markerOutput.targetConnection);
   // The insertion marker is the first block in a stack.  Unplug won't do
@@ -655,10 +656,10 @@ Blockly.InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
   // Inside of a C-block, first statement connection.
   else if (imConn.type == Blockly.connectionTypes.NEXT_STATEMENT &&
       imConn != markerNext) {
-    var innerConnection = imConn.targetConnection;
+    const innerConnection = imConn.targetConnection;
     innerConnection.getSourceBlock().unplug(false);
 
-    var previousBlockNextConnection =
+    const previousBlockNextConnection =
         markerPrev ? markerPrev.targetConnection : null;
 
     imBlock.unplug(true);
@@ -675,7 +676,7 @@ Blockly.InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
   }
 
   this.markerConnection_ = null;
-  var svg = imBlock.getSvgRoot();
+  const svg = imBlock.getSvgRoot();
   if (svg) {
     svg.setAttribute('visibility', 'hidden');
   }
@@ -686,7 +687,7 @@ Blockly.InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
  * @private
  */
 Blockly.InsertionMarkerManager.prototype.showInsertionInputOutline_ = function() {
-  var closest = this.closestConnection_;
+  const closest = this.closestConnection_;
   this.highlightedBlock_ = closest.getSourceBlock();
   this.highlightedBlock_.highlightShapeForInput(closest, true);
 };
@@ -727,7 +728,7 @@ Blockly.InsertionMarkerManager.prototype.hideReplacementFade_ = function() {
  * @package
  */
 Blockly.InsertionMarkerManager.prototype.getInsertionMarkers = function() {
-  var result = [];
+  const result = [];
   if (this.firstMarker_) {
     result.push(this.firstMarker_);
   }

From 61eb96c8310fb278c2b09b7de6c27ea02892a656 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 16:59:11 -0700
Subject: [PATCH 623/833] Migrate core/insertion_marker_manager.js to
 goog.module

---
 core/insertion_marker_manager.js | 72 ++++++++++++++++++--------------
 tests/deps.js                    |  2 +-
 2 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js
index ebe2b8900..07940f106 100644
--- a/core/insertion_marker_manager.js
+++ b/core/insertion_marker_manager.js
@@ -10,15 +10,21 @@
  */
 'use strict';
 
-goog.provide('Blockly.InsertionMarkerManager');
+goog.module('Blockly.InsertionMarkerManager');
+goog.module.declareLegacyNamespace();
 
+// TODO(#5073): Add Blockly require after fixing circular dependency.
+// goog.require('Blockly');
 goog.require('Blockly.blockAnimations');
+goog.require('Blockly.constants');
 goog.require('Blockly.ComponentManager');
 goog.require('Blockly.connectionTypes');
 goog.require('Blockly.Events');
 goog.require('Blockly.internalConstants');
 
 goog.requireType('Blockly.BlockSvg');
+goog.requireType('Blockly.IDeleteArea');
+goog.requireType('Blockly.IDragTarget');
 goog.requireType('Blockly.RenderedConnection');
 goog.requireType('Blockly.utils.Coordinate');
 goog.requireType('Blockly.WorkspaceSvg');
@@ -31,7 +37,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @param {!Blockly.BlockSvg} block The top block in the stack being dragged.
  * @constructor
  */
-Blockly.InsertionMarkerManager = function(block) {
+const InsertionMarkerManager = function(block) {
   Blockly.selected = block;
 
   /**
@@ -142,7 +148,7 @@ Blockly.InsertionMarkerManager = function(block) {
  * could display.
  * @enum {number}
  */
-Blockly.InsertionMarkerManager.PREVIEW_TYPE = {
+InsertionMarkerManager.PREVIEW_TYPE = {
   INSERTION_MARKER: 0,
   INPUT_OUTLINE: 1,
   REPLACEMENT_FADE: 2,
@@ -154,7 +160,7 @@ Blockly.InsertionMarkerManager.PREVIEW_TYPE = {
  * @type {string}
  * @const
  */
-Blockly.InsertionMarkerManager.DUPLICATE_BLOCK_ERROR = 'The insertion marker ' +
+InsertionMarkerManager.DUPLICATE_BLOCK_ERROR = 'The insertion marker ' +
     'manager tried to create a marker but the result is missing %1. If ' +
     'you are using a mutator, make sure your domToMutation method is ' +
     'properly defined.';
@@ -163,7 +169,7 @@ Blockly.InsertionMarkerManager.DUPLICATE_BLOCK_ERROR = 'The insertion marker ' +
  * Sever all links from this object.
  * @package
  */
-Blockly.InsertionMarkerManager.prototype.dispose = function() {
+InsertionMarkerManager.prototype.dispose = function() {
   this.availableConnections_.length = 0;
 
   Blockly.Events.disable();
@@ -184,7 +190,7 @@ Blockly.InsertionMarkerManager.prototype.dispose = function() {
  * change if a block is unplugged and the stack is healed.
  * @package
  */
-Blockly.InsertionMarkerManager.prototype.updateAvailableConnections = function() {
+InsertionMarkerManager.prototype.updateAvailableConnections = function() {
   this.availableConnections_ = this.initAvailableConnections_();
 };
 
@@ -194,7 +200,7 @@ Blockly.InsertionMarkerManager.prototype.updateAvailableConnections = function()
  * @return {boolean} True if the block would be deleted if dropped immediately.
  * @package
  */
-Blockly.InsertionMarkerManager.prototype.wouldDeleteBlock = function() {
+InsertionMarkerManager.prototype.wouldDeleteBlock = function() {
   return this.wouldDeleteBlock_;
 };
 
@@ -205,7 +211,7 @@ Blockly.InsertionMarkerManager.prototype.wouldDeleteBlock = function() {
  *   immediately.
  * @package
  */
-Blockly.InsertionMarkerManager.prototype.wouldConnectBlock = function() {
+InsertionMarkerManager.prototype.wouldConnectBlock = function() {
   return !!this.closestConnection_;
 };
 
@@ -214,7 +220,7 @@ Blockly.InsertionMarkerManager.prototype.wouldConnectBlock = function() {
  * This should be called at the end of a drag.
  * @package
  */
-Blockly.InsertionMarkerManager.prototype.applyConnections = function() {
+InsertionMarkerManager.prototype.applyConnections = function() {
   if (this.closestConnection_) {
     // Don't fire events for insertion markers.
     Blockly.Events.disable();
@@ -244,7 +250,7 @@ Blockly.InsertionMarkerManager.prototype.applyConnections = function() {
  *     currently over.
  * @package
  */
-Blockly.InsertionMarkerManager.prototype.update = function(dxy, dragTarget) {
+InsertionMarkerManager.prototype.update = function(dxy, dragTarget) {
   const candidate = this.getCandidate_(dxy);
 
   this.wouldDeleteBlock_ = this.shouldDelete_(candidate, dragTarget);
@@ -269,7 +275,7 @@ Blockly.InsertionMarkerManager.prototype.update = function(dxy, dragTarget) {
  *     block.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlock) {
+InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlock) {
   const imType = sourceBlock.type;
 
   Blockly.Events.disable();
@@ -293,14 +299,14 @@ Blockly.InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlo
       }
       const resultInput = result.inputList[i];
       if (!resultInput) {
-        throw new Error(Blockly.InsertionMarkerManager.DUPLICATE_BLOCK_ERROR
+        throw new Error(InsertionMarkerManager.DUPLICATE_BLOCK_ERROR
             .replace('%1', 'an input'));
       }
       for (let j = 0; j < sourceInput.fieldRow.length; j++) {
         const sourceField = sourceInput.fieldRow[j];
         const resultField = resultInput.fieldRow[j];
         if (!resultField) {
-          throw new Error(Blockly.InsertionMarkerManager.DUPLICATE_BLOCK_ERROR
+          throw new Error(InsertionMarkerManager.DUPLICATE_BLOCK_ERROR
               .replace('%1', 'a field'));
         }
         resultField.setValue(sourceField.getValue());
@@ -328,7 +334,7 @@ Blockly.InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlo
  *     connections.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.initAvailableConnections_ = function() {
+InsertionMarkerManager.prototype.initAvailableConnections_ = function() {
   const available = this.topBlock_.getConnections_(false);
   // Also check the last connection on this stack
   const lastOnStack = this.topBlock_.lastConnectionInStack(true);
@@ -358,7 +364,7 @@ Blockly.InsertionMarkerManager.prototype.initAvailableConnections_ = function()
  * @return {boolean} Whether the preview should be updated.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.shouldUpdatePreviews_ = function(
+InsertionMarkerManager.prototype.shouldUpdatePreviews_ = function(
     candidate, dxy) {
   const candidateLocal = candidate.local;
   const candidateClosest = candidate.closest;
@@ -406,7 +412,7 @@ Blockly.InsertionMarkerManager.prototype.shouldUpdatePreviews_ = function(
  *     connection, and a radius.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.getCandidate_ = function(dxy) {
+InsertionMarkerManager.prototype.getCandidate_ = function(dxy) {
   let radius = this.getStartRadius_();
   let candidateClosest = null;
   let candidateLocal = null;
@@ -433,7 +439,7 @@ Blockly.InsertionMarkerManager.prototype.getCandidate_ = function(dxy) {
  *     connection.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.getStartRadius_ = function() {
+InsertionMarkerManager.prototype.getStartRadius_ = function() {
   // If there is already a connection highlighted,
   // increase the radius we check for making new connections.
   // Why? When a connection is highlighted, blocks move around when the insertion
@@ -456,7 +462,7 @@ Blockly.InsertionMarkerManager.prototype.getStartRadius_ = function() {
  *    block.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.shouldDelete_ = function(
+InsertionMarkerManager.prototype.shouldDelete_ = function(
     candidate, dragTarget) {
   if (dragTarget) {
     const componentManager = this.workspace_.getComponentManager();
@@ -480,7 +486,7 @@ Blockly.InsertionMarkerManager.prototype.shouldDelete_ = function(
  *     connection, and a radius.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.maybeShowPreview_ = function(candidate) {
+InsertionMarkerManager.prototype.maybeShowPreview_ = function(candidate) {
   // Nope, don't add a marker.
   if (this.wouldDeleteBlock_) {
     return;
@@ -510,7 +516,7 @@ Blockly.InsertionMarkerManager.prototype.maybeShowPreview_ = function(candidate)
  * highlight or an insertion marker, and shows the appropriate one.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.showPreview_ = function() {
+InsertionMarkerManager.prototype.showPreview_ = function() {
   const closest = this.closestConnection_;
   const renderer = this.workspace_.getRenderer();
   const method = renderer.getConnectionPreviewMethod(
@@ -519,13 +525,13 @@ Blockly.InsertionMarkerManager.prototype.showPreview_ = function() {
       this.topBlock_);
 
   switch (method) {
-    case Blockly.InsertionMarkerManager.PREVIEW_TYPE.INPUT_OUTLINE:
+    case InsertionMarkerManager.PREVIEW_TYPE.INPUT_OUTLINE:
       this.showInsertionInputOutline_();
       break;
-    case Blockly.InsertionMarkerManager.PREVIEW_TYPE.INSERTION_MARKER:
+    case InsertionMarkerManager.PREVIEW_TYPE.INSERTION_MARKER:
       this.showInsertionMarker_();
       break;
-    case Blockly.InsertionMarkerManager.PREVIEW_TYPE.REPLACEMENT_FADE:
+    case InsertionMarkerManager.PREVIEW_TYPE.REPLACEMENT_FADE:
       this.showReplacementFade_();
       break;
   }
@@ -545,7 +551,7 @@ Blockly.InsertionMarkerManager.prototype.showPreview_ = function() {
  *     connection, and a radius.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.maybeHidePreview_ = function(candidate) {
+InsertionMarkerManager.prototype.maybeHidePreview_ = function(candidate) {
   // If there's no new preview, remove the old one but don't bother deleting it.
   // We might need it later, and this saves disposing of it and recreating it.
   if (!candidate.closest) {
@@ -574,7 +580,7 @@ Blockly.InsertionMarkerManager.prototype.maybeHidePreview_ = function(candidate)
  *  highlight or an insertion marker, and hides the appropriate one.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.hidePreview_ = function() {
+InsertionMarkerManager.prototype.hidePreview_ = function() {
   if (this.closestConnection_ && this.closestConnection_.targetBlock() &&
       this.workspace_.getRenderer()
           .shouldHighlightConnection(this.closestConnection_)) {
@@ -594,7 +600,7 @@ Blockly.InsertionMarkerManager.prototype.hidePreview_ = function() {
  * manager state).
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.showInsertionMarker_ = function() {
+InsertionMarkerManager.prototype.showInsertionMarker_ = function() {
   const local = this.localConnection_;
   const closest = this.closestConnection_;
 
@@ -630,7 +636,7 @@ Blockly.InsertionMarkerManager.prototype.showInsertionMarker_ = function() {
  * to their original state.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
+InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
   if (!this.markerConnection_) {
     console.log('No insertion marker connection to disconnect');
     return;
@@ -686,7 +692,7 @@ Blockly.InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
  * Shows an outline around the input the closest connection belongs to.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.showInsertionInputOutline_ = function() {
+InsertionMarkerManager.prototype.showInsertionInputOutline_ = function() {
   const closest = this.closestConnection_;
   this.highlightedBlock_ = closest.getSourceBlock();
   this.highlightedBlock_.highlightShapeForInput(closest, true);
@@ -696,7 +702,7 @@ Blockly.InsertionMarkerManager.prototype.showInsertionInputOutline_ = function()
  * Hides any visible input outlines.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.hideInsertionInputOutline_ = function() {
+InsertionMarkerManager.prototype.hideInsertionInputOutline_ = function() {
   this.highlightedBlock_.highlightShapeForInput(this.closestConnection_, false);
   this.highlightedBlock_ = null;
 };
@@ -706,7 +712,7 @@ Blockly.InsertionMarkerManager.prototype.hideInsertionInputOutline_ = function()
  * (the block that is currently connected to it).
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.showReplacementFade_ = function() {
+InsertionMarkerManager.prototype.showReplacementFade_ = function() {
   this.fadedBlock_ = this.closestConnection_.targetBlock();
   this.fadedBlock_.fadeForReplacement(true);
 };
@@ -715,7 +721,7 @@ Blockly.InsertionMarkerManager.prototype.showReplacementFade_ = function() {
  * Hides/Removes any visible fade affects.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.hideReplacementFade_ = function() {
+InsertionMarkerManager.prototype.hideReplacementFade_ = function() {
   this.fadedBlock_.fadeForReplacement(false);
   this.fadedBlock_ = null;
 };
@@ -727,7 +733,7 @@ Blockly.InsertionMarkerManager.prototype.hideReplacementFade_ = function() {
  *     marker blocks.
  * @package
  */
-Blockly.InsertionMarkerManager.prototype.getInsertionMarkers = function() {
+InsertionMarkerManager.prototype.getInsertionMarkers = function() {
   const result = [];
   if (this.firstMarker_) {
     result.push(this.firstMarker_);
@@ -737,3 +743,5 @@ Blockly.InsertionMarkerManager.prototype.getInsertionMarkers = function() {
   }
   return result;
 };
+
+exports = InsertionMarkerManager;
diff --git a/tests/deps.js b/tests/deps.js
index 3da6c1e78..15bbfa67b 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -83,7 +83,7 @@ goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEven
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.internalConstants'], {'lang': 'es5'});
+goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], [], {'lang': 'es6', 'module': 'goog'});

From 0bb3f3af84b9ba1ccaa96fa6b01c93f05e0862af Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 17:00:42 -0700
Subject: [PATCH 624/833] Migrate core/insertion_marker_manager.js named
 requires

---
 core/insertion_marker_manager.js | 115 ++++++++++++++++---------------
 1 file changed, 60 insertions(+), 55 deletions(-)

diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js
index 07940f106..64a8fa936 100644
--- a/core/insertion_marker_manager.js
+++ b/core/insertion_marker_manager.js
@@ -15,26 +15,31 @@ goog.module.declareLegacyNamespace();
 
 // TODO(#5073): Add Blockly require after fixing circular dependency.
 // goog.require('Blockly');
-goog.require('Blockly.blockAnimations');
-goog.require('Blockly.constants');
-goog.require('Blockly.ComponentManager');
-goog.require('Blockly.connectionTypes');
-goog.require('Blockly.Events');
-goog.require('Blockly.internalConstants');
-
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.IDeleteArea');
-goog.requireType('Blockly.IDragTarget');
-goog.requireType('Blockly.RenderedConnection');
-goog.requireType('Blockly.utils.Coordinate');
-goog.requireType('Blockly.WorkspaceSvg');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const ComponentManager = goog.require('Blockly.ComponentManager');
+/* eslint-disable-next-line no-unused-vars */
+const Coordinate = goog.requireType('Blockly.utils.Coordinate');
+const Events = goog.require('Blockly.Events');
+/* 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 connectionTypes = goog.require('Blockly.connectionTypes');
+const constants = goog.require('Blockly.constants');
+const internalConstants = goog.require('Blockly.internalConstants');
 
 
 /**
  * Class that controls updates to connections during drags.  It is primarily
  * responsible for finding the closest eligible connection and highlighting or
  * unhiglighting it as needed during a drag.
- * @param {!Blockly.BlockSvg} block The top block in the stack being dragged.
+ * @param {!BlockSvg} block The top block in the stack being dragged.
  * @constructor
  */
 const InsertionMarkerManager = function(block) {
@@ -43,7 +48,7 @@ const InsertionMarkerManager = function(block) {
   /**
    * The top block in the stack being dragged.
    * Does not change during a drag.
-   * @type {!Blockly.BlockSvg}
+   * @type {!BlockSvg}
    * @private
    */
   this.topBlock_ = block;
@@ -51,7 +56,7 @@ const InsertionMarkerManager = function(block) {
   /**
    * The workspace on which these connections are being dragged.
    * Does not change during a drag.
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @private
    */
   this.workspace_ = block.workspace;
@@ -60,7 +65,7 @@ const InsertionMarkerManager = function(block) {
    * The last connection on the stack, if it's not the last connection on the
    * first block.
    * Set in initAvailableConnections, if at all.
-   * @type {Blockly.RenderedConnection}
+   * @type {RenderedConnection}
    * @private
    */
   this.lastOnStack_ = null;
@@ -69,7 +74,7 @@ const InsertionMarkerManager = function(block) {
    * The insertion marker corresponding to the last block in the stack, if
    * that's not the same as the first block in the stack.
    * Set in initAvailableConnections, if at all
-   * @type {Blockly.BlockSvg}
+   * @type {BlockSvg}
    * @private
    */
   this.lastMarker_ = null;
@@ -77,7 +82,7 @@ const InsertionMarkerManager = function(block) {
   /**
    * The insertion marker that shows up between blocks to show where a block
    * would go if dropped immediately.
-   * @type {Blockly.BlockSvg}
+   * @type {BlockSvg}
    * @private
    */
   this.firstMarker_ = this.createMarkerBlock_(this.topBlock_);
@@ -86,7 +91,7 @@ const InsertionMarkerManager = function(block) {
    * The connection that this block would connect to if released immediately.
    * Updated on every mouse move.
    * This is not on any of the blocks that are being dragged.
-   * @type {Blockly.RenderedConnection}
+   * @type {RenderedConnection}
    * @private
    */
   this.closestConnection_ = null;
@@ -97,7 +102,7 @@ const InsertionMarkerManager = function(block) {
    * Updated on every mouse move.
    * This is on the top block that is being dragged or the last block in the
    * dragging stack.
-   * @type {Blockly.RenderedConnection}
+   * @type {RenderedConnection}
    * @private
    */
   this.localConnection_ = null;
@@ -113,21 +118,21 @@ const InsertionMarkerManager = function(block) {
   /**
    * Connection on the insertion marker block that corresponds to
    * this.localConnection_ on the currently dragged block.
-   * @type {Blockly.RenderedConnection}
+   * @type {RenderedConnection}
    * @private
    */
   this.markerConnection_ = null;
 
   /**
    * The block that currently has an input being highlighted, or null.
-   * @type {Blockly.BlockSvg}
+   * @type {BlockSvg}
    * @private
    */
   this.highlightedBlock_ = null;
 
   /**
    * The block being faded to indicate replacement, or null.
-   * @type {Blockly.BlockSvg}
+   * @type {BlockSvg}
    * @private
    */
   this.fadedBlock_ = null;
@@ -137,7 +142,7 @@ const InsertionMarkerManager = function(block) {
    * other blocks.  This includes all open connections on the top block, as well
    * as the last connection on the block stack.
    * Does not change during a drag.
-   * @type {!Array<!Blockly.RenderedConnection>}
+   * @type {!Array<!RenderedConnection>}
    * @private
    */
   this.availableConnections_ = this.initAvailableConnections_();
@@ -172,7 +177,7 @@ InsertionMarkerManager.DUPLICATE_BLOCK_ERROR = 'The insertion marker ' +
 InsertionMarkerManager.prototype.dispose = function() {
   this.availableConnections_.length = 0;
 
-  Blockly.Events.disable();
+  Events.disable();
   try {
     if (this.firstMarker_) {
       this.firstMarker_.dispose();
@@ -181,7 +186,7 @@ InsertionMarkerManager.prototype.dispose = function() {
       this.lastMarker_.dispose();
     }
   } finally {
-    Blockly.Events.enable();
+    Events.enable();
   }
 };
 
@@ -223,9 +228,9 @@ InsertionMarkerManager.prototype.wouldConnectBlock = function() {
 InsertionMarkerManager.prototype.applyConnections = function() {
   if (this.closestConnection_) {
     // Don't fire events for insertion markers.
-    Blockly.Events.disable();
+    Events.disable();
     this.hidePreview_();
-    Blockly.Events.enable();
+    Events.enable();
     // Connect two blocks together.
     this.localConnection_.connect(this.closestConnection_);
     if (this.topBlock_.rendered) {
@@ -233,7 +238,7 @@ InsertionMarkerManager.prototype.applyConnections = function() {
       // Determine which connection is inferior (lower in the source stack).
       const inferiorConnection = this.localConnection_.isSuperior() ?
           this.closestConnection_ : this.localConnection_;
-      Blockly.blockAnimations.connectionUiEffect(
+      blockAnimations.connectionUiEffect(
           inferiorConnection.getSourceBlock());
       // Bring the just-edited stack to the front.
       const rootBlock = this.topBlock_.getRootBlock();
@@ -244,9 +249,9 @@ InsertionMarkerManager.prototype.applyConnections = function() {
 
 /**
  * Update connections based on the most recent move location.
- * @param {!Blockly.utils.Coordinate} dxy Position relative to drag start,
+ * @param {!Coordinate} dxy Position relative to drag start,
  *     in workspace units.
- * @param {?Blockly.IDragTarget} dragTarget The drag target that the block is
+ * @param {?IDragTarget} dragTarget The drag target that the block is
  *     currently over.
  * @package
  */
@@ -260,25 +265,25 @@ InsertionMarkerManager.prototype.update = function(dxy, dragTarget) {
 
   if (shouldUpdate) {
     // Don't fire events for insertion marker creation or movement.
-    Blockly.Events.disable();
+    Events.disable();
     this.maybeHidePreview_(candidate);
     this.maybeShowPreview_(candidate);
-    Blockly.Events.enable();
+    Events.enable();
   }
 };
 
 /**
  * Create an insertion marker that represents the given block.
- * @param {!Blockly.BlockSvg} sourceBlock The block that the insertion marker
+ * @param {!BlockSvg} sourceBlock The block that the insertion marker
  *     will represent.
- * @return {!Blockly.BlockSvg} The insertion marker that represents the given
+ * @return {!BlockSvg} The insertion marker that represents the given
  *     block.
  * @private
  */
 InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlock) {
   const imType = sourceBlock.type;
 
-  Blockly.Events.disable();
+  Events.disable();
   let result;
   try {
     result = this.workspace_.newBlock(imType);
@@ -294,7 +299,7 @@ InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlock) {
     // child blocks here.
     for (let i = 0; i < sourceBlock.inputList.length; i++) {
       const sourceInput = sourceBlock.inputList[i];
-      if (sourceInput.name == Blockly.constants.COLLAPSED_INPUT_NAME) {
+      if (sourceInput.name == constants.COLLAPSED_INPUT_NAME) {
         continue;  // Ignore the collapsed input.
       }
       const resultInput = result.inputList[i];
@@ -319,7 +324,7 @@ InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlock) {
     result.initSvg();
     result.getSvgRoot().setAttribute('visibility', 'hidden');
   } finally {
-    Blockly.Events.enable();
+    Events.enable();
   }
 
   return result;
@@ -330,7 +335,7 @@ InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlock) {
  * only be called once, at the beginning of a drag.
  * If the stack has more than one block, this function will populate
  * lastOnStack_ and create the corresponding insertion marker.
- * @return {!Array<!Blockly.RenderedConnection>} A list of available
+ * @return {!Array<!RenderedConnection>} A list of available
  *     connections.
  * @private
  */
@@ -342,11 +347,11 @@ InsertionMarkerManager.prototype.initAvailableConnections_ = function() {
     available.push(lastOnStack);
     this.lastOnStack_ = lastOnStack;
     if (this.lastMarker_) {
-      Blockly.Events.disable();
+      Events.disable();
       try {
         this.lastMarker_.dispose();
       } finally {
-        Blockly.Events.enable();
+        Events.enable();
       }
     }
     this.lastMarker_ = this.createMarkerBlock_(lastOnStack.getSourceBlock());
@@ -359,7 +364,7 @@ InsertionMarkerManager.prototype.initAvailableConnections_ = function() {
  * updated based on the closest candidate and the current drag distance.
  * @param {!Object} candidate An object containing a local connection, a closest
  *     connection, and a radius.  Returned by getCandidate_.
- * @param {!Blockly.utils.Coordinate} dxy Position relative to drag start,
+ * @param {!Coordinate} dxy Position relative to drag start,
  *     in workspace units.
  * @return {boolean} Whether the preview should be updated.
  * @private
@@ -387,7 +392,7 @@ InsertionMarkerManager.prototype.shouldUpdatePreviews_ = function(
       return !(
           candidateClosest &&
           radius > curDistance -
-                  Blockly.internalConstants.CURRENT_CONNECTION_PREFERENCE);
+                  internalConstants.CURRENT_CONNECTION_PREFERENCE);
     } else if (!this.localConnection_ && !this.closestConnection_) {
     // We weren't showing a preview before, but we should now.
       return true;
@@ -406,7 +411,7 @@ InsertionMarkerManager.prototype.shouldUpdatePreviews_ = function(
 /**
  * Find the nearest valid connection, which may be the same as the current
  * closest connection.
- * @param {!Blockly.utils.Coordinate} dxy Position relative to drag start,
+ * @param {!Coordinate} dxy Position relative to drag start,
  *     in workspace units.
  * @return {!Object} An object containing a local connection, a closest
  *     connection, and a radius.
@@ -447,16 +452,16 @@ InsertionMarkerManager.prototype.getStartRadius_ = function() {
   // By increasing radiusConnection when a connection already exists,
   // we never "lose" the connection from the offset.
   if (this.closestConnection_ && this.localConnection_) {
-    return Blockly.internalConstants.CONNECTING_SNAP_RADIUS;
+    return internalConstants.CONNECTING_SNAP_RADIUS;
   }
-  return Blockly.internalConstants.SNAP_RADIUS;
+  return internalConstants.SNAP_RADIUS;
 };
 
 /**
  * Whether ending the drag would delete the block.
  * @param {!Object} candidate An object containing a local connection, a closest
  *    connection, and a radius.
- * @param {?Blockly.IDragTarget} dragTarget The drag target that the block is
+ * @param {?IDragTarget} dragTarget The drag target that the block is
  *     currently over.
  * @return {boolean} Whether dropping the block immediately would delete the
  *    block.
@@ -467,10 +472,10 @@ InsertionMarkerManager.prototype.shouldDelete_ = function(
   if (dragTarget) {
     const componentManager = this.workspace_.getComponentManager();
     const isDeleteArea = componentManager.hasCapability(dragTarget.id,
-        Blockly.ComponentManager.Capability.DELETE_AREA);
+        ComponentManager.Capability.DELETE_AREA);
     if (isDeleteArea) {
       return (
-        /** @type {!Blockly.IDeleteArea} */ (dragTarget))
+        /** @type {!IDeleteArea} */ (dragTarget))
           .wouldDelete(this.topBlock_, candidate && !!candidate.closest);
     }
   }
@@ -520,8 +525,8 @@ InsertionMarkerManager.prototype.showPreview_ = function() {
   const closest = this.closestConnection_;
   const renderer = this.workspace_.getRenderer();
   const method = renderer.getConnectionPreviewMethod(
-      /** @type {!Blockly.RenderedConnection} */ (closest),
-      /** @type {!Blockly.RenderedConnection} */ (this.localConnection_),
+      /** @type {!RenderedConnection} */ (closest),
+      /** @type {!RenderedConnection} */ (this.localConnection_),
       this.topBlock_);
 
   switch (method) {
@@ -652,7 +657,7 @@ InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
       (imConn == markerNext && !(markerPrev && markerPrev.targetConnection));
 
   const isFirstInOutputStack =
-      imConn.type == Blockly.connectionTypes.INPUT_VALUE &&
+      imConn.type == connectionTypes.INPUT_VALUE &&
       !(markerOutput && markerOutput.targetConnection);
   // The insertion marker is the first block in a stack.  Unplug won't do
   // anything in that case.  Instead, unplug the following block.
@@ -660,7 +665,7 @@ InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
     imConn.targetBlock().unplug(false);
   }
   // Inside of a C-block, first statement connection.
-  else if (imConn.type == Blockly.connectionTypes.NEXT_STATEMENT &&
+  else if (imConn.type == connectionTypes.NEXT_STATEMENT &&
       imConn != markerNext) {
     const innerConnection = imConn.targetConnection;
     innerConnection.getSourceBlock().unplug(false);
@@ -729,7 +734,7 @@ InsertionMarkerManager.prototype.hideReplacementFade_ = function() {
 /**
  * Get a list of the insertion markers that currently exist.  Drags have 0, 1,
  * or 2 insertion markers.
- * @return {!Array<!Blockly.BlockSvg>} A possibly empty list of insertion
+ * @return {!Array<!BlockSvg>} A possibly empty list of insertion
  *     marker blocks.
  * @package
  */

From 390469435b4f114afe48f8a511476d489ad7239e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 17:00:52 -0700
Subject: [PATCH 625/833] clang-format core/insertion_marker_manager.js

---
 core/insertion_marker_manager.js | 73 ++++++++++++++++----------------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js
index 64a8fa936..41be57fff 100644
--- a/core/insertion_marker_manager.js
+++ b/core/insertion_marker_manager.js
@@ -237,9 +237,9 @@ InsertionMarkerManager.prototype.applyConnections = function() {
       // Trigger a connection animation.
       // Determine which connection is inferior (lower in the source stack).
       const inferiorConnection = this.localConnection_.isSuperior() ?
-          this.closestConnection_ : this.localConnection_;
-      blockAnimations.connectionUiEffect(
-          inferiorConnection.getSourceBlock());
+          this.closestConnection_ :
+          this.localConnection_;
+      blockAnimations.connectionUiEffect(inferiorConnection.getSourceBlock());
       // Bring the just-edited stack to the front.
       const rootBlock = this.topBlock_.getRootBlock();
       rootBlock.bringToFront();
@@ -260,8 +260,8 @@ InsertionMarkerManager.prototype.update = function(dxy, dragTarget) {
 
   this.wouldDeleteBlock_ = this.shouldDelete_(candidate, dragTarget);
 
-  const shouldUpdate = this.wouldDeleteBlock_ ||
-      this.shouldUpdatePreviews_(candidate, dxy);
+  const shouldUpdate =
+      this.wouldDeleteBlock_ || this.shouldUpdatePreviews_(candidate, dxy);
 
   if (shouldUpdate) {
     // Don't fire events for insertion marker creation or movement.
@@ -304,15 +304,15 @@ InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlock) {
       }
       const resultInput = result.inputList[i];
       if (!resultInput) {
-        throw new Error(InsertionMarkerManager.DUPLICATE_BLOCK_ERROR
-            .replace('%1', 'an input'));
+        throw new Error(InsertionMarkerManager.DUPLICATE_BLOCK_ERROR.replace(
+            '%1', 'an input'));
       }
       for (let j = 0; j < sourceInput.fieldRow.length; j++) {
         const sourceField = sourceInput.fieldRow[j];
         const resultField = resultInput.fieldRow[j];
         if (!resultField) {
-          throw new Error(InsertionMarkerManager.DUPLICATE_BLOCK_ERROR
-              .replace('%1', 'a field'));
+          throw new Error(InsertionMarkerManager.DUPLICATE_BLOCK_ERROR.replace(
+              '%1', 'a field'));
         }
         resultField.setValue(sourceField.getValue());
       }
@@ -391,20 +391,22 @@ InsertionMarkerManager.prototype.shouldUpdatePreviews_ = function(
       // Slightly prefer the existing preview over a new preview.
       return !(
           candidateClosest &&
-          radius > curDistance -
-                  internalConstants.CURRENT_CONNECTION_PREFERENCE);
+          radius >
+              curDistance - internalConstants.CURRENT_CONNECTION_PREFERENCE);
     } else if (!this.localConnection_ && !this.closestConnection_) {
-    // We weren't showing a preview before, but we should now.
+      // We weren't showing a preview before, but we should now.
       return true;
     } else {
-      console.error('Only one of localConnection_ and closestConnection_ was set.');
+      console.error(
+          'Only one of localConnection_ and closestConnection_ was set.');
     }
   } else {  // No connection found.
     // Only need to update if we were showing a preview before.
     return !!(this.localConnection_ && this.closestConnection_);
   }
 
-  console.error('Returning true from shouldUpdatePreviews, but it\'s not clear why.');
+  console.error(
+      'Returning true from shouldUpdatePreviews, but it\'s not clear why.');
   return true;
 };
 
@@ -431,11 +433,7 @@ InsertionMarkerManager.prototype.getCandidate_ = function(dxy) {
       radius = neighbour.radius;
     }
   }
-  return {
-    closest: candidateClosest,
-    local: candidateLocal,
-    radius: radius
-  };
+  return {closest: candidateClosest, local: candidateLocal, radius: radius};
 };
 
 /**
@@ -447,10 +445,10 @@ InsertionMarkerManager.prototype.getCandidate_ = function(dxy) {
 InsertionMarkerManager.prototype.getStartRadius_ = function() {
   // If there is already a connection highlighted,
   // increase the radius we check for making new connections.
-  // Why? When a connection is highlighted, blocks move around when the insertion
-  // marker is created, which could cause the connection became out of range.
-  // By increasing radiusConnection when a connection already exists,
-  // we never "lose" the connection from the offset.
+  // Why? When a connection is highlighted, blocks move around when the
+  // insertion marker is created, which could cause the connection became out of
+  // range. By increasing radiusConnection when a connection already exists, we
+  // never "lose" the connection from the offset.
   if (this.closestConnection_ && this.localConnection_) {
     return internalConstants.CONNECTING_SNAP_RADIUS;
   }
@@ -471,11 +469,11 @@ InsertionMarkerManager.prototype.shouldDelete_ = function(
     candidate, dragTarget) {
   if (dragTarget) {
     const componentManager = this.workspace_.getComponentManager();
-    const isDeleteArea = componentManager.hasCapability(dragTarget.id,
-        ComponentManager.Capability.DELETE_AREA);
+    const isDeleteArea = componentManager.hasCapability(
+        dragTarget.id, ComponentManager.Capability.DELETE_AREA);
     if (isDeleteArea) {
       return (
-        /** @type {!IDeleteArea} */ (dragTarget))
+                 /** @type {!IDeleteArea} */ (dragTarget))
           .wouldDelete(this.topBlock_, candidate && !!candidate.closest);
     }
   }
@@ -568,8 +566,10 @@ InsertionMarkerManager.prototype.maybeHidePreview_ = function(candidate) {
     const closestChanged = this.closestConnection_ != candidate.closest;
     const localChanged = this.localConnection_ != candidate.local;
 
-    // Also hide if we had a preview before but now we're going to delete instead.
-    if (hadPreview && (closestChanged || localChanged || this.wouldDeleteBlock_)) {
+    // Also hide if we had a preview before but now we're going to delete
+    // instead.
+    if (hadPreview &&
+        (closestChanged || localChanged || this.wouldDeleteBlock_)) {
       this.hidePreview_();
     }
   }
@@ -587,8 +587,8 @@ InsertionMarkerManager.prototype.maybeHidePreview_ = function(candidate) {
  */
 InsertionMarkerManager.prototype.hidePreview_ = function() {
   if (this.closestConnection_ && this.closestConnection_.targetBlock() &&
-      this.workspace_.getRenderer()
-          .shouldHighlightConnection(this.closestConnection_)) {
+      this.workspace_.getRenderer().shouldHighlightConnection(
+          this.closestConnection_)) {
     this.closestConnection_.unhighlight();
   }
   if (this.fadedBlock_) {
@@ -614,7 +614,8 @@ InsertionMarkerManager.prototype.showInsertionMarker_ = function() {
   const imConn = imBlock.getMatchingConnection(local.getSourceBlock(), local);
 
   if (imConn == this.markerConnection_) {
-    throw Error('Made it to showInsertionMarker_ even though the marker isn\'t ' +
+    throw Error(
+        'Made it to showInsertionMarker_ even though the marker isn\'t ' +
         'changing');
   }
 
@@ -656,8 +657,7 @@ InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
   const isFirstInStatementStack =
       (imConn == markerNext && !(markerPrev && markerPrev.targetConnection));
 
-  const isFirstInOutputStack =
-      imConn.type == connectionTypes.INPUT_VALUE &&
+  const isFirstInOutputStack = imConn.type == connectionTypes.INPUT_VALUE &&
       !(markerOutput && markerOutput.targetConnection);
   // The insertion marker is the first block in a stack.  Unplug won't do
   // anything in that case.  Instead, unplug the following block.
@@ -665,8 +665,8 @@ InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
     imConn.targetBlock().unplug(false);
   }
   // Inside of a C-block, first statement connection.
-  else if (imConn.type == connectionTypes.NEXT_STATEMENT &&
-      imConn != markerNext) {
+  else if (
+      imConn.type == connectionTypes.NEXT_STATEMENT && imConn != markerNext) {
     const innerConnection = imConn.targetConnection;
     innerConnection.getSourceBlock().unplug(false);
 
@@ -682,7 +682,8 @@ InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
   }
 
   if (imConn.targetConnection) {
-    throw Error('markerConnection_ still connected at the end of ' +
+    throw Error(
+        'markerConnection_ still connected at the end of ' +
         'disconnectInsertionMarker');
   }
 

From 66130e66689bfef1958ba6250a18c0507d76e3b5 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 17:26:09 -0700
Subject: [PATCH 626/833] Migrate core/xml.js to ES6 const/let

---
 core/xml.js | 259 ++++++++++++++++++++++++++++------------------------
 1 file changed, 139 insertions(+), 120 deletions(-)

diff --git a/core/xml.js b/core/xml.js
index b32489f0f..1b1db8966 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -39,18 +39,20 @@ goog.requireType('Blockly.WorkspaceCommentSvg');
  * @return {!Element} XML DOM element.
  */
 Blockly.Xml.workspaceToDom = function(workspace, opt_noId) {
-  var xml = Blockly.utils.xml.createElement('xml');
-  var variablesElement = Blockly.Xml.variablesToDom(
+  const xml = Blockly.utils.xml.createElement('xml');
+  const variablesElement = Blockly.Xml.variablesToDom(
       Blockly.Variables.allUsedVarModels(workspace));
   if (variablesElement.hasChildNodes()) {
     xml.appendChild(variablesElement);
   }
-  var comments = workspace.getTopComments(true);
-  for (var i = 0, comment; (comment = comments[i]); i++) {
+  const comments = workspace.getTopComments(true);
+  for (let i = 0; i < comments.length; i++) {
+    const comment = comments[i];
     xml.appendChild(comment.toXmlWithXY(opt_noId));
   }
-  var blocks = workspace.getTopBlocks(true);
-  for (var i = 0, block; (block = blocks[i]); i++) {
+  const blocks = workspace.getTopBlocks(true);
+  for (let i = 0; i < blocks.length; i++) {
+    const block = blocks[i];
     xml.appendChild(Blockly.Xml.blockToDomWithXY(block, opt_noId));
   }
   return xml;
@@ -63,9 +65,10 @@ Blockly.Xml.workspaceToDom = function(workspace, opt_noId) {
  * @return {!Element} Tree of XML elements.
  */
 Blockly.Xml.variablesToDom = function(variableList) {
-  var variables = Blockly.utils.xml.createElement('variables');
-  for (var i = 0, variable; (variable = variableList[i]); i++) {
-    var element = Blockly.utils.xml.createElement('variable');
+  const variables = Blockly.utils.xml.createElement('variables');
+  for (let i = 0; i < variableList.length; i++) {
+    const variable = variableList[i];
+    const element = Blockly.utils.xml.createElement('variable');
     element.appendChild(Blockly.utils.xml.createTextNode(variable.name));
     if (variable.type) {
       element.setAttribute('type', variable.type);
@@ -92,13 +95,13 @@ Blockly.Xml.blockToDomWithXY = function(block, opt_noId) {
     }
   }
 
-  var width;  // Not used in LTR.
+  let width;  // Not used in LTR.
   if (block.workspace.RTL) {
     width = block.workspace.getWidth();
   }
 
-  var element = Blockly.Xml.blockToDom(block, opt_noId);
-  var xy = block.getRelativeToSurfaceXY();
+  const element = Blockly.Xml.blockToDom(block, opt_noId);
+  const xy = block.getRelativeToSurfaceXY();
   element.setAttribute('x',
       Math.round(block.workspace.RTL ? width - xy.x : xy.x));
   element.setAttribute('y', Math.round(xy.y));
@@ -114,7 +117,7 @@ Blockly.Xml.blockToDomWithXY = function(block, opt_noId) {
  */
 Blockly.Xml.fieldToDom_ = function(field) {
   if (field.isSerializable()) {
-    var container = Blockly.utils.xml.createElement('field');
+    const container = Blockly.utils.xml.createElement('field');
     container.setAttribute('name', field.name || '');
     return field.toXml(container);
   }
@@ -130,9 +133,11 @@ Blockly.Xml.fieldToDom_ = function(field) {
  * @private
  */
 Blockly.Xml.allFieldsToDom_ = function(block, element) {
-  for (var i = 0, input; (input = block.inputList[i]); i++) {
-    for (var j = 0, field; (field = input.fieldRow[j]); j++) {
-      var fieldDom = Blockly.Xml.fieldToDom_(field);
+  for (let i = 0; i < block.inputList.length; i++) {
+    const input = block.inputList[i];
+    for (let j = 0; j < input.fieldRow.length; j++) {
+      const field = input.fieldRow[j];
+      const fieldDom = Blockly.Xml.fieldToDom_(field);
       if (fieldDom) {
         element.appendChild(fieldDom);
       }
@@ -150,7 +155,7 @@ Blockly.Xml.allFieldsToDom_ = function(block, element) {
 Blockly.Xml.blockToDom = function(block, opt_noId) {
   // Skip over insertion markers.
   if (block.isInsertionMarker()) {
-    var child = block.getChildren(false)[0];
+    const child = block.getChildren(false)[0];
     if (child) {
       return Blockly.Xml.blockToDom(child);
     } else {
@@ -159,8 +164,7 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
     }
   }
 
-
-  var element =
+  const element =
       Blockly.utils.xml.createElement(block.isShadow() ? 'shadow' : 'block');
   element.setAttribute('type', block.type);
   if (!opt_noId) {
@@ -170,7 +174,7 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
   }
   if (block.mutationToDom) {
     // Custom data for an advanced block.
-    var mutation = block.mutationToDom();
+    const mutation = block.mutationToDom();
     if (mutation && (mutation.hasChildNodes() || mutation.hasAttributes())) {
       element.appendChild(mutation);
     }
@@ -178,12 +182,12 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
 
   Blockly.Xml.allFieldsToDom_(block, element);
 
-  var commentText = block.getCommentText();
+  const commentText = block.getCommentText();
   if (commentText) {
-    var size = block.commentModel.size;
-    var pinned = block.commentModel.pinned;
+    const size = block.commentModel.size;
+    const pinned = block.commentModel.pinned;
 
-    var commentElement = Blockly.utils.xml.createElement('comment');
+    const commentElement = Blockly.utils.xml.createElement('comment');
     commentElement.appendChild(Blockly.utils.xml.createTextNode(commentText));
     commentElement.setAttribute('pinned', pinned);
     commentElement.setAttribute('h', size.height);
@@ -193,29 +197,30 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
   }
 
   if (block.data) {
-    var dataElement = Blockly.utils.xml.createElement('data');
+    const dataElement = Blockly.utils.xml.createElement('data');
     dataElement.appendChild(Blockly.utils.xml.createTextNode(block.data));
     element.appendChild(dataElement);
   }
 
-  for (var i = 0, input; (input = block.inputList[i]); i++) {
-    var container;
-    var empty = true;
+  for (let i = 0; i < block.inputList.length; i++) {
+    const input = block.inputList[i];
+    let container;
+    let empty = true;
     if (input.type == Blockly.inputTypes.DUMMY) {
       continue;
     } else {
-      var childBlock = input.connection.targetBlock();
+      const childBlock = input.connection.targetBlock();
       if (input.type == Blockly.inputTypes.VALUE) {
         container = Blockly.utils.xml.createElement('value');
       } else if (input.type == Blockly.inputTypes.STATEMENT) {
         container = Blockly.utils.xml.createElement('statement');
       }
-      var shadow = input.connection.getShadowDom();
+      const shadow = input.connection.getShadowDom();
       if (shadow && (!childBlock || !childBlock.isShadow())) {
         container.appendChild(Blockly.Xml.cloneShadow_(shadow, opt_noId));
       }
       if (childBlock) {
-        var elem = Blockly.Xml.blockToDom(childBlock, opt_noId);
+        const elem = Blockly.Xml.blockToDom(childBlock, opt_noId);
         if (elem.nodeType == Blockly.utils.dom.NodeType.ELEMENT_NODE) {
           container.appendChild(elem);
           empty = false;
@@ -247,16 +252,17 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
     element.setAttribute('editable', false);
   }
 
-  var nextBlock = block.getNextBlock();
+  const nextBlock = block.getNextBlock();
+  let container;
   if (nextBlock) {
-    var elem = Blockly.Xml.blockToDom(nextBlock, opt_noId);
+    const elem = Blockly.Xml.blockToDom(nextBlock, opt_noId);
     if (elem.nodeType == Blockly.utils.dom.NodeType.ELEMENT_NODE) {
-      var container = Blockly.utils.xml.createElement('next');
+      container = Blockly.utils.xml.createElement('next');
       container.appendChild(elem);
       element.appendChild(container);
     }
   }
-  var shadow = block.nextConnection && block.nextConnection.getShadowDom();
+  const shadow = block.nextConnection && block.nextConnection.getShadowDom();
   if (shadow && (!nextBlock || !nextBlock.isShadow())) {
     container.appendChild(Blockly.Xml.cloneShadow_(shadow, opt_noId));
   }
@@ -274,8 +280,8 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
 Blockly.Xml.cloneShadow_ = function(shadow, opt_noId) {
   shadow = shadow.cloneNode(true);
   // Walk the tree looking for whitespace.  Don't prune whitespace in a tag.
-  var node = shadow;
-  var textNode;
+  let node = shadow;
+  let textNode;
   while (node) {
     if (opt_noId && node.nodeName == 'shadow') {
       // Strip off IDs from shadow blocks.  There should never be a 'block' as
@@ -316,7 +322,7 @@ Blockly.Xml.cloneShadow_ = function(shadow, opt_noId) {
  * @return {string} Text representation.
  */
 Blockly.Xml.domToText = function(dom) {
-  var text = Blockly.utils.xml.domToText(dom);
+  const text = Blockly.utils.xml.domToText(dom);
   // Unpack self-closing tags.  These tags fail when embedded in HTML.
   // <block name="foo"/> -> <block name="foo"></block>
   return text.replace(/<(\w+)([^<]*)\/>/g, '<$1$2></$1>');
@@ -330,13 +336,13 @@ Blockly.Xml.domToText = function(dom) {
 Blockly.Xml.domToPrettyText = function(dom) {
   // This function is not guaranteed to be correct for all XML.
   // But it handles the XML that Blockly generates.
-  var blob = Blockly.Xml.domToText(dom);
+  const blob = Blockly.Xml.domToText(dom);
   // Place every open and close tag on its own line.
-  var lines = blob.split('<');
+  const lines = blob.split('<');
   // Indent every line.
-  var indent = '';
-  for (var i = 1; i < lines.length; i++) {
-    var line = lines[i];
+  let indent = '';
+  for (let i = 1; i < lines.length; i++) {
+    const line = lines[i];
     if (line[0] == '/') {
       indent = indent.substring(2);
     }
@@ -347,7 +353,7 @@ Blockly.Xml.domToPrettyText = function(dom) {
   }
   // Pull simple tags back together.
   // E.g. <foo></foo>
-  var text = lines.join('\n');
+  let text = lines.join('\n');
   text = text.replace(/(<(\w+)\b[^>]*>[^\n]*)\n *<\/\2>/g, '$1</$2>');
   // Trim leading blank line.
   return text.replace(/^\n/, '');
@@ -361,7 +367,7 @@ Blockly.Xml.domToPrettyText = function(dom) {
  * @throws if the text doesn't parse.
  */
 Blockly.Xml.textToDom = function(text) {
-  var doc = Blockly.utils.xml.textToDomDocument(text);
+  const doc = Blockly.utils.xml.textToDomDocument(text);
   if (!doc || !doc.documentElement ||
       doc.getElementsByTagName('parsererror').length) {
     throw Error('textToDom was unable to parse: ' + text);
@@ -379,7 +385,7 @@ Blockly.Xml.textToDom = function(text) {
 Blockly.Xml.clearWorkspaceAndLoadFromXml = function(xml, workspace) {
   workspace.setResizesEnabled(false);
   workspace.clear();
-  var blockIds = Blockly.Xml.domToWorkspace(xml, workspace);
+  const blockIds = Blockly.Xml.domToWorkspace(xml, workspace);
   workspace.setResizesEnabled(true);
   return blockIds;
 };
@@ -394,7 +400,7 @@ Blockly.Xml.clearWorkspaceAndLoadFromXml = function(xml, workspace) {
  */
 Blockly.Xml.domToWorkspace = function(xml, workspace) {
   if (xml instanceof Blockly.Workspace) {
-    var swap = xml;
+    const swap = xml;
     // Closure Compiler complains here because the arguments are reversed.
     /** @suppress {checkTypes} */
     xml = workspace;
@@ -403,13 +409,13 @@ Blockly.Xml.domToWorkspace = function(xml, workspace) {
                  'swap the arguments.');
   }
 
-  var width;  // Not used in LTR.
+  let width;  // Not used in LTR.
   if (workspace.RTL) {
     width = workspace.getWidth();
   }
-  var newBlockIds = [];  // A list of block IDs added by this call.
+  const newBlockIds = [];  // A list of block IDs added by this call.
   Blockly.utils.dom.startTextWidthCache();
-  var existingGroup = Blockly.Events.getGroup();
+  const existingGroup = Blockly.Events.getGroup();
   if (!existingGroup) {
     Blockly.Events.setGroup(true);
   }
@@ -418,21 +424,22 @@ Blockly.Xml.domToWorkspace = function(xml, workspace) {
   if (workspace.setResizesEnabled) {
     workspace.setResizesEnabled(false);
   }
-  var variablesFirst = true;
+  let variablesFirst = true;
   try {
-    for (var i = 0, xmlChild; (xmlChild = xml.childNodes[i]); i++) {
-      var name = xmlChild.nodeName.toLowerCase();
-      var xmlChildElement = /** @type {!Element} */ (xmlChild);
+    for (let i = 0; i < xml.childNodes.length; i++) {
+      const xmlChild = xml.childNodes[i];
+      const name = xmlChild.nodeName.toLowerCase();
+      const xmlChildElement = /** @type {!Element} */ (xmlChild);
       if (name == 'block' ||
           (name == 'shadow' && !Blockly.Events.recordUndo)) {
         // Allow top-level shadow blocks if recordUndo is disabled since
         // that means an undo is in progress.  Such a block is expected
         // to be moved to a nested destination in the next operation.
-        var block = Blockly.Xml.domToBlock(xmlChildElement, workspace);
+        const block = Blockly.Xml.domToBlock(xmlChildElement, workspace);
         newBlockIds.push(block.id);
-        var blockX = xmlChildElement.hasAttribute('x') ?
+        const blockX = xmlChildElement.hasAttribute('x') ?
             parseInt(xmlChildElement.getAttribute('x'), 10) : 10;
-        var blockY = xmlChildElement.hasAttribute('y') ?
+        const blockY = xmlChildElement.hasAttribute('y') ?
             parseInt(xmlChildElement.getAttribute('y'), 10) : 10;
         if (!isNaN(blockX) && !isNaN(blockY)) {
           block.moveBy(workspace.RTL ? width - blockX : blockX, blockY);
@@ -495,26 +502,26 @@ Blockly.Xml.domToWorkspace = function(xml, workspace) {
  * @return {!Array<string>} An array containing new block IDs.
  */
 Blockly.Xml.appendDomToWorkspace = function(xml, workspace) {
-  var bbox;  // Bounding box of the current blocks.
+  let bbox;  // Bounding box of the current blocks.
   // First check if we have a workspaceSvg, otherwise the blocks have no shape
   // and the position does not matter.
   if (Object.prototype.hasOwnProperty.call(workspace, 'scale')) {
     bbox = workspace.getBlocksBoundingBox();
   }
   // Load the new blocks into the workspace and get the IDs of the new blocks.
-  var newBlockIds = Blockly.Xml.domToWorkspace(xml, workspace);
+  const newBlockIds = Blockly.Xml.domToWorkspace(xml, workspace);
   if (bbox && bbox.top != bbox.bottom) {  // check if any previous block
-    var offsetY = 0;  // offset to add to y of the new block
-    var offsetX = 0;
-    var farY = bbox.bottom;  // bottom position
-    var topX = workspace.RTL ? bbox.right : bbox.left;  // x of bounding box
+    let offsetY = 0;  // offset to add to y of the new block
+    let offsetX = 0;
+    const farY = bbox.bottom;  // bottom position
+    const topX = workspace.RTL ? bbox.right : bbox.left;  // x of bounding box
     // Check position of the new blocks.
-    var newLeftX = Infinity;  // x of top left corner
-    var newRightX = -Infinity;  // x of top right corner
-    var newY = Infinity;  // y of top corner
-    var ySeparation = 10;
-    for (var i = 0; i < newBlockIds.length; i++) {
-      var blockXY =
+    let newLeftX = Infinity;  // x of top left corner
+    let newRightX = -Infinity;  // x of top right corner
+    let newY = Infinity;  // y of top corner
+    const ySeparation = 10;
+    for (let i = 0; i < newBlockIds.length; i++) {
+      const blockXY =
           workspace.getBlockById(newBlockIds[i]).getRelativeToSurfaceXY();
       if (blockXY.y < newY) {
         newY = blockXY.y;
@@ -528,8 +535,8 @@ Blockly.Xml.appendDomToWorkspace = function(xml, workspace) {
     }
     offsetY = farY - newY + ySeparation;
     offsetX = workspace.RTL ? topX - newRightX : topX - newLeftX;
-    for (var i = 0; i < newBlockIds.length; i++) {
-      var block = workspace.getBlockById(newBlockIds[i]);
+    for (let i = 0; i < newBlockIds.length; i++) {
+      const block = workspace.getBlockById(newBlockIds[i]);
       block.moveBy(offsetX, offsetY);
     }
   }
@@ -545,7 +552,7 @@ Blockly.Xml.appendDomToWorkspace = function(xml, workspace) {
  */
 Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
   if (xmlBlock instanceof Blockly.Workspace) {
-    var swap = xmlBlock;
+    const swap = xmlBlock;
     // Closure Compiler complains here because the arguments are reversed.
     /** @suppress {checkTypes} */
     xmlBlock = /** @type {!Element} */ (workspace);
@@ -555,19 +562,20 @@ Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
   }
   // Create top-level block.
   Blockly.Events.disable();
-  var variablesBeforeCreation = workspace.getAllVariables();
+  const variablesBeforeCreation = workspace.getAllVariables();
+  let topBlock;
   try {
-    var topBlock = Blockly.Xml.domToBlockHeadless_(xmlBlock, workspace);
+    topBlock = Blockly.Xml.domToBlockHeadless_(xmlBlock, workspace);
     // Generate list of all blocks.
-    var blocks = topBlock.getDescendants(false);
+    const blocks = topBlock.getDescendants(false);
     if (workspace.rendered) {
       // Wait to track connections to speed up assembly.
       topBlock.setConnectionTracking(false);
       // Render each block.
-      for (var i = blocks.length - 1; i >= 0; i--) {
+      for (let i = blocks.length - 1; i >= 0; i--) {
         blocks[i].initSvg();
       }
-      for (var i = blocks.length - 1; i >= 0; i--) {
+      for (let i = blocks.length - 1; i >= 0; i--) {
         blocks[i].render(false);
       }
       // Populating the connection database may be deferred until after the
@@ -582,7 +590,7 @@ Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
       // TODO(@picklesrus): #387. Remove when domToBlock avoids resizing.
       workspace.resizeContents();
     } else {
-      for (var i = blocks.length - 1; i >= 0; i--) {
+      for (let i = blocks.length - 1; i >= 0; i--) {
         blocks[i].initModel();
       }
     }
@@ -590,11 +598,11 @@ Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
     Blockly.Events.enable();
   }
   if (Blockly.Events.isEnabled()) {
-    var newVariables = Blockly.Variables.getAddedVariables(workspace,
+    const newVariables = Blockly.Variables.getAddedVariables(workspace,
         variablesBeforeCreation);
     // Fire a VarCreate event for each (if any) new variable created.
-    for (var i = 0; i < newVariables.length; i++) {
-      var thisVariable = newVariables[i];
+    for (let i = 0; i < newVariables.length; i++) {
+      const thisVariable = newVariables[i];
       Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.VAR_CREATE))(
           thisVariable));
     }
@@ -614,13 +622,14 @@ Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
  *     should be added.
  */
 Blockly.Xml.domToVariables = function(xmlVariables, workspace) {
-  for (var i = 0, xmlChild; (xmlChild = xmlVariables.childNodes[i]); i++) {
+  for (let i = 0; i < xmlVariables.childNodes.length; i++) {
+    const xmlChild = xmlVariables.childNodes[i];
     if (xmlChild.nodeType != Blockly.utils.dom.NodeType.ELEMENT_NODE) {
       continue;  // Skip text nodes.
     }
-    var type = xmlChild.getAttribute('type');
-    var id = xmlChild.getAttribute('id');
-    var name = xmlChild.textContent;
+    const type = xmlChild.getAttribute('type');
+    const id = xmlChild.getAttribute('id');
+    const name = xmlChild.textContent;
 
     workspace.createVariable(name, type, id);
   }
@@ -647,11 +656,12 @@ Blockly.Xml.childNodeTagMap;
  *    node.
  */
 Blockly.Xml.mapSupportedXmlTags_ = function(xmlBlock) {
-  var childNodeMap = {
+  const childNodeMap = {
     mutation: [], comment: [], data: [], field: [], input: [],
     next: []
   };
-  for (var i = 0, xmlChild; (xmlChild = xmlBlock.childNodes[i]); i++) {
+  for (let i = 0; i < xmlBlock.childNodes.length; i++) {
+    const xmlChild = xmlBlock.childNodes[i];
     if (xmlChild.nodeType == Blockly.utils.dom.NodeType.TEXT_NODE) {
       // Ignore any text at the <block> level.  It's all whitespace anyway.
       continue;
@@ -701,8 +711,9 @@ Blockly.Xml.mapSupportedXmlTags_ = function(xmlBlock) {
  * @private
  */
 Blockly.Xml.applyMutationTagNodes_ = function(xmlChildren, block) {
-  var shouldCallInitSvg = false;
-  for (var i = 0, xmlChild; (xmlChild = xmlChildren[i]); i++) {
+  let shouldCallInitSvg = false;
+  for (let i = 0; i < xmlChildren.length; i++) {
+    const xmlChild = xmlChildren[i];
     // Custom data for an advanced block.
     if (block.domToMutation) {
       block.domToMutation(xmlChild);
@@ -722,11 +733,12 @@ Blockly.Xml.applyMutationTagNodes_ = function(xmlChildren, block) {
  * @private
  */
 Blockly.Xml.applyCommentTagNodes_ = function(xmlChildren, block) {
-  for (var i = 0, xmlChild; (xmlChild = xmlChildren[i]); i++) {
-    var text = xmlChild.textContent;
-    var pinned = xmlChild.getAttribute('pinned') == 'true';
-    var width = parseInt(xmlChild.getAttribute('w'), 10);
-    var height = parseInt(xmlChild.getAttribute('h'), 10);
+  for (let i = 0; i < xmlChildren.length; i++) {
+    const xmlChild = xmlChildren[i];
+    const text = xmlChild.textContent;
+    const pinned = xmlChild.getAttribute('pinned') == 'true';
+    const width = parseInt(xmlChild.getAttribute('w'), 10);
+    const height = parseInt(xmlChild.getAttribute('h'), 10);
 
     block.setCommentText(text);
     block.commentModel.pinned = pinned;
@@ -749,7 +761,8 @@ Blockly.Xml.applyCommentTagNodes_ = function(xmlChildren, block) {
  * @private
  */
 Blockly.Xml.applyDataTagNodes_ = function(xmlChildren, block) {
-  for (var i = 0, xmlChild; (xmlChild = xmlChildren[i]); i++) {
+  for (let i = 0; i < xmlChildren.length; i++) {
+    const xmlChild = xmlChildren[i];
     block.data = xmlChild.textContent;
   }
 };
@@ -761,8 +774,9 @@ Blockly.Xml.applyDataTagNodes_ = function(xmlChildren, block) {
  * @private
  */
 Blockly.Xml.applyFieldTagNodes_ = function(xmlChildren, block) {
-  for (var i = 0, xmlChild; (xmlChild = xmlChildren[i]); i++) {
-    var nodeName = xmlChild.getAttribute('name');
+  for (let i = 0; i < xmlChildren.length; i++) {
+    const xmlChild = xmlChildren[i];
+    const nodeName = xmlChild.getAttribute('name');
     Blockly.Xml.domToField_(block, nodeName, xmlChild);
   }
 };
@@ -775,8 +789,9 @@ Blockly.Xml.applyFieldTagNodes_ = function(xmlChildren, block) {
  * @private
  */
 Blockly.Xml.findChildBlocks_ = function(xmlNode) {
-  var childBlockInfo = {childBlockElement: null, childShadowElement: null};
-  for (var i = 0, xmlChild; (xmlChild = xmlNode.childNodes[i]); i++) {
+  const childBlockInfo = {childBlockElement: null, childShadowElement: null};
+  for (let i = 0; i < xmlNode.childNodes.length; i++) {
+    const xmlChild = xmlNode.childNodes[i];
     if (xmlChild.nodeType == Blockly.utils.dom.NodeType.ELEMENT_NODE) {
       if (xmlChild.nodeName.toLowerCase() == 'block') {
         childBlockInfo.childBlockElement = /** @type {!Element} */ (xmlChild);
@@ -799,15 +814,16 @@ Blockly.Xml.findChildBlocks_ = function(xmlNode) {
  */
 Blockly.Xml.applyInputTagNodes_ = function(xmlChildren, workspace, block,
     prototypeName) {
-  for (var i = 0, xmlChild; (xmlChild = xmlChildren[i]); i++) {
-    var nodeName = xmlChild.getAttribute('name');
-    var input = block.getInput(nodeName);
+  for (let i = 0; i < xmlChildren.length; i++) {
+    const xmlChild = xmlChildren[i];
+    const nodeName = xmlChild.getAttribute('name');
+    const input = block.getInput(nodeName);
     if (!input) {
       console.warn('Ignoring non-existent input ' + nodeName + ' in block ' +
           prototypeName);
       break;
     }
-    var childBlockInfo = Blockly.Xml.findChildBlocks_(xmlChild);
+    const childBlockInfo = Blockly.Xml.findChildBlocks_(xmlChild);
     if (childBlockInfo.childBlockElement) {
       if (!input.connection) {
         throw TypeError('Input connection does not exist.');
@@ -831,8 +847,9 @@ Blockly.Xml.applyInputTagNodes_ = function(xmlChildren, workspace, block,
  * @private
  */
 Blockly.Xml.applyNextTagNodes_ = function(xmlChildren, workspace, block) {
-  for (var i = 0, xmlChild; (xmlChild = xmlChildren[i]); i++) {
-    var childBlockInfo = Blockly.Xml.findChildBlocks_(xmlChild);
+  for (let i = 0; i < xmlChildren.length; i++) {
+    const xmlChild = xmlChildren[i];
+    const childBlockInfo = Blockly.Xml.findChildBlocks_(xmlChild);
     if (childBlockInfo.childBlockElement) {
       if (!block.nextConnection) {
         throw TypeError('Next statement does not exist.');
@@ -868,18 +885,18 @@ Blockly.Xml.applyNextTagNodes_ = function(xmlChildren, workspace, block) {
  */
 Blockly.Xml.domToBlockHeadless_ = function(xmlBlock, workspace,
     parentConnection, connectedToParentNext) {
-  var block = null;
-  var prototypeName = xmlBlock.getAttribute('type');
+  let block = null;
+  const prototypeName = xmlBlock.getAttribute('type');
   if (!prototypeName) {
     throw TypeError('Block type unspecified: ' + xmlBlock.outerHTML);
   }
-  var id = xmlBlock.getAttribute('id');
+  const id = xmlBlock.getAttribute('id');
   block = workspace.newBlock(prototypeName, id);
 
   // Preprocess childNodes so tags can be processed in a consistent order.
-  var xmlChildNameMap = Blockly.Xml.mapSupportedXmlTags_(xmlBlock);
+  const xmlChildNameMap = Blockly.Xml.mapSupportedXmlTags_(xmlBlock);
 
-  var shouldCallInitSvg =
+  const shouldCallInitSvg =
       Blockly.Xml.applyMutationTagNodes_(xmlChildNameMap.mutation, block);
   Blockly.Xml.applyCommentTagNodes_(xmlChildNameMap.comment, block);
   Blockly.Xml.applyDataTagNodes_(xmlChildNameMap.data, block);
@@ -915,34 +932,35 @@ Blockly.Xml.domToBlockHeadless_ = function(xmlBlock, workspace,
     block.initSvg();
   }
 
-  var inline = xmlBlock.getAttribute('inline');
+  const inline = xmlBlock.getAttribute('inline');
   if (inline) {
     block.setInputsInline(inline == 'true');
   }
-  var disabled = xmlBlock.getAttribute('disabled');
+  const disabled = xmlBlock.getAttribute('disabled');
   if (disabled) {
     block.setEnabled(disabled != 'true' && disabled != 'disabled');
   }
-  var deletable = xmlBlock.getAttribute('deletable');
+  const deletable = xmlBlock.getAttribute('deletable');
   if (deletable) {
     block.setDeletable(deletable == 'true');
   }
-  var movable = xmlBlock.getAttribute('movable');
+  const movable = xmlBlock.getAttribute('movable');
   if (movable) {
     block.setMovable(movable == 'true');
   }
-  var editable = xmlBlock.getAttribute('editable');
+  const editable = xmlBlock.getAttribute('editable');
   if (editable) {
     block.setEditable(editable == 'true');
   }
-  var collapsed = xmlBlock.getAttribute('collapsed');
+  const collapsed = xmlBlock.getAttribute('collapsed');
   if (collapsed) {
     block.setCollapsed(collapsed == 'true');
   }
   if (xmlBlock.nodeName.toLowerCase() == 'shadow') {
     // Ensure all children are also shadows.
-    var children = block.getChildren(false);
-    for (var i = 0, child; (child = children[i]); i++) {
+    const children = block.getChildren(false);
+    for (let i = 0; i < children.length; i++) {
+      const child = children[i];
       if (!child.isShadow()) {
         throw TypeError('Shadow block not allowed non-shadow child.');
       }
@@ -964,7 +982,7 @@ Blockly.Xml.domToBlockHeadless_ = function(xmlBlock, workspace,
  * @private
  */
 Blockly.Xml.domToField_ = function(block, fieldName, xml) {
-  var field = block.getField(fieldName);
+  const field = block.getField(fieldName);
   if (!field) {
     console.warn('Ignoring non-existent field ' + fieldName + ' in block ' +
         block.type);
@@ -979,7 +997,8 @@ Blockly.Xml.domToField_ = function(block, fieldName, xml) {
  *     DocumentFragment if the block was an insertion marker.
  */
 Blockly.Xml.deleteNext = function(xmlBlock) {
-  for (var i = 0, child; (child = xmlBlock.childNodes[i]); i++) {
+  for (let i = 0; i < xmlBlock.childNodes.length; i++) {
+    const child = xmlBlock.childNodes[i];
     if (child.nodeName.toLowerCase() == 'next') {
       xmlBlock.removeChild(child);
       break;

From a64097d23f4767c1ac857db49b64382145490fad Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 12:44:00 -0700
Subject: [PATCH 627/833] Migrate core/xml.js to goog.module

---
 core/xml.js   | 146 +++++++++++++++++++++++++++-----------------------
 tests/deps.js |   2 +-
 2 files changed, 81 insertions(+), 67 deletions(-)

diff --git a/core/xml.js b/core/xml.js
index 1b1db8966..b07d0a70e 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -14,10 +14,11 @@
  * @name Blockly.Xml
  * @namespace
  */
-goog.provide('Blockly.Xml');
+goog.module('Blockly.Xml');
+goog.module.declareLegacyNamespace();
+
 goog.require('Blockly.Events');
 goog.require('Blockly.inputTypes');
-goog.require('Blockly.utils');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.Size');
 goog.require('Blockly.utils.xml');
@@ -30,6 +31,7 @@ goog.requireType('Blockly.VariableModel');
 goog.requireType('Blockly.Workspace');
 goog.requireType('Blockly.WorkspaceComment');
 goog.requireType('Blockly.WorkspaceCommentSvg');
+goog.requireType('Blockly.Variables');
 
 
 /**
@@ -38,10 +40,10 @@ goog.requireType('Blockly.WorkspaceCommentSvg');
  * @param {boolean=} opt_noId True if the encoder should skip the block IDs.
  * @return {!Element} XML DOM element.
  */
-Blockly.Xml.workspaceToDom = function(workspace, opt_noId) {
+const workspaceToDom = function(workspace, opt_noId) {
   const xml = Blockly.utils.xml.createElement('xml');
-  const variablesElement = Blockly.Xml.variablesToDom(
-      Blockly.Variables.allUsedVarModels(workspace));
+  const variablesElement = variablesToDom(
+      goog.module.get('Blockly.Variables').allUsedVarModels(workspace));
   if (variablesElement.hasChildNodes()) {
     xml.appendChild(variablesElement);
   }
@@ -53,10 +55,11 @@ Blockly.Xml.workspaceToDom = function(workspace, opt_noId) {
   const blocks = workspace.getTopBlocks(true);
   for (let i = 0; i < blocks.length; i++) {
     const block = blocks[i];
-    xml.appendChild(Blockly.Xml.blockToDomWithXY(block, opt_noId));
+    xml.appendChild(blockToDomWithXY(block, opt_noId));
   }
   return xml;
 };
+exports.workspaceToDom = workspaceToDom;
 
 /**
  * Encode a list of variables as XML.
@@ -64,7 +67,7 @@ Blockly.Xml.workspaceToDom = function(workspace, opt_noId) {
  *     models.
  * @return {!Element} Tree of XML elements.
  */
-Blockly.Xml.variablesToDom = function(variableList) {
+const variablesToDom = function(variableList) {
   const variables = Blockly.utils.xml.createElement('variables');
   for (let i = 0; i < variableList.length; i++) {
     const variable = variableList[i];
@@ -78,6 +81,7 @@ Blockly.Xml.variablesToDom = function(variableList) {
   }
   return variables;
 };
+exports.variablesToDom = variablesToDom;
 
 /**
  * Encode a block subtree as XML with XY coordinates.
@@ -86,7 +90,7 @@ Blockly.Xml.variablesToDom = function(variableList) {
  * @return {!Element|!DocumentFragment} Tree of XML elements or an empty document
  *     fragment if the block was an insertion marker.
  */
-Blockly.Xml.blockToDomWithXY = function(block, opt_noId) {
+const blockToDomWithXY = function(block, opt_noId) {
   if (block.isInsertionMarker()) {  // Skip over insertion markers.
     block = block.getChildren(false)[0];
     if (!block) {
@@ -100,13 +104,14 @@ Blockly.Xml.blockToDomWithXY = function(block, opt_noId) {
     width = block.workspace.getWidth();
   }
 
-  const element = Blockly.Xml.blockToDom(block, opt_noId);
+  const element = blockToDom(block, opt_noId);
   const xy = block.getRelativeToSurfaceXY();
   element.setAttribute('x',
       Math.round(block.workspace.RTL ? width - xy.x : xy.x));
   element.setAttribute('y', Math.round(xy.y));
   return element;
 };
+exports.blockToDomWithXY = blockToDomWithXY;
 
 /**
  * Encode a field as XML.
@@ -115,7 +120,7 @@ Blockly.Xml.blockToDomWithXY = function(block, opt_noId) {
  *     serialized.
  * @private
  */
-Blockly.Xml.fieldToDom_ = function(field) {
+const fieldToDom_ = function(field) {
   if (field.isSerializable()) {
     const container = Blockly.utils.xml.createElement('field');
     container.setAttribute('name', field.name || '');
@@ -132,12 +137,12 @@ Blockly.Xml.fieldToDom_ = function(field) {
  *     attached.
  * @private
  */
-Blockly.Xml.allFieldsToDom_ = function(block, element) {
+const allFieldsToDom_ = function(block, element) {
   for (let i = 0; i < block.inputList.length; i++) {
     const input = block.inputList[i];
     for (let j = 0; j < input.fieldRow.length; j++) {
       const field = input.fieldRow[j];
-      const fieldDom = Blockly.Xml.fieldToDom_(field);
+      const fieldDom = fieldToDom_(field);
       if (fieldDom) {
         element.appendChild(fieldDom);
       }
@@ -152,12 +157,12 @@ Blockly.Xml.allFieldsToDom_ = function(block, element) {
  * @return {!Element|!DocumentFragment} Tree of XML elements or an empty document
  *     fragment if the block was an insertion marker.
  */
-Blockly.Xml.blockToDom = function(block, opt_noId) {
+const blockToDom = function(block, opt_noId) {
   // Skip over insertion markers.
   if (block.isInsertionMarker()) {
     const child = block.getChildren(false)[0];
     if (child) {
-      return Blockly.Xml.blockToDom(child);
+      return blockToDom(child);
     } else {
       // Disappears when appended.
       return new DocumentFragment();
@@ -180,7 +185,7 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
     }
   }
 
-  Blockly.Xml.allFieldsToDom_(block, element);
+  allFieldsToDom_(block, element);
 
   const commentText = block.getCommentText();
   if (commentText) {
@@ -217,10 +222,10 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
       }
       const shadow = input.connection.getShadowDom();
       if (shadow && (!childBlock || !childBlock.isShadow())) {
-        container.appendChild(Blockly.Xml.cloneShadow_(shadow, opt_noId));
+        container.appendChild(cloneShadow_(shadow, opt_noId));
       }
       if (childBlock) {
-        const elem = Blockly.Xml.blockToDom(childBlock, opt_noId);
+        const elem = blockToDom(childBlock, opt_noId);
         if (elem.nodeType == Blockly.utils.dom.NodeType.ELEMENT_NODE) {
           container.appendChild(elem);
           empty = false;
@@ -255,7 +260,7 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
   const nextBlock = block.getNextBlock();
   let container;
   if (nextBlock) {
-    const elem = Blockly.Xml.blockToDom(nextBlock, opt_noId);
+    const elem = blockToDom(nextBlock, opt_noId);
     if (elem.nodeType == Blockly.utils.dom.NodeType.ELEMENT_NODE) {
       container = Blockly.utils.xml.createElement('next');
       container.appendChild(elem);
@@ -264,11 +269,12 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
   }
   const shadow = block.nextConnection && block.nextConnection.getShadowDom();
   if (shadow && (!nextBlock || !nextBlock.isShadow())) {
-    container.appendChild(Blockly.Xml.cloneShadow_(shadow, opt_noId));
+    container.appendChild(cloneShadow_(shadow, opt_noId));
   }
 
   return element;
 };
+exports.blockToDom = blockToDom;
 
 /**
  * Deeply clone the shadow's DOM so that changes don't back-wash to the block.
@@ -277,7 +283,7 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
  * @return {!Element} A tree of XML elements.
  * @private
  */
-Blockly.Xml.cloneShadow_ = function(shadow, opt_noId) {
+const cloneShadow_ = function(shadow, opt_noId) {
   shadow = shadow.cloneNode(true);
   // Walk the tree looking for whitespace.  Don't prune whitespace in a tag.
   let node = shadow;
@@ -321,22 +327,23 @@ Blockly.Xml.cloneShadow_ = function(shadow, opt_noId) {
  * @param {!Node} dom A tree of XML nodes.
  * @return {string} Text representation.
  */
-Blockly.Xml.domToText = function(dom) {
+const domToText = function(dom) {
   const text = Blockly.utils.xml.domToText(dom);
   // Unpack self-closing tags.  These tags fail when embedded in HTML.
   // <block name="foo"/> -> <block name="foo"></block>
   return text.replace(/<(\w+)([^<]*)\/>/g, '<$1$2></$1>');
 };
+exports.domToText = domToText;
 
 /**
  * Converts a DOM structure into properly indented text.
  * @param {!Node} dom A tree of XML elements.
  * @return {string} Text representation.
  */
-Blockly.Xml.domToPrettyText = function(dom) {
+const domToPrettyText = function(dom) {
   // This function is not guaranteed to be correct for all XML.
   // But it handles the XML that Blockly generates.
-  const blob = Blockly.Xml.domToText(dom);
+  const blob = domToText(dom);
   // Place every open and close tag on its own line.
   const lines = blob.split('<');
   // Indent every line.
@@ -358,6 +365,7 @@ Blockly.Xml.domToPrettyText = function(dom) {
   // Trim leading blank line.
   return text.replace(/^\n/, '');
 };
+exports.domToPrettyText = domToPrettyText;
 
 /**
  * Converts an XML string into a DOM structure.
@@ -366,7 +374,7 @@ Blockly.Xml.domToPrettyText = function(dom) {
  *     document element.
  * @throws if the text doesn't parse.
  */
-Blockly.Xml.textToDom = function(text) {
+const textToDom = function(text) {
   const doc = Blockly.utils.xml.textToDomDocument(text);
   if (!doc || !doc.documentElement ||
       doc.getElementsByTagName('parsererror').length) {
@@ -374,6 +382,7 @@ Blockly.Xml.textToDom = function(text) {
   }
   return doc.documentElement;
 };
+exports.textToDom = textToDom;
 
 /**
  * Clear the given workspace then decode an XML DOM and
@@ -382,13 +391,14 @@ Blockly.Xml.textToDom = function(text) {
  * @param {!Blockly.Workspace} workspace The workspace.
  * @return {!Array<string>} An array containing new block IDs.
  */
-Blockly.Xml.clearWorkspaceAndLoadFromXml = function(xml, workspace) {
+const clearWorkspaceAndLoadFromXml = function(xml, workspace) {
   workspace.setResizesEnabled(false);
   workspace.clear();
-  const blockIds = Blockly.Xml.domToWorkspace(xml, workspace);
+  const blockIds = domToWorkspace(xml, workspace);
   workspace.setResizesEnabled(true);
   return blockIds;
 };
+exports.clearWorkspaceAndLoadFromXml = clearWorkspaceAndLoadFromXml;
 
 /**
  * Decode an XML DOM and create blocks on the workspace.
@@ -398,14 +408,14 @@ Blockly.Xml.clearWorkspaceAndLoadFromXml = function(xml, workspace) {
  * @suppress {strictModuleDepCheck} Suppress module check while workspace
  *     comments are not bundled in.
  */
-Blockly.Xml.domToWorkspace = function(xml, workspace) {
-  if (xml instanceof Blockly.Workspace) {
+const domToWorkspace = function(xml, workspace) {
+  if (xml instanceof goog.module.get('Blockly.Workspace')) {
     const swap = xml;
     // Closure Compiler complains here because the arguments are reversed.
     /** @suppress {checkTypes} */
     xml = workspace;
     workspace = swap;
-    console.warn('Deprecated call to Blockly.Xml.domToWorkspace, ' +
+    console.warn('Deprecated call to domToWorkspace, ' +
                  'swap the arguments.');
   }
 
@@ -435,7 +445,7 @@ Blockly.Xml.domToWorkspace = function(xml, workspace) {
         // Allow top-level shadow blocks if recordUndo is disabled since
         // that means an undo is in progress.  Such a block is expected
         // to be moved to a nested destination in the next operation.
-        const block = Blockly.Xml.domToBlock(xmlChildElement, workspace);
+        const block = domToBlock(xmlChildElement, workspace);
         newBlockIds.push(block.id);
         const blockX = xmlChildElement.hasAttribute('x') ?
             parseInt(xmlChildElement.getAttribute('x'), 10) : 10;
@@ -470,7 +480,7 @@ Blockly.Xml.domToWorkspace = function(xml, workspace) {
         }
       } else if (name == 'variables') {
         if (variablesFirst) {
-          Blockly.Xml.domToVariables(xmlChildElement, workspace);
+          domToVariables(xmlChildElement, workspace);
         } else {
           throw Error('\'variables\' tag must exist once before block and ' +
               'shadow tag elements in the workspace XML, but it was found in ' +
@@ -493,6 +503,7 @@ Blockly.Xml.domToWorkspace = function(xml, workspace) {
       workspace));
   return newBlockIds;
 };
+exports.domToWorkspace = domToWorkspace;
 
 /**
  * Decode an XML DOM and create blocks on the workspace. Position the new
@@ -501,7 +512,7 @@ Blockly.Xml.domToWorkspace = function(xml, workspace) {
  * @param {!Blockly.Workspace} workspace The workspace to add to.
  * @return {!Array<string>} An array containing new block IDs.
  */
-Blockly.Xml.appendDomToWorkspace = function(xml, workspace) {
+const appendDomToWorkspace = function(xml, workspace) {
   let bbox;  // Bounding box of the current blocks.
   // First check if we have a workspaceSvg, otherwise the blocks have no shape
   // and the position does not matter.
@@ -509,7 +520,7 @@ Blockly.Xml.appendDomToWorkspace = function(xml, workspace) {
     bbox = workspace.getBlocksBoundingBox();
   }
   // Load the new blocks into the workspace and get the IDs of the new blocks.
-  const newBlockIds = Blockly.Xml.domToWorkspace(xml, workspace);
+  const newBlockIds = domToWorkspace(xml, workspace);
   if (bbox && bbox.top != bbox.bottom) {  // check if any previous block
     let offsetY = 0;  // offset to add to y of the new block
     let offsetX = 0;
@@ -542,6 +553,7 @@ Blockly.Xml.appendDomToWorkspace = function(xml, workspace) {
   }
   return newBlockIds;
 };
+exports.appendDomToWorkspace = appendDomToWorkspace;
 
 /**
  * Decode an XML block tag and create a block (and possibly sub blocks) on the
@@ -550,14 +562,14 @@ Blockly.Xml.appendDomToWorkspace = function(xml, workspace) {
  * @param {!Blockly.Workspace} workspace The workspace.
  * @return {!Blockly.Block} The root block created.
  */
-Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
-  if (xmlBlock instanceof Blockly.Workspace) {
+const domToBlock = function(xmlBlock, workspace) {
+  if (xmlBlock instanceof goog.module.get('Blockly.Workspace')) {
     const swap = xmlBlock;
     // Closure Compiler complains here because the arguments are reversed.
     /** @suppress {checkTypes} */
     xmlBlock = /** @type {!Element} */ (workspace);
     workspace = swap;
-    console.warn('Deprecated call to Blockly.Xml.domToBlock, ' +
+    console.warn('Deprecated call to domToBlock, ' +
                  'swap the arguments.');
   }
   // Create top-level block.
@@ -565,7 +577,7 @@ Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
   const variablesBeforeCreation = workspace.getAllVariables();
   let topBlock;
   try {
-    topBlock = Blockly.Xml.domToBlockHeadless_(xmlBlock, workspace);
+    topBlock = domToBlockHeadless_(xmlBlock, workspace);
     // Generate list of all blocks.
     const blocks = topBlock.getDescendants(false);
     if (workspace.rendered) {
@@ -598,7 +610,7 @@ Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
     Blockly.Events.enable();
   }
   if (Blockly.Events.isEnabled()) {
-    const newVariables = Blockly.Variables.getAddedVariables(workspace,
+    const newVariables = goog.module.get('Blockly.Variables').getAddedVariables(workspace,
         variablesBeforeCreation);
     // Fire a VarCreate event for each (if any) new variable created.
     for (let i = 0; i < newVariables.length; i++) {
@@ -613,7 +625,7 @@ Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
   }
   return topBlock;
 };
-
+exports.domToBlock = domToBlock;
 
 /**
  * Decode an XML list of variables and add the variables to the workspace.
@@ -621,7 +633,7 @@ Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
  * @param {!Blockly.Workspace} workspace The workspace to which the variable
  *     should be added.
  */
-Blockly.Xml.domToVariables = function(xmlVariables, workspace) {
+const domToVariables = function(xmlVariables, workspace) {
   for (let i = 0; i < xmlVariables.childNodes.length; i++) {
     const xmlChild = xmlVariables.childNodes[i];
     if (xmlChild.nodeType != Blockly.utils.dom.NodeType.ELEMENT_NODE) {
@@ -634,6 +646,7 @@ Blockly.Xml.domToVariables = function(xmlVariables, workspace) {
     workspace.createVariable(name, type, id);
   }
 };
+exports.domToVariables = domToVariables;
 
 /**
  * A mapping of nodeName to node for child nodes of xmlBlock.
@@ -646,16 +659,16 @@ Blockly.Xml.domToVariables = function(xmlVariables, workspace) {
  *      next: !Array<!Element>
  *    }}
  */
-Blockly.Xml.childNodeTagMap;
+let childNodeTagMap;  // eslint-disable-line no-unused-vars
 
 /**
  * Creates a mapping of childNodes for each supported XML tag for the provided
  * xmlBlock. Logs a warning for any encountered unsupported tags.
  * @param {!Element} xmlBlock XML block element.
- * @return {!Blockly.Xml.childNodeTagMap} The childNode map from nodeName to
+ * @return {!childNodeTagMap} The childNode map from nodeName to
  *    node.
  */
-Blockly.Xml.mapSupportedXmlTags_ = function(xmlBlock) {
+const mapSupportedXmlTags_ = function(xmlBlock) {
   const childNodeMap = {
     mutation: [], comment: [], data: [], field: [], input: [],
     next: []
@@ -671,7 +684,7 @@ Blockly.Xml.mapSupportedXmlTags_ = function(xmlBlock) {
         childNodeMap.mutation.push(xmlChild);
         break;
       case 'comment':
-        if (!Blockly.Comment) {
+        if (!goog.module.get('Blockly.Comment')) {
           console.warn('Missing require for Blockly.Comment, ' +
               'ignoring block comment.');
           break;
@@ -710,7 +723,7 @@ Blockly.Xml.mapSupportedXmlTags_ = function(xmlBlock) {
  *    initialization (requiring initSvg call).
  * @private
  */
-Blockly.Xml.applyMutationTagNodes_ = function(xmlChildren, block) {
+const applyMutationTagNodes_ = function(xmlChildren, block) {
   let shouldCallInitSvg = false;
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
@@ -732,7 +745,7 @@ Blockly.Xml.applyMutationTagNodes_ = function(xmlChildren, block) {
  * @param {!Blockly.Block} block The block to apply the child nodes on.
  * @private
  */
-Blockly.Xml.applyCommentTagNodes_ = function(xmlChildren, block) {
+const applyCommentTagNodes_ = function(xmlChildren, block) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
     const text = xmlChild.textContent;
@@ -760,7 +773,7 @@ Blockly.Xml.applyCommentTagNodes_ = function(xmlChildren, block) {
  * @param {!Blockly.Block} block The block to apply the child nodes on.
  * @private
  */
-Blockly.Xml.applyDataTagNodes_ = function(xmlChildren, block) {
+const applyDataTagNodes_ = function(xmlChildren, block) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
     block.data = xmlChild.textContent;
@@ -773,11 +786,11 @@ Blockly.Xml.applyDataTagNodes_ = function(xmlChildren, block) {
  * @param {!Blockly.Block} block The block to apply the child nodes on.
  * @private
  */
-Blockly.Xml.applyFieldTagNodes_ = function(xmlChildren, block) {
+const applyFieldTagNodes_ = function(xmlChildren, block) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
     const nodeName = xmlChild.getAttribute('name');
-    Blockly.Xml.domToField_(block, nodeName, xmlChild);
+    domToField_(block, nodeName, xmlChild);
   }
 };
 
@@ -788,7 +801,7 @@ Blockly.Xml.applyFieldTagNodes_ = function(xmlChildren, block) {
  *    found child block.
  * @private
  */
-Blockly.Xml.findChildBlocks_ = function(xmlNode) {
+const findChildBlocks_ = function(xmlNode) {
   const childBlockInfo = {childBlockElement: null, childShadowElement: null};
   for (let i = 0; i < xmlNode.childNodes.length; i++) {
     const xmlChild = xmlNode.childNodes[i];
@@ -812,7 +825,7 @@ Blockly.Xml.findChildBlocks_ = function(xmlNode) {
  * @param {string} prototypeName The prototype name of the block.
  * @private
  */
-Blockly.Xml.applyInputTagNodes_ = function(xmlChildren, workspace, block,
+const applyInputTagNodes_ = function(xmlChildren, workspace, block,
     prototypeName) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
@@ -823,12 +836,12 @@ Blockly.Xml.applyInputTagNodes_ = function(xmlChildren, workspace, block,
           prototypeName);
       break;
     }
-    const childBlockInfo = Blockly.Xml.findChildBlocks_(xmlChild);
+    const childBlockInfo = findChildBlocks_(xmlChild);
     if (childBlockInfo.childBlockElement) {
       if (!input.connection) {
         throw TypeError('Input connection does not exist.');
       }
-      Blockly.Xml.domToBlockHeadless_(childBlockInfo.childBlockElement,
+      domToBlockHeadless_(childBlockInfo.childBlockElement,
           workspace, input.connection, false);
     }
     // Set shadow after so we don't create a shadow we delete immediately.
@@ -846,10 +859,10 @@ Blockly.Xml.applyInputTagNodes_ = function(xmlChildren, workspace, block,
  * @param {!Blockly.Block} block The block to apply the child nodes on.
  * @private
  */
-Blockly.Xml.applyNextTagNodes_ = function(xmlChildren, workspace, block) {
+const applyNextTagNodes_ = function(xmlChildren, workspace, block) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
-    const childBlockInfo = Blockly.Xml.findChildBlocks_(xmlChild);
+    const childBlockInfo = findChildBlocks_(xmlChild);
     if (childBlockInfo.childBlockElement) {
       if (!block.nextConnection) {
         throw TypeError('Next statement does not exist.');
@@ -859,7 +872,7 @@ Blockly.Xml.applyNextTagNodes_ = function(xmlChildren, workspace, block) {
         throw TypeError('Next statement is already connected.');
       }
       // Create child block.
-      Blockly.Xml.domToBlockHeadless_(childBlockInfo.childBlockElement,
+      domToBlockHeadless_(childBlockInfo.childBlockElement,
           workspace, block.nextConnection,
           true);
     }
@@ -883,7 +896,7 @@ Blockly.Xml.applyNextTagNodes_ = function(xmlChildren, workspace, block) {
  * @return {!Blockly.Block} The root block created.
  * @private
  */
-Blockly.Xml.domToBlockHeadless_ = function(xmlBlock, workspace,
+const domToBlockHeadless_ = function(xmlBlock, workspace,
     parentConnection, connectedToParentNext) {
   let block = null;
   const prototypeName = xmlBlock.getAttribute('type');
@@ -894,12 +907,12 @@ Blockly.Xml.domToBlockHeadless_ = function(xmlBlock, workspace,
   block = workspace.newBlock(prototypeName, id);
 
   // Preprocess childNodes so tags can be processed in a consistent order.
-  const xmlChildNameMap = Blockly.Xml.mapSupportedXmlTags_(xmlBlock);
+  const xmlChildNameMap = mapSupportedXmlTags_(xmlBlock);
 
   const shouldCallInitSvg =
-      Blockly.Xml.applyMutationTagNodes_(xmlChildNameMap.mutation, block);
-  Blockly.Xml.applyCommentTagNodes_(xmlChildNameMap.comment, block);
-  Blockly.Xml.applyDataTagNodes_(xmlChildNameMap.data, block);
+      applyMutationTagNodes_(xmlChildNameMap.mutation, block);
+  applyCommentTagNodes_(xmlChildNameMap.comment, block);
+  applyDataTagNodes_(xmlChildNameMap.data, block);
 
   // Connect parent after processing mutation and before setting fields.
   if (parentConnection) {
@@ -922,10 +935,10 @@ Blockly.Xml.domToBlockHeadless_ = function(xmlBlock, workspace,
     }
   }
 
-  Blockly.Xml.applyFieldTagNodes_(xmlChildNameMap.field, block);
-  Blockly.Xml.applyInputTagNodes_(
+  applyFieldTagNodes_(xmlChildNameMap.field, block);
+  applyInputTagNodes_(
       xmlChildNameMap.input, workspace, block, prototypeName);
-  Blockly.Xml.applyNextTagNodes_(xmlChildNameMap.next, workspace, block);
+  applyNextTagNodes_(xmlChildNameMap.next, workspace, block);
 
   if (shouldCallInitSvg) {
     // InitSvg needs to be called after variable fields are loaded.
@@ -981,7 +994,7 @@ Blockly.Xml.domToBlockHeadless_ = function(xmlBlock, workspace,
  * @param {!Element} xml The field tag to decode.
  * @private
  */
-Blockly.Xml.domToField_ = function(block, fieldName, xml) {
+const domToField_ = function(block, fieldName, xml) {
   const field = block.getField(fieldName);
   if (!field) {
     console.warn('Ignoring non-existent field ' + fieldName + ' in block ' +
@@ -996,7 +1009,7 @@ Blockly.Xml.domToField_ = function(block, fieldName, xml) {
  * @param {!Element|!DocumentFragment} xmlBlock XML block element or an empty
  *     DocumentFragment if the block was an insertion marker.
  */
-Blockly.Xml.deleteNext = function(xmlBlock) {
+const deleteNext = function(xmlBlock) {
   for (let i = 0; i < xmlBlock.childNodes.length; i++) {
     const child = xmlBlock.childNodes[i];
     if (child.nodeName.toLowerCase() == 'next') {
@@ -1005,3 +1018,4 @@ Blockly.Xml.deleteNext = function(xmlBlock) {
     }
   }
 };
+exports.deleteNext = deleteNext;
diff --git a/tests/deps.js b/tests/deps.js
index 15bbfa67b..536c6dba6 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -224,7 +224,7 @@ goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCom
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6'});
+goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);
 

From 9666a3eb188ebe57ecdbb7b71a9195c477a04c6c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 13:24:03 -0700
Subject: [PATCH 628/833] Migrate core/xml.js named requires

---
 core/xml.js | 170 ++++++++++++++++++++++++++--------------------------
 1 file changed, 85 insertions(+), 85 deletions(-)

diff --git a/core/xml.js b/core/xml.js
index b07d0a70e..43e187c58 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -10,69 +10,69 @@
  */
 'use strict';
 
-/**
- * @name Blockly.Xml
- * @namespace
- */
 goog.module('Blockly.Xml');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.inputTypes');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Size');
-goog.require('Blockly.utils.xml');
-
-goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const Events = goog.require('Blockly.Events');
+/* 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');
+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 dom = goog.require('Blockly.utils.dom');
+const inputTypes = goog.require('Blockly.inputTypes');
+const utilsXml = goog.require('Blockly.utils.xml');
 goog.requireType('Blockly.Comment');
-goog.requireType('Blockly.Connection');
-goog.requireType('Blockly.Field');
-goog.requireType('Blockly.VariableModel');
-goog.requireType('Blockly.Workspace');
+goog.requireType('Blockly.Variables');
 goog.requireType('Blockly.WorkspaceComment');
 goog.requireType('Blockly.WorkspaceCommentSvg');
-goog.requireType('Blockly.Variables');
 
 
 /**
  * Encode a block tree as XML.
- * @param {!Blockly.Workspace} workspace The workspace containing blocks.
+ * @param {!Workspace} workspace The workspace containing blocks.
  * @param {boolean=} opt_noId True if the encoder should skip the block IDs.
  * @return {!Element} XML DOM element.
  */
 const workspaceToDom = function(workspace, opt_noId) {
-  const xml = Blockly.utils.xml.createElement('xml');
+  const treeXml = utilsXml.createElement('xml');
   const variablesElement = variablesToDom(
       goog.module.get('Blockly.Variables').allUsedVarModels(workspace));
   if (variablesElement.hasChildNodes()) {
-    xml.appendChild(variablesElement);
+    treeXml.appendChild(variablesElement);
   }
   const comments = workspace.getTopComments(true);
   for (let i = 0; i < comments.length; i++) {
     const comment = comments[i];
-    xml.appendChild(comment.toXmlWithXY(opt_noId));
+    treeXml.appendChild(comment.toXmlWithXY(opt_noId));
   }
   const blocks = workspace.getTopBlocks(true);
   for (let i = 0; i < blocks.length; i++) {
     const block = blocks[i];
-    xml.appendChild(blockToDomWithXY(block, opt_noId));
+    treeXml.appendChild(blockToDomWithXY(block, opt_noId));
   }
-  return xml;
+  return treeXml;
 };
 exports.workspaceToDom = workspaceToDom;
 
 /**
  * Encode a list of variables as XML.
- * @param {!Array<!Blockly.VariableModel>} variableList List of all variable
+ * @param {!Array<!VariableModel>} variableList List of all variable
  *     models.
  * @return {!Element} Tree of XML elements.
  */
 const variablesToDom = function(variableList) {
-  const variables = Blockly.utils.xml.createElement('variables');
+  const variables = utilsXml.createElement('variables');
   for (let i = 0; i < variableList.length; i++) {
     const variable = variableList[i];
-    const element = Blockly.utils.xml.createElement('variable');
-    element.appendChild(Blockly.utils.xml.createTextNode(variable.name));
+    const element = utilsXml.createElement('variable');
+    element.appendChild(utilsXml.createTextNode(variable.name));
     if (variable.type) {
       element.setAttribute('type', variable.type);
     }
@@ -85,7 +85,7 @@ exports.variablesToDom = variablesToDom;
 
 /**
  * Encode a block subtree as XML with XY coordinates.
- * @param {!Blockly.Block} block The root block to encode.
+ * @param {!Block} block The root block to encode.
  * @param {boolean=} opt_noId True if the encoder should skip the block ID.
  * @return {!Element|!DocumentFragment} Tree of XML elements or an empty document
  *     fragment if the block was an insertion marker.
@@ -115,14 +115,14 @@ exports.blockToDomWithXY = blockToDomWithXY;
 
 /**
  * Encode a field as XML.
- * @param {!Blockly.Field} field The field to encode.
+ * @param {!Field} field The field to encode.
  * @return {?Element} XML element, or null if the field did not need to be
  *     serialized.
  * @private
  */
 const fieldToDom_ = function(field) {
   if (field.isSerializable()) {
-    const container = Blockly.utils.xml.createElement('field');
+    const container = utilsXml.createElement('field');
     container.setAttribute('name', field.name || '');
     return field.toXml(container);
   }
@@ -132,7 +132,7 @@ const fieldToDom_ = function(field) {
 /**
  * Encode all of a block's fields as XML and attach them to the given tree of
  * XML elements.
- * @param {!Blockly.Block} block A block with fields to be encoded.
+ * @param {!Block} block A block with fields to be encoded.
  * @param {!Element} element The XML element to which the field DOM should be
  *     attached.
  * @private
@@ -152,7 +152,7 @@ const allFieldsToDom_ = function(block, element) {
 
 /**
  * Encode a block subtree as XML.
- * @param {!Blockly.Block} block The root block to encode.
+ * @param {!Block} block The root block to encode.
  * @param {boolean=} opt_noId True if the encoder should skip the block ID.
  * @return {!Element|!DocumentFragment} Tree of XML elements or an empty document
  *     fragment if the block was an insertion marker.
@@ -170,7 +170,7 @@ const blockToDom = function(block, opt_noId) {
   }
 
   const element =
-      Blockly.utils.xml.createElement(block.isShadow() ? 'shadow' : 'block');
+      utilsXml.createElement(block.isShadow() ? 'shadow' : 'block');
   element.setAttribute('type', block.type);
   if (!opt_noId) {
     // It's important to use setAttribute here otherwise IE11 won't serialize
@@ -192,8 +192,8 @@ const blockToDom = function(block, opt_noId) {
     const size = block.commentModel.size;
     const pinned = block.commentModel.pinned;
 
-    const commentElement = Blockly.utils.xml.createElement('comment');
-    commentElement.appendChild(Blockly.utils.xml.createTextNode(commentText));
+    const commentElement = utilsXml.createElement('comment');
+    commentElement.appendChild(utilsXml.createTextNode(commentText));
     commentElement.setAttribute('pinned', pinned);
     commentElement.setAttribute('h', size.height);
     commentElement.setAttribute('w', size.width);
@@ -202,8 +202,8 @@ const blockToDom = function(block, opt_noId) {
   }
 
   if (block.data) {
-    const dataElement = Blockly.utils.xml.createElement('data');
-    dataElement.appendChild(Blockly.utils.xml.createTextNode(block.data));
+    const dataElement = utilsXml.createElement('data');
+    dataElement.appendChild(utilsXml.createTextNode(block.data));
     element.appendChild(dataElement);
   }
 
@@ -211,14 +211,14 @@ const blockToDom = function(block, opt_noId) {
     const input = block.inputList[i];
     let container;
     let empty = true;
-    if (input.type == Blockly.inputTypes.DUMMY) {
+    if (input.type == inputTypes.DUMMY) {
       continue;
     } else {
       const childBlock = input.connection.targetBlock();
-      if (input.type == Blockly.inputTypes.VALUE) {
-        container = Blockly.utils.xml.createElement('value');
-      } else if (input.type == Blockly.inputTypes.STATEMENT) {
-        container = Blockly.utils.xml.createElement('statement');
+      if (input.type == inputTypes.VALUE) {
+        container = utilsXml.createElement('value');
+      } else if (input.type == inputTypes.STATEMENT) {
+        container = utilsXml.createElement('statement');
       }
       const shadow = input.connection.getShadowDom();
       if (shadow && (!childBlock || !childBlock.isShadow())) {
@@ -226,7 +226,7 @@ const blockToDom = function(block, opt_noId) {
       }
       if (childBlock) {
         const elem = blockToDom(childBlock, opt_noId);
-        if (elem.nodeType == Blockly.utils.dom.NodeType.ELEMENT_NODE) {
+        if (elem.nodeType == dom.NodeType.ELEMENT_NODE) {
           container.appendChild(elem);
           empty = false;
         }
@@ -261,8 +261,8 @@ const blockToDom = function(block, opt_noId) {
   let container;
   if (nextBlock) {
     const elem = blockToDom(nextBlock, opt_noId);
-    if (elem.nodeType == Blockly.utils.dom.NodeType.ELEMENT_NODE) {
-      container = Blockly.utils.xml.createElement('next');
+    if (elem.nodeType == dom.NodeType.ELEMENT_NODE) {
+      container = utilsXml.createElement('next');
       container.appendChild(elem);
       element.appendChild(container);
     }
@@ -300,19 +300,19 @@ const cloneShadow_ = function(shadow, opt_noId) {
       while (node && !node.nextSibling) {
         textNode = node;
         node = node.parentNode;
-        if (textNode.nodeType == Blockly.utils.dom.NodeType.TEXT_NODE &&
+        if (textNode.nodeType == dom.NodeType.TEXT_NODE &&
             textNode.data.trim() == '' && node.firstChild != textNode) {
           // Prune whitespace after a tag.
-          Blockly.utils.dom.removeNode(textNode);
+          dom.removeNode(textNode);
         }
       }
       if (node) {
         textNode = node;
         node = node.nextSibling;
-        if (textNode.nodeType == Blockly.utils.dom.NodeType.TEXT_NODE &&
+        if (textNode.nodeType == dom.NodeType.TEXT_NODE &&
             textNode.data.trim() == '') {
           // Prune whitespace before a tag.
-          Blockly.utils.dom.removeNode(textNode);
+          dom.removeNode(textNode);
         }
       }
     }
@@ -328,7 +328,7 @@ const cloneShadow_ = function(shadow, opt_noId) {
  * @return {string} Text representation.
  */
 const domToText = function(dom) {
-  const text = Blockly.utils.xml.domToText(dom);
+  const text = utilsXml.domToText(dom);
   // Unpack self-closing tags.  These tags fail when embedded in HTML.
   // <block name="foo"/> -> <block name="foo"></block>
   return text.replace(/<(\w+)([^<]*)\/>/g, '<$1$2></$1>');
@@ -375,7 +375,7 @@ exports.domToPrettyText = domToPrettyText;
  * @throws if the text doesn't parse.
  */
 const textToDom = function(text) {
-  const doc = Blockly.utils.xml.textToDomDocument(text);
+  const doc = utilsXml.textToDomDocument(text);
   if (!doc || !doc.documentElement ||
       doc.getElementsByTagName('parsererror').length) {
     throw Error('textToDom was unable to parse: ' + text);
@@ -388,7 +388,7 @@ exports.textToDom = textToDom;
  * Clear the given workspace then decode an XML DOM and
  * create blocks on the workspace.
  * @param {!Element} xml XML DOM.
- * @param {!Blockly.Workspace} workspace The workspace.
+ * @param {!Workspace} workspace The workspace.
  * @return {!Array<string>} An array containing new block IDs.
  */
 const clearWorkspaceAndLoadFromXml = function(xml, workspace) {
@@ -403,7 +403,7 @@ exports.clearWorkspaceAndLoadFromXml = clearWorkspaceAndLoadFromXml;
 /**
  * Decode an XML DOM and create blocks on the workspace.
  * @param {!Element} xml XML DOM.
- * @param {!Blockly.Workspace} workspace The workspace.
+ * @param {!Workspace} workspace The workspace.
  * @return {!Array<string>} An array containing new block IDs.
  * @suppress {strictModuleDepCheck} Suppress module check while workspace
  *     comments are not bundled in.
@@ -424,10 +424,10 @@ const domToWorkspace = function(xml, workspace) {
     width = workspace.getWidth();
   }
   const newBlockIds = [];  // A list of block IDs added by this call.
-  Blockly.utils.dom.startTextWidthCache();
-  const existingGroup = Blockly.Events.getGroup();
+  dom.startTextWidthCache();
+  const existingGroup = Events.getGroup();
   if (!existingGroup) {
-    Blockly.Events.setGroup(true);
+    Events.setGroup(true);
   }
 
   // Disable workspace resizes as an optimization.
@@ -441,7 +441,7 @@ const domToWorkspace = function(xml, workspace) {
       const name = xmlChild.nodeName.toLowerCase();
       const xmlChildElement = /** @type {!Element} */ (xmlChild);
       if (name == 'block' ||
-          (name == 'shadow' && !Blockly.Events.recordUndo)) {
+          (name == 'shadow' && !Events.recordUndo)) {
         // Allow top-level shadow blocks if recordUndo is disabled since
         // that means an undo is in progress.  Such a block is expected
         // to be moved to a nested destination in the next operation.
@@ -491,15 +491,15 @@ const domToWorkspace = function(xml, workspace) {
     }
   } finally {
     if (!existingGroup) {
-      Blockly.Events.setGroup(false);
+      Events.setGroup(false);
     }
-    Blockly.utils.dom.stopTextWidthCache();
+    dom.stopTextWidthCache();
   }
   // Re-enable workspace resizing.
   if (workspace.setResizesEnabled) {
     workspace.setResizesEnabled(true);
   }
-  Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.FINISHED_LOADING))(
+  Events.fire(new (Events.get(Events.FINISHED_LOADING))(
       workspace));
   return newBlockIds;
 };
@@ -509,7 +509,7 @@ exports.domToWorkspace = domToWorkspace;
  * Decode an XML DOM and create blocks on the workspace. Position the new
  * blocks immediately below prior blocks, aligned by their starting edge.
  * @param {!Element} xml The XML DOM.
- * @param {!Blockly.Workspace} workspace The workspace to add to.
+ * @param {!Workspace} workspace The workspace to add to.
  * @return {!Array<string>} An array containing new block IDs.
  */
 const appendDomToWorkspace = function(xml, workspace) {
@@ -559,8 +559,8 @@ exports.appendDomToWorkspace = appendDomToWorkspace;
  * Decode an XML block tag and create a block (and possibly sub blocks) on the
  * workspace.
  * @param {!Element} xmlBlock XML block element.
- * @param {!Blockly.Workspace} workspace The workspace.
- * @return {!Blockly.Block} The root block created.
+ * @param {!Workspace} workspace The workspace.
+ * @return {!Block} The root block created.
  */
 const domToBlock = function(xmlBlock, workspace) {
   if (xmlBlock instanceof goog.module.get('Blockly.Workspace')) {
@@ -573,7 +573,7 @@ const domToBlock = function(xmlBlock, workspace) {
                  'swap the arguments.');
   }
   // Create top-level block.
-  Blockly.Events.disable();
+  Events.disable();
   const variablesBeforeCreation = workspace.getAllVariables();
   let topBlock;
   try {
@@ -607,20 +607,20 @@ const domToBlock = function(xmlBlock, workspace) {
       }
     }
   } finally {
-    Blockly.Events.enable();
+    Events.enable();
   }
-  if (Blockly.Events.isEnabled()) {
+  if (Events.isEnabled()) {
     const newVariables = goog.module.get('Blockly.Variables').getAddedVariables(workspace,
         variablesBeforeCreation);
     // Fire a VarCreate event for each (if any) new variable created.
     for (let i = 0; i < newVariables.length; i++) {
       const thisVariable = newVariables[i];
-      Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.VAR_CREATE))(
+      Events.fire(new (Events.get(Events.VAR_CREATE))(
           thisVariable));
     }
     // Block events come after var events, in case they refer to newly created
     // variables.
-    Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.CREATE))(
+    Events.fire(new (Events.get(Events.CREATE))(
         topBlock));
   }
   return topBlock;
@@ -630,13 +630,13 @@ exports.domToBlock = domToBlock;
 /**
  * Decode an XML list of variables and add the variables to the workspace.
  * @param {!Element} xmlVariables List of XML variable elements.
- * @param {!Blockly.Workspace} workspace The workspace to which the variable
+ * @param {!Workspace} workspace The workspace to which the variable
  *     should be added.
  */
 const domToVariables = function(xmlVariables, workspace) {
   for (let i = 0; i < xmlVariables.childNodes.length; i++) {
     const xmlChild = xmlVariables.childNodes[i];
-    if (xmlChild.nodeType != Blockly.utils.dom.NodeType.ELEMENT_NODE) {
+    if (xmlChild.nodeType != dom.NodeType.ELEMENT_NODE) {
       continue;  // Skip text nodes.
     }
     const type = xmlChild.getAttribute('type');
@@ -675,7 +675,7 @@ const mapSupportedXmlTags_ = function(xmlBlock) {
   };
   for (let i = 0; i < xmlBlock.childNodes.length; i++) {
     const xmlChild = xmlBlock.childNodes[i];
-    if (xmlChild.nodeType == Blockly.utils.dom.NodeType.TEXT_NODE) {
+    if (xmlChild.nodeType == dom.NodeType.TEXT_NODE) {
       // Ignore any text at the <block> level.  It's all whitespace anyway.
       continue;
     }
@@ -685,7 +685,7 @@ const mapSupportedXmlTags_ = function(xmlBlock) {
         break;
       case 'comment':
         if (!goog.module.get('Blockly.Comment')) {
-          console.warn('Missing require for Blockly.Comment, ' +
+          console.warn('Missing require for Comment, ' +
               'ignoring block comment.');
           break;
         }
@@ -718,7 +718,7 @@ const mapSupportedXmlTags_ = function(xmlBlock) {
 /**
  * Applies mutation tag child nodes to the given block.
  * @param {!Array<!Element>} xmlChildren Child nodes.
- * @param {!Blockly.Block} block The block to apply the child nodes on.
+ * @param {!Block} block The block to apply the child nodes on.
  * @return {boolean} True if mutation may have added some elements that need
  *    initialization (requiring initSvg call).
  * @private
@@ -742,7 +742,7 @@ const applyMutationTagNodes_ = function(xmlChildren, block) {
 /**
  * Applies comment tag child nodes to the given block.
  * @param {!Array<!Element>} xmlChildren Child nodes.
- * @param {!Blockly.Block} block The block to apply the child nodes on.
+ * @param {!Block} block The block to apply the child nodes on.
  * @private
  */
 const applyCommentTagNodes_ = function(xmlChildren, block) {
@@ -756,7 +756,7 @@ const applyCommentTagNodes_ = function(xmlChildren, block) {
     block.setCommentText(text);
     block.commentModel.pinned = pinned;
     if (!isNaN(width) && !isNaN(height)) {
-      block.commentModel.size = new Blockly.utils.Size(width, height);
+      block.commentModel.size = new Size(width, height);
     }
 
     if (pinned && block.getCommentIcon && !block.isInFlyout) {
@@ -770,7 +770,7 @@ const applyCommentTagNodes_ = function(xmlChildren, block) {
 /**
  * Applies data tag child nodes to the given block.
  * @param {!Array<!Element>} xmlChildren Child nodes.
- * @param {!Blockly.Block} block The block to apply the child nodes on.
+ * @param {!Block} block The block to apply the child nodes on.
  * @private
  */
 const applyDataTagNodes_ = function(xmlChildren, block) {
@@ -783,7 +783,7 @@ const applyDataTagNodes_ = function(xmlChildren, block) {
 /**
  * Applies field tag child nodes to the given block.
  * @param {!Array<!Element>} xmlChildren Child nodes.
- * @param {!Blockly.Block} block The block to apply the child nodes on.
+ * @param {!Block} block The block to apply the child nodes on.
  * @private
  */
 const applyFieldTagNodes_ = function(xmlChildren, block) {
@@ -805,7 +805,7 @@ const findChildBlocks_ = function(xmlNode) {
   const childBlockInfo = {childBlockElement: null, childShadowElement: null};
   for (let i = 0; i < xmlNode.childNodes.length; i++) {
     const xmlChild = xmlNode.childNodes[i];
-    if (xmlChild.nodeType == Blockly.utils.dom.NodeType.ELEMENT_NODE) {
+    if (xmlChild.nodeType == dom.NodeType.ELEMENT_NODE) {
       if (xmlChild.nodeName.toLowerCase() == 'block') {
         childBlockInfo.childBlockElement = /** @type {!Element} */ (xmlChild);
       } else if (xmlChild.nodeName.toLowerCase() == 'shadow') {
@@ -819,9 +819,9 @@ const findChildBlocks_ = function(xmlNode) {
 /**
  * Applies input child nodes (value or statement) to the given block.
  * @param {!Array<!Element>} xmlChildren Child nodes.
- * @param {!Blockly.Workspace} workspace The workspace containing the given
+ * @param {!Workspace} workspace The workspace containing the given
  *    block.
- * @param {!Blockly.Block} block The block to apply the child nodes on.
+ * @param {!Block} block The block to apply the child nodes on.
  * @param {string} prototypeName The prototype name of the block.
  * @private
  */
@@ -854,9 +854,9 @@ const applyInputTagNodes_ = function(xmlChildren, workspace, block,
 /**
  * Applies next child nodes to the given block.
  * @param {!Array<!Element>} xmlChildren Child nodes.
- * @param {!Blockly.Workspace} workspace The workspace containing the given
+ * @param {!Workspace} workspace The workspace containing the given
  *    block.
- * @param {!Blockly.Block} block The block to apply the child nodes on.
+ * @param {!Block} block The block to apply the child nodes on.
  * @private
  */
 const applyNextTagNodes_ = function(xmlChildren, workspace, block) {
@@ -888,12 +888,12 @@ const applyNextTagNodes_ = function(xmlChildren, workspace, block) {
  * Decode an XML block tag and create a block (and possibly sub blocks) on the
  * workspace.
  * @param {!Element} xmlBlock XML block element.
- * @param {!Blockly.Workspace} workspace The workspace.
- * @param {!Blockly.Connection=} parentConnection The parent connection to
+ * @param {!Workspace} workspace The workspace.
+ * @param {!Connection=} parentConnection The parent connection to
  *    to connect this block to after instantiating.
  * @param {boolean=} connectedToParentNext Whether the provided parent connection
  *    is a next connection, rather than output or statement.
- * @return {!Blockly.Block} The root block created.
+ * @return {!Block} The root block created.
  * @private
  */
 const domToBlockHeadless_ = function(xmlBlock, workspace,
@@ -989,7 +989,7 @@ const domToBlockHeadless_ = function(xmlBlock, workspace,
 
 /**
  * Decode an XML field tag and set the value of that field on the given block.
- * @param {!Blockly.Block} block The block that is currently being deserialized.
+ * @param {!Block} block The block that is currently being deserialized.
  * @param {string} fieldName The name of the field on the block.
  * @param {!Element} xml The field tag to decode.
  * @private

From 1d9371a3bc5ae90168bb0f3c938a34b671040444 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 13:25:05 -0700
Subject: [PATCH 629/833] clang-format core/xml.js

---
 core/xml.js | 106 ++++++++++++++++++++++++++--------------------------
 1 file changed, 54 insertions(+), 52 deletions(-)

diff --git a/core/xml.js b/core/xml.js
index 43e187c58..4ebbe1cda 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -87,8 +87,8 @@ exports.variablesToDom = variablesToDom;
  * Encode a block subtree as XML with XY coordinates.
  * @param {!Block} block The root block to encode.
  * @param {boolean=} opt_noId True if the encoder should skip the block ID.
- * @return {!Element|!DocumentFragment} Tree of XML elements or an empty document
- *     fragment if the block was an insertion marker.
+ * @return {!Element|!DocumentFragment} Tree of XML elements or an empty
+ *     document fragment if the block was an insertion marker.
  */
 const blockToDomWithXY = function(block, opt_noId) {
   if (block.isInsertionMarker()) {  // Skip over insertion markers.
@@ -106,8 +106,8 @@ const blockToDomWithXY = function(block, opt_noId) {
 
   const element = blockToDom(block, opt_noId);
   const xy = block.getRelativeToSurfaceXY();
-  element.setAttribute('x',
-      Math.round(block.workspace.RTL ? width - xy.x : xy.x));
+  element.setAttribute(
+      'x', Math.round(block.workspace.RTL ? width - xy.x : xy.x));
   element.setAttribute('y', Math.round(xy.y));
   return element;
 };
@@ -154,8 +154,8 @@ const allFieldsToDom_ = function(block, element) {
  * Encode a block subtree as XML.
  * @param {!Block} block The root block to encode.
  * @param {boolean=} opt_noId True if the encoder should skip the block ID.
- * @return {!Element|!DocumentFragment} Tree of XML elements or an empty document
- *     fragment if the block was an insertion marker.
+ * @return {!Element|!DocumentFragment} Tree of XML elements or an empty
+ *     document fragment if the block was an insertion marker.
  */
 const blockToDom = function(block, opt_noId) {
   // Skip over insertion markers.
@@ -169,8 +169,7 @@ const blockToDom = function(block, opt_noId) {
     }
   }
 
-  const element =
-      utilsXml.createElement(block.isShadow() ? 'shadow' : 'block');
+  const element = utilsXml.createElement(block.isShadow() ? 'shadow' : 'block');
   element.setAttribute('type', block.type);
   if (!opt_noId) {
     // It's important to use setAttribute here otherwise IE11 won't serialize
@@ -415,8 +414,9 @@ const domToWorkspace = function(xml, workspace) {
     /** @suppress {checkTypes} */
     xml = workspace;
     workspace = swap;
-    console.warn('Deprecated call to domToWorkspace, ' +
-                 'swap the arguments.');
+    console.warn(
+        'Deprecated call to domToWorkspace, ' +
+        'swap the arguments.');
   }
 
   let width;  // Not used in LTR.
@@ -440,17 +440,18 @@ const domToWorkspace = function(xml, workspace) {
       const xmlChild = xml.childNodes[i];
       const name = xmlChild.nodeName.toLowerCase();
       const xmlChildElement = /** @type {!Element} */ (xmlChild);
-      if (name == 'block' ||
-          (name == 'shadow' && !Events.recordUndo)) {
+      if (name == 'block' || (name == 'shadow' && !Events.recordUndo)) {
         // Allow top-level shadow blocks if recordUndo is disabled since
         // that means an undo is in progress.  Such a block is expected
         // to be moved to a nested destination in the next operation.
         const block = domToBlock(xmlChildElement, workspace);
         newBlockIds.push(block.id);
         const blockX = xmlChildElement.hasAttribute('x') ?
-            parseInt(xmlChildElement.getAttribute('x'), 10) : 10;
+            parseInt(xmlChildElement.getAttribute('x'), 10) :
+            10;
         const blockY = xmlChildElement.hasAttribute('y') ?
-            parseInt(xmlChildElement.getAttribute('y'), 10) : 10;
+            parseInt(xmlChildElement.getAttribute('y'), 10) :
+            10;
         if (!isNaN(blockX) && !isNaN(blockY)) {
           block.moveBy(workspace.RTL ? width - blockX : blockX, blockY);
         }
@@ -462,7 +463,8 @@ const domToWorkspace = function(xml, workspace) {
           const WorkspaceCommentSvg =
               goog.module.get('Blockly.WorkspaceCommentSvg');
           if (!WorkspaceCommentSvg) {
-            console.warn('Missing require for Blockly.WorkspaceCommentSvg, ' +
+            console.warn(
+                'Missing require for Blockly.WorkspaceCommentSvg, ' +
                 'ignoring workspace comment.');
           } else {
             WorkspaceCommentSvg.fromXml(
@@ -472,7 +474,8 @@ const domToWorkspace = function(xml, workspace) {
         } else {
           const WorkspaceComment = goog.module.get('Blockly.WorkspaceComment');
           if (!WorkspaceComment) {
-            console.warn('Missing require for Blockly.WorkspaceComment, ' +
+            console.warn(
+                'Missing require for Blockly.WorkspaceComment, ' +
                 'ignoring workspace comment.');
           } else {
             WorkspaceComment.fromXml(xmlChildElement, workspace);
@@ -482,7 +485,8 @@ const domToWorkspace = function(xml, workspace) {
         if (variablesFirst) {
           domToVariables(xmlChildElement, workspace);
         } else {
-          throw Error('\'variables\' tag must exist once before block and ' +
+          throw Error(
+              '\'variables\' tag must exist once before block and ' +
               'shadow tag elements in the workspace XML, but it was found in ' +
               'another location.');
         }
@@ -499,8 +503,7 @@ const domToWorkspace = function(xml, workspace) {
   if (workspace.setResizesEnabled) {
     workspace.setResizesEnabled(true);
   }
-  Events.fire(new (Events.get(Events.FINISHED_LOADING))(
-      workspace));
+  Events.fire(new (Events.get(Events.FINISHED_LOADING))(workspace));
   return newBlockIds;
 };
 exports.domToWorkspace = domToWorkspace;
@@ -522,14 +525,14 @@ const appendDomToWorkspace = function(xml, workspace) {
   // Load the new blocks into the workspace and get the IDs of the new blocks.
   const newBlockIds = domToWorkspace(xml, workspace);
   if (bbox && bbox.top != bbox.bottom) {  // check if any previous block
-    let offsetY = 0;  // offset to add to y of the new block
+    let offsetY = 0;                      // offset to add to y of the new block
     let offsetX = 0;
-    const farY = bbox.bottom;  // bottom position
+    const farY = bbox.bottom;                             // bottom position
     const topX = workspace.RTL ? bbox.right : bbox.left;  // x of bounding box
     // Check position of the new blocks.
-    let newLeftX = Infinity;  // x of top left corner
+    let newLeftX = Infinity;    // x of top left corner
     let newRightX = -Infinity;  // x of top right corner
-    let newY = Infinity;  // y of top corner
+    let newY = Infinity;        // y of top corner
     const ySeparation = 10;
     for (let i = 0; i < newBlockIds.length; i++) {
       const blockXY =
@@ -569,8 +572,9 @@ const domToBlock = function(xmlBlock, workspace) {
     /** @suppress {checkTypes} */
     xmlBlock = /** @type {!Element} */ (workspace);
     workspace = swap;
-    console.warn('Deprecated call to domToBlock, ' +
-                 'swap the arguments.');
+    console.warn(
+        'Deprecated call to domToBlock, ' +
+        'swap the arguments.');
   }
   // Create top-level block.
   Events.disable();
@@ -610,18 +614,17 @@ const domToBlock = function(xmlBlock, workspace) {
     Events.enable();
   }
   if (Events.isEnabled()) {
-    const newVariables = goog.module.get('Blockly.Variables').getAddedVariables(workspace,
-        variablesBeforeCreation);
+    const newVariables =
+        goog.module.get('Blockly.Variables')
+            .getAddedVariables(workspace, variablesBeforeCreation);
     // Fire a VarCreate event for each (if any) new variable created.
     for (let i = 0; i < newVariables.length; i++) {
       const thisVariable = newVariables[i];
-      Events.fire(new (Events.get(Events.VAR_CREATE))(
-          thisVariable));
+      Events.fire(new (Events.get(Events.VAR_CREATE))(thisVariable));
     }
     // Block events come after var events, in case they refer to newly created
     // variables.
-    Events.fire(new (Events.get(Events.CREATE))(
-        topBlock));
+    Events.fire(new (Events.get(Events.CREATE))(topBlock));
   }
   return topBlock;
 };
@@ -669,10 +672,8 @@ let childNodeTagMap;  // eslint-disable-line no-unused-vars
  *    node.
  */
 const mapSupportedXmlTags_ = function(xmlBlock) {
-  const childNodeMap = {
-    mutation: [], comment: [], data: [], field: [], input: [],
-    next: []
-  };
+  const childNodeMap =
+      {mutation: [], comment: [], data: [], field: [], input: [], next: []};
   for (let i = 0; i < xmlBlock.childNodes.length; i++) {
     const xmlChild = xmlBlock.childNodes[i];
     if (xmlChild.nodeType == dom.NodeType.TEXT_NODE) {
@@ -685,7 +686,8 @@ const mapSupportedXmlTags_ = function(xmlBlock) {
         break;
       case 'comment':
         if (!goog.module.get('Blockly.Comment')) {
-          console.warn('Missing require for Comment, ' +
+          console.warn(
+              'Missing require for Comment, ' +
               'ignoring block comment.');
           break;
         }
@@ -825,14 +827,15 @@ const findChildBlocks_ = function(xmlNode) {
  * @param {string} prototypeName The prototype name of the block.
  * @private
  */
-const applyInputTagNodes_ = function(xmlChildren, workspace, block,
-    prototypeName) {
+const applyInputTagNodes_ = function(
+    xmlChildren, workspace, block, prototypeName) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
     const nodeName = xmlChild.getAttribute('name');
     const input = block.getInput(nodeName);
     if (!input) {
-      console.warn('Ignoring non-existent input ' + nodeName + ' in block ' +
+      console.warn(
+          'Ignoring non-existent input ' + nodeName + ' in block ' +
           prototypeName);
       break;
     }
@@ -841,8 +844,8 @@ const applyInputTagNodes_ = function(xmlChildren, workspace, block,
       if (!input.connection) {
         throw TypeError('Input connection does not exist.');
       }
-      domToBlockHeadless_(childBlockInfo.childBlockElement,
-          workspace, input.connection, false);
+      domToBlockHeadless_(
+          childBlockInfo.childBlockElement, workspace, input.connection, false);
     }
     // Set shadow after so we don't create a shadow we delete immediately.
     if (childBlockInfo.childShadowElement) {
@@ -872,8 +875,8 @@ const applyNextTagNodes_ = function(xmlChildren, workspace, block) {
         throw TypeError('Next statement is already connected.');
       }
       // Create child block.
-      domToBlockHeadless_(childBlockInfo.childBlockElement,
-          workspace, block.nextConnection,
+      domToBlockHeadless_(
+          childBlockInfo.childBlockElement, workspace, block.nextConnection,
           true);
     }
     // Set shadow after so we don't create a shadow we delete immediately.
@@ -891,13 +894,14 @@ const applyNextTagNodes_ = function(xmlChildren, workspace, block) {
  * @param {!Workspace} workspace The workspace.
  * @param {!Connection=} parentConnection The parent connection to
  *    to connect this block to after instantiating.
- * @param {boolean=} connectedToParentNext Whether the provided parent connection
+ * @param {boolean=} connectedToParentNext Whether the provided parent
+ *     connection
  *    is a next connection, rather than output or statement.
  * @return {!Block} The root block created.
  * @private
  */
-const domToBlockHeadless_ = function(xmlBlock, workspace,
-    parentConnection, connectedToParentNext) {
+const domToBlockHeadless_ = function(
+    xmlBlock, workspace, parentConnection, connectedToParentNext) {
   let block = null;
   const prototypeName = xmlBlock.getAttribute('type');
   if (!prototypeName) {
@@ -920,8 +924,7 @@ const domToBlockHeadless_ = function(xmlBlock, workspace,
       if (block.previousConnection) {
         parentConnection.connect(block.previousConnection);
       } else {
-        throw TypeError(
-            'Next block does not have previous statement.');
+        throw TypeError('Next block does not have previous statement.');
       }
     } else {
       if (block.outputConnection) {
@@ -936,8 +939,7 @@ const domToBlockHeadless_ = function(xmlBlock, workspace,
   }
 
   applyFieldTagNodes_(xmlChildNameMap.field, block);
-  applyInputTagNodes_(
-      xmlChildNameMap.input, workspace, block, prototypeName);
+  applyInputTagNodes_(xmlChildNameMap.input, workspace, block, prototypeName);
   applyNextTagNodes_(xmlChildNameMap.next, workspace, block);
 
   if (shouldCallInitSvg) {
@@ -997,8 +999,8 @@ const domToBlockHeadless_ = function(xmlBlock, workspace,
 const domToField_ = function(block, fieldName, xml) {
   const field = block.getField(fieldName);
   if (!field) {
-    console.warn('Ignoring non-existent field ' + fieldName + ' in block ' +
-        block.type);
+    console.warn(
+        'Ignoring non-existent field ' + fieldName + ' in block ' + block.type);
     return;
   }
   field.fromXml(xml);

From d1d8863fe8d0cac0193cf65f6a369b8fc6e0956a Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 11 Aug 2021 15:42:02 -0700
Subject: [PATCH 630/833] Rename private methods in core/xml.js

---
 core/xml.js | 72 ++++++++++++++++++++++-------------------------------
 1 file changed, 30 insertions(+), 42 deletions(-)

diff --git a/core/xml.js b/core/xml.js
index 4ebbe1cda..661631d27 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -118,9 +118,8 @@ exports.blockToDomWithXY = blockToDomWithXY;
  * @param {!Field} field The field to encode.
  * @return {?Element} XML element, or null if the field did not need to be
  *     serialized.
- * @private
  */
-const fieldToDom_ = function(field) {
+const fieldToDom = function(field) {
   if (field.isSerializable()) {
     const container = utilsXml.createElement('field');
     container.setAttribute('name', field.name || '');
@@ -135,14 +134,13 @@ const fieldToDom_ = function(field) {
  * @param {!Block} block A block with fields to be encoded.
  * @param {!Element} element The XML element to which the field DOM should be
  *     attached.
- * @private
  */
-const allFieldsToDom_ = function(block, element) {
+const allFieldsToDom = function(block, element) {
   for (let i = 0; i < block.inputList.length; i++) {
     const input = block.inputList[i];
     for (let j = 0; j < input.fieldRow.length; j++) {
       const field = input.fieldRow[j];
-      const fieldDom = fieldToDom_(field);
+      const fieldDom = fieldToDom(field);
       if (fieldDom) {
         element.appendChild(fieldDom);
       }
@@ -184,7 +182,7 @@ const blockToDom = function(block, opt_noId) {
     }
   }
 
-  allFieldsToDom_(block, element);
+  allFieldsToDom(block, element);
 
   const commentText = block.getCommentText();
   if (commentText) {
@@ -221,7 +219,7 @@ const blockToDom = function(block, opt_noId) {
       }
       const shadow = input.connection.getShadowDom();
       if (shadow && (!childBlock || !childBlock.isShadow())) {
-        container.appendChild(cloneShadow_(shadow, opt_noId));
+        container.appendChild(cloneShadow(shadow, opt_noId));
       }
       if (childBlock) {
         const elem = blockToDom(childBlock, opt_noId);
@@ -268,7 +266,7 @@ const blockToDom = function(block, opt_noId) {
   }
   const shadow = block.nextConnection && block.nextConnection.getShadowDom();
   if (shadow && (!nextBlock || !nextBlock.isShadow())) {
-    container.appendChild(cloneShadow_(shadow, opt_noId));
+    container.appendChild(cloneShadow(shadow, opt_noId));
   }
 
   return element;
@@ -280,9 +278,8 @@ exports.blockToDom = blockToDom;
  * @param {!Element} shadow A tree of XML elements.
  * @param {boolean=} opt_noId True if the encoder should skip the block ID.
  * @return {!Element} A tree of XML elements.
- * @private
  */
-const cloneShadow_ = function(shadow, opt_noId) {
+const cloneShadow = function(shadow, opt_noId) {
   shadow = shadow.cloneNode(true);
   // Walk the tree looking for whitespace.  Don't prune whitespace in a tag.
   let node = shadow;
@@ -581,7 +578,7 @@ const domToBlock = function(xmlBlock, workspace) {
   const variablesBeforeCreation = workspace.getAllVariables();
   let topBlock;
   try {
-    topBlock = domToBlockHeadless_(xmlBlock, workspace);
+    topBlock = domToBlockHeadless(xmlBlock, workspace);
     // Generate list of all blocks.
     const blocks = topBlock.getDescendants(false);
     if (workspace.rendered) {
@@ -671,7 +668,7 @@ let childNodeTagMap;  // eslint-disable-line no-unused-vars
  * @return {!childNodeTagMap} The childNode map from nodeName to
  *    node.
  */
-const mapSupportedXmlTags_ = function(xmlBlock) {
+const mapSupportedXmlTags = function(xmlBlock) {
   const childNodeMap =
       {mutation: [], comment: [], data: [], field: [], input: [], next: []};
   for (let i = 0; i < xmlBlock.childNodes.length; i++) {
@@ -723,9 +720,8 @@ const mapSupportedXmlTags_ = function(xmlBlock) {
  * @param {!Block} block The block to apply the child nodes on.
  * @return {boolean} True if mutation may have added some elements that need
  *    initialization (requiring initSvg call).
- * @private
  */
-const applyMutationTagNodes_ = function(xmlChildren, block) {
+const applyMutationTagNodes = function(xmlChildren, block) {
   let shouldCallInitSvg = false;
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
@@ -745,9 +741,8 @@ const applyMutationTagNodes_ = function(xmlChildren, block) {
  * Applies comment tag child nodes to the given block.
  * @param {!Array<!Element>} xmlChildren Child nodes.
  * @param {!Block} block The block to apply the child nodes on.
- * @private
  */
-const applyCommentTagNodes_ = function(xmlChildren, block) {
+const applyCommentTagNodes = function(xmlChildren, block) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
     const text = xmlChild.textContent;
@@ -773,9 +768,8 @@ const applyCommentTagNodes_ = function(xmlChildren, block) {
  * Applies data tag child nodes to the given block.
  * @param {!Array<!Element>} xmlChildren Child nodes.
  * @param {!Block} block The block to apply the child nodes on.
- * @private
  */
-const applyDataTagNodes_ = function(xmlChildren, block) {
+const applyDataTagNodes = function(xmlChildren, block) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
     block.data = xmlChild.textContent;
@@ -786,13 +780,12 @@ const applyDataTagNodes_ = function(xmlChildren, block) {
  * Applies field tag child nodes to the given block.
  * @param {!Array<!Element>} xmlChildren Child nodes.
  * @param {!Block} block The block to apply the child nodes on.
- * @private
  */
-const applyFieldTagNodes_ = function(xmlChildren, block) {
+const applyFieldTagNodes = function(xmlChildren, block) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
     const nodeName = xmlChild.getAttribute('name');
-    domToField_(block, nodeName, xmlChild);
+    domToField(block, nodeName, xmlChild);
   }
 };
 
@@ -801,9 +794,8 @@ const applyFieldTagNodes_ = function(xmlChildren, block) {
  * @param {!Element} xmlNode The XML node to extract child block info from.
  * @return {{childBlockElement: ?Element, childShadowElement: ?Element}} Any
  *    found child block.
- * @private
  */
-const findChildBlocks_ = function(xmlNode) {
+const findChildBlocks = function(xmlNode) {
   const childBlockInfo = {childBlockElement: null, childShadowElement: null};
   for (let i = 0; i < xmlNode.childNodes.length; i++) {
     const xmlChild = xmlNode.childNodes[i];
@@ -825,9 +817,8 @@ const findChildBlocks_ = function(xmlNode) {
  *    block.
  * @param {!Block} block The block to apply the child nodes on.
  * @param {string} prototypeName The prototype name of the block.
- * @private
  */
-const applyInputTagNodes_ = function(
+const applyInputTagNodes = function(
     xmlChildren, workspace, block, prototypeName) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
@@ -839,12 +830,12 @@ const applyInputTagNodes_ = function(
           prototypeName);
       break;
     }
-    const childBlockInfo = findChildBlocks_(xmlChild);
+    const childBlockInfo = findChildBlocks(xmlChild);
     if (childBlockInfo.childBlockElement) {
       if (!input.connection) {
         throw TypeError('Input connection does not exist.');
       }
-      domToBlockHeadless_(
+      domToBlockHeadless(
           childBlockInfo.childBlockElement, workspace, input.connection, false);
     }
     // Set shadow after so we don't create a shadow we delete immediately.
@@ -860,12 +851,11 @@ const applyInputTagNodes_ = function(
  * @param {!Workspace} workspace The workspace containing the given
  *    block.
  * @param {!Block} block The block to apply the child nodes on.
- * @private
  */
-const applyNextTagNodes_ = function(xmlChildren, workspace, block) {
+const applyNextTagNodes = function(xmlChildren, workspace, block) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
-    const childBlockInfo = findChildBlocks_(xmlChild);
+    const childBlockInfo = findChildBlocks(xmlChild);
     if (childBlockInfo.childBlockElement) {
       if (!block.nextConnection) {
         throw TypeError('Next statement does not exist.');
@@ -875,7 +865,7 @@ const applyNextTagNodes_ = function(xmlChildren, workspace, block) {
         throw TypeError('Next statement is already connected.');
       }
       // Create child block.
-      domToBlockHeadless_(
+      domToBlockHeadless(
           childBlockInfo.childBlockElement, workspace, block.nextConnection,
           true);
     }
@@ -898,9 +888,8 @@ const applyNextTagNodes_ = function(xmlChildren, workspace, block) {
  *     connection
  *    is a next connection, rather than output or statement.
  * @return {!Block} The root block created.
- * @private
  */
-const domToBlockHeadless_ = function(
+const domToBlockHeadless = function(
     xmlBlock, workspace, parentConnection, connectedToParentNext) {
   let block = null;
   const prototypeName = xmlBlock.getAttribute('type');
@@ -911,12 +900,12 @@ const domToBlockHeadless_ = function(
   block = workspace.newBlock(prototypeName, id);
 
   // Preprocess childNodes so tags can be processed in a consistent order.
-  const xmlChildNameMap = mapSupportedXmlTags_(xmlBlock);
+  const xmlChildNameMap = mapSupportedXmlTags(xmlBlock);
 
   const shouldCallInitSvg =
-      applyMutationTagNodes_(xmlChildNameMap.mutation, block);
-  applyCommentTagNodes_(xmlChildNameMap.comment, block);
-  applyDataTagNodes_(xmlChildNameMap.data, block);
+      applyMutationTagNodes(xmlChildNameMap.mutation, block);
+  applyCommentTagNodes(xmlChildNameMap.comment, block);
+  applyDataTagNodes(xmlChildNameMap.data, block);
 
   // Connect parent after processing mutation and before setting fields.
   if (parentConnection) {
@@ -938,9 +927,9 @@ const domToBlockHeadless_ = function(
     }
   }
 
-  applyFieldTagNodes_(xmlChildNameMap.field, block);
-  applyInputTagNodes_(xmlChildNameMap.input, workspace, block, prototypeName);
-  applyNextTagNodes_(xmlChildNameMap.next, workspace, block);
+  applyFieldTagNodes(xmlChildNameMap.field, block);
+  applyInputTagNodes(xmlChildNameMap.input, workspace, block, prototypeName);
+  applyNextTagNodes(xmlChildNameMap.next, workspace, block);
 
   if (shouldCallInitSvg) {
     // InitSvg needs to be called after variable fields are loaded.
@@ -994,9 +983,8 @@ const domToBlockHeadless_ = function(
  * @param {!Block} block The block that is currently being deserialized.
  * @param {string} fieldName The name of the field on the block.
  * @param {!Element} xml The field tag to decode.
- * @private
  */
-const domToField_ = function(block, fieldName, xml) {
+const domToField = function(block, fieldName, xml) {
   const field = block.getField(fieldName);
   if (!field) {
     console.warn(

From 5df8752288eacca8d2a301d78c5c85fd8787b31c Mon Sep 17 00:00:00 2001
From: Maribeth Bottorff <maribethb@google.com>
Date: Wed, 11 Aug 2021 17:16:25 -0700
Subject: [PATCH 631/833] fix whitespace

---
 core/bubble.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/bubble.js b/core/bubble.js
index 993565982..dbe10cd1b 100644
--- a/core/bubble.js
+++ b/core/bubble.js
@@ -35,12 +35,10 @@ const dom = goog.require('Blockly.utils.dom');
 const math = goog.require('Blockly.utils.math');
 const userAgent = goog.require('Blockly.utils.userAgent');
 const utils = goog.require('Blockly.utils');
-
 /** @suppress {extraRequire} */
 goog.require('Blockly.Workspace');
 
 
-
 /**
  * Class for UI bubble.
  * @param {!WorkspaceSvg} workspace The workspace on which to draw the

From 10785ba7c089cd4e7eefbc629117dca5aab2d858 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 16:20:37 -0700
Subject: [PATCH 632/833] Migrate core/renderers/zelos/constants.js to ES6
 const/let

---
 core/renderers/zelos/constants.js | 83 ++++++++++++++++---------------
 1 file changed, 43 insertions(+), 40 deletions(-)

diff --git a/core/renderers/zelos/constants.js b/core/renderers/zelos/constants.js
index 2070197cf..df4532d39 100644
--- a/core/renderers/zelos/constants.js
+++ b/core/renderers/zelos/constants.js
@@ -422,7 +422,7 @@ Blockly.zelos.ConstantProvider.prototype.setDynamicProperties_ = function(
   this.SELECTED_GLOW_COLOUR =
       theme.getComponentStyle('selectedGlowColour') ||
       this.SELECTED_GLOW_COLOUR;
-  var selectedGlowSize =
+  const selectedGlowSize =
       Number(theme.getComponentStyle('selectedGlowSize'));
   this.SELECTED_GLOW_SIZE =
       selectedGlowSize && !isNaN(selectedGlowSize) ?
@@ -430,7 +430,7 @@ Blockly.zelos.ConstantProvider.prototype.setDynamicProperties_ = function(
   this.REPLACEMENT_GLOW_COLOUR =
       theme.getComponentStyle('replacementGlowColour') ||
       this.REPLACEMENT_GLOW_COLOUR;
-  var replacementGlowSize =
+  const replacementGlowSize =
       Number(theme.getComponentStyle('replacementGlowSize'));
   this.REPLACEMENT_GLOW_SIZE =
       replacementGlowSize && !isNaN(replacementGlowSize) ?
@@ -454,10 +454,10 @@ Blockly.zelos.ConstantProvider.prototype.dispose = function() {
  * @override
  */
 Blockly.zelos.ConstantProvider.prototype.makeStartHat = function() {
-  var height = this.START_HAT_HEIGHT;
-  var width = this.START_HAT_WIDTH;
+  const height = this.START_HAT_HEIGHT;
+  const width = this.START_HAT_WIDTH;
 
-  var mainPath =
+  const mainPath =
       Blockly.utils.svgPaths.curve('c',
           [
             Blockly.utils.svgPaths.point(25, -height),
@@ -478,7 +478,7 @@ Blockly.zelos.ConstantProvider.prototype.makeStartHat = function() {
  * @package
  */
 Blockly.zelos.ConstantProvider.prototype.makeHexagonal = function() {
-  var maxWidth = this.MAX_DYNAMIC_CONNECTION_SHAPE_WIDTH;
+  const maxWidth = this.MAX_DYNAMIC_CONNECTION_SHAPE_WIDTH;
 
   // The main path for the hexagonal connection shape is made out of two lines.
   // The lines are defined with relative positions and require the block height.
@@ -486,11 +486,11 @@ Blockly.zelos.ConstantProvider.prototype.makeHexagonal = function() {
   // flips.  The 'left' and 'right' versions of the path are also the same, but
   // the X sign flips.
   function makeMainPath(height, up, right) {
-    var halfHeight = height / 2;
-    var width = halfHeight > maxWidth ? maxWidth : halfHeight;
-    var forward = up ? -1 : 1;
-    var direction = right ? -1 : 1;
-    var dy = forward * height / 2;
+    const halfHeight = height / 2;
+    const width = halfHeight > maxWidth ? maxWidth : halfHeight;
+    const forward = up ? -1 : 1;
+    const direction = right ? -1 : 1;
+    const dy = forward * height / 2;
     return Blockly.utils.svgPaths.lineTo(-direction * width, dy) +
         Blockly.utils.svgPaths.lineTo(direction * width, dy);
   }
@@ -499,7 +499,7 @@ Blockly.zelos.ConstantProvider.prototype.makeHexagonal = function() {
     type: this.SHAPES.HEXAGONAL,
     isDynamic: true,
     width: function(height) {
-      var halfHeight = height / 2;
+      const halfHeight = height / 2;
       return halfHeight > maxWidth ? maxWidth : halfHeight;
     },
     height: function(height) {
@@ -533,8 +533,8 @@ Blockly.zelos.ConstantProvider.prototype.makeHexagonal = function() {
  * @package
  */
 Blockly.zelos.ConstantProvider.prototype.makeRounded = function() {
-  var maxWidth = this.MAX_DYNAMIC_CONNECTION_SHAPE_WIDTH;
-  var maxHeight = maxWidth * 2;
+  const maxWidth = this.MAX_DYNAMIC_CONNECTION_SHAPE_WIDTH;
+  const maxHeight = maxWidth * 2;
 
   // The main path for the rounded connection shape is made out of two arcs and
   // a line that joins them.  The arcs are defined with relative positions.
@@ -545,9 +545,10 @@ Blockly.zelos.ConstantProvider.prototype.makeRounded = function() {
   // flips.  The 'up' and 'right' versions of the path flip the sweep-flag
   // which moves the arc at negative angles.
   function makeMainPath(blockHeight, up, right) {
-    var remainingHeight = blockHeight > maxHeight ? blockHeight - maxHeight : 0;
-    var height = blockHeight > maxHeight ? maxHeight : blockHeight;
-    var radius = height / 2;
+    const remainingHeight = blockHeight > maxHeight ? blockHeight - maxHeight
+        : 0;
+    const height = blockHeight > maxHeight ? maxHeight : blockHeight;
+    const radius = height / 2;
     return Blockly.utils.svgPaths.arc('a', '0 0,1', radius,
         Blockly.utils.svgPaths.point((up ? -1 : 1) * radius, (up ? -1 : 1) * radius)) +
       Blockly.utils.svgPaths.lineOnAxis('v', (right ? 1 : -1) * remainingHeight) +
@@ -559,7 +560,7 @@ Blockly.zelos.ConstantProvider.prototype.makeRounded = function() {
     type: this.SHAPES.ROUND,
     isDynamic: true,
     width: function(height) {
-      var halfHeight = height / 2;
+      const halfHeight = height / 2;
       return halfHeight > maxWidth ? maxWidth : halfHeight;
     },
     height: function(height) {
@@ -593,7 +594,7 @@ Blockly.zelos.ConstantProvider.prototype.makeRounded = function() {
  * @package
  */
 Blockly.zelos.ConstantProvider.prototype.makeSquared = function() {
-  var radius = this.CORNER_RADIUS;
+  const radius = this.CORNER_RADIUS;
 
   // The main path for the squared connection shape is made out of two corners
   // and a single line in-between (a and v). These are defined in relative
@@ -602,7 +603,7 @@ Blockly.zelos.ConstantProvider.prototype.makeSquared = function() {
   // flips.  The 'up' and 'down' versions of the path determine where the corner
   // point is placed and in-turn the direction of the corners.
   function makeMainPath(height, up, right) {
-    var innerHeight = height - radius * 2;
+    const innerHeight = height - radius * 2;
     return Blockly.utils.svgPaths.arc('a', '0 0,1', radius,
         Blockly.utils.svgPaths.point((up ? -1 : 1) * radius, (up ? -1 : 1) * radius)) +
       Blockly.utils.svgPaths.lineOnAxis('v', (right ? 1 : -1) * innerHeight) +
@@ -645,14 +646,15 @@ Blockly.zelos.ConstantProvider.prototype.makeSquared = function() {
  */
 Blockly.zelos.ConstantProvider.prototype.shapeFor = function(
     connection) {
-  var checks = connection.getCheck();
+  let checks = connection.getCheck();
   if (!checks && connection.targetConnection) {
     checks = connection.targetConnection.getCheck();
   }
+  let outputShape;
   switch (connection.type) {
     case Blockly.connectionTypes.INPUT_VALUE:
     case Blockly.connectionTypes.OUTPUT_VALUE:
-      var outputShape = connection.getSourceBlock().getOutputShape();
+      outputShape = connection.getSourceBlock().getOutputShape();
       // If the block has an output shape set, use that instead.
       if (outputShape != null) {
         switch (outputShape) {
@@ -684,14 +686,14 @@ Blockly.zelos.ConstantProvider.prototype.shapeFor = function(
  * @override
  */
 Blockly.zelos.ConstantProvider.prototype.makeNotch = function() {
-  var width = this.NOTCH_WIDTH;
-  var height = this.NOTCH_HEIGHT;
+  const width = this.NOTCH_WIDTH;
+  const height = this.NOTCH_HEIGHT;
 
-  var innerWidth = width / 3;
-  var curveWidth = innerWidth / 3;
+  const innerWidth = width / 3;
+  const curveWidth = innerWidth / 3;
 
-  var halfHeight = height / 2;
-  var quarterHeight = halfHeight / 2;
+  const halfHeight = height / 2;
+  const quarterHeight = halfHeight / 2;
 
   function makeMainPath(dir) {
     return (
@@ -739,8 +741,8 @@ Blockly.zelos.ConstantProvider.prototype.makeNotch = function() {
     );
   }
 
-  var pathLeft = makeMainPath(1);
-  var pathRight = makeMainPath(-1);
+  const pathLeft = makeMainPath(1);
+  const pathRight = makeMainPath(-1);
 
   return {
     type: this.SHAPES.NOTCH,
@@ -755,18 +757,19 @@ Blockly.zelos.ConstantProvider.prototype.makeNotch = function() {
  * @override
  */
 Blockly.zelos.ConstantProvider.prototype.makeInsideCorners = function() {
-  var radius = this.CORNER_RADIUS;
+  const radius = this.CORNER_RADIUS;
 
-  var innerTopLeftCorner = Blockly.utils.svgPaths.arc('a', '0 0,0', radius,
+  const innerTopLeftCorner = Blockly.utils.svgPaths.arc('a', '0 0,0', radius,
       Blockly.utils.svgPaths.point(-radius, radius));
 
-  var innerTopRightCorner = Blockly.utils.svgPaths.arc('a', '0 0,1', radius,
+  const innerTopRightCorner = Blockly.utils.svgPaths.arc('a', '0 0,1', radius,
       Blockly.utils.svgPaths.point(-radius, radius));
 
-  var innerBottomLeftCorner = Blockly.utils.svgPaths.arc('a', '0 0,0', radius,
+  const innerBottomLeftCorner = Blockly.utils.svgPaths.arc('a', '0 0,0', radius,
       Blockly.utils.svgPaths.point(radius, radius));
 
-  var innerBottomRightCorner = Blockly.utils.svgPaths.arc('a', '0 0,1', radius,
+  const innerBottomRightCorner = Blockly.utils.svgPaths.arc('a', '0 0,1',
+      radius,
       Blockly.utils.svgPaths.point(radius, radius));
 
   return {
@@ -809,11 +812,11 @@ Blockly.zelos.ConstantProvider.prototype.createDom = function(svg,
     ... filters go here ...
   </defs>
   */
-  var defs = Blockly.utils.dom.createSvgElement(
+  const defs = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.DEFS, {}, svg);
   // Using a dilate distorts the block shape.
   // Instead use a gaussian blur, and then set all alpha to 1 with a transfer.
-  var selectedGlowFilter = Blockly.utils.dom.createSvgElement(
+  const selectedGlowFilter = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.FILTER,
       {
         'id': 'blocklySelectedGlowFilter' + this.randomIdentifier,
@@ -831,7 +834,7 @@ Blockly.zelos.ConstantProvider.prototype.createDom = function(svg,
       },
       selectedGlowFilter);
   // Set all gaussian blur pixels to 1 opacity before applying flood
-  var selectedComponentTransfer = Blockly.utils.dom.createSvgElement(
+  const selectedComponentTransfer = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.FECOMPONENTTRANSFER, {
         'result': 'outBlur'
       }, selectedGlowFilter);
@@ -862,7 +865,7 @@ Blockly.zelos.ConstantProvider.prototype.createDom = function(svg,
 
   // Using a dilate distorts the block shape.
   // Instead use a gaussian blur, and then set all alpha to 1 with a transfer.
-  var replacementGlowFilter = Blockly.utils.dom.createSvgElement(
+  const replacementGlowFilter = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.FILTER,
       {
         'id': 'blocklyReplacementGlowFilter' + this.randomIdentifier,
@@ -880,7 +883,7 @@ Blockly.zelos.ConstantProvider.prototype.createDom = function(svg,
       },
       replacementGlowFilter);
   // Set all gaussian blur pixels to 1 opacity before applying flood
-  var replacementComponentTransfer = Blockly.utils.dom.createSvgElement(
+  const replacementComponentTransfer = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.FECOMPONENTTRANSFER, {
         'result': 'outBlur'
       }, replacementGlowFilter);

From c539c53981278214159a802af5cbaf1c1a7463ae Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 16:20:47 -0700
Subject: [PATCH 633/833] Migrate core/renderers/zelos/constants.js to
 goog.module

---
 core/renderers/zelos/constants.js | 51 ++++++++++++++++---------------
 tests/deps.js                     |  2 +-
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/core/renderers/zelos/constants.js b/core/renderers/zelos/constants.js
index df4532d39..3f9077cb5 100644
--- a/core/renderers/zelos/constants.js
+++ b/core/renderers/zelos/constants.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.zelos.ConstantProvider');
+goog.module('Blockly.zelos.ConstantProvider');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.ConstantProvider');
 goog.require('Blockly.connectionTypes');
@@ -28,8 +29,8 @@ goog.require('Blockly.utils.svgPaths');
  * @package
  * @extends {Blockly.blockRendering.ConstantProvider}
  */
-Blockly.zelos.ConstantProvider = function() {
-  Blockly.zelos.ConstantProvider.superClass_.constructor.call(this);
+const ConstantProvider = function() {
+  ConstantProvider.superClass_.constructor.call(this);
 
   this.GRID_UNIT = 4;
 
@@ -383,14 +384,14 @@ Blockly.zelos.ConstantProvider = function() {
    */
   this.replacementGlowFilter_ = null;
 };
-Blockly.utils.object.inherits(Blockly.zelos.ConstantProvider,
+Blockly.utils.object.inherits(ConstantProvider,
     Blockly.blockRendering.ConstantProvider);
 
 /**
  * @override
  */
-Blockly.zelos.ConstantProvider.prototype.setFontConstants_ = function(theme) {
-  Blockly.zelos.ConstantProvider.superClass_.setFontConstants_.call(this,
+ConstantProvider.prototype.setFontConstants_ = function(theme) {
+  ConstantProvider.superClass_.setFontConstants_.call(this,
       theme);
 
   this.FIELD_BORDER_RECT_HEIGHT = this.FIELD_TEXT_HEIGHT +
@@ -401,8 +402,8 @@ Blockly.zelos.ConstantProvider.prototype.setFontConstants_ = function(theme) {
 /**
  * @override
  */
-Blockly.zelos.ConstantProvider.prototype.init = function() {
-  Blockly.zelos.ConstantProvider.superClass_.init.call(this);
+ConstantProvider.prototype.init = function() {
+  ConstantProvider.superClass_.init.call(this);
   this.HEXAGONAL = this.makeHexagonal();
   this.ROUNDED = this.makeRounded();
   this.SQUARED = this.makeSquared();
@@ -414,9 +415,9 @@ Blockly.zelos.ConstantProvider.prototype.init = function() {
 /**
  * @override
  */
-Blockly.zelos.ConstantProvider.prototype.setDynamicProperties_ = function(
+ConstantProvider.prototype.setDynamicProperties_ = function(
     theme) {
-  Blockly.zelos.ConstantProvider.superClass_.setDynamicProperties_.call(this,
+  ConstantProvider.superClass_.setDynamicProperties_.call(this,
       theme);
 
   this.SELECTED_GLOW_COLOUR =
@@ -440,8 +441,8 @@ Blockly.zelos.ConstantProvider.prototype.setDynamicProperties_ = function(
 /**
  * @override
  */
-Blockly.zelos.ConstantProvider.prototype.dispose = function() {
-  Blockly.zelos.ConstantProvider.superClass_.dispose.call(this);
+ConstantProvider.prototype.dispose = function() {
+  ConstantProvider.superClass_.dispose.call(this);
   if (this.selectedGlowFilter_) {
     Blockly.utils.dom.removeNode(this.selectedGlowFilter_);
   }
@@ -453,7 +454,7 @@ Blockly.zelos.ConstantProvider.prototype.dispose = function() {
 /**
  * @override
  */
-Blockly.zelos.ConstantProvider.prototype.makeStartHat = function() {
+ConstantProvider.prototype.makeStartHat = function() {
   const height = this.START_HAT_HEIGHT;
   const width = this.START_HAT_WIDTH;
 
@@ -477,7 +478,7 @@ Blockly.zelos.ConstantProvider.prototype.makeStartHat = function() {
  *     a hexagonal shape for connections.
  * @package
  */
-Blockly.zelos.ConstantProvider.prototype.makeHexagonal = function() {
+ConstantProvider.prototype.makeHexagonal = function() {
   const maxWidth = this.MAX_DYNAMIC_CONNECTION_SHAPE_WIDTH;
 
   // The main path for the hexagonal connection shape is made out of two lines.
@@ -532,7 +533,7 @@ Blockly.zelos.ConstantProvider.prototype.makeHexagonal = function() {
  *     a rounded shape for connections.
  * @package
  */
-Blockly.zelos.ConstantProvider.prototype.makeRounded = function() {
+ConstantProvider.prototype.makeRounded = function() {
   const maxWidth = this.MAX_DYNAMIC_CONNECTION_SHAPE_WIDTH;
   const maxHeight = maxWidth * 2;
 
@@ -593,7 +594,7 @@ Blockly.zelos.ConstantProvider.prototype.makeRounded = function() {
  *     a squared shape for connections.
  * @package
  */
-Blockly.zelos.ConstantProvider.prototype.makeSquared = function() {
+ConstantProvider.prototype.makeSquared = function() {
   const radius = this.CORNER_RADIUS;
 
   // The main path for the squared connection shape is made out of two corners
@@ -644,7 +645,7 @@ Blockly.zelos.ConstantProvider.prototype.makeSquared = function() {
 /**
  * @override
  */
-Blockly.zelos.ConstantProvider.prototype.shapeFor = function(
+ConstantProvider.prototype.shapeFor = function(
     connection) {
   let checks = connection.getCheck();
   if (!checks && connection.targetConnection) {
@@ -685,7 +686,7 @@ Blockly.zelos.ConstantProvider.prototype.shapeFor = function(
 /**
  * @override
  */
-Blockly.zelos.ConstantProvider.prototype.makeNotch = function() {
+ConstantProvider.prototype.makeNotch = function() {
   const width = this.NOTCH_WIDTH;
   const height = this.NOTCH_HEIGHT;
 
@@ -756,7 +757,7 @@ Blockly.zelos.ConstantProvider.prototype.makeNotch = function() {
 /**
  * @override
  */
-Blockly.zelos.ConstantProvider.prototype.makeInsideCorners = function() {
+ConstantProvider.prototype.makeInsideCorners = function() {
   const radius = this.CORNER_RADIUS;
 
   const innerTopLeftCorner = Blockly.utils.svgPaths.arc('a', '0 0,0', radius,
@@ -787,7 +788,7 @@ Blockly.zelos.ConstantProvider.prototype.makeInsideCorners = function() {
 /**
  * @override
  */
-Blockly.zelos.ConstantProvider.prototype.generateSecondaryColour_ = function(
+ConstantProvider.prototype.generateSecondaryColour_ = function(
     colour) {
   return Blockly.utils.colour.blend('#000', colour, 0.15) || colour;
 };
@@ -795,7 +796,7 @@ Blockly.zelos.ConstantProvider.prototype.generateSecondaryColour_ = function(
 /**
  * @override
  */
-Blockly.zelos.ConstantProvider.prototype.generateTertiaryColour_ = function(
+ConstantProvider.prototype.generateTertiaryColour_ = function(
     colour) {
   return Blockly.utils.colour.blend('#000', colour, 0.25) || colour;
 };
@@ -803,9 +804,9 @@ Blockly.zelos.ConstantProvider.prototype.generateTertiaryColour_ = function(
 /**
  * @override
  */
-Blockly.zelos.ConstantProvider.prototype.createDom = function(svg,
+ConstantProvider.prototype.createDom = function(svg,
     tagName, selector) {
-  Blockly.zelos.ConstantProvider.superClass_.createDom.call(this, svg,
+  ConstantProvider.superClass_.createDom.call(this, svg,
       tagName, selector);
   /*
   <defs>
@@ -923,7 +924,7 @@ Blockly.zelos.ConstantProvider.prototype.createDom = function(svg,
 /**
  * @override
  */
-Blockly.zelos.ConstantProvider.prototype.getCSS_ = function(selector) {
+ConstantProvider.prototype.getCSS_ = function(selector) {
   return [
     /* eslint-disable indent */
     // Text.
@@ -1005,3 +1006,5 @@ Blockly.zelos.ConstantProvider.prototype.getCSS_ = function(selector) {
     /* eslint-enable indent */
   ];
 };
+
+exports = ConstantProvider;
diff --git a/tests/deps.js b/tests/deps.js
index d11d3833e..dbce55866 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -163,7 +163,7 @@ goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimali
 goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos', 'Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es5'});
+goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.zelos.RenderInfo']);
 goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos', 'Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow']);
 goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom']);

From d2267e9533cd6e9f6d9efd5e1cac93e2fd326c68 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 11 Aug 2021 14:00:40 -0700
Subject: [PATCH 634/833] Migrate core/renderers/zelos/constants.js named
 requires

---
 core/renderers/zelos/constants.js | 190 +++++++++++++++---------------
 1 file changed, 93 insertions(+), 97 deletions(-)

diff --git a/core/renderers/zelos/constants.js b/core/renderers/zelos/constants.js
index 3f9077cb5..e00ec1f78 100644
--- a/core/renderers/zelos/constants.js
+++ b/core/renderers/zelos/constants.js
@@ -14,20 +14,20 @@
 goog.module('Blockly.zelos.ConstantProvider');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.ConstantProvider');
-goog.require('Blockly.connectionTypes');
-goog.require('Blockly.utils.colour');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.svgPaths');
+const BaseConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider');
+const Svg = goog.require('Blockly.utils.Svg');
+const connectionTypes = goog.require('Blockly.connectionTypes');
+const dom = goog.require('Blockly.utils.dom');
+const object = goog.require('Blockly.utils.object');
+const svgPaths = goog.require('Blockly.utils.svgPaths');
+const utilsColour = goog.require('Blockly.utils.colour');
 
 
 /**
  * An object that provides constants for rendering blocks in Zelos mode.
  * @constructor
  * @package
- * @extends {Blockly.blockRendering.ConstantProvider}
+ * @extends {BaseConstantProvider}
  */
 const ConstantProvider = function() {
   ConstantProvider.superClass_.constructor.call(this);
@@ -384,8 +384,7 @@ const ConstantProvider = function() {
    */
   this.replacementGlowFilter_ = null;
 };
-Blockly.utils.object.inherits(ConstantProvider,
-    Blockly.blockRendering.ConstantProvider);
+object.inherits(ConstantProvider, BaseConstantProvider);
 
 /**
  * @override
@@ -444,10 +443,10 @@ ConstantProvider.prototype.setDynamicProperties_ = function(
 ConstantProvider.prototype.dispose = function() {
   ConstantProvider.superClass_.dispose.call(this);
   if (this.selectedGlowFilter_) {
-    Blockly.utils.dom.removeNode(this.selectedGlowFilter_);
+    dom.removeNode(this.selectedGlowFilter_);
   }
   if (this.replacementGlowFilter_) {
-    Blockly.utils.dom.removeNode(this.replacementGlowFilter_);
+    dom.removeNode(this.replacementGlowFilter_);
   }
 };
 
@@ -459,11 +458,11 @@ ConstantProvider.prototype.makeStartHat = function() {
   const width = this.START_HAT_WIDTH;
 
   const mainPath =
-      Blockly.utils.svgPaths.curve('c',
+      svgPaths.curve('c',
           [
-            Blockly.utils.svgPaths.point(25, -height),
-            Blockly.utils.svgPaths.point(71, -height),
-            Blockly.utils.svgPaths.point(width, 0)
+            svgPaths.point(25, -height),
+            svgPaths.point(71, -height),
+            svgPaths.point(width, 0)
           ]);
   return {
     height: height,
@@ -492,8 +491,8 @@ ConstantProvider.prototype.makeHexagonal = function() {
     const forward = up ? -1 : 1;
     const direction = right ? -1 : 1;
     const dy = forward * height / 2;
-    return Blockly.utils.svgPaths.lineTo(-direction * width, dy) +
-        Blockly.utils.svgPaths.lineTo(direction * width, dy);
+    return svgPaths.lineTo(-direction * width, dy) +
+        svgPaths.lineTo(direction * width, dy);
   }
 
   return {
@@ -550,11 +549,11 @@ ConstantProvider.prototype.makeRounded = function() {
         : 0;
     const height = blockHeight > maxHeight ? maxHeight : blockHeight;
     const radius = height / 2;
-    return Blockly.utils.svgPaths.arc('a', '0 0,1', radius,
-        Blockly.utils.svgPaths.point((up ? -1 : 1) * radius, (up ? -1 : 1) * radius)) +
-      Blockly.utils.svgPaths.lineOnAxis('v', (right ? 1 : -1) * remainingHeight) +
-      Blockly.utils.svgPaths.arc('a', '0 0,1', radius,
-          Blockly.utils.svgPaths.point((up ? 1 : -1) * radius, (up ? -1 : 1) * radius));
+    return svgPaths.arc('a', '0 0,1', radius,
+        svgPaths.point((up ? -1 : 1) * radius, (up ? -1 : 1) * radius)) +
+      svgPaths.lineOnAxis('v', (right ? 1 : -1) * remainingHeight) +
+      svgPaths.arc('a', '0 0,1', radius,
+          svgPaths.point((up ? 1 : -1) * radius, (up ? -1 : 1) * radius));
   }
 
   return {
@@ -605,11 +604,11 @@ ConstantProvider.prototype.makeSquared = function() {
   // point is placed and in-turn the direction of the corners.
   function makeMainPath(height, up, right) {
     const innerHeight = height - radius * 2;
-    return Blockly.utils.svgPaths.arc('a', '0 0,1', radius,
-        Blockly.utils.svgPaths.point((up ? -1 : 1) * radius, (up ? -1 : 1) * radius)) +
-      Blockly.utils.svgPaths.lineOnAxis('v', (right ? 1 : -1) * innerHeight) +
-      Blockly.utils.svgPaths.arc('a', '0 0,1', radius,
-          Blockly.utils.svgPaths.point((up ? 1 : -1) * radius, (up ? -1 : 1) * radius));
+    return svgPaths.arc('a', '0 0,1', radius,
+        svgPaths.point((up ? -1 : 1) * radius, (up ? -1 : 1) * radius)) +
+      svgPaths.lineOnAxis('v', (right ? 1 : -1) * innerHeight) +
+      svgPaths.arc('a', '0 0,1', radius,
+          svgPaths.point((up ? 1 : -1) * radius, (up ? -1 : 1) * radius));
   }
 
   return {
@@ -653,8 +652,8 @@ ConstantProvider.prototype.shapeFor = function(
   }
   let outputShape;
   switch (connection.type) {
-    case Blockly.connectionTypes.INPUT_VALUE:
-    case Blockly.connectionTypes.OUTPUT_VALUE:
+    case connectionTypes.INPUT_VALUE:
+    case connectionTypes.OUTPUT_VALUE:
       outputShape = connection.getSourceBlock().getOutputShape();
       // If the block has an output shape set, use that instead.
       if (outputShape != null) {
@@ -675,8 +674,8 @@ ConstantProvider.prototype.shapeFor = function(
         return this.ROUNDED;
       }
       return this.ROUNDED;
-    case Blockly.connectionTypes.PREVIOUS_STATEMENT:
-    case Blockly.connectionTypes.NEXT_STATEMENT:
+    case connectionTypes.PREVIOUS_STATEMENT:
+    case connectionTypes.NEXT_STATEMENT:
       return this.NOTCH;
     default:
       throw Error('Unknown type');
@@ -698,45 +697,45 @@ ConstantProvider.prototype.makeNotch = function() {
 
   function makeMainPath(dir) {
     return (
-      Blockly.utils.svgPaths.curve('c', [
-        Blockly.utils.svgPaths.point(dir * curveWidth / 2,
+      svgPaths.curve('c', [
+        svgPaths.point(dir * curveWidth / 2,
             0),
-        Blockly.utils.svgPaths.point(dir * curveWidth * 3 / 4,
+        svgPaths.point(dir * curveWidth * 3 / 4,
             quarterHeight / 2),
-        Blockly.utils.svgPaths.point(dir * curveWidth,
+        svgPaths.point(dir * curveWidth,
             quarterHeight)
       ]) +
-      Blockly.utils.svgPaths.line([
-        Blockly.utils.svgPaths.point(dir * curveWidth,
+      svgPaths.line([
+        svgPaths.point(dir * curveWidth,
             halfHeight)
       ]) +
-      Blockly.utils.svgPaths.curve('c', [
-        Blockly.utils.svgPaths.point(dir * curveWidth / 4,
+      svgPaths.curve('c', [
+        svgPaths.point(dir * curveWidth / 4,
             quarterHeight / 2),
-        Blockly.utils.svgPaths.point(dir * curveWidth / 2,
+        svgPaths.point(dir * curveWidth / 2,
             quarterHeight),
-        Blockly.utils.svgPaths.point(dir * curveWidth,
+        svgPaths.point(dir * curveWidth,
             quarterHeight)
       ]) +
-      Blockly.utils.svgPaths.lineOnAxis('h', dir * innerWidth) +
-      Blockly.utils.svgPaths.curve('c', [
-        Blockly.utils.svgPaths.point(dir * curveWidth / 2,
+      svgPaths.lineOnAxis('h', dir * innerWidth) +
+      svgPaths.curve('c', [
+        svgPaths.point(dir * curveWidth / 2,
             0),
-        Blockly.utils.svgPaths.point(dir * curveWidth * 3 / 4,
+        svgPaths.point(dir * curveWidth * 3 / 4,
             -(quarterHeight / 2)),
-        Blockly.utils.svgPaths.point(dir * curveWidth,
+        svgPaths.point(dir * curveWidth,
             -quarterHeight)
       ]) +
-      Blockly.utils.svgPaths.line([
-        Blockly.utils.svgPaths.point(dir * curveWidth,
+      svgPaths.line([
+        svgPaths.point(dir * curveWidth,
             -halfHeight)
       ]) +
-      Blockly.utils.svgPaths.curve('c', [
-        Blockly.utils.svgPaths.point(dir * curveWidth / 4,
+      svgPaths.curve('c', [
+        svgPaths.point(dir * curveWidth / 4,
             -(quarterHeight / 2)),
-        Blockly.utils.svgPaths.point(dir * curveWidth / 2,
+        svgPaths.point(dir * curveWidth / 2,
             -quarterHeight),
-        Blockly.utils.svgPaths.point(dir * curveWidth,
+        svgPaths.point(dir * curveWidth,
             -quarterHeight)
       ])
     );
@@ -760,18 +759,18 @@ ConstantProvider.prototype.makeNotch = function() {
 ConstantProvider.prototype.makeInsideCorners = function() {
   const radius = this.CORNER_RADIUS;
 
-  const innerTopLeftCorner = Blockly.utils.svgPaths.arc('a', '0 0,0', radius,
-      Blockly.utils.svgPaths.point(-radius, radius));
+  const innerTopLeftCorner = svgPaths.arc('a', '0 0,0', radius,
+      svgPaths.point(-radius, radius));
 
-  const innerTopRightCorner = Blockly.utils.svgPaths.arc('a', '0 0,1', radius,
-      Blockly.utils.svgPaths.point(-radius, radius));
+  const innerTopRightCorner = svgPaths.arc('a', '0 0,1', radius,
+      svgPaths.point(-radius, radius));
 
-  const innerBottomLeftCorner = Blockly.utils.svgPaths.arc('a', '0 0,0', radius,
-      Blockly.utils.svgPaths.point(radius, radius));
+  const innerBottomLeftCorner = svgPaths.arc('a', '0 0,0', radius,
+      svgPaths.point(radius, radius));
 
-  const innerBottomRightCorner = Blockly.utils.svgPaths.arc('a', '0 0,1',
+  const innerBottomRightCorner = svgPaths.arc('a', '0 0,1',
       radius,
-      Blockly.utils.svgPaths.point(radius, radius));
+      svgPaths.point(radius, radius));
 
   return {
     width: radius,
@@ -788,24 +787,21 @@ ConstantProvider.prototype.makeInsideCorners = function() {
 /**
  * @override
  */
-ConstantProvider.prototype.generateSecondaryColour_ = function(
-    colour) {
-  return Blockly.utils.colour.blend('#000', colour, 0.15) || colour;
+ConstantProvider.prototype.generateSecondaryColour_ = function(colour) {
+  return utilsColour.blend('#000', colour, 0.15) || colour;
 };
 
 /**
  * @override
  */
-ConstantProvider.prototype.generateTertiaryColour_ = function(
-    colour) {
-  return Blockly.utils.colour.blend('#000', colour, 0.25) || colour;
+ConstantProvider.prototype.generateTertiaryColour_ = function(colour) {
+  return utilsColour.blend('#000', colour, 0.25) || colour;
 };
 
 /**
  * @override
  */
-ConstantProvider.prototype.createDom = function(svg,
-    tagName, selector) {
+ConstantProvider.prototype.createDom = function(svg, tagName, selector) {
   ConstantProvider.superClass_.createDom.call(this, svg,
       tagName, selector);
   /*
@@ -813,12 +809,12 @@ ConstantProvider.prototype.createDom = function(svg,
     ... filters go here ...
   </defs>
   */
-  const defs = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.DEFS, {}, svg);
+  const defs = dom.createSvgElement(
+      Svg.DEFS, {}, svg);
   // Using a dilate distorts the block shape.
   // Instead use a gaussian blur, and then set all alpha to 1 with a transfer.
-  const selectedGlowFilter = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FILTER,
+  const selectedGlowFilter = dom.createSvgElement(
+      Svg.FILTER,
       {
         'id': 'blocklySelectedGlowFilter' + this.randomIdentifier,
         'height': '160%',
@@ -827,35 +823,35 @@ ConstantProvider.prototype.createDom = function(svg,
         x: '-40%'
       },
       defs);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FEGAUSSIANBLUR,
+  dom.createSvgElement(
+      Svg.FEGAUSSIANBLUR,
       {
         'in': 'SourceGraphic',
         'stdDeviation': this.SELECTED_GLOW_SIZE
       },
       selectedGlowFilter);
   // Set all gaussian blur pixels to 1 opacity before applying flood
-  const selectedComponentTransfer = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FECOMPONENTTRANSFER, {
+  const selectedComponentTransfer = dom.createSvgElement(
+      Svg.FECOMPONENTTRANSFER, {
         'result': 'outBlur'
       }, selectedGlowFilter);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FEFUNCA,
+  dom.createSvgElement(
+      Svg.FEFUNCA,
       {
         'type': 'table', 'tableValues': '0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1'
       },
       selectedComponentTransfer);
   // Color the highlight
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FEFLOOD,
+  dom.createSvgElement(
+      Svg.FEFLOOD,
       {
         'flood-color': this.SELECTED_GLOW_COLOUR,
         'flood-opacity': 1,
         'result': 'outColor'
       },
       selectedGlowFilter);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FECOMPOSITE,
+  dom.createSvgElement(
+      Svg.FECOMPOSITE,
       {
         'in': 'outColor', 'in2': 'outBlur',
         'operator': 'in', 'result': 'outGlow'
@@ -866,8 +862,8 @@ ConstantProvider.prototype.createDom = function(svg,
 
   // Using a dilate distorts the block shape.
   // Instead use a gaussian blur, and then set all alpha to 1 with a transfer.
-  const replacementGlowFilter = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FILTER,
+  const replacementGlowFilter = dom.createSvgElement(
+      Svg.FILTER,
       {
         'id': 'blocklyReplacementGlowFilter' + this.randomIdentifier,
         'height': '160%',
@@ -876,42 +872,42 @@ ConstantProvider.prototype.createDom = function(svg,
         x: '-40%'
       },
       defs);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FEGAUSSIANBLUR,
+  dom.createSvgElement(
+      Svg.FEGAUSSIANBLUR,
       {
         'in': 'SourceGraphic',
         'stdDeviation': this.REPLACEMENT_GLOW_SIZE
       },
       replacementGlowFilter);
   // Set all gaussian blur pixels to 1 opacity before applying flood
-  const replacementComponentTransfer = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FECOMPONENTTRANSFER, {
+  const replacementComponentTransfer = dom.createSvgElement(
+      Svg.FECOMPONENTTRANSFER, {
         'result': 'outBlur'
       }, replacementGlowFilter);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FEFUNCA,
+  dom.createSvgElement(
+      Svg.FEFUNCA,
       {
         'type': 'table', 'tableValues': '0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1'
       },
       replacementComponentTransfer);
   // Color the highlight
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FEFLOOD,
+  dom.createSvgElement(
+      Svg.FEFLOOD,
       {
         'flood-color': this.REPLACEMENT_GLOW_COLOUR,
         'flood-opacity': 1,
         'result': 'outColor'
       },
       replacementGlowFilter);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FECOMPOSITE,
+  dom.createSvgElement(
+      Svg.FECOMPOSITE,
       {
         'in': 'outColor', 'in2': 'outBlur',
         'operator': 'in', 'result': 'outGlow'
       },
       replacementGlowFilter);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FECOMPOSITE,
+  dom.createSvgElement(
+      Svg.FECOMPOSITE,
       {
         'in': 'SourceGraphic', 'in2': 'outGlow',
         'operator': 'over',

From 9411c812f41ebd80c809ceb2b07ccadf54f96b7a Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 11 Aug 2021 14:01:02 -0700
Subject: [PATCH 635/833] clang-format core/renderers/zelos/constants.js

---
 core/renderers/zelos/constants.js | 327 ++++++++++++------------------
 1 file changed, 133 insertions(+), 194 deletions(-)

diff --git a/core/renderers/zelos/constants.js b/core/renderers/zelos/constants.js
index e00ec1f78..2c6a2971f 100644
--- a/core/renderers/zelos/constants.js
+++ b/core/renderers/zelos/constants.js
@@ -196,13 +196,7 @@ const ConstantProvider = function() {
    * @enum {number}
    * @override
    */
-  this.SHAPES = {
-    HEXAGONAL: 1,
-    ROUND: 2,
-    SQUARE: 3,
-    PUZZLE: 4,
-    NOTCH: 5
-  };
+  this.SHAPES = {HEXAGONAL: 1, ROUND: 2, SQUARE: 3, PUZZLE: 4, NOTCH: 5};
 
   /**
    * Map of output/input shapes and the amount they should cause a block to be
@@ -213,19 +207,22 @@ const ConstantProvider = function() {
    * @package
    */
   this.SHAPE_IN_SHAPE_PADDING = {
-    1: {  // Outer shape: hexagon.
+    1: {
+      // Outer shape: hexagon.
       0: 5 * this.GRID_UNIT,  // Field in hexagon.
       1: 2 * this.GRID_UNIT,  // Hexagon in hexagon.
       2: 5 * this.GRID_UNIT,  // Round in hexagon.
       3: 5 * this.GRID_UNIT   // Square in hexagon.
     },
-    2: {  // Outer shape: round.
+    2: {
+      // Outer shape: round.
       0: 3 * this.GRID_UNIT,  // Field in round.
       1: 3 * this.GRID_UNIT,  // Hexagon in round.
       2: 1 * this.GRID_UNIT,  // Round in round.
       3: 2 * this.GRID_UNIT   // Square in round.
     },
-    3: {  // Outer shape: square.
+    3: {
+      // Outer shape: square.
       0: 2 * this.GRID_UNIT,  // Field in square.
       1: 2 * this.GRID_UNIT,  // Hexagon in square.
       2: 2 * this.GRID_UNIT,  // Round in square.
@@ -252,7 +249,7 @@ const ConstantProvider = function() {
    * @override
    */
   this.FIELD_TEXT_FONTFAMILY =
-    '"Helvetica Neue", "Segoe UI", Helvetica, sans-serif';
+      '"Helvetica Neue", "Segoe UI", Helvetica, sans-serif';
 
   /**
    * @override
@@ -390,11 +387,10 @@ object.inherits(ConstantProvider, BaseConstantProvider);
  * @override
  */
 ConstantProvider.prototype.setFontConstants_ = function(theme) {
-  ConstantProvider.superClass_.setFontConstants_.call(this,
-      theme);
+  ConstantProvider.superClass_.setFontConstants_.call(this, theme);
 
-  this.FIELD_BORDER_RECT_HEIGHT = this.FIELD_TEXT_HEIGHT +
-      this.FIELD_BORDER_RECT_Y_PADDING * 2;
+  this.FIELD_BORDER_RECT_HEIGHT =
+      this.FIELD_TEXT_HEIGHT + this.FIELD_BORDER_RECT_Y_PADDING * 2;
   this.FIELD_DROPDOWN_BORDER_RECT_HEIGHT = this.FIELD_BORDER_RECT_HEIGHT;
 };
 
@@ -407,26 +403,22 @@ ConstantProvider.prototype.init = function() {
   this.ROUNDED = this.makeRounded();
   this.SQUARED = this.makeSquared();
 
-  this.STATEMENT_INPUT_NOTCH_OFFSET = this.NOTCH_OFFSET_LEFT +
-      this.INSIDE_CORNERS.rightWidth;
+  this.STATEMENT_INPUT_NOTCH_OFFSET =
+      this.NOTCH_OFFSET_LEFT + this.INSIDE_CORNERS.rightWidth;
 };
 
 /**
  * @override
  */
-ConstantProvider.prototype.setDynamicProperties_ = function(
-    theme) {
-  ConstantProvider.superClass_.setDynamicProperties_.call(this,
-      theme);
+ConstantProvider.prototype.setDynamicProperties_ = function(theme) {
+  ConstantProvider.superClass_.setDynamicProperties_.call(this, theme);
 
-  this.SELECTED_GLOW_COLOUR =
-      theme.getComponentStyle('selectedGlowColour') ||
+  this.SELECTED_GLOW_COLOUR = theme.getComponentStyle('selectedGlowColour') ||
       this.SELECTED_GLOW_COLOUR;
-  const selectedGlowSize =
-      Number(theme.getComponentStyle('selectedGlowSize'));
-  this.SELECTED_GLOW_SIZE =
-      selectedGlowSize && !isNaN(selectedGlowSize) ?
-      selectedGlowSize : this.SELECTED_GLOW_SIZE;
+  const selectedGlowSize = Number(theme.getComponentStyle('selectedGlowSize'));
+  this.SELECTED_GLOW_SIZE = selectedGlowSize && !isNaN(selectedGlowSize) ?
+      selectedGlowSize :
+      this.SELECTED_GLOW_SIZE;
   this.REPLACEMENT_GLOW_COLOUR =
       theme.getComponentStyle('replacementGlowColour') ||
       this.REPLACEMENT_GLOW_COLOUR;
@@ -434,7 +426,8 @@ ConstantProvider.prototype.setDynamicProperties_ = function(
       Number(theme.getComponentStyle('replacementGlowSize'));
   this.REPLACEMENT_GLOW_SIZE =
       replacementGlowSize && !isNaN(replacementGlowSize) ?
-      replacementGlowSize : this.REPLACEMENT_GLOW_SIZE;
+      replacementGlowSize :
+      this.REPLACEMENT_GLOW_SIZE;
 };
 
 /**
@@ -457,18 +450,11 @@ ConstantProvider.prototype.makeStartHat = function() {
   const height = this.START_HAT_HEIGHT;
   const width = this.START_HAT_WIDTH;
 
-  const mainPath =
-      svgPaths.curve('c',
-          [
-            svgPaths.point(25, -height),
-            svgPaths.point(71, -height),
-            svgPaths.point(width, 0)
-          ]);
-  return {
-    height: height,
-    width: width,
-    path: mainPath
-  };
+  const mainPath = svgPaths.curve('c', [
+    svgPaths.point(25, -height), svgPaths.point(71, -height),
+    svgPaths.point(width, 0)
+  ]);
+  return {height: height, width: width, path: mainPath};
 };
 
 /**
@@ -509,7 +495,7 @@ ConstantProvider.prototype.makeHexagonal = function() {
       return connectionHeight / 2;
     },
     connectionOffsetX: function(connectionWidth) {
-      return - connectionWidth;
+      return -connectionWidth;
     },
     pathDown: function(height) {
       return makeMainPath(height, false, false);
@@ -545,15 +531,17 @@ ConstantProvider.prototype.makeRounded = function() {
   // flips.  The 'up' and 'right' versions of the path flip the sweep-flag
   // which moves the arc at negative angles.
   function makeMainPath(blockHeight, up, right) {
-    const remainingHeight = blockHeight > maxHeight ? blockHeight - maxHeight
-        : 0;
+    const remainingHeight =
+        blockHeight > maxHeight ? blockHeight - maxHeight : 0;
     const height = blockHeight > maxHeight ? maxHeight : blockHeight;
     const radius = height / 2;
-    return svgPaths.arc('a', '0 0,1', radius,
-        svgPaths.point((up ? -1 : 1) * radius, (up ? -1 : 1) * radius)) +
-      svgPaths.lineOnAxis('v', (right ? 1 : -1) * remainingHeight) +
-      svgPaths.arc('a', '0 0,1', radius,
-          svgPaths.point((up ? 1 : -1) * radius, (up ? -1 : 1) * radius));
+    return svgPaths.arc(
+               'a', '0 0,1', radius,
+               svgPaths.point((up ? -1 : 1) * radius, (up ? -1 : 1) * radius)) +
+        svgPaths.lineOnAxis('v', (right ? 1 : -1) * remainingHeight) +
+        svgPaths.arc(
+            'a', '0 0,1', radius,
+            svgPaths.point((up ? 1 : -1) * radius, (up ? -1 : 1) * radius));
   }
 
   return {
@@ -570,7 +558,7 @@ ConstantProvider.prototype.makeRounded = function() {
       return connectionHeight / 2;
     },
     connectionOffsetX: function(connectionWidth) {
-      return - connectionWidth;
+      return -connectionWidth;
     },
     pathDown: function(height) {
       return makeMainPath(height, false, false);
@@ -604,11 +592,13 @@ ConstantProvider.prototype.makeSquared = function() {
   // point is placed and in-turn the direction of the corners.
   function makeMainPath(height, up, right) {
     const innerHeight = height - radius * 2;
-    return svgPaths.arc('a', '0 0,1', radius,
-        svgPaths.point((up ? -1 : 1) * radius, (up ? -1 : 1) * radius)) +
-      svgPaths.lineOnAxis('v', (right ? 1 : -1) * innerHeight) +
-      svgPaths.arc('a', '0 0,1', radius,
-          svgPaths.point((up ? 1 : -1) * radius, (up ? -1 : 1) * radius));
+    return svgPaths.arc(
+               'a', '0 0,1', radius,
+               svgPaths.point((up ? -1 : 1) * radius, (up ? -1 : 1) * radius)) +
+        svgPaths.lineOnAxis('v', (right ? 1 : -1) * innerHeight) +
+        svgPaths.arc(
+            'a', '0 0,1', radius,
+            svgPaths.point((up ? 1 : -1) * radius, (up ? -1 : 1) * radius));
   }
 
   return {
@@ -624,7 +614,7 @@ ConstantProvider.prototype.makeSquared = function() {
       return connectionHeight / 2;
     },
     connectionOffsetX: function(connectionWidth) {
-      return - connectionWidth;
+      return -connectionWidth;
     },
     pathDown: function(height) {
       return makeMainPath(height, false, false);
@@ -644,8 +634,7 @@ ConstantProvider.prototype.makeSquared = function() {
 /**
  * @override
  */
-ConstantProvider.prototype.shapeFor = function(
-    connection) {
+ConstantProvider.prototype.shapeFor = function(connection) {
   let checks = connection.getCheck();
   if (!checks && connection.targetConnection) {
     checks = connection.targetConnection.getCheck();
@@ -658,9 +647,12 @@ ConstantProvider.prototype.shapeFor = function(
       // If the block has an output shape set, use that instead.
       if (outputShape != null) {
         switch (outputShape) {
-          case this.SHAPES.HEXAGONAL: return this.HEXAGONAL;
-          case this.SHAPES.ROUND: return this.ROUNDED;
-          case this.SHAPES.SQUARE: return this.SQUARED;
+          case this.SHAPES.HEXAGONAL:
+            return this.HEXAGONAL;
+          case this.SHAPES.ROUND:
+            return this.ROUNDED;
+          case this.SHAPES.SQUARE:
+            return this.SQUARED;
         }
       }
       // Includes doesn't work in IE.
@@ -697,48 +689,35 @@ ConstantProvider.prototype.makeNotch = function() {
 
   function makeMainPath(dir) {
     return (
-      svgPaths.curve('c', [
-        svgPaths.point(dir * curveWidth / 2,
-            0),
-        svgPaths.point(dir * curveWidth * 3 / 4,
-            quarterHeight / 2),
-        svgPaths.point(dir * curveWidth,
-            quarterHeight)
-      ]) +
-      svgPaths.line([
-        svgPaths.point(dir * curveWidth,
-            halfHeight)
-      ]) +
-      svgPaths.curve('c', [
-        svgPaths.point(dir * curveWidth / 4,
-            quarterHeight / 2),
-        svgPaths.point(dir * curveWidth / 2,
-            quarterHeight),
-        svgPaths.point(dir * curveWidth,
-            quarterHeight)
-      ]) +
-      svgPaths.lineOnAxis('h', dir * innerWidth) +
-      svgPaths.curve('c', [
-        svgPaths.point(dir * curveWidth / 2,
-            0),
-        svgPaths.point(dir * curveWidth * 3 / 4,
-            -(quarterHeight / 2)),
-        svgPaths.point(dir * curveWidth,
-            -quarterHeight)
-      ]) +
-      svgPaths.line([
-        svgPaths.point(dir * curveWidth,
-            -halfHeight)
-      ]) +
-      svgPaths.curve('c', [
-        svgPaths.point(dir * curveWidth / 4,
-            -(quarterHeight / 2)),
-        svgPaths.point(dir * curveWidth / 2,
-            -quarterHeight),
-        svgPaths.point(dir * curveWidth,
-            -quarterHeight)
-      ])
-    );
+        svgPaths.curve(
+            'c',
+            [
+              svgPaths.point(dir * curveWidth / 2, 0),
+              svgPaths.point(dir * curveWidth * 3 / 4, quarterHeight / 2),
+              svgPaths.point(dir * curveWidth, quarterHeight)
+            ]) +
+        svgPaths.line([svgPaths.point(dir * curveWidth, halfHeight)]) +
+        svgPaths.curve(
+            'c',
+            [
+              svgPaths.point(dir * curveWidth / 4, quarterHeight / 2),
+              svgPaths.point(dir * curveWidth / 2, quarterHeight),
+              svgPaths.point(dir * curveWidth, quarterHeight)
+            ]) +
+        svgPaths.lineOnAxis('h', dir * innerWidth) +
+        svgPaths.curve(
+            'c',
+            [
+              svgPaths.point(dir * curveWidth / 2, 0),
+              svgPaths.point(dir * curveWidth * 3 / 4, -(quarterHeight / 2)),
+              svgPaths.point(dir * curveWidth, -quarterHeight)
+            ]) +
+        svgPaths.line([svgPaths.point(dir * curveWidth, -halfHeight)]) +
+        svgPaths.curve('c', [
+          svgPaths.point(dir * curveWidth / 4, -(quarterHeight / 2)),
+          svgPaths.point(dir * curveWidth / 2, -quarterHeight),
+          svgPaths.point(dir * curveWidth, -quarterHeight)
+        ]));
   }
 
   const pathLeft = makeMainPath(1);
@@ -759,18 +738,17 @@ ConstantProvider.prototype.makeNotch = function() {
 ConstantProvider.prototype.makeInsideCorners = function() {
   const radius = this.CORNER_RADIUS;
 
-  const innerTopLeftCorner = svgPaths.arc('a', '0 0,0', radius,
-      svgPaths.point(-radius, radius));
+  const innerTopLeftCorner =
+      svgPaths.arc('a', '0 0,0', radius, svgPaths.point(-radius, radius));
 
-  const innerTopRightCorner = svgPaths.arc('a', '0 0,1', radius,
-      svgPaths.point(-radius, radius));
+  const innerTopRightCorner =
+      svgPaths.arc('a', '0 0,1', radius, svgPaths.point(-radius, radius));
 
-  const innerBottomLeftCorner = svgPaths.arc('a', '0 0,0', radius,
-      svgPaths.point(radius, radius));
+  const innerBottomLeftCorner =
+      svgPaths.arc('a', '0 0,0', radius, svgPaths.point(radius, radius));
 
-  const innerBottomRightCorner = svgPaths.arc('a', '0 0,1',
-      radius,
-      svgPaths.point(radius, radius));
+  const innerBottomRightCorner =
+      svgPaths.arc('a', '0 0,1', radius, svgPaths.point(radius, radius));
 
   return {
     width: radius,
@@ -802,20 +780,17 @@ ConstantProvider.prototype.generateTertiaryColour_ = function(colour) {
  * @override
  */
 ConstantProvider.prototype.createDom = function(svg, tagName, selector) {
-  ConstantProvider.superClass_.createDom.call(this, svg,
-      tagName, selector);
+  ConstantProvider.superClass_.createDom.call(this, svg, tagName, selector);
   /*
   <defs>
     ... filters go here ...
   </defs>
   */
-  const defs = dom.createSvgElement(
-      Svg.DEFS, {}, svg);
+  const defs = dom.createSvgElement(Svg.DEFS, {}, svg);
   // Using a dilate distorts the block shape.
   // Instead use a gaussian blur, and then set all alpha to 1 with a transfer.
   const selectedGlowFilter = dom.createSvgElement(
-      Svg.FILTER,
-      {
+      Svg.FILTER, {
         'id': 'blocklySelectedGlowFilter' + this.randomIdentifier,
         'height': '160%',
         'width': '180%',
@@ -825,36 +800,29 @@ ConstantProvider.prototype.createDom = function(svg, tagName, selector) {
       defs);
   dom.createSvgElement(
       Svg.FEGAUSSIANBLUR,
-      {
-        'in': 'SourceGraphic',
-        'stdDeviation': this.SELECTED_GLOW_SIZE
-      },
+      {'in': 'SourceGraphic', 'stdDeviation': this.SELECTED_GLOW_SIZE},
       selectedGlowFilter);
   // Set all gaussian blur pixels to 1 opacity before applying flood
   const selectedComponentTransfer = dom.createSvgElement(
-      Svg.FECOMPONENTTRANSFER, {
-        'result': 'outBlur'
-      }, selectedGlowFilter);
+      Svg.FECOMPONENTTRANSFER, {'result': 'outBlur'}, selectedGlowFilter);
   dom.createSvgElement(
       Svg.FEFUNCA,
-      {
-        'type': 'table', 'tableValues': '0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1'
-      },
+      {'type': 'table', 'tableValues': '0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1'},
       selectedComponentTransfer);
   // Color the highlight
   dom.createSvgElement(
-      Svg.FEFLOOD,
-      {
+      Svg.FEFLOOD, {
         'flood-color': this.SELECTED_GLOW_COLOUR,
         'flood-opacity': 1,
         'result': 'outColor'
       },
       selectedGlowFilter);
   dom.createSvgElement(
-      Svg.FECOMPOSITE,
-      {
-        'in': 'outColor', 'in2': 'outBlur',
-        'operator': 'in', 'result': 'outGlow'
+      Svg.FECOMPOSITE, {
+        'in': 'outColor',
+        'in2': 'outBlur',
+        'operator': 'in',
+        'result': 'outGlow'
       },
       selectedGlowFilter);
   this.selectedGlowFilterId = selectedGlowFilter.id;
@@ -863,8 +831,7 @@ ConstantProvider.prototype.createDom = function(svg, tagName, selector) {
   // Using a dilate distorts the block shape.
   // Instead use a gaussian blur, and then set all alpha to 1 with a transfer.
   const replacementGlowFilter = dom.createSvgElement(
-      Svg.FILTER,
-      {
+      Svg.FILTER, {
         'id': 'blocklyReplacementGlowFilter' + this.randomIdentifier,
         'height': '160%',
         'width': '180%',
@@ -874,42 +841,35 @@ ConstantProvider.prototype.createDom = function(svg, tagName, selector) {
       defs);
   dom.createSvgElement(
       Svg.FEGAUSSIANBLUR,
-      {
-        'in': 'SourceGraphic',
-        'stdDeviation': this.REPLACEMENT_GLOW_SIZE
-      },
+      {'in': 'SourceGraphic', 'stdDeviation': this.REPLACEMENT_GLOW_SIZE},
       replacementGlowFilter);
   // Set all gaussian blur pixels to 1 opacity before applying flood
   const replacementComponentTransfer = dom.createSvgElement(
-      Svg.FECOMPONENTTRANSFER, {
-        'result': 'outBlur'
-      }, replacementGlowFilter);
+      Svg.FECOMPONENTTRANSFER, {'result': 'outBlur'}, replacementGlowFilter);
   dom.createSvgElement(
       Svg.FEFUNCA,
-      {
-        'type': 'table', 'tableValues': '0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1'
-      },
+      {'type': 'table', 'tableValues': '0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1'},
       replacementComponentTransfer);
   // Color the highlight
   dom.createSvgElement(
-      Svg.FEFLOOD,
-      {
+      Svg.FEFLOOD, {
         'flood-color': this.REPLACEMENT_GLOW_COLOUR,
         'flood-opacity': 1,
         'result': 'outColor'
       },
       replacementGlowFilter);
   dom.createSvgElement(
-      Svg.FECOMPOSITE,
-      {
-        'in': 'outColor', 'in2': 'outBlur',
-        'operator': 'in', 'result': 'outGlow'
+      Svg.FECOMPOSITE, {
+        'in': 'outColor',
+        'in2': 'outBlur',
+        'operator': 'in',
+        'result': 'outGlow'
       },
       replacementGlowFilter);
   dom.createSvgElement(
-      Svg.FECOMPOSITE,
-      {
-        'in': 'SourceGraphic', 'in2': 'outGlow',
+      Svg.FECOMPOSITE, {
+        'in': 'SourceGraphic',
+        'in2': 'outGlow',
         'operator': 'over',
       },
       replacementGlowFilter);
@@ -924,80 +884,59 @@ ConstantProvider.prototype.getCSS_ = function(selector) {
   return [
     /* eslint-disable indent */
     // Text.
-    selector + ' .blocklyText,',
-    selector + ' .blocklyFlyoutLabelText {',
-      'font: ' + this.FIELD_TEXT_FONTWEIGHT + ' ' +
-          this.FIELD_TEXT_FONTSIZE + 'pt ' + this.FIELD_TEXT_FONTFAMILY + ';',
+    selector + ' .blocklyText,', selector + ' .blocklyFlyoutLabelText {',
+    'font: ' + this.FIELD_TEXT_FONTWEIGHT + ' ' + this.FIELD_TEXT_FONTSIZE +
+        'pt ' + this.FIELD_TEXT_FONTFAMILY + ';',
     '}',
 
     // Fields.
-    selector + ' .blocklyText {',
-      'fill: #fff;',
-    '}',
+    selector + ' .blocklyText {', 'fill: #fff;', '}',
     selector + ' .blocklyNonEditableText>rect:not(.blocklyDropdownRect),',
     selector + ' .blocklyEditableText>rect:not(.blocklyDropdownRect) {',
-      'fill: ' + this.FIELD_BORDER_RECT_COLOUR + ';',
-    '}',
+    'fill: ' + this.FIELD_BORDER_RECT_COLOUR + ';', '}',
     selector + ' .blocklyNonEditableText>text,',
     selector + ' .blocklyEditableText>text,',
     selector + ' .blocklyNonEditableText>g>text,',
-    selector + ' .blocklyEditableText>g>text {',
-      'fill: #575E75;',
-    '}',
+    selector + ' .blocklyEditableText>g>text {', 'fill: #575E75;', '}',
 
     // Flyout labels.
-    selector + ' .blocklyFlyoutLabelText {',
-      'fill: #575E75;',
-    '}',
+    selector + ' .blocklyFlyoutLabelText {', 'fill: #575E75;', '}',
 
     // Bubbles.
-    selector + ' .blocklyText.blocklyBubbleText {',
-      'fill: #575E75;',
-    '}',
+    selector + ' .blocklyText.blocklyBubbleText {', 'fill: #575E75;', '}',
 
     // Editable field hover.
     selector + ' .blocklyDraggable:not(.blocklyDisabled)',
     ' .blocklyEditableText:not(.editing):hover>rect,',
     selector + ' .blocklyDraggable:not(.blocklyDisabled)',
-    ' .blocklyEditableText:not(.editing):hover>.blocklyPath {',
-      'stroke: #fff;',
-      'stroke-width: 2;',
-    '}',
+    ' .blocklyEditableText:not(.editing):hover>.blocklyPath {', 'stroke: #fff;',
+    'stroke-width: 2;', '}',
 
     // Text field input.
     selector + ' .blocklyHtmlInput {',
-      'font-family: ' + this.FIELD_TEXT_FONTFAMILY + ';',
-      'font-weight: ' + this.FIELD_TEXT_FONTWEIGHT + ';',
-      'color: #575E75;',
-    '}',
+    'font-family: ' + this.FIELD_TEXT_FONTFAMILY + ';',
+    'font-weight: ' + this.FIELD_TEXT_FONTWEIGHT + ';', 'color: #575E75;', '}',
 
     // Dropdown field.
-    selector + ' .blocklyDropdownText {',
-      'fill: #fff !important;',
-    '}',
+    selector + ' .blocklyDropdownText {', 'fill: #fff !important;', '}',
     // Widget and Dropdown Div
     selector + '.blocklyWidgetDiv .goog-menuitem,',
     selector + '.blocklyDropDownDiv .goog-menuitem {',
-      'font-family: ' + this.FIELD_TEXT_FONTFAMILY + ';',
-    '}',
-    selector + '.blocklyDropDownDiv .goog-menuitem-content {',
-      'color: #fff;',
+    'font-family: ' + this.FIELD_TEXT_FONTFAMILY + ';', '}',
+    selector + '.blocklyDropDownDiv .goog-menuitem-content {', 'color: #fff;',
     '}',
 
     // Connection highlight.
     selector + ' .blocklyHighlightedConnectionPath {',
-      'stroke: ' + this.SELECTED_GLOW_COLOUR + ';',
-    '}',
+    'stroke: ' + this.SELECTED_GLOW_COLOUR + ';', '}',
 
     // Disabled outline paths.
     selector + ' .blocklyDisabled > .blocklyOutlinePath {',
-      'fill: url(#blocklyDisabledPattern' + this.randomIdentifier + ')',
-    '}',
+    'fill: url(#blocklyDisabledPattern' + this.randomIdentifier + ')', '}',
 
     // Insertion marker.
     selector + ' .blocklyInsertionMarker>.blocklyPath {',
-      'fill-opacity: ' + this.INSERTION_MARKER_OPACITY + ';',
-      'stroke: none;',
+    'fill-opacity: ' + this.INSERTION_MARKER_OPACITY + ';', 'stroke: none;',
     '}',
     /* eslint-enable indent */
   ];

From a557320eef26e8e935f86f7089a1932aa59894b4 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 15:08:03 -0700
Subject: [PATCH 636/833] Migrate core/renderers/common/debugger.js to ES6
 const/let

---
 core/renderers/common/debugger.js | 40 ++++++++++++++++---------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/core/renderers/common/debugger.js b/core/renderers/common/debugger.js
index a6ab9d387..da21d424c 100644
--- a/core/renderers/common/debugger.js
+++ b/core/renderers/common/debugger.js
@@ -78,7 +78,8 @@ Blockly.blockRendering.Debug.config = {
  * @package
  */
 Blockly.blockRendering.Debug.prototype.clearElems = function() {
-  for (var i = 0, elem; (elem = this.debugElements_[i]); i++) {
+  for (let i = 0; i < this.debugElements_.length; i++) {
+    const elem = this.debugElements_[i];
     Blockly.utils.dom.removeNode(elem);
   }
 
@@ -97,8 +98,8 @@ Blockly.blockRendering.Debug.prototype.drawSpacerRow = function(row, cursorY, is
     return;
   }
 
-  var height = Math.abs(row.height);
-  var isNegativeSpacing = row.height < 0;
+  const height = Math.abs(row.height);
+  const isNegativeSpacing = row.height < 0;
   if (isNegativeSpacing) {
     cursorY -= height;
   }
@@ -131,13 +132,13 @@ Blockly.blockRendering.Debug.prototype.drawSpacerElem = function(elem, rowHeight
     return;
   }
 
-  var width = Math.abs(elem.width);
-  var isNegativeSpacing = elem.width < 0;
-  var xPos = isNegativeSpacing ? elem.xPos - width : elem.xPos;
+  const width = Math.abs(elem.width);
+  const isNegativeSpacing = elem.width < 0;
+  let xPos = isNegativeSpacing ? elem.xPos - width : elem.xPos;
   if (isRtl) {
     xPos = -(xPos + width);
   }
-  var yPos = elem.centerline - elem.height / 2;
+  const yPos = elem.centerline - elem.height / 2;
   this.debugElements_.push(Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.RECT,
       {
@@ -162,11 +163,11 @@ Blockly.blockRendering.Debug.prototype.drawSpacerElem = function(elem, rowHeight
  */
 Blockly.blockRendering.Debug.prototype.drawRenderedElem = function(elem, isRtl) {
   if (Blockly.blockRendering.Debug.config.elems) {
-    var xPos = elem.xPos;
+    let xPos = elem.xPos;
     if (isRtl) {
       xPos = -(xPos + elem.width);
     }
-    var yPos = elem.centerline - elem.height / 2;
+    const yPos = elem.centerline - elem.height / 2;
     this.debugElements_.push(Blockly.utils.dom.createSvgElement(
         Blockly.utils.Svg.RECT,
         {
@@ -183,7 +184,7 @@ Blockly.blockRendering.Debug.prototype.drawRenderedElem = function(elem, isRtl)
 
     if (Blockly.blockRendering.Types.isField(elem) &&
         elem.field instanceof Blockly.FieldLabel) {
-      var baseline = this.constants_.FIELD_TEXT_BASELINE;
+      const baseline = this.constants_.FIELD_TEXT_BASELINE;
       this.debugElements_.push(Blockly.utils.dom.createSvgElement(
           Blockly.utils.Svg.RECT,
           {
@@ -221,9 +222,9 @@ Blockly.blockRendering.Debug.prototype.drawConnection = function(conn) {
     return;
   }
 
-  var colour;
-  var size;
-  var fill;
+  let colour;
+  let size;
+  let fill;
   if (conn.type == Blockly.connectionTypes.INPUT_VALUE) {
     size = 4;
     colour = 'magenta';
@@ -309,8 +310,8 @@ Blockly.blockRendering.Debug.prototype.drawRenderedRow = function(row, cursorY,
  * @package
  */
 Blockly.blockRendering.Debug.prototype.drawRowWithElements = function(row, cursorY, isRtl) {
-  for (var i = 0, l = row.elements.length; i < l; i++) {
-    var elem = row.elements[i];
+  for (let i = 0; i < row.elements.length; i++) {
+    const elem = row.elements[i];
     if (!elem) {
       console.warn('A row has an undefined or null element.', row, elem);
       continue;
@@ -337,8 +338,8 @@ Blockly.blockRendering.Debug.prototype.drawBoundingBox = function(info) {
     return;
   }
   // Bounding box without children.
-  var xPos = info.RTL ? -info.width : 0;
-  var yPos = 0;
+  let xPos = info.RTL ? -info.width : 0;
+  const yPos = 0;
   this.debugElements_.push(Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.RECT,
       {
@@ -387,8 +388,9 @@ Blockly.blockRendering.Debug.prototype.drawDebug = function(block, info) {
 
   this.randomColour_ = '#' + Math.floor(Math.random() * 16777215).toString(16);
 
-  var cursorY = 0;
-  for (var i = 0, row; (row = info.rows[i]); i++) {
+  let cursorY = 0;
+  for (let i = 0; i < info.rows.length; i++) {
+    const row = info.rows[i];
     if (Blockly.blockRendering.Types.isBetweenRowSpacer(row)) {
       this.drawSpacerRow(row, cursorY, info.RTL);
     } else {

From d6dc3807e936d874e76ff9bd32c41c571ed1455f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 15:08:34 -0700
Subject: [PATCH 637/833] Migrate core/renderers/common/debugger.js to
 goog.module

---
 core/renderers/common/debugger.js | 56 +++++++++++++++++--------------
 tests/deps.js                     |  2 +-
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/core/renderers/common/debugger.js b/core/renderers/common/debugger.js
index da21d424c..bcc7b167a 100644
--- a/core/renderers/common/debugger.js
+++ b/core/renderers/common/debugger.js
@@ -10,18 +10,20 @@
  */
 'use strict';
 
-goog.provide('Blockly.blockRendering.Debug');
+goog.module('Blockly.blockRendering.Debug');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.Measurable');
-goog.require('Blockly.blockRendering.RenderInfo');
-goog.require('Blockly.blockRendering.Row');
 goog.require('Blockly.blockRendering.Types');
 goog.require('Blockly.connectionTypes');
+goog.require('Blockly.FieldLabel');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.Svg');
 
 goog.requireType('Blockly.blockRendering.ConstantProvider');
 goog.requireType('Blockly.blockRendering.InRowSpacer');
+goog.requireType('Blockly.blockRendering.Measurable');
+goog.requireType('Blockly.blockRendering.RenderInfo');
+goog.requireType('Blockly.blockRendering.Row');
 goog.requireType('Blockly.BlockSvg');
 goog.requireType('Blockly.RenderedConnection');
 
@@ -33,7 +35,7 @@ goog.requireType('Blockly.RenderedConnection');
  * @package
  * @constructor
  */
-Blockly.blockRendering.Debug = function(constants) {
+const Debug = function(constants) {
   /**
    * An array of SVG elements that have been created by this object.
    * @type {Array<!SVGElement>}
@@ -62,7 +64,7 @@ Blockly.blockRendering.Debug = function(constants) {
  * rendering of specific rendering components.
  * @type {!Object<string, boolean>}
  */
-Blockly.blockRendering.Debug.config = {
+Debug.config = {
   rowSpacers: true,
   elemSpacers: true,
   rows: true,
@@ -77,7 +79,7 @@ Blockly.blockRendering.Debug.config = {
  * Remove all elements the this object created on the last pass.
  * @package
  */
-Blockly.blockRendering.Debug.prototype.clearElems = function() {
+Debug.prototype.clearElems = function() {
   for (let i = 0; i < this.debugElements_.length; i++) {
     const elem = this.debugElements_[i];
     Blockly.utils.dom.removeNode(elem);
@@ -93,8 +95,8 @@ Blockly.blockRendering.Debug.prototype.clearElems = function() {
  * @param {boolean} isRtl Whether the block is rendered RTL.
  * @package
  */
-Blockly.blockRendering.Debug.prototype.drawSpacerRow = function(row, cursorY, isRtl) {
-  if (!Blockly.blockRendering.Debug.config.rowSpacers) {
+Debug.prototype.drawSpacerRow = function(row, cursorY, isRtl) {
+  if (!Debug.config.rowSpacers) {
     return;
   }
 
@@ -127,8 +129,8 @@ Blockly.blockRendering.Debug.prototype.drawSpacerRow = function(row, cursorY, is
  * @param {boolean} isRtl Whether the block is rendered RTL.
  * @package
  */
-Blockly.blockRendering.Debug.prototype.drawSpacerElem = function(elem, rowHeight, isRtl) {
-  if (!Blockly.blockRendering.Debug.config.elemSpacers) {
+Debug.prototype.drawSpacerElem = function(elem, rowHeight, isRtl) {
+  if (!Debug.config.elemSpacers) {
     return;
   }
 
@@ -161,8 +163,8 @@ Blockly.blockRendering.Debug.prototype.drawSpacerElem = function(elem, rowHeight
  * @param {boolean} isRtl Whether the block is rendered RTL.
  * @package
  */
-Blockly.blockRendering.Debug.prototype.drawRenderedElem = function(elem, isRtl) {
-  if (Blockly.blockRendering.Debug.config.elems) {
+Debug.prototype.drawRenderedElem = function(elem, isRtl) {
+  if (Debug.config.elems) {
     let xPos = elem.xPos;
     if (isRtl) {
       xPos = -(xPos + elem.width);
@@ -203,7 +205,7 @@ Blockly.blockRendering.Debug.prototype.drawRenderedElem = function(elem, isRtl)
 
 
   if (Blockly.blockRendering.Types.isInput(elem) &&
-      Blockly.blockRendering.Debug.config.connections) {
+      Debug.config.connections) {
     this.drawConnection(elem.connectionModel);
   }
 };
@@ -217,8 +219,8 @@ Blockly.blockRendering.Debug.prototype.drawRenderedElem = function(elem, isRtl)
  *     is a debug module.
  * @package
  */
-Blockly.blockRendering.Debug.prototype.drawConnection = function(conn) {
-  if (!Blockly.blockRendering.Debug.config.connections) {
+Debug.prototype.drawConnection = function(conn) {
+  if (!Debug.config.connections) {
     return;
   }
 
@@ -262,8 +264,8 @@ Blockly.blockRendering.Debug.prototype.drawConnection = function(conn) {
  * @param {boolean} isRtl Whether the block is rendered RTL.
  * @package
  */
-Blockly.blockRendering.Debug.prototype.drawRenderedRow = function(row, cursorY, isRtl) {
-  if (!Blockly.blockRendering.Debug.config.rows) {
+Debug.prototype.drawRenderedRow = function(row, cursorY, isRtl) {
+  if (!Debug.config.rows) {
     return;
   }
   this.debugElements_.push(Blockly.utils.dom.createSvgElement(
@@ -284,7 +286,7 @@ Blockly.blockRendering.Debug.prototype.drawRenderedRow = function(row, cursorY,
     return;
   }
 
-  if (Blockly.blockRendering.Debug.config.connectedBlockBounds) {
+  if (Debug.config.connectedBlockBounds) {
     this.debugElements_.push(Blockly.utils.dom.createSvgElement(
         Blockly.utils.Svg.RECT,
         {
@@ -309,7 +311,7 @@ Blockly.blockRendering.Debug.prototype.drawRenderedRow = function(row, cursorY,
  * @param {boolean} isRtl Whether the block is rendered RTL.
  * @package
  */
-Blockly.blockRendering.Debug.prototype.drawRowWithElements = function(row, cursorY, isRtl) {
+Debug.prototype.drawRowWithElements = function(row, cursorY, isRtl) {
   for (let i = 0; i < row.elements.length; i++) {
     const elem = row.elements[i];
     if (!elem) {
@@ -333,8 +335,8 @@ Blockly.blockRendering.Debug.prototype.drawRowWithElements = function(row, curso
  *     the block to debug.
  * @package
  */
-Blockly.blockRendering.Debug.prototype.drawBoundingBox = function(info) {
-  if (!Blockly.blockRendering.Debug.config.blockBounds) {
+Debug.prototype.drawBoundingBox = function(info) {
+  if (!Debug.config.blockBounds) {
     return;
   }
   // Bounding box without children.
@@ -355,7 +357,7 @@ Blockly.blockRendering.Debug.prototype.drawBoundingBox = function(info) {
       },
       this.svgRoot_));
 
-  if (Blockly.blockRendering.Debug.config.connectedBlockBounds) {
+  if (Debug.config.connectedBlockBounds) {
     // Bounding box with children.
     xPos = info.RTL ? -info.widthWithChildren : 0;
     this.debugElements_.push(Blockly.utils.dom.createSvgElement(
@@ -382,7 +384,7 @@ Blockly.blockRendering.Debug.prototype.drawBoundingBox = function(info) {
  *     the block to debug.
  * @package
  */
-Blockly.blockRendering.Debug.prototype.drawDebug = function(block, info) {
+Debug.prototype.drawDebug = function(block, info) {
   this.clearElems();
   this.svgRoot_ = block.getSvgRoot();
 
@@ -423,8 +425,8 @@ Blockly.blockRendering.Debug.prototype.drawDebug = function(block, info) {
  * @param {!SVGElement} svgPath The block's SVG path.
  * @package
  */
-Blockly.blockRendering.Debug.prototype.drawRender = function(svgPath) {
-  if (!Blockly.blockRendering.Debug.config.render) {
+Debug.prototype.drawRender = function(svgPath) {
+  if (!Debug.config.render) {
     return;
   }
   svgPath.setAttribute('filter',
@@ -433,3 +435,5 @@ Blockly.blockRendering.Debug.prototype.drawRender = function(svgPath) {
     svgPath.setAttribute('filter', '');
   }, 100);
 };
+
+exports = Debug;
diff --git a/tests/deps.js b/tests/deps.js
index dbce55866..8e73990eb 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -132,7 +132,7 @@ goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang':
 goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
+goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});

From f02e0015f50163b26ac24d581c685d20d7e73585 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 16:32:28 -0700
Subject: [PATCH 638/833] Migrate core/renderers/common/debugger.js named
 requires

---
 core/renderers/common/debugger.js | 114 ++++++++++++++++--------------
 1 file changed, 60 insertions(+), 54 deletions(-)

diff --git a/core/renderers/common/debugger.js b/core/renderers/common/debugger.js
index bcc7b167a..45a3bd4aa 100644
--- a/core/renderers/common/debugger.js
+++ b/core/renderers/common/debugger.js
@@ -13,24 +13,30 @@
 goog.module('Blockly.blockRendering.Debug');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.connectionTypes');
-goog.require('Blockly.FieldLabel');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Svg');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.blockRendering.InRowSpacer');
-goog.requireType('Blockly.blockRendering.Measurable');
-goog.requireType('Blockly.blockRendering.RenderInfo');
-goog.requireType('Blockly.blockRendering.Row');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.RenderedConnection');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const FieldLabel = goog.require('Blockly.FieldLabel');
+/* eslint-disable-next-line no-unused-vars */
+const InRowSpacer = goog.requireType('Blockly.blockRendering.InRowSpacer');
+/* eslint-disable-next-line no-unused-vars */
+const Measurable = goog.requireType('Blockly.blockRendering.Measurable');
+/* eslint-disable-next-line no-unused-vars */
+const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
+/* eslint-disable-next-line no-unused-vars */
+const RenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
+/* eslint-disable-next-line no-unused-vars */
+const Row = goog.requireType('Blockly.blockRendering.Row');
+const Svg = goog.require('Blockly.utils.Svg');
+const Types = goog.require('Blockly.blockRendering.Types');
+const connectionTypes = goog.require('Blockly.connectionTypes');
+const dom = goog.require('Blockly.utils.dom');
 
 
 /**
  * An object that renders rectangles and dots for debugging rendering code.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The renderer's
+ * @param {!ConstantProvider} constants The renderer's
  *     constants.
  * @package
  * @constructor
@@ -53,7 +59,7 @@ const Debug = function(constants) {
 
   /**
    * The renderer's constant provider.
-   * @type {!Blockly.blockRendering.ConstantProvider}
+   * @type {!ConstantProvider}
    * @private
    */
   this.constants_ = constants;
@@ -82,7 +88,7 @@ Debug.config = {
 Debug.prototype.clearElems = function() {
   for (let i = 0; i < this.debugElements_.length; i++) {
     const elem = this.debugElements_[i];
-    Blockly.utils.dom.removeNode(elem);
+    dom.removeNode(elem);
   }
 
   this.debugElements_ = [];
@@ -90,7 +96,7 @@ Debug.prototype.clearElems = function() {
 
 /**
  * Draw a debug rectangle for a spacer (empty) row.
- * @param {!Blockly.blockRendering.Row} row The row to render.
+ * @param {!Row} row The row to render.
  * @param {number} cursorY The y position of the top of the row.
  * @param {boolean} isRtl Whether the block is rendered RTL.
  * @package
@@ -106,8 +112,8 @@ Debug.prototype.drawSpacerRow = function(row, cursorY, isRtl) {
     cursorY -= height;
   }
 
-  this.debugElements_.push(Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  this.debugElements_.push(dom.createSvgElement(
+      Svg.RECT,
       {
         'class': 'rowSpacerRect blockRenderDebug',
         'x': isRtl ? -(row.xPos + row.width) : row.xPos,
@@ -124,7 +130,7 @@ Debug.prototype.drawSpacerRow = function(row, cursorY, isRtl) {
 
 /**
  * Draw a debug rectangle for a horizontal spacer.
- * @param {!Blockly.blockRendering.InRowSpacer} elem The spacer to render.
+ * @param {!InRowSpacer} elem The spacer to render.
  * @param {number} rowHeight The height of the container row.
  * @param {boolean} isRtl Whether the block is rendered RTL.
  * @package
@@ -141,8 +147,8 @@ Debug.prototype.drawSpacerElem = function(elem, rowHeight, isRtl) {
     xPos = -(xPos + width);
   }
   const yPos = elem.centerline - elem.height / 2;
-  this.debugElements_.push(Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  this.debugElements_.push(dom.createSvgElement(
+      Svg.RECT,
       {
         'class': 'elemSpacerRect blockRenderDebug',
         'x': xPos,
@@ -159,7 +165,7 @@ Debug.prototype.drawSpacerElem = function(elem, rowHeight, isRtl) {
 
 /**
  * Draw a debug rectangle for an in-row element.
- * @param {!Blockly.blockRendering.Measurable} elem The element to render.
+ * @param {!Measurable} elem The element to render.
  * @param {boolean} isRtl Whether the block is rendered RTL.
  * @package
  */
@@ -170,8 +176,8 @@ Debug.prototype.drawRenderedElem = function(elem, isRtl) {
       xPos = -(xPos + elem.width);
     }
     const yPos = elem.centerline - elem.height / 2;
-    this.debugElements_.push(Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.RECT,
+    this.debugElements_.push(dom.createSvgElement(
+        Svg.RECT,
         {
           'class': 'rowRenderingRect blockRenderDebug',
           'x': xPos,
@@ -184,11 +190,11 @@ Debug.prototype.drawRenderedElem = function(elem, isRtl) {
         },
         this.svgRoot_));
 
-    if (Blockly.blockRendering.Types.isField(elem) &&
-        elem.field instanceof Blockly.FieldLabel) {
+    if (Types.isField(elem) &&
+        elem.field instanceof FieldLabel) {
       const baseline = this.constants_.FIELD_TEXT_BASELINE;
-      this.debugElements_.push(Blockly.utils.dom.createSvgElement(
-          Blockly.utils.Svg.RECT,
+      this.debugElements_.push(dom.createSvgElement(
+          Svg.RECT,
           {
             'class': 'rowRenderingRect blockRenderDebug',
             'x': xPos,
@@ -204,7 +210,7 @@ Debug.prototype.drawRenderedElem = function(elem, isRtl) {
   }
 
 
-  if (Blockly.blockRendering.Types.isInput(elem) &&
+  if (Types.isInput(elem) &&
       Debug.config.connections) {
     this.drawConnection(elem.connectionModel);
   }
@@ -214,7 +220,7 @@ Debug.prototype.drawRenderedElem = function(elem, isRtl) {
  * Draw a circle at the location of the given connection.  Inputs and outputs
  * share the same colours, as do previous and next.  When positioned correctly
  * a connected pair will look like a bullseye.
- * @param {Blockly.RenderedConnection} conn The connection to circle.
+ * @param {RenderedConnection} conn The connection to circle.
  * @suppress {visibility} Suppress visibility of conn.offsetInBlock_ since this
  *     is a debug module.
  * @package
@@ -227,25 +233,25 @@ Debug.prototype.drawConnection = function(conn) {
   let colour;
   let size;
   let fill;
-  if (conn.type == Blockly.connectionTypes.INPUT_VALUE) {
+  if (conn.type == connectionTypes.INPUT_VALUE) {
     size = 4;
     colour = 'magenta';
     fill = 'none';
-  } else if (conn.type == Blockly.connectionTypes.OUTPUT_VALUE) {
+  } else if (conn.type == connectionTypes.OUTPUT_VALUE) {
     size = 2;
     colour = 'magenta';
     fill = colour;
-  } else if (conn.type == Blockly.connectionTypes.NEXT_STATEMENT) {
+  } else if (conn.type == connectionTypes.NEXT_STATEMENT) {
     size = 4;
     colour = 'goldenrod';
     fill = 'none';
-  } else if (conn.type == Blockly.connectionTypes.PREVIOUS_STATEMENT) {
+  } else if (conn.type == connectionTypes.PREVIOUS_STATEMENT) {
     size = 2;
     colour = 'goldenrod';
     fill = colour;
   }
-  this.debugElements_.push(Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.CIRCLE,
+  this.debugElements_.push(dom.createSvgElement(
+      Svg.CIRCLE,
       {
         'class': 'blockRenderDebug',
         'cx': conn.offsetInBlock_.x,
@@ -259,7 +265,7 @@ Debug.prototype.drawConnection = function(conn) {
 
 /**
  * Draw a debug rectangle for a non-empty row.
- * @param {!Blockly.blockRendering.Row} row The non-empty row to render.
+ * @param {!Row} row The non-empty row to render.
  * @param {number} cursorY The y position of the top of the row.
  * @param {boolean} isRtl Whether the block is rendered RTL.
  * @package
@@ -268,8 +274,8 @@ Debug.prototype.drawRenderedRow = function(row, cursorY, isRtl) {
   if (!Debug.config.rows) {
     return;
   }
-  this.debugElements_.push(Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  this.debugElements_.push(dom.createSvgElement(
+      Svg.RECT,
       {
         'class': 'elemRenderingRect blockRenderDebug',
         'x': isRtl ? -(row.xPos + row.width) : row.xPos,
@@ -282,13 +288,13 @@ Debug.prototype.drawRenderedRow = function(row, cursorY, isRtl) {
       },
       this.svgRoot_));
 
-  if (Blockly.blockRendering.Types.isTopOrBottomRow(row)) {
+  if (Types.isTopOrBottomRow(row)) {
     return;
   }
 
   if (Debug.config.connectedBlockBounds) {
-    this.debugElements_.push(Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.RECT,
+    this.debugElements_.push(dom.createSvgElement(
+        Svg.RECT,
         {
           'class': 'connectedBlockWidth blockRenderDebug',
           'x': isRtl ? -(row.xPos + row.widthWithConnectedBlocks) : row.xPos,
@@ -306,7 +312,7 @@ Debug.prototype.drawRenderedRow = function(row, cursorY, isRtl) {
 
 /**
  * Draw debug rectangles for a non-empty row and all of its subcomponents.
- * @param {!Blockly.blockRendering.Row} row The non-empty row to render.
+ * @param {!Row} row The non-empty row to render.
  * @param {number} cursorY The y position of the top of the row.
  * @param {boolean} isRtl Whether the block is rendered RTL.
  * @package
@@ -318,9 +324,9 @@ Debug.prototype.drawRowWithElements = function(row, cursorY, isRtl) {
       console.warn('A row has an undefined or null element.', row, elem);
       continue;
     }
-    if (Blockly.blockRendering.Types.isSpacer(elem)) {
+    if (Types.isSpacer(elem)) {
       this.drawSpacerElem(
-          /** @type {!Blockly.blockRendering.InRowSpacer} */ (elem),
+          /** @type {!InRowSpacer} */ (elem),
           row.height, isRtl);
     } else {
       this.drawRenderedElem(elem, isRtl);
@@ -331,7 +337,7 @@ Debug.prototype.drawRowWithElements = function(row, cursorY, isRtl) {
 
 /**
  * Draw a debug rectangle around the entire block.
- * @param {!Blockly.blockRendering.RenderInfo} info Rendering information about
+ * @param {!RenderInfo} info Rendering information about
  *     the block to debug.
  * @package
  */
@@ -342,8 +348,8 @@ Debug.prototype.drawBoundingBox = function(info) {
   // Bounding box without children.
   let xPos = info.RTL ? -info.width : 0;
   const yPos = 0;
-  this.debugElements_.push(Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  this.debugElements_.push(dom.createSvgElement(
+      Svg.RECT,
       {
         'class': 'blockBoundingBox blockRenderDebug',
         'x': xPos,
@@ -360,8 +366,8 @@ Debug.prototype.drawBoundingBox = function(info) {
   if (Debug.config.connectedBlockBounds) {
     // Bounding box with children.
     xPos = info.RTL ? -info.widthWithChildren : 0;
-    this.debugElements_.push(Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.RECT,
+    this.debugElements_.push(dom.createSvgElement(
+        Svg.RECT,
         {
           'class': 'blockRenderDebug',
           'x': xPos,
@@ -379,8 +385,8 @@ Debug.prototype.drawBoundingBox = function(info) {
 
 /**
  * Do all of the work to draw debug information for the whole block.
- * @param {!Blockly.BlockSvg} block The block to draw debug information for.
- * @param {!Blockly.blockRendering.RenderInfo} info Rendering information about
+ * @param {!BlockSvg} block The block to draw debug information for.
+ * @param {!RenderInfo} info Rendering information about
  *     the block to debug.
  * @package
  */
@@ -393,7 +399,7 @@ Debug.prototype.drawDebug = function(block, info) {
   let cursorY = 0;
   for (let i = 0; i < info.rows.length; i++) {
     const row = info.rows[i];
-    if (Blockly.blockRendering.Types.isBetweenRowSpacer(row)) {
+    if (Types.isBetweenRowSpacer(row)) {
       this.drawSpacerRow(row, cursorY, info.RTL);
     } else {
       this.drawRowWithElements(row, cursorY, info.RTL);

From 8a48ba264231437663b0aca9dd21161b572f6542 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 16:32:39 -0700
Subject: [PATCH 639/833] clang-format core/renderers/common/debugger.js

---
 core/renderers/common/debugger.js | 39 +++++++++++--------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/core/renderers/common/debugger.js b/core/renderers/common/debugger.js
index 45a3bd4aa..ebe19d791 100644
--- a/core/renderers/common/debugger.js
+++ b/core/renderers/common/debugger.js
@@ -113,8 +113,7 @@ Debug.prototype.drawSpacerRow = function(row, cursorY, isRtl) {
   }
 
   this.debugElements_.push(dom.createSvgElement(
-      Svg.RECT,
-      {
+      Svg.RECT, {
         'class': 'rowSpacerRect blockRenderDebug',
         'x': isRtl ? -(row.xPos + row.width) : row.xPos,
         'y': cursorY,
@@ -148,8 +147,7 @@ Debug.prototype.drawSpacerElem = function(elem, rowHeight, isRtl) {
   }
   const yPos = elem.centerline - elem.height / 2;
   this.debugElements_.push(dom.createSvgElement(
-      Svg.RECT,
-      {
+      Svg.RECT, {
         'class': 'elemSpacerRect blockRenderDebug',
         'x': xPos,
         'y': yPos,
@@ -177,8 +175,7 @@ Debug.prototype.drawRenderedElem = function(elem, isRtl) {
     }
     const yPos = elem.centerline - elem.height / 2;
     this.debugElements_.push(dom.createSvgElement(
-        Svg.RECT,
-        {
+        Svg.RECT, {
           'class': 'rowRenderingRect blockRenderDebug',
           'x': xPos,
           'y': yPos,
@@ -190,12 +187,10 @@ Debug.prototype.drawRenderedElem = function(elem, isRtl) {
         },
         this.svgRoot_));
 
-    if (Types.isField(elem) &&
-        elem.field instanceof FieldLabel) {
+    if (Types.isField(elem) && elem.field instanceof FieldLabel) {
       const baseline = this.constants_.FIELD_TEXT_BASELINE;
       this.debugElements_.push(dom.createSvgElement(
-          Svg.RECT,
-          {
+          Svg.RECT, {
             'class': 'rowRenderingRect blockRenderDebug',
             'x': xPos,
             'y': yPos + baseline,
@@ -210,8 +205,7 @@ Debug.prototype.drawRenderedElem = function(elem, isRtl) {
   }
 
 
-  if (Types.isInput(elem) &&
-      Debug.config.connections) {
+  if (Types.isInput(elem) && Debug.config.connections) {
     this.drawConnection(elem.connectionModel);
   }
 };
@@ -251,8 +245,7 @@ Debug.prototype.drawConnection = function(conn) {
     fill = colour;
   }
   this.debugElements_.push(dom.createSvgElement(
-      Svg.CIRCLE,
-      {
+      Svg.CIRCLE, {
         'class': 'blockRenderDebug',
         'cx': conn.offsetInBlock_.x,
         'cy': conn.offsetInBlock_.y,
@@ -275,8 +268,7 @@ Debug.prototype.drawRenderedRow = function(row, cursorY, isRtl) {
     return;
   }
   this.debugElements_.push(dom.createSvgElement(
-      Svg.RECT,
-      {
+      Svg.RECT, {
         'class': 'elemRenderingRect blockRenderDebug',
         'x': isRtl ? -(row.xPos + row.width) : row.xPos,
         'y': row.yPos,
@@ -294,8 +286,7 @@ Debug.prototype.drawRenderedRow = function(row, cursorY, isRtl) {
 
   if (Debug.config.connectedBlockBounds) {
     this.debugElements_.push(dom.createSvgElement(
-        Svg.RECT,
-        {
+        Svg.RECT, {
           'class': 'connectedBlockWidth blockRenderDebug',
           'x': isRtl ? -(row.xPos + row.widthWithConnectedBlocks) : row.xPos,
           'y': row.yPos,
@@ -326,8 +317,7 @@ Debug.prototype.drawRowWithElements = function(row, cursorY, isRtl) {
     }
     if (Types.isSpacer(elem)) {
       this.drawSpacerElem(
-          /** @type {!InRowSpacer} */ (elem),
-          row.height, isRtl);
+          /** @type {!InRowSpacer} */ (elem), row.height, isRtl);
     } else {
       this.drawRenderedElem(elem, isRtl);
     }
@@ -349,8 +339,7 @@ Debug.prototype.drawBoundingBox = function(info) {
   let xPos = info.RTL ? -info.width : 0;
   const yPos = 0;
   this.debugElements_.push(dom.createSvgElement(
-      Svg.RECT,
-      {
+      Svg.RECT, {
         'class': 'blockBoundingBox blockRenderDebug',
         'x': xPos,
         'y': yPos,
@@ -367,8 +356,7 @@ Debug.prototype.drawBoundingBox = function(info) {
     // Bounding box with children.
     xPos = info.RTL ? -info.widthWithChildren : 0;
     this.debugElements_.push(dom.createSvgElement(
-        Svg.RECT,
-        {
+        Svg.RECT, {
           'class': 'blockRenderDebug',
           'x': xPos,
           'y': yPos,
@@ -435,8 +423,7 @@ Debug.prototype.drawRender = function(svgPath) {
   if (!Debug.config.render) {
     return;
   }
-  svgPath.setAttribute('filter',
-      'url(#' + this.constants_.debugFilterId + ')');
+  svgPath.setAttribute('filter', 'url(#' + this.constants_.debugFilterId + ')');
   setTimeout(function() {
     svgPath.setAttribute('filter', '');
   }, 100);

From c86c8f8e926c6a8a8651ae215b04da8f4e87222a Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 12 Aug 2021 09:55:38 -0700
Subject: [PATCH 640/833] Migrate core/variables.js to goog.module syntax
 (#5321)

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

* Migrate core/variables.js to goog.module

* Migrate core/variables.js to named requires

* clang-format core/variables.js

* Add JSDoc and make testdeps function test-only

* Fix return type for getTestDeps

* Migrate to new style of exposing methods for mocking in core/variables.js
---
 core/variables.js                  | 402 +++++++++++++----------------
 tests/deps.js                      |   2 +-
 tests/mocha/field_variable_test.js |   4 +-
 3 files changed, 189 insertions(+), 219 deletions(-)

diff --git a/core/variables.js b/core/variables.js
index 223838a2b..f468163c4 100644
--- a/core/variables.js
+++ b/core/variables.js
@@ -14,44 +14,36 @@
  * @name Blockly.Variables
  * @namespace
  */
-goog.provide('Blockly.Variables');
+goog.module('Blockly.Variables');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Blocks');
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.Msg');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.xml');
-goog.require('Blockly.VariableModel');
-goog.require('Blockly.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');
+const Xml = goog.require('Blockly.Xml');
+const utilsXml = goog.require('Blockly.utils.xml');
 
-goog.requireType('Blockly.Workspace');
-
-
-/**
- * Constant to separate variable names from procedures and generated functions
- * when running generators.
- * @deprecated Use Blockly.internalConstants.VARIABLE_CATEGORY_NAME
- */
-Blockly.Variables.NAME_TYPE = Blockly.internalConstants.VARIABLE_CATEGORY_NAME;
 
 /**
  * Find all user-created variables that are in use in the workspace.
  * For use by generators.
  * To get a list of all variables on a workspace, including unused variables,
  * call Workspace.getAllVariables.
- * @param {!Blockly.Workspace} ws The workspace to search for variables.
- * @return {!Array<!Blockly.VariableModel>} Array of variable models.
+ * @param {!Workspace} ws The workspace to search for variables.
+ * @return {!Array<!VariableModel>} Array of variable models.
  */
-Blockly.Variables.allUsedVarModels = function(ws) {
-  var blocks = ws.getAllBlocks(false);
-  var variableHash = Object.create(null);
+const allUsedVarModels = function(ws) {
+  const blocks = ws.getAllBlocks(false);
+  const variableHash = Object.create(null);
   // Iterate through every block and add each variable to the hash.
-  for (var i = 0; i < blocks.length; i++) {
-    var blockVariables = blocks[i].getVarModels();
+  for (let i = 0; i < blocks.length; i++) {
+    const blockVariables = blocks[i].getVarModels();
     if (blockVariables) {
-      for (var j = 0; j < blockVariables.length; j++) {
-        var variable = blockVariables[j];
-        var id = variable.getId();
+      for (let j = 0; j < blockVariables.length; j++) {
+        const variable = blockVariables[j];
+        const id = variable.getId();
         if (id) {
           variableHash[id] = variable;
         }
@@ -59,18 +51,18 @@ Blockly.Variables.allUsedVarModels = function(ws) {
     }
   }
   // Flatten the hash into a list.
-  var variableList = [];
-  for (var id in variableHash) {
+  const variableList = [];
+  for (const id in variableHash) {
     variableList.push(variableHash[id]);
   }
   return variableList;
 };
+exports.allUsedVarModels = allUsedVarModels;
 
 /**
- * @private
  * @type {Object<string,boolean>}
  */
-Blockly.Variables.ALL_DEVELOPER_VARS_WARNINGS_BY_BLOCK_TYPE_ = {};
+const ALL_DEVELOPER_VARS_WARNINGS_BY_BLOCK_TYPE = {};
 
 /**
  * Find all developer variables used by blocks in the workspace.
@@ -79,29 +71,28 @@ Blockly.Variables.ALL_DEVELOPER_VARS_WARNINGS_BY_BLOCK_TYPE_ = {};
  * To declare developer variables, define the getDeveloperVariables function on
  * your block and return a list of variable names.
  * For use by generators.
- * @param {!Blockly.Workspace} workspace The workspace to search.
+ * @param {!Workspace} workspace The workspace to search.
  * @return {!Array<string>} A list of non-duplicated variable names.
  */
-Blockly.Variables.allDeveloperVariables = function(workspace) {
-  var blocks = workspace.getAllBlocks(false);
-  var variableHash = Object.create(null);
-  for (var i = 0, block; (block = blocks[i]); i++) {
-    var getDeveloperVariables = block.getDeveloperVariables;
+const allDeveloperVariables = function(workspace) {
+  const blocks = workspace.getAllBlocks(false);
+  const variableHash = Object.create(null);
+  for (let i = 0, block; (block = blocks[i]); i++) {
+    let getDeveloperVariables = block.getDeveloperVariables;
     if (!getDeveloperVariables && block.getDeveloperVars) {
       // August 2018: getDeveloperVars() was deprecated and renamed
       // getDeveloperVariables().
       getDeveloperVariables = block.getDeveloperVars;
-      if (!Blockly.Variables.ALL_DEVELOPER_VARS_WARNINGS_BY_BLOCK_TYPE_[
-          block.type]) {
-        console.warn('Function getDeveloperVars() deprecated. Use ' +
+      if (!ALL_DEVELOPER_VARS_WARNINGS_BY_BLOCK_TYPE[block.type]) {
+        console.warn(
+            'Function getDeveloperVars() deprecated. Use ' +
             'getDeveloperVariables() (block type \'' + block.type + '\')');
-        Blockly.Variables.ALL_DEVELOPER_VARS_WARNINGS_BY_BLOCK_TYPE_[
-            block.type] = true;
+        ALL_DEVELOPER_VARS_WARNINGS_BY_BLOCK_TYPE[block.type] = true;
       }
     }
     if (getDeveloperVariables) {
-      var devVars = getDeveloperVariables();
-      for (var j = 0; j < devVars.length; j++) {
+      const devVars = getDeveloperVariables();
+      for (let j = 0; j < devVars.length; j++) {
         variableHash[devVars[j]] = true;
       }
     }
@@ -110,57 +101,57 @@ Blockly.Variables.allDeveloperVariables = function(workspace) {
   // Flatten the hash into a list.
   return Object.keys(variableHash);
 };
+exports.allDeveloperVariables = allDeveloperVariables;
 
 /**
  * Construct the elements (blocks and button) required by the flyout for the
  * variable category.
- * @param {!Blockly.Workspace} workspace The workspace containing variables.
+ * @param {!Workspace} workspace The workspace containing variables.
  * @return {!Array<!Element>} Array of XML elements.
  */
-Blockly.Variables.flyoutCategory = function(workspace) {
-  var xmlList = [];
-  var button = document.createElement('button');
+const flyoutCategory = function(workspace) {
+  let xmlList = [];
+  const button = document.createElement('button');
   button.setAttribute('text', '%{BKY_NEW_VARIABLE}');
   button.setAttribute('callbackKey', 'CREATE_VARIABLE');
 
   workspace.registerButtonCallback('CREATE_VARIABLE', function(button) {
-    Blockly.Variables.createVariableButtonHandler(button.getTargetWorkspace());
+    createVariableButtonHandler(button.getTargetWorkspace());
   });
 
   xmlList.push(button);
 
-  var blockList = Blockly.Variables.flyoutCategoryBlocks(workspace);
+  const blockList = flyoutCategoryBlocks(workspace);
   xmlList = xmlList.concat(blockList);
   return xmlList;
 };
+exports.flyoutCategory = flyoutCategory;
 
 /**
  * Construct the blocks required by the flyout for the variable category.
- * @param {!Blockly.Workspace} workspace The workspace containing variables.
+ * @param {!Workspace} workspace The workspace containing variables.
  * @return {!Array<!Element>} Array of XML block elements.
  */
-Blockly.Variables.flyoutCategoryBlocks = function(workspace) {
-  var variableModelList = workspace.getVariablesOfType('');
+const flyoutCategoryBlocks = function(workspace) {
+  const variableModelList = workspace.getVariablesOfType('');
 
-  var xmlList = [];
+  const xmlList = [];
   if (variableModelList.length > 0) {
     // New variables are added to the end of the variableModelList.
-    var mostRecentVariable = variableModelList[variableModelList.length - 1];
-    if (Blockly.Blocks['variables_set']) {
-      var block = Blockly.utils.xml.createElement('block');
+    const mostRecentVariable = variableModelList[variableModelList.length - 1];
+    if (Blocks['variables_set']) {
+      const block = utilsXml.createElement('block');
       block.setAttribute('type', 'variables_set');
-      block.setAttribute('gap', Blockly.Blocks['math_change'] ? 8 : 24);
-      block.appendChild(
-          Blockly.Variables.generateVariableFieldDom(mostRecentVariable));
+      block.setAttribute('gap', Blocks['math_change'] ? 8 : 24);
+      block.appendChild(generateVariableFieldDom(mostRecentVariable));
       xmlList.push(block);
     }
-    if (Blockly.Blocks['math_change']) {
-      var block = Blockly.utils.xml.createElement('block');
+    if (Blocks['math_change']) {
+      const block = utilsXml.createElement('block');
       block.setAttribute('type', 'math_change');
-      block.setAttribute('gap', Blockly.Blocks['variables_get'] ? 20 : 8);
-      block.appendChild(
-          Blockly.Variables.generateVariableFieldDom(mostRecentVariable));
-      var value = Blockly.Xml.textToDom(
+      block.setAttribute('gap', Blocks['variables_get'] ? 20 : 8);
+      block.appendChild(generateVariableFieldDom(mostRecentVariable));
+      const value = Xml.textToDom(
           '<value name="DELTA">' +
           '<shadow type="math_number">' +
           '<field name="NUM">1</field>' +
@@ -170,35 +161,35 @@ Blockly.Variables.flyoutCategoryBlocks = function(workspace) {
       xmlList.push(block);
     }
 
-    if (Blockly.Blocks['variables_get']) {
-      variableModelList.sort(Blockly.VariableModel.compareByName);
-      for (var i = 0, variable; (variable = variableModelList[i]); i++) {
-        var block = Blockly.utils.xml.createElement('block');
+    if (Blocks['variables_get']) {
+      variableModelList.sort(VariableModel.compareByName);
+      for (let i = 0, variable; (variable = variableModelList[i]); i++) {
+        const block = utilsXml.createElement('block');
         block.setAttribute('type', 'variables_get');
         block.setAttribute('gap', 8);
-        block.appendChild(Blockly.Variables.generateVariableFieldDom(variable));
+        block.appendChild(generateVariableFieldDom(variable));
         xmlList.push(block);
       }
     }
   }
   return xmlList;
 };
+exports.flyoutCategoryBlocks = flyoutCategoryBlocks;
 
-Blockly.Variables.VAR_LETTER_OPTIONS = 'ijkmnopqrstuvwxyzabcdefgh';  // No 'l'.
+const VAR_LETTER_OPTIONS = 'ijkmnopqrstuvwxyzabcdefgh';  // No 'l'.
+exports.VAR_LETTER_OPTIONS = VAR_LETTER_OPTIONS;
 
 /**
  * Return a new variable name that is not yet being used. This will try to
  * generate single letter variable names in the range 'i' to 'z' to start with.
  * If no unique name is located it will try 'i' to 'z', 'a' to 'h',
  * then 'i2' to 'z2' etc.  Skip 'l'.
- * @param {!Blockly.Workspace} workspace The workspace to be unique in.
+ * @param {!Workspace} workspace The workspace to be unique in.
  * @return {string} New variable name.
  */
-Blockly.Variables.generateUniqueName = function(workspace) {
-  return Blockly.Variables.generateUniqueNameFromOptions(
-      Blockly.Variables.VAR_LETTER_OPTIONS.charAt(0),
-      workspace.getAllVariableNames()
-  );
+exports.generateUniqueName = function(workspace) {
+  return generateUniqueNameFromOptions(
+      VAR_LETTER_OPTIONS.charAt(0), workspace.getAllVariableNames());
 };
 
 /**
@@ -209,20 +200,20 @@ Blockly.Variables.generateUniqueName = function(workspace) {
  * @param {!Array<string>} usedNames A list of all of the used names.
  * @return {string} A unique name that is not present in the usedNames array.
  */
-Blockly.Variables.generateUniqueNameFromOptions = function(startChar, usedNames) {
+const generateUniqueNameFromOptions = function(startChar, usedNames) {
   if (!usedNames.length) {
     return startChar;
   }
 
-  var letters = Blockly.Variables.VAR_LETTER_OPTIONS;
-  var suffix = '';
-  var letterIndex = letters.indexOf(startChar);
-  var potName = startChar;
+  const letters = VAR_LETTER_OPTIONS;
+  let suffix = '';
+  let letterIndex = letters.indexOf(startChar);
+  let potName = startChar;
 
   // eslint-disable-next-line no-constant-condition
   while (true) {
-    var inUse = false;
-    for (var i = 0; i < usedNames.length; i++) {
+    let inUse = false;
+    for (let i = 0; i < usedNames.length; i++) {
       if (usedNames[i].toLowerCase() == potName) {
         inUse = true;
         break;
@@ -241,6 +232,7 @@ Blockly.Variables.generateUniqueNameFromOptions = function(startChar, usedNames)
     potName = letters.charAt(letterIndex) + suffix;
   }
 };
+exports.generateUniqueNameFromOptions = generateUniqueNameFromOptions;
 
 /**
  * Handles "Create Variable" button in the default variables toolbox category.
@@ -251,7 +243,7 @@ Blockly.Variables.generateUniqueNameFromOptions = function(startChar, usedNames)
  * types and after-creation processing. More complex customization (e.g.,
  * prompting for variable type) is beyond the scope of this function.
  *
- * @param {!Blockly.Workspace} workspace The workspace on which to create the
+ * @param {!Workspace} workspace The workspace on which to create the
  *     variable.
  * @param {function(?string=)=} opt_callback A callback. It will be passed an
  *     acceptable new variable name, or null if change is to be aborted (cancel
@@ -259,107 +251,88 @@ Blockly.Variables.generateUniqueNameFromOptions = function(startChar, usedNames)
  * @param {string=} opt_type The type of the variable like 'int', 'string', or
  *     ''. This will default to '', which is a specific type.
  */
-Blockly.Variables.createVariableButtonHandler = function(
+const createVariableButtonHandler = function(
     workspace, opt_callback, opt_type) {
-  var type = opt_type || '';
+  const type = opt_type || '';
   // This function needs to be named so it can be called recursively.
-  var promptAndCheckWithAlert = function(defaultName) {
-    Blockly.Variables.promptName(Blockly.Msg['NEW_VARIABLE_TITLE'], defaultName,
-        function(text) {
-          if (text) {
-            var existing =
-                Blockly.Variables.nameUsedWithAnyType(text, workspace);
-            if (existing) {
-              if (existing.type == type) {
-                var msg = Blockly.Msg['VARIABLE_ALREADY_EXISTS'].replace(
-                    '%1', existing.name);
-              } else {
-                var msg =
-                    Blockly.Msg['VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE'];
-                msg = msg.replace('%1', existing.name).replace('%2', existing.type);
-              }
-              Blockly.alert(msg,
-                  function() {
-                    promptAndCheckWithAlert(text);  // Recurse
-                  });
-            } else {
-              // No conflict
-              workspace.createVariable(text, type);
-              if (opt_callback) {
-                opt_callback(text);
-              }
-            }
+  const promptAndCheckWithAlert = function(defaultName) {
+    promptName(Msg['NEW_VARIABLE_TITLE'], defaultName, function(text) {
+      if (text) {
+        const existing = nameUsedWithAnyType(text, workspace);
+        if (existing) {
+          let msg;
+          if (existing.type == type) {
+            msg = Msg['VARIABLE_ALREADY_EXISTS'].replace('%1', existing.name);
           } else {
-            // User canceled prompt.
-            if (opt_callback) {
-              opt_callback(null);
-            }
+            msg = Msg['VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE'];
+            msg = msg.replace('%1', existing.name).replace('%2', existing.type);
           }
-        });
+          Blockly.alert(msg, function() {
+            promptAndCheckWithAlert(text);  // Recurse
+          });
+        } else {
+          // No conflict
+          workspace.createVariable(text, type);
+          if (opt_callback) {
+            opt_callback(text);
+          }
+        }
+      } else {
+        // User canceled prompt.
+        if (opt_callback) {
+          opt_callback(null);
+        }
+      }
+    });
   };
   promptAndCheckWithAlert('');
 };
-
-/**
- * Original name of Blockly.Variables.createVariableButtonHandler(..).
- * @deprecated Use Blockly.Variables.createVariableButtonHandler(..).
- *
- * @param {!Blockly.Workspace} workspace The workspace on which to create the
- *     variable.
- * @param {function(?string=)=} opt_callback A callback. It will be passed an
- *     acceptable new variable name, or null if change is to be aborted (cancel
- *     button), or undefined if an existing variable was chosen.
- * @param {string=} opt_type The type of the variable like 'int', 'string', or
- *     ''. This will default to '', which is a specific type.
- */
-Blockly.Variables.createVariable =
-    Blockly.Variables.createVariableButtonHandler;
+exports.createVariableButtonHandler = createVariableButtonHandler;
 
 /**
  * Opens a prompt that allows the user to enter a new name for a variable.
  * Triggers a rename if the new name is valid. Or re-prompts if there is a
  * collision.
- * @param {!Blockly.Workspace} workspace The workspace on which to rename the
+ * @param {!Workspace} workspace The workspace on which to rename the
  *     variable.
- * @param {!Blockly.VariableModel} variable Variable to rename.
+ * @param {!VariableModel} variable Variable to rename.
  * @param {function(?string=)=} opt_callback A callback. It will
  *     be passed an acceptable new variable name, or null if change is to be
  *     aborted (cancel button), or undefined if an existing variable was chosen.
  */
-Blockly.Variables.renameVariable = function(workspace, variable, opt_callback) {
+const renameVariable = function(workspace, variable, opt_callback) {
   // This function needs to be named so it can be called recursively.
-  var promptAndCheckWithAlert = function(defaultName) {
-    var promptText =
-        Blockly.Msg['RENAME_VARIABLE_TITLE'].replace('%1', variable.name);
-    Blockly.Variables.promptName(promptText, defaultName,
-        function(newName) {
-          if (newName) {
-            var existing = Blockly.Variables.nameUsedWithOtherType_(newName,
-                variable.type, workspace);
-            if (existing) {
-              var msg = Blockly.Msg['VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE']
-                  .replace('%1', existing.name)
-                  .replace('%2', existing.type);
-              Blockly.alert(msg,
-                  function() {
-                    promptAndCheckWithAlert(newName);  // Recurse
-                  });
-            } else {
-              workspace.renameVariableById(variable.getId(), newName);
-              if (opt_callback) {
-                opt_callback(newName);
-              }
-            }
-          } else {
-            // User canceled prompt.
-            if (opt_callback) {
-              opt_callback(null);
-            }
+  const promptAndCheckWithAlert = function(defaultName) {
+    const promptText =
+        Msg['RENAME_VARIABLE_TITLE'].replace('%1', variable.name);
+    promptName(promptText, defaultName, function(newName) {
+      if (newName) {
+        const existing =
+            nameUsedWithOtherType(newName, variable.type, workspace);
+        if (existing) {
+          const msg = Msg['VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE']
+                          .replace('%1', existing.name)
+                          .replace('%2', existing.type);
+          Blockly.alert(msg, function() {
+            promptAndCheckWithAlert(newName);  // Recurse
+          });
+        } else {
+          workspace.renameVariableById(variable.getId(), newName);
+          if (opt_callback) {
+            opt_callback(newName);
           }
-        });
+        }
+      } else {
+        // User canceled prompt.
+        if (opt_callback) {
+          opt_callback(null);
+        }
+      }
+    });
   };
   promptAndCheckWithAlert('');
 };
+exports.renameVariable = renameVariable;
 
 /**
  * Prompt the user for a new variable name.
@@ -368,14 +341,13 @@ Blockly.Variables.renameVariable = function(workspace, variable, opt_callback) {
  * @param {function(?string)} callback A callback. It will return the new
  *     variable name, or null if the user picked something illegal.
  */
-Blockly.Variables.promptName = function(promptText, defaultText, callback) {
+const promptName = function(promptText, defaultText, callback) {
   Blockly.prompt(promptText, defaultText, function(newVar) {
     // Merge runs of whitespace.  Strip leading and trailing whitespace.
     // Beyond this, all names are legal.
     if (newVar) {
       newVar = newVar.replace(/[\s\xa0]+/g, ' ').trim();
-      if (newVar == Blockly.Msg['RENAME_VARIABLE'] ||
-          newVar == Blockly.Msg['NEW_VARIABLE']) {
+      if (newVar == Msg['RENAME_VARIABLE'] || newVar == Msg['NEW_VARIABLE']) {
         // Ok, not ALL names are legal...
         newVar = null;
       }
@@ -383,23 +355,23 @@ Blockly.Variables.promptName = function(promptText, defaultText, callback) {
     callback(newVar);
   });
 };
+exports.promptName = promptName;
 
 /**
  * Check whether there exists a variable with the given name but a different
  * type.
  * @param {string} name The name to search for.
  * @param {string} type The type to exclude from the search.
- * @param {!Blockly.Workspace} workspace The workspace to search for the
+ * @param {!Workspace} workspace The workspace to search for the
  *     variable.
- * @return {?Blockly.VariableModel} The variable with the given name and a
+ * @return {?VariableModel} The variable with the given name and a
  *     different type, or null if none was found.
- * @private
  */
-Blockly.Variables.nameUsedWithOtherType_ = function(name, type, workspace) {
-  var allVariables = workspace.getVariableMap().getAllVariables();
+const nameUsedWithOtherType = function(name, type, workspace) {
+  const allVariables = workspace.getVariableMap().getAllVariables();
 
   name = name.toLowerCase();
-  for (var i = 0, variable; (variable = allVariables[i]); i++) {
+  for (let i = 0, variable; (variable = allVariables[i]); i++) {
     if (variable.name.toLowerCase() == name && variable.type != type) {
       return variable;
     }
@@ -410,84 +382,82 @@ Blockly.Variables.nameUsedWithOtherType_ = function(name, type, workspace) {
 /**
  * Check whether there exists a variable with the given name of any type.
  * @param {string} name The name to search for.
- * @param {!Blockly.Workspace} workspace The workspace to search for the
+ * @param {!Workspace} workspace The workspace to search for the
  *     variable.
- * @return {?Blockly.VariableModel} The variable with the given name,
+ * @return {?VariableModel} The variable with the given name,
  *     or null if none was found.
  */
-Blockly.Variables.nameUsedWithAnyType = function(name, workspace) {
-  var allVariables = workspace.getVariableMap().getAllVariables();
+const nameUsedWithAnyType = function(name, workspace) {
+  const allVariables = workspace.getVariableMap().getAllVariables();
 
   name = name.toLowerCase();
-  for (var i = 0, variable; (variable = allVariables[i]); i++) {
+  for (let i = 0, variable; (variable = allVariables[i]); i++) {
     if (variable.name.toLowerCase() == name) {
       return variable;
     }
   }
   return null;
 };
+exports.nameUsedWithAnyType = nameUsedWithAnyType;
 
 /**
  * Generate DOM objects representing a variable field.
- * @param {!Blockly.VariableModel} variableModel The variable model to
+ * @param {!VariableModel} variableModel The variable model to
  *     represent.
  * @return {?Element} The generated DOM.
- * @public
  */
-Blockly.Variables.generateVariableFieldDom = function(variableModel) {
+const generateVariableFieldDom = function(variableModel) {
   /* Generates the following XML:
    * <field name="VAR" id="goKTKmYJ8DhVHpruv" variabletype="int">foo</field>
    */
-  var field = Blockly.utils.xml.createElement('field');
+  const field = utilsXml.createElement('field');
   field.setAttribute('name', 'VAR');
   field.setAttribute('id', variableModel.getId());
   field.setAttribute('variabletype', variableModel.type);
-  var name = Blockly.utils.xml.createTextNode(variableModel.name);
+  const name = utilsXml.createTextNode(variableModel.name);
   field.appendChild(name);
   return field;
 };
+exports.generateVariableFieldDom = generateVariableFieldDom;
 
 /**
  * Helper function to look up or create a variable on the given workspace.
  * If no variable exists, creates and returns it.
- * @param {!Blockly.Workspace} workspace The workspace to search for the
+ * @param {!Workspace} workspace The workspace to search for the
  *     variable.  It may be a flyout workspace or main workspace.
  * @param {?string} id The ID to use to look up or create the variable, or null.
  * @param {string=} opt_name The string to use to look up or create the
  *     variable.
  * @param {string=} opt_type The type to use to look up or create the variable.
- * @return {!Blockly.VariableModel} The variable corresponding to the given ID
+ * @return {!VariableModel} The variable corresponding to the given ID
  *     or name + type combination.
  */
-Blockly.Variables.getOrCreateVariablePackage = function(workspace, id, opt_name,
-    opt_type) {
-  var variable = Blockly.Variables.getVariable(workspace, id, opt_name,
-      opt_type);
+const getOrCreateVariablePackage = function(workspace, id, opt_name, opt_type) {
+  let variable = getVariable(workspace, id, opt_name, opt_type);
   if (!variable) {
-    variable = Blockly.Variables.createVariable_(workspace, id, opt_name,
-        opt_type);
+    variable = createVariable(workspace, id, opt_name, opt_type);
   }
   return variable;
 };
+exports.getOrCreateVariablePackage = getOrCreateVariablePackage;
 
 /**
  * Look up  a variable on the given workspace.
  * Always looks in the main workspace before looking in the flyout workspace.
  * Always prefers lookup by ID to lookup by name + type.
- * @param {!Blockly.Workspace} workspace The workspace to search for the
+ * @param {!Workspace} workspace The workspace to search for the
  *     variable.  It may be a flyout workspace or main workspace.
  * @param {?string} id The ID to use to look up the variable, or null.
  * @param {string=} opt_name The string to use to look up the variable.
  *     Only used if lookup by ID fails.
  * @param {string=} opt_type The type to use to look up the variable.
  *     Only used if lookup by ID fails.
- * @return {?Blockly.VariableModel} The variable corresponding to the given ID
+ * @return {?VariableModel} The variable corresponding to the given ID
  *     or name + type combination, or null if not found.
- * @public
  */
-Blockly.Variables.getVariable = function(workspace, id, opt_name, opt_type) {
-  var potentialVariableMap = workspace.getPotentialVariableMap();
-  var variable = null;
+const getVariable = function(workspace, id, opt_name, opt_type) {
+  const potentialVariableMap = workspace.getPotentialVariableMap();
+  let variable = null;
   // Try to just get the variable, by ID if possible.
   if (id) {
     // Look in the real variable map before checking the potential variable map.
@@ -513,29 +483,28 @@ Blockly.Variables.getVariable = function(workspace, id, opt_name, opt_type) {
   }
   return variable;
 };
+exports.getVariable = getVariable;
 
 /**
  * Helper function to create a variable on the given workspace.
- * @param {!Blockly.Workspace} workspace The workspace in which to create the
+ * @param {!Workspace} workspace The workspace in which to create the
  * variable.  It may be a flyout workspace or main workspace.
  * @param {?string} id The ID to use to create the variable, or null.
  * @param {string=} opt_name The string to use to create the variable.
  * @param {string=} opt_type The type to use to create the variable.
- * @return {!Blockly.VariableModel} The variable corresponding to the given ID
+ * @return {!VariableModel} The variable corresponding to the given ID
  *     or name + type combination.
- * @private
  */
-Blockly.Variables.createVariable_ = function(workspace, id, opt_name,
-    opt_type) {
-  var potentialVariableMap = workspace.getPotentialVariableMap();
+const createVariable = function(workspace, id, opt_name, opt_type) {
+  const potentialVariableMap = workspace.getPotentialVariableMap();
   // Variables without names get uniquely named for this workspace.
   if (!opt_name) {
-    var ws = workspace.isFlyout ? workspace.targetWorkspace : workspace;
-    opt_name = Blockly.Variables.generateUniqueName(ws);
+    const ws = workspace.isFlyout ? workspace.targetWorkspace : workspace;
+    opt_name = exports.generateUniqueName(ws);
   }
 
   // Create a potential variable if in the flyout.
-  var variable = null;
+  let variable = null;
   if (potentialVariableMap) {
     variable = potentialVariableMap.createVariable(opt_name, opt_type, id);
   } else {  // In the main workspace, create a real variable.
@@ -548,20 +517,19 @@ Blockly.Variables.createVariable_ = function(workspace, id, opt_name,
  * Helper function to get the list of variables that have been added to the
  * workspace after adding a new block, using the given list of variables that
  * were in the workspace before the new block was added.
- * @param {!Blockly.Workspace} workspace The workspace to inspect.
- * @param {!Array<!Blockly.VariableModel>} originalVariables The array of
+ * @param {!Workspace} workspace The workspace to inspect.
+ * @param {!Array<!VariableModel>} originalVariables The array of
  *     variables that existed in the workspace before adding the new block.
- * @return {!Array<!Blockly.VariableModel>} The new array of variables that
+ * @return {!Array<!VariableModel>} The new array of variables that
  *     were freshly added to the workspace after creating the new block,
  *     or [] if no new variables were added to the workspace.
- * @package
  */
-Blockly.Variables.getAddedVariables = function(workspace, originalVariables) {
-  var allCurrentVariables = workspace.getAllVariables();
-  var addedVariables = [];
+const getAddedVariables = function(workspace, originalVariables) {
+  const allCurrentVariables = workspace.getAllVariables();
+  const addedVariables = [];
   if (originalVariables.length != allCurrentVariables.length) {
-    for (var i = 0; i < allCurrentVariables.length; i++) {
-      var variable = allCurrentVariables[i];
+    for (let i = 0; i < allCurrentVariables.length; i++) {
+      const variable = allCurrentVariables[i];
       // For any variable that is present in allCurrentVariables but not
       // present in originalVariables, add the variable to addedVariables.
       if (originalVariables.indexOf(variable) == -1) {
@@ -571,3 +539,5 @@ Blockly.Variables.getAddedVariables = function(workspace, originalVariables) {
   }
   return addedVariables;
 };
+/** @package */
+exports.getAddedVariables = getAddedVariables;
diff --git a/tests/deps.js b/tests/deps.js
index 8e73990eb..f6348dbeb 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -213,7 +213,7 @@ goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'],
 goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
 goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.xml']);
+goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.common', 'Blockly.utils.dom']);
diff --git a/tests/mocha/field_variable_test.js b/tests/mocha/field_variable_test.js
index 0048b8e09..eab65a16e 100644
--- a/tests/mocha/field_variable_test.js
+++ b/tests/mocha/field_variable_test.js
@@ -11,8 +11,8 @@ suite('Variable Fields', function() {
     sharedTestSetup.call(this);
     this.workspace = new Blockly.Workspace();
     // Stub for default variable name.
-    sinon.stub(Blockly.Variables, 'generateUniqueName')
-        .returns(FAKE_VARIABLE_NAME);
+    sinon.stub(Blockly.Variables, 'generateUniqueName').returns(
+      FAKE_VARIABLE_NAME);
   });
   teardown(function() {
     sharedTestTeardown.call(this);

From ee3f4d257b079a1f8009f8c18ce4b0ca3d6aed31 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 12 Aug 2021 11:44:08 -0700
Subject: [PATCH 641/833] Migrate core/utils/string.js to goog.module syntax
 (#5059)

* Migrate core/utils/string.js to ES6 const/let

* Migrate core/utils/string.js to goog.module

* clang-format core/utils/string.js

* Migrate core/utils/string.js to current exports convention

* Convert two remaining vars to lets in core/utils/string.js
---
 core/utils/string.js | 135 ++++++++++++++++++++++---------------------
 tests/deps.js        |   2 +-
 2 files changed, 71 insertions(+), 66 deletions(-)

diff --git a/core/utils/string.js b/core/utils/string.js
index 880401a4c..ce815616f 100644
--- a/core/utils/string.js
+++ b/core/utils/string.js
@@ -16,7 +16,8 @@
  * @name Blockly.utils.string
  * @namespace
  */
-goog.provide('Blockly.utils.string');
+goog.module('Blockly.utils.string');
+goog.module.declareLegacyNamespace();
 
 
 /**
@@ -26,23 +27,27 @@ goog.provide('Blockly.utils.string');
  * @param {string} prefix A string to look for at the start of `str`.
  * @return {boolean} True if `str` begins with `prefix`.
  */
-Blockly.utils.string.startsWith = function(str, prefix) {
+const startsWith = function(str, prefix) {
   return str.lastIndexOf(prefix, 0) == 0;
 };
+exports.startsWith = startsWith;
 
 /**
  * Given an array of strings, return the length of the shortest one.
  * @param {!Array<string>} array Array of strings.
  * @return {number} Length of shortest string.
  */
-Blockly.utils.string.shortestStringLength = function(array) {
+const shortestStringLength = function(array) {
   if (!array.length) {
     return 0;
   }
-  return array.reduce(function(a, b) {
-    return a.length < b.length ? a : b;
-  }).length;
+  return array
+      .reduce(function(a, b) {
+        return a.length < b.length ? a : b;
+      })
+      .length;
 };
+exports.shortestStringLength = shortestStringLength;
 
 /**
  * Given an array of strings, return the length of the common prefix.
@@ -51,17 +56,18 @@ Blockly.utils.string.shortestStringLength = function(array) {
  * @param {number=} opt_shortest Length of shortest string.
  * @return {number} Length of common prefix.
  */
-Blockly.utils.string.commonWordPrefix = function(array, opt_shortest) {
+const commonWordPrefix = function(array, opt_shortest) {
   if (!array.length) {
     return 0;
   } else if (array.length == 1) {
     return array[0].length;
   }
-  var wordPrefix = 0;
-  var max = opt_shortest || Blockly.utils.string.shortestStringLength(array);
-  for (var len = 0; len < max; len++) {
-    var letter = array[0][len];
-    for (var i = 1; i < array.length; i++) {
+  let wordPrefix = 0;
+  const max = opt_shortest || shortestStringLength(array);
+  let len;
+  for (len = 0; len < max; len++) {
+    const letter = array[0][len];
+    for (let i = 1; i < array.length; i++) {
       if (letter != array[i][len]) {
         return wordPrefix;
       }
@@ -70,14 +76,15 @@ Blockly.utils.string.commonWordPrefix = function(array, opt_shortest) {
       wordPrefix = len + 1;
     }
   }
-  for (var i = 1; i < array.length; i++) {
-    var letter = array[i][len];
+  for (let i = 1; i < array.length; i++) {
+    const letter = array[i][len];
     if (letter && letter != ' ') {
       return wordPrefix;
     }
   }
   return max;
 };
+exports.commonWordPrefix = commonWordPrefix;
 
 /**
  * Given an array of strings, return the length of the common suffix.
@@ -86,17 +93,18 @@ Blockly.utils.string.commonWordPrefix = function(array, opt_shortest) {
  * @param {number=} opt_shortest Length of shortest string.
  * @return {number} Length of common suffix.
  */
-Blockly.utils.string.commonWordSuffix = function(array, opt_shortest) {
+const commonWordSuffix = function(array, opt_shortest) {
   if (!array.length) {
     return 0;
   } else if (array.length == 1) {
     return array[0].length;
   }
-  var wordPrefix = 0;
-  var max = opt_shortest || Blockly.utils.string.shortestStringLength(array);
-  for (var len = 0; len < max; len++) {
-    var letter = array[0].substr(-len - 1, 1);
-    for (var i = 1; i < array.length; i++) {
+  let wordPrefix = 0;
+  const max = opt_shortest || shortestStringLength(array);
+  let len;
+  for (len = 0; len < max; len++) {
+    const letter = array[0].substr(-len - 1, 1);
+    for (let i = 1; i < array.length; i++) {
       if (letter != array[i].substr(-len - 1, 1)) {
         return wordPrefix;
       }
@@ -105,14 +113,15 @@ Blockly.utils.string.commonWordSuffix = function(array, opt_shortest) {
       wordPrefix = len + 1;
     }
   }
-  for (var i = 1; i < array.length; i++) {
-    var letter = array[i].charAt(array[i].length - len - 1);
+  for (let i = 1; i < array.length; i++) {
+    const letter = array[i].charAt(array[i].length - len - 1);
     if (letter && letter != ' ') {
       return wordPrefix;
     }
   }
   return max;
 };
+exports.commonWordSuffix = commonWordSuffix;
 
 /**
  * Wrap text to the specified width.
@@ -120,49 +129,49 @@ Blockly.utils.string.commonWordSuffix = function(array, opt_shortest) {
  * @param {number} limit Width to wrap each line.
  * @return {string} Wrapped text.
  */
-Blockly.utils.string.wrap = function(text, limit) {
-  var lines = text.split('\n');
-  for (var i = 0; i < lines.length; i++) {
-    lines[i] = Blockly.utils.string.wrapLine_(lines[i], limit);
+const wrap = function(text, limit) {
+  const lines = text.split('\n');
+  for (let i = 0; i < lines.length; i++) {
+    lines[i] = wrapLine(lines[i], limit);
   }
   return lines.join('\n');
 };
+exports.wrap = wrap;
 
 /**
  * Wrap single line of text to the specified width.
  * @param {string} text Text to wrap.
  * @param {number} limit Width to wrap each line.
  * @return {string} Wrapped text.
- * @private
  */
-Blockly.utils.string.wrapLine_ = function(text, limit) {
+const wrapLine = function(text, limit) {
   if (text.length <= limit) {
     // Short text, no need to wrap.
     return text;
   }
   // Split the text into words.
-  var words = text.trim().split(/\s+/);
+  const words = text.trim().split(/\s+/);
   // Set limit to be the length of the largest word.
-  for (var i = 0; i < words.length; i++) {
+  for (let i = 0; i < words.length; i++) {
     if (words[i].length > limit) {
       limit = words[i].length;
     }
   }
 
-  var lastScore;
-  var score = -Infinity;
-  var lastText;
-  var lineCount = 1;
+  let lastScore;
+  let score = -Infinity;
+  let lastText;
+  let lineCount = 1;
   do {
     lastScore = score;
     lastText = text;
     // Create a list of booleans representing if a space (false) or
     // a break (true) appears after each word.
-    var wordBreaks = [];
+    let wordBreaks = [];
     // Seed the list with evenly spaced linebreaks.
-    var steps = words.length / lineCount;
-    var insertedBreaks = 1;
-    for (var i = 0; i < words.length - 1; i++) {
+    const steps = words.length / lineCount;
+    let insertedBreaks = 1;
+    for (let i = 0; i < words.length - 1; i++) {
       if (insertedBreaks < (i + 1.5) / steps) {
         insertedBreaks++;
         wordBreaks[i] = true;
@@ -170,9 +179,9 @@ Blockly.utils.string.wrapLine_ = function(text, limit) {
         wordBreaks[i] = false;
       }
     }
-    wordBreaks = Blockly.utils.string.wrapMutate_(words, wordBreaks, limit);
-    score = Blockly.utils.string.wrapScore_(words, wordBreaks, limit);
-    text = Blockly.utils.string.wrapToText_(words, wordBreaks);
+    wordBreaks = wrapMutate(words, wordBreaks, limit);
+    score = wrapScore(words, wordBreaks, limit);
+    text = wrapToText(words, wordBreaks);
     lineCount++;
   } while (score > lastScore);
   return lastText;
@@ -184,14 +193,13 @@ Blockly.utils.string.wrapLine_ = function(text, limit) {
  * @param {!Array<boolean>} wordBreaks Array of line breaks.
  * @param {number} limit Width to wrap each line.
  * @return {number} Larger the better.
- * @private
  */
-Blockly.utils.string.wrapScore_ = function(words, wordBreaks, limit) {
+const wrapScore = function(words, wordBreaks, limit) {
   // If this function becomes a performance liability, add caching.
   // Compute the length of each line.
-  var lineLengths = [0];
-  var linePunctuation = [];
-  for (var i = 0; i < words.length; i++) {
+  const lineLengths = [0];
+  const linePunctuation = [];
+  for (let i = 0; i < words.length; i++) {
     lineLengths[lineLengths.length - 1] += words[i].length;
     if (wordBreaks[i] === true) {
       lineLengths.push(0);
@@ -200,10 +208,10 @@ Blockly.utils.string.wrapScore_ = function(words, wordBreaks, limit) {
       lineLengths[lineLengths.length - 1]++;
     }
   }
-  var maxLength = Math.max.apply(Math, lineLengths);
+  const maxLength = Math.max.apply(Math, lineLengths);
 
-  var score = 0;
-  for (var i = 0; i < lineLengths.length; i++) {
+  let score = 0;
+  for (let i = 0; i < lineLengths.length; i++) {
     // Optimize for width.
     // -2 points per char over limit (scaled to the power of 1.5).
     score -= Math.pow(Math.abs(limit - lineLengths[i]), 1.5) * 2;
@@ -222,8 +230,9 @@ Blockly.utils.string.wrapScore_ = function(words, wordBreaks, limit) {
   // previous line.  For example, this looks wrong:
   // aaa bbb
   // ccc ddd eee
-  if (lineLengths.length > 1 && lineLengths[lineLengths.length - 1] <=
-      lineLengths[lineLengths.length - 2]) {
+  if (lineLengths.length > 1 &&
+      lineLengths[lineLengths.length - 1] <=
+          lineLengths[lineLengths.length - 2]) {
     score += 0.5;
   }
   return score;
@@ -236,21 +245,19 @@ Blockly.utils.string.wrapScore_ = function(words, wordBreaks, limit) {
  * @param {!Array<boolean>} wordBreaks Array of line breaks.
  * @param {number} limit Width to wrap each line.
  * @return {!Array<boolean>} New array of optimal line breaks.
- * @private
  */
-Blockly.utils.string.wrapMutate_ = function(words, wordBreaks, limit) {
-  var bestScore = Blockly.utils.string.wrapScore_(words, wordBreaks, limit);
-  var bestBreaks;
+const wrapMutate = function(words, wordBreaks, limit) {
+  let bestScore = wrapScore(words, wordBreaks, limit);
+  let bestBreaks;
   // Try shifting every line break forward or backward.
-  for (var i = 0; i < wordBreaks.length - 1; i++) {
+  for (let i = 0; i < wordBreaks.length - 1; i++) {
     if (wordBreaks[i] == wordBreaks[i + 1]) {
       continue;
     }
-    var mutatedWordBreaks = [].concat(wordBreaks);
+    const mutatedWordBreaks = [].concat(wordBreaks);
     mutatedWordBreaks[i] = !mutatedWordBreaks[i];
     mutatedWordBreaks[i + 1] = !mutatedWordBreaks[i + 1];
-    var mutatedScore =
-        Blockly.utils.string.wrapScore_(words, mutatedWordBreaks, limit);
+    const mutatedScore = wrapScore(words, mutatedWordBreaks, limit);
     if (mutatedScore > bestScore) {
       bestScore = mutatedScore;
       bestBreaks = mutatedWordBreaks;
@@ -258,7 +265,7 @@ Blockly.utils.string.wrapMutate_ = function(words, wordBreaks, limit) {
   }
   if (bestBreaks) {
     // Found an improvement.  See if it may be improved further.
-    return Blockly.utils.string.wrapMutate_(words, bestBreaks, limit);
+    return wrapMutate(words, bestBreaks, limit);
   }
   // No improvements found.  Done.
   return wordBreaks;
@@ -269,11 +276,10 @@ Blockly.utils.string.wrapMutate_ = function(words, wordBreaks, limit) {
  * @param {!Array<string>} words Array of each word.
  * @param {!Array<boolean>} wordBreaks Array of line breaks.
  * @return {string} Plain text.
- * @private
  */
-Blockly.utils.string.wrapToText_ = function(words, wordBreaks) {
-  var text = [];
-  for (var i = 0; i < words.length; i++) {
+const wrapToText = function(words, wordBreaks) {
+  const text = [];
+  for (let i = 0; i < words.length; i++) {
     text.push(words[i]);
     if (wordBreaks[i] !== undefined) {
       text.push(wordBreaks[i] ? '\n' : ' ');
@@ -281,4 +287,3 @@ Blockly.utils.string.wrapToText_ = function(words, wordBreaks) {
   }
   return text.join('');
 };
-
diff --git a/tests/deps.js b/tests/deps.js
index f6348dbeb..5fc684c8a 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -204,7 +204,7 @@ goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], [],
 goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], []);
+goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Blockly.utils.Coordinate', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], []);
 goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], [], {'lang': 'es6', 'module': 'goog'});

From 7f213b968cbff2b4ff2395e9a6d71cdd1c09f6a9 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 11 Aug 2021 16:26:35 -0700
Subject: [PATCH 642/833] Migrate core/renderers/zelos/drawer.js to ES6
 const/let

---
 core/renderers/zelos/drawer.js | 42 +++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/core/renderers/zelos/drawer.js b/core/renderers/zelos/drawer.js
index be1a4fa04..febdb1e47 100644
--- a/core/renderers/zelos/drawer.js
+++ b/core/renderers/zelos/drawer.js
@@ -42,8 +42,8 @@ Blockly.utils.object.inherits(Blockly.zelos.Drawer,
  * @override
  */
 Blockly.zelos.Drawer.prototype.draw = function() {
-  var pathObject =
-    /** @type {!Blockly.zelos.PathObject} */ (this.block_.pathObject);
+  const pathObject =
+      /** @type {!Blockly.zelos.PathObject} */ (this.block_.pathObject);
   pathObject.beginDrawing();
   this.hideHiddenIcons_();
   this.drawOutline_();
@@ -106,8 +106,8 @@ Blockly.zelos.Drawer.prototype.drawRightSideRow_ = function(row) {
     return;
   }
   if (row.precedesStatement || row.followsStatement) {
-    var cornerHeight = this.constants_.INSIDE_CORNERS.rightHeight;
-    var remainingHeight = row.height -
+    const cornerHeight = this.constants_.INSIDE_CORNERS.rightHeight;
+    const remainingHeight = row.height -
         (row.precedesStatement ? cornerHeight : 0);
     this.outlinePath_ +=
         (row.followsStatement ?
@@ -152,7 +152,7 @@ Blockly.zelos.Drawer.prototype.drawLeftDynamicConnection_ = function() {
  * @protected
  */
 Blockly.zelos.Drawer.prototype.drawFlatTop_ = function() {
-  var topRow = this.info_.topRow;
+  const topRow = this.info_.topRow;
   this.positionPreviousConnection_();
 
   this.outlinePath_ +=
@@ -166,7 +166,7 @@ Blockly.zelos.Drawer.prototype.drawFlatTop_ = function() {
  * @protected
  */
 Blockly.zelos.Drawer.prototype.drawFlatBottom_ = function() {
-  var bottomRow = this.info_.bottomRow;
+  const bottomRow = this.info_.bottomRow;
   this.positionNextConnection_();
 
   this.outlinePath_ +=
@@ -181,18 +181,18 @@ Blockly.zelos.Drawer.prototype.drawFlatBottom_ = function() {
 Blockly.zelos.Drawer.prototype.drawInlineInput_ = function(input) {
   this.positionInlineInputConnection_(input);
 
-  var inputName = input.input.name;
+  const inputName = input.input.name;
   if (input.connectedBlock || this.info_.isInsertionMarker) {
     return;
   }
 
-  var width = input.width - (input.connectionWidth * 2);
-  var height = input.height;
-  var yPos = input.centerline - height / 2;
+  const width = input.width - (input.connectionWidth * 2);
+  const height = input.height;
+  const yPos = input.centerline - height / 2;
 
-  var connectionRight = input.xPos + input.connectionWidth;
+  const connectionRight = input.xPos + input.connectionWidth;
 
-  var outlinePath = Blockly.utils.svgPaths.moveTo(connectionRight, yPos) +
+  const outlinePath = Blockly.utils.svgPaths.moveTo(connectionRight, yPos) +
       Blockly.utils.svgPaths.lineOnAxis('h', width) +
       input.shape.pathRightDown(input.height) +
       Blockly.utils.svgPaths.lineOnAxis('h', -width) +
@@ -205,24 +205,24 @@ Blockly.zelos.Drawer.prototype.drawInlineInput_ = function(input) {
  * @override
  */
 Blockly.zelos.Drawer.prototype.drawStatementInput_ = function(row) {
-  var input = row.getLastInput();
+  const input = row.getLastInput();
   // Where to start drawing the notch, which is on the right side in LTR.
-  var x = input.xPos + input.notchOffset + input.shape.width;
+  const x = input.xPos + input.notchOffset + input.shape.width;
 
-  var innerTopLeftCorner =
+  const innerTopLeftCorner =
       input.shape.pathRight +
       Blockly.utils.svgPaths.lineOnAxis('h',
           -(input.notchOffset - this.constants_.INSIDE_CORNERS.width)) +
       this.constants_.INSIDE_CORNERS.pathTop;
 
-  var innerHeight =
+  const innerHeight =
       row.height - (2 * this.constants_.INSIDE_CORNERS.height);
 
-  var innerBottomLeftCorner =
-    this.constants_.INSIDE_CORNERS.pathBottom +
-    Blockly.utils.svgPaths.lineOnAxis('h',
-        (input.notchOffset - this.constants_.INSIDE_CORNERS.width)) +
-    (input.connectedBottomNextConnection ? '' : input.shape.pathLeft);
+  const innerBottomLeftCorner =
+      this.constants_.INSIDE_CORNERS.pathBottom +
+      Blockly.utils.svgPaths.lineOnAxis('h',
+          (input.notchOffset - this.constants_.INSIDE_CORNERS.width)) +
+      (input.connectedBottomNextConnection ? '' : input.shape.pathLeft);
 
   this.outlinePath_ += Blockly.utils.svgPaths.lineOnAxis('H', x) +
       innerTopLeftCorner +

From 8073b0e2827266566ec619df66660eca313e9d36 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 11 Aug 2021 16:27:33 -0700
Subject: [PATCH 643/833] Migrate core/renderers/zelos/drawer.js to goog.module

---
 core/renderers/zelos/drawer.js | 38 +++++++++++++++++++---------------
 tests/deps.js                  |  2 +-
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/core/renderers/zelos/drawer.js b/core/renderers/zelos/drawer.js
index febdb1e47..5781c8310 100644
--- a/core/renderers/zelos/drawer.js
+++ b/core/renderers/zelos/drawer.js
@@ -10,16 +10,18 @@
  */
 'use strict';
 
-goog.provide('Blockly.zelos.Drawer');
+goog.module('Blockly.zelos.Drawer');
+goog.module.declareLegacyNamespace();
 
+goog.require('Blockly.blockRendering');
 goog.require('Blockly.blockRendering.Drawer');
 goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.svgPaths');
-goog.require('Blockly.zelos.RenderInfo');
 
 goog.requireType('Blockly.blockRendering.Row');
 goog.requireType('Blockly.BlockSvg');
 goog.requireType('Blockly.zelos.PathObject');
+goog.requireType('Blockly.zelos.RenderInfo');
 
 
 /**
@@ -31,17 +33,17 @@ goog.requireType('Blockly.zelos.PathObject');
  * @constructor
  * @extends {Blockly.blockRendering.Drawer}
  */
-Blockly.zelos.Drawer = function(block, info) {
-  Blockly.zelos.Drawer.superClass_.constructor.call(this, block, info);
+const Drawer = function(block, info) {
+  Drawer.superClass_.constructor.call(this, block, info);
 };
-Blockly.utils.object.inherits(Blockly.zelos.Drawer,
+Blockly.utils.object.inherits(Drawer,
     Blockly.blockRendering.Drawer);
 
 
 /**
  * @override
  */
-Blockly.zelos.Drawer.prototype.draw = function() {
+Drawer.prototype.draw = function() {
   const pathObject =
       /** @type {!Blockly.zelos.PathObject} */ (this.block_.pathObject);
   pathObject.beginDrawing();
@@ -68,7 +70,7 @@ Blockly.zelos.Drawer.prototype.draw = function() {
 /**
  * @override
  */
-Blockly.zelos.Drawer.prototype.drawOutline_ = function() {
+Drawer.prototype.drawOutline_ = function() {
   if (this.info_.outputConnection &&
       this.info_.outputConnection.isDynamicShape &&
       !this.info_.hasStatementInput &&
@@ -78,19 +80,19 @@ Blockly.zelos.Drawer.prototype.drawOutline_ = function() {
     this.drawFlatBottom_();
     this.drawLeftDynamicConnection_();
   } else {
-    Blockly.zelos.Drawer.superClass_.drawOutline_.call(this);
+    Drawer.superClass_.drawOutline_.call(this);
   }
 };
 
 /**
  * @override
  */
-Blockly.zelos.Drawer.prototype.drawLeft_ = function() {
+Drawer.prototype.drawLeft_ = function() {
   if (this.info_.outputConnection &&
       this.info_.outputConnection.isDynamicShape) {
     this.drawLeftDynamicConnection_();
   } else {
-    Blockly.zelos.Drawer.superClass_.drawLeft_.call(this);
+    Drawer.superClass_.drawLeft_.call(this);
   }
 };
 
@@ -101,7 +103,7 @@ Blockly.zelos.Drawer.prototype.drawLeft_ = function() {
  *     side of.
  * @protected
  */
-Blockly.zelos.Drawer.prototype.drawRightSideRow_ = function(row) {
+Drawer.prototype.drawRightSideRow_ = function(row) {
   if (row.height <= 0) {
     return;
   }
@@ -127,7 +129,7 @@ Blockly.zelos.Drawer.prototype.drawRightSideRow_ = function(row) {
  * Add steps to draw the right side of an output with a dynamic connection.
  * @protected
  */
-Blockly.zelos.Drawer.prototype.drawRightDynamicConnection_ = function() {
+Drawer.prototype.drawRightDynamicConnection_ = function() {
   this.outlinePath_ += this.info_.outputConnection.shape.pathRightDown(
       this.info_.outputConnection.height);
 };
@@ -136,7 +138,7 @@ Blockly.zelos.Drawer.prototype.drawRightDynamicConnection_ = function() {
  * Add steps to draw the left side of an output with a dynamic connection.
  * @protected
  */
-Blockly.zelos.Drawer.prototype.drawLeftDynamicConnection_ = function() {
+Drawer.prototype.drawLeftDynamicConnection_ = function() {
   this.positionOutputConnection_();
 
   this.outlinePath_ += this.info_.outputConnection.shape.pathUp(
@@ -151,7 +153,7 @@ Blockly.zelos.Drawer.prototype.drawLeftDynamicConnection_ = function() {
  * Add steps to draw a flat top row.
  * @protected
  */
-Blockly.zelos.Drawer.prototype.drawFlatTop_ = function() {
+Drawer.prototype.drawFlatTop_ = function() {
   const topRow = this.info_.topRow;
   this.positionPreviousConnection_();
 
@@ -165,7 +167,7 @@ Blockly.zelos.Drawer.prototype.drawFlatTop_ = function() {
  * Add steps to draw a flat bottom row.
  * @protected
  */
-Blockly.zelos.Drawer.prototype.drawFlatBottom_ = function() {
+Drawer.prototype.drawFlatBottom_ = function() {
   const bottomRow = this.info_.bottomRow;
   this.positionNextConnection_();
 
@@ -178,7 +180,7 @@ Blockly.zelos.Drawer.prototype.drawFlatBottom_ = function() {
 /**
  * @override
  */
-Blockly.zelos.Drawer.prototype.drawInlineInput_ = function(input) {
+Drawer.prototype.drawInlineInput_ = function(input) {
   this.positionInlineInputConnection_(input);
 
   const inputName = input.input.name;
@@ -204,7 +206,7 @@ Blockly.zelos.Drawer.prototype.drawInlineInput_ = function(input) {
 /**
  * @override
  */
-Blockly.zelos.Drawer.prototype.drawStatementInput_ = function(row) {
+Drawer.prototype.drawStatementInput_ = function(row) {
   const input = row.getLastInput();
   // Where to start drawing the notch, which is on the right side in LTR.
   const x = input.xPos + input.notchOffset + input.shape.width;
@@ -232,3 +234,5 @@ Blockly.zelos.Drawer.prototype.drawStatementInput_ = function(row) {
 
   this.positionStatementInputConnection_(row);
 };
+
+exports = Drawer;
diff --git a/tests/deps.js b/tests/deps.js
index 5fc684c8a..d882746ad 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -164,7 +164,7 @@ goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.mini
 goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos', 'Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.zelos.RenderInfo']);
+goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos', 'Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow']);
 goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);

From e9f2d7087be213fb5661f696c290ac8c4d25f024 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 11 Aug 2021 16:29:44 -0700
Subject: [PATCH 644/833] Migrate core/renderers/zelos/drawer.js named requires

---
 core/renderers/zelos/drawer.js | 64 ++++++++++++++++++----------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/core/renderers/zelos/drawer.js b/core/renderers/zelos/drawer.js
index 5781c8310..e87b815fb 100644
--- a/core/renderers/zelos/drawer.js
+++ b/core/renderers/zelos/drawer.js
@@ -13,31 +13,33 @@
 goog.module('Blockly.zelos.Drawer');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering');
-goog.require('Blockly.blockRendering.Drawer');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.svgPaths');
-
-goog.requireType('Blockly.blockRendering.Row');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.zelos.PathObject');
-goog.requireType('Blockly.zelos.RenderInfo');
+const BaseDrawer = goog.require('Blockly.blockRendering.Drawer');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const PathObject = goog.requireType('Blockly.zelos.PathObject');
+/* eslint-disable-next-line no-unused-vars */
+const RenderInfo = goog.requireType('Blockly.zelos.RenderInfo');
+/* eslint-disable-next-line no-unused-vars */
+const Row = goog.requireType('Blockly.blockRendering.Row');
+const blockRendering = goog.require('Blockly.blockRendering');
+const object = goog.require('Blockly.utils.object');
+const svgPaths = goog.require('Blockly.utils.svgPaths');
 
 
 /**
  * An object that draws a block based on the given rendering information.
- * @param {!Blockly.BlockSvg} block The block to render.
- * @param {!Blockly.zelos.RenderInfo} info An object containing all
+ * @param {!BlockSvg} block The block to render.
+ * @param {!RenderInfo} info An object containing all
  *   information needed to render this block.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Drawer}
+ * @extends {BaseDrawer}
  */
 const Drawer = function(block, info) {
   Drawer.superClass_.constructor.call(this, block, info);
 };
-Blockly.utils.object.inherits(Drawer,
-    Blockly.blockRendering.Drawer);
+object.inherits(Drawer, BaseDrawer);
 
 
 /**
@@ -45,7 +47,7 @@ Blockly.utils.object.inherits(Drawer,
  */
 Drawer.prototype.draw = function() {
   const pathObject =
-      /** @type {!Blockly.zelos.PathObject} */ (this.block_.pathObject);
+      /** @type {!PathObject} */ (this.block_.pathObject);
   pathObject.beginDrawing();
   this.hideHiddenIcons_();
   this.drawOutline_();
@@ -55,7 +57,7 @@ Drawer.prototype.draw = function() {
   if (this.info_.RTL) {
     pathObject.flipRTL();
   }
-  if (Blockly.blockRendering.isDebuggerEnabled()) {
+  if (blockRendering.isDebuggerEnabled()) {
     this.block_.renderingDebugger.drawDebug(this.block_, this.info_);
   }
   this.recordSizeOnBlock_();
@@ -99,7 +101,7 @@ Drawer.prototype.drawLeft_ = function() {
 /**
  * Add steps for the right side of a row that does not have value or
  * statement input connections.
- * @param {!Blockly.blockRendering.Row} row The row to draw the
+ * @param {!Row} row The row to draw the
  *     side of.
  * @protected
  */
@@ -115,13 +117,13 @@ Drawer.prototype.drawRightSideRow_ = function(row) {
         (row.followsStatement ?
             this.constants_.INSIDE_CORNERS.pathBottomRight : '') +
         (remainingHeight > 0 ?
-            Blockly.utils.svgPaths
+            svgPaths
                 .lineOnAxis('V', row.yPos + remainingHeight) : '') +
         (row.precedesStatement ?
             this.constants_.INSIDE_CORNERS.pathTopRight : '');
   } else {
     this.outlinePath_ +=
-        Blockly.utils.svgPaths.lineOnAxis('V', row.yPos + row.height);
+        svgPaths.lineOnAxis('V', row.yPos + row.height);
   }
 };
 
@@ -158,9 +160,9 @@ Drawer.prototype.drawFlatTop_ = function() {
   this.positionPreviousConnection_();
 
   this.outlinePath_ +=
-      Blockly.utils.svgPaths.moveBy(topRow.xPos, this.info_.startY);
+      svgPaths.moveBy(topRow.xPos, this.info_.startY);
 
-  this.outlinePath_ += Blockly.utils.svgPaths.lineOnAxis('h', topRow.width);
+  this.outlinePath_ += svgPaths.lineOnAxis('h', topRow.width);
 };
 
 /**
@@ -172,9 +174,9 @@ Drawer.prototype.drawFlatBottom_ = function() {
   this.positionNextConnection_();
 
   this.outlinePath_ +=
-    Blockly.utils.svgPaths.lineOnAxis('V', bottomRow.baseline);
+    svgPaths.lineOnAxis('V', bottomRow.baseline);
 
-  this.outlinePath_ += Blockly.utils.svgPaths.lineOnAxis('h', -bottomRow.width);
+  this.outlinePath_ += svgPaths.lineOnAxis('h', -bottomRow.width);
 };
 
 /**
@@ -194,10 +196,10 @@ Drawer.prototype.drawInlineInput_ = function(input) {
 
   const connectionRight = input.xPos + input.connectionWidth;
 
-  const outlinePath = Blockly.utils.svgPaths.moveTo(connectionRight, yPos) +
-      Blockly.utils.svgPaths.lineOnAxis('h', width) +
+  const outlinePath = svgPaths.moveTo(connectionRight, yPos) +
+      svgPaths.lineOnAxis('h', width) +
       input.shape.pathRightDown(input.height) +
-      Blockly.utils.svgPaths.lineOnAxis('h', -width) +
+      svgPaths.lineOnAxis('h', -width) +
       input.shape.pathUp(input.height) +
       'z';
   this.block_.pathObject.setOutlinePath(inputName, outlinePath);
@@ -213,7 +215,7 @@ Drawer.prototype.drawStatementInput_ = function(row) {
 
   const innerTopLeftCorner =
       input.shape.pathRight +
-      Blockly.utils.svgPaths.lineOnAxis('h',
+      svgPaths.lineOnAxis('h',
           -(input.notchOffset - this.constants_.INSIDE_CORNERS.width)) +
       this.constants_.INSIDE_CORNERS.pathTop;
 
@@ -222,15 +224,15 @@ Drawer.prototype.drawStatementInput_ = function(row) {
 
   const innerBottomLeftCorner =
       this.constants_.INSIDE_CORNERS.pathBottom +
-      Blockly.utils.svgPaths.lineOnAxis('h',
+      svgPaths.lineOnAxis('h',
           (input.notchOffset - this.constants_.INSIDE_CORNERS.width)) +
       (input.connectedBottomNextConnection ? '' : input.shape.pathLeft);
 
-  this.outlinePath_ += Blockly.utils.svgPaths.lineOnAxis('H', x) +
+  this.outlinePath_ += svgPaths.lineOnAxis('H', x) +
       innerTopLeftCorner +
-      Blockly.utils.svgPaths.lineOnAxis('v', innerHeight) +
+      svgPaths.lineOnAxis('v', innerHeight) +
       innerBottomLeftCorner +
-      Blockly.utils.svgPaths.lineOnAxis('H', row.xPos + row.width);
+      svgPaths.lineOnAxis('H', row.xPos + row.width);
 
   this.positionStatementInputConnection_(row);
 };

From 5dff47a1f876a49f56cd37fb4d22986bf37b6c2e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 11 Aug 2021 16:29:51 -0700
Subject: [PATCH 645/833] clang-format core/renderers/zelos/drawer.js

---
 core/renderers/zelos/drawer.js | 52 ++++++++++++++--------------------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/core/renderers/zelos/drawer.js b/core/renderers/zelos/drawer.js
index e87b815fb..554859b93 100644
--- a/core/renderers/zelos/drawer.js
+++ b/core/renderers/zelos/drawer.js
@@ -111,19 +111,18 @@ Drawer.prototype.drawRightSideRow_ = function(row) {
   }
   if (row.precedesStatement || row.followsStatement) {
     const cornerHeight = this.constants_.INSIDE_CORNERS.rightHeight;
-    const remainingHeight = row.height -
-        (row.precedesStatement ? cornerHeight : 0);
+    const remainingHeight =
+        row.height - (row.precedesStatement ? cornerHeight : 0);
     this.outlinePath_ +=
-        (row.followsStatement ?
-            this.constants_.INSIDE_CORNERS.pathBottomRight : '') +
+        (row.followsStatement ? this.constants_.INSIDE_CORNERS.pathBottomRight :
+                                '') +
         (remainingHeight > 0 ?
-            svgPaths
-                .lineOnAxis('V', row.yPos + remainingHeight) : '') +
-        (row.precedesStatement ?
-            this.constants_.INSIDE_CORNERS.pathTopRight : '');
+             svgPaths.lineOnAxis('V', row.yPos + remainingHeight) :
+             '') +
+        (row.precedesStatement ? this.constants_.INSIDE_CORNERS.pathTopRight :
+                                 '');
   } else {
-    this.outlinePath_ +=
-        svgPaths.lineOnAxis('V', row.yPos + row.height);
+    this.outlinePath_ += svgPaths.lineOnAxis('V', row.yPos + row.height);
   }
 };
 
@@ -159,8 +158,7 @@ Drawer.prototype.drawFlatTop_ = function() {
   const topRow = this.info_.topRow;
   this.positionPreviousConnection_();
 
-  this.outlinePath_ +=
-      svgPaths.moveBy(topRow.xPos, this.info_.startY);
+  this.outlinePath_ += svgPaths.moveBy(topRow.xPos, this.info_.startY);
 
   this.outlinePath_ += svgPaths.lineOnAxis('h', topRow.width);
 };
@@ -173,8 +171,7 @@ Drawer.prototype.drawFlatBottom_ = function() {
   const bottomRow = this.info_.bottomRow;
   this.positionNextConnection_();
 
-  this.outlinePath_ +=
-    svgPaths.lineOnAxis('V', bottomRow.baseline);
+  this.outlinePath_ += svgPaths.lineOnAxis('V', bottomRow.baseline);
 
   this.outlinePath_ += svgPaths.lineOnAxis('h', -bottomRow.width);
 };
@@ -199,9 +196,7 @@ Drawer.prototype.drawInlineInput_ = function(input) {
   const outlinePath = svgPaths.moveTo(connectionRight, yPos) +
       svgPaths.lineOnAxis('h', width) +
       input.shape.pathRightDown(input.height) +
-      svgPaths.lineOnAxis('h', -width) +
-      input.shape.pathUp(input.height) +
-      'z';
+      svgPaths.lineOnAxis('h', -width) + input.shape.pathUp(input.height) + 'z';
   this.block_.pathObject.setOutlinePath(inputName, outlinePath);
 };
 
@@ -213,25 +208,20 @@ Drawer.prototype.drawStatementInput_ = function(row) {
   // Where to start drawing the notch, which is on the right side in LTR.
   const x = input.xPos + input.notchOffset + input.shape.width;
 
-  const innerTopLeftCorner =
-      input.shape.pathRight +
-      svgPaths.lineOnAxis('h',
-          -(input.notchOffset - this.constants_.INSIDE_CORNERS.width)) +
+  const innerTopLeftCorner = input.shape.pathRight +
+      svgPaths.lineOnAxis(
+          'h', -(input.notchOffset - this.constants_.INSIDE_CORNERS.width)) +
       this.constants_.INSIDE_CORNERS.pathTop;
 
-  const innerHeight =
-      row.height - (2 * this.constants_.INSIDE_CORNERS.height);
+  const innerHeight = row.height - (2 * this.constants_.INSIDE_CORNERS.height);
 
-  const innerBottomLeftCorner =
-      this.constants_.INSIDE_CORNERS.pathBottom +
-      svgPaths.lineOnAxis('h',
-          (input.notchOffset - this.constants_.INSIDE_CORNERS.width)) +
+  const innerBottomLeftCorner = this.constants_.INSIDE_CORNERS.pathBottom +
+      svgPaths.lineOnAxis(
+          'h', (input.notchOffset - this.constants_.INSIDE_CORNERS.width)) +
       (input.connectedBottomNextConnection ? '' : input.shape.pathLeft);
 
-  this.outlinePath_ += svgPaths.lineOnAxis('H', x) +
-      innerTopLeftCorner +
-      svgPaths.lineOnAxis('v', innerHeight) +
-      innerBottomLeftCorner +
+  this.outlinePath_ += svgPaths.lineOnAxis('H', x) + innerTopLeftCorner +
+      svgPaths.lineOnAxis('v', innerHeight) + innerBottomLeftCorner +
       svgPaths.lineOnAxis('H', row.xPos + row.width);
 
   this.positionStatementInputConnection_(row);

From 390cc692bbcfb8650a8f8425078861143bc06dd2 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 11 Aug 2021 16:36:14 -0700
Subject: [PATCH 646/833] Migrate core/renderers/zelos/info.js to ES6 const/let

---
 core/renderers/zelos/info.js | 125 ++++++++++++++++++-----------------
 1 file changed, 66 insertions(+), 59 deletions(-)

diff --git a/core/renderers/zelos/info.js b/core/renderers/zelos/info.js
index 078031756..441b2d24b 100644
--- a/core/renderers/zelos/info.js
+++ b/core/renderers/zelos/info.js
@@ -142,7 +142,7 @@ Blockly.zelos.RenderInfo.prototype.shouldStartNewRow_ = function(input,
  */
 Blockly.zelos.RenderInfo.prototype.getDesiredRowWidth_ = function(row) {
   if (row.hasStatement) {
-    var rightCornerWidth = this.constants_.INSIDE_CORNERS.rightWidth || 0;
+    const rightCornerWidth = this.constants_.INSIDE_CORNERS.rightWidth || 0;
     return this.width - this.startX - rightCornerWidth;
   }
   return Blockly.zelos.RenderInfo.superClass_.getDesiredRowWidth_.call(this,
@@ -192,13 +192,13 @@ Blockly.zelos.RenderInfo.prototype.getSpacerRowHeight_ = function(
       Blockly.blockRendering.Types.isBottomRow(next)) {
     return this.constants_.EMPTY_BLOCK_SPACER_HEIGHT;
   }
-  var followsStatement =
+  const followsStatement =
       Blockly.blockRendering.Types.isInputRow(prev) && prev.hasStatement;
-  var precedesStatement =
+  const precedesStatement =
       Blockly.blockRendering.Types.isInputRow(next) && next.hasStatement;
   if (precedesStatement || followsStatement) {
-    var cornerHeight = this.constants_.INSIDE_CORNERS.rightHeight || 0;
-    var height = Math.max(this.constants_.NOTCH_HEIGHT, cornerHeight);
+    const cornerHeight = this.constants_.INSIDE_CORNERS.rightHeight || 0;
+    const height = Math.max(this.constants_.NOTCH_HEIGHT, cornerHeight);
     return precedesStatement && followsStatement ?
         Math.max(height, this.constants_.DUMMY_INPUT_MIN_HEIGHT) : height;
   }
@@ -213,7 +213,7 @@ Blockly.zelos.RenderInfo.prototype.getSpacerRowHeight_ = function(
   }
   if ((Blockly.blockRendering.Types.isBottomRow(next))) {
     if (!this.outputConnection) {
-      var topHeight = Math.max(this.topRow.minHeight,
+      const topHeight = Math.max(this.topRow.minHeight,
           Math.max(this.constants_.NOTCH_HEIGHT,
               this.constants_.CORNER_RADIUS)) - this.constants_.CORNER_RADIUS;
       return topHeight;
@@ -230,7 +230,7 @@ Blockly.zelos.RenderInfo.prototype.getSpacerRowHeight_ = function(
  * @override
  */
 Blockly.zelos.RenderInfo.prototype.getSpacerRowWidth_ = function(prev, next) {
-  var width = this.width - this.startX;
+  const width = this.width - this.startX;
   if ((Blockly.blockRendering.Types.isInputRow(prev) && prev.hasStatement) ||
       (Blockly.blockRendering.Types.isInputRow(next) && next.hasStatement)) {
     return Math.max(width, this.constants_.STATEMENT_INPUT_SPACER_MIN_WIDTH);
@@ -247,7 +247,7 @@ Blockly.zelos.RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
     return row.yPos + this.constants_.EMPTY_STATEMENT_INPUT_HEIGHT / 2;
   }
   if (Blockly.blockRendering.Types.isInlineInput(elem)) {
-    var connectedBlock = elem.connectedBlock;
+    const connectedBlock = elem.connectedBlock;
     if (connectedBlock && connectedBlock.outputConnection &&
         connectedBlock.nextConnection) {
       return row.yPos + connectedBlock.height / 2;
@@ -278,8 +278,9 @@ Blockly.zelos.RenderInfo.prototype.addInput_ = function(input, activeRow) {
 Blockly.zelos.RenderInfo.prototype.addAlignmentPadding_ = function(row,
     missingSpace) {
   if (row.rightAlignedDummyInput) {
-    var alignmentDivider;
-    for (var i = 0, elem; (elem = row.elements[i]); i++) {
+    let alignmentDivider;
+    for (let i = 0; i < row.elements.length; i++) {
+      const elem = row.elements[i];
       if (Blockly.blockRendering.Types.isSpacer(elem)) {
         alignmentDivider = elem;
       }
@@ -305,20 +306,20 @@ Blockly.zelos.RenderInfo.prototype.addAlignmentPadding_ = function(row,
  * @protected
  */
 Blockly.zelos.RenderInfo.prototype.adjustXPosition_ = function() {
-  var notchTotalWidth = this.constants_.NOTCH_OFFSET_LEFT +
+  const notchTotalWidth = this.constants_.NOTCH_OFFSET_LEFT +
       this.constants_.NOTCH_WIDTH;
-  var minXPos = notchTotalWidth;
+  let minXPos = notchTotalWidth;
   // Run through every input row on the block and only apply bump logic to the
   // first input row (if the block has prev connection) and every input row that
   // has a prev and next notch.
-  for (var i = 2; i < this.rows.length - 1; i += 2) {
-    var prevSpacer = this.rows[i - 1];
-    var row = this.rows[i];
-    var nextSpacer = this.rows[i + 1];
+  for (let i = 2; i < this.rows.length - 1; i += 2) {
+    const prevSpacer = this.rows[i - 1];
+    const row = this.rows[i];
+    const nextSpacer = this.rows[i + 1];
 
-    var hasPrevNotch = i == 2 ?
+    const hasPrevNotch = i == 2 ?
         !!this.topRow.hasPreviousConnection : !!prevSpacer.followsStatement;
-    var hasNextNotch = i + 2 >= this.rows.length - 1 ?
+    const hasNextNotch = i + 2 >= this.rows.length - 1 ?
         !!this.bottomRow.hasNextConnection : !!nextSpacer.precedesStatement;
 
     if (Blockly.blockRendering.Types.isInputRow(row) && row.hasStatement) {
@@ -326,9 +327,10 @@ Blockly.zelos.RenderInfo.prototype.adjustXPosition_ = function() {
       minXPos = row.width - row.getLastInput().width + notchTotalWidth;
     } else if (hasPrevNotch && (i == 2 || hasNextNotch) &&
         Blockly.blockRendering.Types.isInputRow(row) && !row.hasStatement) {
-      var xCursor = row.xPos;
-      var prevInRowSpacer = null;
-      for (var j = 0, elem; (elem = row.elements[j]); j++) {
+      let xCursor = row.xPos;
+      let prevInRowSpacer = null;
+      for (let j = 0; i < row.elements.length; j++) {
+        const elem = row.elements[j];
         if (Blockly.blockRendering.Types.isSpacer(elem)) {
           prevInRowSpacer = elem;
         }
@@ -338,7 +340,7 @@ Blockly.zelos.RenderInfo.prototype.adjustXPosition_ = function() {
               !(Blockly.blockRendering.Types.isField(elem) &&
               (elem.field instanceof Blockly.FieldLabel ||
               elem.field instanceof Blockly.FieldImage))) {
-            var difference = minXPos - xCursor;
+            const difference = minXPos - xCursor;
             prevInRowSpacer.width += difference;
           }
         }
@@ -360,19 +362,20 @@ Blockly.zelos.RenderInfo.prototype.finalizeOutputConnection_ = function() {
   if (!this.outputConnection || !this.outputConnection.isDynamicShape) {
     return;
   }
-  var yCursor = 0;
+  let yCursor = 0;
   // Determine the block height.
-  for (var i = 0, row; (row = this.rows[i]); i++) {
+  for (let i = 0; i < this.rows.length; i++) {
+    const row = this.rows[i];
     row.yPos = yCursor;
     yCursor += row.height;
   }
   this.height = yCursor;
 
   // Adjust the height of the output connection.
-  var blockHeight = this.bottomRow.hasNextConnection ?
+  const blockHeight = this.bottomRow.hasNextConnection ?
       this.height - this.bottomRow.descenderHeight : this.height;
-  var connectionHeight = this.outputConnection.shape.height(blockHeight);
-  var connectionWidth = this.outputConnection.shape.width(blockHeight);
+  const connectionHeight = this.outputConnection.shape.height(blockHeight);
+  const connectionWidth = this.outputConnection.shape.width(blockHeight);
 
   this.outputConnection.height = connectionHeight;
   this.outputConnection.width = connectionWidth;
@@ -384,7 +387,7 @@ Blockly.zelos.RenderInfo.prototype.finalizeOutputConnection_ = function() {
 
   // Add the right connection measurable.
   // Don't add it if we have a value-to-statement or a value-to-stack block.
-  var rightConnectionWidth = 0;
+  let rightConnectionWidth = 0;
   if (!this.hasStatementInput && !this.bottomRow.hasNextConnection) {
     rightConnectionWidth = connectionWidth;
     this.rightSide.height = connectionHeight;
@@ -409,17 +412,18 @@ Blockly.zelos.RenderInfo.prototype.finalizeHorizontalAlignment_ = function() {
       this.bottomRow.hasNextConnection) {
     return;
   }
-  var totalNegativeSpacing = 0;
-  for (var i = 0, row; (row = this.rows[i]); i++) {
+  let totalNegativeSpacing = 0;
+  for (let i = 0; i < this.rows.length; i++) {
+    const row = this.rows[i];
     if (!Blockly.blockRendering.Types.isInputRow(row)) {
       continue;
     }
-    var firstElem = row.elements[1];
-    var lastElem = row.elements[row.elements.length - 2];
-    var leftNegPadding = this.getNegativeSpacing_(firstElem);
-    var rightNegPadding = this.getNegativeSpacing_(lastElem);
+    const firstElem = row.elements[1];
+    const lastElem = row.elements[row.elements.length - 2];
+    let leftNegPadding = this.getNegativeSpacing_(firstElem);
+    let rightNegPadding = this.getNegativeSpacing_(lastElem);
     totalNegativeSpacing = leftNegPadding + rightNegPadding;
-    var minBlockWidth = this.constants_.MIN_BLOCK_WIDTH +
+    const minBlockWidth = this.constants_.MIN_BLOCK_WIDTH +
         this.outputConnection.width * 2;
     if (this.width - totalNegativeSpacing < minBlockWidth) {
       // Maintain a minimum block width, split negative spacing between left
@@ -438,7 +442,8 @@ Blockly.zelos.RenderInfo.prototype.finalizeHorizontalAlignment_ = function() {
     this.width -= totalNegativeSpacing;
     this.widthWithChildren -= totalNegativeSpacing;
     this.rightSide.xPos -= totalNegativeSpacing;
-    for (var i = 0, row; (row = this.rows[i]); i++) {
+    for (let i = 0; i < this.rows.length; i++) {
+      const row = this.rows[i];
       if (Blockly.blockRendering.Types.isTopOrBottomRow(row)) {
         row.elements[1].width -= totalNegativeSpacing;
         row.elements[1].widthWithConnectedBlocks -= totalNegativeSpacing;
@@ -461,27 +466,28 @@ Blockly.zelos.RenderInfo.prototype.getNegativeSpacing_ = function(elem) {
   if (!elem) {
     return 0;
   }
-  var connectionWidth = this.outputConnection.width;
-  var outerShape = this.outputConnection.shape.type;
-  var constants =
-    /** @type {!Blockly.zelos.ConstantProvider} */ (this.constants_);
+  const connectionWidth = this.outputConnection.width;
+  const outerShape = this.outputConnection.shape.type;
+  const constants =
+      /** @type {!Blockly.zelos.ConstantProvider} */ (this.constants_);
   if (this.isMultiRow && this.inputRows.length > 1) {
     switch (outerShape) {
-      case constants.SHAPES.ROUND:
+      case constants.SHAPES.ROUND: {
         // Special case for multi-row round reporter blocks.
-        var maxWidth = this.constants_.MAX_DYNAMIC_CONNECTION_SHAPE_WIDTH;
-        var width = this.height / 2 > maxWidth ? maxWidth : this.height / 2;
-        var topPadding = this.constants_.SMALL_PADDING;
-        var roundPadding = width *
-          (1 - Math.sin(Math.acos((width - topPadding) / width)));
+        const maxWidth = this.constants_.MAX_DYNAMIC_CONNECTION_SHAPE_WIDTH;
+        const width = this.height / 2 > maxWidth ? maxWidth : this.height / 2;
+        const topPadding = this.constants_.SMALL_PADDING;
+        const roundPadding = width *
+            (1 - Math.sin(Math.acos((width - topPadding) / width)));
         return connectionWidth - roundPadding;
+      }
       default:
         return 0;
     }
   }
   if (Blockly.blockRendering.Types.isInlineInput(elem)) {
-    var connectedBlock = elem.connectedBlock;
-    var innerShape = connectedBlock ?
+    const connectedBlock = elem.connectedBlock;
+    const innerShape = connectedBlock ?
         connectedBlock.pathObject.outputShapeType :
         elem.shape.type;
     // Special case for value to stack / value to statement blocks.
@@ -522,19 +528,19 @@ Blockly.zelos.RenderInfo.prototype.finalizeVerticalAlignment_ = function() {
   }
   // Run through every input row on the block and only apply tight nesting logic
   // to input rows that have a prev and next notch.
-  for (var i = 2; i < this.rows.length - 1; i += 2) {
-    var prevSpacer = this.rows[i - 1];
-    var row = this.rows[i];
-    var nextSpacer = this.rows[i + 1];
+  for (let i = 2; i < this.rows.length - 1; i += 2) {
+    const prevSpacer = this.rows[i - 1];
+    const row = this.rows[i];
+    const nextSpacer = this.rows[i + 1];
 
-    var firstRow = i == 2;
-    var hasPrevNotch = firstRow ?
+    const firstRow = i == 2;
+    const hasPrevNotch = firstRow ?
         !!this.topRow.hasPreviousConnection : !!prevSpacer.followsStatement;
-    var hasNextNotch = i + 2 >= this.rows.length - 1 ?
+    const hasNextNotch = i + 2 >= this.rows.length - 1 ?
         !!this.bottomRow.hasNextConnection : !!nextSpacer.precedesStatement;
 
     if (hasPrevNotch) {
-      var hasSingleTextOrImageField = row.elements.length == 3 &&
+      const hasSingleTextOrImageField = row.elements.length == 3 &&
           (row.elements[1].field instanceof Blockly.FieldLabel ||
               row.elements[1].field instanceof Blockly.FieldImage);
       if (!firstRow && hasSingleTextOrImageField) {
@@ -547,9 +553,10 @@ Blockly.zelos.RenderInfo.prototype.finalizeVerticalAlignment_ = function() {
         prevSpacer.height += this.constants_.SMALL_PADDING;
       } else if (hasNextNotch) {
         // Determine if the input row has non-shadow connected blocks.
-        var hasNonShadowConnectedBlocks = false;
-        var MIN_VERTICAL_TIGHTNESTING_HEIGHT = 40;
-        for (var j = 0, elem; (elem = row.elements[j]); j++) {
+        let hasNonShadowConnectedBlocks = false;
+        const MIN_VERTICAL_TIGHTNESTING_HEIGHT = 40;
+        for (let j = 0; j < row.elements.length; j++) {
+          const elem = row.elements[j];
           if (Blockly.blockRendering.Types.isInlineInput(elem) &&
               elem.connectedBlock && !elem.connectedBlock.isShadow() &&
               elem.connectedBlock.getHeightWidth().height >=

From a0980ae3beab22ccfdffacf423e614a252fcc2f5 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 12 Aug 2021 09:23:45 -0700
Subject: [PATCH 647/833] Migrate core/renderers/zelos/info.js to goog.module

---
 core/renderers/zelos/info.js | 57 +++++++++++++++++++-----------------
 tests/deps.js                |  2 +-
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/core/renderers/zelos/info.js b/core/renderers/zelos/info.js
index 441b2d24b..642634c12 100644
--- a/core/renderers/zelos/info.js
+++ b/core/renderers/zelos/info.js
@@ -11,13 +11,13 @@
  */
 'use strict';
 
-goog.provide('Blockly.zelos');
-goog.provide('Blockly.zelos.RenderInfo');
+goog.module('Blockly.zelos.RenderInfo');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.InRowSpacer');
-goog.require('Blockly.blockRendering.Measurable');
 goog.require('Blockly.blockRendering.RenderInfo');
 goog.require('Blockly.blockRendering.Types');
+goog.require('Blockly.constants');
 goog.require('Blockly.FieldImage');
 goog.require('Blockly.FieldLabel');
 goog.require('Blockly.FieldTextInput');
@@ -27,6 +27,7 @@ goog.require('Blockly.zelos.BottomRow');
 goog.require('Blockly.zelos.RightConnectionShape');
 goog.require('Blockly.zelos.TopRow');
 
+goog.requireType('Blockly.blockRendering.Measurable');
 goog.requireType('Blockly.BlockSvg');
 goog.requireType('Blockly.zelos.ConstantProvider');
 goog.requireType('Blockly.zelos.Renderer');
@@ -45,8 +46,8 @@ goog.requireType('Blockly.zelos.Renderer');
  * @package
  * @extends {Blockly.blockRendering.RenderInfo}
  */
-Blockly.zelos.RenderInfo = function(renderer, block) {
-  Blockly.zelos.RenderInfo.superClass_.constructor.call(this, renderer, block);
+const RenderInfo = function(renderer, block) {
+  RenderInfo.superClass_.constructor.call(this, renderer, block);
 
   /**
    * An object with rendering information about the top row of the block.
@@ -87,7 +88,7 @@ Blockly.zelos.RenderInfo = function(renderer, block) {
   this.rightSide = this.outputConnection ?
       new Blockly.zelos.RightConnectionShape(this.constants_) : null;
 };
-Blockly.utils.object.inherits(Blockly.zelos.RenderInfo,
+Blockly.utils.object.inherits(RenderInfo,
     Blockly.blockRendering.RenderInfo);
 
 /**
@@ -95,14 +96,14 @@ Blockly.utils.object.inherits(Blockly.zelos.RenderInfo,
  * @return {!Blockly.zelos.Renderer} The block renderer in use.
  * @package
  */
-Blockly.zelos.RenderInfo.prototype.getRenderer = function() {
+RenderInfo.prototype.getRenderer = function() {
   return /** @type {!Blockly.zelos.Renderer} */ (this.renderer_);
 };
 
 /**
  * @override
  */
-Blockly.zelos.RenderInfo.prototype.measure = function() {
+RenderInfo.prototype.measure = function() {
   // Modifying parent measure method to add `adjustXPosition_`.
   this.createRows_();
   this.addElemSpacing_();
@@ -116,7 +117,7 @@ Blockly.zelos.RenderInfo.prototype.measure = function() {
 /**
  * @override
  */
-Blockly.zelos.RenderInfo.prototype.shouldStartNewRow_ = function(input,
+RenderInfo.prototype.shouldStartNewRow_ = function(input,
     lastInput) {
   // If this is the first input, just add to the existing row.
   // That row is either empty or has some icons in it.
@@ -140,19 +141,19 @@ Blockly.zelos.RenderInfo.prototype.shouldStartNewRow_ = function(input,
 /**
  * @override
  */
-Blockly.zelos.RenderInfo.prototype.getDesiredRowWidth_ = function(row) {
+RenderInfo.prototype.getDesiredRowWidth_ = function(row) {
   if (row.hasStatement) {
     const rightCornerWidth = this.constants_.INSIDE_CORNERS.rightWidth || 0;
     return this.width - this.startX - rightCornerWidth;
   }
-  return Blockly.zelos.RenderInfo.superClass_.getDesiredRowWidth_.call(this,
+  return RenderInfo.superClass_.getDesiredRowWidth_.call(this,
       row);
 };
 
 /**
  * @override
  */
-Blockly.zelos.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
+RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   if (!prev || !next) {
     // No need for padding at the beginning or end of the row if the
     // output shape is dynamic.
@@ -185,7 +186,7 @@ Blockly.zelos.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
 /**
  * @override
  */
-Blockly.zelos.RenderInfo.prototype.getSpacerRowHeight_ = function(
+RenderInfo.prototype.getSpacerRowHeight_ = function(
     prev, next) {
   // If we have an empty block add a spacer to increase the height.
   if (Blockly.blockRendering.Types.isTopRow(prev) &&
@@ -229,7 +230,7 @@ Blockly.zelos.RenderInfo.prototype.getSpacerRowHeight_ = function(
 /**
  * @override
  */
-Blockly.zelos.RenderInfo.prototype.getSpacerRowWidth_ = function(prev, next) {
+RenderInfo.prototype.getSpacerRowWidth_ = function(prev, next) {
   const width = this.width - this.startX;
   if ((Blockly.blockRendering.Types.isInputRow(prev) && prev.hasStatement) ||
       (Blockly.blockRendering.Types.isInputRow(next) && next.hasStatement)) {
@@ -241,7 +242,7 @@ Blockly.zelos.RenderInfo.prototype.getSpacerRowWidth_ = function(prev, next) {
 /**
  * @override
  */
-Blockly.zelos.RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
+RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
   if (row.hasStatement && !Blockly.blockRendering.Types.isSpacer(elem) &&
       !Blockly.blockRendering.Types.isStatementInput(elem)) {
     return row.yPos + this.constants_.EMPTY_STATEMENT_INPUT_HEIGHT / 2;
@@ -253,14 +254,14 @@ Blockly.zelos.RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
       return row.yPos + connectedBlock.height / 2;
     }
   }
-  return Blockly.zelos.RenderInfo.superClass_.getElemCenterline_.call(this,
+  return RenderInfo.superClass_.getElemCenterline_.call(this,
       row, elem);
 };
 
 /**
  * @override
  */
-Blockly.zelos.RenderInfo.prototype.addInput_ = function(input, activeRow) {
+RenderInfo.prototype.addInput_ = function(input, activeRow) {
   // If we have two dummy inputs on the same row, one aligned left and the other
   // right, keep track of the right aligned dummy input so we can add padding
   // later.
@@ -269,13 +270,13 @@ Blockly.zelos.RenderInfo.prototype.addInput_ = function(input, activeRow) {
       input.align == Blockly.constants.ALIGN.RIGHT) {
     activeRow.rightAlignedDummyInput = input;
   }
-  Blockly.zelos.RenderInfo.superClass_.addInput_.call(this, input, activeRow);
+  RenderInfo.superClass_.addInput_.call(this, input, activeRow);
 };
 
 /**
  * @override
  */
-Blockly.zelos.RenderInfo.prototype.addAlignmentPadding_ = function(row,
+RenderInfo.prototype.addAlignmentPadding_ = function(row,
     missingSpace) {
   if (row.rightAlignedDummyInput) {
     let alignmentDivider;
@@ -295,7 +296,7 @@ Blockly.zelos.RenderInfo.prototype.addAlignmentPadding_ = function(row,
       return;
     }
   }
-  Blockly.zelos.RenderInfo.superClass_.addAlignmentPadding_.call(this, row,
+  RenderInfo.superClass_.addAlignmentPadding_.call(this, row,
       missingSpace);
 };
 
@@ -305,7 +306,7 @@ Blockly.zelos.RenderInfo.prototype.addAlignmentPadding_ = function(row,
  * called.
  * @protected
  */
-Blockly.zelos.RenderInfo.prototype.adjustXPosition_ = function() {
+RenderInfo.prototype.adjustXPosition_ = function() {
   const notchTotalWidth = this.constants_.NOTCH_OFFSET_LEFT +
       this.constants_.NOTCH_WIDTH;
   let minXPos = notchTotalWidth;
@@ -357,7 +358,7 @@ Blockly.zelos.RenderInfo.prototype.adjustXPosition_ = function() {
  * output connection.
  * @protected
  */
-Blockly.zelos.RenderInfo.prototype.finalizeOutputConnection_ = function() {
+RenderInfo.prototype.finalizeOutputConnection_ = function() {
   // Dynamic output connections depend on the height of the block.
   if (!this.outputConnection || !this.outputConnection.isDynamicShape) {
     return;
@@ -407,7 +408,7 @@ Blockly.zelos.RenderInfo.prototype.finalizeOutputConnection_ = function() {
  * spacers.
  * @protected
  */
-Blockly.zelos.RenderInfo.prototype.finalizeHorizontalAlignment_ = function() {
+RenderInfo.prototype.finalizeHorizontalAlignment_ = function() {
   if (!this.outputConnection || this.hasStatementInput ||
       this.bottomRow.hasNextConnection) {
     return;
@@ -462,7 +463,7 @@ Blockly.zelos.RenderInfo.prototype.finalizeHorizontalAlignment_ = function() {
  * @return {number} The amount of spacing to reduce the first or last spacer.
  * @protected
  */
-Blockly.zelos.RenderInfo.prototype.getNegativeSpacing_ = function(elem) {
+RenderInfo.prototype.getNegativeSpacing_ = function(elem) {
   if (!elem) {
     return 0;
   }
@@ -522,7 +523,7 @@ Blockly.zelos.RenderInfo.prototype.getNegativeSpacing_ = function(elem) {
  * row's inline inputs.
  * @protected
  */
-Blockly.zelos.RenderInfo.prototype.finalizeVerticalAlignment_ = function() {
+RenderInfo.prototype.finalizeVerticalAlignment_ = function() {
   if (this.outputConnection) {
     return;
   }
@@ -579,13 +580,15 @@ Blockly.zelos.RenderInfo.prototype.finalizeVerticalAlignment_ = function() {
 /**
  * @override
  */
-Blockly.zelos.RenderInfo.prototype.finalize_ = function() {
+RenderInfo.prototype.finalize_ = function() {
   this.finalizeOutputConnection_();
   this.finalizeHorizontalAlignment_();
   this.finalizeVerticalAlignment_();
-  Blockly.zelos.RenderInfo.superClass_.finalize_.call(this);
+  RenderInfo.superClass_.finalize_.call(this);
 
   if (this.rightSide) {
     this.widthWithChildren += this.rightSide.width;
   }
 };
+
+exports = RenderInfo;
diff --git a/tests/deps.js b/tests/deps.js
index d882746ad..e013707cb 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -165,7 +165,7 @@ goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos', '
 goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos', 'Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow']);
+goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);

From 10e8349bad3d105a2b98d7ec09d676532eedf1c4 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 12 Aug 2021 09:33:41 -0700
Subject: [PATCH 648/833] Migrate core/renderers/zelos/info.js named requires

---
 core/renderers/zelos/info.js | 156 ++++++++++++++++++-----------------
 1 file changed, 79 insertions(+), 77 deletions(-)

diff --git a/core/renderers/zelos/info.js b/core/renderers/zelos/info.js
index 642634c12..fe2055faa 100644
--- a/core/renderers/zelos/info.js
+++ b/core/renderers/zelos/info.js
@@ -14,23 +14,26 @@
 goog.module('Blockly.zelos.RenderInfo');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.InRowSpacer');
-goog.require('Blockly.blockRendering.RenderInfo');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.constants');
-goog.require('Blockly.FieldImage');
-goog.require('Blockly.FieldLabel');
-goog.require('Blockly.FieldTextInput');
-goog.require('Blockly.inputTypes');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.zelos.BottomRow');
-goog.require('Blockly.zelos.RightConnectionShape');
-goog.require('Blockly.zelos.TopRow');
-
-goog.requireType('Blockly.blockRendering.Measurable');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.zelos.ConstantProvider');
-goog.requireType('Blockly.zelos.Renderer');
+const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const BottomRow = goog.require('Blockly.zelos.BottomRow');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.zelos.ConstantProvider');
+const FieldImage = goog.require('Blockly.FieldImage');
+const FieldLabel = goog.require('Blockly.FieldLabel');
+const FieldTextInput = goog.require('Blockly.FieldTextInput');
+const InRowSpacer = goog.require('Blockly.blockRendering.InRowSpacer');
+/* eslint-disable-next-line no-unused-vars */
+const Measurable = goog.requireType('Blockly.blockRendering.Measurable');
+/* eslint-disable-next-line no-unused-vars */
+const Renderer = goog.requireType('Blockly.zelos.Renderer');
+const RightConnectionShape = goog.require('Blockly.zelos.RightConnectionShape');
+const TopRow = goog.require('Blockly.zelos.TopRow');
+const Types = goog.require('Blockly.blockRendering.Types');
+const constants = goog.require('Blockly.constants');
+const inputTypes = goog.require('Blockly.inputTypes');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -40,28 +43,28 @@ goog.requireType('Blockly.zelos.Renderer');
  * may choose to rerender when getSize() is called).  However, calling it
  * repeatedly may be expensive.
  *
- * @param {!Blockly.zelos.Renderer} renderer The renderer in use.
- * @param {!Blockly.BlockSvg} block The block to measure.
+ * @param {!Renderer} renderer The renderer in use.
+ * @param {!BlockSvg} block The block to measure.
  * @constructor
  * @package
- * @extends {Blockly.blockRendering.RenderInfo}
+ * @extends {BaseRenderInfo}
  */
 const RenderInfo = function(renderer, block) {
   RenderInfo.superClass_.constructor.call(this, renderer, block);
 
   /**
    * An object with rendering information about the top row of the block.
-   * @type {!Blockly.zelos.TopRow}
+   * @type {!TopRow}
    * @override
    */
-  this.topRow = new Blockly.zelos.TopRow(this.constants_);
+  this.topRow = new TopRow(this.constants_);
 
   /**
    * An object with rendering information about the bottom row of the block.
-   * @type {!Blockly.zelos.BottomRow}
+   * @type {!BottomRow}
    * @override
    */
-  this.bottomRow = new Blockly.zelos.BottomRow(this.constants_);
+  this.bottomRow = new BottomRow(this.constants_);
 
   /**
    * @override
@@ -83,21 +86,20 @@ const RenderInfo = function(renderer, block) {
 
   /**
    * An object with rendering information about the right connection shape.
-   * @type {Blockly.zelos.RightConnectionShape}
+   * @type {RightConnectionShape}
    */
   this.rightSide = this.outputConnection ?
-      new Blockly.zelos.RightConnectionShape(this.constants_) : null;
+      new RightConnectionShape(this.constants_) : null;
 };
-Blockly.utils.object.inherits(RenderInfo,
-    Blockly.blockRendering.RenderInfo);
+object.inherits(RenderInfo, BaseRenderInfo);
 
 /**
  * Get the block renderer in use.
- * @return {!Blockly.zelos.Renderer} The block renderer in use.
+ * @return {!Renderer} The block renderer in use.
  * @package
  */
 RenderInfo.prototype.getRenderer = function() {
-  return /** @type {!Blockly.zelos.Renderer} */ (this.renderer_);
+  return /** @type {!Renderer} */ (this.renderer_);
 };
 
 /**
@@ -125,13 +127,13 @@ RenderInfo.prototype.shouldStartNewRow_ = function(input,
     return false;
   }
   // A statement input or an input following one always gets a new row.
-  if (input.type == Blockly.inputTypes.STATEMENT ||
-      lastInput.type == Blockly.inputTypes.STATEMENT) {
+  if (input.type == inputTypes.STATEMENT ||
+      lastInput.type == inputTypes.STATEMENT) {
     return true;
   }
   // Value and dummy inputs get new row if inputs are not inlined.
-  if (input.type == Blockly.inputTypes.VALUE ||
-      input.type == Blockly.inputTypes.DUMMY) {
+  if (input.type == inputTypes.VALUE ||
+      input.type == inputTypes.DUMMY) {
     return !this.isInline || this.isMultiRow;
   }
   return false;
@@ -164,20 +166,20 @@ RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   }
   if (!prev) {
     // Statement input padding.
-    if (next && Blockly.blockRendering.Types.isStatementInput(next)) {
+    if (next && Types.isStatementInput(next)) {
       return this.constants_.STATEMENT_INPUT_PADDING_LEFT;
     }
   }
   // Spacing between a rounded corner and a previous or next connection.
-  if (prev && Blockly.blockRendering.Types.isLeftRoundedCorner(prev) && next) {
-    if (Blockly.blockRendering.Types.isPreviousConnection(next) ||
-      Blockly.blockRendering.Types.isNextConnection(next)) {
+  if (prev && Types.isLeftRoundedCorner(prev) && next) {
+    if (Types.isPreviousConnection(next) ||
+      Types.isNextConnection(next)) {
       return next.notchOffset - this.constants_.CORNER_RADIUS;
     }
   }
   // Spacing between a square corner and a hat.
-  if (prev && Blockly.blockRendering.Types.isLeftSquareCorner(prev) && next &&
-      Blockly.blockRendering.Types.isHat(next)) {
+  if (prev && Types.isLeftSquareCorner(prev) && next &&
+      Types.isHat(next)) {
     return this.constants_.NO_PADDING;
   }
   return this.constants_.MEDIUM_PADDING;
@@ -189,14 +191,14 @@ RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
 RenderInfo.prototype.getSpacerRowHeight_ = function(
     prev, next) {
   // If we have an empty block add a spacer to increase the height.
-  if (Blockly.blockRendering.Types.isTopRow(prev) &&
-      Blockly.blockRendering.Types.isBottomRow(next)) {
+  if (Types.isTopRow(prev) &&
+      Types.isBottomRow(next)) {
     return this.constants_.EMPTY_BLOCK_SPACER_HEIGHT;
   }
   const followsStatement =
-      Blockly.blockRendering.Types.isInputRow(prev) && prev.hasStatement;
+      Types.isInputRow(prev) && prev.hasStatement;
   const precedesStatement =
-      Blockly.blockRendering.Types.isInputRow(next) && next.hasStatement;
+      Types.isInputRow(next) && next.hasStatement;
   if (precedesStatement || followsStatement) {
     const cornerHeight = this.constants_.INSIDE_CORNERS.rightHeight || 0;
     const height = Math.max(this.constants_.NOTCH_HEIGHT, cornerHeight);
@@ -204,7 +206,7 @@ RenderInfo.prototype.getSpacerRowHeight_ = function(
         Math.max(height, this.constants_.DUMMY_INPUT_MIN_HEIGHT) : height;
   }
   // Top and bottom rows act as a spacer so we don't need any extra padding.
-  if ((Blockly.blockRendering.Types.isTopRow(prev))) {
+  if ((Types.isTopRow(prev))) {
     if (!prev.hasPreviousConnection &&
         (!this.outputConnection || this.hasStatementInput)) {
       return Math.abs(this.constants_.NOTCH_HEIGHT -
@@ -212,7 +214,7 @@ RenderInfo.prototype.getSpacerRowHeight_ = function(
     }
     return this.constants_.NO_PADDING;
   }
-  if ((Blockly.blockRendering.Types.isBottomRow(next))) {
+  if ((Types.isBottomRow(next))) {
     if (!this.outputConnection) {
       const topHeight = Math.max(this.topRow.minHeight,
           Math.max(this.constants_.NOTCH_HEIGHT,
@@ -232,8 +234,8 @@ RenderInfo.prototype.getSpacerRowHeight_ = function(
  */
 RenderInfo.prototype.getSpacerRowWidth_ = function(prev, next) {
   const width = this.width - this.startX;
-  if ((Blockly.blockRendering.Types.isInputRow(prev) && prev.hasStatement) ||
-      (Blockly.blockRendering.Types.isInputRow(next) && next.hasStatement)) {
+  if ((Types.isInputRow(prev) && prev.hasStatement) ||
+      (Types.isInputRow(next) && next.hasStatement)) {
     return Math.max(width, this.constants_.STATEMENT_INPUT_SPACER_MIN_WIDTH);
   }
   return width;
@@ -243,11 +245,11 @@ RenderInfo.prototype.getSpacerRowWidth_ = function(prev, next) {
  * @override
  */
 RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
-  if (row.hasStatement && !Blockly.blockRendering.Types.isSpacer(elem) &&
-      !Blockly.blockRendering.Types.isStatementInput(elem)) {
+  if (row.hasStatement && !Types.isSpacer(elem) &&
+      !Types.isStatementInput(elem)) {
     return row.yPos + this.constants_.EMPTY_STATEMENT_INPUT_HEIGHT / 2;
   }
-  if (Blockly.blockRendering.Types.isInlineInput(elem)) {
+  if (Types.isInlineInput(elem)) {
     const connectedBlock = elem.connectedBlock;
     if (connectedBlock && connectedBlock.outputConnection &&
         connectedBlock.nextConnection) {
@@ -265,9 +267,9 @@ RenderInfo.prototype.addInput_ = function(input, activeRow) {
   // If we have two dummy inputs on the same row, one aligned left and the other
   // right, keep track of the right aligned dummy input so we can add padding
   // later.
-  if (input.type == Blockly.inputTypes.DUMMY && activeRow.hasDummyInput &&
-      activeRow.align == Blockly.constants.ALIGN.LEFT &&
-      input.align == Blockly.constants.ALIGN.RIGHT) {
+  if (input.type == inputTypes.DUMMY && activeRow.hasDummyInput &&
+      activeRow.align == constants.ALIGN.LEFT &&
+      input.align == constants.ALIGN.RIGHT) {
     activeRow.rightAlignedDummyInput = input;
   }
   RenderInfo.superClass_.addInput_.call(this, input, activeRow);
@@ -282,10 +284,10 @@ RenderInfo.prototype.addAlignmentPadding_ = function(row,
     let alignmentDivider;
     for (let i = 0; i < row.elements.length; i++) {
       const elem = row.elements[i];
-      if (Blockly.blockRendering.Types.isSpacer(elem)) {
+      if (Types.isSpacer(elem)) {
         alignmentDivider = elem;
       }
-      if (Blockly.blockRendering.Types.isField(elem) &&
+      if (Types.isField(elem) &&
         elem.parentInput == row.rightAlignedDummyInput) {
         break;
       }
@@ -323,24 +325,24 @@ RenderInfo.prototype.adjustXPosition_ = function() {
     const hasNextNotch = i + 2 >= this.rows.length - 1 ?
         !!this.bottomRow.hasNextConnection : !!nextSpacer.precedesStatement;
 
-    if (Blockly.blockRendering.Types.isInputRow(row) && row.hasStatement) {
+    if (Types.isInputRow(row) && row.hasStatement) {
       row.measure();
       minXPos = row.width - row.getLastInput().width + notchTotalWidth;
     } else if (hasPrevNotch && (i == 2 || hasNextNotch) &&
-        Blockly.blockRendering.Types.isInputRow(row) && !row.hasStatement) {
+        Types.isInputRow(row) && !row.hasStatement) {
       let xCursor = row.xPos;
       let prevInRowSpacer = null;
       for (let j = 0; i < row.elements.length; j++) {
         const elem = row.elements[j];
-        if (Blockly.blockRendering.Types.isSpacer(elem)) {
+        if (Types.isSpacer(elem)) {
           prevInRowSpacer = elem;
         }
-        if (prevInRowSpacer && (Blockly.blockRendering.Types.isField(elem) ||
-            Blockly.blockRendering.Types.isInput(elem))) {
+        if (prevInRowSpacer && (Types.isField(elem) ||
+            Types.isInput(elem))) {
           if (xCursor < minXPos &&
-              !(Blockly.blockRendering.Types.isField(elem) &&
-              (elem.field instanceof Blockly.FieldLabel ||
-              elem.field instanceof Blockly.FieldImage))) {
+              !(Types.isField(elem) &&
+              (elem.field instanceof FieldLabel ||
+              elem.field instanceof FieldImage))) {
             const difference = minXPos - xCursor;
             prevInRowSpacer.width += difference;
           }
@@ -416,7 +418,7 @@ RenderInfo.prototype.finalizeHorizontalAlignment_ = function() {
   let totalNegativeSpacing = 0;
   for (let i = 0; i < this.rows.length; i++) {
     const row = this.rows[i];
-    if (!Blockly.blockRendering.Types.isInputRow(row)) {
+    if (!Types.isInputRow(row)) {
       continue;
     }
     const firstElem = row.elements[1];
@@ -434,9 +436,9 @@ RenderInfo.prototype.finalizeHorizontalAlignment_ = function() {
       rightNegPadding = totalNegativeSpacing / 2;
     }
     // Add a negative spacer on the start and end of the block.
-    row.elements.unshift(new Blockly.blockRendering.InRowSpacer(this.constants_,
+    row.elements.unshift(new InRowSpacer(this.constants_,
         -leftNegPadding));
-    row.elements.push(new Blockly.blockRendering.InRowSpacer(this.constants_,
+    row.elements.push(new InRowSpacer(this.constants_,
         -rightNegPadding));
   }
   if (totalNegativeSpacing) {
@@ -445,7 +447,7 @@ RenderInfo.prototype.finalizeHorizontalAlignment_ = function() {
     this.rightSide.xPos -= totalNegativeSpacing;
     for (let i = 0; i < this.rows.length; i++) {
       const row = this.rows[i];
-      if (Blockly.blockRendering.Types.isTopOrBottomRow(row)) {
+      if (Types.isTopOrBottomRow(row)) {
         row.elements[1].width -= totalNegativeSpacing;
         row.elements[1].widthWithConnectedBlocks -= totalNegativeSpacing;
       }
@@ -458,7 +460,7 @@ RenderInfo.prototype.finalizeHorizontalAlignment_ = function() {
 /**
  * Calculate the spacing to reduce the left and right edges by based on the
  * outer and inner connection shape.
- * @param {Blockly.blockRendering.Measurable} elem The first or last element on
+ * @param {Measurable} elem The first or last element on
  *     a block.
  * @return {number} The amount of spacing to reduce the first or last spacer.
  * @protected
@@ -470,7 +472,7 @@ RenderInfo.prototype.getNegativeSpacing_ = function(elem) {
   const connectionWidth = this.outputConnection.width;
   const outerShape = this.outputConnection.shape.type;
   const constants =
-      /** @type {!Blockly.zelos.ConstantProvider} */ (this.constants_);
+      /** @type {!ConstantProvider} */ (this.constants_);
   if (this.isMultiRow && this.inputRows.length > 1) {
     switch (outerShape) {
       case constants.SHAPES.ROUND: {
@@ -486,7 +488,7 @@ RenderInfo.prototype.getNegativeSpacing_ = function(elem) {
         return 0;
     }
   }
-  if (Blockly.blockRendering.Types.isInlineInput(elem)) {
+  if (Types.isInlineInput(elem)) {
     const connectedBlock = elem.connectedBlock;
     const innerShape = connectedBlock ?
         connectedBlock.pathObject.outputShapeType :
@@ -503,15 +505,15 @@ RenderInfo.prototype.getNegativeSpacing_ = function(elem) {
     }
     return connectionWidth -
         this.constants_.SHAPE_IN_SHAPE_PADDING[outerShape][innerShape];
-  } else if (Blockly.blockRendering.Types.isField(elem)) {
+  } else if (Types.isField(elem)) {
     // Special case for text inputs.
     if (outerShape == constants.SHAPES.ROUND &&
-        elem.field instanceof Blockly.FieldTextInput) {
+        elem.field instanceof FieldTextInput) {
       return connectionWidth - (2.75 * constants.GRID_UNIT);
     }
     return connectionWidth -
         this.constants_.SHAPE_IN_SHAPE_PADDING[outerShape][0];
-  } else if (Blockly.blockRendering.Types.isIcon(elem)) {
+  } else if (Types.isIcon(elem)) {
     return this.constants_.SMALL_PADDING;
   }
   return 0;
@@ -542,8 +544,8 @@ RenderInfo.prototype.finalizeVerticalAlignment_ = function() {
 
     if (hasPrevNotch) {
       const hasSingleTextOrImageField = row.elements.length == 3 &&
-          (row.elements[1].field instanceof Blockly.FieldLabel ||
-              row.elements[1].field instanceof Blockly.FieldImage);
+          (row.elements[1].field instanceof FieldLabel ||
+              row.elements[1].field instanceof FieldImage);
       if (!firstRow && hasSingleTextOrImageField) {
         // Remove some padding if we have a single image or text field.
         prevSpacer.height -= this.constants_.SMALL_PADDING;
@@ -558,7 +560,7 @@ RenderInfo.prototype.finalizeVerticalAlignment_ = function() {
         const MIN_VERTICAL_TIGHTNESTING_HEIGHT = 40;
         for (let j = 0; j < row.elements.length; j++) {
           const elem = row.elements[j];
-          if (Blockly.blockRendering.Types.isInlineInput(elem) &&
+          if (Types.isInlineInput(elem) &&
               elem.connectedBlock && !elem.connectedBlock.isShadow() &&
               elem.connectedBlock.getHeightWidth().height >=
                   MIN_VERTICAL_TIGHTNESTING_HEIGHT) {

From 8e5fcaf724921ddd5c4fa4dfa04b06c09d7f79f0 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 12 Aug 2021 09:33:56 -0700
Subject: [PATCH 649/833] clang-format core/renderers/zelos/info.js

---
 core/renderers/zelos/info.js | 126 ++++++++++++++++-------------------
 1 file changed, 59 insertions(+), 67 deletions(-)

diff --git a/core/renderers/zelos/info.js b/core/renderers/zelos/info.js
index fe2055faa..c98826e27 100644
--- a/core/renderers/zelos/info.js
+++ b/core/renderers/zelos/info.js
@@ -88,8 +88,8 @@ const RenderInfo = function(renderer, block) {
    * An object with rendering information about the right connection shape.
    * @type {RightConnectionShape}
    */
-  this.rightSide = this.outputConnection ?
-      new RightConnectionShape(this.constants_) : null;
+  this.rightSide =
+      this.outputConnection ? new RightConnectionShape(this.constants_) : null;
 };
 object.inherits(RenderInfo, BaseRenderInfo);
 
@@ -119,8 +119,7 @@ RenderInfo.prototype.measure = function() {
 /**
  * @override
  */
-RenderInfo.prototype.shouldStartNewRow_ = function(input,
-    lastInput) {
+RenderInfo.prototype.shouldStartNewRow_ = function(input, lastInput) {
   // If this is the first input, just add to the existing row.
   // That row is either empty or has some icons in it.
   if (!lastInput) {
@@ -132,8 +131,7 @@ RenderInfo.prototype.shouldStartNewRow_ = function(input,
     return true;
   }
   // Value and dummy inputs get new row if inputs are not inlined.
-  if (input.type == inputTypes.VALUE ||
-      input.type == inputTypes.DUMMY) {
+  if (input.type == inputTypes.VALUE || input.type == inputTypes.DUMMY) {
     return !this.isInline || this.isMultiRow;
   }
   return false;
@@ -148,8 +146,7 @@ RenderInfo.prototype.getDesiredRowWidth_ = function(row) {
     const rightCornerWidth = this.constants_.INSIDE_CORNERS.rightWidth || 0;
     return this.width - this.startX - rightCornerWidth;
   }
-  return RenderInfo.superClass_.getDesiredRowWidth_.call(this,
-      row);
+  return RenderInfo.superClass_.getDesiredRowWidth_.call(this, row);
 };
 
 /**
@@ -172,14 +169,12 @@ RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   }
   // Spacing between a rounded corner and a previous or next connection.
   if (prev && Types.isLeftRoundedCorner(prev) && next) {
-    if (Types.isPreviousConnection(next) ||
-      Types.isNextConnection(next)) {
+    if (Types.isPreviousConnection(next) || Types.isNextConnection(next)) {
       return next.notchOffset - this.constants_.CORNER_RADIUS;
     }
   }
   // Spacing between a square corner and a hat.
-  if (prev && Types.isLeftSquareCorner(prev) && next &&
-      Types.isHat(next)) {
+  if (prev && Types.isLeftSquareCorner(prev) && next && Types.isHat(next)) {
     return this.constants_.NO_PADDING;
   }
   return this.constants_.MEDIUM_PADDING;
@@ -188,41 +183,41 @@ RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
 /**
  * @override
  */
-RenderInfo.prototype.getSpacerRowHeight_ = function(
-    prev, next) {
+RenderInfo.prototype.getSpacerRowHeight_ = function(prev, next) {
   // If we have an empty block add a spacer to increase the height.
-  if (Types.isTopRow(prev) &&
-      Types.isBottomRow(next)) {
+  if (Types.isTopRow(prev) && Types.isBottomRow(next)) {
     return this.constants_.EMPTY_BLOCK_SPACER_HEIGHT;
   }
-  const followsStatement =
-      Types.isInputRow(prev) && prev.hasStatement;
-  const precedesStatement =
-      Types.isInputRow(next) && next.hasStatement;
+  const followsStatement = Types.isInputRow(prev) && prev.hasStatement;
+  const precedesStatement = Types.isInputRow(next) && next.hasStatement;
   if (precedesStatement || followsStatement) {
     const cornerHeight = this.constants_.INSIDE_CORNERS.rightHeight || 0;
     const height = Math.max(this.constants_.NOTCH_HEIGHT, cornerHeight);
     return precedesStatement && followsStatement ?
-        Math.max(height, this.constants_.DUMMY_INPUT_MIN_HEIGHT) : height;
+        Math.max(height, this.constants_.DUMMY_INPUT_MIN_HEIGHT) :
+        height;
   }
   // Top and bottom rows act as a spacer so we don't need any extra padding.
-  if ((Types.isTopRow(prev))) {
+  if (Types.isTopRow(prev)) {
     if (!prev.hasPreviousConnection &&
         (!this.outputConnection || this.hasStatementInput)) {
-      return Math.abs(this.constants_.NOTCH_HEIGHT -
-          this.constants_.CORNER_RADIUS);
+      return Math.abs(
+          this.constants_.NOTCH_HEIGHT - this.constants_.CORNER_RADIUS);
     }
     return this.constants_.NO_PADDING;
   }
-  if ((Types.isBottomRow(next))) {
+  if (Types.isBottomRow(next)) {
     if (!this.outputConnection) {
-      const topHeight = Math.max(this.topRow.minHeight,
-          Math.max(this.constants_.NOTCH_HEIGHT,
-              this.constants_.CORNER_RADIUS)) - this.constants_.CORNER_RADIUS;
+      const topHeight = Math.max(
+                            this.topRow.minHeight,
+                            Math.max(
+                                this.constants_.NOTCH_HEIGHT,
+                                this.constants_.CORNER_RADIUS)) -
+          this.constants_.CORNER_RADIUS;
       return topHeight;
     } else if (!next.hasNextConnection && this.hasStatementInput) {
-      return Math.abs(this.constants_.NOTCH_HEIGHT -
-          this.constants_.CORNER_RADIUS);
+      return Math.abs(
+          this.constants_.NOTCH_HEIGHT - this.constants_.CORNER_RADIUS);
     }
     return this.constants_.NO_PADDING;
   }
@@ -256,8 +251,7 @@ RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
       return row.yPos + connectedBlock.height / 2;
     }
   }
-  return RenderInfo.superClass_.getElemCenterline_.call(this,
-      row, elem);
+  return RenderInfo.superClass_.getElemCenterline_.call(this, row, elem);
 };
 
 /**
@@ -278,8 +272,7 @@ RenderInfo.prototype.addInput_ = function(input, activeRow) {
 /**
  * @override
  */
-RenderInfo.prototype.addAlignmentPadding_ = function(row,
-    missingSpace) {
+RenderInfo.prototype.addAlignmentPadding_ = function(row, missingSpace) {
   if (row.rightAlignedDummyInput) {
     let alignmentDivider;
     for (let i = 0; i < row.elements.length; i++) {
@@ -288,7 +281,7 @@ RenderInfo.prototype.addAlignmentPadding_ = function(row,
         alignmentDivider = elem;
       }
       if (Types.isField(elem) &&
-        elem.parentInput == row.rightAlignedDummyInput) {
+          elem.parentInput == row.rightAlignedDummyInput) {
         break;
       }
     }
@@ -298,8 +291,7 @@ RenderInfo.prototype.addAlignmentPadding_ = function(row,
       return;
     }
   }
-  RenderInfo.superClass_.addAlignmentPadding_.call(this, row,
-      missingSpace);
+  RenderInfo.superClass_.addAlignmentPadding_.call(this, row, missingSpace);
 };
 
 /**
@@ -309,8 +301,8 @@ RenderInfo.prototype.addAlignmentPadding_ = function(row,
  * @protected
  */
 RenderInfo.prototype.adjustXPosition_ = function() {
-  const notchTotalWidth = this.constants_.NOTCH_OFFSET_LEFT +
-      this.constants_.NOTCH_WIDTH;
+  const notchTotalWidth =
+      this.constants_.NOTCH_OFFSET_LEFT + this.constants_.NOTCH_WIDTH;
   let minXPos = notchTotalWidth;
   // Run through every input row on the block and only apply bump logic to the
   // first input row (if the block has prev connection) and every input row that
@@ -320,16 +312,18 @@ RenderInfo.prototype.adjustXPosition_ = function() {
     const row = this.rows[i];
     const nextSpacer = this.rows[i + 1];
 
-    const hasPrevNotch = i == 2 ?
-        !!this.topRow.hasPreviousConnection : !!prevSpacer.followsStatement;
+    const hasPrevNotch = i == 2 ? !!this.topRow.hasPreviousConnection :
+                                  !!prevSpacer.followsStatement;
     const hasNextNotch = i + 2 >= this.rows.length - 1 ?
-        !!this.bottomRow.hasNextConnection : !!nextSpacer.precedesStatement;
+        !!this.bottomRow.hasNextConnection :
+        !!nextSpacer.precedesStatement;
 
     if (Types.isInputRow(row) && row.hasStatement) {
       row.measure();
       minXPos = row.width - row.getLastInput().width + notchTotalWidth;
-    } else if (hasPrevNotch && (i == 2 || hasNextNotch) &&
-        Types.isInputRow(row) && !row.hasStatement) {
+    } else if (
+        hasPrevNotch && (i == 2 || hasNextNotch) && Types.isInputRow(row) &&
+        !row.hasStatement) {
       let xCursor = row.xPos;
       let prevInRowSpacer = null;
       for (let j = 0; i < row.elements.length; j++) {
@@ -337,12 +331,11 @@ RenderInfo.prototype.adjustXPosition_ = function() {
         if (Types.isSpacer(elem)) {
           prevInRowSpacer = elem;
         }
-        if (prevInRowSpacer && (Types.isField(elem) ||
-            Types.isInput(elem))) {
+        if (prevInRowSpacer && (Types.isField(elem) || Types.isInput(elem))) {
           if (xCursor < minXPos &&
               !(Types.isField(elem) &&
-              (elem.field instanceof FieldLabel ||
-              elem.field instanceof FieldImage))) {
+                (elem.field instanceof FieldLabel ||
+                 elem.field instanceof FieldImage))) {
             const difference = minXPos - xCursor;
             prevInRowSpacer.width += difference;
           }
@@ -376,7 +369,8 @@ RenderInfo.prototype.finalizeOutputConnection_ = function() {
 
   // Adjust the height of the output connection.
   const blockHeight = this.bottomRow.hasNextConnection ?
-      this.height - this.bottomRow.descenderHeight : this.height;
+      this.height - this.bottomRow.descenderHeight :
+      this.height;
   const connectionHeight = this.outputConnection.shape.height(blockHeight);
   const connectionWidth = this.outputConnection.shape.width(blockHeight);
 
@@ -426,8 +420,8 @@ RenderInfo.prototype.finalizeHorizontalAlignment_ = function() {
     let leftNegPadding = this.getNegativeSpacing_(firstElem);
     let rightNegPadding = this.getNegativeSpacing_(lastElem);
     totalNegativeSpacing = leftNegPadding + rightNegPadding;
-    const minBlockWidth = this.constants_.MIN_BLOCK_WIDTH +
-        this.outputConnection.width * 2;
+    const minBlockWidth =
+        this.constants_.MIN_BLOCK_WIDTH + this.outputConnection.width * 2;
     if (this.width - totalNegativeSpacing < minBlockWidth) {
       // Maintain a minimum block width, split negative spacing between left
       // and right edge.
@@ -436,10 +430,8 @@ RenderInfo.prototype.finalizeHorizontalAlignment_ = function() {
       rightNegPadding = totalNegativeSpacing / 2;
     }
     // Add a negative spacer on the start and end of the block.
-    row.elements.unshift(new InRowSpacer(this.constants_,
-        -leftNegPadding));
-    row.elements.push(new InRowSpacer(this.constants_,
-        -rightNegPadding));
+    row.elements.unshift(new InRowSpacer(this.constants_, -leftNegPadding));
+    row.elements.push(new InRowSpacer(this.constants_, -rightNegPadding));
   }
   if (totalNegativeSpacing) {
     this.width -= totalNegativeSpacing;
@@ -480,8 +472,8 @@ RenderInfo.prototype.getNegativeSpacing_ = function(elem) {
         const maxWidth = this.constants_.MAX_DYNAMIC_CONNECTION_SHAPE_WIDTH;
         const width = this.height / 2 > maxWidth ? maxWidth : this.height / 2;
         const topPadding = this.constants_.SMALL_PADDING;
-        const roundPadding = width *
-            (1 - Math.sin(Math.acos((width - topPadding) / width)));
+        const roundPadding =
+            width * (1 - Math.sin(Math.acos((width - topPadding) / width)));
         return connectionWidth - roundPadding;
       }
       default:
@@ -499,8 +491,7 @@ RenderInfo.prototype.getNegativeSpacing_ = function(elem) {
       return 0;
     }
     // Special case for hexagonal output.
-    if (outerShape == constants.SHAPES.HEXAGONAL &&
-        outerShape != innerShape) {
+    if (outerShape == constants.SHAPES.HEXAGONAL && outerShape != innerShape) {
       return 0;
     }
     return connectionWidth -
@@ -537,15 +528,16 @@ RenderInfo.prototype.finalizeVerticalAlignment_ = function() {
     const nextSpacer = this.rows[i + 1];
 
     const firstRow = i == 2;
-    const hasPrevNotch = firstRow ?
-        !!this.topRow.hasPreviousConnection : !!prevSpacer.followsStatement;
+    const hasPrevNotch = firstRow ? !!this.topRow.hasPreviousConnection :
+                                    !!prevSpacer.followsStatement;
     const hasNextNotch = i + 2 >= this.rows.length - 1 ?
-        !!this.bottomRow.hasNextConnection : !!nextSpacer.precedesStatement;
+        !!this.bottomRow.hasNextConnection :
+        !!nextSpacer.precedesStatement;
 
     if (hasPrevNotch) {
       const hasSingleTextOrImageField = row.elements.length == 3 &&
           (row.elements[1].field instanceof FieldLabel ||
-              row.elements[1].field instanceof FieldImage);
+           row.elements[1].field instanceof FieldImage);
       if (!firstRow && hasSingleTextOrImageField) {
         // Remove some padding if we have a single image or text field.
         prevSpacer.height -= this.constants_.SMALL_PADDING;
@@ -557,13 +549,13 @@ RenderInfo.prototype.finalizeVerticalAlignment_ = function() {
       } else if (hasNextNotch) {
         // Determine if the input row has non-shadow connected blocks.
         let hasNonShadowConnectedBlocks = false;
-        const MIN_VERTICAL_TIGHTNESTING_HEIGHT = 40;
+        const minVerticalTightNestingHeight = 40;
         for (let j = 0; j < row.elements.length; j++) {
           const elem = row.elements[j];
-          if (Types.isInlineInput(elem) &&
-              elem.connectedBlock && !elem.connectedBlock.isShadow() &&
+          if (Types.isInlineInput(elem) && elem.connectedBlock &&
+              !elem.connectedBlock.isShadow() &&
               elem.connectedBlock.getHeightWidth().height >=
-                  MIN_VERTICAL_TIGHTNESTING_HEIGHT) {
+                  minVerticalTightNestingHeight) {
             hasNonShadowConnectedBlocks = true;
             break;
           }

From 428621688fe5b0903ad09c76c2a37c691e91984b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 12 Aug 2021 15:34:57 -0700
Subject: [PATCH 650/833] Migrate core/renderers/zelos/marker_svg.js to ES6
 const/let

---
 core/renderers/zelos/marker_svg.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/renderers/zelos/marker_svg.js b/core/renderers/zelos/marker_svg.js
index d260e11e3..e43e6eafd 100644
--- a/core/renderers/zelos/marker_svg.js
+++ b/core/renderers/zelos/marker_svg.js
@@ -46,9 +46,9 @@ Blockly.utils.object.inherits(Blockly.zelos.MarkerSvg,
  * @private
  */
 Blockly.zelos.MarkerSvg.prototype.showWithInputOutput_ = function(curNode) {
-  var block = /** @type {!Blockly.BlockSvg} */ (curNode.getSourceBlock());
-  var connection = /** @type {!Blockly.Connection} */ (curNode.getLocation());
-  var offsetInBlock = connection.getOffsetInBlock();
+  const block = /** @type {!Blockly.BlockSvg} */ (curNode.getSourceBlock());
+  const connection = /** @type {!Blockly.Connection} */ (curNode.getLocation());
+  const offsetInBlock = connection.getOffsetInBlock();
 
   this.positionCircle_(offsetInBlock.x, offsetInBlock.y);
   this.setParent_(block);
@@ -74,10 +74,10 @@ Blockly.zelos.MarkerSvg.prototype.showWithInput_ = function(curNode) {
  * @param {!Blockly.ASTNode} curNode The current node of the marker.
  */
 Blockly.zelos.MarkerSvg.prototype.showWithBlock_ = function(curNode) {
-  var block = /** @type {!Blockly.BlockSvg} */ (curNode.getLocation());
+  const block = /** @type {!Blockly.BlockSvg} */ (curNode.getLocation());
 
   // Gets the height and width of entire stack.
-  var heightWidth = block.getHeightWidth();
+  const heightWidth = block.getHeightWidth();
 
   // Add padding so that being on a stack looks different than being on a block.
   this.positionRect_(0, 0, heightWidth.width, heightWidth.height);
@@ -130,7 +130,7 @@ Blockly.zelos.MarkerSvg.prototype.createDomInternal_ = function() {
 
   // Markers and stack cursors don't blink.
   if (this.isCursor()) {
-    var blinkProperties = this.getBlinkProperties_();
+    const blinkProperties = this.getBlinkProperties_();
     Blockly.utils.dom.createSvgElement(
         Blockly.utils.Svg.ANIMATE, blinkProperties,
         this.markerCircle_);
@@ -149,7 +149,7 @@ Blockly.zelos.MarkerSvg.prototype.applyColour_ = function(curNode) {
   this.markerCircle_.setAttribute('stroke', this.colour_);
 
   if (this.isCursor()) {
-    var values = this.colour_ + ';transparent;transparent;';
+    const values = this.colour_ + ';transparent;transparent;';
     this.markerCircle_.firstChild.setAttribute('values', values);
   }
 };

From 42ce46bdd88adc3ec665e0c4313a52d7163fa08e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 12 Aug 2021 15:43:30 -0700
Subject: [PATCH 651/833] Migrate core/renderers/zelos/marker_svg.js to
 goog.module

---
 core/renderers/zelos/marker_svg.js | 34 +++++++++++++++++-------------
 tests/deps.js                      |  2 +-
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/core/renderers/zelos/marker_svg.js b/core/renderers/zelos/marker_svg.js
index e43e6eafd..467a812fa 100644
--- a/core/renderers/zelos/marker_svg.js
+++ b/core/renderers/zelos/marker_svg.js
@@ -10,10 +10,12 @@
  */
 'use strict';
 
-goog.provide('Blockly.zelos.MarkerSvg');
+goog.module('Blockly.zelos.MarkerSvg');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.MarkerSvg');
 goog.require('Blockly.utils.dom');
+goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.Svg');
 
 goog.requireType('Blockly.ASTNode');
@@ -33,11 +35,11 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @constructor
  * @extends {Blockly.blockRendering.MarkerSvg}
  */
-Blockly.zelos.MarkerSvg = function(workspace, constants, marker) {
-  Blockly.zelos.MarkerSvg.superClass_.constructor.call(
+const MarkerSvg = function(workspace, constants, marker) {
+  MarkerSvg.superClass_.constructor.call(
       this, workspace, constants, marker);
 };
-Blockly.utils.object.inherits(Blockly.zelos.MarkerSvg,
+Blockly.utils.object.inherits(MarkerSvg,
     Blockly.blockRendering.MarkerSvg);
 
 /**
@@ -45,7 +47,7 @@ Blockly.utils.object.inherits(Blockly.zelos.MarkerSvg,
  * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
  * @private
  */
-Blockly.zelos.MarkerSvg.prototype.showWithInputOutput_ = function(curNode) {
+MarkerSvg.prototype.showWithInputOutput_ = function(curNode) {
   const block = /** @type {!Blockly.BlockSvg} */ (curNode.getSourceBlock());
   const connection = /** @type {!Blockly.Connection} */ (curNode.getLocation());
   const offsetInBlock = connection.getOffsetInBlock();
@@ -58,14 +60,14 @@ Blockly.zelos.MarkerSvg.prototype.showWithInputOutput_ = function(curNode) {
 /**
  * @override
  */
-Blockly.zelos.MarkerSvg.prototype.showWithOutput_ = function(curNode) {
+MarkerSvg.prototype.showWithOutput_ = function(curNode) {
   this.showWithInputOutput_(curNode);
 };
 
 /**
  * @override
  */
-Blockly.zelos.MarkerSvg.prototype.showWithInput_ = function(curNode) {
+MarkerSvg.prototype.showWithInput_ = function(curNode) {
   this.showWithInputOutput_(curNode);
 };
 
@@ -73,7 +75,7 @@ Blockly.zelos.MarkerSvg.prototype.showWithInput_ = function(curNode) {
  * Draw a rectangle around the block.
  * @param {!Blockly.ASTNode} curNode The current node of the marker.
  */
-Blockly.zelos.MarkerSvg.prototype.showWithBlock_ = function(curNode) {
+MarkerSvg.prototype.showWithBlock_ = function(curNode) {
   const block = /** @type {!Blockly.BlockSvg} */ (curNode.getLocation());
 
   // Gets the height and width of entire stack.
@@ -91,7 +93,7 @@ Blockly.zelos.MarkerSvg.prototype.showWithBlock_ = function(curNode) {
  * @param {number} y The y position of the circle.
  * @private
  */
-Blockly.zelos.MarkerSvg.prototype.positionCircle_ = function(x, y) {
+MarkerSvg.prototype.positionCircle_ = function(x, y) {
   this.markerCircle_.setAttribute('cx', x);
   this.markerCircle_.setAttribute('cy', y);
   this.currentMarkerSvg = this.markerCircle_;
@@ -100,15 +102,15 @@ Blockly.zelos.MarkerSvg.prototype.positionCircle_ = function(x, y) {
 /**
  * @override
  */
-Blockly.zelos.MarkerSvg.prototype.hide = function() {
-  Blockly.zelos.MarkerSvg.superClass_.hide.call(this);
+MarkerSvg.prototype.hide = function() {
+  MarkerSvg.superClass_.hide.call(this);
   this.markerCircle_.style.display = 'none';
 };
 
 /**
  * @override
  */
-Blockly.zelos.MarkerSvg.prototype.createDomInternal_ = function() {
+MarkerSvg.prototype.createDomInternal_ = function() {
   /* This markup will be generated and added to the .svgGroup_:
   <g>
     <rect width="100" height="5">
@@ -118,7 +120,7 @@ Blockly.zelos.MarkerSvg.prototype.createDomInternal_ = function() {
   </g>
   */
 
-  Blockly.zelos.MarkerSvg.superClass_.createDomInternal_.call(this);
+  MarkerSvg.superClass_.createDomInternal_.call(this);
 
   this.markerCircle_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.CIRCLE, {
@@ -142,8 +144,8 @@ Blockly.zelos.MarkerSvg.prototype.createDomInternal_ = function() {
 /**
  * @override
  */
-Blockly.zelos.MarkerSvg.prototype.applyColour_ = function(curNode) {
-  Blockly.zelos.MarkerSvg.superClass_.applyColour_.call(this, curNode);
+MarkerSvg.prototype.applyColour_ = function(curNode) {
+  MarkerSvg.superClass_.applyColour_.call(this, curNode);
 
   this.markerCircle_.setAttribute('fill', this.colour_);
   this.markerCircle_.setAttribute('stroke', this.colour_);
@@ -153,3 +155,5 @@ Blockly.zelos.MarkerSvg.prototype.applyColour_ = function(curNode) {
     this.markerCircle_.firstChild.setAttribute('values', values);
   }
 };
+
+exports = MarkerSvg;
diff --git a/tests/deps.js b/tests/deps.js
index e013707cb..c8fd0c781 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -166,7 +166,7 @@ goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos
 goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/zelos/measurables/rows.js', ['Blockly.zelos.BottomRow', 'Blockly.zelos.TopRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.TopRow', 'Blockly.utils.object']);

From 52d6af787e1ced59c93df66444ca0e7e937ca245 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 12 Aug 2021 15:46:17 -0700
Subject: [PATCH 652/833] Migrate core/renderers/zelos/marker_svg.js named
 requires

---
 core/renderers/zelos/marker_svg.js | 57 ++++++++++++++++--------------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/core/renderers/zelos/marker_svg.js b/core/renderers/zelos/marker_svg.js
index 467a812fa..a2ad38da1 100644
--- a/core/renderers/zelos/marker_svg.js
+++ b/core/renderers/zelos/marker_svg.js
@@ -13,43 +13,48 @@
 goog.module('Blockly.zelos.MarkerSvg');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.MarkerSvg');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Svg');
-
-goog.requireType('Blockly.ASTNode');
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.Connection');
-goog.requireType('Blockly.Marker');
-goog.requireType('Blockly.WorkspaceSvg');
+/* 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 BlockSvg = goog.requireType('Blockly.BlockSvg');
+/* 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');
 
 
 /**
  * Class to draw a marker.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace the marker belongs to.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The constants for
+ * @param {!WorkspaceSvg} workspace The workspace the marker belongs to.
+ * @param {!ConstantProvider} constants The constants for
  *     the renderer.
- * @param {!Blockly.Marker} marker The marker to draw.
+ * @param {!Marker} marker The marker to draw.
  * @constructor
- * @extends {Blockly.blockRendering.MarkerSvg}
+ * @extends {BaseMarkerSvg}
  */
 const MarkerSvg = function(workspace, constants, marker) {
   MarkerSvg.superClass_.constructor.call(
       this, workspace, constants, marker);
 };
-Blockly.utils.object.inherits(MarkerSvg,
-    Blockly.blockRendering.MarkerSvg);
+object.inherits(MarkerSvg,
+    BaseMarkerSvg);
 
 /**
  * Position and display the marker for an input or an output connection.
- * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
+ * @param {!ASTNode} curNode The node to draw the marker for.
  * @private
  */
 MarkerSvg.prototype.showWithInputOutput_ = function(curNode) {
-  const block = /** @type {!Blockly.BlockSvg} */ (curNode.getSourceBlock());
-  const connection = /** @type {!Blockly.Connection} */ (curNode.getLocation());
+  const block = /** @type {!BlockSvg} */ (curNode.getSourceBlock());
+  const connection = /** @type {!Connection} */ (curNode.getLocation());
   const offsetInBlock = connection.getOffsetInBlock();
 
   this.positionCircle_(offsetInBlock.x, offsetInBlock.y);
@@ -73,10 +78,10 @@ MarkerSvg.prototype.showWithInput_ = function(curNode) {
 
 /**
  * Draw a rectangle around the block.
- * @param {!Blockly.ASTNode} curNode The current node of the marker.
+ * @param {!ASTNode} curNode The current node of the marker.
  */
 MarkerSvg.prototype.showWithBlock_ = function(curNode) {
-  const block = /** @type {!Blockly.BlockSvg} */ (curNode.getLocation());
+  const block = /** @type {!BlockSvg} */ (curNode.getLocation());
 
   // Gets the height and width of entire stack.
   const heightWidth = block.getHeightWidth();
@@ -122,8 +127,8 @@ MarkerSvg.prototype.createDomInternal_ = function() {
 
   MarkerSvg.superClass_.createDomInternal_.call(this);
 
-  this.markerCircle_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.CIRCLE, {
+  this.markerCircle_ = dom.createSvgElement(
+      Svg.CIRCLE, {
         'r': this.constants_.CURSOR_RADIUS,
         'style': 'display: none',
         'stroke-width': this.constants_.CURSOR_STROKE_WIDTH
@@ -133,8 +138,8 @@ MarkerSvg.prototype.createDomInternal_ = function() {
   // Markers and stack cursors don't blink.
   if (this.isCursor()) {
     const blinkProperties = this.getBlinkProperties_();
-    Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.ANIMATE, blinkProperties,
+    dom.createSvgElement(
+        Svg.ANIMATE, blinkProperties,
         this.markerCircle_);
   }
 

From 08626a689a0bcd96345150a48c4d6960af6ab6b9 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 12 Aug 2021 15:56:10 -0700
Subject: [PATCH 653/833] clang-format core/renderers/zelos/marker_svg.js

---
 core/renderers/zelos/marker_svg.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/core/renderers/zelos/marker_svg.js b/core/renderers/zelos/marker_svg.js
index a2ad38da1..e14171db6 100644
--- a/core/renderers/zelos/marker_svg.js
+++ b/core/renderers/zelos/marker_svg.js
@@ -41,11 +41,9 @@ const object = goog.require('Blockly.utils.object');
  * @extends {BaseMarkerSvg}
  */
 const MarkerSvg = function(workspace, constants, marker) {
-  MarkerSvg.superClass_.constructor.call(
-      this, workspace, constants, marker);
+  MarkerSvg.superClass_.constructor.call(this, workspace, constants, marker);
 };
-object.inherits(MarkerSvg,
-    BaseMarkerSvg);
+object.inherits(MarkerSvg, BaseMarkerSvg);
 
 /**
  * Position and display the marker for an input or an output connection.
@@ -120,7 +118,8 @@ MarkerSvg.prototype.createDomInternal_ = function() {
   <g>
     <rect width="100" height="5">
       <animate attributeType="XML" attributeName="fill" dur="1s"
-        values="transparent;transparent;#fff;transparent" repeatCount="indefinite" />
+        values="transparent;transparent;#fff;transparent"
+  repeatCount="indefinite" />
     </rect>
   </g>
   */
@@ -138,9 +137,7 @@ MarkerSvg.prototype.createDomInternal_ = function() {
   // Markers and stack cursors don't blink.
   if (this.isCursor()) {
     const blinkProperties = this.getBlinkProperties_();
-    dom.createSvgElement(
-        Svg.ANIMATE, blinkProperties,
-        this.markerCircle_);
+    dom.createSvgElement(Svg.ANIMATE, blinkProperties, this.markerCircle_);
   }
 
   return this.markerSvg_;

From 012bb8998603e96e577fdf5f4dff134821965f4a Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 12 Aug 2021 16:57:12 -0700
Subject: [PATCH 654/833] Revert clang-format on comment in
 core/renderers/zelos/marker_svg.js

---
 core/renderers/zelos/marker_svg.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/renderers/zelos/marker_svg.js b/core/renderers/zelos/marker_svg.js
index e14171db6..0cd8c5dc9 100644
--- a/core/renderers/zelos/marker_svg.js
+++ b/core/renderers/zelos/marker_svg.js
@@ -114,15 +114,16 @@ MarkerSvg.prototype.hide = function() {
  * @override
  */
 MarkerSvg.prototype.createDomInternal_ = function() {
+  /* clang-format off */
   /* This markup will be generated and added to the .svgGroup_:
   <g>
     <rect width="100" height="5">
       <animate attributeType="XML" attributeName="fill" dur="1s"
-        values="transparent;transparent;#fff;transparent"
-  repeatCount="indefinite" />
+        values="transparent;transparent;#fff;transparent" repeatCount="indefinite" />
     </rect>
   </g>
   */
+  /* clang-format on */
 
   MarkerSvg.superClass_.createDomInternal_.call(this);
 

From 744e0ecb3d8ac676220592a62da98e665ecf50ed Mon Sep 17 00:00:00 2001
From: Maribeth Bottorff <maribethb@google.com>
Date: Fri, 13 Aug 2021 12:58:18 -0700
Subject: [PATCH 655/833] Quiet the typings script unless you tell it to be
 verbose. (#5362)

---
 scripts/gulpfiles/typings.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/gulpfiles/typings.js b/scripts/gulpfiles/typings.js
index 1a40d53b2..f96378526 100644
--- a/scripts/gulpfiles/typings.js
+++ b/scripts/gulpfiles/typings.js
@@ -12,6 +12,7 @@
 var gulp = require('gulp');
 gulp.concat = require('gulp-concat');
 
+var argv = require('yargs').argv;
 var path = require('path');
 var fs = require('fs');
 var rimraf = require('rimraf');
@@ -83,8 +84,12 @@ function typings() {
       return;
     }
     const cmd = `closure2ts ${file} ${typescriptFileName}`;
-    console.log(`Generating typings for ${file}`);
-    execSync(cmd, { stdio: 'inherit' });
+    let outputMode = 'ignore';
+    if (argv.verbose) {
+      console.log(`Generating typings for ${file}`);
+      outputMode = 'inherit';
+    }
+    execSync(cmd, { stdio: outputMode });
   });
 
   const srcs = [

From 8e3cf41d2ba9089eb088e48863d5a3731a133656 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 16 Aug 2021 08:24:36 -0700
Subject: [PATCH 656/833] Migrate core/renderers/minimalist/renderer.js to
 goog.module syntax (#5365)

* Migrate core/renderers/minimalist/renderer.js to goog.module

* Migrate core/renderers/minimalist/renderer.js to named requires

* clang-format core/renderers/minimalist/renderer.js
---
 core/renderers/minimalist/renderer.js | 57 +++++++++++++++------------
 tests/deps.js                         |  2 +-
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/core/renderers/minimalist/renderer.js b/core/renderers/minimalist/renderer.js
index 76db7d5c8..365a00774 100644
--- a/core/renderers/minimalist/renderer.js
+++ b/core/renderers/minimalist/renderer.js
@@ -9,14 +9,19 @@
  */
 'use strict';
 
-goog.provide('Blockly.minimalist.Renderer');
+goog.module('Blockly.minimalist.Renderer');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering');
-goog.require('Blockly.blockRendering.Renderer');
-goog.require('Blockly.minimalist.ConstantProvider');
-goog.require('Blockly.minimalist.Drawer');
-goog.require('Blockly.minimalist.RenderInfo');
-goog.require('Blockly.utils.object');
+/* eslint-disable-next-line no-unused-vars */
+const BaseRenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
+const BaseRenderer = goog.require('Blockly.blockRendering.Renderer');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const ConstantProvider = goog.require('Blockly.minimalist.ConstantProvider');
+const Drawer = goog.require('Blockly.minimalist.Drawer');
+const RenderInfo = goog.require('Blockly.minimalist.RenderInfo');
+const blockRendering = goog.require('Blockly.blockRendering');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -24,47 +29,47 @@ goog.require('Blockly.utils.object');
  * @param {string} name The renderer name.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Renderer}
+ * @extends {BaseRenderer}
  */
-Blockly.minimalist.Renderer = function(name) {
-  Blockly.minimalist.Renderer.superClass_.constructor.call(this, name);
+const Renderer = function(name) {
+  Renderer.superClass_.constructor.call(this, name);
 };
-Blockly.utils.object.inherits(Blockly.minimalist.Renderer,
-    Blockly.blockRendering.Renderer);
+object.inherits(Renderer, BaseRenderer);
 
 /**
  * Create a new instance of the renderer's constant provider.
- * @return {!Blockly.minimalist.ConstantProvider} The constant provider.
+ * @return {!ConstantProvider} The constant provider.
  * @protected
  * @override
  */
-Blockly.minimalist.Renderer.prototype.makeConstants_ = function() {
-  return new Blockly.minimalist.ConstantProvider();
+Renderer.prototype.makeConstants_ = function() {
+  return new ConstantProvider();
 };
 
 /**
  * Create a new instance of the renderer's render info object.
- * @param {!Blockly.BlockSvg} block The block to measure.
- * @return {!Blockly.minimalist.RenderInfo} The render info object.
+ * @param {!BlockSvg} block The block to measure.
+ * @return {!RenderInfo} The render info object.
  * @protected
  * @override
  */
-Blockly.minimalist.Renderer.prototype.makeRenderInfo_ = function(block) {
-  return new Blockly.minimalist.RenderInfo(this, block);
+Renderer.prototype.makeRenderInfo_ = function(block) {
+  return new RenderInfo(this, block);
 };
 
 /**
  * Create a new instance of the renderer's drawer.
- * @param {!Blockly.BlockSvg} block The block to render.
- * @param {!Blockly.blockRendering.RenderInfo} info An object containing all
+ * @param {!BlockSvg} block The block to render.
+ * @param {!BaseRenderInfo} info An object containing all
  *   information needed to render this block.
- * @return {!Blockly.minimalist.Drawer} The drawer.
+ * @return {!Drawer} The drawer.
  * @protected
  * @override
  */
-Blockly.minimalist.Renderer.prototype.makeDrawer_ = function(block, info) {
-  return new Blockly.minimalist.Drawer(block,
-      /** @type {!Blockly.minimalist.RenderInfo} */ (info));
+Renderer.prototype.makeDrawer_ = function(block, info) {
+  return new Drawer(block, /** @type {!RenderInfo} */ (info));
 };
 
-Blockly.blockRendering.register('minimalist', Blockly.minimalist.Renderer);
+blockRendering.register('minimalist', Renderer);
+
+exports = Renderer;
diff --git a/tests/deps.js b/tests/deps.js
index c8fd0c781..2f727ac14 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -160,7 +160,7 @@ goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockR
 goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist', 'Blockly.minimalist.RenderInfo'], ['Blockly.utils.object']);
-goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos', 'Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});

From 1e32aee7accc2ac0fad4f797967da87a6df2c1ab Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 16 Aug 2021 08:48:56 -0700
Subject: [PATCH 657/833] Migrate core/renderers/minimalist/constants.js to
 goog.module syntax (#5363)

* Migrate core/renderers/minimalist/constants.js to goog.module

* Migrate core/renderers/minimalist/constants.js to named requires

* clang-format core/renderers/minimalist/constants.js
---
 core/renderers/minimalist/constants.js | 18 ++++++++++--------
 tests/deps.js                          |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/core/renderers/minimalist/constants.js b/core/renderers/minimalist/constants.js
index fdcfc2767..186fe2e76 100644
--- a/core/renderers/minimalist/constants.js
+++ b/core/renderers/minimalist/constants.js
@@ -10,20 +10,22 @@
  */
 'use strict';
 
-goog.provide('Blockly.minimalist.ConstantProvider');
+goog.module('Blockly.minimalist.ConstantProvider');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.ConstantProvider');
-goog.require('Blockly.utils.object');
+const BaseConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object that provides constants for rendering blocks in the sample.
  * @constructor
  * @package
- * @extends {Blockly.blockRendering.ConstantProvider}
+ * @extends {BaseConstantProvider}
  */
-Blockly.minimalist.ConstantProvider = function() {
-  Blockly.minimalist.ConstantProvider.superClass_.constructor.call(this);
+const ConstantProvider = function() {
+  ConstantProvider.superClass_.constructor.call(this);
 };
-Blockly.utils.object.inherits(Blockly.minimalist.ConstantProvider,
-    Blockly.blockRendering.ConstantProvider);
+object.inherits(ConstantProvider, BaseConstantProvider);
+
+exports = ConstantProvider;
diff --git a/tests/deps.js b/tests/deps.js
index 2f727ac14..7e1c01916 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -157,7 +157,7 @@ goog.addDependency('../../core/renderers/measurables/row_elements.js', ['Blockly
 goog.addDependency('../../core/renderers/measurables/rows.js', ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist', 'Blockly.minimalist.RenderInfo'], ['Blockly.utils.object']);
 goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 26195a6d9ca5bde23470fd7c23bbb06c1f679ae2 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 16 Aug 2021 08:49:49 -0700
Subject: [PATCH 658/833] Migrate core/renderers/minimalist/info.js to
 goog.module syntax (#5364)

* Migrate core/renderers/minimalist/info.js to goog.module

* Migrate core/renderers/minimalist/info.js to named requires

* clang-format core/renderers/minimalist/info.js
---
 core/renderers/minimalist/info.js | 33 ++++++++++++++++++-------------
 tests/deps.js                     |  2 +-
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/core/renderers/minimalist/info.js b/core/renderers/minimalist/info.js
index d7bbae6bf..a2d40f041 100644
--- a/core/renderers/minimalist/info.js
+++ b/core/renderers/minimalist/info.js
@@ -9,10 +9,15 @@
  */
 'use strict';
 
-goog.provide('Blockly.minimalist');
-goog.provide('Blockly.minimalist.RenderInfo');
+goog.module('Blockly.minimalist.RenderInfo');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.utils.object');
+const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const Renderer = goog.requireType('Blockly.minimalist.Renderer');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -22,24 +27,24 @@ goog.require('Blockly.utils.object');
  * may choose to rerender when getSize() is called).  However, calling it
  * repeatedly may be expensive.
  *
- * @param {!Blockly.minimalist.Renderer} renderer The renderer in use.
- * @param {!Blockly.BlockSvg} block The block to measure.
+ * @param {!Renderer} renderer The renderer in use.
+ * @param {!BlockSvg} block The block to measure.
  * @constructor
  * @package
- * @extends {Blockly.blockRendering.RenderInfo}
+ * @extends {BaseRenderInfo}
  */
-Blockly.minimalist.RenderInfo = function(renderer, block) {
-  Blockly.minimalist.RenderInfo.superClass_.constructor.call(this, renderer, block);
-
+const RenderInfo = function(renderer, block) {
+  RenderInfo.superClass_.constructor.call(this, renderer, block);
 };
-Blockly.utils.object.inherits(Blockly.minimalist.RenderInfo,
-    Blockly.blockRendering.RenderInfo);
+object.inherits(RenderInfo, BaseRenderInfo);
 
 /**
  * Get the block renderer in use.
- * @return {!Blockly.minimalist.Renderer} The block renderer in use.
+ * @return {!Renderer} The block renderer in use.
  * @package
  */
-Blockly.minimalist.RenderInfo.prototype.getRenderer = function() {
-  return /** @type {!Blockly.minimalist.Renderer} */ (this.renderer_);
+RenderInfo.prototype.getRenderer = function() {
+  return /** @type {!Renderer} */ (this.renderer_);
 };
+
+exports = RenderInfo;
diff --git a/tests/deps.js b/tests/deps.js
index 7e1c01916..ad8c0479c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -159,7 +159,7 @@ goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Bloc
 goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist', 'Blockly.minimalist.RenderInfo'], ['Blockly.utils.object']);
+goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist.RenderInfo'], ['Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos', 'Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object']);

From 9046ce165b0577db9ff5f0c70e2ed27037a67c90 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 16 Aug 2021 10:23:50 -0700
Subject: [PATCH 659/833] Migrate core/widgetdiv.js to goog.module syntax
 (#5331)

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

* Migrate core/widgetdiv.js to goog.module

* Migrate core/widgetdiv.js to named requires

* clang-format core/widgetdiv.js

* Mark WidgetDiv.DIV as deprecated and refactor callers to use setters/getters

* Fix deprecation date

* Refactor tests to make setDiv() in core/widgetdiv.js test-only

* Fix type annotations for WidgetDiv.DIV and move test cleanup into sharedTestTeardown
---
 core/contextmenu.js                      |   5 +-
 core/field_multilineinput.js             |   2 +-
 core/field_textinput.js                  |   6 +-
 core/widgetdiv.js                        | 206 +++++++++++++----------
 demos/custom-fields/pitch/field_pitch.js |   2 +-
 tests/deps.js                            |   2 +-
 tests/mocha/field_textinput_test.js      |   2 +-
 tests/mocha/test_helpers.js              |   2 +
 tests/mocha/widget_div_test.js           |   2 +-
 9 files changed, 133 insertions(+), 96 deletions(-)

diff --git a/core/contextmenu.js b/core/contextmenu.js
index cc02adc25..cc91ebcb1 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -174,7 +174,10 @@ const position_ = function(menu, e, rtl) {
  * @private
  */
 const createWidget_ = function(menu) {
-  const div = WidgetDiv.DIV;
+  const div = WidgetDiv.getDiv();
+  if (!div) {
+    throw Error('Attempting to create a context menu when widget div is null');
+  }
   menu.render(div);
   const menuDom = menu.getElement();
   dom.addClass(
diff --git a/core/field_multilineinput.js b/core/field_multilineinput.js
index eee4f58c4..31df9a6fc 100644
--- a/core/field_multilineinput.js
+++ b/core/field_multilineinput.js
@@ -330,7 +330,7 @@ FieldMultilineInput.prototype.showEditor_ = function(_opt_e, opt_quietInput) {
  * @protected
  */
 FieldMultilineInput.prototype.widgetCreate_ = function() {
-  const div = WidgetDiv.DIV;
+  const div = WidgetDiv.getDiv();
   const scale = this.workspace_.getScale();
 
   const htmlInput =
diff --git a/core/field_textinput.js b/core/field_textinput.js
index 4b80e411b..a682cb2ff 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -341,7 +341,7 @@ FieldTextInput.prototype.showInlineEditor_ = function(quietInput) {
  */
 FieldTextInput.prototype.widgetCreate_ = function() {
   Events.setGroup(true);
-  const div = WidgetDiv.DIV;
+  const div = WidgetDiv.getDiv();
 
   dom.addClass(this.getClickTarget_(), 'editing');
 
@@ -406,7 +406,7 @@ FieldTextInput.prototype.widgetDispose_ = function() {
 
   // Actual disposal.
   this.unbindInputEvents_();
-  const style = WidgetDiv.DIV.style;
+  const style = WidgetDiv.getDiv().style;
   style.width = 'auto';
   style.height = 'auto';
   style.fontSize = '';
@@ -509,7 +509,7 @@ FieldTextInput.prototype.setEditorValue_ = function(newValue) {
  * @protected
  */
 FieldTextInput.prototype.resizeEditor_ = function() {
-  const div = WidgetDiv.DIV;
+  const div = WidgetDiv.getDiv();
   const bBox = this.getScaledBBox();
   div.style.width = bBox.right - bBox.left + 'px';
   div.style.height = bBox.bottom - bBox.top + 'px';
diff --git a/core/widgetdiv.js b/core/widgetdiv.js
index 106dce645..c3bd46cca 100644
--- a/core/widgetdiv.js
+++ b/core/widgetdiv.js
@@ -16,131 +16,168 @@
  * @name Blockly.WidgetDiv
  * @namespace
  */
-goog.provide('Blockly.WidgetDiv');
+goog.module('Blockly.WidgetDiv');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.common');
-goog.require('Blockly.utils.dom');
-
-goog.requireType('Blockly.utils.Rect');
-goog.requireType('Blockly.utils.Size');
-goog.requireType('Blockly.WorkspaceSvg');
+/* eslint-disable-next-line no-unused-vars */
+const Rect = goog.requireType('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');
+const common = goog.require('Blockly.common');
+const deprecation = goog.require('Blockly.utils.deprecation');
+const dom = goog.require('Blockly.utils.dom');
 
 
 /**
  * The object currently using this container.
  * @type {Object}
- * @private
  */
-Blockly.WidgetDiv.owner_ = null;
+let owner = null;
 
 /**
  * Optional cleanup function set by whichever object uses the widget.
  * @type {Function}
- * @private
  */
-Blockly.WidgetDiv.dispose_ = null;
+let dispose = null;
 
 /**
  * A class name representing the current owner's workspace renderer.
  * @type {string}
- * @private
  */
-Blockly.WidgetDiv.rendererClassName_ = '';
+let rendererClassName = '';
 
 /**
  * A class name representing the current owner's workspace theme.
  * @type {string}
- * @private
  */
-Blockly.WidgetDiv.themeClassName_ = '';
+let themeClassName = '';
+
+/**
+ * The HTML container for popup overlays (e.g. editor widgets).
+ * @type {?Element}
+ */
+let DIV;
+/** @deprecated September 2021 */
+exports.DIV = DIV;
+
+/**
+ * Returns the HTML container for editor widgets.
+ * @return {?Element} The editor widget container.
+ */
+const getDiv = function() {
+  return DIV;
+};
+exports.getDiv = getDiv;
+
+/**
+ * Allows unit tests to reset the div.
+ * @param {?Element} newDiv The new value for the DIV field.
+ */
+const testOnly_setDiv = function(newDiv) {
+  DIV = newDiv;
+};
+exports.testOnly_setDiv = testOnly_setDiv;
+
+Object.defineProperties(exports, {
+  DIV: {
+    get: function() {
+      deprecation.warn(
+        'Blockly.WidgetDiv.DIV', 'September 2021', 'September 2022',
+        'Blockly.WidgetDiv.getDiv()');
+      return getDiv();
+    }
+  }
+});
 
 /**
  * Create the widget div and inject it onto the page.
  */
-Blockly.WidgetDiv.createDom = function() {
-  if (Blockly.WidgetDiv.DIV) {
+const createDom = function() {
+  if (DIV) {
     return;  // Already created.
   }
-  /**
-   * The HTML container for popup overlays (e.g. editor widgets).
-   * @type {!Element}
-   */
-  Blockly.WidgetDiv.DIV = document.createElement('div');
-  Blockly.WidgetDiv.DIV.className = 'blocklyWidgetDiv';
-  var container = Blockly.common.getParentContainer() || document.body;
-  container.appendChild(Blockly.WidgetDiv.DIV);
+
+  DIV = document.createElement('div');
+  DIV.className = 'blocklyWidgetDiv';
+  const container = common.getParentContainer() || document.body;
+  container.appendChild(DIV);
 };
+exports.createDom = createDom;
 
 /**
  * Initialize and display the widget div.  Close the old one if needed.
  * @param {!Object} newOwner The object that will be using this container.
  * @param {boolean} rtl Right-to-left (true) or left-to-right (false).
- * @param {Function} dispose Optional cleanup function to be run when the
+ * @param {Function} newDispose Optional cleanup function to be run when the
  *     widget is closed.
  */
-Blockly.WidgetDiv.show = function(newOwner, rtl, dispose) {
-  Blockly.WidgetDiv.hide();
-  Blockly.WidgetDiv.owner_ = newOwner;
-  Blockly.WidgetDiv.dispose_ = dispose;
-  var div = Blockly.WidgetDiv.DIV;
+const show = function(newOwner, rtl, newDispose) {
+  hide();
+  owner = newOwner;
+  dispose = newDispose;
+  const div = DIV;
   div.style.direction = rtl ? 'rtl' : 'ltr';
   div.style.display = 'block';
-  var mainWorkspace =
-    /** @type {!Blockly.WorkspaceSvg} */ (Blockly.common.getMainWorkspace());
-  Blockly.WidgetDiv.rendererClassName_ =
-      mainWorkspace.getRenderer().getClassName();
-  Blockly.WidgetDiv.themeClassName_ = mainWorkspace.getTheme().getClassName();
-  Blockly.utils.dom.addClass(div, Blockly.WidgetDiv.rendererClassName_);
-  Blockly.utils.dom.addClass(div, Blockly.WidgetDiv.themeClassName_);
+  const mainWorkspace =
+      /** @type {!WorkspaceSvg} */ (common.getMainWorkspace());
+  rendererClassName = mainWorkspace.getRenderer().getClassName();
+  themeClassName = mainWorkspace.getTheme().getClassName();
+  dom.addClass(div, rendererClassName);
+  dom.addClass(div, themeClassName);
 };
+exports.show = show;
 
 /**
  * Destroy the widget and hide the div.
  */
-Blockly.WidgetDiv.hide = function() {
-  if (!Blockly.WidgetDiv.isVisible()) {
+const hide = function() {
+  if (!isVisible()) {
     return;
   }
-  Blockly.WidgetDiv.owner_ = null;
+  owner = null;
 
-  var div = Blockly.WidgetDiv.DIV;
+  const div = DIV;
   div.style.display = 'none';
   div.style.left = '';
   div.style.top = '';
-  Blockly.WidgetDiv.dispose_ && Blockly.WidgetDiv.dispose_();
-  Blockly.WidgetDiv.dispose_ = null;
+  dispose && dispose();
+  dispose = null;
   div.textContent = '';
 
-  if (Blockly.WidgetDiv.rendererClassName_) {
-    Blockly.utils.dom.removeClass(div, Blockly.WidgetDiv.rendererClassName_);
-    Blockly.WidgetDiv.rendererClassName_ = '';
+  if (rendererClassName) {
+    dom.removeClass(div, rendererClassName);
+    rendererClassName = '';
   }
-  if (Blockly.WidgetDiv.themeClassName_) {
-    Blockly.utils.dom.removeClass(div, Blockly.WidgetDiv.themeClassName_);
-    Blockly.WidgetDiv.themeClassName_ = '';
+  if (themeClassName) {
+    dom.removeClass(div, themeClassName);
+    themeClassName = '';
   }
-  (/** @type {!Blockly.WorkspaceSvg} */ (
-    Blockly.common.getMainWorkspace())).markFocused();
+  (/** @type {!WorkspaceSvg} */ (common.getMainWorkspace())).markFocused();
 };
+exports.hide = hide;
 
 /**
  * Is the container visible?
  * @return {boolean} True if visible.
  */
-Blockly.WidgetDiv.isVisible = function() {
-  return !!Blockly.WidgetDiv.owner_;
+const isVisible = function() {
+  return !!owner;
 };
+exports.isVisible = isVisible;
 
 /**
  * Destroy the widget and hide the div if it is being used by the specified
  * object.
  * @param {!Object} oldOwner The object that was using this container.
  */
-Blockly.WidgetDiv.hideIfOwner = function(oldOwner) {
-  if (Blockly.WidgetDiv.owner_ == oldOwner) {
-    Blockly.WidgetDiv.hide();
+const hideIfOwner = function(oldOwner) {
+  if (owner == oldOwner) {
+    hide();
   }
 };
+exports.hideIfOwner = hideIfOwner;
 
 /**
  * Set the widget div's position and height.  This function does nothing clever:
@@ -148,12 +185,11 @@ Blockly.WidgetDiv.hideIfOwner = function(oldOwner) {
  * @param {number} x Horizontal location (window coordinates, not body).
  * @param {number} y Vertical location (window coordinates, not body).
  * @param {number} height The height of the widget div (pixels).
- * @private
  */
-Blockly.WidgetDiv.positionInternal_ = function(x, y, height) {
-  Blockly.WidgetDiv.DIV.style.left = x + 'px';
-  Blockly.WidgetDiv.DIV.style.top = y + 'px';
-  Blockly.WidgetDiv.DIV.style.height = height + 'px';
+const positionInternal = function(x, y, height) {
+  DIV.style.left = x + 'px';
+  DIV.style.top = y + 'px';
+  DIV.style.height = height + 'px';
 };
 
 /**
@@ -161,56 +197,53 @@ Blockly.WidgetDiv.positionInternal_ = function(x, y, height) {
  * The widget should be placed adjacent to but not overlapping the anchor
  * rectangle.  The preferred position is directly below and aligned to the left
  * (LTR) or right (RTL) side of the anchor.
- * @param {!Blockly.utils.Rect} viewportBBox The bounding rectangle of the
+ * @param {!Rect} viewportBBox The bounding rectangle of the
  *     current viewport, in window coordinates.
- * @param {!Blockly.utils.Rect} anchorBBox The bounding rectangle of the anchor,
+ * @param {!Rect} anchorBBox The bounding rectangle of the anchor,
  *     in window coordinates.
- * @param {!Blockly.utils.Size} widgetSize The size of the widget that is inside
+ * @param {!Size} widgetSize The size of the widget that is inside
  *     the widget div, in window coordinates.
  * @param {boolean} rtl Whether the workspace is in RTL mode.  This determines
  *     horizontal alignment.
- * @package
  */
-Blockly.WidgetDiv.positionWithAnchor = function(viewportBBox, anchorBBox,
-    widgetSize, rtl) {
-  var y = Blockly.WidgetDiv.calculateY_(viewportBBox, anchorBBox, widgetSize);
-  var x = Blockly.WidgetDiv.calculateX_(viewportBBox, anchorBBox, widgetSize,
-      rtl);
+const positionWithAnchor = function(viewportBBox, anchorBBox, widgetSize, rtl) {
+  const y = calculateY(viewportBBox, anchorBBox, widgetSize);
+  const x = calculateX(viewportBBox, anchorBBox, widgetSize, rtl);
 
   if (y < 0) {
-    Blockly.WidgetDiv.positionInternal_(x, 0, widgetSize.height + y);
+    positionInternal(x, 0, widgetSize.height + y);
   } else {
-    Blockly.WidgetDiv.positionInternal_(x, y, widgetSize.height);
+    positionInternal(x, y, widgetSize.height);
   }
 };
+/** @package */
+exports.positionWithAnchor = positionWithAnchor;
 
 /**
  * Calculate an x position (in window coordinates) such that the widget will not
  * be offscreen on the right or left.
- * @param {!Blockly.utils.Rect} viewportBBox The bounding rectangle of the
+ * @param {!Rect} viewportBBox The bounding rectangle of the
  *     current viewport, in window coordinates.
- * @param {!Blockly.utils.Rect} anchorBBox The bounding rectangle of the anchor,
+ * @param {!Rect} anchorBBox The bounding rectangle of the anchor,
  *     in window coordinates.
- * @param {!Blockly.utils.Size} widgetSize The dimensions of the widget inside
+ * @param {!Size} widgetSize The dimensions of the widget inside
  *     the widget div.
  * @param {boolean} rtl Whether the Blockly workspace is in RTL mode.
  * @return {number} A valid x-coordinate for the top left corner of the widget
  *     div, in window coordinates.
- * @private
  */
-Blockly.WidgetDiv.calculateX_ = function(viewportBBox, anchorBBox, widgetSize,
-    rtl) {
+const calculateX = function(viewportBBox, anchorBBox, widgetSize, rtl) {
   if (rtl) {
     // Try to align the right side of the field and the right side of widget.
-    var widgetLeft = anchorBBox.right - widgetSize.width;
+    const widgetLeft = anchorBBox.right - widgetSize.width;
     // Don't go offscreen left.
-    var x = Math.max(widgetLeft, viewportBBox.left);
+    const x = Math.max(widgetLeft, viewportBBox.left);
     // But really don't go offscreen right:
     return Math.min(x, viewportBBox.right - widgetSize.width);
   } else {
     // Try to align the left side of the field and the left side of widget.
     // Don't go offscreen right.
-    var x = Math.min(anchorBBox.left, viewportBBox.right - widgetSize.width);
+    const x = Math.min(anchorBBox.left, viewportBBox.right - widgetSize.width);
     // But left is more important, because that's where the text is.
     return Math.max(x, viewportBBox.left);
   }
@@ -219,17 +252,16 @@ Blockly.WidgetDiv.calculateX_ = function(viewportBBox, anchorBBox, widgetSize,
 /**
  * Calculate a y position (in window coordinates) such that the widget will not
  * be offscreen on the top or bottom.
- * @param {!Blockly.utils.Rect} viewportBBox The bounding rectangle of the
+ * @param {!Rect} viewportBBox The bounding rectangle of the
  *     current viewport, in window coordinates.
- * @param {!Blockly.utils.Rect} anchorBBox The bounding rectangle of the anchor,
+ * @param {!Rect} anchorBBox The bounding rectangle of the anchor,
  *     in window coordinates.
- * @param {!Blockly.utils.Size} widgetSize The dimensions of the widget inside
+ * @param {!Size} widgetSize The dimensions of the widget inside
  *     the widget div.
  * @return {number} A valid y-coordinate for the top left corner of the widget
  *     div, in window coordinates.
- * @private
  */
-Blockly.WidgetDiv.calculateY_ = function(viewportBBox, anchorBBox, widgetSize) {
+const calculateY = function(viewportBBox, anchorBBox, widgetSize) {
   // Flip the widget vertically if off the bottom.
   if (anchorBBox.bottom + widgetSize.height >= viewportBBox.bottom) {
     // The bottom of the widget is at the top of the field.
diff --git a/demos/custom-fields/pitch/field_pitch.js b/demos/custom-fields/pitch/field_pitch.js
index d36bc3ee8..522461cef 100644
--- a/demos/custom-fields/pitch/field_pitch.js
+++ b/demos/custom-fields/pitch/field_pitch.js
@@ -68,7 +68,7 @@ CustomFields.FieldPitch.NOTES = 'C3 D3 E3 F3 G3 A3 B3 C4 D4 E4 F4 G4 A4'.split(/
 CustomFields.FieldPitch.prototype.showEditor_ = function() {
   CustomFields.FieldPitch.superClass_.showEditor_.call(this);
 
-  var div = Blockly.WidgetDiv.DIV;
+  var div = Blockly.WidgetDiv.getDiv();
   if (!div.firstChild) {
     // Mobile interface uses Blockly.prompt.
     return;
diff --git a/tests/deps.js b/tests/deps.js
index ad8c0479c..3fbb04372 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -216,7 +216,7 @@ goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['
 goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.common', 'Blockly.utils.dom']);
+goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/field_textinput_test.js b/tests/mocha/field_textinput_test.js
index 1a1c1ed2a..c777134c3 100644
--- a/tests/mocha/field_textinput_test.js
+++ b/tests/mocha/field_textinput_test.js
@@ -168,7 +168,7 @@ suite('Text Input Fields', function() {
           };
           field.clickTarget_ = document.createElement('div');
           Blockly.mainWorkspace = workspace;
-          Blockly.WidgetDiv.DIV = document.createElement('div');
+          Blockly.WidgetDiv.createDom();
           this.stub = sinon.stub(field, 'resizeEditor_');
         };
 
diff --git a/tests/mocha/test_helpers.js b/tests/mocha/test_helpers.js
index 106991955..aa27dd66a 100644
--- a/tests/mocha/test_helpers.js
+++ b/tests/mocha/test_helpers.js
@@ -240,6 +240,8 @@ function sharedTestTeardown() {
     for (let i = 0; i < messages.length; i++) {
       delete Blockly.Msg[messages[i]];
     }
+
+    Blockly.WidgetDiv.testOnly_setDiv(null);
   }
 }
 
diff --git a/tests/mocha/widget_div_test.js b/tests/mocha/widget_div_test.js
index 84571dd59..31d0620e7 100644
--- a/tests/mocha/widget_div_test.js
+++ b/tests/mocha/widget_div_test.js
@@ -40,7 +40,7 @@ suite('WidgetDiv', function() {
           anchorBBox, rtl, expectedX, expectedY, expectedHeight) {
         Blockly.WidgetDiv.positionWithAnchor(
             this.viewportBBox, anchorBBox, this.widgetSize, rtl);
-        var style = Blockly.WidgetDiv.DIV.style;
+        var style = Blockly.WidgetDiv.getDiv().style;
         chai.assert.equal(style.left, expectedX + 'px', 'Left');
         chai.assert.equal(style.top, expectedY + 'px', 'Top');
         chai.assert.equal(style.height, expectedHeight + 'px', 'Height');

From 9daf2f3be1af401a4760ff2445b625e632031216 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 12 Aug 2021 16:59:59 -0700
Subject: [PATCH 660/833] Migrate core/renderers/thrasos/renderer.js to
 goog.module

---
 core/renderers/thrasos/renderer.js | 15 +++++++++------
 tests/deps.js                      |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/renderers/thrasos/renderer.js b/core/renderers/thrasos/renderer.js
index 9bb9bdd97..21e982b92 100644
--- a/core/renderers/thrasos/renderer.js
+++ b/core/renderers/thrasos/renderer.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.thrasos.Renderer');
+goog.module('Blockly.thrasos.Renderer');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering');
 goog.require('Blockly.blockRendering.Renderer');
@@ -27,10 +28,10 @@ goog.requireType('Blockly.BlockSvg');
  * @constructor
  * @extends {Blockly.blockRendering.Renderer}
  */
-Blockly.thrasos.Renderer = function(name) {
-  Blockly.thrasos.Renderer.superClass_.constructor.call(this, name);
+const Renderer = function(name) {
+  Renderer.superClass_.constructor.call(this, name);
 };
-Blockly.utils.object.inherits(Blockly.thrasos.Renderer,
+Blockly.utils.object.inherits(Renderer,
     Blockly.blockRendering.Renderer);
 
 /**
@@ -40,9 +41,11 @@ Blockly.utils.object.inherits(Blockly.thrasos.Renderer,
  * @protected
  * @override
  */
-Blockly.thrasos.Renderer.prototype.makeRenderInfo_ = function(block) {
+Renderer.prototype.makeRenderInfo_ = function(block) {
   return new Blockly.thrasos.RenderInfo(this, block);
 };
 
 
-Blockly.blockRendering.register('thrasos', Blockly.thrasos.Renderer);
+Blockly.blockRendering.register('thrasos', Renderer);
+
+exports = Renderer;
diff --git a/tests/deps.js b/tests/deps.js
index 3fbb04372..737b671b0 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -162,7 +162,7 @@ goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minima
 goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist.RenderInfo'], ['Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos', 'Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});

From 0def8c0a99c3f1fc2ba2e627d9112481fe9342ea Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 12 Aug 2021 17:01:32 -0700
Subject: [PATCH 661/833] Migrate core/renderers/thrasos/renderer.js named
 requires

---
 core/renderers/thrasos/renderer.js | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/core/renderers/thrasos/renderer.js b/core/renderers/thrasos/renderer.js
index 21e982b92..cda5d40d5 100644
--- a/core/renderers/thrasos/renderer.js
+++ b/core/renderers/thrasos/renderer.js
@@ -13,12 +13,12 @@
 goog.module('Blockly.thrasos.Renderer');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering');
-goog.require('Blockly.blockRendering.Renderer');
-goog.require('Blockly.thrasos.RenderInfo');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.BlockSvg');
+const BaseRenderer = goog.require('Blockly.blockRendering.Renderer');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const RenderInfo = goog.require('Blockly.thrasos.RenderInfo');
+const blockRendering = goog.require('Blockly.blockRendering');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -26,26 +26,25 @@ goog.requireType('Blockly.BlockSvg');
  * @param {string} name The renderer name.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Renderer}
+ * @extends {BaseRenderer}
  */
 const Renderer = function(name) {
   Renderer.superClass_.constructor.call(this, name);
 };
-Blockly.utils.object.inherits(Renderer,
-    Blockly.blockRendering.Renderer);
+object.inherits(Renderer, BaseRenderer);
 
 /**
  * Create a new instance of the renderer's render info object.
- * @param {!Blockly.BlockSvg} block The block to measure.
- * @return {!Blockly.thrasos.RenderInfo} The render info object.
+ * @param {!BlockSvg} block The block to measure.
+ * @return {!RenderInfo} The render info object.
  * @protected
  * @override
  */
 Renderer.prototype.makeRenderInfo_ = function(block) {
-  return new Blockly.thrasos.RenderInfo(this, block);
+  return new RenderInfo(this, block);
 };
 
 
-Blockly.blockRendering.register('thrasos', Renderer);
+blockRendering.register('thrasos', Renderer);
 
 exports = Renderer;

From 60ed51a0b3fb0628f709a82dce436af9920eee74 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 12 Aug 2021 16:18:32 -0700
Subject: [PATCH 662/833] Migrate core/renderers/thrasos/info.js to ES6
 const/let

---
 core/renderers/thrasos/info.js | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/core/renderers/thrasos/info.js b/core/renderers/thrasos/info.js
index 962c6ea6d..7ac616f2a 100644
--- a/core/renderers/thrasos/info.js
+++ b/core/renderers/thrasos/info.js
@@ -56,14 +56,17 @@ Blockly.thrasos.RenderInfo.prototype.getRenderer = function() {
  * @override
  */
 Blockly.thrasos.RenderInfo.prototype.addElemSpacing_ = function() {
-  var hasExternalInputs = false;
-  for (var i = 0, row; (row = this.rows[i]); i++) {
+  let hasExternalInputs = false;
+  for (let i = 0; i < this.rows.length; i++) {
+    const row = this.rows[i];
     if (row.hasExternalInput) {
       hasExternalInputs = true;
+      break;
     }
   }
-  for (var i = 0, row; (row = this.rows[i]); i++) {
-    var oldElems = row.elements;
+  for (let i = 0; i < this.rows.length; i++) {
+    const row = this.rows[i];
+    const oldElems = row.elements;
     row.elements = [];
     // No spacing needed before the corner on the top row or the bottom row.
     if (row.startsWithElemSpacer()) {
@@ -71,15 +74,15 @@ Blockly.thrasos.RenderInfo.prototype.addElemSpacing_ = function() {
       row.elements.push(new Blockly.blockRendering.InRowSpacer(
           this.constants_, this.getInRowSpacing_(null, oldElems[0])));
     }
-    for (var e = 0; e < oldElems.length - 1; e++) {
+    for (let e = 0; e < oldElems.length - 1; e++) {
       row.elements.push(oldElems[e]);
-      var spacing = this.getInRowSpacing_(oldElems[e], oldElems[e + 1]);
+      const spacing = this.getInRowSpacing_(oldElems[e], oldElems[e + 1]);
       row.elements.push(
           new Blockly.blockRendering.InRowSpacer(this.constants_, spacing));
     }
     row.elements.push(oldElems[oldElems.length - 1]);
     if (row.endsWithElemSpacer()) {
-      var spacing = this.getInRowSpacing_(oldElems[oldElems.length - 1], null);
+      let spacing = this.getInRowSpacing_(oldElems[oldElems.length - 1], null);
       if (hasExternalInputs && row.hasDummyInput) {
         spacing += this.constants_.TAB_WIDTH;
       }
@@ -264,7 +267,7 @@ Blockly.thrasos.RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
     return row.yPos + elem.height / 2;
   }
   if (Blockly.blockRendering.Types.isBottomRow(row)) {
-    var baseline = row.yPos + row.height - row.descenderHeight;
+    const baseline = row.yPos + row.height - row.descenderHeight;
     if (Blockly.blockRendering.Types.isNextConnection(elem)) {
       return baseline + elem.height / 2;
     }
@@ -277,9 +280,9 @@ Blockly.thrasos.RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
     return row.capline + elem.height / 2;
   }
 
-  var result = row.yPos;
+  let result = row.yPos;
   if (Blockly.blockRendering.Types.isField(elem) && row.hasStatement) {
-    var offset = this.constants_.TALL_INPUT_FIELD_OFFSET_Y +
+    const offset = this.constants_.TALL_INPUT_FIELD_OFFSET_Y +
         elem.height / 2;
     result += offset;
   } else {
@@ -295,9 +298,10 @@ Blockly.thrasos.RenderInfo.prototype.finalize_ = function() {
   // Performance note: this could be combined with the draw pass, if the time
   // that this takes is excessive.  But it shouldn't be, because it only
   // accesses and sets properties that already exist on the objects.
-  var widestRowWithConnectedBlocks = 0;
-  var yCursor = 0;
-  for (var i = 0, row; (row = this.rows[i]); i++) {
+  let widestRowWithConnectedBlocks = 0;
+  let yCursor = 0;
+  for (let i = 0; i < this.rows.length; i++) {
+    const row = this.rows[i];
     row.yPos = yCursor;
     row.xPos = this.startX;
     yCursor += row.height;
@@ -305,11 +309,11 @@ Blockly.thrasos.RenderInfo.prototype.finalize_ = function() {
     widestRowWithConnectedBlocks =
         Math.max(widestRowWithConnectedBlocks, row.widthWithConnectedBlocks);
     // Add padding to the bottom row if block height is less than minimum
-    var heightWithoutHat = yCursor - this.topRow.ascenderHeight;
+    const heightWithoutHat = yCursor - this.topRow.ascenderHeight;
     if (row == this.bottomRow &&
         heightWithoutHat < this.constants_.MIN_BLOCK_HEIGHT) {
       // But the hat height shouldn't be part of this.
-      var diff = this.constants_.MIN_BLOCK_HEIGHT - heightWithoutHat;
+      const diff = this.constants_.MIN_BLOCK_HEIGHT - heightWithoutHat;
       this.bottomRow.height += diff;
       yCursor += diff;
     }

From 1cd9e1c8ea010528870df171de89bc4d3d4f71da Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 12 Aug 2021 16:41:12 -0700
Subject: [PATCH 663/833] Migrate core/renderers/thrasos/info.js to goog.module

---
 core/renderers/thrasos/info.js | 24 +++++++++++++-----------
 tests/deps.js                  |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/core/renderers/thrasos/info.js b/core/renderers/thrasos/info.js
index 7ac616f2a..edfdb8b9d 100644
--- a/core/renderers/thrasos/info.js
+++ b/core/renderers/thrasos/info.js
@@ -11,8 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.thrasos');
-goog.provide('Blockly.thrasos.RenderInfo');
+goog.module('Blockly.thrasos.RenderInfo');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.InRowSpacer');
 goog.require('Blockly.blockRendering.RenderInfo');
@@ -37,10 +37,10 @@ goog.requireType('Blockly.thrasos.Renderer');
  * @package
  * @extends {Blockly.blockRendering.RenderInfo}
  */
-Blockly.thrasos.RenderInfo = function(renderer, block) {
-  Blockly.thrasos.RenderInfo.superClass_.constructor.call(this, renderer, block);
+const RenderInfo = function(renderer, block) {
+  RenderInfo.superClass_.constructor.call(this, renderer, block);
 };
-Blockly.utils.object.inherits(Blockly.thrasos.RenderInfo,
+Blockly.utils.object.inherits(RenderInfo,
     Blockly.blockRendering.RenderInfo);
 
 /**
@@ -48,14 +48,14 @@ Blockly.utils.object.inherits(Blockly.thrasos.RenderInfo,
  * @return {!Blockly.thrasos.Renderer} The block renderer in use.
  * @package
  */
-Blockly.thrasos.RenderInfo.prototype.getRenderer = function() {
+RenderInfo.prototype.getRenderer = function() {
   return /** @type {!Blockly.thrasos.Renderer} */ (this.renderer_);
 };
 
 /**
  * @override
  */
-Blockly.thrasos.RenderInfo.prototype.addElemSpacing_ = function() {
+RenderInfo.prototype.addElemSpacing_ = function() {
   let hasExternalInputs = false;
   for (let i = 0; i < this.rows.length; i++) {
     const row = this.rows[i];
@@ -96,7 +96,7 @@ Blockly.thrasos.RenderInfo.prototype.addElemSpacing_ = function() {
 /**
  * @override
  */
-Blockly.thrasos.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
+RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   if (!prev) {
     // Between an editable field and the beginning of the row.
     if (next && Blockly.blockRendering.Types.isField(next) &&
@@ -232,7 +232,7 @@ Blockly.thrasos.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
 /**
  * @override
  */
-Blockly.thrasos.RenderInfo.prototype.getSpacerRowHeight_ = function(
+RenderInfo.prototype.getSpacerRowHeight_ = function(
     prev, next) {
   // If we have an empty block add a spacer to increase the height.
   if (Blockly.blockRendering.Types.isTopRow(prev) &&
@@ -262,7 +262,7 @@ Blockly.thrasos.RenderInfo.prototype.getSpacerRowHeight_ = function(
 /**
  * @override
  */
-Blockly.thrasos.RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
+RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
   if (Blockly.blockRendering.Types.isSpacer(elem)) {
     return row.yPos + elem.height / 2;
   }
@@ -294,7 +294,7 @@ Blockly.thrasos.RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
 /**
  * @override
  */
-Blockly.thrasos.RenderInfo.prototype.finalize_ = function() {
+RenderInfo.prototype.finalize_ = function() {
   // Performance note: this could be combined with the draw pass, if the time
   // that this takes is excessive.  But it shouldn't be, because it only
   // accesses and sets properties that already exist on the objects.
@@ -333,3 +333,5 @@ Blockly.thrasos.RenderInfo.prototype.finalize_ = function() {
   this.height = yCursor;
   this.startY = this.topRow.capline;
 };
+
+exports = RenderInfo;
diff --git a/tests/deps.js b/tests/deps.js
index 737b671b0..2ef3e4da3 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -161,7 +161,7 @@ goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.min
 goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist.RenderInfo'], ['Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos', 'Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});

From ce662f43d91ff2e3f0c9d4e6d9c531dd37559b3f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 12 Aug 2021 16:41:57 -0700
Subject: [PATCH 664/833] Migrate core/renderers/thrasos/info.js named requires

---
 core/renderers/thrasos/info.js | 138 +++++++++++++++++----------------
 1 file changed, 70 insertions(+), 68 deletions(-)

diff --git a/core/renderers/thrasos/info.js b/core/renderers/thrasos/info.js
index edfdb8b9d..46716de34 100644
--- a/core/renderers/thrasos/info.js
+++ b/core/renderers/thrasos/info.js
@@ -14,14 +14,16 @@
 goog.module('Blockly.thrasos.RenderInfo');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.InRowSpacer');
-goog.require('Blockly.blockRendering.RenderInfo');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.Field');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.thrasos.Renderer');
+const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo');
+/* 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.blockRendering.Field');
+const InRowSpacer = goog.require('Blockly.blockRendering.InRowSpacer');
+/* eslint-disable-next-line no-unused-vars */
+const Renderer = goog.requireType('Blockly.thrasos.Renderer');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -31,25 +33,25 @@ goog.requireType('Blockly.thrasos.Renderer');
  * may choose to rerender when getSize() is called).  However, calling it
  * repeatedly may be expensive.
  *
- * @param {!Blockly.thrasos.Renderer} renderer The renderer in use.
- * @param {!Blockly.BlockSvg} block The block to measure.
+ * @param {!Renderer} renderer The renderer in use.
+ * @param {!BlockSvg} block The block to measure.
  * @constructor
  * @package
- * @extends {Blockly.blockRendering.RenderInfo}
+ * @extends {BaseRenderInfo}
  */
 const RenderInfo = function(renderer, block) {
   RenderInfo.superClass_.constructor.call(this, renderer, block);
 };
-Blockly.utils.object.inherits(RenderInfo,
-    Blockly.blockRendering.RenderInfo);
+object.inherits(RenderInfo,
+    BaseRenderInfo);
 
 /**
  * Get the block renderer in use.
- * @return {!Blockly.thrasos.Renderer} The block renderer in use.
+ * @return {!Renderer} The block renderer in use.
  * @package
  */
 RenderInfo.prototype.getRenderer = function() {
-  return /** @type {!Blockly.thrasos.Renderer} */ (this.renderer_);
+  return /** @type {!Renderer} */ (this.renderer_);
 };
 
 /**
@@ -71,14 +73,14 @@ RenderInfo.prototype.addElemSpacing_ = function() {
     // No spacing needed before the corner on the top row or the bottom row.
     if (row.startsWithElemSpacer()) {
       // There's a spacer before the first element in the row.
-      row.elements.push(new Blockly.blockRendering.InRowSpacer(
+      row.elements.push(new InRowSpacer(
           this.constants_, this.getInRowSpacing_(null, oldElems[0])));
     }
     for (let e = 0; e < oldElems.length - 1; e++) {
       row.elements.push(oldElems[e]);
       const spacing = this.getInRowSpacing_(oldElems[e], oldElems[e + 1]);
       row.elements.push(
-          new Blockly.blockRendering.InRowSpacer(this.constants_, spacing));
+          new InRowSpacer(this.constants_, spacing));
     }
     row.elements.push(oldElems[oldElems.length - 1]);
     if (row.endsWithElemSpacer()) {
@@ -87,7 +89,7 @@ RenderInfo.prototype.addElemSpacing_ = function() {
         spacing += this.constants_.TAB_WIDTH;
       }
       // There's a spacer after the last element in the row.
-      row.elements.push(new Blockly.blockRendering.InRowSpacer(
+      row.elements.push(new InRowSpacer(
           this.constants_, spacing));
     }
   }
@@ -99,15 +101,15 @@ RenderInfo.prototype.addElemSpacing_ = function() {
 RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   if (!prev) {
     // Between an editable field and the beginning of the row.
-    if (next && Blockly.blockRendering.Types.isField(next) &&
-        (/** @type {Blockly.blockRendering.Field} */ (next)).isEditable) {
+    if (next && Types.isField(next) &&
+        (/** @type {Field} */ (next)).isEditable) {
       return this.constants_.MEDIUM_PADDING;
     }
     // Inline input at the beginning of the row.
-    if (next && Blockly.blockRendering.Types.isInlineInput(next)) {
+    if (next && Types.isInlineInput(next)) {
       return this.constants_.MEDIUM_LARGE_PADDING;
     }
-    if (next && Blockly.blockRendering.Types.isStatementInput(next)) {
+    if (next && Types.isStatementInput(next)) {
       return this.constants_.STATEMENT_INPUT_PADDING_LEFT;
     }
     // Anything else at the beginning of the row.
@@ -115,29 +117,29 @@ RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   }
 
   // Spacing between a non-input and the end of the row.
-  if (!Blockly.blockRendering.Types.isInput(prev) && !next) {
+  if (!Types.isInput(prev) && !next) {
     // Between an editable field and the end of the row.
-    if (Blockly.blockRendering.Types.isField(prev) &&
-        (/** @type {Blockly.blockRendering.Field} */ (prev)).isEditable) {
+    if (Types.isField(prev) &&
+        (/** @type {Field} */ (prev)).isEditable) {
       return this.constants_.MEDIUM_PADDING;
     }
     // Padding at the end of an icon-only row to make the block shape clearer.
-    if (Blockly.blockRendering.Types.isIcon(prev)) {
+    if (Types.isIcon(prev)) {
       return (this.constants_.LARGE_PADDING * 2) + 1;
     }
-    if (Blockly.blockRendering.Types.isHat(prev)) {
+    if (Types.isHat(prev)) {
       return this.constants_.NO_PADDING;
     }
     // Establish a minimum width for a block with a previous or next connection.
-    if (Blockly.blockRendering.Types.isPreviousOrNextConnection(prev)) {
+    if (Types.isPreviousOrNextConnection(prev)) {
       return this.constants_.LARGE_PADDING;
     }
     // Between rounded corner and the end of the row.
-    if (Blockly.blockRendering.Types.isLeftRoundedCorner(prev)) {
+    if (Types.isLeftRoundedCorner(prev)) {
       return this.constants_.MIN_BLOCK_WIDTH;
     }
     // Between a jagged edge and the end of the row.
-    if (Blockly.blockRendering.Types.isJaggedEdge(prev)) {
+    if (Types.isJaggedEdge(prev)) {
       return this.constants_.NO_PADDING;
     }
     // Between noneditable fields and icons and the end of the row.
@@ -145,33 +147,33 @@ RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   }
 
   // Between inputs and the end of the row.
-  if (Blockly.blockRendering.Types.isInput(prev) && !next) {
-    if (Blockly.blockRendering.Types.isExternalInput(prev)) {
+  if (Types.isInput(prev) && !next) {
+    if (Types.isExternalInput(prev)) {
       return this.constants_.NO_PADDING;
-    } else if (Blockly.blockRendering.Types.isInlineInput(prev)) {
+    } else if (Types.isInlineInput(prev)) {
       return this.constants_.LARGE_PADDING;
-    } else if (Blockly.blockRendering.Types.isStatementInput(prev)) {
+    } else if (Types.isStatementInput(prev)) {
       return this.constants_.NO_PADDING;
     }
   }
 
   // Spacing between a non-input and an input.
-  if (!Blockly.blockRendering.Types.isInput(prev) &&
-      next && Blockly.blockRendering.Types.isInput(next)) {
+  if (!Types.isInput(prev) &&
+      next && Types.isInput(next)) {
     // Between an editable field and an input.
-    if (Blockly.blockRendering.Types.isField(prev) &&
-        (/** @type {Blockly.blockRendering.Field} */ (prev)).isEditable) {
-      if (Blockly.blockRendering.Types.isInlineInput(next)) {
+    if (Types.isField(prev) &&
+        (/** @type {Field} */ (prev)).isEditable) {
+      if (Types.isInlineInput(next)) {
         return this.constants_.SMALL_PADDING;
-      } else if (Blockly.blockRendering.Types.isExternalInput(next)) {
+      } else if (Types.isExternalInput(next)) {
         return this.constants_.SMALL_PADDING;
       }
     } else {
-      if (Blockly.blockRendering.Types.isInlineInput(next)) {
+      if (Types.isInlineInput(next)) {
         return this.constants_.MEDIUM_LARGE_PADDING;
-      } else if (Blockly.blockRendering.Types.isExternalInput(next)) {
+      } else if (Types.isExternalInput(next)) {
         return this.constants_.MEDIUM_LARGE_PADDING;
-      } else if (Blockly.blockRendering.Types.isStatementInput(next)) {
+      } else if (Types.isStatementInput(next)) {
         return this.constants_.LARGE_PADDING;
       }
     }
@@ -179,16 +181,16 @@ RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   }
 
   // Spacing between an icon and an icon or field.
-  if (Blockly.blockRendering.Types.isIcon(prev) &&
-      next && !Blockly.blockRendering.Types.isInput(next)) {
+  if (Types.isIcon(prev) &&
+      next && !Types.isInput(next)) {
     return this.constants_.LARGE_PADDING;
   }
 
   // Spacing between an inline input and a field.
-  if (Blockly.blockRendering.Types.isInlineInput(prev) &&
-      next && Blockly.blockRendering.Types.isField(next)) {
+  if (Types.isInlineInput(prev) &&
+      next && Types.isField(next)) {
     // Editable field after inline input.
-    if ((/** @type {Blockly.blockRendering.Field} */ (next)).isEditable) {
+    if ((/** @type {Field} */ (next)).isEditable) {
       return this.constants_.MEDIUM_PADDING;
     } else {
       // Noneditable field after inline input.
@@ -196,33 +198,33 @@ RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
     }
   }
 
-  if (Blockly.blockRendering.Types.isLeftSquareCorner(prev) && next) {
+  if (Types.isLeftSquareCorner(prev) && next) {
     // Spacing between a hat and a corner
-    if (Blockly.blockRendering.Types.isHat(next)) {
+    if (Types.isHat(next)) {
       return this.constants_.NO_PADDING;
     }
     // Spacing between a square corner and a previous or next connection
-    if (Blockly.blockRendering.Types.isPreviousConnection(next) ||
-        Blockly.blockRendering.Types.isNextConnection(next)) {
+    if (Types.isPreviousConnection(next) ||
+        Types.isNextConnection(next)) {
       return next.notchOffset;
     }
   }
 
   // Spacing between a rounded corner and a previous or next connection.
-  if (Blockly.blockRendering.Types.isLeftRoundedCorner(prev) && next) {
+  if (Types.isLeftRoundedCorner(prev) && next) {
     return next.notchOffset - this.constants_.CORNER_RADIUS;
   }
 
   // Spacing between two fields of the same editability.
-  if (Blockly.blockRendering.Types.isField(prev) &&
-      next && Blockly.blockRendering.Types.isField(next) &&
-      ((/** @type {Blockly.blockRendering.Field} */ (prev)).isEditable ==
-          (/** @type {Blockly.blockRendering.Field} */ (next)).isEditable)) {
+  if (Types.isField(prev) &&
+      next && Types.isField(next) &&
+      ((/** @type {Field} */ (prev)).isEditable ==
+          (/** @type {Field} */ (next)).isEditable)) {
     return this.constants_.LARGE_PADDING;
   }
 
   // Spacing between anything and a jagged edge.
-  if (next && Blockly.blockRendering.Types.isJaggedEdge(next)) {
+  if (next && Types.isJaggedEdge(next)) {
     return this.constants_.LARGE_PADDING;
   }
 
@@ -235,13 +237,13 @@ RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
 RenderInfo.prototype.getSpacerRowHeight_ = function(
     prev, next) {
   // If we have an empty block add a spacer to increase the height.
-  if (Blockly.blockRendering.Types.isTopRow(prev) &&
-      Blockly.blockRendering.Types.isBottomRow(next)) {
+  if (Types.isTopRow(prev) &&
+      Types.isBottomRow(next)) {
     return this.constants_.EMPTY_BLOCK_SPACER_HEIGHT;
   }
   // Top and bottom rows act as a spacer so we don't need any extra padding.
-  if (Blockly.blockRendering.Types.isTopRow(prev) ||
-      Blockly.blockRendering.Types.isBottomRow(next)) {
+  if (Types.isTopRow(prev) ||
+      Types.isBottomRow(next)) {
     return this.constants_.NO_PADDING;
   }
   if (prev.hasExternalInput && next.hasExternalInput) {
@@ -263,25 +265,25 @@ RenderInfo.prototype.getSpacerRowHeight_ = function(
  * @override
  */
 RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
-  if (Blockly.blockRendering.Types.isSpacer(elem)) {
+  if (Types.isSpacer(elem)) {
     return row.yPos + elem.height / 2;
   }
-  if (Blockly.blockRendering.Types.isBottomRow(row)) {
+  if (Types.isBottomRow(row)) {
     const baseline = row.yPos + row.height - row.descenderHeight;
-    if (Blockly.blockRendering.Types.isNextConnection(elem)) {
+    if (Types.isNextConnection(elem)) {
       return baseline + elem.height / 2;
     }
     return baseline - elem.height / 2;
   }
-  if (Blockly.blockRendering.Types.isTopRow(row)) {
-    if (Blockly.blockRendering.Types.isHat(elem)) {
+  if (Types.isTopRow(row)) {
+    if (Types.isHat(elem)) {
       return row.capline - elem.height / 2;
     }
     return row.capline + elem.height / 2;
   }
 
   let result = row.yPos;
-  if (Blockly.blockRendering.Types.isField(elem) && row.hasStatement) {
+  if (Types.isField(elem) && row.hasStatement) {
     const offset = this.constants_.TALL_INPUT_FIELD_OFFSET_Y +
         elem.height / 2;
     result += offset;

From 6bf9a336f4c6038a6388ca78ef49b039629b5122 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 12 Aug 2021 16:49:12 -0700
Subject: [PATCH 665/833] clang-format core/renderers/thrasos/info.js

---
 core/renderers/thrasos/info.js | 50 ++++++++++++----------------------
 1 file changed, 18 insertions(+), 32 deletions(-)

diff --git a/core/renderers/thrasos/info.js b/core/renderers/thrasos/info.js
index 46716de34..974a0e76e 100644
--- a/core/renderers/thrasos/info.js
+++ b/core/renderers/thrasos/info.js
@@ -42,8 +42,7 @@ const object = goog.require('Blockly.utils.object');
 const RenderInfo = function(renderer, block) {
   RenderInfo.superClass_.constructor.call(this, renderer, block);
 };
-object.inherits(RenderInfo,
-    BaseRenderInfo);
+object.inherits(RenderInfo, BaseRenderInfo);
 
 /**
  * Get the block renderer in use.
@@ -79,8 +78,7 @@ RenderInfo.prototype.addElemSpacing_ = function() {
     for (let e = 0; e < oldElems.length - 1; e++) {
       row.elements.push(oldElems[e]);
       const spacing = this.getInRowSpacing_(oldElems[e], oldElems[e + 1]);
-      row.elements.push(
-          new InRowSpacer(this.constants_, spacing));
+      row.elements.push(new InRowSpacer(this.constants_, spacing));
     }
     row.elements.push(oldElems[oldElems.length - 1]);
     if (row.endsWithElemSpacer()) {
@@ -89,8 +87,7 @@ RenderInfo.prototype.addElemSpacing_ = function() {
         spacing += this.constants_.TAB_WIDTH;
       }
       // There's a spacer after the last element in the row.
-      row.elements.push(new InRowSpacer(
-          this.constants_, spacing));
+      row.elements.push(new InRowSpacer(this.constants_, spacing));
     }
   }
 };
@@ -119,8 +116,7 @@ RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   // Spacing between a non-input and the end of the row.
   if (!Types.isInput(prev) && !next) {
     // Between an editable field and the end of the row.
-    if (Types.isField(prev) &&
-        (/** @type {Field} */ (prev)).isEditable) {
+    if (Types.isField(prev) && (/** @type {Field} */ (prev)).isEditable) {
       return this.constants_.MEDIUM_PADDING;
     }
     // Padding at the end of an icon-only row to make the block shape clearer.
@@ -158,11 +154,9 @@ RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   }
 
   // Spacing between a non-input and an input.
-  if (!Types.isInput(prev) &&
-      next && Types.isInput(next)) {
+  if (!Types.isInput(prev) && next && Types.isInput(next)) {
     // Between an editable field and an input.
-    if (Types.isField(prev) &&
-        (/** @type {Field} */ (prev)).isEditable) {
+    if (Types.isField(prev) && (/** @type {Field} */ (prev)).isEditable) {
       if (Types.isInlineInput(next)) {
         return this.constants_.SMALL_PADDING;
       } else if (Types.isExternalInput(next)) {
@@ -181,14 +175,12 @@ RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   }
 
   // Spacing between an icon and an icon or field.
-  if (Types.isIcon(prev) &&
-      next && !Types.isInput(next)) {
+  if (Types.isIcon(prev) && next && !Types.isInput(next)) {
     return this.constants_.LARGE_PADDING;
   }
 
   // Spacing between an inline input and a field.
-  if (Types.isInlineInput(prev) &&
-      next && Types.isField(next)) {
+  if (Types.isInlineInput(prev) && next && Types.isField(next)) {
     // Editable field after inline input.
     if ((/** @type {Field} */ (next)).isEditable) {
       return this.constants_.MEDIUM_PADDING;
@@ -204,8 +196,7 @@ RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
       return this.constants_.NO_PADDING;
     }
     // Spacing between a square corner and a previous or next connection
-    if (Types.isPreviousConnection(next) ||
-        Types.isNextConnection(next)) {
+    if (Types.isPreviousConnection(next) || Types.isNextConnection(next)) {
       return next.notchOffset;
     }
   }
@@ -216,10 +207,9 @@ RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   }
 
   // Spacing between two fields of the same editability.
-  if (Types.isField(prev) &&
-      next && Types.isField(next) &&
+  if (Types.isField(prev) && next && Types.isField(next) &&
       ((/** @type {Field} */ (prev)).isEditable ==
-          (/** @type {Field} */ (next)).isEditable)) {
+       (/** @type {Field} */ (next)).isEditable)) {
     return this.constants_.LARGE_PADDING;
   }
 
@@ -234,16 +224,13 @@ RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
 /**
  * @override
  */
-RenderInfo.prototype.getSpacerRowHeight_ = function(
-    prev, next) {
+RenderInfo.prototype.getSpacerRowHeight_ = function(prev, next) {
   // If we have an empty block add a spacer to increase the height.
-  if (Types.isTopRow(prev) &&
-      Types.isBottomRow(next)) {
+  if (Types.isTopRow(prev) && Types.isBottomRow(next)) {
     return this.constants_.EMPTY_BLOCK_SPACER_HEIGHT;
   }
   // Top and bottom rows act as a spacer so we don't need any extra padding.
-  if (Types.isTopRow(prev) ||
-      Types.isBottomRow(next)) {
+  if (Types.isTopRow(prev) || Types.isBottomRow(next)) {
     return this.constants_.NO_PADDING;
   }
   if (prev.hasExternalInput && next.hasExternalInput) {
@@ -284,8 +271,7 @@ RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
 
   let result = row.yPos;
   if (Types.isField(elem) && row.hasStatement) {
-    const offset = this.constants_.TALL_INPUT_FIELD_OFFSET_Y +
-        elem.height / 2;
+    const offset = this.constants_.TALL_INPUT_FIELD_OFFSET_Y + elem.height / 2;
     result += offset;
   } else {
     result += (row.height / 2);
@@ -324,9 +310,9 @@ RenderInfo.prototype.finalize_ = function() {
   if (this.outputConnection && this.block_.nextConnection &&
       this.block_.nextConnection.isConnected()) {
     // Include width of connected block in value to stack width measurement.
-    widestRowWithConnectedBlocks =
-        Math.max(widestRowWithConnectedBlocks,
-            this.block_.nextConnection.targetBlock().getHeightWidth().width);
+    widestRowWithConnectedBlocks = Math.max(
+        widestRowWithConnectedBlocks,
+        this.block_.nextConnection.targetBlock().getHeightWidth().width);
   }
 
   this.bottomRow.baseline = yCursor - this.bottomRow.descenderHeight;

From dbe7aaa8c85a2c16020e975506744530aa5f5953 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 16 Aug 2021 15:54:11 -0700
Subject: [PATCH 666/833] Migrate core/renderers/measurables/row_elements.js to
 goog.module syntax (#5381)

* Split provides in core/renderers/measurables/row_elements.js into individual files

* Migrate core/renderers/measurables/row_elements.js to ES6 const/let

* Migrate core/renderers/measurables/row_elements.js to goog.module

* Migrate core/renderers/measurables/row_elements.js to named requires

* clang-format core/renderers/measurables/row_elements.js
---
 core/renderers/measurables/field.js         |  52 ++++++
 core/renderers/measurables/hat.js           |  41 +++++
 core/renderers/measurables/icon.js          |  47 +++++
 core/renderers/measurables/in_row_spacer.js |  41 +++++
 core/renderers/measurables/jagged_edge.js   |  40 +++++
 core/renderers/measurables/round_corner.js  |  46 +++++
 core/renderers/measurables/row_elements.js  | 190 --------------------
 core/renderers/measurables/square_corner.js |  44 +++++
 tests/deps.js                               |   8 +-
 9 files changed, 318 insertions(+), 191 deletions(-)
 create mode 100644 core/renderers/measurables/field.js
 create mode 100644 core/renderers/measurables/hat.js
 create mode 100644 core/renderers/measurables/icon.js
 create mode 100644 core/renderers/measurables/in_row_spacer.js
 create mode 100644 core/renderers/measurables/jagged_edge.js
 create mode 100644 core/renderers/measurables/round_corner.js
 delete mode 100644 core/renderers/measurables/row_elements.js
 create mode 100644 core/renderers/measurables/square_corner.js

diff --git a/core/renderers/measurables/field.js b/core/renderers/measurables/field.js
new file mode 100644
index 000000000..33c6b6eb3
--- /dev/null
+++ b/core/renderers/measurables/field.js
@@ -0,0 +1,52 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Objects representing a field in a row of a rendered
+ * block.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.module('Blockly.blockRendering.Field');
+goog.module.declareLegacyNamespace();
+
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const BlocklyField = goog.requireType('Blockly.Field');
+/* eslint-disable-next-line no-unused-vars */
+const Input = goog.requireType('Blockly.Input');
+const Measurable = goog.require('Blockly.blockRendering.Measurable');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
+
+
+/**
+ * An object containing information about the space a field takes up during
+ * rendering
+ * @param {!ConstantProvider} constants The rendering
+ *   constants provider.
+ * @param {!BlocklyField} field The field to measure and store information for.
+ * @param {!Input} parentInput The parent input for the field.
+ * @package
+ * @constructor
+ * @extends {Measurable}
+ */
+const Field = function(constants, field, parentInput) {
+  Field.superClass_.constructor.call(this, constants);
+  this.field = field;
+  this.isEditable = field.EDITABLE;
+  this.flipRtl = field.getFlipRtl();
+  this.type |= Types.FIELD;
+
+  const size = this.field.getSize();
+  this.height = size.height;
+  this.width = size.width;
+  this.parentInput = parentInput;
+};
+object.inherits(Field, Measurable);
+
+exports = Field;
diff --git a/core/renderers/measurables/hat.js b/core/renderers/measurables/hat.js
new file mode 100644
index 000000000..a7d5f269b
--- /dev/null
+++ b/core/renderers/measurables/hat.js
@@ -0,0 +1,41 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Objects representing a hat in a row of a rendered
+ * block.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.module('Blockly.blockRendering.Hat');
+goog.module.declareLegacyNamespace();
+
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const Measurable = goog.require('Blockly.blockRendering.Measurable');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
+
+
+/**
+ * An object containing information about the space a hat takes up during
+ * rendering.
+ * @param {!ConstantProvider} constants The rendering
+ *   constants provider.
+ * @package
+ * @constructor
+ * @extends {Measurable}
+ */
+const Hat = function(constants) {
+  Hat.superClass_.constructor.call(this, constants);
+  this.type |= Types.HAT;
+  this.height = this.constants_.START_HAT.height;
+  this.width = this.constants_.START_HAT.width;
+  this.ascenderHeight = this.height;
+};
+object.inherits(Hat, Measurable);
+
+exports = Hat;
diff --git a/core/renderers/measurables/icon.js b/core/renderers/measurables/icon.js
new file mode 100644
index 000000000..850d123f0
--- /dev/null
+++ b/core/renderers/measurables/icon.js
@@ -0,0 +1,47 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Objects representing an icon in a row of a rendered
+ * block.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.module('Blockly.blockRendering.Icon');
+goog.module.declareLegacyNamespace();
+
+/* eslint-disable-next-line no-unused-vars */
+const BlocklyIcon = goog.requireType('Blockly.Icon');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const Measurable = goog.require('Blockly.blockRendering.Measurable');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
+
+
+/**
+ * An object containing information about the space an icon takes up during
+ * rendering
+ * @param {!ConstantProvider} constants The rendering
+ *   constants provider.
+ * @param {!BlocklyIcon} icon The icon to measure and store information for.
+ * @package
+ * @constructor
+ * @extends {Measurable}
+ */
+const Icon = function(constants, icon) {
+  Icon.superClass_.constructor.call(this, constants);
+  this.icon = icon;
+  this.isVisible = icon.isVisible();
+  this.type |= Types.ICON;
+
+  const size = icon.getCorrectedSize();
+  this.height = size.height;
+  this.width = size.width;
+};
+object.inherits(Icon, Measurable);
+
+exports = Icon;
diff --git a/core/renderers/measurables/in_row_spacer.js b/core/renderers/measurables/in_row_spacer.js
new file mode 100644
index 000000000..4177807f0
--- /dev/null
+++ b/core/renderers/measurables/in_row_spacer.js
@@ -0,0 +1,41 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Objects representing a spacer in a row of a rendered
+ * block.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.module('Blockly.blockRendering.InRowSpacer');
+goog.module.declareLegacyNamespace();
+
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const Measurable = goog.require('Blockly.blockRendering.Measurable');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
+
+
+/**
+ * An object containing information about a spacer between two elements on a
+ * row.
+ * @param {!ConstantProvider} constants The rendering
+ *   constants provider.
+ * @param {number} width The width of the spacer.
+ * @package
+ * @constructor
+ * @extends {Measurable}
+ */
+const InRowSpacer = function(constants, width) {
+  InRowSpacer.superClass_.constructor.call(this, constants);
+  this.type |= Types.SPACER | Types.IN_ROW_SPACER;
+  this.width = width;
+  this.height = this.constants_.SPACER_DEFAULT_HEIGHT;
+};
+object.inherits(InRowSpacer, Measurable);
+
+exports = InRowSpacer;
diff --git a/core/renderers/measurables/jagged_edge.js b/core/renderers/measurables/jagged_edge.js
new file mode 100644
index 000000000..14c9dd533
--- /dev/null
+++ b/core/renderers/measurables/jagged_edge.js
@@ -0,0 +1,40 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Objects representing a jagged edge in a row of a rendered
+ * block.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.module('Blockly.blockRendering.JaggedEdge');
+goog.module.declareLegacyNamespace();
+
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const Measurable = goog.require('Blockly.blockRendering.Measurable');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
+
+
+/**
+ * An object containing information about the jagged edge of a collapsed block
+ * takes up during rendering
+ * @param {!ConstantProvider} constants The rendering
+ *   constants provider.
+ * @package
+ * @constructor
+ * @extends {Measurable}
+ */
+const JaggedEdge = function(constants) {
+  JaggedEdge.superClass_.constructor.call(this, constants);
+  this.type |= Types.JAGGED_EDGE;
+  this.height = this.constants_.JAGGED_TEETH.height;
+  this.width = this.constants_.JAGGED_TEETH.width;
+};
+object.inherits(JaggedEdge, Measurable);
+
+exports = JaggedEdge;
diff --git a/core/renderers/measurables/round_corner.js b/core/renderers/measurables/round_corner.js
new file mode 100644
index 000000000..605f5536b
--- /dev/null
+++ b/core/renderers/measurables/round_corner.js
@@ -0,0 +1,46 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Objects representing a round corner in a row of a rendered
+ * block.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.module('Blockly.blockRendering.RoundCorner');
+goog.module.declareLegacyNamespace();
+
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const Measurable = goog.require('Blockly.blockRendering.Measurable');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
+
+
+/**
+ * An object containing information about the space a rounded corner takes up
+ * during rendering.
+ * @param {!ConstantProvider} constants The rendering
+ *   constants provider.
+ * @param {string=} opt_position The position of this corner.
+ * @package
+ * @constructor
+ * @extends {Measurable}
+ */
+const RoundCorner = function(constants, opt_position) {
+  RoundCorner.superClass_.constructor.call(this, constants);
+  this.type =
+      ((!opt_position || opt_position == 'left') ? Types.LEFT_ROUND_CORNER :
+                                                   Types.RIGHT_ROUND_CORNER) |
+      Types.CORNER;
+  this.width = this.constants_.CORNER_RADIUS;
+  // The rounded corner extends into the next row by 4 so we only take the
+  // height that is aligned with this row.
+  this.height = this.constants_.CORNER_RADIUS / 2;
+};
+object.inherits(RoundCorner, Measurable);
+
+exports = RoundCorner;
diff --git a/core/renderers/measurables/row_elements.js b/core/renderers/measurables/row_elements.js
deleted file mode 100644
index 7c28d8c22..000000000
--- a/core/renderers/measurables/row_elements.js
+++ /dev/null
@@ -1,190 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Objects representing elements in a row of a rendered
- * block.
- * @author fenichel@google.com (Rachel Fenichel)
- */
-
-goog.provide('Blockly.blockRendering.Field');
-goog.provide('Blockly.blockRendering.Hat');
-goog.provide('Blockly.blockRendering.Icon');
-goog.provide('Blockly.blockRendering.InRowSpacer');
-goog.provide('Blockly.blockRendering.JaggedEdge');
-goog.provide('Blockly.blockRendering.RoundCorner');
-goog.provide('Blockly.blockRendering.SquareCorner');
-
-goog.require('Blockly.blockRendering.Measurable');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.Field');
-goog.requireType('Blockly.Icon');
-goog.requireType('Blockly.Input');
-
-
-/**
- * An object containing information about the space an icon takes up during
- * rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @param {!Blockly.Icon} icon The icon to measure and store information for.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.Measurable}
- */
-Blockly.blockRendering.Icon = function(constants, icon) {
-  Blockly.blockRendering.Icon.superClass_.constructor.call(this, constants);
-  this.icon = icon;
-  this.isVisible = icon.isVisible();
-  this.type |= Blockly.blockRendering.Types.ICON;
-
-  var size = icon.getCorrectedSize();
-  this.height = size.height;
-  this.width = size.width;
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.Icon,
-    Blockly.blockRendering.Measurable);
-
-/**
- * An object containing information about the jagged edge of a collapsed block
- * takes up during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.Measurable}
- */
-Blockly.blockRendering.JaggedEdge = function(constants) {
-  Blockly.blockRendering.JaggedEdge.superClass_.constructor.call(
-      this, constants);
-  this.type |= Blockly.blockRendering.Types.JAGGED_EDGE;
-  this.height = this.constants_.JAGGED_TEETH.height;
-  this.width = this.constants_.JAGGED_TEETH.width;
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.JaggedEdge,
-    Blockly.blockRendering.Measurable);
-
-
-/**
- * An object containing information about the space a field takes up during
- * rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @param {!Blockly.Field} field The field to measure and store information for.
- * @param {!Blockly.Input} parentInput The parent input for the field.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.Measurable}
- */
-Blockly.blockRendering.Field = function(constants, field, parentInput) {
-  Blockly.blockRendering.Field.superClass_.constructor.call(this, constants);
-  this.field = field;
-  this.isEditable = field.EDITABLE;
-  this.flipRtl = field.getFlipRtl();
-  this.type |= Blockly.blockRendering.Types.FIELD;
-
-  var size = this.field.getSize();
-  this.height = size.height;
-  this.width = size.width;
-  this.parentInput = parentInput;
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.Field,
-    Blockly.blockRendering.Measurable);
-
-/**
- * An object containing information about the space a hat takes up during
- * rendering.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.Measurable}
- */
-Blockly.blockRendering.Hat = function(constants) {
-  Blockly.blockRendering.Hat.superClass_.constructor.call(this, constants);
-  this.type |= Blockly.blockRendering.Types.HAT;
-  this.height = this.constants_.START_HAT.height;
-  this.width = this.constants_.START_HAT.width;
-  this.ascenderHeight = this.height;
-
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.Hat,
-    Blockly.blockRendering.Measurable);
-
-/**
- * An object containing information about the space a square corner takes up
- * during rendering.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @param {string=} opt_position The position of this corner.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.Measurable}
- */
-Blockly.blockRendering.SquareCorner = function(constants, opt_position) {
-  Blockly.blockRendering.SquareCorner.superClass_.constructor.call(this,
-      constants);
-  this.type = ((!opt_position || opt_position == 'left') ?
-      Blockly.blockRendering.Types.LEFT_SQUARE_CORNER :
-      Blockly.blockRendering.Types.RIGHT_SQUARE_CORNER) |
-          Blockly.blockRendering.Types.CORNER;
-  this.height = this.constants_.NO_PADDING;
-  this.width = this.constants_.NO_PADDING;
-
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.SquareCorner,
-    Blockly.blockRendering.Measurable);
-
-/**
- * An object containing information about the space a rounded corner takes up
- * during rendering.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @param {string=} opt_position The position of this corner.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.Measurable}
- */
-Blockly.blockRendering.RoundCorner = function(constants, opt_position) {
-  Blockly.blockRendering.RoundCorner.superClass_.constructor.call(this,
-      constants);
-  this.type = ((!opt_position || opt_position == 'left') ?
-      Blockly.blockRendering.Types.LEFT_ROUND_CORNER :
-      Blockly.blockRendering.Types.RIGHT_ROUND_CORNER) |
-          Blockly.blockRendering.Types.CORNER;
-  this.width = this.constants_.CORNER_RADIUS;
-  // The rounded corner extends into the next row by 4 so we only take the
-  // height that is aligned with this row.
-  this.height = this.constants_.CORNER_RADIUS / 2;
-
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.RoundCorner,
-    Blockly.blockRendering.Measurable);
-
-/**
- * An object containing information about a spacer between two elements on a
- * row.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @param {number} width The width of the spacer.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.Measurable}
- */
-Blockly.blockRendering.InRowSpacer = function(constants, width) {
-  Blockly.blockRendering.InRowSpacer.superClass_.constructor.call(this,
-      constants);
-  this.type |= Blockly.blockRendering.Types.SPACER |
-      Blockly.blockRendering.Types.IN_ROW_SPACER;
-  this.width = width;
-  this.height = this.constants_.SPACER_DEFAULT_HEIGHT;
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.InRowSpacer,
-    Blockly.blockRendering.Measurable);
-
diff --git a/core/renderers/measurables/square_corner.js b/core/renderers/measurables/square_corner.js
new file mode 100644
index 000000000..7af12dad6
--- /dev/null
+++ b/core/renderers/measurables/square_corner.js
@@ -0,0 +1,44 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Objects representing a square corner in a row of a rendered
+ * block.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.module('Blockly.blockRendering.SquareCorner');
+goog.module.declareLegacyNamespace();
+
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const Measurable = goog.require('Blockly.blockRendering.Measurable');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
+
+
+/**
+ * An object containing information about the space a square corner takes up
+ * during rendering.
+ * @param {!ConstantProvider} constants The rendering
+ *   constants provider.
+ * @param {string=} opt_position The position of this corner.
+ * @package
+ * @constructor
+ * @extends {Measurable}
+ */
+const SquareCorner = function(constants, opt_position) {
+  SquareCorner.superClass_.constructor.call(this, constants);
+  this.type =
+      ((!opt_position || opt_position == 'left') ? Types.LEFT_SQUARE_CORNER :
+                                                   Types.RIGHT_SQUARE_CORNER) |
+      Types.CORNER;
+  this.height = this.constants_.NO_PADDING;
+  this.width = this.constants_.NO_PADDING;
+};
+object.inherits(SquareCorner, Measurable);
+
+exports = SquareCorner;
diff --git a/tests/deps.js b/tests/deps.js
index 2ef3e4da3..9417f0438 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -151,10 +151,16 @@ goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Ren
 goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/external_value_input.js', ['Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/field.js', ['Blockly.blockRendering.Field'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/hat.js', ['Blockly.blockRendering.Hat'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/icon.js', ['Blockly.blockRendering.Icon'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/in_row_spacer.js', ['Blockly.blockRendering.InRowSpacer'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/inline_input.js', ['Blockly.blockRendering.InlineInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/input_connection.js', ['Blockly.blockRendering.InputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/row_elements.js', ['Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/jagged_edge.js', ['Blockly.blockRendering.JaggedEdge'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/round_corner.js', ['Blockly.blockRendering.RoundCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/rows.js', ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/square_corner.js', ['Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 11f4479fafe958d52edd685c97066775d05e15e7 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 16 Aug 2021 18:01:41 -0700
Subject: [PATCH 667/833] Split classes from core/renderers/measurables/rows.js
 into multiple files

---
 core/renderers/measurables/bottom_row.js | 129 +++++++++++++
 core/renderers/measurables/input_row.js  |  76 ++++++++
 core/renderers/measurables/row.js        | 219 +++++++++++++++++++++++
 core/renderers/measurables/spacer_row.js |  52 ++++++
 core/renderers/measurables/top_row.js    | 133 ++++++++++++++
 tests/deps.js                            |   6 +-
 6 files changed, 614 insertions(+), 1 deletion(-)
 create mode 100644 core/renderers/measurables/bottom_row.js
 create mode 100644 core/renderers/measurables/input_row.js
 create mode 100644 core/renderers/measurables/row.js
 create mode 100644 core/renderers/measurables/spacer_row.js
 create mode 100644 core/renderers/measurables/top_row.js

diff --git a/core/renderers/measurables/bottom_row.js b/core/renderers/measurables/bottom_row.js
new file mode 100644
index 000000000..2cb1b702f
--- /dev/null
+++ b/core/renderers/measurables/bottom_row.js
@@ -0,0 +1,129 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Object representing a bottom row on a rendered block.
+ * of its subcomponents.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.module('Blockly.blockRendering.BottomRow');
+goog.module.declareLegacyNamespace();
+
+goog.requireType('Blockly.BlockSvg');
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.blockRendering.NextConnection');
+goog.require('Blockly.blockRendering.Row');
+goog.require('Blockly.blockRendering.Types');
+goog.require('Blockly.utils.object');
+
+
+/**
+ * An object containing information about what elements are in the bottom row of
+ * a block as well as spacing information for the top row.
+ * Elements in a bottom row can consist of corners, spacers and next
+ * connections.
+ * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ *   constants provider.
+ * @package
+ * @constructor
+ * @extends {Blockly.blockRendering.Row}
+ */
+Blockly.blockRendering.BottomRow = function(constants) {
+  Blockly.blockRendering.BottomRow.superClass_.constructor.call(this,
+      constants);
+  this.type |= Blockly.blockRendering.Types.BOTTOM_ROW;
+
+  /**
+   * Whether this row has a next connection.
+   * @package
+   * @type {boolean}
+   */
+  this.hasNextConnection = false;
+
+  /**
+   * The next connection on the row, if any.
+   * @package
+   * @type {Blockly.blockRendering.NextConnection}
+   */
+  this.connection = null;
+
+  /**
+   * The amount that the bottom of the block extends below the horizontal edge,
+   * e.g. because of a next connection.  Must be non-negative (see #2820).
+   * @package
+   * @type {number}
+   */
+  this.descenderHeight = 0;
+
+  /**
+   * The Y position of the bottom edge of the block, relative to the origin
+   * of the block rendering.
+   * @type {number}
+   */
+  this.baseline = 0;
+};
+Blockly.utils.object.inherits(Blockly.blockRendering.BottomRow,
+    Blockly.blockRendering.Row);
+
+/**
+ * Returns whether or not the bottom row has a left square corner.
+ * @param {!Blockly.BlockSvg} block The block whose bottom row this represents.
+ * @return {boolean} Whether or not the bottom row has a left square corner.
+ */
+Blockly.blockRendering.BottomRow.prototype.hasLeftSquareCorner = function(
+    block) {
+  return !!block.outputConnection || !!block.getNextBlock();
+};
+
+/**
+ * Returns whether or not the bottom row has a right square corner.
+ * @param {!Blockly.BlockSvg} _block The block whose bottom row this represents.
+ * @return {boolean} Whether or not the bottom row has a right square corner.
+ */
+Blockly.blockRendering.BottomRow.prototype.hasRightSquareCorner = function(
+    _block) {
+  return true;
+};
+
+/**
+ * @override
+ */
+Blockly.blockRendering.BottomRow.prototype.measure = function() {
+  var height = 0;
+  var width = 0;
+  var descenderHeight = 0;
+  for (var e = 0, elem; (elem = this.elements[e]); e++) {
+    width += elem.width;
+    if (!(Blockly.blockRendering.Types.isSpacer(elem))) {
+      // Note: this assumes that next connections have *only* descenderHeight,
+      // with no height above the baseline.
+      if (Blockly.blockRendering.Types.isNextConnection(elem)) {
+        descenderHeight = Math.max(descenderHeight, elem.height);
+      } else {
+        height = Math.max(height, elem.height);
+      }
+    }
+  }
+  this.width = Math.max(this.minWidth, width);
+  this.height = Math.max(this.minHeight, height) + descenderHeight;
+  this.descenderHeight = descenderHeight;
+  this.widthWithConnectedBlocks = this.width;
+};
+
+/**
+ * @override
+ */
+Blockly.blockRendering.BottomRow.prototype.startsWithElemSpacer = function() {
+  return false;
+};
+
+/**
+ * @override
+ */
+Blockly.blockRendering.BottomRow.prototype.endsWithElemSpacer = function() {
+  return false;
+};
diff --git a/core/renderers/measurables/input_row.js b/core/renderers/measurables/input_row.js
new file mode 100644
index 000000000..b7ca55135
--- /dev/null
+++ b/core/renderers/measurables/input_row.js
@@ -0,0 +1,76 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Object representing a row that holds one or more inputs on a
+ * rendered block.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.module('Blockly.blockRendering.InputRow');
+goog.module.declareLegacyNamespace();
+
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.require('Blockly.blockRendering.Row');
+goog.require('Blockly.blockRendering.Types');
+goog.require('Blockly.utils.object');
+
+
+/**
+ * An object containing information about a row that holds one or more inputs.
+ * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ *   constants provider.
+ * @package
+ * @constructor
+ * @extends {Blockly.blockRendering.Row}
+ */
+Blockly.blockRendering.InputRow = function(constants) {
+  Blockly.blockRendering.InputRow.superClass_.constructor.call(this, constants);
+  this.type |= Blockly.blockRendering.Types.INPUT_ROW;
+
+  /**
+   * The total width of all blocks connected to this row.
+   * @type {number}
+   * @package
+   */
+  this.connectedBlockWidths = 0;
+};
+Blockly.utils.object.inherits(Blockly.blockRendering.InputRow,
+    Blockly.blockRendering.Row);
+
+/**
+ * Inspect all subcomponents and populate all size properties on the row.
+ * @package
+ */
+Blockly.blockRendering.InputRow.prototype.measure = function() {
+  this.width = this.minWidth;
+  this.height = this.minHeight;
+  var connectedBlockWidths = 0;
+  for (var e = 0, elem; (elem = this.elements[e]); e++) {
+    this.width += elem.width;
+    if (Blockly.blockRendering.Types.isInput(elem)) {
+      if (Blockly.blockRendering.Types.isStatementInput(elem)) {
+        connectedBlockWidths += elem.connectedBlockWidth;
+      } else if (Blockly.blockRendering.Types.isExternalInput(elem) &&
+          elem.connectedBlockWidth != 0) {
+        connectedBlockWidths += (elem.connectedBlockWidth -
+          elem.connectionWidth);
+      }
+    }
+    if (!(Blockly.blockRendering.Types.isSpacer(elem))) {
+      this.height = Math.max(this.height, elem.height);
+    }
+  }
+  this.connectedBlockWidths = connectedBlockWidths;
+  this.widthWithConnectedBlocks = this.width + connectedBlockWidths;
+};
+
+/**
+ * @override
+ */
+Blockly.blockRendering.InputRow.prototype.endsWithElemSpacer = function() {
+  return !this.hasExternalInput && !this.hasStatement;
+};
diff --git a/core/renderers/measurables/row.js b/core/renderers/measurables/row.js
new file mode 100644
index 000000000..8f47590de
--- /dev/null
+++ b/core/renderers/measurables/row.js
@@ -0,0 +1,219 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Object representing a single row on a rendered block.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.module('Blockly.blockRendering.Row');
+goog.module.declareLegacyNamespace();
+
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.blockRendering.InputConnection');
+goog.requireType('Blockly.blockRendering.InRowSpacer');
+goog.requireType('Blockly.blockRendering.Measurable');
+goog.require('Blockly.blockRendering.Types');
+
+
+/**
+ * An object representing a single row on a rendered block and all of its
+ * subcomponents.
+ * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ *   constants provider.
+ * @package
+ * @constructor
+ */
+Blockly.blockRendering.Row = function(constants) {
+  /**
+   * The type of this rendering object.
+   * @package
+   * @type {number}
+   */
+  this.type = Blockly.blockRendering.Types.ROW;
+
+  /**
+   * An array of elements contained in this row.
+   * @package
+   * @type {!Array<!Blockly.blockRendering.Measurable>}
+   */
+  this.elements = [];
+
+  /**
+   * The height of the row.
+   * @package
+   * @type {number}
+   */
+  this.height = 0;
+
+  /**
+   * The width of the row, from the left edge of the block to the right.
+   * Does not include child blocks unless they are inline.
+   * @package
+   * @type {number}
+   */
+  this.width = 0;
+
+  /**
+   * The minimum height of the row.
+   * @package
+   * @type {number}
+   */
+  this.minHeight = 0;
+
+  /**
+   * The minimum width of the row, from the left edge of the block to the right.
+   * Does not include child blocks unless they are inline.
+   * @package
+   * @type {number}
+   */
+  this.minWidth = 0;
+
+  /**
+   * The width of the row, from the left edge of the block to the edge of the
+   * block or any connected child blocks.
+   * @package
+   * @type {number}
+   */
+  this.widthWithConnectedBlocks = 0;
+
+  /**
+   * The Y position of the row relative to the origin of the block's svg group.
+   * @package
+   * @type {number}
+   */
+  this.yPos = 0;
+
+  /**
+   * The X position of the row relative to the origin of the block's svg group.
+   * @package
+   * @type {number}
+   */
+  this.xPos = 0;
+
+  /**
+   * Whether the row has any external inputs.
+   * @package
+   * @type {boolean}
+   */
+  this.hasExternalInput = false;
+
+  /**
+   * Whether the row has any statement inputs.
+   * @package
+   * @type {boolean}
+   */
+  this.hasStatement = false;
+
+  /**
+   * Whether the row has any inline inputs.
+   * @package
+   * @type {boolean}
+   */
+  this.hasInlineInput = false;
+
+  /**
+   * Whether the row has any dummy inputs.
+   * @package
+   * @type {boolean}
+   */
+  this.hasDummyInput = false;
+
+  /**
+   * Whether the row has a jagged edge.
+   * @package
+   * @type {boolean}
+   */
+  this.hasJaggedEdge = false;
+
+  /**
+   * The renderer's constant provider.
+   * @type {!Blockly.blockRendering.ConstantProvider}
+   * @protected
+   */
+  this.constants_ = constants;
+
+  this.notchOffset = this.constants_.NOTCH_OFFSET_LEFT;
+
+  /**
+   * Alignment of the row.
+   * @package
+   * @type {?number}
+   */
+  this.align = null;
+};
+
+/**
+ * Get the last input on this row, if it has one.
+ * @return {Blockly.blockRendering.InputConnection} The last input on the row,
+ *     or null.
+ * @package
+ */
+// TODO: Consider moving this to InputRow, if possible.
+Blockly.blockRendering.Row.prototype.getLastInput = function() {
+  for (var i = this.elements.length - 1, elem; (elem = this.elements[i]); i--) {
+    if (Blockly.blockRendering.Types.isInput(elem)) {
+      return /** @type {Blockly.blockRendering.InputConnection} */ (elem);
+    }
+  }
+  return null;
+};
+
+/**
+ * Inspect all subcomponents and populate all size properties on the row.
+ * @package
+ */
+Blockly.blockRendering.Row.prototype.measure = function() {
+  throw Error('Unexpected attempt to measure a base Row.');
+};
+
+/**
+ * Determines whether this row should start with an element spacer.
+ * @return {boolean} Whether the row should start with a spacer.
+ * @package
+ */
+Blockly.blockRendering.Row.prototype.startsWithElemSpacer = function() {
+  return true;
+};
+
+/**
+ * Determines whether this row should end with an element spacer.
+ * @return {boolean} Whether the row should end with a spacer.
+ * @package
+ */
+Blockly.blockRendering.Row.prototype.endsWithElemSpacer = function() {
+  return true;
+};
+
+/**
+ * Convenience method to get the first spacer element on this row.
+ * @return {Blockly.blockRendering.InRowSpacer} The first spacer element on
+ *   this row.
+ * @package
+ */
+Blockly.blockRendering.Row.prototype.getFirstSpacer = function() {
+  for (var i = 0, elem; (elem = this.elements[i]); i++) {
+    if (Blockly.blockRendering.Types.isSpacer(elem)) {
+      return /** @type {Blockly.blockRendering.InRowSpacer} */ (elem);
+    }
+  }
+  return null;
+};
+
+/**
+ * Convenience method to get the last spacer element on this row.
+ * @return {Blockly.blockRendering.InRowSpacer} The last spacer element on
+ *   this row.
+ * @package
+ */
+Blockly.blockRendering.Row.prototype.getLastSpacer = function() {
+  for (var i = this.elements.length - 1, elem; (elem = this.elements[i]); i--) {
+    if (Blockly.blockRendering.Types.isSpacer(elem)) {
+      return /** @type {Blockly.blockRendering.InRowSpacer} */ (elem);
+    }
+  }
+  return null;
+};
diff --git a/core/renderers/measurables/spacer_row.js b/core/renderers/measurables/spacer_row.js
new file mode 100644
index 000000000..163883069
--- /dev/null
+++ b/core/renderers/measurables/spacer_row.js
@@ -0,0 +1,52 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Object representing a spacer between two rows.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.module('Blockly.blockRendering.SpacerRow');
+goog.module.declareLegacyNamespace();
+
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.require('Blockly.blockRendering.InRowSpacer');
+goog.require('Blockly.blockRendering.Row');
+goog.require('Blockly.blockRendering.Types');
+goog.require('Blockly.utils.object');
+
+
+/**
+ * An object containing information about a spacer between two rows.
+ * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ *   constants provider.
+ * @param {number} height The height of the spacer.
+ * @param {number} width The width of the spacer.
+ * @package
+ * @constructor
+ * @extends {Blockly.blockRendering.Row}
+ */
+Blockly.blockRendering.SpacerRow = function(constants, height, width) {
+  Blockly.blockRendering.SpacerRow.superClass_.constructor.call(this,
+      constants);
+  this.type |= Blockly.blockRendering.Types.SPACER |
+      Blockly.blockRendering.Types.BETWEEN_ROW_SPACER;
+  this.width = width;
+  this.height = height;
+  this.followsStatement = false;
+  this.widthWithConnectedBlocks = 0;
+  this.elements = [
+    new Blockly.blockRendering.InRowSpacer(this.constants_, width)];
+};
+Blockly.utils.object.inherits(Blockly.blockRendering.SpacerRow,
+    Blockly.blockRendering.Row);
+
+/**
+ * @override
+ */
+Blockly.blockRendering.SpacerRow.prototype.measure = function() {
+  // NOP.  Width and height were set at creation.
+};
diff --git a/core/renderers/measurables/top_row.js b/core/renderers/measurables/top_row.js
new file mode 100644
index 000000000..54de07550
--- /dev/null
+++ b/core/renderers/measurables/top_row.js
@@ -0,0 +1,133 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Object representing a top row on a rendered block.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.module('Blockly.blockRendering.TopRow');
+goog.module.declareLegacyNamespace();
+
+goog.requireType('Blockly.BlockSvg');
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.require('Blockly.blockRendering.PreviousConnection');
+goog.require('Blockly.blockRendering.Row');
+goog.require('Blockly.blockRendering.Types');
+goog.require('Blockly.utils.object');
+
+
+/**
+ * An object containing information about what elements are in the top row of a
+ * block as well as sizing information for the top row.
+ * Elements in a top row can consist of corners, hats, spacers, and previous
+ * connections.
+ * After this constructor is called, the row will contain all non-spacer
+ * elements it needs.
+ * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ *   constants provider.
+ * @package
+ * @constructor
+ * @extends {Blockly.blockRendering.Row}
+ */
+Blockly.blockRendering.TopRow = function(constants) {
+  Blockly.blockRendering.TopRow.superClass_.constructor.call(this, constants);
+
+  this.type |= Blockly.blockRendering.Types.TOP_ROW;
+
+  /**
+   * The starting point for drawing the row, in the y direction.
+   * This allows us to draw hats and similar shapes that don't start at the
+   * origin. Must be non-negative (see #2820).
+   * @package
+   * @type {number}
+   */
+  this.capline = 0;
+
+  /**
+   * How much the row extends up above its capline.
+   * @type {number}
+   */
+  this.ascenderHeight = 0;
+
+  /**
+   * Whether the block has a previous connection.
+   * @package
+   * @type {boolean}
+   */
+  this.hasPreviousConnection = false;
+
+  /**
+   * The previous connection on the block, if any.
+   * @type {Blockly.blockRendering.PreviousConnection}
+   */
+  this.connection = null;
+};
+Blockly.utils.object.inherits(Blockly.blockRendering.TopRow,
+    Blockly.blockRendering.Row);
+
+/**
+ * Returns whether or not the top row has a left square corner.
+ * @param {!Blockly.BlockSvg} block The block whose top row this represents.
+ * @return {boolean} Whether or not the top row has a left square corner.
+ */
+Blockly.blockRendering.TopRow.prototype.hasLeftSquareCorner = function(block) {
+  var hasHat = (block.hat ?
+      block.hat === 'cap' : this.constants_.ADD_START_HATS) &&
+      !block.outputConnection && !block.previousConnection;
+  var prevBlock = block.getPreviousBlock();
+
+  return !!block.outputConnection ||
+      hasHat || (prevBlock ? prevBlock.getNextBlock() == block : false);
+};
+
+/**
+ * Returns whether or not the top row has a right square corner.
+ * @param {!Blockly.BlockSvg} _block The block whose top row this represents.
+ * @return {boolean} Whether or not the top row has a right square corner.
+ */
+Blockly.blockRendering.TopRow.prototype.hasRightSquareCorner = function(
+    _block) {
+  return true;
+};
+
+/**
+ * @override
+ */
+Blockly.blockRendering.TopRow.prototype.measure = function() {
+  var height = 0;
+  var width = 0;
+  var ascenderHeight = 0;
+  for (var e = 0, elem; (elem = this.elements[e]); e++) {
+    width += elem.width;
+    if (!(Blockly.blockRendering.Types.isSpacer(elem))) {
+      if (Blockly.blockRendering.Types.isHat(elem)) {
+        ascenderHeight = Math.max(ascenderHeight, elem.ascenderHeight);
+      } else {
+        height = Math.max(height, elem.height);
+      }
+    }
+  }
+  this.width = Math.max(this.minWidth, width);
+  this.height = Math.max(this.minHeight, height) + ascenderHeight;
+  this.ascenderHeight = ascenderHeight;
+  this.capline = this.ascenderHeight;
+  this.widthWithConnectedBlocks = this.width;
+};
+
+/**
+ * @override
+ */
+Blockly.blockRendering.TopRow.prototype.startsWithElemSpacer = function() {
+  return false;
+};
+
+/**
+ * @override
+ */
+Blockly.blockRendering.TopRow.prototype.endsWithElemSpacer = function() {
+  return false;
+};
diff --git a/tests/deps.js b/tests/deps.js
index 9417f0438..9cc3c3043 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -149,6 +149,7 @@ goog.addDependency('../../core/renderers/geras/measurables/statement_input.js',
 goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/bottom_row.js', ['Blockly.blockRendering.BottomRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/external_value_input.js', ['Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/field.js', ['Blockly.blockRendering.Field'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -157,11 +158,14 @@ goog.addDependency('../../core/renderers/measurables/icon.js', ['Blockly.blockRe
 goog.addDependency('../../core/renderers/measurables/in_row_spacer.js', ['Blockly.blockRendering.InRowSpacer'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/inline_input.js', ['Blockly.blockRendering.InlineInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/input_connection.js', ['Blockly.blockRendering.InputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/input_row.js', ['Blockly.blockRendering.InputRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/jagged_edge.js', ['Blockly.blockRendering.JaggedEdge'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/round_corner.js', ['Blockly.blockRendering.RoundCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/rows.js', ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/row.js', ['Blockly.blockRendering.Row'], ['Blockly.blockRendering.Types'], {'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/spacer_row.js', ['Blockly.blockRendering.SpacerRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/square_corner.js', ['Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/top_row.js', ['Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 6bf554643adbf36b5ecd45412b36fb66e5d8e7fe Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 16 Aug 2021 18:02:49 -0700
Subject: [PATCH 668/833] Migrate core/renderers/measurables/rows.js to
 goog.module

---
 core/renderers/measurables/bottom_row.js |  18 +-
 core/renderers/measurables/input_row.js  |  12 +-
 core/renderers/measurables/row.js        |  16 +-
 core/renderers/measurables/rows.js       | 535 -----------------------
 core/renderers/measurables/spacer_row.js |  10 +-
 core/renderers/measurables/top_row.js    |  20 +-
 tests/deps.js                            |  10 +-
 7 files changed, 48 insertions(+), 573 deletions(-)
 delete mode 100644 core/renderers/measurables/rows.js

diff --git a/core/renderers/measurables/bottom_row.js b/core/renderers/measurables/bottom_row.js
index 2cb1b702f..add8568b8 100644
--- a/core/renderers/measurables/bottom_row.js
+++ b/core/renderers/measurables/bottom_row.js
@@ -32,8 +32,8 @@ goog.require('Blockly.utils.object');
  * @constructor
  * @extends {Blockly.blockRendering.Row}
  */
-Blockly.blockRendering.BottomRow = function(constants) {
-  Blockly.blockRendering.BottomRow.superClass_.constructor.call(this,
+const BottomRow = function(constants) {
+  BottomRow.superClass_.constructor.call(this,
       constants);
   this.type |= Blockly.blockRendering.Types.BOTTOM_ROW;
 
@@ -66,7 +66,7 @@ Blockly.blockRendering.BottomRow = function(constants) {
    */
   this.baseline = 0;
 };
-Blockly.utils.object.inherits(Blockly.blockRendering.BottomRow,
+Blockly.utils.object.inherits(BottomRow,
     Blockly.blockRendering.Row);
 
 /**
@@ -74,7 +74,7 @@ Blockly.utils.object.inherits(Blockly.blockRendering.BottomRow,
  * @param {!Blockly.BlockSvg} block The block whose bottom row this represents.
  * @return {boolean} Whether or not the bottom row has a left square corner.
  */
-Blockly.blockRendering.BottomRow.prototype.hasLeftSquareCorner = function(
+BottomRow.prototype.hasLeftSquareCorner = function(
     block) {
   return !!block.outputConnection || !!block.getNextBlock();
 };
@@ -84,7 +84,7 @@ Blockly.blockRendering.BottomRow.prototype.hasLeftSquareCorner = function(
  * @param {!Blockly.BlockSvg} _block The block whose bottom row this represents.
  * @return {boolean} Whether or not the bottom row has a right square corner.
  */
-Blockly.blockRendering.BottomRow.prototype.hasRightSquareCorner = function(
+BottomRow.prototype.hasRightSquareCorner = function(
     _block) {
   return true;
 };
@@ -92,7 +92,7 @@ Blockly.blockRendering.BottomRow.prototype.hasRightSquareCorner = function(
 /**
  * @override
  */
-Blockly.blockRendering.BottomRow.prototype.measure = function() {
+BottomRow.prototype.measure = function() {
   var height = 0;
   var width = 0;
   var descenderHeight = 0;
@@ -117,13 +117,15 @@ Blockly.blockRendering.BottomRow.prototype.measure = function() {
 /**
  * @override
  */
-Blockly.blockRendering.BottomRow.prototype.startsWithElemSpacer = function() {
+BottomRow.prototype.startsWithElemSpacer = function() {
   return false;
 };
 
 /**
  * @override
  */
-Blockly.blockRendering.BottomRow.prototype.endsWithElemSpacer = function() {
+BottomRow.prototype.endsWithElemSpacer = function() {
   return false;
 };
+
+exports = BottomRow;
diff --git a/core/renderers/measurables/input_row.js b/core/renderers/measurables/input_row.js
index b7ca55135..16991e144 100644
--- a/core/renderers/measurables/input_row.js
+++ b/core/renderers/measurables/input_row.js
@@ -27,8 +27,8 @@ goog.require('Blockly.utils.object');
  * @constructor
  * @extends {Blockly.blockRendering.Row}
  */
-Blockly.blockRendering.InputRow = function(constants) {
-  Blockly.blockRendering.InputRow.superClass_.constructor.call(this, constants);
+const InputRow = function(constants) {
+  InputRow.superClass_.constructor.call(this, constants);
   this.type |= Blockly.blockRendering.Types.INPUT_ROW;
 
   /**
@@ -38,14 +38,14 @@ Blockly.blockRendering.InputRow = function(constants) {
    */
   this.connectedBlockWidths = 0;
 };
-Blockly.utils.object.inherits(Blockly.blockRendering.InputRow,
+Blockly.utils.object.inherits(InputRow,
     Blockly.blockRendering.Row);
 
 /**
  * Inspect all subcomponents and populate all size properties on the row.
  * @package
  */
-Blockly.blockRendering.InputRow.prototype.measure = function() {
+InputRow.prototype.measure = function() {
   this.width = this.minWidth;
   this.height = this.minHeight;
   var connectedBlockWidths = 0;
@@ -71,6 +71,8 @@ Blockly.blockRendering.InputRow.prototype.measure = function() {
 /**
  * @override
  */
-Blockly.blockRendering.InputRow.prototype.endsWithElemSpacer = function() {
+InputRow.prototype.endsWithElemSpacer = function() {
   return !this.hasExternalInput && !this.hasStatement;
 };
+
+exports = InputRow;
diff --git a/core/renderers/measurables/row.js b/core/renderers/measurables/row.js
index 8f47590de..b429beba8 100644
--- a/core/renderers/measurables/row.js
+++ b/core/renderers/measurables/row.js
@@ -27,7 +27,7 @@ goog.require('Blockly.blockRendering.Types');
  * @package
  * @constructor
  */
-Blockly.blockRendering.Row = function(constants) {
+const Row = function(constants) {
   /**
    * The type of this rendering object.
    * @package
@@ -153,7 +153,7 @@ Blockly.blockRendering.Row = function(constants) {
  * @package
  */
 // TODO: Consider moving this to InputRow, if possible.
-Blockly.blockRendering.Row.prototype.getLastInput = function() {
+Row.prototype.getLastInput = function() {
   for (var i = this.elements.length - 1, elem; (elem = this.elements[i]); i--) {
     if (Blockly.blockRendering.Types.isInput(elem)) {
       return /** @type {Blockly.blockRendering.InputConnection} */ (elem);
@@ -166,7 +166,7 @@ Blockly.blockRendering.Row.prototype.getLastInput = function() {
  * Inspect all subcomponents and populate all size properties on the row.
  * @package
  */
-Blockly.blockRendering.Row.prototype.measure = function() {
+Row.prototype.measure = function() {
   throw Error('Unexpected attempt to measure a base Row.');
 };
 
@@ -175,7 +175,7 @@ Blockly.blockRendering.Row.prototype.measure = function() {
  * @return {boolean} Whether the row should start with a spacer.
  * @package
  */
-Blockly.blockRendering.Row.prototype.startsWithElemSpacer = function() {
+Row.prototype.startsWithElemSpacer = function() {
   return true;
 };
 
@@ -184,7 +184,7 @@ Blockly.blockRendering.Row.prototype.startsWithElemSpacer = function() {
  * @return {boolean} Whether the row should end with a spacer.
  * @package
  */
-Blockly.blockRendering.Row.prototype.endsWithElemSpacer = function() {
+Row.prototype.endsWithElemSpacer = function() {
   return true;
 };
 
@@ -194,7 +194,7 @@ Blockly.blockRendering.Row.prototype.endsWithElemSpacer = function() {
  *   this row.
  * @package
  */
-Blockly.blockRendering.Row.prototype.getFirstSpacer = function() {
+Row.prototype.getFirstSpacer = function() {
   for (var i = 0, elem; (elem = this.elements[i]); i++) {
     if (Blockly.blockRendering.Types.isSpacer(elem)) {
       return /** @type {Blockly.blockRendering.InRowSpacer} */ (elem);
@@ -209,7 +209,7 @@ Blockly.blockRendering.Row.prototype.getFirstSpacer = function() {
  *   this row.
  * @package
  */
-Blockly.blockRendering.Row.prototype.getLastSpacer = function() {
+Row.prototype.getLastSpacer = function() {
   for (var i = this.elements.length - 1, elem; (elem = this.elements[i]); i--) {
     if (Blockly.blockRendering.Types.isSpacer(elem)) {
       return /** @type {Blockly.blockRendering.InRowSpacer} */ (elem);
@@ -217,3 +217,5 @@ Blockly.blockRendering.Row.prototype.getLastSpacer = function() {
   }
   return null;
 };
+
+exports = Row;
diff --git a/core/renderers/measurables/rows.js b/core/renderers/measurables/rows.js
deleted file mode 100644
index b300e96ed..000000000
--- a/core/renderers/measurables/rows.js
+++ /dev/null
@@ -1,535 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Objects representing a single row on a rendered block and all
- * of its subcomponents.
- * @author fenichel@google.com (Rachel Fenichel)
- */
-
-goog.provide('Blockly.blockRendering.BottomRow');
-goog.provide('Blockly.blockRendering.InputRow');
-goog.provide('Blockly.blockRendering.Row');
-goog.provide('Blockly.blockRendering.SpacerRow');
-goog.provide('Blockly.blockRendering.TopRow');
-
-goog.require('Blockly.blockRendering.InputConnection');
-goog.require('Blockly.blockRendering.InRowSpacer');
-goog.require('Blockly.blockRendering.Measurable');
-goog.require('Blockly.blockRendering.NextConnection');
-goog.require('Blockly.blockRendering.PreviousConnection');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.BlockSvg');
-
-
-/**
- * An object representing a single row on a rendered block and all of its
- * subcomponents.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @package
- * @constructor
- */
-Blockly.blockRendering.Row = function(constants) {
-  /**
-   * The type of this rendering object.
-   * @package
-   * @type {number}
-   */
-  this.type = Blockly.blockRendering.Types.ROW;
-
-  /**
-   * An array of elements contained in this row.
-   * @package
-   * @type {!Array<!Blockly.blockRendering.Measurable>}
-   */
-  this.elements = [];
-
-  /**
-   * The height of the row.
-   * @package
-   * @type {number}
-   */
-  this.height = 0;
-
-  /**
-   * The width of the row, from the left edge of the block to the right.
-   * Does not include child blocks unless they are inline.
-   * @package
-   * @type {number}
-   */
-  this.width = 0;
-
-  /**
-   * The minimum height of the row.
-   * @package
-   * @type {number}
-   */
-  this.minHeight = 0;
-
-  /**
-   * The minimum width of the row, from the left edge of the block to the right.
-   * Does not include child blocks unless they are inline.
-   * @package
-   * @type {number}
-   */
-  this.minWidth = 0;
-
-  /**
-   * The width of the row, from the left edge of the block to the edge of the
-   * block or any connected child blocks.
-   * @package
-   * @type {number}
-   */
-  this.widthWithConnectedBlocks = 0;
-
-  /**
-   * The Y position of the row relative to the origin of the block's svg group.
-   * @package
-   * @type {number}
-   */
-  this.yPos = 0;
-
-  /**
-   * The X position of the row relative to the origin of the block's svg group.
-   * @package
-   * @type {number}
-   */
-  this.xPos = 0;
-
-  /**
-   * Whether the row has any external inputs.
-   * @package
-   * @type {boolean}
-   */
-  this.hasExternalInput = false;
-
-  /**
-   * Whether the row has any statement inputs.
-   * @package
-   * @type {boolean}
-   */
-  this.hasStatement = false;
-
-  /**
-   * Whether the row has any inline inputs.
-   * @package
-   * @type {boolean}
-   */
-  this.hasInlineInput = false;
-
-  /**
-   * Whether the row has any dummy inputs.
-   * @package
-   * @type {boolean}
-   */
-  this.hasDummyInput = false;
-
-  /**
-   * Whether the row has a jagged edge.
-   * @package
-   * @type {boolean}
-   */
-  this.hasJaggedEdge = false;
-
-  /**
-   * The renderer's constant provider.
-   * @type {!Blockly.blockRendering.ConstantProvider}
-   * @protected
-   */
-  this.constants_ = constants;
-
-  this.notchOffset = this.constants_.NOTCH_OFFSET_LEFT;
-
-  /**
-   * Alignment of the row.
-   * @package
-   * @type {?number}
-   */
-  this.align = null;
-};
-
-/**
- * Inspect all subcomponents and populate all size properties on the row.
- * @package
- */
-Blockly.blockRendering.Row.prototype.measure = function() {
-  throw Error('Unexpected attempt to measure a base Row.');
-};
-
-/**
- * Get the last input on this row, if it has one.
- * @return {Blockly.blockRendering.InputConnection} The last input on the row,
- *     or null.
- * @package
- */
-// TODO: Consider moving this to InputRow, if possible.
-Blockly.blockRendering.Row.prototype.getLastInput = function() {
-  for (var i = this.elements.length - 1, elem; (elem = this.elements[i]); i--) {
-    if (Blockly.blockRendering.Types.isInput(elem)) {
-      return /** @type {Blockly.blockRendering.InputConnection} */ (elem);
-    }
-  }
-  return null;
-};
-
-/**
- * Determines whether this row should start with an element spacer.
- * @return {boolean} Whether the row should start with a spacer.
- * @package
- */
-Blockly.blockRendering.Row.prototype.startsWithElemSpacer = function() {
-  return true;
-};
-
-/**
- * Determines whether this row should end with an element spacer.
- * @return {boolean} Whether the row should end with a spacer.
- * @package
- */
-Blockly.blockRendering.Row.prototype.endsWithElemSpacer = function() {
-  return true;
-};
-
-/**
- * Convenience method to get the first spacer element on this row.
- * @return {Blockly.blockRendering.InRowSpacer} The first spacer element on
- *   this row.
- * @package
- */
-Blockly.blockRendering.Row.prototype.getFirstSpacer = function() {
-  for (var i = 0, elem; (elem = this.elements[i]); i++) {
-    if (Blockly.blockRendering.Types.isSpacer(elem)) {
-      return /** @type {Blockly.blockRendering.InRowSpacer} */ (elem);
-    }
-  }
-  return null;
-};
-
-/**
- * Convenience method to get the last spacer element on this row.
- * @return {Blockly.blockRendering.InRowSpacer} The last spacer element on
- *   this row.
- * @package
- */
-Blockly.blockRendering.Row.prototype.getLastSpacer = function() {
-  for (var i = this.elements.length - 1, elem; (elem = this.elements[i]); i--) {
-    if (Blockly.blockRendering.Types.isSpacer(elem)) {
-      return /** @type {Blockly.blockRendering.InRowSpacer} */ (elem);
-    }
-  }
-  return null;
-};
-
-/**
- * An object containing information about what elements are in the top row of a
- * block as well as sizing information for the top row.
- * Elements in a top row can consist of corners, hats, spacers, and previous
- * connections.
- * After this constructor is called, the row will contain all non-spacer
- * elements it needs.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.Row}
- */
-Blockly.blockRendering.TopRow = function(constants) {
-  Blockly.blockRendering.TopRow.superClass_.constructor.call(this, constants);
-
-  this.type |= Blockly.blockRendering.Types.TOP_ROW;
-
-  /**
-   * The starting point for drawing the row, in the y direction.
-   * This allows us to draw hats and similar shapes that don't start at the
-   * origin. Must be non-negative (see #2820).
-   * @package
-   * @type {number}
-   */
-  this.capline = 0;
-
-  /**
-   * How much the row extends up above its capline.
-   * @type {number}
-   */
-  this.ascenderHeight = 0;
-
-  /**
-   * Whether the block has a previous connection.
-   * @package
-   * @type {boolean}
-   */
-  this.hasPreviousConnection = false;
-
-  /**
-   * The previous connection on the block, if any.
-   * @type {Blockly.blockRendering.PreviousConnection}
-   */
-  this.connection = null;
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.TopRow,
-    Blockly.blockRendering.Row);
-
-/**
- * Returns whether or not the top row has a left square corner.
- * @param {!Blockly.BlockSvg} block The block whose top row this represents.
- * @return {boolean} Whether or not the top row has a left square corner.
- */
-Blockly.blockRendering.TopRow.prototype.hasLeftSquareCorner = function(block) {
-  var hasHat = (block.hat ?
-      block.hat === 'cap' : this.constants_.ADD_START_HATS) &&
-      !block.outputConnection && !block.previousConnection;
-  var prevBlock = block.getPreviousBlock();
-
-  return !!block.outputConnection ||
-      hasHat || (prevBlock ? prevBlock.getNextBlock() == block : false);
-};
-
-/**
- * Returns whether or not the top row has a right square corner.
- * @param {!Blockly.BlockSvg} _block The block whose top row this represents.
- * @return {boolean} Whether or not the top row has a right square corner.
- */
-Blockly.blockRendering.TopRow.prototype.hasRightSquareCorner = function(
-    _block) {
-  return true;
-};
-
-/**
- * @override
- */
-Blockly.blockRendering.TopRow.prototype.measure = function() {
-  var height = 0;
-  var width = 0;
-  var ascenderHeight = 0;
-  for (var e = 0, elem; (elem = this.elements[e]); e++) {
-    width += elem.width;
-    if (!(Blockly.blockRendering.Types.isSpacer(elem))) {
-      if (Blockly.blockRendering.Types.isHat(elem)) {
-        ascenderHeight = Math.max(ascenderHeight, elem.ascenderHeight);
-      } else {
-        height = Math.max(height, elem.height);
-      }
-    }
-  }
-  this.width = Math.max(this.minWidth, width);
-  this.height = Math.max(this.minHeight, height) + ascenderHeight;
-  this.ascenderHeight = ascenderHeight;
-  this.capline = this.ascenderHeight;
-  this.widthWithConnectedBlocks = this.width;
-};
-
-/**
- * @override
- */
-Blockly.blockRendering.TopRow.prototype.startsWithElemSpacer = function() {
-  return false;
-};
-
-/**
- * @override
- */
-Blockly.blockRendering.TopRow.prototype.endsWithElemSpacer = function() {
-  return false;
-};
-
-/**
- * An object containing information about what elements are in the bottom row of
- * a block as well as spacing information for the top row.
- * Elements in a bottom row can consist of corners, spacers and next
- * connections.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.Row}
- */
-Blockly.blockRendering.BottomRow = function(constants) {
-  Blockly.blockRendering.BottomRow.superClass_.constructor.call(this,
-      constants);
-  this.type |= Blockly.blockRendering.Types.BOTTOM_ROW;
-
-  /**
-   * Whether this row has a next connection.
-   * @package
-   * @type {boolean}
-   */
-  this.hasNextConnection = false;
-
-  /**
-   * The next connection on the row, if any.
-   * @package
-   * @type {Blockly.blockRendering.NextConnection}
-   */
-  this.connection = null;
-
-  /**
-   * The amount that the bottom of the block extends below the horizontal edge,
-   * e.g. because of a next connection.  Must be non-negative (see #2820).
-   * @package
-   * @type {number}
-   */
-  this.descenderHeight = 0;
-
-  /**
-   * The Y position of the bottom edge of the block, relative to the origin
-   * of the block rendering.
-   * @type {number}
-   */
-  this.baseline = 0;
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.BottomRow,
-    Blockly.blockRendering.Row);
-
-/**
- * Returns whether or not the bottom row has a left square corner.
- * @param {!Blockly.BlockSvg} block The block whose bottom row this represents.
- * @return {boolean} Whether or not the bottom row has a left square corner.
- */
-Blockly.blockRendering.BottomRow.prototype.hasLeftSquareCorner = function(
-    block) {
-  return !!block.outputConnection || !!block.getNextBlock();
-};
-
-/**
- * Returns whether or not the bottom row has a right square corner.
- * @param {!Blockly.BlockSvg} _block The block whose bottom row this represents.
- * @return {boolean} Whether or not the bottom row has a right square corner.
- */
-Blockly.blockRendering.BottomRow.prototype.hasRightSquareCorner = function(
-    _block) {
-  return true;
-};
-
-/**
- * @override
- */
-Blockly.blockRendering.BottomRow.prototype.measure = function() {
-  var height = 0;
-  var width = 0;
-  var descenderHeight = 0;
-  for (var e = 0, elem; (elem = this.elements[e]); e++) {
-    width += elem.width;
-    if (!(Blockly.blockRendering.Types.isSpacer(elem))) {
-      // Note: this assumes that next connections have *only* descenderHeight,
-      // with no height above the baseline.
-      if (Blockly.blockRendering.Types.isNextConnection(elem)) {
-        descenderHeight = Math.max(descenderHeight, elem.height);
-      } else {
-        height = Math.max(height, elem.height);
-      }
-    }
-  }
-  this.width = Math.max(this.minWidth, width);
-  this.height = Math.max(this.minHeight, height) + descenderHeight;
-  this.descenderHeight = descenderHeight;
-  this.widthWithConnectedBlocks = this.width;
-};
-
-/**
- * @override
- */
-Blockly.blockRendering.BottomRow.prototype.startsWithElemSpacer = function() {
-  return false;
-};
-
-/**
- * @override
- */
-Blockly.blockRendering.BottomRow.prototype.endsWithElemSpacer = function() {
-  return false;
-};
-
-/**
- * An object containing information about a spacer between two rows.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @param {number} height The height of the spacer.
- * @param {number} width The width of the spacer.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.Row}
- */
-Blockly.blockRendering.SpacerRow = function(constants, height, width) {
-  Blockly.blockRendering.SpacerRow.superClass_.constructor.call(this,
-      constants);
-  this.type |= Blockly.blockRendering.Types.SPACER |
-      Blockly.blockRendering.Types.BETWEEN_ROW_SPACER;
-  this.width = width;
-  this.height = height;
-  this.followsStatement = false;
-  this.widthWithConnectedBlocks = 0;
-  this.elements = [
-    new Blockly.blockRendering.InRowSpacer(this.constants_, width)];
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.SpacerRow,
-    Blockly.blockRendering.Row);
-
-/**
- * @override
- */
-Blockly.blockRendering.SpacerRow.prototype.measure = function() {
-  // NOP.  Width and height were set at creation.
-};
-
-/**
- * An object containing information about a row that holds one or more inputs.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.Row}
- */
-Blockly.blockRendering.InputRow = function(constants) {
-  Blockly.blockRendering.InputRow.superClass_.constructor.call(this, constants);
-  this.type |= Blockly.blockRendering.Types.INPUT_ROW;
-
-  /**
-   * The total width of all blocks connected to this row.
-   * @type {number}
-   * @package
-   */
-  this.connectedBlockWidths = 0;
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.InputRow,
-    Blockly.blockRendering.Row);
-
-/**
- * Inspect all subcomponents and populate all size properties on the row.
- * @package
- */
-Blockly.blockRendering.InputRow.prototype.measure = function() {
-  this.width = this.minWidth;
-  this.height = this.minHeight;
-  var connectedBlockWidths = 0;
-  for (var e = 0, elem; (elem = this.elements[e]); e++) {
-    this.width += elem.width;
-    if (Blockly.blockRendering.Types.isInput(elem)) {
-      if (Blockly.blockRendering.Types.isStatementInput(elem)) {
-        connectedBlockWidths += elem.connectedBlockWidth;
-      } else if (Blockly.blockRendering.Types.isExternalInput(elem) &&
-          elem.connectedBlockWidth != 0) {
-        connectedBlockWidths += (elem.connectedBlockWidth -
-          elem.connectionWidth);
-      }
-    }
-    if (!(Blockly.blockRendering.Types.isSpacer(elem))) {
-      this.height = Math.max(this.height, elem.height);
-    }
-  }
-  this.connectedBlockWidths = connectedBlockWidths;
-  this.widthWithConnectedBlocks = this.width + connectedBlockWidths;
-};
-
-/**
- * @override
- */
-Blockly.blockRendering.InputRow.prototype.endsWithElemSpacer = function() {
-  return !this.hasExternalInput && !this.hasStatement;
-};
diff --git a/core/renderers/measurables/spacer_row.js b/core/renderers/measurables/spacer_row.js
index 163883069..86e243ee1 100644
--- a/core/renderers/measurables/spacer_row.js
+++ b/core/renderers/measurables/spacer_row.js
@@ -29,8 +29,8 @@ goog.require('Blockly.utils.object');
  * @constructor
  * @extends {Blockly.blockRendering.Row}
  */
-Blockly.blockRendering.SpacerRow = function(constants, height, width) {
-  Blockly.blockRendering.SpacerRow.superClass_.constructor.call(this,
+const SpacerRow = function(constants, height, width) {
+  SpacerRow.superClass_.constructor.call(this,
       constants);
   this.type |= Blockly.blockRendering.Types.SPACER |
       Blockly.blockRendering.Types.BETWEEN_ROW_SPACER;
@@ -41,12 +41,14 @@ Blockly.blockRendering.SpacerRow = function(constants, height, width) {
   this.elements = [
     new Blockly.blockRendering.InRowSpacer(this.constants_, width)];
 };
-Blockly.utils.object.inherits(Blockly.blockRendering.SpacerRow,
+Blockly.utils.object.inherits(SpacerRow,
     Blockly.blockRendering.Row);
 
 /**
  * @override
  */
-Blockly.blockRendering.SpacerRow.prototype.measure = function() {
+SpacerRow.prototype.measure = function() {
   // NOP.  Width and height were set at creation.
 };
+
+exports = SpacerRow;
diff --git a/core/renderers/measurables/top_row.js b/core/renderers/measurables/top_row.js
index 54de07550..d49eb57e8 100644
--- a/core/renderers/measurables/top_row.js
+++ b/core/renderers/measurables/top_row.js
@@ -14,7 +14,7 @@ goog.module.declareLegacyNamespace();
 
 goog.requireType('Blockly.BlockSvg');
 goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.require('Blockly.blockRendering.PreviousConnection');
+goog.requireType('Blockly.blockRendering.PreviousConnection');
 goog.require('Blockly.blockRendering.Row');
 goog.require('Blockly.blockRendering.Types');
 goog.require('Blockly.utils.object');
@@ -33,8 +33,8 @@ goog.require('Blockly.utils.object');
  * @constructor
  * @extends {Blockly.blockRendering.Row}
  */
-Blockly.blockRendering.TopRow = function(constants) {
-  Blockly.blockRendering.TopRow.superClass_.constructor.call(this, constants);
+const TopRow = function(constants) {
+  TopRow.superClass_.constructor.call(this, constants);
 
   this.type |= Blockly.blockRendering.Types.TOP_ROW;
 
@@ -66,7 +66,7 @@ Blockly.blockRendering.TopRow = function(constants) {
    */
   this.connection = null;
 };
-Blockly.utils.object.inherits(Blockly.blockRendering.TopRow,
+Blockly.utils.object.inherits(TopRow,
     Blockly.blockRendering.Row);
 
 /**
@@ -74,7 +74,7 @@ Blockly.utils.object.inherits(Blockly.blockRendering.TopRow,
  * @param {!Blockly.BlockSvg} block The block whose top row this represents.
  * @return {boolean} Whether or not the top row has a left square corner.
  */
-Blockly.blockRendering.TopRow.prototype.hasLeftSquareCorner = function(block) {
+TopRow.prototype.hasLeftSquareCorner = function(block) {
   var hasHat = (block.hat ?
       block.hat === 'cap' : this.constants_.ADD_START_HATS) &&
       !block.outputConnection && !block.previousConnection;
@@ -89,7 +89,7 @@ Blockly.blockRendering.TopRow.prototype.hasLeftSquareCorner = function(block) {
  * @param {!Blockly.BlockSvg} _block The block whose top row this represents.
  * @return {boolean} Whether or not the top row has a right square corner.
  */
-Blockly.blockRendering.TopRow.prototype.hasRightSquareCorner = function(
+TopRow.prototype.hasRightSquareCorner = function(
     _block) {
   return true;
 };
@@ -97,7 +97,7 @@ Blockly.blockRendering.TopRow.prototype.hasRightSquareCorner = function(
 /**
  * @override
  */
-Blockly.blockRendering.TopRow.prototype.measure = function() {
+TopRow.prototype.measure = function() {
   var height = 0;
   var width = 0;
   var ascenderHeight = 0;
@@ -121,13 +121,15 @@ Blockly.blockRendering.TopRow.prototype.measure = function() {
 /**
  * @override
  */
-Blockly.blockRendering.TopRow.prototype.startsWithElemSpacer = function() {
+TopRow.prototype.startsWithElemSpacer = function() {
   return false;
 };
 
 /**
  * @override
  */
-Blockly.blockRendering.TopRow.prototype.endsWithElemSpacer = function() {
+TopRow.prototype.endsWithElemSpacer = function() {
   return false;
 };
+
+exports = TopRow;
diff --git a/tests/deps.js b/tests/deps.js
index 9cc3c3043..3f2dbf73a 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -149,7 +149,7 @@ goog.addDependency('../../core/renderers/geras/measurables/statement_input.js',
 goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/bottom_row.js', ['Blockly.blockRendering.BottomRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/bottom_row.js', ['Blockly.blockRendering.BottomRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/external_value_input.js', ['Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/field.js', ['Blockly.blockRendering.Field'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -158,14 +158,14 @@ goog.addDependency('../../core/renderers/measurables/icon.js', ['Blockly.blockRe
 goog.addDependency('../../core/renderers/measurables/in_row_spacer.js', ['Blockly.blockRendering.InRowSpacer'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/inline_input.js', ['Blockly.blockRendering.InlineInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/input_connection.js', ['Blockly.blockRendering.InputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/input_row.js', ['Blockly.blockRendering.InputRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/input_row.js', ['Blockly.blockRendering.InputRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/jagged_edge.js', ['Blockly.blockRendering.JaggedEdge'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/round_corner.js', ['Blockly.blockRendering.RoundCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/row.js', ['Blockly.blockRendering.Row'], ['Blockly.blockRendering.Types'], {'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/spacer_row.js', ['Blockly.blockRendering.SpacerRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/row.js', ['Blockly.blockRendering.Row'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/spacer_row.js', ['Blockly.blockRendering.SpacerRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/square_corner.js', ['Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/top_row.js', ['Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/top_row.js', ['Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 5038907c674761f9692433473952a948bacd20f9 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 16 Aug 2021 23:15:51 -0700
Subject: [PATCH 669/833] Migrate core/renderers/measurables/rows.js

---
 core/renderers/measurables/bottom_row.js |  9 +++++----
 core/renderers/measurables/input_row.js  |  5 +++--
 core/renderers/measurables/row.js        |  9 ++++++---
 core/renderers/measurables/top_row.js    | 14 ++++++++------
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/core/renderers/measurables/bottom_row.js b/core/renderers/measurables/bottom_row.js
index add8568b8..6a576acac 100644
--- a/core/renderers/measurables/bottom_row.js
+++ b/core/renderers/measurables/bottom_row.js
@@ -93,10 +93,11 @@ BottomRow.prototype.hasRightSquareCorner = function(
  * @override
  */
 BottomRow.prototype.measure = function() {
-  var height = 0;
-  var width = 0;
-  var descenderHeight = 0;
-  for (var e = 0, elem; (elem = this.elements[e]); e++) {
+  let height = 0;
+  let width = 0;
+  let descenderHeight = 0;
+  for (let i = 0; i < this.elements.length; i++) {
+    const elem = this.elements[i];
     width += elem.width;
     if (!(Blockly.blockRendering.Types.isSpacer(elem))) {
       // Note: this assumes that next connections have *only* descenderHeight,
diff --git a/core/renderers/measurables/input_row.js b/core/renderers/measurables/input_row.js
index 16991e144..4a23d4014 100644
--- a/core/renderers/measurables/input_row.js
+++ b/core/renderers/measurables/input_row.js
@@ -48,8 +48,9 @@ Blockly.utils.object.inherits(InputRow,
 InputRow.prototype.measure = function() {
   this.width = this.minWidth;
   this.height = this.minHeight;
-  var connectedBlockWidths = 0;
-  for (var e = 0, elem; (elem = this.elements[e]); e++) {
+  let connectedBlockWidths = 0;
+  for (let i = 0; i < this.elements.length; i++) {
+    const elem = this.elements[i];
     this.width += elem.width;
     if (Blockly.blockRendering.Types.isInput(elem)) {
       if (Blockly.blockRendering.Types.isStatementInput(elem)) {
diff --git a/core/renderers/measurables/row.js b/core/renderers/measurables/row.js
index b429beba8..33fee6655 100644
--- a/core/renderers/measurables/row.js
+++ b/core/renderers/measurables/row.js
@@ -154,7 +154,8 @@ const Row = function(constants) {
  */
 // TODO: Consider moving this to InputRow, if possible.
 Row.prototype.getLastInput = function() {
-  for (var i = this.elements.length - 1, elem; (elem = this.elements[i]); i--) {
+  for (let i = this.elements.length - 1; i >= 0; i--) {
+    const elem = this.elements[i];
     if (Blockly.blockRendering.Types.isInput(elem)) {
       return /** @type {Blockly.blockRendering.InputConnection} */ (elem);
     }
@@ -195,7 +196,8 @@ Row.prototype.endsWithElemSpacer = function() {
  * @package
  */
 Row.prototype.getFirstSpacer = function() {
-  for (var i = 0, elem; (elem = this.elements[i]); i++) {
+  for (let i = 0; i < this.elements.length; i++) {
+    const elem = this.elements[i];
     if (Blockly.blockRendering.Types.isSpacer(elem)) {
       return /** @type {Blockly.blockRendering.InRowSpacer} */ (elem);
     }
@@ -210,7 +212,8 @@ Row.prototype.getFirstSpacer = function() {
  * @package
  */
 Row.prototype.getLastSpacer = function() {
-  for (var i = this.elements.length - 1, elem; (elem = this.elements[i]); i--) {
+  for (let i = this.elements.length - 1; i >= 0; i--) {
+    const elem = this.elements[i];
     if (Blockly.blockRendering.Types.isSpacer(elem)) {
       return /** @type {Blockly.blockRendering.InRowSpacer} */ (elem);
     }
diff --git a/core/renderers/measurables/top_row.js b/core/renderers/measurables/top_row.js
index d49eb57e8..58132855f 100644
--- a/core/renderers/measurables/top_row.js
+++ b/core/renderers/measurables/top_row.js
@@ -75,10 +75,10 @@ Blockly.utils.object.inherits(TopRow,
  * @return {boolean} Whether or not the top row has a left square corner.
  */
 TopRow.prototype.hasLeftSquareCorner = function(block) {
-  var hasHat = (block.hat ?
+  const hasHat = (block.hat ?
       block.hat === 'cap' : this.constants_.ADD_START_HATS) &&
       !block.outputConnection && !block.previousConnection;
-  var prevBlock = block.getPreviousBlock();
+  const prevBlock = block.getPreviousBlock();
 
   return !!block.outputConnection ||
       hasHat || (prevBlock ? prevBlock.getNextBlock() == block : false);
@@ -98,10 +98,12 @@ TopRow.prototype.hasRightSquareCorner = function(
  * @override
  */
 TopRow.prototype.measure = function() {
-  var height = 0;
-  var width = 0;
-  var ascenderHeight = 0;
-  for (var e = 0, elem; (elem = this.elements[e]); e++) {
+  let height = 0;
+  let width = 0;
+  let ascenderHeight = 0;
+  let e = 0, elem;
+  for (let i = 0; i < this.elements.length; i++) {
+    const elem = this.elements[i];
     width += elem.width;
     if (!(Blockly.blockRendering.Types.isSpacer(elem))) {
       if (Blockly.blockRendering.Types.isHat(elem)) {

From c56da8c93a8ec12f7863bd6cab892d65844e9725 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 16 Aug 2021 18:04:19 -0700
Subject: [PATCH 670/833] Migrate core/renderers/measurables/rows.js named
 requires

---
 core/renderers/measurables/bottom_row.js | 35 +++++++++++----------
 core/renderers/measurables/input_row.js  | 27 ++++++++--------
 core/renderers/measurables/row.js        | 40 +++++++++++++-----------
 core/renderers/measurables/spacer_row.js | 25 ++++++++-------
 core/renderers/measurables/top_row.js    | 35 +++++++++++----------
 5 files changed, 87 insertions(+), 75 deletions(-)

diff --git a/core/renderers/measurables/bottom_row.js b/core/renderers/measurables/bottom_row.js
index 6a576acac..d435bda88 100644
--- a/core/renderers/measurables/bottom_row.js
+++ b/core/renderers/measurables/bottom_row.js
@@ -13,12 +13,15 @@
 goog.module('Blockly.blockRendering.BottomRow');
 goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.blockRendering.NextConnection');
-goog.require('Blockly.blockRendering.Row');
-goog.require('Blockly.blockRendering.Types');
-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 ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const NextConnection = goog.requireType('Blockly.blockRendering.NextConnection');
+const Row = goog.require('Blockly.blockRendering.Row');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -26,16 +29,16 @@ goog.require('Blockly.utils.object');
  * a block as well as spacing information for the top row.
  * Elements in a bottom row can consist of corners, spacers and next
  * connections.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Row}
+ * @extends {Row}
  */
 const BottomRow = function(constants) {
   BottomRow.superClass_.constructor.call(this,
       constants);
-  this.type |= Blockly.blockRendering.Types.BOTTOM_ROW;
+  this.type |= Types.BOTTOM_ROW;
 
   /**
    * Whether this row has a next connection.
@@ -47,7 +50,7 @@ const BottomRow = function(constants) {
   /**
    * The next connection on the row, if any.
    * @package
-   * @type {Blockly.blockRendering.NextConnection}
+   * @type {NextConnection}
    */
   this.connection = null;
 
@@ -66,12 +69,12 @@ const BottomRow = function(constants) {
    */
   this.baseline = 0;
 };
-Blockly.utils.object.inherits(BottomRow,
-    Blockly.blockRendering.Row);
+object.inherits(BottomRow,
+    Row);
 
 /**
  * Returns whether or not the bottom row has a left square corner.
- * @param {!Blockly.BlockSvg} block The block whose bottom row this represents.
+ * @param {!BlockSvg} block The block whose bottom row this represents.
  * @return {boolean} Whether or not the bottom row has a left square corner.
  */
 BottomRow.prototype.hasLeftSquareCorner = function(
@@ -81,7 +84,7 @@ BottomRow.prototype.hasLeftSquareCorner = function(
 
 /**
  * Returns whether or not the bottom row has a right square corner.
- * @param {!Blockly.BlockSvg} _block The block whose bottom row this represents.
+ * @param {!BlockSvg} _block The block whose bottom row this represents.
  * @return {boolean} Whether or not the bottom row has a right square corner.
  */
 BottomRow.prototype.hasRightSquareCorner = function(
@@ -99,10 +102,10 @@ BottomRow.prototype.measure = function() {
   for (let i = 0; i < this.elements.length; i++) {
     const elem = this.elements[i];
     width += elem.width;
-    if (!(Blockly.blockRendering.Types.isSpacer(elem))) {
+    if (!(Types.isSpacer(elem))) {
       // Note: this assumes that next connections have *only* descenderHeight,
       // with no height above the baseline.
-      if (Blockly.blockRendering.Types.isNextConnection(elem)) {
+      if (Types.isNextConnection(elem)) {
         descenderHeight = Math.max(descenderHeight, elem.height);
       } else {
         height = Math.max(height, elem.height);
diff --git a/core/renderers/measurables/input_row.js b/core/renderers/measurables/input_row.js
index 4a23d4014..72b0b18ea 100644
--- a/core/renderers/measurables/input_row.js
+++ b/core/renderers/measurables/input_row.js
@@ -13,23 +13,24 @@
 goog.module('Blockly.blockRendering.InputRow');
 goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.require('Blockly.blockRendering.Row');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const Row = goog.require('Blockly.blockRendering.Row');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object containing information about a row that holds one or more inputs.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Row}
+ * @extends {Row}
  */
 const InputRow = function(constants) {
   InputRow.superClass_.constructor.call(this, constants);
-  this.type |= Blockly.blockRendering.Types.INPUT_ROW;
+  this.type |= Types.INPUT_ROW;
 
   /**
    * The total width of all blocks connected to this row.
@@ -38,8 +39,8 @@ const InputRow = function(constants) {
    */
   this.connectedBlockWidths = 0;
 };
-Blockly.utils.object.inherits(InputRow,
-    Blockly.blockRendering.Row);
+object.inherits(InputRow,
+    Row);
 
 /**
  * Inspect all subcomponents and populate all size properties on the row.
@@ -52,16 +53,16 @@ InputRow.prototype.measure = function() {
   for (let i = 0; i < this.elements.length; i++) {
     const elem = this.elements[i];
     this.width += elem.width;
-    if (Blockly.blockRendering.Types.isInput(elem)) {
-      if (Blockly.blockRendering.Types.isStatementInput(elem)) {
+    if (Types.isInput(elem)) {
+      if (Types.isStatementInput(elem)) {
         connectedBlockWidths += elem.connectedBlockWidth;
-      } else if (Blockly.blockRendering.Types.isExternalInput(elem) &&
+      } else if (Types.isExternalInput(elem) &&
           elem.connectedBlockWidth != 0) {
         connectedBlockWidths += (elem.connectedBlockWidth -
           elem.connectionWidth);
       }
     }
-    if (!(Blockly.blockRendering.Types.isSpacer(elem))) {
+    if (!(Types.isSpacer(elem))) {
       this.height = Math.max(this.height, elem.height);
     }
   }
diff --git a/core/renderers/measurables/row.js b/core/renderers/measurables/row.js
index 33fee6655..86be896c8 100644
--- a/core/renderers/measurables/row.js
+++ b/core/renderers/measurables/row.js
@@ -12,17 +12,21 @@
 goog.module('Blockly.blockRendering.Row');
 goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.blockRendering.InputConnection');
-goog.requireType('Blockly.blockRendering.InRowSpacer');
-goog.requireType('Blockly.blockRendering.Measurable');
-goog.require('Blockly.blockRendering.Types');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const InputConnection = goog.requireType('Blockly.blockRendering.InputConnection');
+/* eslint-disable-next-line no-unused-vars */
+const InRowSpacer = goog.requireType('Blockly.blockRendering.InRowSpacer');
+/* eslint-disable-next-line no-unused-vars */
+const Measurable = goog.requireType('Blockly.blockRendering.Measurable');
+const Types = goog.require('Blockly.blockRendering.Types');
 
 
 /**
  * An object representing a single row on a rendered block and all of its
  * subcomponents.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
  * @package
  * @constructor
@@ -33,12 +37,12 @@ const Row = function(constants) {
    * @package
    * @type {number}
    */
-  this.type = Blockly.blockRendering.Types.ROW;
+  this.type = Types.ROW;
 
   /**
    * An array of elements contained in this row.
    * @package
-   * @type {!Array<!Blockly.blockRendering.Measurable>}
+   * @type {!Array<!Measurable>}
    */
   this.elements = [];
 
@@ -131,7 +135,7 @@ const Row = function(constants) {
 
   /**
    * The renderer's constant provider.
-   * @type {!Blockly.blockRendering.ConstantProvider}
+   * @type {!ConstantProvider}
    * @protected
    */
   this.constants_ = constants;
@@ -148,7 +152,7 @@ const Row = function(constants) {
 
 /**
  * Get the last input on this row, if it has one.
- * @return {Blockly.blockRendering.InputConnection} The last input on the row,
+ * @return {InputConnection} The last input on the row,
  *     or null.
  * @package
  */
@@ -156,8 +160,8 @@ const Row = function(constants) {
 Row.prototype.getLastInput = function() {
   for (let i = this.elements.length - 1; i >= 0; i--) {
     const elem = this.elements[i];
-    if (Blockly.blockRendering.Types.isInput(elem)) {
-      return /** @type {Blockly.blockRendering.InputConnection} */ (elem);
+    if (Types.isInput(elem)) {
+      return /** @type {InputConnection} */ (elem);
     }
   }
   return null;
@@ -191,15 +195,15 @@ Row.prototype.endsWithElemSpacer = function() {
 
 /**
  * Convenience method to get the first spacer element on this row.
- * @return {Blockly.blockRendering.InRowSpacer} The first spacer element on
+ * @return {InRowSpacer} The first spacer element on
  *   this row.
  * @package
  */
 Row.prototype.getFirstSpacer = function() {
   for (let i = 0; i < this.elements.length; i++) {
     const elem = this.elements[i];
-    if (Blockly.blockRendering.Types.isSpacer(elem)) {
-      return /** @type {Blockly.blockRendering.InRowSpacer} */ (elem);
+    if (Types.isSpacer(elem)) {
+      return /** @type {InRowSpacer} */ (elem);
     }
   }
   return null;
@@ -207,15 +211,15 @@ Row.prototype.getFirstSpacer = function() {
 
 /**
  * Convenience method to get the last spacer element on this row.
- * @return {Blockly.blockRendering.InRowSpacer} The last spacer element on
+ * @return {InRowSpacer} The last spacer element on
  *   this row.
  * @package
  */
 Row.prototype.getLastSpacer = function() {
   for (let i = this.elements.length - 1; i >= 0; i--) {
     const elem = this.elements[i];
-    if (Blockly.blockRendering.Types.isSpacer(elem)) {
-      return /** @type {Blockly.blockRendering.InRowSpacer} */ (elem);
+    if (Types.isSpacer(elem)) {
+      return /** @type {InRowSpacer} */ (elem);
     }
   }
   return null;
diff --git a/core/renderers/measurables/spacer_row.js b/core/renderers/measurables/spacer_row.js
index 86e243ee1..3d87e250f 100644
--- a/core/renderers/measurables/spacer_row.js
+++ b/core/renderers/measurables/spacer_row.js
@@ -12,37 +12,38 @@
 goog.module('Blockly.blockRendering.SpacerRow');
 goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.require('Blockly.blockRendering.InRowSpacer');
-goog.require('Blockly.blockRendering.Row');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const InRowSpacer = goog.require('Blockly.blockRendering.InRowSpacer');
+const Row = goog.require('Blockly.blockRendering.Row');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object containing information about a spacer between two rows.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
  * @param {number} height The height of the spacer.
  * @param {number} width The width of the spacer.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Row}
+ * @extends {Row}
  */
 const SpacerRow = function(constants, height, width) {
   SpacerRow.superClass_.constructor.call(this,
       constants);
-  this.type |= Blockly.blockRendering.Types.SPACER |
-      Blockly.blockRendering.Types.BETWEEN_ROW_SPACER;
+  this.type |= Types.SPACER |
+      Types.BETWEEN_ROW_SPACER;
   this.width = width;
   this.height = height;
   this.followsStatement = false;
   this.widthWithConnectedBlocks = 0;
   this.elements = [
-    new Blockly.blockRendering.InRowSpacer(this.constants_, width)];
+    new InRowSpacer(this.constants_, width)];
 };
-Blockly.utils.object.inherits(SpacerRow,
-    Blockly.blockRendering.Row);
+object.inherits(SpacerRow,
+    Row);
 
 /**
  * @override
diff --git a/core/renderers/measurables/top_row.js b/core/renderers/measurables/top_row.js
index 58132855f..cbd5e9c0e 100644
--- a/core/renderers/measurables/top_row.js
+++ b/core/renderers/measurables/top_row.js
@@ -12,12 +12,15 @@
 goog.module('Blockly.blockRendering.TopRow');
 goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.blockRendering.PreviousConnection');
-goog.require('Blockly.blockRendering.Row');
-goog.require('Blockly.blockRendering.Types');
-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 ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const PreviousConnection = goog.requireType('Blockly.blockRendering.PreviousConnection');
+const Row = goog.require('Blockly.blockRendering.Row');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -27,16 +30,16 @@ goog.require('Blockly.utils.object');
  * connections.
  * After this constructor is called, the row will contain all non-spacer
  * elements it needs.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Row}
+ * @extends {Row}
  */
 const TopRow = function(constants) {
   TopRow.superClass_.constructor.call(this, constants);
 
-  this.type |= Blockly.blockRendering.Types.TOP_ROW;
+  this.type |= Types.TOP_ROW;
 
   /**
    * The starting point for drawing the row, in the y direction.
@@ -62,16 +65,16 @@ const TopRow = function(constants) {
 
   /**
    * The previous connection on the block, if any.
-   * @type {Blockly.blockRendering.PreviousConnection}
+   * @type {PreviousConnection}
    */
   this.connection = null;
 };
-Blockly.utils.object.inherits(TopRow,
-    Blockly.blockRendering.Row);
+object.inherits(TopRow,
+    Row);
 
 /**
  * Returns whether or not the top row has a left square corner.
- * @param {!Blockly.BlockSvg} block The block whose top row this represents.
+ * @param {!BlockSvg} block The block whose top row this represents.
  * @return {boolean} Whether or not the top row has a left square corner.
  */
 TopRow.prototype.hasLeftSquareCorner = function(block) {
@@ -86,7 +89,7 @@ TopRow.prototype.hasLeftSquareCorner = function(block) {
 
 /**
  * Returns whether or not the top row has a right square corner.
- * @param {!Blockly.BlockSvg} _block The block whose top row this represents.
+ * @param {!BlockSvg} _block The block whose top row this represents.
  * @return {boolean} Whether or not the top row has a right square corner.
  */
 TopRow.prototype.hasRightSquareCorner = function(
@@ -105,8 +108,8 @@ TopRow.prototype.measure = function() {
   for (let i = 0; i < this.elements.length; i++) {
     const elem = this.elements[i];
     width += elem.width;
-    if (!(Blockly.blockRendering.Types.isSpacer(elem))) {
-      if (Blockly.blockRendering.Types.isHat(elem)) {
+    if (!(Types.isSpacer(elem))) {
+      if (Types.isHat(elem)) {
         ascenderHeight = Math.max(ascenderHeight, elem.ascenderHeight);
       } else {
         height = Math.max(height, elem.height);

From 57d6c40061ff4c3ea999e0085bc82310393a35a8 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 16 Aug 2021 18:05:02 -0700
Subject: [PATCH 671/833] clang-format core/renderers/measurables/rows.js

---
 core/renderers/measurables/bottom_row.js | 12 ++++--------
 core/renderers/measurables/input_row.js  | 10 ++++------
 core/renderers/measurables/spacer_row.js | 12 ++++--------
 core/renderers/measurables/top_row.js    | 14 ++++++--------
 4 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/core/renderers/measurables/bottom_row.js b/core/renderers/measurables/bottom_row.js
index d435bda88..37e80f6f2 100644
--- a/core/renderers/measurables/bottom_row.js
+++ b/core/renderers/measurables/bottom_row.js
@@ -36,8 +36,7 @@ const object = goog.require('Blockly.utils.object');
  * @extends {Row}
  */
 const BottomRow = function(constants) {
-  BottomRow.superClass_.constructor.call(this,
-      constants);
+  BottomRow.superClass_.constructor.call(this, constants);
   this.type |= Types.BOTTOM_ROW;
 
   /**
@@ -69,16 +68,14 @@ const BottomRow = function(constants) {
    */
   this.baseline = 0;
 };
-object.inherits(BottomRow,
-    Row);
+object.inherits(BottomRow, Row);
 
 /**
  * Returns whether or not the bottom row has a left square corner.
  * @param {!BlockSvg} block The block whose bottom row this represents.
  * @return {boolean} Whether or not the bottom row has a left square corner.
  */
-BottomRow.prototype.hasLeftSquareCorner = function(
-    block) {
+BottomRow.prototype.hasLeftSquareCorner = function(block) {
   return !!block.outputConnection || !!block.getNextBlock();
 };
 
@@ -87,8 +84,7 @@ BottomRow.prototype.hasLeftSquareCorner = function(
  * @param {!BlockSvg} _block The block whose bottom row this represents.
  * @return {boolean} Whether or not the bottom row has a right square corner.
  */
-BottomRow.prototype.hasRightSquareCorner = function(
-    _block) {
+BottomRow.prototype.hasRightSquareCorner = function(_block) {
   return true;
 };
 
diff --git a/core/renderers/measurables/input_row.js b/core/renderers/measurables/input_row.js
index 72b0b18ea..587d8cb8b 100644
--- a/core/renderers/measurables/input_row.js
+++ b/core/renderers/measurables/input_row.js
@@ -39,8 +39,7 @@ const InputRow = function(constants) {
    */
   this.connectedBlockWidths = 0;
 };
-object.inherits(InputRow,
-    Row);
+object.inherits(InputRow, Row);
 
 /**
  * Inspect all subcomponents and populate all size properties on the row.
@@ -56,10 +55,9 @@ InputRow.prototype.measure = function() {
     if (Types.isInput(elem)) {
       if (Types.isStatementInput(elem)) {
         connectedBlockWidths += elem.connectedBlockWidth;
-      } else if (Types.isExternalInput(elem) &&
-          elem.connectedBlockWidth != 0) {
-        connectedBlockWidths += (elem.connectedBlockWidth -
-          elem.connectionWidth);
+      } else if (Types.isExternalInput(elem) && elem.connectedBlockWidth != 0) {
+        connectedBlockWidths +=
+            (elem.connectedBlockWidth - elem.connectionWidth);
       }
     }
     if (!(Types.isSpacer(elem))) {
diff --git a/core/renderers/measurables/spacer_row.js b/core/renderers/measurables/spacer_row.js
index 3d87e250f..3956355cb 100644
--- a/core/renderers/measurables/spacer_row.js
+++ b/core/renderers/measurables/spacer_row.js
@@ -31,19 +31,15 @@ const object = goog.require('Blockly.utils.object');
  * @extends {Row}
  */
 const SpacerRow = function(constants, height, width) {
-  SpacerRow.superClass_.constructor.call(this,
-      constants);
-  this.type |= Types.SPACER |
-      Types.BETWEEN_ROW_SPACER;
+  SpacerRow.superClass_.constructor.call(this, constants);
+  this.type |= Types.SPACER | Types.BETWEEN_ROW_SPACER;
   this.width = width;
   this.height = height;
   this.followsStatement = false;
   this.widthWithConnectedBlocks = 0;
-  this.elements = [
-    new InRowSpacer(this.constants_, width)];
+  this.elements = [new InRowSpacer(this.constants_, width)];
 };
-object.inherits(SpacerRow,
-    Row);
+object.inherits(SpacerRow, Row);
 
 /**
  * @override
diff --git a/core/renderers/measurables/top_row.js b/core/renderers/measurables/top_row.js
index cbd5e9c0e..a1bcd82f6 100644
--- a/core/renderers/measurables/top_row.js
+++ b/core/renderers/measurables/top_row.js
@@ -69,8 +69,7 @@ const TopRow = function(constants) {
    */
   this.connection = null;
 };
-object.inherits(TopRow,
-    Row);
+object.inherits(TopRow, Row);
 
 /**
  * Returns whether or not the top row has a left square corner.
@@ -78,13 +77,13 @@ object.inherits(TopRow,
  * @return {boolean} Whether or not the top row has a left square corner.
  */
 TopRow.prototype.hasLeftSquareCorner = function(block) {
-  const hasHat = (block.hat ?
-      block.hat === 'cap' : this.constants_.ADD_START_HATS) &&
+  const hasHat =
+      (block.hat ? block.hat === 'cap' : this.constants_.ADD_START_HATS) &&
       !block.outputConnection && !block.previousConnection;
   const prevBlock = block.getPreviousBlock();
 
-  return !!block.outputConnection ||
-      hasHat || (prevBlock ? prevBlock.getNextBlock() == block : false);
+  return !!block.outputConnection || hasHat ||
+      (prevBlock ? prevBlock.getNextBlock() == block : false);
 };
 
 /**
@@ -92,8 +91,7 @@ TopRow.prototype.hasLeftSquareCorner = function(block) {
  * @param {!BlockSvg} _block The block whose top row this represents.
  * @return {boolean} Whether or not the top row has a right square corner.
  */
-TopRow.prototype.hasRightSquareCorner = function(
-    _block) {
+TopRow.prototype.hasRightSquareCorner = function(_block) {
   return true;
 };
 

From ec04c9ca36d1d84f803692d1732718ea47d9aeb1 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 16 Aug 2021 18:16:11 -0700
Subject: [PATCH 672/833] Fix jsdoc in core/renderers/measurables/bottom_row.js

---
 core/renderers/measurables/bottom_row.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/renderers/measurables/bottom_row.js b/core/renderers/measurables/bottom_row.js
index 37e80f6f2..1c4fe02ac 100644
--- a/core/renderers/measurables/bottom_row.js
+++ b/core/renderers/measurables/bottom_row.js
@@ -26,7 +26,7 @@ const object = goog.require('Blockly.utils.object');
 
 /**
  * An object containing information about what elements are in the bottom row of
- * a block as well as spacing information for the top row.
+ * a block as well as spacing information for the bottom row.
  * Elements in a bottom row can consist of corners, spacers and next
  * connections.
  * @param {!ConstantProvider} constants The rendering

From a9d4adcbf0667f7ae0a604c27c8d3a57d162564b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 09:07:00 -0700
Subject: [PATCH 673/833] Remove unused variables in
 core/renderers/measurables/top_row.js

---
 core/renderers/measurables/top_row.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/renderers/measurables/top_row.js b/core/renderers/measurables/top_row.js
index a1bcd82f6..bc59170d6 100644
--- a/core/renderers/measurables/top_row.js
+++ b/core/renderers/measurables/top_row.js
@@ -102,7 +102,6 @@ TopRow.prototype.measure = function() {
   let height = 0;
   let width = 0;
   let ascenderHeight = 0;
-  let e = 0, elem;
   for (let i = 0; i < this.elements.length; i++) {
     const elem = this.elements[i];
     width += elem.width;

From b4b8b2299416ceb6e01caa5fbf812a1820973e32 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 11:09:44 -0700
Subject: [PATCH 674/833] Migrate core/renderers/zelos/path_object.js to ES6
 const/let

---
 core/renderers/zelos/path_object.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/renderers/zelos/path_object.js b/core/renderers/zelos/path_object.js
index 9a406e90b..6469c3c86 100644
--- a/core/renderers/zelos/path_object.js
+++ b/core/renderers/zelos/path_object.js
@@ -98,7 +98,7 @@ Blockly.zelos.PathObject.prototype.applyColour = function(block) {
   }
 
   // Apply colour to outlines.
-  for (var key in this.outlines_) {
+  for (const key in this.outlines_) {
     this.outlines_[key].setAttribute('fill', this.style.colourTertiary);
   }
 };
@@ -109,7 +109,7 @@ Blockly.zelos.PathObject.prototype.applyColour = function(block) {
 Blockly.zelos.PathObject.prototype.flipRTL = function() {
   Blockly.zelos.PathObject.superClass_.flipRTL.call(this);
   // Mirror each input outline path.
-  for (var key in this.outlines_) {
+  for (const key in this.outlines_) {
     this.outlines_[key].setAttribute('transform', 'scale(-1 1)');
   }
 };
@@ -155,8 +155,8 @@ Blockly.zelos.PathObject.prototype.updateReplacementFade = function(
  */
 Blockly.zelos.PathObject.prototype.updateShapeForInputHighlight = function(
     conn, enable) {
-  var name = conn.getParentInput().name;
-  var outlinePath = this.getOutlinePath_(name);
+  const name = conn.getParentInput().name;
+  const outlinePath = this.getOutlinePath_(name);
   if (!outlinePath) {
     return;
   }
@@ -174,7 +174,7 @@ Blockly.zelos.PathObject.prototype.updateShapeForInputHighlight = function(
  */
 Blockly.zelos.PathObject.prototype.beginDrawing = function() {
   this.remainingOutlines_ = Object.create(null);
-  for (var key in this.outlines_) {
+  for (const key in this.outlines_) {
     // The value set here isn't used anywhere, we are just using the
     // object as a Set data structure.
     this.remainingOutlines_[key] = 1;
@@ -189,7 +189,7 @@ Blockly.zelos.PathObject.prototype.endDrawing = function() {
   // Go through all remaining outlines that were not used this draw pass, and
   // remove them.
   if (this.remainingOutlines_) {
-    for (var key in this.remainingOutlines_) {
+    for (const key in this.remainingOutlines_) {
       this.removeOutlinePath_(key);
     }
   }
@@ -204,7 +204,7 @@ Blockly.zelos.PathObject.prototype.endDrawing = function() {
  * @package
  */
 Blockly.zelos.PathObject.prototype.setOutlinePath = function(name, pathString) {
-  var outline = this.getOutlinePath_(name);
+  const outline = this.getOutlinePath_(name);
   outline.setAttribute('d', pathString);
   outline.setAttribute('fill', this.style.colourTertiary);
 };

From d6eb6c14efff4912e5a0b92a07dac059902982bf Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 11:10:11 -0700
Subject: [PATCH 675/833] Migrate core/renderers/zelos/path_object.js to
 goog.module

---
 core/renderers/zelos/path_object.js | 41 ++++++++++++++++-------------
 tests/deps.js                       |  2 +-
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/core/renderers/zelos/path_object.js b/core/renderers/zelos/path_object.js
index 6469c3c86..15ec3e116 100644
--- a/core/renderers/zelos/path_object.js
+++ b/core/renderers/zelos/path_object.js
@@ -11,14 +11,15 @@
 
 'use strict';
 
-goog.provide('Blockly.zelos.PathObject');
+goog.module('Blockly.zelos.PathObject');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.PathObject');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.Svg');
-goog.require('Blockly.zelos.ConstantProvider');
 
+goog.requireType('Blockly.zelos.ConstantProvider');
 goog.requireType('Blockly.Theme');
 
 
@@ -33,8 +34,8 @@ goog.requireType('Blockly.Theme');
  * @extends {Blockly.blockRendering.PathObject}
  * @package
  */
-Blockly.zelos.PathObject = function(root, style, constants) {
-  Blockly.zelos.PathObject.superClass_.constructor.call(this, root, style,
+const PathObject = function(root, style, constants) {
+  PathObject.superClass_.constructor.call(this, root, style,
       constants);
 
   /**
@@ -74,14 +75,14 @@ Blockly.zelos.PathObject = function(root, style, constants) {
    */
   this.outputShapeType = null;
 };
-Blockly.utils.object.inherits(Blockly.zelos.PathObject,
+Blockly.utils.object.inherits(PathObject,
     Blockly.blockRendering.PathObject);
 
 /**
  * @override
  */
-Blockly.zelos.PathObject.prototype.setPath = function(pathString) {
-  Blockly.zelos.PathObject.superClass_.setPath.call(this, pathString);
+PathObject.prototype.setPath = function(pathString) {
+  PathObject.superClass_.setPath.call(this, pathString);
   if (this.svgPathSelected_) {
     this.svgPathSelected_.setAttribute('d', pathString);
   }
@@ -90,8 +91,8 @@ Blockly.zelos.PathObject.prototype.setPath = function(pathString) {
 /**
  * @override
  */
-Blockly.zelos.PathObject.prototype.applyColour = function(block) {
-  Blockly.zelos.PathObject.superClass_.applyColour.call(this, block);
+PathObject.prototype.applyColour = function(block) {
+  PathObject.superClass_.applyColour.call(this, block);
   // Set shadow stroke colour.
   if (block.isShadow() && block.getParent()) {
     this.svgPath.setAttribute('stroke', block.getParent().style.colourTertiary);
@@ -106,8 +107,8 @@ Blockly.zelos.PathObject.prototype.applyColour = function(block) {
 /**
  * @override
  */
-Blockly.zelos.PathObject.prototype.flipRTL = function() {
-  Blockly.zelos.PathObject.superClass_.flipRTL.call(this);
+PathObject.prototype.flipRTL = function() {
+  PathObject.superClass_.flipRTL.call(this);
   // Mirror each input outline path.
   for (const key in this.outlines_) {
     this.outlines_[key].setAttribute('transform', 'scale(-1 1)');
@@ -117,7 +118,7 @@ Blockly.zelos.PathObject.prototype.flipRTL = function() {
 /**
  * @override
  */
-Blockly.zelos.PathObject.prototype.updateSelected = function(enable) {
+PathObject.prototype.updateSelected = function(enable) {
   this.setClass_('blocklySelected', enable);
   if (enable) {
     if (!this.svgPathSelected_) {
@@ -139,7 +140,7 @@ Blockly.zelos.PathObject.prototype.updateSelected = function(enable) {
 /**
  * @override
  */
-Blockly.zelos.PathObject.prototype.updateReplacementFade = function(
+PathObject.prototype.updateReplacementFade = function(
     enable) {
   this.setClass_('blocklyReplaceable', enable);
   if (enable) {
@@ -153,7 +154,7 @@ Blockly.zelos.PathObject.prototype.updateReplacementFade = function(
 /**
  * @override
  */
-Blockly.zelos.PathObject.prototype.updateShapeForInputHighlight = function(
+PathObject.prototype.updateShapeForInputHighlight = function(
     conn, enable) {
   const name = conn.getParentInput().name;
   const outlinePath = this.getOutlinePath_(name);
@@ -172,7 +173,7 @@ Blockly.zelos.PathObject.prototype.updateShapeForInputHighlight = function(
  * Method that's called when the drawer is about to draw the block.
  * @package
  */
-Blockly.zelos.PathObject.prototype.beginDrawing = function() {
+PathObject.prototype.beginDrawing = function() {
   this.remainingOutlines_ = Object.create(null);
   for (const key in this.outlines_) {
     // The value set here isn't used anywhere, we are just using the
@@ -185,7 +186,7 @@ Blockly.zelos.PathObject.prototype.beginDrawing = function() {
  * Method that's called when the drawer is done drawing.
  * @package
  */
-Blockly.zelos.PathObject.prototype.endDrawing = function() {
+PathObject.prototype.endDrawing = function() {
   // Go through all remaining outlines that were not used this draw pass, and
   // remove them.
   if (this.remainingOutlines_) {
@@ -203,7 +204,7 @@ Blockly.zelos.PathObject.prototype.endDrawing = function() {
  * @param {string} pathString The path.
  * @package
  */
-Blockly.zelos.PathObject.prototype.setOutlinePath = function(name, pathString) {
+PathObject.prototype.setOutlinePath = function(name, pathString) {
   const outline = this.getOutlinePath_(name);
   outline.setAttribute('d', pathString);
   outline.setAttribute('fill', this.style.colourTertiary);
@@ -215,7 +216,7 @@ Blockly.zelos.PathObject.prototype.setOutlinePath = function(name, pathString) {
  * @return {!SVGElement} The SVG outline path.
  * @private
  */
-Blockly.zelos.PathObject.prototype.getOutlinePath_ = function(name) {
+PathObject.prototype.getOutlinePath_ = function(name) {
   if (!this.outlines_[name]) {
     this.outlines_[name] = Blockly.utils.dom.createSvgElement(
         Blockly.utils.Svg.PATH, {
@@ -236,7 +237,9 @@ Blockly.zelos.PathObject.prototype.getOutlinePath_ = function(name) {
  * @param {string} name The input name.
  * @private
  */
-Blockly.zelos.PathObject.prototype.removeOutlinePath_ = function(name) {
+PathObject.prototype.removeOutlinePath_ = function(name) {
   this.outlines_[name].parentNode.removeChild(this.outlines_[name]);
   delete this.outlines_[name];
 };
+
+exports = PathObject;
diff --git a/tests/deps.js b/tests/deps.js
index 3f2dbf73a..18cb65bff 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -180,7 +180,7 @@ goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.M
 goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/zelos/measurables/rows.js', ['Blockly.zelos.BottomRow', 'Blockly.zelos.TopRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.TopRow', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider']);
+goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo']);
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});

From 07ddf67aa9f5a72fad55867d8e283e71378fa03a Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 11:12:34 -0700
Subject: [PATCH 676/833] Migrate core/renderers/zelos/path_object.js named
 requires

---
 core/renderers/zelos/path_object.js | 31 +++++++++++++++--------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/core/renderers/zelos/path_object.js b/core/renderers/zelos/path_object.js
index 15ec3e116..8cdd0549a 100644
--- a/core/renderers/zelos/path_object.js
+++ b/core/renderers/zelos/path_object.js
@@ -14,24 +14,25 @@
 goog.module('Blockly.zelos.PathObject');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.PathObject');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Svg');
-
-goog.requireType('Blockly.zelos.ConstantProvider');
-goog.requireType('Blockly.Theme');
+const BasePathObject = goog.require('Blockly.blockRendering.PathObject');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.zelos.ConstantProvider');
+const Svg = goog.require('Blockly.utils.Svg');
+/* eslint-disable-next-line no-unused-vars */
+const Theme = goog.requireType('Blockly.Theme');
+const dom = goog.require('Blockly.utils.dom');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object that handles creating and setting each of the SVG elements
  * used by the renderer.
  * @param {!SVGElement} root The root SVG element.
- * @param {!Blockly.Theme.BlockStyle} style The style object to use for
+ * @param {!Theme.BlockStyle} style The style object to use for
  *     colouring.
- * @param {!Blockly.zelos.ConstantProvider} constants The renderer's constants.
+ * @param {!ConstantProvider} constants The renderer's constants.
  * @constructor
- * @extends {Blockly.blockRendering.PathObject}
+ * @extends {BasePathObject}
  * @package
  */
 const PathObject = function(root, style, constants) {
@@ -40,7 +41,7 @@ const PathObject = function(root, style, constants) {
 
   /**
    * The renderer's constant provider.
-   * @type {!Blockly.zelos.ConstantProvider}
+   * @type {!ConstantProvider}
    */
   this.constants = constants;
 
@@ -75,8 +76,8 @@ const PathObject = function(root, style, constants) {
    */
   this.outputShapeType = null;
 };
-Blockly.utils.object.inherits(PathObject,
-    Blockly.blockRendering.PathObject);
+object.inherits(PathObject,
+    BasePathObject);
 
 /**
  * @override
@@ -218,8 +219,8 @@ PathObject.prototype.setOutlinePath = function(name, pathString) {
  */
 PathObject.prototype.getOutlinePath_ = function(name) {
   if (!this.outlines_[name]) {
-    this.outlines_[name] = Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.PATH, {
+    this.outlines_[name] = dom.createSvgElement(
+        Svg.PATH, {
           'class': 'blocklyOutlinePath',
           // IE doesn't like paths without the data definition, set empty default
           'd': ''

From e75a50b8b9d862ecfd3c443194ca24e6b2904f5c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 11:12:38 -0700
Subject: [PATCH 677/833] clang-format core/renderers/zelos/path_object.js

---
 core/renderers/zelos/path_object.js | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/core/renderers/zelos/path_object.js b/core/renderers/zelos/path_object.js
index 8cdd0549a..5539fc503 100644
--- a/core/renderers/zelos/path_object.js
+++ b/core/renderers/zelos/path_object.js
@@ -36,8 +36,7 @@ const object = goog.require('Blockly.utils.object');
  * @package
  */
 const PathObject = function(root, style, constants) {
-  PathObject.superClass_.constructor.call(this, root, style,
-      constants);
+  PathObject.superClass_.constructor.call(this, root, style, constants);
 
   /**
    * The renderer's constant provider.
@@ -76,8 +75,7 @@ const PathObject = function(root, style, constants) {
    */
   this.outputShapeType = null;
 };
-object.inherits(PathObject,
-    BasePathObject);
+object.inherits(PathObject, BasePathObject);
 
 /**
  * @override
@@ -124,10 +122,10 @@ PathObject.prototype.updateSelected = function(enable) {
   if (enable) {
     if (!this.svgPathSelected_) {
       this.svgPathSelected_ =
-        /** @type {!SVGElement} */ (this.svgPath.cloneNode(true));
+          /** @type {!SVGElement} */ (this.svgPath.cloneNode(true));
       this.svgPathSelected_.setAttribute('fill', 'none');
-      this.svgPathSelected_.setAttribute('filter',
-          'url(#' + this.constants.selectedGlowFilterId + ')');
+      this.svgPathSelected_.setAttribute(
+          'filter', 'url(#' + this.constants.selectedGlowFilterId + ')');
       this.svgRoot.appendChild(this.svgPathSelected_);
     }
   } else {
@@ -141,12 +139,11 @@ PathObject.prototype.updateSelected = function(enable) {
 /**
  * @override
  */
-PathObject.prototype.updateReplacementFade = function(
-    enable) {
+PathObject.prototype.updateReplacementFade = function(enable) {
   this.setClass_('blocklyReplaceable', enable);
   if (enable) {
-    this.svgPath.setAttribute('filter',
-        'url(#' + this.constants.replacementGlowFilterId + ')');
+    this.svgPath.setAttribute(
+        'filter', 'url(#' + this.constants.replacementGlowFilterId + ')');
   } else {
     this.svgPath.removeAttribute('filter');
   }
@@ -155,16 +152,15 @@ PathObject.prototype.updateReplacementFade = function(
 /**
  * @override
  */
-PathObject.prototype.updateShapeForInputHighlight = function(
-    conn, enable) {
+PathObject.prototype.updateShapeForInputHighlight = function(conn, enable) {
   const name = conn.getParentInput().name;
   const outlinePath = this.getOutlinePath_(name);
   if (!outlinePath) {
     return;
   }
   if (enable) {
-    outlinePath.setAttribute('filter',
-        'url(#' + this.constants.replacementGlowFilterId + ')');
+    outlinePath.setAttribute(
+        'filter', 'url(#' + this.constants.replacementGlowFilterId + ')');
   } else {
     outlinePath.removeAttribute('filter');
   }
@@ -222,7 +218,8 @@ PathObject.prototype.getOutlinePath_ = function(name) {
     this.outlines_[name] = dom.createSvgElement(
         Svg.PATH, {
           'class': 'blocklyOutlinePath',
-          // IE doesn't like paths without the data definition, set empty default
+          // IE doesn't like paths without the data definition, set empty
+          // default
           'd': ''
         },
         this.svgRoot);

From d50247664acceb9e32fbf26d5c94fbb90e703d7f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 16 Aug 2021 17:06:14 -0700
Subject: [PATCH 678/833] Split classes from
 core/renderers/measurables/connections.js into multiple files

---
 core/renderers/measurables/connection.js      |  43 +++++++
 core/renderers/measurables/connections.js     | 116 ------------------
 core/renderers/measurables/next_connection.js |  42 +++++++
 .../measurables/output_connection.js          |  48 ++++++++
 .../measurables/previous_connection.js        |  44 +++++++
 tests/deps.js                                 |   5 +-
 6 files changed, 181 insertions(+), 117 deletions(-)
 create mode 100644 core/renderers/measurables/connection.js
 delete mode 100644 core/renderers/measurables/connections.js
 create mode 100644 core/renderers/measurables/next_connection.js
 create mode 100644 core/renderers/measurables/output_connection.js
 create mode 100644 core/renderers/measurables/previous_connection.js

diff --git a/core/renderers/measurables/connection.js b/core/renderers/measurables/connection.js
new file mode 100644
index 000000000..c2ad7db99
--- /dev/null
+++ b/core/renderers/measurables/connection.js
@@ -0,0 +1,43 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Base class representing the space a connection takes up during
+ * rendering.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.provide('Blockly.blockRendering.Connection');
+
+goog.require('Blockly.blockRendering.Measurable');
+goog.require('Blockly.blockRendering.Types');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.RenderedConnection');
+
+
+/**
+ * The base class to represent a connection and the space that it takes up on
+ * the block.
+ * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ *   constants provider.
+ * @param {!Blockly.RenderedConnection} connectionModel The connection object on
+ *     the block that this represents.
+ * @package
+ * @constructor
+ * @extends {Blockly.blockRendering.Measurable}
+ */
+Blockly.blockRendering.Connection = function(constants, connectionModel) {
+  Blockly.blockRendering.Connection.superClass_.constructor.call(this,
+      constants);
+  this.connectionModel = connectionModel;
+  this.shape = this.constants_.shapeFor(connectionModel);
+  this.isDynamicShape = !!this.shape['isDynamic'];
+  this.type |= Blockly.blockRendering.Types.CONNECTION;
+};
+Blockly.utils.object.inherits(Blockly.blockRendering.Connection,
+    Blockly.blockRendering.Measurable);
diff --git a/core/renderers/measurables/connections.js b/core/renderers/measurables/connections.js
deleted file mode 100644
index 0762878c2..000000000
--- a/core/renderers/measurables/connections.js
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Objects representing connections on rendered blocks.
- * @author fenichel@google.com (Rachel Fenichel)
- */
-
-goog.provide('Blockly.blockRendering.Connection');
-goog.provide('Blockly.blockRendering.NextConnection');
-goog.provide('Blockly.blockRendering.OutputConnection');
-goog.provide('Blockly.blockRendering.PreviousConnection');
-
-goog.require('Blockly.blockRendering.Measurable');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.RenderedConnection');
-
-
-/**
- * The base class to represent a connection and the space that it takes up on
- * the block.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @param {!Blockly.RenderedConnection} connectionModel The connection object on
- *     the block that this represents.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.Measurable}
- */
-Blockly.blockRendering.Connection = function(constants, connectionModel) {
-  Blockly.blockRendering.Connection.superClass_.constructor.call(this,
-      constants);
-  this.connectionModel = connectionModel;
-  this.shape = this.constants_.shapeFor(connectionModel);
-  this.isDynamicShape = !!this.shape['isDynamic'];
-  this.type |= Blockly.blockRendering.Types.CONNECTION;
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.Connection,
-    Blockly.blockRendering.Measurable);
-
-/**
- * An object containing information about the space an output connection takes
- * up during rendering.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @param {Blockly.RenderedConnection} connectionModel The connection object on
- *     the block that this represents.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.Connection}
- */
-Blockly.blockRendering.OutputConnection = function(constants, connectionModel) {
-  Blockly.blockRendering.OutputConnection.superClass_.constructor.call(this,
-      constants, connectionModel);
-  this.type |= Blockly.blockRendering.Types.OUTPUT_CONNECTION;
-
-  this.height = !this.isDynamicShape ? this.shape.height : 0;
-  this.width = !this.isDynamicShape ? this.shape.width : 0;
-  this.startX = this.width;
-
-  this.connectionOffsetY = this.constants_.TAB_OFFSET_FROM_TOP;
-  this.connectionOffsetX = 0;
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.OutputConnection,
-    Blockly.blockRendering.Connection);
-
-
-/**
- * An object containing information about the space a previous connection takes
- * up during rendering.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @param {Blockly.RenderedConnection} connectionModel The connection object on
- *     the block that this represents.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.Connection}
- */
-Blockly.blockRendering.PreviousConnection = function(
-    constants, connectionModel) {
-  Blockly.blockRendering.PreviousConnection.superClass_.constructor.call(this,
-      constants, connectionModel);
-  this.type |= Blockly.blockRendering.Types.PREVIOUS_CONNECTION;
-  this.height = this.shape.height;
-  this.width = this.shape.width;
-
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.PreviousConnection,
-    Blockly.blockRendering.Connection);
-
-/**
- * An object containing information about the space a next connection takes
- * up during rendering.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @param {Blockly.RenderedConnection} connectionModel The connection object on
- *     the block that this represents.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.Connection}
- */
-Blockly.blockRendering.NextConnection = function(constants, connectionModel) {
-  Blockly.blockRendering.NextConnection.superClass_.constructor.call(this,
-      constants, connectionModel);
-  this.type |= Blockly.blockRendering.Types.NEXT_CONNECTION;
-  this.height = this.shape.height;
-  this.width = this.shape.width;
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.NextConnection,
-    Blockly.blockRendering.Connection);
diff --git a/core/renderers/measurables/next_connection.js b/core/renderers/measurables/next_connection.js
new file mode 100644
index 000000000..a5874e027
--- /dev/null
+++ b/core/renderers/measurables/next_connection.js
@@ -0,0 +1,42 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class representing the space a next connection takes up during
+ * rendering.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.provide('Blockly.blockRendering.NextConnection');
+
+goog.require('Blockly.blockRendering.Connection');
+goog.require('Blockly.blockRendering.Types');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.RenderedConnection');
+
+
+/**
+ * An object containing information about the space a next connection takes
+ * up during rendering.
+ * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ *   constants provider.
+ * @param {Blockly.RenderedConnection} connectionModel The connection object on
+ *     the block that this represents.
+ * @package
+ * @constructor
+ * @extends {Blockly.blockRendering.Connection}
+ */
+Blockly.blockRendering.NextConnection = function(constants, connectionModel) {
+  Blockly.blockRendering.NextConnection.superClass_.constructor.call(this,
+      constants, connectionModel);
+  this.type |= Blockly.blockRendering.Types.NEXT_CONNECTION;
+  this.height = this.shape.height;
+  this.width = this.shape.width;
+};
+Blockly.utils.object.inherits(Blockly.blockRendering.NextConnection,
+    Blockly.blockRendering.Connection);
diff --git a/core/renderers/measurables/output_connection.js b/core/renderers/measurables/output_connection.js
new file mode 100644
index 000000000..86ac5ab46
--- /dev/null
+++ b/core/renderers/measurables/output_connection.js
@@ -0,0 +1,48 @@
+
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class representing the space a output connection takes up
+ * during rendering.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.provide('Blockly.blockRendering.OutputConnection');
+
+goog.require('Blockly.blockRendering.Connection');
+goog.require('Blockly.blockRendering.Types');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.RenderedConnection');
+
+
+/**
+ * An object containing information about the space an output connection takes
+ * up during rendering.
+ * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ *   constants provider.
+ * @param {Blockly.RenderedConnection} connectionModel The connection object on
+ *     the block that this represents.
+ * @package
+ * @constructor
+ * @extends {Blockly.blockRendering.Connection}
+ */
+Blockly.blockRendering.OutputConnection = function(constants, connectionModel) {
+  Blockly.blockRendering.OutputConnection.superClass_.constructor.call(this,
+      constants, connectionModel);
+  this.type |= Blockly.blockRendering.Types.OUTPUT_CONNECTION;
+
+  this.height = !this.isDynamicShape ? this.shape.height : 0;
+  this.width = !this.isDynamicShape ? this.shape.width : 0;
+  this.startX = this.width;
+
+  this.connectionOffsetY = this.constants_.TAB_OFFSET_FROM_TOP;
+  this.connectionOffsetX = 0;
+};
+Blockly.utils.object.inherits(Blockly.blockRendering.OutputConnection,
+    Blockly.blockRendering.Connection);
diff --git a/core/renderers/measurables/previous_connection.js b/core/renderers/measurables/previous_connection.js
new file mode 100644
index 000000000..deb5e9137
--- /dev/null
+++ b/core/renderers/measurables/previous_connection.js
@@ -0,0 +1,44 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class representing the space a previous connection takes up
+ * during rendering.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.provide('Blockly.blockRendering.PreviousConnection');
+
+goog.require('Blockly.blockRendering.Connection');
+goog.require('Blockly.blockRendering.Types');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.RenderedConnection');
+
+
+/**
+ * An object containing information about the space a previous connection takes
+ * up during rendering.
+ * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ *   constants provider.
+ * @param {Blockly.RenderedConnection} connectionModel The connection object on
+ *     the block that this represents.
+ * @package
+ * @constructor
+ * @extends {Blockly.blockRendering.Connection}
+ */
+Blockly.blockRendering.PreviousConnection = function(
+    constants, connectionModel) {
+  Blockly.blockRendering.PreviousConnection.superClass_.constructor.call(this,
+      constants, connectionModel);
+  this.type |= Blockly.blockRendering.Types.PREVIOUS_CONNECTION;
+  this.height = this.shape.height;
+  this.width = this.shape.width;
+
+};
+Blockly.utils.object.inherits(Blockly.blockRendering.PreviousConnection,
+    Blockly.blockRendering.Connection);
diff --git a/tests/deps.js b/tests/deps.js
index 18cb65bff..267209ed9 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -150,7 +150,7 @@ goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.
 goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/bottom_row.js', ['Blockly.blockRendering.BottomRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/connection.js', ['Blockly.blockRendering.Connection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/external_value_input.js', ['Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/field.js', ['Blockly.blockRendering.Field'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/hat.js', ['Blockly.blockRendering.Hat'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -160,6 +160,9 @@ goog.addDependency('../../core/renderers/measurables/inline_input.js', ['Blockly
 goog.addDependency('../../core/renderers/measurables/input_connection.js', ['Blockly.blockRendering.InputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/input_row.js', ['Blockly.blockRendering.InputRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/jagged_edge.js', ['Blockly.blockRendering.JaggedEdge'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/next_connection.js', ['Blockly.blockRendering.NextConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/output_connection.js', ['Blockly.blockRendering.OutputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/previous_connection.js', ['Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/round_corner.js', ['Blockly.blockRendering.RoundCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/row.js', ['Blockly.blockRendering.Row'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/spacer_row.js', ['Blockly.blockRendering.SpacerRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 974c73f0b9901317dfbc85dcd372b45ce4e23324 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 16 Aug 2021 17:07:40 -0700
Subject: [PATCH 679/833] Migrate core/renderers/measurables/connections.js to
 goog.module

---
 core/renderers/measurables/connection.js          | 11 +++++++----
 core/renderers/measurables/next_connection.js     | 11 +++++++----
 core/renderers/measurables/output_connection.js   | 11 +++++++----
 core/renderers/measurables/previous_connection.js | 11 +++++++----
 tests/deps.js                                     |  8 ++++----
 5 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/core/renderers/measurables/connection.js b/core/renderers/measurables/connection.js
index c2ad7db99..d7b8c8772 100644
--- a/core/renderers/measurables/connection.js
+++ b/core/renderers/measurables/connection.js
@@ -10,7 +10,8 @@
  * @author fenichel@google.com (Rachel Fenichel)
  */
 
-goog.provide('Blockly.blockRendering.Connection');
+goog.module('Blockly.blockRendering.Connection');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.Measurable');
 goog.require('Blockly.blockRendering.Types');
@@ -31,13 +32,15 @@ goog.requireType('Blockly.RenderedConnection');
  * @constructor
  * @extends {Blockly.blockRendering.Measurable}
  */
-Blockly.blockRendering.Connection = function(constants, connectionModel) {
-  Blockly.blockRendering.Connection.superClass_.constructor.call(this,
+const Connection = function(constants, connectionModel) {
+  Connection.superClass_.constructor.call(this,
       constants);
   this.connectionModel = connectionModel;
   this.shape = this.constants_.shapeFor(connectionModel);
   this.isDynamicShape = !!this.shape['isDynamic'];
   this.type |= Blockly.blockRendering.Types.CONNECTION;
 };
-Blockly.utils.object.inherits(Blockly.blockRendering.Connection,
+Blockly.utils.object.inherits(Connection,
     Blockly.blockRendering.Measurable);
+
+exports = Connection;
diff --git a/core/renderers/measurables/next_connection.js b/core/renderers/measurables/next_connection.js
index a5874e027..7d5303923 100644
--- a/core/renderers/measurables/next_connection.js
+++ b/core/renderers/measurables/next_connection.js
@@ -10,7 +10,8 @@
  * @author fenichel@google.com (Rachel Fenichel)
  */
 
-goog.provide('Blockly.blockRendering.NextConnection');
+goog.module('Blockly.blockRendering.NextConnection');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.Connection');
 goog.require('Blockly.blockRendering.Types');
@@ -31,12 +32,14 @@ goog.requireType('Blockly.RenderedConnection');
  * @constructor
  * @extends {Blockly.blockRendering.Connection}
  */
-Blockly.blockRendering.NextConnection = function(constants, connectionModel) {
-  Blockly.blockRendering.NextConnection.superClass_.constructor.call(this,
+const NextConnection = function(constants, connectionModel) {
+  NextConnection.superClass_.constructor.call(this,
       constants, connectionModel);
   this.type |= Blockly.blockRendering.Types.NEXT_CONNECTION;
   this.height = this.shape.height;
   this.width = this.shape.width;
 };
-Blockly.utils.object.inherits(Blockly.blockRendering.NextConnection,
+Blockly.utils.object.inherits(NextConnection,
     Blockly.blockRendering.Connection);
+
+exports = NextConnection;
diff --git a/core/renderers/measurables/output_connection.js b/core/renderers/measurables/output_connection.js
index 86ac5ab46..c4941ae23 100644
--- a/core/renderers/measurables/output_connection.js
+++ b/core/renderers/measurables/output_connection.js
@@ -11,7 +11,8 @@
  * @author fenichel@google.com (Rachel Fenichel)
  */
 
-goog.provide('Blockly.blockRendering.OutputConnection');
+goog.module('Blockly.blockRendering.OutputConnection');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.Connection');
 goog.require('Blockly.blockRendering.Types');
@@ -32,8 +33,8 @@ goog.requireType('Blockly.RenderedConnection');
  * @constructor
  * @extends {Blockly.blockRendering.Connection}
  */
-Blockly.blockRendering.OutputConnection = function(constants, connectionModel) {
-  Blockly.blockRendering.OutputConnection.superClass_.constructor.call(this,
+const OutputConnection = function(constants, connectionModel) {
+  OutputConnection.superClass_.constructor.call(this,
       constants, connectionModel);
   this.type |= Blockly.blockRendering.Types.OUTPUT_CONNECTION;
 
@@ -44,5 +45,7 @@ Blockly.blockRendering.OutputConnection = function(constants, connectionModel) {
   this.connectionOffsetY = this.constants_.TAB_OFFSET_FROM_TOP;
   this.connectionOffsetX = 0;
 };
-Blockly.utils.object.inherits(Blockly.blockRendering.OutputConnection,
+Blockly.utils.object.inherits(OutputConnection,
     Blockly.blockRendering.Connection);
+
+exports = OutputConnection;
diff --git a/core/renderers/measurables/previous_connection.js b/core/renderers/measurables/previous_connection.js
index deb5e9137..ebbadf49c 100644
--- a/core/renderers/measurables/previous_connection.js
+++ b/core/renderers/measurables/previous_connection.js
@@ -10,7 +10,8 @@
  * @author fenichel@google.com (Rachel Fenichel)
  */
 
-goog.provide('Blockly.blockRendering.PreviousConnection');
+goog.module('Blockly.blockRendering.PreviousConnection');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.Connection');
 goog.require('Blockly.blockRendering.Types');
@@ -31,14 +32,16 @@ goog.requireType('Blockly.RenderedConnection');
  * @constructor
  * @extends {Blockly.blockRendering.Connection}
  */
-Blockly.blockRendering.PreviousConnection = function(
+const PreviousConnection = function(
     constants, connectionModel) {
-  Blockly.blockRendering.PreviousConnection.superClass_.constructor.call(this,
+  PreviousConnection.superClass_.constructor.call(this,
       constants, connectionModel);
   this.type |= Blockly.blockRendering.Types.PREVIOUS_CONNECTION;
   this.height = this.shape.height;
   this.width = this.shape.width;
 
 };
-Blockly.utils.object.inherits(Blockly.blockRendering.PreviousConnection,
+Blockly.utils.object.inherits(PreviousConnection,
     Blockly.blockRendering.Connection);
+
+exports = PreviousConnection;
diff --git a/tests/deps.js b/tests/deps.js
index 267209ed9..6bed21032 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -150,7 +150,7 @@ goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.
 goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/bottom_row.js', ['Blockly.blockRendering.BottomRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/connection.js', ['Blockly.blockRendering.Connection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/connection.js', ['Blockly.blockRendering.Connection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/external_value_input.js', ['Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/field.js', ['Blockly.blockRendering.Field'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/hat.js', ['Blockly.blockRendering.Hat'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -160,9 +160,9 @@ goog.addDependency('../../core/renderers/measurables/inline_input.js', ['Blockly
 goog.addDependency('../../core/renderers/measurables/input_connection.js', ['Blockly.blockRendering.InputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/input_row.js', ['Blockly.blockRendering.InputRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/jagged_edge.js', ['Blockly.blockRendering.JaggedEdge'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/next_connection.js', ['Blockly.blockRendering.NextConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/output_connection.js', ['Blockly.blockRendering.OutputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/previous_connection.js', ['Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/next_connection.js', ['Blockly.blockRendering.NextConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/output_connection.js', ['Blockly.blockRendering.OutputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/previous_connection.js', ['Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/round_corner.js', ['Blockly.blockRendering.RoundCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/row.js', ['Blockly.blockRendering.Row'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/spacer_row.js', ['Blockly.blockRendering.SpacerRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 673c64dab82720fc3d44dc1ff9904abe01b86176 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 16 Aug 2021 17:13:17 -0700
Subject: [PATCH 680/833] Migrate core/renderers/measurables/connections.js
 named requires

---
 core/renderers/measurables/connection.js      | 25 ++++++++++---------
 core/renderers/measurables/next_connection.js | 25 ++++++++++---------
 .../measurables/output_connection.js          | 25 ++++++++++---------
 .../measurables/previous_connection.js        | 25 ++++++++++---------
 4 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/core/renderers/measurables/connection.js b/core/renderers/measurables/connection.js
index d7b8c8772..7d422a850 100644
--- a/core/renderers/measurables/connection.js
+++ b/core/renderers/measurables/connection.js
@@ -13,24 +13,25 @@
 goog.module('Blockly.blockRendering.Connection');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.Measurable');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.RenderedConnection');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const Measurable = goog.require('Blockly.blockRendering.Measurable');
+/* eslint-disable-next-line no-unused-vars */
+const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * The base class to represent a connection and the space that it takes up on
  * the block.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
- * @param {!Blockly.RenderedConnection} connectionModel The connection object on
+ * @param {!RenderedConnection} connectionModel The connection object on
  *     the block that this represents.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Measurable}
+ * @extends {Measurable}
  */
 const Connection = function(constants, connectionModel) {
   Connection.superClass_.constructor.call(this,
@@ -38,9 +39,9 @@ const Connection = function(constants, connectionModel) {
   this.connectionModel = connectionModel;
   this.shape = this.constants_.shapeFor(connectionModel);
   this.isDynamicShape = !!this.shape['isDynamic'];
-  this.type |= Blockly.blockRendering.Types.CONNECTION;
+  this.type |= Types.CONNECTION;
 };
-Blockly.utils.object.inherits(Connection,
-    Blockly.blockRendering.Measurable);
+object.inherits(Connection,
+    Measurable);
 
 exports = Connection;
diff --git a/core/renderers/measurables/next_connection.js b/core/renderers/measurables/next_connection.js
index 7d5303923..bdffd8f46 100644
--- a/core/renderers/measurables/next_connection.js
+++ b/core/renderers/measurables/next_connection.js
@@ -13,33 +13,34 @@
 goog.module('Blockly.blockRendering.NextConnection');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.Connection');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.RenderedConnection');
+const Connection = goog.require('Blockly.blockRendering.Connection');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object containing information about the space a next connection takes
  * up during rendering.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
- * @param {Blockly.RenderedConnection} connectionModel The connection object on
+ * @param {RenderedConnection} connectionModel The connection object on
  *     the block that this represents.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Connection}
+ * @extends {Connection}
  */
 const NextConnection = function(constants, connectionModel) {
   NextConnection.superClass_.constructor.call(this,
       constants, connectionModel);
-  this.type |= Blockly.blockRendering.Types.NEXT_CONNECTION;
+  this.type |= Types.NEXT_CONNECTION;
   this.height = this.shape.height;
   this.width = this.shape.width;
 };
-Blockly.utils.object.inherits(NextConnection,
-    Blockly.blockRendering.Connection);
+object.inherits(NextConnection,
+    Connection);
 
 exports = NextConnection;
diff --git a/core/renderers/measurables/output_connection.js b/core/renderers/measurables/output_connection.js
index c4941ae23..3f4a2d270 100644
--- a/core/renderers/measurables/output_connection.js
+++ b/core/renderers/measurables/output_connection.js
@@ -14,29 +14,30 @@
 goog.module('Blockly.blockRendering.OutputConnection');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.Connection');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.RenderedConnection');
+const Connection = goog.require('Blockly.blockRendering.Connection');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object containing information about the space an output connection takes
  * up during rendering.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
- * @param {Blockly.RenderedConnection} connectionModel The connection object on
+ * @param {RenderedConnection} connectionModel The connection object on
  *     the block that this represents.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Connection}
+ * @extends {Connection}
  */
 const OutputConnection = function(constants, connectionModel) {
   OutputConnection.superClass_.constructor.call(this,
       constants, connectionModel);
-  this.type |= Blockly.blockRendering.Types.OUTPUT_CONNECTION;
+  this.type |= Types.OUTPUT_CONNECTION;
 
   this.height = !this.isDynamicShape ? this.shape.height : 0;
   this.width = !this.isDynamicShape ? this.shape.width : 0;
@@ -45,7 +46,7 @@ const OutputConnection = function(constants, connectionModel) {
   this.connectionOffsetY = this.constants_.TAB_OFFSET_FROM_TOP;
   this.connectionOffsetX = 0;
 };
-Blockly.utils.object.inherits(OutputConnection,
-    Blockly.blockRendering.Connection);
+object.inherits(OutputConnection,
+    Connection);
 
 exports = OutputConnection;
diff --git a/core/renderers/measurables/previous_connection.js b/core/renderers/measurables/previous_connection.js
index ebbadf49c..d9a6eaddc 100644
--- a/core/renderers/measurables/previous_connection.js
+++ b/core/renderers/measurables/previous_connection.js
@@ -13,35 +13,36 @@
 goog.module('Blockly.blockRendering.PreviousConnection');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.Connection');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.RenderedConnection');
+const Connection = goog.require('Blockly.blockRendering.Connection');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object containing information about the space a previous connection takes
  * up during rendering.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
- * @param {Blockly.RenderedConnection} connectionModel The connection object on
+ * @param {RenderedConnection} connectionModel The connection object on
  *     the block that this represents.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Connection}
+ * @extends {Connection}
  */
 const PreviousConnection = function(
     constants, connectionModel) {
   PreviousConnection.superClass_.constructor.call(this,
       constants, connectionModel);
-  this.type |= Blockly.blockRendering.Types.PREVIOUS_CONNECTION;
+  this.type |= Types.PREVIOUS_CONNECTION;
   this.height = this.shape.height;
   this.width = this.shape.width;
 
 };
-Blockly.utils.object.inherits(PreviousConnection,
-    Blockly.blockRendering.Connection);
+object.inherits(PreviousConnection,
+    Connection);
 
 exports = PreviousConnection;

From d30b0f5f3ca6bba16a60563267c4e5282e8bba58 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 16 Aug 2021 17:14:36 -0700
Subject: [PATCH 681/833] clang-formant
 core/renderers/measurables/connections.js

---
 core/renderers/measurables/connection.js          |  6 ++----
 core/renderers/measurables/next_connection.js     |  6 ++----
 core/renderers/measurables/output_connection.js   |  7 +++----
 core/renderers/measurables/previous_connection.js | 11 ++++-------
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/core/renderers/measurables/connection.js b/core/renderers/measurables/connection.js
index 7d422a850..f8b77714e 100644
--- a/core/renderers/measurables/connection.js
+++ b/core/renderers/measurables/connection.js
@@ -34,14 +34,12 @@ const object = goog.require('Blockly.utils.object');
  * @extends {Measurable}
  */
 const Connection = function(constants, connectionModel) {
-  Connection.superClass_.constructor.call(this,
-      constants);
+  Connection.superClass_.constructor.call(this, constants);
   this.connectionModel = connectionModel;
   this.shape = this.constants_.shapeFor(connectionModel);
   this.isDynamicShape = !!this.shape['isDynamic'];
   this.type |= Types.CONNECTION;
 };
-object.inherits(Connection,
-    Measurable);
+object.inherits(Connection, Measurable);
 
 exports = Connection;
diff --git a/core/renderers/measurables/next_connection.js b/core/renderers/measurables/next_connection.js
index bdffd8f46..79f50e7a8 100644
--- a/core/renderers/measurables/next_connection.js
+++ b/core/renderers/measurables/next_connection.js
@@ -34,13 +34,11 @@ const object = goog.require('Blockly.utils.object');
  * @extends {Connection}
  */
 const NextConnection = function(constants, connectionModel) {
-  NextConnection.superClass_.constructor.call(this,
-      constants, connectionModel);
+  NextConnection.superClass_.constructor.call(this, constants, connectionModel);
   this.type |= Types.NEXT_CONNECTION;
   this.height = this.shape.height;
   this.width = this.shape.width;
 };
-object.inherits(NextConnection,
-    Connection);
+object.inherits(NextConnection, Connection);
 
 exports = NextConnection;
diff --git a/core/renderers/measurables/output_connection.js b/core/renderers/measurables/output_connection.js
index 3f4a2d270..3b1030bb9 100644
--- a/core/renderers/measurables/output_connection.js
+++ b/core/renderers/measurables/output_connection.js
@@ -35,8 +35,8 @@ const object = goog.require('Blockly.utils.object');
  * @extends {Connection}
  */
 const OutputConnection = function(constants, connectionModel) {
-  OutputConnection.superClass_.constructor.call(this,
-      constants, connectionModel);
+  OutputConnection.superClass_.constructor.call(
+      this, constants, connectionModel);
   this.type |= Types.OUTPUT_CONNECTION;
 
   this.height = !this.isDynamicShape ? this.shape.height : 0;
@@ -46,7 +46,6 @@ const OutputConnection = function(constants, connectionModel) {
   this.connectionOffsetY = this.constants_.TAB_OFFSET_FROM_TOP;
   this.connectionOffsetX = 0;
 };
-object.inherits(OutputConnection,
-    Connection);
+object.inherits(OutputConnection, Connection);
 
 exports = OutputConnection;
diff --git a/core/renderers/measurables/previous_connection.js b/core/renderers/measurables/previous_connection.js
index d9a6eaddc..6b48d8b44 100644
--- a/core/renderers/measurables/previous_connection.js
+++ b/core/renderers/measurables/previous_connection.js
@@ -33,16 +33,13 @@ const object = goog.require('Blockly.utils.object');
  * @constructor
  * @extends {Connection}
  */
-const PreviousConnection = function(
-    constants, connectionModel) {
-  PreviousConnection.superClass_.constructor.call(this,
-      constants, connectionModel);
+const PreviousConnection = function(constants, connectionModel) {
+  PreviousConnection.superClass_.constructor.call(
+      this, constants, connectionModel);
   this.type |= Types.PREVIOUS_CONNECTION;
   this.height = this.shape.height;
   this.width = this.shape.width;
-
 };
-object.inherits(PreviousConnection,
-    Connection);
+object.inherits(PreviousConnection, Connection);
 
 exports = PreviousConnection;

From 92a519235083f5e54f0d31e1ec1e57feae204e2f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 12:57:55 -0700
Subject: [PATCH 682/833] Migrate core/touch.js to ES6 const/let

---
 core/touch.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/core/touch.js b/core/touch.js
index 7dc578663..81f82d1fd 100644
--- a/core/touch.js
+++ b/core/touch.js
@@ -171,7 +171,7 @@ Blockly.Touch.getTouchIdentifierFromEvent = function(e) {
  *     saved identifier.
  */
 Blockly.Touch.checkTouchIdentifier = function(e) {
-  var identifier = Blockly.Touch.getTouchIdentifierFromEvent(e);
+  const identifier = Blockly.Touch.getTouchIdentifierFromEvent(e);
 
   // if (Blockly.touchIdentifier_) is insufficient because Android touch
   // identifiers may be zero.
@@ -202,7 +202,7 @@ Blockly.Touch.checkTouchIdentifier = function(e) {
 Blockly.Touch.setClientFromTouch = function(e) {
   if (Blockly.utils.string.startsWith(e.type, 'touch')) {
     // Map the touch event's properties to the event.
-    var touchPoint = e.changedTouches[0];
+    const touchPoint = e.changedTouches[0];
     e.clientX = touchPoint.clientX;
     e.clientY = touchPoint.clientY;
   }
@@ -238,15 +238,19 @@ Blockly.Touch.isTouchEvent = function(e) {
  *     event will have exactly one changed touch.
  */
 Blockly.Touch.splitEventByTouches = function(e) {
-  var events = [];
+  const events = [];
   if (e.changedTouches) {
-    for (var i = 0; i < e.changedTouches.length; i++) {
-      var newEvent = {
+    for (let i = 0; i < e.changedTouches.length; i++) {
+      const newEvent = {
         type: e.type,
         changedTouches: [e.changedTouches[i]],
         target: e.target,
-        stopPropagation: function() { e.stopPropagation(); },
-        preventDefault: function() { e.preventDefault(); }
+        stopPropagation: function () {
+          e.stopPropagation();
+        },
+        preventDefault: function () {
+          e.preventDefault();
+        }
       };
       events[i] = newEvent;
     }

From 9561cb20c96136d47ec7df5f0aca8b557ca8006a Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 13:33:41 -0700
Subject: [PATCH 683/833] Migrate core/touch.js to goog.module

---
 core/gesture.js       | 10 ++---
 core/inject.js        |  5 ++-
 core/touch.js         | 95 +++++++++++++++++++++++--------------------
 core/touch_gesture.js |  5 ++-
 tests/deps.js         |  6 +--
 5 files changed, 64 insertions(+), 57 deletions(-)

diff --git a/core/gesture.js b/core/gesture.js
index 855dc76de..bf28e9315 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -14,8 +14,6 @@
 goog.module('Blockly.Gesture');
 goog.module.declareLegacyNamespace();
 
-// TODO(#5073): Add Blockly require after fixing circular dependency.
-// goog.require('Blockly');
 /* eslint-disable-next-line no-unused-vars */
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const BubbleDragger = goog.require('Blockly.BubbleDragger');
@@ -280,7 +278,7 @@ Gesture.prototype.updateFromEvent_ = function(e) {
   // Exceeded the drag radius for the first time.
   if (changed) {
     this.updateIsDragging_();
-    Blockly.longStop_();
+    Touch.longStop();
   }
   this.mostRecentEvent_ = e;
 };
@@ -511,7 +509,7 @@ Gesture.prototype.doStart = function(e) {
   if ((e.type.toLowerCase() == 'touchstart' ||
        e.type.toLowerCase() == 'pointerdown') &&
       e.pointerType != 'mouse') {
-    Blockly.longStart(e, this);
+    Touch.longStart(e, this);
   }
 
   this.mouseDownXY_ = new Coordinate(e.clientX, e.clientY);
@@ -561,7 +559,7 @@ Gesture.prototype.handleMove = function(e) {
  */
 Gesture.prototype.handleUp = function(e) {
   this.updateFromEvent_(e);
-  Blockly.longStop_();
+  Touch.longStop();
 
   if (this.isEnding_) {
     console.log('Trying to end a gesture recursively.');
@@ -607,7 +605,7 @@ Gesture.prototype.cancel = function() {
   if (this.isEnding_) {
     return;
   }
-  Blockly.longStop_();
+  Touch.longStop();
   if (this.isDraggingBubble_) {
     this.bubbleDragger_.endBubbleDrag(
         this.mostRecentEvent_, this.currentDragDeltaXY_);
diff --git a/core/inject.js b/core/inject.js
index 62be9633e..c2446e602 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -22,6 +22,7 @@ goog.require('Blockly.Grid');
 goog.require('Blockly.Msg');
 goog.require('Blockly.Options');
 goog.require('Blockly.ScrollbarPair');
+goog.require('Blockly.Touch');
 goog.require('Blockly.Tooltip');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.aria');
@@ -433,9 +434,9 @@ Blockly.inject.bindDocumentEvents_ = function() {
         document, 'keydown', null, Blockly.onKeyDown);
     // longStop needs to run to stop the context menu from showing up.  It
     // should run regardless of what other touch event handlers have run.
-    Blockly.browserEvents.bind(document, 'touchend', null, Blockly.longStop_);
+    Blockly.browserEvents.bind(document, 'touchend', null, Blockly.Touch.longStop);
     Blockly.browserEvents.bind(
-        document, 'touchcancel', null, Blockly.longStop_);
+        document, 'touchcancel', null, Blockly.Touch.longStop);
     // Some iPad versions don't fire resize after portrait to landscape change.
     if (Blockly.utils.userAgent.IPAD) {
       Blockly.browserEvents.conditionalBind(
diff --git a/core/touch.js b/core/touch.js
index 81f82d1fd..a88f754e0 100644
--- a/core/touch.js
+++ b/core/touch.js
@@ -10,14 +10,10 @@
  */
 'use strict';
 
-/**
- * @name Blockly.Touch
- * @namespace
- */
-goog.provide('Blockly.Touch');
+goog.module('Blockly.Touch');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.internalConstants');
-goog.require('Blockly.utils');
 goog.require('Blockly.utils.global');
 goog.require('Blockly.utils.string');
 
@@ -25,10 +21,11 @@ goog.requireType('Blockly.Gesture');
 
 
 /**
-  * Whether touch is enabled in the browser.
-  * Copied from Closure's goog.events.BrowserFeature.TOUCH_ENABLED
-  */
-Blockly.Touch.TOUCH_ENABLED =
+ * Whether touch is enabled in the browser.
+ * Copied from Closure's goog.events.BrowserFeature.TOUCH_ENABLED
+ * @const
+ */
+const TOUCH_ENABLED =
     ('ontouchstart' in Blockly.utils.global ||
      !!(Blockly.utils.global['document'] && document.documentElement &&
         'ontouchstart' in document.documentElement) ||
@@ -36,22 +33,22 @@ Blockly.Touch.TOUCH_ENABLED =
      !!(Blockly.utils.global['navigator'] &&
         (Blockly.utils.global['navigator']['maxTouchPoints'] ||
          Blockly.utils.global['navigator']['msMaxTouchPoints'])));
+exports.TOUCH_ENABLED = TOUCH_ENABLED;
 
 /**
  * Which touch events are we currently paying attention to?
  * @type {?string}
- * @private
  */
-Blockly.Touch.touchIdentifier_ = null;
+let touchIdentifier_ = null;
 
 /**
  * The TOUCH_MAP lookup dictionary specifies additional touch events to fire,
  * in conjunction with mouse events.
  * @type {Object}
  */
-Blockly.Touch.TOUCH_MAP = {};
+let TOUCH_MAP = {};
 if (Blockly.utils.global['PointerEvent']) {
-  Blockly.Touch.TOUCH_MAP = {
+  TOUCH_MAP = {
     'mousedown': ['pointerdown'],
     'mouseenter': ['pointerenter'],
     'mouseleave': ['pointerleave'],
@@ -62,19 +59,19 @@ if (Blockly.utils.global['PointerEvent']) {
     'touchend': ['pointerup'],
     'touchcancel': ['pointercancel']
   };
-} else if (Blockly.Touch.TOUCH_ENABLED) {
-  Blockly.Touch.TOUCH_MAP = {
+} else if (TOUCH_ENABLED) {
+  TOUCH_MAP = {
     'mousedown': ['touchstart'],
     'mousemove': ['touchmove'],
     'mouseup': ['touchend', 'touchcancel']
   };
 }
+exports.TOUCH_MAP = TOUCH_MAP;
 
 /**
  * PID of queued long-press task.
- * @private
  */
-Blockly.longPid_ = 0;
+let longPid_ = 0;
 
 /**
  * Context menus on touch devices are activated using a long-press.
@@ -84,15 +81,14 @@ Blockly.longPid_ = 0;
  * if the touch event terminates early.
  * @param {!Event} e Touch start event.
  * @param {Blockly.Gesture} gesture The gesture that triggered this longStart.
- * @package
  */
-Blockly.longStart = function(e, gesture) {
-  Blockly.longStop_();
+const longStart = function(e, gesture) {
+  longStop();
   // Punt on multitouch events.
   if (e.changedTouches && e.changedTouches.length != 1) {
     return;
   }
-  Blockly.longPid_ = setTimeout(function() {
+  longPid_ = setTimeout(function() {
     // Additional check to distinguish between touch events and pointer events
     if (e.changedTouches) {
       // TouchEvent
@@ -108,27 +104,31 @@ Blockly.longStart = function(e, gesture) {
     }
   }, Blockly.internalConstants.LONGPRESS);
 };
+/** @package */
+exports.longStart = longStart;
 
 /**
  * Nope, that's not a long-press.  Either touchend or touchcancel was fired,
  * or a drag hath begun.  Kill the queued long-press task.
- * @package
  */
-Blockly.longStop_ = function() {
-  if (Blockly.longPid_) {
-    clearTimeout(Blockly.longPid_);
-    Blockly.longPid_ = 0;
+const longStop = function() {
+  if (longPid_) {
+    clearTimeout(longPid_);
+    longPid_ = 0;
   }
 };
+/** @package */
+exports.longStop = longStop;
 
 /**
  * Clear the touch identifier that tracks which touch stream to pay attention
  * to.  This ends the current drag/gesture and allows other pointers to be
  * captured.
  */
-Blockly.Touch.clearTouchIdentifier = function() {
-  Blockly.Touch.touchIdentifier_ = null;
+const clearTouchIdentifier = function() {
+  touchIdentifier_ = null;
 };
+exports.clearTouchIdentifier = clearTouchIdentifier;
 
 /**
  * Decide whether Blockly should handle or ignore this event.
@@ -138,10 +138,11 @@ Blockly.Touch.clearTouchIdentifier = function() {
  * @return {boolean} True if this event should be passed through to the
  *     registered handler; false if it should be blocked.
  */
-Blockly.Touch.shouldHandleEvent = function(e) {
-  return !Blockly.Touch.isMouseOrTouchEvent(e) ||
-      Blockly.Touch.checkTouchIdentifier(e);
+const shouldHandleEvent = function(e) {
+  return !isMouseOrTouchEvent(e) ||
+      checkTouchIdentifier(e);
 };
+exports.shouldHandleEvent = shouldHandleEvent;
 
 /**
  * Get the touch identifier from the given event.  If it was a mouse event, the
@@ -150,13 +151,14 @@ Blockly.Touch.shouldHandleEvent = function(e) {
  * @return {string} The touch identifier from the first changed touch, if
  *     defined.  Otherwise 'mouse'.
  */
-Blockly.Touch.getTouchIdentifierFromEvent = function(e) {
+const getTouchIdentifierFromEvent = function(e) {
   return e.pointerId != undefined ? e.pointerId :
       (e.changedTouches && e.changedTouches[0] &&
       e.changedTouches[0].identifier !== undefined &&
       e.changedTouches[0].identifier !== null) ?
       e.changedTouches[0].identifier : 'mouse';
 };
+exports.getTouchIdentifierFromEvent = getTouchIdentifierFromEvent;
 
 /**
  * Check whether the touch identifier on the event matches the current saved
@@ -170,22 +172,22 @@ Blockly.Touch.getTouchIdentifierFromEvent = function(e) {
  * @return {boolean} Whether the identifier on the event matches the current
  *     saved identifier.
  */
-Blockly.Touch.checkTouchIdentifier = function(e) {
-  const identifier = Blockly.Touch.getTouchIdentifierFromEvent(e);
+const checkTouchIdentifier = function(e) {
+  const identifier = getTouchIdentifierFromEvent(e);
 
-  // if (Blockly.touchIdentifier_) is insufficient because Android touch
+  // if (touchIdentifier_) is insufficient because Android touch
   // identifiers may be zero.
-  if (Blockly.Touch.touchIdentifier_ !== undefined &&
-      Blockly.Touch.touchIdentifier_ !== null) {
+  if (touchIdentifier_ !== undefined &&
+      touchIdentifier_ !== null) {
     // We're already tracking some touch/mouse event.  Is this from the same
     // source?
-    return Blockly.Touch.touchIdentifier_ == identifier;
+    return touchIdentifier_ == identifier;
   }
   if (e.type == 'mousedown' || e.type == 'touchstart' ||
       e.type == 'pointerdown') {
     // No identifier set yet, and this is the start of a drag.  Set it and
     // return.
-    Blockly.Touch.touchIdentifier_ = identifier;
+    touchIdentifier_ = identifier;
     return true;
   }
   // There was no identifier yet, but this wasn't a start event so we're going
@@ -193,13 +195,14 @@ Blockly.Touch.checkTouchIdentifier = function(e) {
   // pointer was down.
   return false;
 };
+exports.checkTouchIdentifier = checkTouchIdentifier;
 
 /**
  * Set an event's clientX and clientY from its first changed touch.  Use this to
  * make a touch event work in a mouse event handler.
  * @param {!Event} e A touch event.
  */
-Blockly.Touch.setClientFromTouch = function(e) {
+const setClientFromTouch = function(e) {
   if (Blockly.utils.string.startsWith(e.type, 'touch')) {
     // Map the touch event's properties to the event.
     const touchPoint = e.changedTouches[0];
@@ -207,27 +210,30 @@ Blockly.Touch.setClientFromTouch = function(e) {
     e.clientY = touchPoint.clientY;
   }
 };
+exports.setClientFromTouch = setClientFromTouch;
 
 /**
  * Check whether a given event is a mouse or touch event.
  * @param {!Event} e An event.
  * @return {boolean} True if it is a mouse or touch event; false otherwise.
  */
-Blockly.Touch.isMouseOrTouchEvent = function(e) {
+const isMouseOrTouchEvent = function(e) {
   return Blockly.utils.string.startsWith(e.type, 'touch') ||
       Blockly.utils.string.startsWith(e.type, 'mouse') ||
       Blockly.utils.string.startsWith(e.type, 'pointer');
 };
+exports.isMouseOrTouchEvent = isMouseOrTouchEvent;
 
 /**
  * Check whether a given event is a touch event or a pointer event.
  * @param {!Event} e An event.
  * @return {boolean} True if it is a touch event; false otherwise.
  */
-Blockly.Touch.isTouchEvent = function(e) {
+const isTouchEvent = function(e) {
   return Blockly.utils.string.startsWith(e.type, 'touch') ||
       Blockly.utils.string.startsWith(e.type, 'pointer');
 };
+exports.isTouchEvent = isTouchEvent;
 
 /**
  * Split an event into an array of events, one per changed touch or mouse
@@ -237,7 +243,7 @@ Blockly.Touch.isTouchEvent = function(e) {
  * @return {!Array<!Event>} An array of mouse or touch events.  Each touch
  *     event will have exactly one changed touch.
  */
-Blockly.Touch.splitEventByTouches = function(e) {
+const splitEventByTouches = function(e) {
   const events = [];
   if (e.changedTouches) {
     for (let i = 0; i < e.changedTouches.length; i++) {
@@ -259,3 +265,4 @@ Blockly.Touch.splitEventByTouches = function(e) {
   }
   return events;
 };
+exports.splitEventByTouches = splitEventByTouches;
diff --git a/core/touch_gesture.js b/core/touch_gesture.js
index 169d80062..7fa4b147f 100644
--- a/core/touch_gesture.js
+++ b/core/touch_gesture.js
@@ -15,6 +15,7 @@ goog.provide('Blockly.TouchGesture');
 
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.Gesture');
+goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.object');
@@ -152,7 +153,7 @@ Blockly.TouchGesture.prototype.handleStart = function(e) {
     this.handleTouchStart(e);
 
     if (this.isMultiTouch()) {
-      Blockly.longStop_();
+      Blockly.Touch.longStop();
     }
   }
 };
@@ -174,7 +175,7 @@ Blockly.TouchGesture.prototype.handleMove = function(e) {
     if (Blockly.Touch.isTouchEvent(e)) {
       this.handleTouchMove(e);
     }
-    Blockly.longStop_();
+    Blockly.Touch.longStop();
   } else {
     Blockly.TouchGesture.superClass_.handleMove.call(this, e);
   }
diff --git a/tests/deps.js b/tests/deps.js
index 6bed21032..a213beb75 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -80,7 +80,7 @@ goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.c
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
@@ -200,8 +200,8 @@ goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.string']);
-goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.string']);
-goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
+goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});

From cb5eee7cb9108b82fab970f3533d341ef2407da6 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 13:40:09 -0700
Subject: [PATCH 684/833] Migrate core/touch.js named requires

---
 core/touch.js | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/core/touch.js b/core/touch.js
index a88f754e0..8fec76099 100644
--- a/core/touch.js
+++ b/core/touch.js
@@ -13,11 +13,11 @@
 goog.module('Blockly.Touch');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.utils.global');
-goog.require('Blockly.utils.string');
-
-goog.requireType('Blockly.Gesture');
+/* eslint-disable-next-line no-unused-vars */
+const Gesture = goog.requireType('Blockly.Gesture');
+const internalConstants = goog.require('Blockly.internalConstants');
+const utilsGlobal = goog.require('Blockly.utils.global');
+const utilsString = goog.require('Blockly.utils.string');
 
 
 /**
@@ -26,13 +26,13 @@ goog.requireType('Blockly.Gesture');
  * @const
  */
 const TOUCH_ENABLED =
-    ('ontouchstart' in Blockly.utils.global ||
-     !!(Blockly.utils.global['document'] && document.documentElement &&
+    ('ontouchstart' in utilsGlobal ||
+     !!(utilsGlobal['document'] && document.documentElement &&
         'ontouchstart' in document.documentElement) ||
      // IE10 uses non-standard touch events, so it has a different check.
-     !!(Blockly.utils.global['navigator'] &&
-        (Blockly.utils.global['navigator']['maxTouchPoints'] ||
-         Blockly.utils.global['navigator']['msMaxTouchPoints'])));
+     !!(utilsGlobal['navigator'] &&
+        (utilsGlobal['navigator']['maxTouchPoints'] ||
+            utilsGlobal['navigator']['msMaxTouchPoints'])));
 exports.TOUCH_ENABLED = TOUCH_ENABLED;
 
 /**
@@ -47,7 +47,7 @@ let touchIdentifier_ = null;
  * @type {Object}
  */
 let TOUCH_MAP = {};
-if (Blockly.utils.global['PointerEvent']) {
+if (utilsGlobal['PointerEvent']) {
   TOUCH_MAP = {
     'mousedown': ['pointerdown'],
     'mouseenter': ['pointerenter'],
@@ -80,7 +80,7 @@ let longPid_ = 0;
  * which after about a second opens the context menu.  The tasks is killed
  * if the touch event terminates early.
  * @param {!Event} e Touch start event.
- * @param {Blockly.Gesture} gesture The gesture that triggered this longStart.
+ * @param {Gesture} gesture The gesture that triggered this longStart.
  */
 const longStart = function(e, gesture) {
   longStop();
@@ -102,7 +102,7 @@ const longStart = function(e, gesture) {
     if (gesture) {
       gesture.handleRightClick(e);
     }
-  }, Blockly.internalConstants.LONGPRESS);
+  }, internalConstants.LONGPRESS);
 };
 /** @package */
 exports.longStart = longStart;
@@ -203,7 +203,7 @@ exports.checkTouchIdentifier = checkTouchIdentifier;
  * @param {!Event} e A touch event.
  */
 const setClientFromTouch = function(e) {
-  if (Blockly.utils.string.startsWith(e.type, 'touch')) {
+  if (utilsString.startsWith(e.type, 'touch')) {
     // Map the touch event's properties to the event.
     const touchPoint = e.changedTouches[0];
     e.clientX = touchPoint.clientX;
@@ -218,9 +218,9 @@ exports.setClientFromTouch = setClientFromTouch;
  * @return {boolean} True if it is a mouse or touch event; false otherwise.
  */
 const isMouseOrTouchEvent = function(e) {
-  return Blockly.utils.string.startsWith(e.type, 'touch') ||
-      Blockly.utils.string.startsWith(e.type, 'mouse') ||
-      Blockly.utils.string.startsWith(e.type, 'pointer');
+  return utilsString.startsWith(e.type, 'touch') ||
+      utilsString.startsWith(e.type, 'mouse') ||
+      utilsString.startsWith(e.type, 'pointer');
 };
 exports.isMouseOrTouchEvent = isMouseOrTouchEvent;
 
@@ -230,8 +230,8 @@ exports.isMouseOrTouchEvent = isMouseOrTouchEvent;
  * @return {boolean} True if it is a touch event; false otherwise.
  */
 const isTouchEvent = function(e) {
-  return Blockly.utils.string.startsWith(e.type, 'touch') ||
-      Blockly.utils.string.startsWith(e.type, 'pointer');
+  return utilsString.startsWith(e.type, 'touch') ||
+      utilsString.startsWith(e.type, 'pointer');
 };
 exports.isTouchEvent = isTouchEvent;
 

From 3bbbdbcfe9dd8dfb839d8ea9f7788530be72e2c7 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 13:40:13 -0700
Subject: [PATCH 685/833] clang-format core/touch.js

---
 core/touch.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/touch.js b/core/touch.js
index 8fec76099..daa95722f 100644
--- a/core/touch.js
+++ b/core/touch.js
@@ -32,7 +32,7 @@ const TOUCH_ENABLED =
      // IE10 uses non-standard touch events, so it has a different check.
      !!(utilsGlobal['navigator'] &&
         (utilsGlobal['navigator']['maxTouchPoints'] ||
-            utilsGlobal['navigator']['msMaxTouchPoints'])));
+         utilsGlobal['navigator']['msMaxTouchPoints'])));
 exports.TOUCH_ENABLED = TOUCH_ENABLED;
 
 /**
@@ -139,8 +139,7 @@ exports.clearTouchIdentifier = clearTouchIdentifier;
  *     registered handler; false if it should be blocked.
  */
 const shouldHandleEvent = function(e) {
-  return !isMouseOrTouchEvent(e) ||
-      checkTouchIdentifier(e);
+  return !isMouseOrTouchEvent(e) || checkTouchIdentifier(e);
 };
 exports.shouldHandleEvent = shouldHandleEvent;
 
@@ -152,11 +151,13 @@ exports.shouldHandleEvent = shouldHandleEvent;
  *     defined.  Otherwise 'mouse'.
  */
 const getTouchIdentifierFromEvent = function(e) {
-  return e.pointerId != undefined ? e.pointerId :
+  return e.pointerId != undefined ?
+      e.pointerId :
       (e.changedTouches && e.changedTouches[0] &&
-      e.changedTouches[0].identifier !== undefined &&
-      e.changedTouches[0].identifier !== null) ?
-      e.changedTouches[0].identifier : 'mouse';
+       e.changedTouches[0].identifier !== undefined &&
+       e.changedTouches[0].identifier !== null) ?
+      e.changedTouches[0].identifier :
+      'mouse';
 };
 exports.getTouchIdentifierFromEvent = getTouchIdentifierFromEvent;
 
@@ -177,8 +178,7 @@ const checkTouchIdentifier = function(e) {
 
   // if (touchIdentifier_) is insufficient because Android touch
   // identifiers may be zero.
-  if (touchIdentifier_ !== undefined &&
-      touchIdentifier_ !== null) {
+  if (touchIdentifier_ !== undefined && touchIdentifier_ !== null) {
     // We're already tracking some touch/mouse event.  Is this from the same
     // source?
     return touchIdentifier_ == identifier;
@@ -251,10 +251,10 @@ const splitEventByTouches = function(e) {
         type: e.type,
         changedTouches: [e.changedTouches[i]],
         target: e.target,
-        stopPropagation: function () {
+        stopPropagation: function() {
           e.stopPropagation();
         },
-        preventDefault: function () {
+        preventDefault: function() {
           e.preventDefault();
         }
       };

From 221f0b9c423c7c9f541f1b035b6d0d719903759c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 12:47:34 -0700
Subject: [PATCH 686/833] Migrate core/theme/zelos.js to goog.module

---
 core/theme/zelos.js | 17 ++++++++++-------
 tests/deps.js       |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/core/theme/zelos.js b/core/theme/zelos.js
index 361b9e4d0..bfb2d0768 100644
--- a/core/theme/zelos.js
+++ b/core/theme/zelos.js
@@ -9,15 +9,16 @@
  */
 'use strict';
 
-goog.provide('Blockly.Themes.Zelos');
+goog.module('Blockly.Themes.Zelos');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Theme');
 
 
 // Temporary holding object.
-Blockly.Themes.Zelos = {};
+let Zelos = {};
 
-Blockly.Themes.Zelos.defaultBlockStyles = {
+Zelos.defaultBlockStyles = {
   "colour_blocks": {
     "colourPrimary": "#CF63CF",
     "colourSecondary": "#C94FC9",
@@ -71,7 +72,7 @@ Blockly.Themes.Zelos.defaultBlockStyles = {
   }
 };
 
-Blockly.Themes.Zelos.categoryStyles = {
+Zelos.categoryStyles = {
   "colour_category": {
     "colour": "#CF63CF"
   },
@@ -101,6 +102,8 @@ Blockly.Themes.Zelos.categoryStyles = {
   }
 };
 
-Blockly.Themes.Zelos =
-    new Blockly.Theme('zelos', Blockly.Themes.Zelos.defaultBlockStyles,
-        Blockly.Themes.Zelos.categoryStyles);
+Zelos =
+    new Blockly.Theme('zelos', Zelos.defaultBlockStyles,
+        Zelos.categoryStyles);
+
+exports = Zelos;
diff --git a/tests/deps.js b/tests/deps.js
index a213beb75..8e1c3d6fb 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -192,7 +192,7 @@ goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);
-goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme']);
+goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly', 'Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});

From 6efd4572947ee898b1d2b01d574de5064493069f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 12:47:38 -0700
Subject: [PATCH 687/833] Migrate core/theme/zelos.js named requires

---
 core/theme/zelos.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/theme/zelos.js b/core/theme/zelos.js
index bfb2d0768..8ff63d3ba 100644
--- a/core/theme/zelos.js
+++ b/core/theme/zelos.js
@@ -12,7 +12,7 @@
 goog.module('Blockly.Themes.Zelos');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Theme');
+const Theme = goog.require('Blockly.Theme');
 
 
 // Temporary holding object.
@@ -103,7 +103,7 @@ Zelos.categoryStyles = {
 };
 
 Zelos =
-    new Blockly.Theme('zelos', Zelos.defaultBlockStyles,
+    new Theme('zelos', Zelos.defaultBlockStyles,
         Zelos.categoryStyles);
 
 exports = Zelos;

From 94293d2446721b9edb1afeb519263f9b16702dee Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 12:47:42 -0700
Subject: [PATCH 688/833] clang-format core/theme/zelos.js

---
 core/theme/zelos.js | 122 ++++++++++++++++++--------------------------
 1 file changed, 51 insertions(+), 71 deletions(-)

diff --git a/core/theme/zelos.js b/core/theme/zelos.js
index 8ff63d3ba..de8461a2c 100644
--- a/core/theme/zelos.js
+++ b/core/theme/zelos.js
@@ -19,91 +19,71 @@ const Theme = goog.require('Blockly.Theme');
 let Zelos = {};
 
 Zelos.defaultBlockStyles = {
-  "colour_blocks": {
-    "colourPrimary": "#CF63CF",
-    "colourSecondary": "#C94FC9",
-    "colourTertiary": "#BD42BD"
+  'colour_blocks': {
+    'colourPrimary': '#CF63CF',
+    'colourSecondary': '#C94FC9',
+    'colourTertiary': '#BD42BD'
   },
-  "list_blocks": {
-    "colourPrimary": "#9966FF",
-    "colourSecondary": "#855CD6",
-    "colourTertiary": "#774DCB"
+  'list_blocks': {
+    'colourPrimary': '#9966FF',
+    'colourSecondary': '#855CD6',
+    'colourTertiary': '#774DCB'
   },
-  "logic_blocks": {
-    "colourPrimary": "#4C97FF",
-    "colourSecondary": "#4280D7",
-    "colourTertiary": "#3373CC"
+  'logic_blocks': {
+    'colourPrimary': '#4C97FF',
+    'colourSecondary': '#4280D7',
+    'colourTertiary': '#3373CC'
   },
-  "loop_blocks": {
-    "colourPrimary": "#0fBD8C",
-    "colourSecondary": "#0DA57A",
-    "colourTertiary": "#0B8E69"
+  'loop_blocks': {
+    'colourPrimary': '#0fBD8C',
+    'colourSecondary': '#0DA57A',
+    'colourTertiary': '#0B8E69'
   },
-  "math_blocks": {
-    "colourPrimary": "#59C059",
-    "colourSecondary": "#46B946",
-    "colourTertiary": "#389438"
+  'math_blocks': {
+    'colourPrimary': '#59C059',
+    'colourSecondary': '#46B946',
+    'colourTertiary': '#389438'
   },
-  "procedure_blocks": {
-    "colourPrimary": "#FF6680",
-    "colourSecondary": "#FF4D6A",
-    "colourTertiary": "#FF3355"
+  'procedure_blocks': {
+    'colourPrimary': '#FF6680',
+    'colourSecondary': '#FF4D6A',
+    'colourTertiary': '#FF3355'
   },
-  "text_blocks": {
-    "colourPrimary": "#FFBF00",
-    "colourSecondary": "#E6AC00",
-    "colourTertiary": "#CC9900"
+  'text_blocks': {
+    'colourPrimary': '#FFBF00',
+    'colourSecondary': '#E6AC00',
+    'colourTertiary': '#CC9900'
   },
-  "variable_blocks": {
-    "colourPrimary": "#FF8C1A",
-    "colourSecondary": "#FF8000",
-    "colourTertiary": "#DB6E00"
+  'variable_blocks': {
+    'colourPrimary': '#FF8C1A',
+    'colourSecondary': '#FF8000',
+    'colourTertiary': '#DB6E00'
   },
-  "variable_dynamic_blocks": {
-    "colourPrimary": "#FF8C1A",
-    "colourSecondary": "#FF8000",
-    "colourTertiary": "#DB6E00"
+  'variable_dynamic_blocks': {
+    'colourPrimary': '#FF8C1A',
+    'colourSecondary': '#FF8000',
+    'colourTertiary': '#DB6E00'
   },
-  "hat_blocks": {
-    "colourPrimary": "#4C97FF",
-    "colourSecondary": "#4280D7",
-    "colourTertiary": "#3373CC",
-    "hat": "cap"
+  'hat_blocks': {
+    'colourPrimary': '#4C97FF',
+    'colourSecondary': '#4280D7',
+    'colourTertiary': '#3373CC',
+    'hat': 'cap'
   }
 };
 
 Zelos.categoryStyles = {
-  "colour_category": {
-    "colour": "#CF63CF"
-  },
-  "list_category": {
-    "colour": "#9966FF"
-  },
-  "logic_category": {
-    "colour": "#4C97FF"
-  },
-  "loop_category": {
-    "colour": "#0fBD8C"
-  },
-  "math_category": {
-    "colour": "#59C059"
-  },
-  "procedure_category": {
-    "colour": "#FF6680"
-  },
-  "text_category": {
-    "colour": "#FFBF00"
-  },
-  "variable_category": {
-    "colour": "#FF8C1A"
-  },
-  "variable_dynamic_category": {
-    "colour": "#FF8C1A"
-  }
+  'colour_category': {'colour': '#CF63CF'},
+  'list_category': {'colour': '#9966FF'},
+  'logic_category': {'colour': '#4C97FF'},
+  'loop_category': {'colour': '#0fBD8C'},
+  'math_category': {'colour': '#59C059'},
+  'procedure_category': {'colour': '#FF6680'},
+  'text_category': {'colour': '#FFBF00'},
+  'variable_category': {'colour': '#FF8C1A'},
+  'variable_dynamic_category': {'colour': '#FF8C1A'}
 };
 
-Zelos =
-    new Theme('zelos', Zelos.defaultBlockStyles,
-        Zelos.categoryStyles);
+Zelos = new Theme('zelos', Zelos.defaultBlockStyles, Zelos.categoryStyles);
 
 exports = Zelos;

From 3be64d78aabdd96e8fac284b61f9673f46f8c419 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 12:38:47 -0700
Subject: [PATCH 689/833] Migrate core/theme/classic.js to goog.module

---
 core/theme/classic.js | 17 ++++++++++-------
 tests/deps.js         |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/core/theme/classic.js b/core/theme/classic.js
index 5c128eb18..513c6c212 100644
--- a/core/theme/classic.js
+++ b/core/theme/classic.js
@@ -10,15 +10,16 @@
  */
 'use strict';
 
-goog.provide('Blockly.Themes.Classic');
+goog.module('Blockly.Themes.Classic');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Theme');
 
 
 // Temporary holding object.
-Blockly.Themes.Classic = {};
+let Classic = {};
 
-Blockly.Themes.Classic.defaultBlockStyles = {
+Classic.defaultBlockStyles = {
   "colour_blocks": {
     "colourPrimary": "20"
   },
@@ -52,7 +53,7 @@ Blockly.Themes.Classic.defaultBlockStyles = {
   }
 };
 
-Blockly.Themes.Classic.categoryStyles = {
+Classic.categoryStyles = {
   "colour_category": {
     "colour": "20"
   },
@@ -82,6 +83,8 @@ Blockly.Themes.Classic.categoryStyles = {
   }
 };
 
-Blockly.Themes.Classic =
-    new Blockly.Theme('classic', Blockly.Themes.Classic.defaultBlockStyles,
-        Blockly.Themes.Classic.categoryStyles);
+Classic =
+    new Blockly.Theme('classic', Classic.defaultBlockStyles,
+        Classic.categoryStyles);
+
+exports = Classic;
diff --git a/tests/deps.js b/tests/deps.js
index 8e1c3d6fb..a9808465d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -191,7 +191,7 @@ goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly', 'Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);
+goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly', 'Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});

From 9c533aa303d8cfbcea393fbc99ba9fdee41d9def Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 12:40:55 -0700
Subject: [PATCH 690/833] Migrate core/theme/classic.js named requires

---
 core/theme/classic.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/theme/classic.js b/core/theme/classic.js
index 513c6c212..29177fd25 100644
--- a/core/theme/classic.js
+++ b/core/theme/classic.js
@@ -13,7 +13,7 @@
 goog.module('Blockly.Themes.Classic');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Theme');
+const Theme = goog.require('Blockly.Theme');
 
 
 // Temporary holding object.
@@ -84,7 +84,7 @@ Classic.categoryStyles = {
 };
 
 Classic =
-    new Blockly.Theme('classic', Classic.defaultBlockStyles,
+    new Theme('classic', Classic.defaultBlockStyles,
         Classic.categoryStyles);
 
 exports = Classic;

From e7fe63a1965d074a22362efd1df747a23c7aea43 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 12:41:03 -0700
Subject: [PATCH 691/833] clang-format core/theme/classic.js

---
 core/theme/classic.js | 80 +++++++++++--------------------------------
 1 file changed, 20 insertions(+), 60 deletions(-)

diff --git a/core/theme/classic.js b/core/theme/classic.js
index 29177fd25..ab6d715f6 100644
--- a/core/theme/classic.js
+++ b/core/theme/classic.js
@@ -20,71 +20,31 @@ const Theme = goog.require('Blockly.Theme');
 let Classic = {};
 
 Classic.defaultBlockStyles = {
-  "colour_blocks": {
-    "colourPrimary": "20"
-  },
-  "list_blocks": {
-    "colourPrimary": "260"
-  },
-  "logic_blocks": {
-    "colourPrimary": "210"
-  },
-  "loop_blocks": {
-    "colourPrimary": "120"
-  },
-  "math_blocks": {
-    "colourPrimary": "230"
-  },
-  "procedure_blocks": {
-    "colourPrimary": "290"
-  },
-  "text_blocks": {
-    "colourPrimary": "160"
-  },
-  "variable_blocks": {
-    "colourPrimary": "330"
-  },
-  "variable_dynamic_blocks": {
-    "colourPrimary": "310"
-  },
-  "hat_blocks": {
-    "colourPrimary": "330",
-    "hat": "cap"
-  }
+  'colour_blocks': {'colourPrimary': '20'},
+  'list_blocks': {'colourPrimary': '260'},
+  'logic_blocks': {'colourPrimary': '210'},
+  'loop_blocks': {'colourPrimary': '120'},
+  'math_blocks': {'colourPrimary': '230'},
+  'procedure_blocks': {'colourPrimary': '290'},
+  'text_blocks': {'colourPrimary': '160'},
+  'variable_blocks': {'colourPrimary': '330'},
+  'variable_dynamic_blocks': {'colourPrimary': '310'},
+  'hat_blocks': {'colourPrimary': '330', 'hat': 'cap'}
 };
 
 Classic.categoryStyles = {
-  "colour_category": {
-    "colour": "20"
-  },
-  "list_category": {
-    "colour": "260"
-  },
-  "logic_category": {
-    "colour": "210"
-  },
-  "loop_category": {
-    "colour": "120"
-  },
-  "math_category": {
-    "colour": "230"
-  },
-  "procedure_category": {
-    "colour": "290"
-  },
-  "text_category": {
-    "colour": "160"
-  },
-  "variable_category": {
-    "colour": "330"
-  },
-  "variable_dynamic_category": {
-    "colour": "310"
-  }
+  'colour_category': {'colour': '20'},
+  'list_category': {'colour': '260'},
+  'logic_category': {'colour': '210'},
+  'loop_category': {'colour': '120'},
+  'math_category': {'colour': '230'},
+  'procedure_category': {'colour': '290'},
+  'text_category': {'colour': '160'},
+  'variable_category': {'colour': '330'},
+  'variable_dynamic_category': {'colour': '310'}
 };
 
 Classic =
-    new Theme('classic', Classic.defaultBlockStyles,
-        Classic.categoryStyles);
+    new Theme('classic', Classic.defaultBlockStyles, Classic.categoryStyles);
 
 exports = Classic;

From 2ea51db5491f7504f6959460a61f492560ff1fab Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 11:15:54 -0700
Subject: [PATCH 692/833] Migrate core/renderers/zelos/renderer.js to
 goog.module

---
 core/renderers/zelos/renderer.js | 34 +++++++++++++++++---------------
 tests/deps.js                    |  2 +-
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/core/renderers/zelos/renderer.js b/core/renderers/zelos/renderer.js
index 3c5287bbb..3ea048779 100644
--- a/core/renderers/zelos/renderer.js
+++ b/core/renderers/zelos/renderer.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.zelos.Renderer');
+goog.module('Blockly.zelos.Renderer');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering');
 goog.require('Blockly.blockRendering.Renderer');
@@ -23,10 +24,9 @@ goog.require('Blockly.zelos.MarkerSvg');
 goog.require('Blockly.zelos.PathObject');
 goog.require('Blockly.zelos.RenderInfo');
 
-goog.requireType('Blockly.blockRendering.MarkerSvg');
-goog.requireType('Blockly.blockRendering.RenderInfo');
 goog.requireType('Blockly.BlockSvg');
 goog.requireType('Blockly.Marker');
+goog.requireType('Blockly.blockRendering.RenderInfo');
 goog.requireType('Blockly.Theme');
 goog.requireType('Blockly.WorkspaceSvg');
 
@@ -38,10 +38,10 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @constructor
  * @extends {Blockly.blockRendering.Renderer}
  */
-Blockly.zelos.Renderer = function(name) {
-  Blockly.zelos.Renderer.superClass_.constructor.call(this, name);
+const Renderer = function(name) {
+  Renderer.superClass_.constructor.call(this, name);
 };
-Blockly.utils.object.inherits(Blockly.zelos.Renderer,
+Blockly.utils.object.inherits(Renderer,
     Blockly.blockRendering.Renderer);
 
 /**
@@ -50,7 +50,7 @@ Blockly.utils.object.inherits(Blockly.zelos.Renderer,
  * @protected
  * @override
  */
-Blockly.zelos.Renderer.prototype.makeConstants_ = function() {
+Renderer.prototype.makeConstants_ = function() {
   return new Blockly.zelos.ConstantProvider();
 };
 
@@ -61,7 +61,7 @@ Blockly.zelos.Renderer.prototype.makeConstants_ = function() {
  * @protected
  * @override
  */
-Blockly.zelos.Renderer.prototype.makeRenderInfo_ = function(block) {
+Renderer.prototype.makeRenderInfo_ = function(block) {
   return new Blockly.zelos.RenderInfo(this, block);
 };
 
@@ -74,7 +74,7 @@ Blockly.zelos.Renderer.prototype.makeRenderInfo_ = function(block) {
  * @protected
  * @override
  */
-Blockly.zelos.Renderer.prototype.makeDrawer_ = function(block, info) {
+Renderer.prototype.makeDrawer_ = function(block, info) {
   return new Blockly.zelos.Drawer(block,
       /** @type {!Blockly.zelos.RenderInfo} */ (info));
 };
@@ -83,12 +83,12 @@ Blockly.zelos.Renderer.prototype.makeDrawer_ = function(block, info) {
  * Create a new instance of the renderer's cursor drawer.
  * @param {!Blockly.WorkspaceSvg} workspace The workspace the cursor belongs to.
  * @param {!Blockly.Marker} marker The marker.
- * @return {!Blockly.blockRendering.MarkerSvg} The object in charge of drawing
+ * @return {!Blockly.zelos.MarkerSvg} The object in charge of drawing
  *     the marker.
  * @package
  * @override
  */
-Blockly.zelos.Renderer.prototype.makeMarkerDrawer = function(
+Renderer.prototype.makeMarkerDrawer = function(
     workspace, marker) {
   return new Blockly.zelos.MarkerSvg(workspace, this.getConstants(), marker);
 };
@@ -102,7 +102,7 @@ Blockly.zelos.Renderer.prototype.makeMarkerDrawer = function(
  * @package
  * @override
  */
-Blockly.zelos.Renderer.prototype.makePathObject = function(root, style) {
+Renderer.prototype.makePathObject = function(root, style) {
   return new Blockly.zelos.PathObject(root, style,
       /** @type {!Blockly.zelos.ConstantProvider} */ (this.getConstants()));
 };
@@ -110,7 +110,7 @@ Blockly.zelos.Renderer.prototype.makePathObject = function(root, style) {
 /**
  * @override
  */
-Blockly.zelos.Renderer.prototype.shouldHighlightConnection = function(conn) {
+Renderer.prototype.shouldHighlightConnection = function(conn) {
   return conn.type != Blockly.connectionTypes.INPUT_VALUE &&
       conn.type !== Blockly.connectionTypes.OUTPUT_VALUE;
 };
@@ -118,7 +118,7 @@ Blockly.zelos.Renderer.prototype.shouldHighlightConnection = function(conn) {
 /**
  * @override
  */
-Blockly.zelos.Renderer.prototype.getConnectionPreviewMethod = function(
+Renderer.prototype.getConnectionPreviewMethod = function(
     closest, local, topBlock) {
   if (local.type == Blockly.connectionTypes.OUTPUT_VALUE) {
     if (!closest.isConnected()) {
@@ -132,8 +132,10 @@ Blockly.zelos.Renderer.prototype.getConnectionPreviewMethod = function(
     return Blockly.InsertionMarkerManager.PREVIEW_TYPE.REPLACEMENT_FADE;
   }
 
-  return Blockly.zelos.Renderer.superClass_.getConnectionPreviewMethod(
+  return Renderer.superClass_.getConnectionPreviewMethod(
       closest, local, topBlock);
 };
 
-Blockly.blockRendering.register('zelos', Blockly.zelos.Renderer);
+Blockly.blockRendering.register('zelos', Renderer);
+
+exports = Renderer;
diff --git a/tests/deps.js b/tests/deps.js
index a9808465d..4265efa12 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -184,7 +184,7 @@ goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly
 goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/zelos/measurables/rows.js', ['Blockly.zelos.BottomRow', 'Blockly.zelos.TopRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.TopRow', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo']);
+goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});

From 9bfbd09a223af57e5b7b7010df9aa2661abd53d2 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 11:28:11 -0700
Subject: [PATCH 693/833] Migrate core/renderers/zelos/renderer.js named
 requires

---
 core/renderers/zelos/renderer.js | 90 +++++++++++++++++---------------
 1 file changed, 47 insertions(+), 43 deletions(-)

diff --git a/core/renderers/zelos/renderer.js b/core/renderers/zelos/renderer.js
index 3ea048779..61d727464 100644
--- a/core/renderers/zelos/renderer.js
+++ b/core/renderers/zelos/renderer.js
@@ -13,22 +13,26 @@
 goog.module('Blockly.zelos.Renderer');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering');
-goog.require('Blockly.blockRendering.Renderer');
-goog.require('Blockly.connectionTypes');
-goog.require('Blockly.InsertionMarkerManager');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.zelos.ConstantProvider');
-goog.require('Blockly.zelos.Drawer');
-goog.require('Blockly.zelos.MarkerSvg');
-goog.require('Blockly.zelos.PathObject');
-goog.require('Blockly.zelos.RenderInfo');
-
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.Marker');
-goog.requireType('Blockly.blockRendering.RenderInfo');
-goog.requireType('Blockly.Theme');
-goog.requireType('Blockly.WorkspaceSvg');
+const BaseRenderer = goog.require('Blockly.blockRendering.Renderer');
+/* eslint-disable-next-line no-unused-vars */
+const BaseRenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+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');
+/* eslint-disable-next-line no-unused-vars */
+const Theme = goog.requireType('Blockly.Theme');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const blockRendering = goog.require('Blockly.blockRendering');
+const connectionTypes = goog.require('Blockly.connectionTypes');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -36,83 +40,83 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @param {string} name The renderer name.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Renderer}
+ * @extends {BaseRenderer}
  */
 const Renderer = function(name) {
   Renderer.superClass_.constructor.call(this, name);
 };
-Blockly.utils.object.inherits(Renderer,
-    Blockly.blockRendering.Renderer);
+object.inherits(Renderer,
+    BaseRenderer);
 
 /**
  * Create a new instance of the renderer's constant provider.
- * @return {!Blockly.zelos.ConstantProvider} The constant provider.
+ * @return {!ConstantProvider} The constant provider.
  * @protected
  * @override
  */
 Renderer.prototype.makeConstants_ = function() {
-  return new Blockly.zelos.ConstantProvider();
+  return new ConstantProvider();
 };
 
 /**
  * Create a new instance of the renderer's render info object.
- * @param {!Blockly.BlockSvg} block The block to measure.
- * @return {!Blockly.zelos.RenderInfo} The render info object.
+ * @param {!BlockSvg} block The block to measure.
+ * @return {!RenderInfo} The render info object.
  * @protected
  * @override
  */
 Renderer.prototype.makeRenderInfo_ = function(block) {
-  return new Blockly.zelos.RenderInfo(this, block);
+  return new RenderInfo(this, block);
 };
 
 /**
  * Create a new instance of the renderer's drawer.
- * @param {!Blockly.BlockSvg} block The block to render.
- * @param {!Blockly.blockRendering.RenderInfo} info An object containing all
+ * @param {!BlockSvg} block The block to render.
+ * @param {!BaseRenderInfo} info An object containing all
  *   information needed to render this block.
- * @return {!Blockly.zelos.Drawer} The drawer.
+ * @return {!Drawer} The drawer.
  * @protected
  * @override
  */
 Renderer.prototype.makeDrawer_ = function(block, info) {
-  return new Blockly.zelos.Drawer(block,
-      /** @type {!Blockly.zelos.RenderInfo} */ (info));
+  return new Drawer(block,
+      /** @type {!RenderInfo} */ (info));
 };
 
 /**
  * Create a new instance of the renderer's cursor drawer.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace the cursor belongs to.
- * @param {!Blockly.Marker} marker The marker.
- * @return {!Blockly.zelos.MarkerSvg} The object in charge of drawing
+ * @param {!WorkspaceSvg} workspace The workspace the cursor belongs to.
+ * @param {!Marker} marker The marker.
+ * @return {!MarkerSvg} The object in charge of drawing
  *     the marker.
  * @package
  * @override
  */
 Renderer.prototype.makeMarkerDrawer = function(
     workspace, marker) {
-  return new Blockly.zelos.MarkerSvg(workspace, this.getConstants(), marker);
+  return new MarkerSvg(workspace, this.getConstants(), marker);
 };
 
 /**
  * Create a new instance of a renderer path object.
  * @param {!SVGElement} root The root SVG element.
- * @param {!Blockly.Theme.BlockStyle} style The style object to use for
+ * @param {!Theme.BlockStyle} style The style object to use for
  *     colouring.
- * @return {!Blockly.zelos.PathObject} The renderer path object.
+ * @return {!PathObject} The renderer path object.
  * @package
  * @override
  */
 Renderer.prototype.makePathObject = function(root, style) {
-  return new Blockly.zelos.PathObject(root, style,
-      /** @type {!Blockly.zelos.ConstantProvider} */ (this.getConstants()));
+  return new PathObject(root, style,
+      /** @type {!ConstantProvider} */ (this.getConstants()));
 };
 
 /**
  * @override
  */
 Renderer.prototype.shouldHighlightConnection = function(conn) {
-  return conn.type != Blockly.connectionTypes.INPUT_VALUE &&
-      conn.type !== Blockly.connectionTypes.OUTPUT_VALUE;
+  return conn.type != connectionTypes.INPUT_VALUE &&
+      conn.type !== connectionTypes.OUTPUT_VALUE;
 };
 
 /**
@@ -120,22 +124,22 @@ Renderer.prototype.shouldHighlightConnection = function(conn) {
  */
 Renderer.prototype.getConnectionPreviewMethod = function(
     closest, local, topBlock) {
-  if (local.type == Blockly.connectionTypes.OUTPUT_VALUE) {
+  if (local.type == connectionTypes.OUTPUT_VALUE) {
     if (!closest.isConnected()) {
-      return Blockly.InsertionMarkerManager.PREVIEW_TYPE.INPUT_OUTLINE;
+      return InsertionMarkerManager.PREVIEW_TYPE.INPUT_OUTLINE;
     }
     // TODO: Returning this is a total hack, because we don't want to show
     //   a replacement fade, we want to show an outline affect.
     //   Sadly zelos does not support showing an outline around filled
     //   inputs, so we have to pretend like the connected block is getting
     //   replaced.
-    return Blockly.InsertionMarkerManager.PREVIEW_TYPE.REPLACEMENT_FADE;
+    return InsertionMarkerManager.PREVIEW_TYPE.REPLACEMENT_FADE;
   }
 
   return Renderer.superClass_.getConnectionPreviewMethod(
       closest, local, topBlock);
 };
 
-Blockly.blockRendering.register('zelos', Renderer);
+blockRendering.register('zelos', Renderer);
 
 exports = Renderer;

From 72bbd3fa69e8fb462b2590cb95fe6dc661e4eb6a Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 11:34:33 -0700
Subject: [PATCH 694/833] clang-format core/renderers/zelos/renderer.js

---
 core/renderers/zelos/renderer.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/renderers/zelos/renderer.js b/core/renderers/zelos/renderer.js
index 61d727464..0eb0ef4ed 100644
--- a/core/renderers/zelos/renderer.js
+++ b/core/renderers/zelos/renderer.js
@@ -45,8 +45,7 @@ const object = goog.require('Blockly.utils.object');
 const Renderer = function(name) {
   Renderer.superClass_.constructor.call(this, name);
 };
-object.inherits(Renderer,
-    BaseRenderer);
+object.inherits(Renderer, BaseRenderer);
 
 /**
  * Create a new instance of the renderer's constant provider.
@@ -79,7 +78,8 @@ Renderer.prototype.makeRenderInfo_ = function(block) {
  * @override
  */
 Renderer.prototype.makeDrawer_ = function(block, info) {
-  return new Drawer(block,
+  return new Drawer(
+      block,
       /** @type {!RenderInfo} */ (info));
 };
 
@@ -92,8 +92,7 @@ Renderer.prototype.makeDrawer_ = function(block, info) {
  * @package
  * @override
  */
-Renderer.prototype.makeMarkerDrawer = function(
-    workspace, marker) {
+Renderer.prototype.makeMarkerDrawer = function(workspace, marker) {
   return new MarkerSvg(workspace, this.getConstants(), marker);
 };
 
@@ -107,7 +106,8 @@ Renderer.prototype.makeMarkerDrawer = function(
  * @override
  */
 Renderer.prototype.makePathObject = function(root, style) {
-  return new PathObject(root, style,
+  return new PathObject(
+      root, style,
       /** @type {!ConstantProvider} */ (this.getConstants()));
 };
 

From 7974e6325b5b8b5439321fd0295c9477183e21da Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 10:42:11 -0700
Subject: [PATCH 695/833] Split classes from core/metrics_manager.js into
 multiple files

---
 core/flyout_metrics_manager.js | 99 ++++++++++++++++++++++++++++++++++
 core/metrics_manager.js        | 88 +-----------------------------
 tests/deps.js                  |  3 +-
 3 files changed, 102 insertions(+), 88 deletions(-)
 create mode 100644 core/flyout_metrics_manager.js

diff --git a/core/flyout_metrics_manager.js b/core/flyout_metrics_manager.js
new file mode 100644
index 000000000..4e8dc8aed
--- /dev/null
+++ b/core/flyout_metrics_manager.js
@@ -0,0 +1,99 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Calculates and reports flyout workspace metrics.
+ * @author aschmiedt@google.com (Abby Schmiedt)
+ */
+'use strict';
+
+goog.provide('Blockly.FlyoutMetricsManager');
+
+goog.require('Blockly.MetricsManager');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.IFlyout');
+goog.requireType('Blockly.WorkspaceSvg');
+
+
+/**
+ * Calculates metrics for a flyout's workspace.
+ * The metrics are mainly used to size scrollbars for the flyout.
+ * @param {!Blockly.WorkspaceSvg} workspace The flyout's workspace.
+ * @param {!Blockly.IFlyout} flyout The flyout.
+ * @extends {Blockly.MetricsManager}
+ * @constructor
+ */
+Blockly.FlyoutMetricsManager = function(workspace, flyout) {
+  /**
+   * The flyout that owns the workspace to calculate metrics for.
+   * @type {!Blockly.IFlyout}
+   * @protected
+   */
+  this.flyout_ = flyout;
+
+  Blockly.FlyoutMetricsManager.superClass_.constructor.call(this, workspace);
+};
+Blockly.utils.object.inherits(
+    Blockly.FlyoutMetricsManager, Blockly.MetricsManager);
+
+/**
+ * Gets the bounding box of the blocks on the flyout's workspace.
+ * This is in workspace coordinates.
+ * @return {!SVGRect|{height: number, y: number, width: number, x: number}} The
+ *     bounding box of the blocks on the workspace.
+ * @private
+ */
+Blockly.FlyoutMetricsManager.prototype.getBoundingBox_ = function() {
+  try {
+    var blockBoundingBox = this.workspace_.getCanvas().getBBox();
+  } catch (e) {
+    // Firefox has trouble with hidden elements (Bug 528969).
+    // 2021 Update: It looks like this was fixed around Firefox 77 released in
+    // 2020.
+    var blockBoundingBox = {height: 0, y: 0, width: 0, x: 0};
+  }
+  return blockBoundingBox;
+};
+
+/**
+ * @override
+ */
+Blockly.FlyoutMetricsManager.prototype.getContentMetrics = function(
+    opt_getWorkspaceCoordinates) {
+  // The bounding box is in workspace coordinates.
+  var blockBoundingBox = this.getBoundingBox_();
+  var scale = opt_getWorkspaceCoordinates ? 1 : this.workspace_.scale;
+
+  return {
+    height: blockBoundingBox.height * scale,
+    width: blockBoundingBox.width * scale,
+    top: blockBoundingBox.y * scale,
+    left: blockBoundingBox.x * scale,
+  };
+};
+
+/**
+ * @override
+ */
+Blockly.FlyoutMetricsManager.prototype.getScrollMetrics = function(
+    opt_getWorkspaceCoordinates, opt_viewMetrics, opt_contentMetrics) {
+  var contentMetrics = opt_contentMetrics || this.getContentMetrics();
+  var margin = this.flyout_.MARGIN * this.workspace_.scale;
+  var scale = opt_getWorkspaceCoordinates ? this.workspace_.scale : 1;
+
+  // The left padding isn't just the margin. Some blocks are also offset by
+  // tabWidth so that value and statement blocks line up.
+  // The contentMetrics.left value is equivalent to the variable left padding.
+  var leftPadding = contentMetrics.left;
+
+  return {
+    height: (contentMetrics.height + 2 * margin) / scale,
+    width: (contentMetrics.width + leftPadding + margin) / scale,
+    top: 0,
+    left: 0,
+  };
+};
diff --git a/core/metrics_manager.js b/core/metrics_manager.js
index 1288588df..562a1b8b6 100644
--- a/core/metrics_manager.js
+++ b/core/metrics_manager.js
@@ -10,15 +10,14 @@
  */
 'use strict';
 
-goog.provide('Blockly.FlyoutMetricsManager');
 goog.provide('Blockly.MetricsManager');
 
-goog.requireType('Blockly.IMetricsManager');
 goog.require('Blockly.registry');
 goog.require('Blockly.utils.Size');
 goog.require('Blockly.utils.toolbox');
 
 goog.requireType('Blockly.IFlyout');
+goog.requireType('Blockly.IMetricsManager');
 goog.requireType('Blockly.IToolbox');
 goog.requireType('Blockly.utils.Metrics');
 goog.requireType('Blockly.WorkspaceSvg');
@@ -50,7 +49,6 @@ Blockly.MetricsManager = function(workspace) {
  *          }}
  */
 Blockly.MetricsManager.ToolboxMetrics;
-
 /**
  * Describes where the viewport starts in relation to the workspace SVG.
  * @typedef {{
@@ -59,8 +57,6 @@ Blockly.MetricsManager.ToolboxMetrics;
  *          }}
  */
 Blockly.MetricsManager.AbsoluteMetrics;
-
-
 /**
  * All the measurements needed to describe the size and location of a container.
  * @typedef {{
@@ -71,7 +67,6 @@ Blockly.MetricsManager.AbsoluteMetrics;
  *          }}
  */
 Blockly.MetricsManager.ContainerRegion;
-
 /**
  * Describes fixed edges of the workspace.
  * @typedef {{
@@ -82,7 +77,6 @@ Blockly.MetricsManager.ContainerRegion;
  *          }}
  */
 Blockly.MetricsManager.FixedEdges;
-
 /**
  * Common metrics used for UI elements.
  * @typedef {{
@@ -92,7 +86,6 @@ Blockly.MetricsManager.FixedEdges;
  *          }}
  */
 Blockly.MetricsManager.UiMetrics;
-
 /**
  * Gets the dimensions of the given workspace component, in pixel coordinates.
  * @param {?Blockly.IToolbox|?Blockly.IFlyout} elem The element to get the
@@ -477,82 +470,3 @@ Blockly.MetricsManager.prototype.getMetrics = function() {
 Blockly.registry.register(
     Blockly.registry.Type.METRICS_MANAGER, Blockly.registry.DEFAULT,
     Blockly.MetricsManager);
-
-/**
- * Calculates metrics for a flyout's workspace.
- * The metrics are mainly used to size scrollbars for the flyout.
- * @param {!Blockly.WorkspaceSvg} workspace The flyout's workspace.
- * @param {!Blockly.IFlyout} flyout The flyout.
- * @extends {Blockly.MetricsManager}
- * @constructor
- */
-Blockly.FlyoutMetricsManager = function(workspace, flyout) {
-  /**
-   * The flyout that owns the workspace to calculate metrics for.
-   * @type {!Blockly.IFlyout}
-   * @protected
-   */
-  this.flyout_ = flyout;
-
-  Blockly.FlyoutMetricsManager.superClass_.constructor.call(this, workspace);
-};
-Blockly.utils.object.inherits(
-    Blockly.FlyoutMetricsManager, Blockly.MetricsManager);
-
-/**
- * Gets the bounding box of the blocks on the flyout's workspace.
- * This is in workspace coordinates.
- * @return {!SVGRect|{height: number, y: number, width: number, x: number}} The
- *     bounding box of the blocks on the workspace.
- * @private
- */
-Blockly.FlyoutMetricsManager.prototype.getBoundingBox_ = function() {
-  try {
-    var blockBoundingBox = this.workspace_.getCanvas().getBBox();
-  } catch (e) {
-    // Firefox has trouble with hidden elements (Bug 528969).
-    // 2021 Update: It looks like this was fixed around Firefox 77 released in
-    // 2020.
-    var blockBoundingBox = {height: 0, y: 0, width: 0, x: 0};
-  }
-  return blockBoundingBox;
-};
-
-/**
- * @override
- */
-Blockly.FlyoutMetricsManager.prototype.getContentMetrics = function(
-    opt_getWorkspaceCoordinates) {
-  // The bounding box is in workspace coordinates.
-  var blockBoundingBox = this.getBoundingBox_();
-  var scale = opt_getWorkspaceCoordinates ? 1 : this.workspace_.scale;
-
-  return {
-    height: blockBoundingBox.height * scale,
-    width: blockBoundingBox.width * scale,
-    top: blockBoundingBox.y * scale,
-    left: blockBoundingBox.x * scale,
-  };
-};
-
-/**
- * @override
- */
-Blockly.FlyoutMetricsManager.prototype.getScrollMetrics = function(
-    opt_getWorkspaceCoordinates, opt_viewMetrics, opt_contentMetrics) {
-  var contentMetrics = opt_contentMetrics || this.getContentMetrics();
-  var margin = this.flyout_.MARGIN * this.workspace_.scale;
-  var scale = opt_getWorkspaceCoordinates ? this.workspace_.scale : 1;
-
-  // The left padding isn't just the margin. Some blocks are also offset by
-  // tabWidth so that value and statement blocks line up.
-  // The contentMetrics.left value is equivalent to the variable left padding.
-  var leftPadding = contentMetrics.left;
-
-  return {
-    height: (contentMetrics.height + 2 * margin) / scale,
-    width: (contentMetrics.width + leftPadding + margin) / scale,
-    top: 0,
-    left: 0,
-  };
-};
diff --git a/tests/deps.js b/tests/deps.js
index 4265efa12..f1caf890b 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -75,6 +75,7 @@ goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['
 goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es5'});
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.common', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
@@ -121,7 +122,7 @@ goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.T
 goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], [], {'lang': 'es6', 'module': 'goog'});
 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.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/metrics_manager.js', ['Blockly.FlyoutMetricsManager', 'Blockly.MetricsManager'], ['Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/metrics_manager.js', ['Blockly.MetricsManager'], ['Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global']);
 goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', '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', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});

From c449f516d75c57a691fecda231375991180c88c8 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 10:44:48 -0700
Subject: [PATCH 696/833] Migrate core/metrics_manager.js to ES6 const/let

---
 core/flyout_metrics_manager.js |  17 +++---
 core/metrics_manager.js        | 103 +++++++++++++++++----------------
 2 files changed, 61 insertions(+), 59 deletions(-)

diff --git a/core/flyout_metrics_manager.js b/core/flyout_metrics_manager.js
index 4e8dc8aed..55a634e97 100644
--- a/core/flyout_metrics_manager.js
+++ b/core/flyout_metrics_manager.js
@@ -48,13 +48,14 @@ Blockly.utils.object.inherits(
  * @private
  */
 Blockly.FlyoutMetricsManager.prototype.getBoundingBox_ = function() {
+  let blockBoundingBox;
   try {
-    var blockBoundingBox = this.workspace_.getCanvas().getBBox();
+    blockBoundingBox = this.workspace_.getCanvas().getBBox();
   } catch (e) {
     // Firefox has trouble with hidden elements (Bug 528969).
     // 2021 Update: It looks like this was fixed around Firefox 77 released in
     // 2020.
-    var blockBoundingBox = {height: 0, y: 0, width: 0, x: 0};
+    blockBoundingBox = {height: 0, y: 0, width: 0, x: 0};
   }
   return blockBoundingBox;
 };
@@ -65,8 +66,8 @@ Blockly.FlyoutMetricsManager.prototype.getBoundingBox_ = function() {
 Blockly.FlyoutMetricsManager.prototype.getContentMetrics = function(
     opt_getWorkspaceCoordinates) {
   // The bounding box is in workspace coordinates.
-  var blockBoundingBox = this.getBoundingBox_();
-  var scale = opt_getWorkspaceCoordinates ? 1 : this.workspace_.scale;
+  const blockBoundingBox = this.getBoundingBox_();
+  const scale = opt_getWorkspaceCoordinates ? 1 : this.workspace_.scale;
 
   return {
     height: blockBoundingBox.height * scale,
@@ -81,14 +82,14 @@ Blockly.FlyoutMetricsManager.prototype.getContentMetrics = function(
  */
 Blockly.FlyoutMetricsManager.prototype.getScrollMetrics = function(
     opt_getWorkspaceCoordinates, opt_viewMetrics, opt_contentMetrics) {
-  var contentMetrics = opt_contentMetrics || this.getContentMetrics();
-  var margin = this.flyout_.MARGIN * this.workspace_.scale;
-  var scale = opt_getWorkspaceCoordinates ? this.workspace_.scale : 1;
+  const contentMetrics = opt_contentMetrics || this.getContentMetrics();
+  const margin = this.flyout_.MARGIN * this.workspace_.scale;
+  const scale = opt_getWorkspaceCoordinates ? this.workspace_.scale : 1;
 
   // The left padding isn't just the margin. Some blocks are also offset by
   // tabWidth so that value and statement blocks line up.
   // The contentMetrics.left value is equivalent to the variable left padding.
-  var leftPadding = contentMetrics.left;
+  const leftPadding = contentMetrics.left;
 
   return {
     height: (contentMetrics.height + 2 * margin) / scale,
diff --git a/core/metrics_manager.js b/core/metrics_manager.js
index 562a1b8b6..cd2be38ec 100644
--- a/core/metrics_manager.js
+++ b/core/metrics_manager.js
@@ -96,8 +96,8 @@ Blockly.MetricsManager.UiMetrics;
  * @protected
  */
 Blockly.MetricsManager.prototype.getDimensionsPx_ = function(elem) {
-  var width = 0;
-  var height = 0;
+  let width = 0;
+  let height = 0;
   if (elem) {
     width = elem.getWidth();
     height = elem.getHeight();
@@ -115,7 +115,7 @@ Blockly.MetricsManager.prototype.getDimensionsPx_ = function(elem) {
  * @public
  */
 Blockly.MetricsManager.prototype.getFlyoutMetrics = function(opt_own) {
-  var flyoutDimensions =
+  const flyoutDimensions =
       this.getDimensionsPx_(this.workspace_.getFlyout(opt_own));
   return {
     width: flyoutDimensions.width,
@@ -134,7 +134,7 @@ Blockly.MetricsManager.prototype.getFlyoutMetrics = function(opt_own) {
  * @public
  */
 Blockly.MetricsManager.prototype.getToolboxMetrics = function() {
-  var toolboxDimensions = this.getDimensionsPx_(this.workspace_.getToolbox());
+  const toolboxDimensions = this.getDimensionsPx_(this.workspace_.getToolbox());
 
   return {
     width: toolboxDimensions.width,
@@ -162,22 +162,22 @@ Blockly.MetricsManager.prototype.getSvgMetrics = function() {
  * @public
  */
 Blockly.MetricsManager.prototype.getAbsoluteMetrics = function() {
-  var absoluteLeft = 0;
-  var toolboxMetrics = this.getToolboxMetrics();
-  var flyoutMetrics = this.getFlyoutMetrics(true);
-  var doesToolboxExist = !!this.workspace_.getToolbox();
-  var doesFlyoutExist = !!this.workspace_.getFlyout(true);
-  var toolboxPosition =
+  let absoluteLeft = 0;
+  const toolboxMetrics = this.getToolboxMetrics();
+  const flyoutMetrics = this.getFlyoutMetrics(true);
+  const doesToolboxExist = !!this.workspace_.getToolbox();
+  const doesFlyoutExist = !!this.workspace_.getFlyout(true);
+  const toolboxPosition =
       doesToolboxExist ? toolboxMetrics.position : flyoutMetrics.position;
 
-  var atLeft = toolboxPosition == Blockly.utils.toolbox.Position.LEFT;
-  var atTop = toolboxPosition == Blockly.utils.toolbox.Position.TOP;
+  const atLeft = toolboxPosition == Blockly.utils.toolbox.Position.LEFT;
+  const atTop = toolboxPosition == Blockly.utils.toolbox.Position.TOP;
   if (doesToolboxExist && atLeft) {
     absoluteLeft = toolboxMetrics.width;
   } else if (doesFlyoutExist && atLeft) {
     absoluteLeft = flyoutMetrics.width;
   }
-  var absoluteTop = 0;
+  let absoluteTop = 0;
   if (doesToolboxExist && atTop) {
     absoluteTop = toolboxMetrics.height;
   } else if (doesFlyoutExist && atTop) {
@@ -202,12 +202,12 @@ Blockly.MetricsManager.prototype.getAbsoluteMetrics = function() {
  */
 Blockly.MetricsManager.prototype.getViewMetrics = function(
     opt_getWorkspaceCoordinates) {
-  var scale = opt_getWorkspaceCoordinates ? this.workspace_.scale : 1;
-  var svgMetrics = this.getSvgMetrics();
-  var toolboxMetrics = this.getToolboxMetrics();
-  var flyoutMetrics = this.getFlyoutMetrics(true);
-  var doesToolboxExist = !!this.workspace_.getToolbox();
-  var toolboxPosition =
+  const scale = opt_getWorkspaceCoordinates ? this.workspace_.scale : 1;
+  const svgMetrics = this.getSvgMetrics();
+  const toolboxMetrics = this.getToolboxMetrics();
+  const flyoutMetrics = this.getFlyoutMetrics(true);
+  const doesToolboxExist = !!this.workspace_.getToolbox();
+  const toolboxPosition =
       doesToolboxExist ? toolboxMetrics.position : flyoutMetrics.position;
 
   if (this.workspace_.getToolbox()) {
@@ -247,10 +247,10 @@ Blockly.MetricsManager.prototype.getViewMetrics = function(
  */
 Blockly.MetricsManager.prototype.getContentMetrics = function(
     opt_getWorkspaceCoordinates) {
-  var scale = opt_getWorkspaceCoordinates ? 1 : this.workspace_.scale;
+  const scale = opt_getWorkspaceCoordinates ? 1 : this.workspace_.scale;
 
   // Block bounding box is in workspace coordinates.
-  var blockBox = this.workspace_.getBlocksBoundingBox();
+  const blockBox = this.workspace_.getBlocksBoundingBox();
 
   return {
     height: (blockBox.bottom - blockBox.top) * scale,
@@ -287,12 +287,12 @@ Blockly.MetricsManager.prototype.getComputedFixedEdges_ = function(
     return {};
   }
 
-  var hScrollEnabled = this.workspace_.isMovableHorizontally();
-  var vScrollEnabled = this.workspace_.isMovableVertically();
+  const hScrollEnabled = this.workspace_.isMovableHorizontally();
+  const vScrollEnabled = this.workspace_.isMovableVertically();
 
-  var viewMetrics = opt_viewMetrics || this.getViewMetrics(false);
+  const viewMetrics = opt_viewMetrics || this.getViewMetrics(false);
 
-  var edges = {};
+  const edges = {};
   if (!vScrollEnabled) {
     edges.top = viewMetrics.top;
     edges.bottom = viewMetrics.top + viewMetrics.height;
@@ -316,23 +316,23 @@ Blockly.MetricsManager.prototype.getComputedFixedEdges_ = function(
  */
 Blockly.MetricsManager.prototype.getPaddedContent_ = function(
     viewMetrics, contentMetrics) {
-  var contentBottom = contentMetrics.top + contentMetrics.height;
-  var contentRight = contentMetrics.left + contentMetrics.width;
+  const contentBottom = contentMetrics.top + contentMetrics.height;
+  const contentRight = contentMetrics.left + contentMetrics.width;
 
-  var viewWidth = viewMetrics.width;
-  var viewHeight = viewMetrics.height;
-  var halfWidth = viewWidth / 2;
-  var halfHeight = viewHeight / 2;
+  const viewWidth = viewMetrics.width;
+  const viewHeight = viewMetrics.height;
+  const halfWidth = viewWidth / 2;
+  const halfHeight = viewHeight / 2;
 
   // Add a padding around the content that is at least half a screen wide.
   // Ensure padding is wide enough that blocks can scroll over entire screen.
-  var top =
+  const top =
       Math.min(contentMetrics.top - halfHeight, contentBottom - viewHeight);
-  var left =
+  const left =
       Math.min(contentMetrics.left - halfWidth, contentRight - viewWidth);
-  var bottom =
+  const bottom =
       Math.max(contentBottom + halfHeight, contentMetrics.top + viewHeight);
-  var right =
+  const right =
       Math.max(contentRight + halfWidth, contentMetrics.left + viewWidth);
 
   return {top: top, bottom: bottom, left: left, right: right};
@@ -353,22 +353,22 @@ Blockly.MetricsManager.prototype.getPaddedContent_ = function(
  */
 Blockly.MetricsManager.prototype.getScrollMetrics = function(
     opt_getWorkspaceCoordinates, opt_viewMetrics, opt_contentMetrics) {
-  var scale = opt_getWorkspaceCoordinates ? this.workspace_.scale : 1;
-  var viewMetrics = opt_viewMetrics || this.getViewMetrics(false);
-  var contentMetrics = opt_contentMetrics || this.getContentMetrics();
-  var fixedEdges = this.getComputedFixedEdges_(viewMetrics);
+  const scale = opt_getWorkspaceCoordinates ? this.workspace_.scale : 1;
+  const viewMetrics = opt_viewMetrics || this.getViewMetrics(false);
+  const contentMetrics = opt_contentMetrics || this.getContentMetrics();
+  const fixedEdges = this.getComputedFixedEdges_(viewMetrics);
 
   // Add padding around content.
-  var paddedContent = this.getPaddedContent_(viewMetrics, contentMetrics);
+  const paddedContent = this.getPaddedContent_(viewMetrics, contentMetrics);
 
   // Use combination of fixed bounds and padded content to make scroll area.
-  var top = fixedEdges.top !== undefined ?
+  const top = fixedEdges.top !== undefined ?
       fixedEdges.top : paddedContent.top;
-  var left = fixedEdges.left !== undefined ?
+  const left = fixedEdges.left !== undefined ?
       fixedEdges.left : paddedContent.left;
-  var bottom = fixedEdges.bottom !== undefined ?
+  const bottom = fixedEdges.bottom !== undefined ?
       fixedEdges.bottom : paddedContent.bottom;
-  var right = fixedEdges.right !== undefined ?
+  const right = fixedEdges.right !== undefined ?
       fixedEdges.right : paddedContent.right;
 
   return {
@@ -428,13 +428,14 @@ Blockly.MetricsManager.prototype.getUiMetrics = function() {
  * @public
  */
 Blockly.MetricsManager.prototype.getMetrics = function() {
-  var toolboxMetrics = this.getToolboxMetrics();
-  var flyoutMetrics = this.getFlyoutMetrics(true);
-  var svgMetrics = this.getSvgMetrics();
-  var absoluteMetrics = this.getAbsoluteMetrics();
-  var viewMetrics = this.getViewMetrics();
-  var contentMetrics = this.getContentMetrics();
-  var scrollMetrics = this.getScrollMetrics(false, viewMetrics, contentMetrics);
+  const toolboxMetrics = this.getToolboxMetrics();
+  const flyoutMetrics = this.getFlyoutMetrics(true);
+  const svgMetrics = this.getSvgMetrics();
+  const absoluteMetrics = this.getAbsoluteMetrics();
+  const viewMetrics = this.getViewMetrics();
+  const contentMetrics = this.getContentMetrics();
+  const scrollMetrics = this.getScrollMetrics(false, viewMetrics,
+      contentMetrics);
 
   return {
     contentHeight: contentMetrics.height,

From 30fe1aacecfebc467c380b3b55378820e0634f9a Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 10:48:32 -0700
Subject: [PATCH 697/833] Migrate core/metrics_manager.js to goog.module

---
 core/flyout_metrics_manager.js | 17 +++++---
 core/metrics_manager.js        | 80 +++++++++++++++++-----------------
 tests/deps.js                  |  4 +-
 3 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/core/flyout_metrics_manager.js b/core/flyout_metrics_manager.js
index 55a634e97..1dc655c9d 100644
--- a/core/flyout_metrics_manager.js
+++ b/core/flyout_metrics_manager.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.FlyoutMetricsManager');
+goog.module('Blockly.FlyoutMetricsManager');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.MetricsManager');
 goog.require('Blockly.utils.object');
@@ -27,7 +28,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @extends {Blockly.MetricsManager}
  * @constructor
  */
-Blockly.FlyoutMetricsManager = function(workspace, flyout) {
+const FlyoutMetricsManager = function(workspace, flyout) {
   /**
    * The flyout that owns the workspace to calculate metrics for.
    * @type {!Blockly.IFlyout}
@@ -35,10 +36,10 @@ Blockly.FlyoutMetricsManager = function(workspace, flyout) {
    */
   this.flyout_ = flyout;
 
-  Blockly.FlyoutMetricsManager.superClass_.constructor.call(this, workspace);
+  FlyoutMetricsManager.superClass_.constructor.call(this, workspace);
 };
 Blockly.utils.object.inherits(
-    Blockly.FlyoutMetricsManager, Blockly.MetricsManager);
+    FlyoutMetricsManager, Blockly.MetricsManager);
 
 /**
  * Gets the bounding box of the blocks on the flyout's workspace.
@@ -47,7 +48,7 @@ Blockly.utils.object.inherits(
  *     bounding box of the blocks on the workspace.
  * @private
  */
-Blockly.FlyoutMetricsManager.prototype.getBoundingBox_ = function() {
+FlyoutMetricsManager.prototype.getBoundingBox_ = function() {
   let blockBoundingBox;
   try {
     blockBoundingBox = this.workspace_.getCanvas().getBBox();
@@ -63,7 +64,7 @@ Blockly.FlyoutMetricsManager.prototype.getBoundingBox_ = function() {
 /**
  * @override
  */
-Blockly.FlyoutMetricsManager.prototype.getContentMetrics = function(
+FlyoutMetricsManager.prototype.getContentMetrics = function(
     opt_getWorkspaceCoordinates) {
   // The bounding box is in workspace coordinates.
   const blockBoundingBox = this.getBoundingBox_();
@@ -80,7 +81,7 @@ Blockly.FlyoutMetricsManager.prototype.getContentMetrics = function(
 /**
  * @override
  */
-Blockly.FlyoutMetricsManager.prototype.getScrollMetrics = function(
+FlyoutMetricsManager.prototype.getScrollMetrics = function(
     opt_getWorkspaceCoordinates, opt_viewMetrics, opt_contentMetrics) {
   const contentMetrics = opt_contentMetrics || this.getContentMetrics();
   const margin = this.flyout_.MARGIN * this.workspace_.scale;
@@ -98,3 +99,5 @@ Blockly.FlyoutMetricsManager.prototype.getScrollMetrics = function(
     left: 0,
   };
 };
+
+exports = FlyoutMetricsManager;
diff --git a/core/metrics_manager.js b/core/metrics_manager.js
index cd2be38ec..25bcf3cd5 100644
--- a/core/metrics_manager.js
+++ b/core/metrics_manager.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.MetricsManager');
+goog.module('Blockly.MetricsManager');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.registry');
 goog.require('Blockly.utils.Size');
@@ -30,7 +31,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @implements {Blockly.IMetricsManager}
  * @constructor
  */
-Blockly.MetricsManager = function(workspace) {
+const MetricsManager = function(workspace) {
   /**
    * The workspace to calculate metrics for.
    * @type {!Blockly.WorkspaceSvg}
@@ -48,7 +49,7 @@ Blockly.MetricsManager = function(workspace) {
  *            position: !Blockly.utils.toolbox.Position
  *          }}
  */
-Blockly.MetricsManager.ToolboxMetrics;
+MetricsManager.ToolboxMetrics;
 /**
  * Describes where the viewport starts in relation to the workspace SVG.
  * @typedef {{
@@ -56,7 +57,7 @@ Blockly.MetricsManager.ToolboxMetrics;
  *            top: number
  *          }}
  */
-Blockly.MetricsManager.AbsoluteMetrics;
+MetricsManager.AbsoluteMetrics;
 /**
  * All the measurements needed to describe the size and location of a container.
  * @typedef {{
@@ -66,7 +67,7 @@ Blockly.MetricsManager.AbsoluteMetrics;
  *            left: number
  *          }}
  */
-Blockly.MetricsManager.ContainerRegion;
+MetricsManager.ContainerRegion;
 /**
  * Describes fixed edges of the workspace.
  * @typedef {{
@@ -76,16 +77,16 @@ Blockly.MetricsManager.ContainerRegion;
  *            right: (number|undefined)
  *          }}
  */
-Blockly.MetricsManager.FixedEdges;
+MetricsManager.FixedEdges;
 /**
  * Common metrics used for UI elements.
  * @typedef {{
- *            viewMetrics: !Blockly.MetricsManager.ContainerRegion,
- *            absoluteMetrics: !Blockly.MetricsManager.AbsoluteMetrics,
- *            toolboxMetrics: !Blockly.MetricsManager.ToolboxMetrics
+ *            viewMetrics: !MetricsManager.ContainerRegion,
+ *            absoluteMetrics: !MetricsManager.AbsoluteMetrics,
+ *            toolboxMetrics: !MetricsManager.ToolboxMetrics
  *          }}
  */
-Blockly.MetricsManager.UiMetrics;
+MetricsManager.UiMetrics;
 /**
  * Gets the dimensions of the given workspace component, in pixel coordinates.
  * @param {?Blockly.IToolbox|?Blockly.IFlyout} elem The element to get the
@@ -95,7 +96,7 @@ Blockly.MetricsManager.UiMetrics;
  *     attributes, which will both be zero if elem did not exist.
  * @protected
  */
-Blockly.MetricsManager.prototype.getDimensionsPx_ = function(elem) {
+MetricsManager.prototype.getDimensionsPx_ = function(elem) {
   let width = 0;
   let height = 0;
   if (elem) {
@@ -110,11 +111,11 @@ Blockly.MetricsManager.prototype.getDimensionsPx_ = function(elem) {
  * coordinates. Returns 0 for the width and height if the workspace has a
  * category toolbox instead of a simple toolbox.
  * @param {boolean=} opt_own Whether to only return the workspace's own flyout.
- * @return {!Blockly.MetricsManager.ToolboxMetrics} The width and height of the
+ * @return {!MetricsManager.ToolboxMetrics} The width and height of the
  *     flyout.
  * @public
  */
-Blockly.MetricsManager.prototype.getFlyoutMetrics = function(opt_own) {
+MetricsManager.prototype.getFlyoutMetrics = function(opt_own) {
   const flyoutDimensions =
       this.getDimensionsPx_(this.workspace_.getFlyout(opt_own));
   return {
@@ -129,11 +130,11 @@ Blockly.MetricsManager.prototype.getFlyoutMetrics = function(opt_own) {
  * coordinates. Returns 0 for the width and height if the workspace has a simple
  * toolbox instead of a category toolbox. To get the width and height of a
  * simple toolbox @see {@link getFlyoutMetrics}.
- * @return {!Blockly.MetricsManager.ToolboxMetrics} The object with the width,
+ * @return {!MetricsManager.ToolboxMetrics} The object with the width,
  *     height and position of the toolbox.
  * @public
  */
-Blockly.MetricsManager.prototype.getToolboxMetrics = function() {
+MetricsManager.prototype.getToolboxMetrics = function() {
   const toolboxDimensions = this.getDimensionsPx_(this.workspace_.getToolbox());
 
   return {
@@ -150,18 +151,18 @@ Blockly.MetricsManager.prototype.getToolboxMetrics = function() {
  *     SVG element.
  * @public
  */
-Blockly.MetricsManager.prototype.getSvgMetrics = function() {
+MetricsManager.prototype.getSvgMetrics = function() {
   return this.workspace_.getCachedParentSvgSize();
 };
 
 /**
  * Gets the absolute left and absolute top in pixel coordinates.
  * This is where the visible workspace starts in relation to the SVG container.
- * @return {!Blockly.MetricsManager.AbsoluteMetrics} The absolute metrics for
+ * @return {!MetricsManager.AbsoluteMetrics} The absolute metrics for
  *     the workspace.
  * @public
  */
-Blockly.MetricsManager.prototype.getAbsoluteMetrics = function() {
+MetricsManager.prototype.getAbsoluteMetrics = function() {
   let absoluteLeft = 0;
   const toolboxMetrics = this.getToolboxMetrics();
   const flyoutMetrics = this.getFlyoutMetrics(true);
@@ -195,12 +196,12 @@ Blockly.MetricsManager.prototype.getAbsoluteMetrics = function() {
  * coordinates. The visible workspace does not include the toolbox or flyout.
  * @param {boolean=} opt_getWorkspaceCoordinates True to get the view metrics in
  *     workspace coordinates, false to get them in pixel coordinates.
- * @return {!Blockly.MetricsManager.ContainerRegion} The width, height, top and
+ * @return {!MetricsManager.ContainerRegion} The width, height, top and
  *     left of the viewport in either workspace coordinates or pixel
  *     coordinates.
  * @public
  */
-Blockly.MetricsManager.prototype.getViewMetrics = function(
+MetricsManager.prototype.getViewMetrics = function(
     opt_getWorkspaceCoordinates) {
   const scale = opt_getWorkspaceCoordinates ? this.workspace_.scale : 1;
   const svgMetrics = this.getSvgMetrics();
@@ -241,11 +242,11 @@ Blockly.MetricsManager.prototype.getViewMetrics = function(
  * workspace (workspace comments and blocks).
  * @param {boolean=} opt_getWorkspaceCoordinates True to get the content metrics
  *     in workspace coordinates, false to get them in pixel coordinates.
- * @return {!Blockly.MetricsManager.ContainerRegion} The
+ * @return {!MetricsManager.ContainerRegion} The
  *     metrics for the content container.
  * @public
  */
-Blockly.MetricsManager.prototype.getContentMetrics = function(
+MetricsManager.prototype.getContentMetrics = function(
     opt_getWorkspaceCoordinates) {
   const scale = opt_getWorkspaceCoordinates ? 1 : this.workspace_.scale;
 
@@ -265,7 +266,7 @@ Blockly.MetricsManager.prototype.getContentMetrics = function(
  * @return {boolean} Whether the scroll area has fixed edges.
  * @package
  */
-Blockly.MetricsManager.prototype.hasFixedEdges = function() {
+MetricsManager.prototype.hasFixedEdges = function() {
   // This exists for optimization of bump logic.
   return !this.workspace_.isMovableHorizontally() ||
       !this.workspace_.isMovableVertically();
@@ -273,14 +274,14 @@ Blockly.MetricsManager.prototype.hasFixedEdges = function() {
 
 /**
  * Computes the fixed edges of the scroll area.
- * @param {!Blockly.MetricsManager.ContainerRegion=} opt_viewMetrics The view
+ * @param {!MetricsManager.ContainerRegion=} opt_viewMetrics The view
  *     metrics if they have been previously computed. Passing in null may cause
  *     the view metrics to be computed again, if it is needed.
- * @return {!Blockly.MetricsManager.FixedEdges} The fixed edges of the scroll
+ * @return {!MetricsManager.FixedEdges} The fixed edges of the scroll
  *     area.
  * @protected
  */
-Blockly.MetricsManager.prototype.getComputedFixedEdges_ = function(
+MetricsManager.prototype.getComputedFixedEdges_ = function(
     opt_viewMetrics) {
   if (!this.hasFixedEdges()) {
     // Return early if there are no edges.
@@ -306,15 +307,15 @@ Blockly.MetricsManager.prototype.getComputedFixedEdges_ = function(
 
 /**
  * Returns the content area with added padding.
- * @param {!Blockly.MetricsManager.ContainerRegion} viewMetrics The view
+ * @param {!MetricsManager.ContainerRegion} viewMetrics The view
  *     metrics.
- * @param {!Blockly.MetricsManager.ContainerRegion} contentMetrics The content
+ * @param {!MetricsManager.ContainerRegion} contentMetrics The content
  *     metrics.
  * @return {{top: number, bottom: number, left: number, right: number}} The
  *     padded content area.
  * @protected
  */
-Blockly.MetricsManager.prototype.getPaddedContent_ = function(
+MetricsManager.prototype.getPaddedContent_ = function(
     viewMetrics, contentMetrics) {
   const contentBottom = contentMetrics.top + contentMetrics.height;
   const contentRight = contentMetrics.left + contentMetrics.width;
@@ -342,16 +343,16 @@ Blockly.MetricsManager.prototype.getPaddedContent_ = function(
  * Returns the metrics for the scroll area of the workspace.
  * @param {boolean=} opt_getWorkspaceCoordinates True to get the scroll metrics
  *     in workspace coordinates, false to get them in pixel coordinates.
- * @param {!Blockly.MetricsManager.ContainerRegion=} opt_viewMetrics The view
+ * @param {!MetricsManager.ContainerRegion=} opt_viewMetrics The view
  *     metrics if they have been previously computed. Passing in null may cause
  *     the view metrics to be computed again, if it is needed.
- * @param {!Blockly.MetricsManager.ContainerRegion=} opt_contentMetrics The
+ * @param {!MetricsManager.ContainerRegion=} opt_contentMetrics The
  *     content metrics if they have been previously computed. Passing in null
  *     may cause the content metrics to be computed again, if it is needed.
- * @return {!Blockly.MetricsManager.ContainerRegion} The metrics for the scroll
+ * @return {!MetricsManager.ContainerRegion} The metrics for the scroll
  *    container.
  */
-Blockly.MetricsManager.prototype.getScrollMetrics = function(
+MetricsManager.prototype.getScrollMetrics = function(
     opt_getWorkspaceCoordinates, opt_viewMetrics, opt_contentMetrics) {
   const scale = opt_getWorkspaceCoordinates ? this.workspace_.scale : 1;
   const viewMetrics = opt_viewMetrics || this.getViewMetrics(false);
@@ -381,9 +382,9 @@ Blockly.MetricsManager.prototype.getScrollMetrics = function(
 
 /**
  * Returns common metrics used by UI elements.
- * @return {!Blockly.MetricsManager.UiMetrics} The UI metrics.
+ * @return {!MetricsManager.UiMetrics} The UI metrics.
  */
-Blockly.MetricsManager.prototype.getUiMetrics = function() {
+MetricsManager.prototype.getUiMetrics = function() {
   return {
     viewMetrics: this.getViewMetrics(),
     absoluteMetrics: this.getAbsoluteMetrics(),
@@ -427,15 +428,14 @@ Blockly.MetricsManager.prototype.getUiMetrics = function() {
  *     level workspace.
  * @public
  */
-Blockly.MetricsManager.prototype.getMetrics = function() {
+MetricsManager.prototype.getMetrics = function() {
   const toolboxMetrics = this.getToolboxMetrics();
   const flyoutMetrics = this.getFlyoutMetrics(true);
   const svgMetrics = this.getSvgMetrics();
   const absoluteMetrics = this.getAbsoluteMetrics();
   const viewMetrics = this.getViewMetrics();
   const contentMetrics = this.getContentMetrics();
-  const scrollMetrics = this.getScrollMetrics(false, viewMetrics,
-      contentMetrics);
+  const scrollMetrics = this.getScrollMetrics(false, viewMetrics, contentMetrics);
 
   return {
     contentHeight: contentMetrics.height,
@@ -470,4 +470,6 @@ Blockly.MetricsManager.prototype.getMetrics = function() {
 
 Blockly.registry.register(
     Blockly.registry.Type.METRICS_MANAGER, Blockly.registry.DEFAULT,
-    Blockly.MetricsManager);
+    MetricsManager);
+
+exports = MetricsManager;
diff --git a/tests/deps.js b/tests/deps.js
index f1caf890b..7a2466581 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -75,7 +75,7 @@ goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['
 goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es5'});
+goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.common', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
@@ -122,7 +122,7 @@ goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.T
 goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], [], {'lang': 'es6', 'module': 'goog'});
 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.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/metrics_manager.js', ['Blockly.MetricsManager'], ['Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/metrics_manager.js', ['Blockly.MetricsManager'], ['Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global']);
 goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', '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', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});

From 5b0160db70231ca7a2e1280d3b45354933544704 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 10:54:21 -0700
Subject: [PATCH 698/833] Migrate core/metrics_manager.js named requires

---
 core/flyout_metrics_manager.js | 23 ++++++------
 core/metrics_manager.js        | 64 ++++++++++++++++++----------------
 2 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/core/flyout_metrics_manager.js b/core/flyout_metrics_manager.js
index 1dc655c9d..23a04a2be 100644
--- a/core/flyout_metrics_manager.js
+++ b/core/flyout_metrics_manager.js
@@ -13,33 +13,34 @@
 goog.module('Blockly.FlyoutMetricsManager');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.MetricsManager');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.IFlyout');
-goog.requireType('Blockly.WorkspaceSvg');
+/* 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');
 
 
 /**
  * Calculates metrics for a flyout's workspace.
  * The metrics are mainly used to size scrollbars for the flyout.
- * @param {!Blockly.WorkspaceSvg} workspace The flyout's workspace.
- * @param {!Blockly.IFlyout} flyout The flyout.
- * @extends {Blockly.MetricsManager}
+ * @param {!WorkspaceSvg} workspace The flyout's workspace.
+ * @param {!IFlyout} flyout The flyout.
+ * @extends {MetricsManager}
  * @constructor
  */
 const FlyoutMetricsManager = function(workspace, flyout) {
   /**
    * The flyout that owns the workspace to calculate metrics for.
-   * @type {!Blockly.IFlyout}
+   * @type {!IFlyout}
    * @protected
    */
   this.flyout_ = flyout;
 
   FlyoutMetricsManager.superClass_.constructor.call(this, workspace);
 };
-Blockly.utils.object.inherits(
-    FlyoutMetricsManager, Blockly.MetricsManager);
+object.inherits(
+    FlyoutMetricsManager, MetricsManager);
 
 /**
  * Gets the bounding box of the blocks on the flyout's workspace.
diff --git a/core/metrics_manager.js b/core/metrics_manager.js
index 25bcf3cd5..ed36bdb09 100644
--- a/core/metrics_manager.js
+++ b/core/metrics_manager.js
@@ -13,28 +13,32 @@
 goog.module('Blockly.MetricsManager');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.Size');
-goog.require('Blockly.utils.toolbox');
-
-goog.requireType('Blockly.IFlyout');
-goog.requireType('Blockly.IMetricsManager');
-goog.requireType('Blockly.IToolbox');
-goog.requireType('Blockly.utils.Metrics');
-goog.requireType('Blockly.WorkspaceSvg');
+/* eslint-disable-next-line no-unused-vars */
+const IFlyout = goog.requireType('Blockly.IFlyout');
+/* eslint-disable-next-line no-unused-vars */
+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 Metrics = goog.requireType('Blockly.utils.Metrics');
+const Size = goog.require('Blockly.utils.Size');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const registry = goog.require('Blockly.registry');
+const toolbox = goog.require('Blockly.utils.toolbox');
 
 
 /**
  * The manager for all workspace metrics calculations.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace to calculate metrics
+ * @param {!WorkspaceSvg} workspace The workspace to calculate metrics
  *     for.
- * @implements {Blockly.IMetricsManager}
+ * @implements {IMetricsManager}
  * @constructor
  */
 const MetricsManager = function(workspace) {
   /**
    * The workspace to calculate metrics for.
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @protected
    */
   this.workspace_ = workspace;
@@ -46,7 +50,7 @@ const MetricsManager = function(workspace) {
  * @typedef {{
  *            width: number,
  *            height: number,
- *            position: !Blockly.utils.toolbox.Position
+ *            position: !toolbox.Position
  *          }}
  */
 MetricsManager.ToolboxMetrics;
@@ -89,10 +93,10 @@ MetricsManager.FixedEdges;
 MetricsManager.UiMetrics;
 /**
  * Gets the dimensions of the given workspace component, in pixel coordinates.
- * @param {?Blockly.IToolbox|?Blockly.IFlyout} elem The element to get the
+ * @param {?IToolbox|?IFlyout} elem The element to get the
  *     dimensions of, or null.  It should be a toolbox or flyout, and should
  *     implement getWidth() and getHeight().
- * @return {!Blockly.utils.Size} An object containing width and height
+ * @return {!Size} An object containing width and height
  *     attributes, which will both be zero if elem did not exist.
  * @protected
  */
@@ -103,7 +107,7 @@ MetricsManager.prototype.getDimensionsPx_ = function(elem) {
     width = elem.getWidth();
     height = elem.getHeight();
   }
-  return new Blockly.utils.Size(width, height);
+  return new Size(width, height);
 };
 
 /**
@@ -147,7 +151,7 @@ MetricsManager.prototype.getToolboxMetrics = function() {
 /**
  * Gets the width and height of the workspace's parent SVG element in pixel
  * coordinates. This area includes the toolbox and the visible workspace area.
- * @return {!Blockly.utils.Size} The width and height of the workspace's parent
+ * @return {!Size} The width and height of the workspace's parent
  *     SVG element.
  * @public
  */
@@ -171,8 +175,8 @@ MetricsManager.prototype.getAbsoluteMetrics = function() {
   const toolboxPosition =
       doesToolboxExist ? toolboxMetrics.position : flyoutMetrics.position;
 
-  const atLeft = toolboxPosition == Blockly.utils.toolbox.Position.LEFT;
-  const atTop = toolboxPosition == Blockly.utils.toolbox.Position.TOP;
+  const atLeft = toolboxPosition == toolbox.Position.LEFT;
+  const atTop = toolboxPosition == toolbox.Position.TOP;
   if (doesToolboxExist && atLeft) {
     absoluteLeft = toolboxMetrics.width;
   } else if (doesFlyoutExist && atLeft) {
@@ -212,19 +216,19 @@ MetricsManager.prototype.getViewMetrics = function(
       doesToolboxExist ? toolboxMetrics.position : flyoutMetrics.position;
 
   if (this.workspace_.getToolbox()) {
-    if (toolboxPosition == Blockly.utils.toolbox.Position.TOP ||
-        toolboxPosition == Blockly.utils.toolbox.Position.BOTTOM) {
+    if (toolboxPosition == toolbox.Position.TOP ||
+        toolboxPosition == toolbox.Position.BOTTOM) {
       svgMetrics.height -= toolboxMetrics.height;
-    } else if (toolboxPosition == Blockly.utils.toolbox.Position.LEFT ||
-        toolboxPosition == Blockly.utils.toolbox.Position.RIGHT) {
+    } else if (toolboxPosition == toolbox.Position.LEFT ||
+        toolboxPosition == toolbox.Position.RIGHT) {
       svgMetrics.width -= toolboxMetrics.width;
     }
   } else if (this.workspace_.getFlyout(true)) {
-    if (toolboxPosition == Blockly.utils.toolbox.Position.TOP ||
-        toolboxPosition == Blockly.utils.toolbox.Position.BOTTOM) {
+    if (toolboxPosition == toolbox.Position.TOP ||
+        toolboxPosition == toolbox.Position.BOTTOM) {
       svgMetrics.height -= flyoutMetrics.height;
-    } else if (toolboxPosition == Blockly.utils.toolbox.Position.LEFT ||
-        toolboxPosition == Blockly.utils.toolbox.Position.RIGHT) {
+    } else if (toolboxPosition == toolbox.Position.LEFT ||
+        toolboxPosition == toolbox.Position.RIGHT) {
       svgMetrics.width -= flyoutMetrics.width;
     }
   }
@@ -424,7 +428,7 @@ MetricsManager.prototype.getUiMetrics = function() {
  * .flyoutHeight: Height of the flyout if it is always open.  Otherwise zero.
  * .toolboxPosition: Top, bottom, left or right. Use TOOLBOX_AT constants to
  *     compare.
- * @return {!Blockly.utils.Metrics} Contains size and position metrics of a top
+ * @return {!Metrics} Contains size and position metrics of a top
  *     level workspace.
  * @public
  */
@@ -468,8 +472,8 @@ MetricsManager.prototype.getMetrics = function() {
   };
 };
 
-Blockly.registry.register(
-    Blockly.registry.Type.METRICS_MANAGER, Blockly.registry.DEFAULT,
+registry.register(
+    registry.Type.METRICS_MANAGER, registry.DEFAULT,
     MetricsManager);
 
 exports = MetricsManager;

From e340b0002738f6dd6f5ccc833423d849c4ec6f4d Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 10:55:03 -0700
Subject: [PATCH 699/833] clang-format core/metrics_manager.js

---
 core/flyout_metrics_manager.js |  3 +--
 core/metrics_manager.js        | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/core/flyout_metrics_manager.js b/core/flyout_metrics_manager.js
index 23a04a2be..b3ed243d6 100644
--- a/core/flyout_metrics_manager.js
+++ b/core/flyout_metrics_manager.js
@@ -39,8 +39,7 @@ const FlyoutMetricsManager = function(workspace, flyout) {
 
   FlyoutMetricsManager.superClass_.constructor.call(this, workspace);
 };
-object.inherits(
-    FlyoutMetricsManager, MetricsManager);
+object.inherits(FlyoutMetricsManager, MetricsManager);
 
 /**
  * Gets the bounding box of the blocks on the flyout's workspace.
diff --git a/core/metrics_manager.js b/core/metrics_manager.js
index ed36bdb09..ea90030e8 100644
--- a/core/metrics_manager.js
+++ b/core/metrics_manager.js
@@ -219,7 +219,8 @@ MetricsManager.prototype.getViewMetrics = function(
     if (toolboxPosition == toolbox.Position.TOP ||
         toolboxPosition == toolbox.Position.BOTTOM) {
       svgMetrics.height -= toolboxMetrics.height;
-    } else if (toolboxPosition == toolbox.Position.LEFT ||
+    } else if (
+        toolboxPosition == toolbox.Position.LEFT ||
         toolboxPosition == toolbox.Position.RIGHT) {
       svgMetrics.width -= toolboxMetrics.width;
     }
@@ -227,7 +228,8 @@ MetricsManager.prototype.getViewMetrics = function(
     if (toolboxPosition == toolbox.Position.TOP ||
         toolboxPosition == toolbox.Position.BOTTOM) {
       svgMetrics.height -= flyoutMetrics.height;
-    } else if (toolboxPosition == toolbox.Position.LEFT ||
+    } else if (
+        toolboxPosition == toolbox.Position.LEFT ||
         toolboxPosition == toolbox.Position.RIGHT) {
       svgMetrics.width -= flyoutMetrics.width;
     }
@@ -285,8 +287,7 @@ MetricsManager.prototype.hasFixedEdges = function() {
  *     area.
  * @protected
  */
-MetricsManager.prototype.getComputedFixedEdges_ = function(
-    opt_viewMetrics) {
+MetricsManager.prototype.getComputedFixedEdges_ = function(opt_viewMetrics) {
   if (!this.hasFixedEdges()) {
     // Return early if there are no edges.
     return {};
@@ -367,14 +368,13 @@ MetricsManager.prototype.getScrollMetrics = function(
   const paddedContent = this.getPaddedContent_(viewMetrics, contentMetrics);
 
   // Use combination of fixed bounds and padded content to make scroll area.
-  const top = fixedEdges.top !== undefined ?
-      fixedEdges.top : paddedContent.top;
-  const left = fixedEdges.left !== undefined ?
-      fixedEdges.left : paddedContent.left;
-  const bottom = fixedEdges.bottom !== undefined ?
-      fixedEdges.bottom : paddedContent.bottom;
-  const right = fixedEdges.right !== undefined ?
-      fixedEdges.right : paddedContent.right;
+  const top = fixedEdges.top !== undefined ? fixedEdges.top : paddedContent.top;
+  const left =
+      fixedEdges.left !== undefined ? fixedEdges.left : paddedContent.left;
+  const bottom = fixedEdges.bottom !== undefined ? fixedEdges.bottom :
+                                                   paddedContent.bottom;
+  const right =
+      fixedEdges.right !== undefined ? fixedEdges.right : paddedContent.right;
 
   return {
     top: top / scale,
@@ -439,7 +439,8 @@ MetricsManager.prototype.getMetrics = function() {
   const absoluteMetrics = this.getAbsoluteMetrics();
   const viewMetrics = this.getViewMetrics();
   const contentMetrics = this.getContentMetrics();
-  const scrollMetrics = this.getScrollMetrics(false, viewMetrics, contentMetrics);
+  const scrollMetrics =
+      this.getScrollMetrics(false, viewMetrics, contentMetrics);
 
   return {
     contentHeight: contentMetrics.height,
@@ -473,7 +474,6 @@ MetricsManager.prototype.getMetrics = function() {
 };
 
 registry.register(
-    registry.Type.METRICS_MANAGER, registry.DEFAULT,
-    MetricsManager);
+    registry.Type.METRICS_MANAGER, registry.DEFAULT, MetricsManager);
 
 exports = MetricsManager;

From e5359e4bf5cc16d98c2d52ed85d117e294667fdc Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 18 Aug 2021 09:49:33 -0700
Subject: [PATCH 700/833] Update named require in core/metrics_manager.js

---
 core/metrics_manager.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/metrics_manager.js b/core/metrics_manager.js
index ea90030e8..04643d74a 100644
--- a/core/metrics_manager.js
+++ b/core/metrics_manager.js
@@ -25,7 +25,7 @@ const Size = goog.require('Blockly.utils.Size');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const registry = goog.require('Blockly.registry');
-const toolbox = goog.require('Blockly.utils.toolbox');
+const toolboxUtils = goog.require('Blockly.utils.toolbox');
 
 
 /**
@@ -50,7 +50,7 @@ const MetricsManager = function(workspace) {
  * @typedef {{
  *            width: number,
  *            height: number,
- *            position: !toolbox.Position
+ *            position: !toolboxUtils.Position
  *          }}
  */
 MetricsManager.ToolboxMetrics;
@@ -175,8 +175,8 @@ MetricsManager.prototype.getAbsoluteMetrics = function() {
   const toolboxPosition =
       doesToolboxExist ? toolboxMetrics.position : flyoutMetrics.position;
 
-  const atLeft = toolboxPosition == toolbox.Position.LEFT;
-  const atTop = toolboxPosition == toolbox.Position.TOP;
+  const atLeft = toolboxPosition == toolboxUtils.Position.LEFT;
+  const atTop = toolboxPosition == toolboxUtils.Position.TOP;
   if (doesToolboxExist && atLeft) {
     absoluteLeft = toolboxMetrics.width;
   } else if (doesFlyoutExist && atLeft) {
@@ -216,21 +216,21 @@ MetricsManager.prototype.getViewMetrics = function(
       doesToolboxExist ? toolboxMetrics.position : flyoutMetrics.position;
 
   if (this.workspace_.getToolbox()) {
-    if (toolboxPosition == toolbox.Position.TOP ||
-        toolboxPosition == toolbox.Position.BOTTOM) {
+    if (toolboxPosition == toolboxUtils.Position.TOP ||
+        toolboxPosition == toolboxUtils.Position.BOTTOM) {
       svgMetrics.height -= toolboxMetrics.height;
     } else if (
-        toolboxPosition == toolbox.Position.LEFT ||
-        toolboxPosition == toolbox.Position.RIGHT) {
+        toolboxPosition == toolboxUtils.Position.LEFT ||
+        toolboxPosition == toolboxUtils.Position.RIGHT) {
       svgMetrics.width -= toolboxMetrics.width;
     }
   } else if (this.workspace_.getFlyout(true)) {
-    if (toolboxPosition == toolbox.Position.TOP ||
-        toolboxPosition == toolbox.Position.BOTTOM) {
+    if (toolboxPosition == toolboxUtils.Position.TOP ||
+        toolboxPosition == toolboxUtils.Position.BOTTOM) {
       svgMetrics.height -= flyoutMetrics.height;
     } else if (
-        toolboxPosition == toolbox.Position.LEFT ||
-        toolboxPosition == toolbox.Position.RIGHT) {
+        toolboxPosition == toolboxUtils.Position.LEFT ||
+        toolboxPosition == toolboxUtils.Position.RIGHT) {
       svgMetrics.width -= flyoutMetrics.width;
     }
   }

From d37df416e1f07cbf69187311735bbc82623cb46b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 11:50:32 -0700
Subject: [PATCH 701/833] Migrate
 core/renderers/zelos/measurables/row_elements.js to goog.module

---
 core/renderers/zelos/measurables/row_elements.js | 11 +++++++----
 tests/deps.js                                    |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/renderers/zelos/measurables/row_elements.js b/core/renderers/zelos/measurables/row_elements.js
index ee3bf1a2a..038e36745 100644
--- a/core/renderers/zelos/measurables/row_elements.js
+++ b/core/renderers/zelos/measurables/row_elements.js
@@ -10,7 +10,8 @@
  * @author samelh@google.com (Sam El-Husseini)
  */
 
-goog.provide('Blockly.zelos.RightConnectionShape');
+goog.module('Blockly.zelos.RightConnectionShape');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.Measurable');
 goog.require('Blockly.blockRendering.Types');
@@ -28,12 +29,14 @@ goog.requireType('Blockly.blockRendering.ConstantProvider');
  * @constructor
  * @extends {Blockly.blockRendering.Measurable}
  */
-Blockly.zelos.RightConnectionShape = function(constants) {
-  Blockly.zelos.RightConnectionShape.superClass_.constructor.call(this, constants);
+const RightConnectionShape = function(constants) {
+  RightConnectionShape.superClass_.constructor.call(this, constants);
   this.type |= Blockly.blockRendering.Types.getType('RIGHT_CONNECTION');
   // Size is dynamic
   this.height = 0;
   this.width = 0;
 };
-Blockly.utils.object.inherits(Blockly.zelos.RightConnectionShape,
+Blockly.utils.object.inherits(RightConnectionShape,
     Blockly.blockRendering.Measurable);
+
+exports = RightConnectionShape;
diff --git a/tests/deps.js b/tests/deps.js
index 7a2466581..d59ccc233 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -182,7 +182,7 @@ goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawe
 goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/measurables/rows.js', ['Blockly.zelos.BottomRow', 'Blockly.zelos.TopRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.TopRow', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});

From b69800623b0262dc8c480ae09a69dcb98c76bf1f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 11:51:33 -0700
Subject: [PATCH 702/833] Migrate
 core/renderers/zelos/measurables/row_elements.js named requires

---
 .../zelos/measurables/row_elements.js         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/renderers/zelos/measurables/row_elements.js b/core/renderers/zelos/measurables/row_elements.js
index 038e36745..b4f602197 100644
--- a/core/renderers/zelos/measurables/row_elements.js
+++ b/core/renderers/zelos/measurables/row_elements.js
@@ -13,30 +13,30 @@
 goog.module('Blockly.zelos.RightConnectionShape');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.Measurable');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const Measurable = goog.require('Blockly.blockRendering.Measurable');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object containing information about the space a right connection shape
  * takes up during rendering.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Measurable}
+ * @extends {Measurable}
  */
 const RightConnectionShape = function(constants) {
   RightConnectionShape.superClass_.constructor.call(this, constants);
-  this.type |= Blockly.blockRendering.Types.getType('RIGHT_CONNECTION');
+  this.type |= Types.getType('RIGHT_CONNECTION');
   // Size is dynamic
   this.height = 0;
   this.width = 0;
 };
-Blockly.utils.object.inherits(RightConnectionShape,
-    Blockly.blockRendering.Measurable);
+object.inherits(RightConnectionShape,
+    Measurable);
 
 exports = RightConnectionShape;

From bcfca5c198993916b0423b0b11c2829777363e1d Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 11:51:37 -0700
Subject: [PATCH 703/833] clang-format
 core/renderers/zelos/measurables/row_elements.js

---
 core/renderers/zelos/measurables/row_elements.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/renderers/zelos/measurables/row_elements.js b/core/renderers/zelos/measurables/row_elements.js
index b4f602197..85e59e6ad 100644
--- a/core/renderers/zelos/measurables/row_elements.js
+++ b/core/renderers/zelos/measurables/row_elements.js
@@ -36,7 +36,6 @@ const RightConnectionShape = function(constants) {
   this.height = 0;
   this.width = 0;
 };
-object.inherits(RightConnectionShape,
-    Measurable);
+object.inherits(RightConnectionShape, Measurable);
 
 exports = RightConnectionShape;

From 3e1099e2b843888b5ac366b3ac2fdd440906da07 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 09:24:37 -0700
Subject: [PATCH 704/833] Split classes from
 core/renderers/zelos/measurables/rows.js into multiple files

---
 .../renderers/zelos/measurables/bottom_row.js | 60 +++++++++++++++++++
 .../zelos/measurables/{rows.js => top_row.js} | 46 +-------------
 tests/deps.js                                 |  3 +-
 3 files changed, 63 insertions(+), 46 deletions(-)
 create mode 100644 core/renderers/zelos/measurables/bottom_row.js
 rename core/renderers/zelos/measurables/{rows.js => top_row.js} (56%)

diff --git a/core/renderers/zelos/measurables/bottom_row.js b/core/renderers/zelos/measurables/bottom_row.js
new file mode 100644
index 000000000..16aa4c86e
--- /dev/null
+++ b/core/renderers/zelos/measurables/bottom_row.js
@@ -0,0 +1,60 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview An object representing the bottom row of a rendered block.
+ * @author samelh@google.com (Sam El-Husseini)
+ */
+'use strict';
+
+goog.provide('Blockly.zelos.BottomRow');
+
+goog.require('Blockly.blockRendering.BottomRow');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+
+
+/**
+ * An object containing information about what elements are in the bottom row of
+ * a block as well as spacing information for the top row.
+ * Elements in a bottom row can consist of corners, spacers and next
+ * connections.
+ * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ *   constants provider.
+ * @package
+ * @constructor
+ * @extends {Blockly.blockRendering.BottomRow}
+ */
+Blockly.zelos.BottomRow = function(constants) {
+  Blockly.zelos.BottomRow.superClass_.constructor.call(this, constants);
+};
+Blockly.utils.object.inherits(Blockly.zelos.BottomRow,
+    Blockly.blockRendering.BottomRow);
+
+/**
+ * @override
+ */
+Blockly.zelos.BottomRow.prototype.endsWithElemSpacer = function() {
+  return false;
+};
+
+/**
+ * Render a round corner unless the block has an output connection.
+ * @override
+ */
+Blockly.zelos.BottomRow.prototype.hasLeftSquareCorner = function(block) {
+  return !!block.outputConnection;
+};
+
+/**
+ * Render a round corner unless the block has an output connection.
+ * @override
+ */
+Blockly.zelos.BottomRow.prototype.hasRightSquareCorner = function(block) {
+  return !!block.outputConnection && !block.statementInputCount &&
+    !block.nextConnection;
+};
diff --git a/core/renderers/zelos/measurables/rows.js b/core/renderers/zelos/measurables/top_row.js
similarity index 56%
rename from core/renderers/zelos/measurables/rows.js
rename to core/renderers/zelos/measurables/top_row.js
index 305d11087..a1817801a 100644
--- a/core/renderers/zelos/measurables/rows.js
+++ b/core/renderers/zelos/measurables/top_row.js
@@ -5,16 +5,13 @@
  */
 
 /**
- * @fileoverview An object representing a single row on a rendered block and all
- * of its subcomponents.
+ * @fileoverview An object representing the top row of a rendered block.
  * @author samelh@google.com (Sam El-Husseini)
  */
 'use strict';
 
-goog.provide('Blockly.zelos.BottomRow');
 goog.provide('Blockly.zelos.TopRow');
 
-goog.require('Blockly.blockRendering.BottomRow');
 goog.require('Blockly.blockRendering.TopRow');
 goog.require('Blockly.utils.object');
 
@@ -66,44 +63,3 @@ Blockly.zelos.TopRow.prototype.hasRightSquareCorner = function(block) {
   return !!block.outputConnection && !block.statementInputCount &&
     !block.nextConnection;
 };
-
-/**
- * An object containing information about what elements are in the bottom row of
- * a block as well as spacing information for the top row.
- * Elements in a bottom row can consist of corners, spacers and next
- * connections.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.BottomRow}
- */
-Blockly.zelos.BottomRow = function(constants) {
-  Blockly.zelos.BottomRow.superClass_.constructor.call(this, constants);
-};
-Blockly.utils.object.inherits(Blockly.zelos.BottomRow,
-    Blockly.blockRendering.BottomRow);
-
-/**
- * @override
- */
-Blockly.zelos.BottomRow.prototype.endsWithElemSpacer = function() {
-  return false;
-};
-
-/**
- * Render a round corner unless the block has an output connection.
- * @override
- */
-Blockly.zelos.BottomRow.prototype.hasLeftSquareCorner = function(block) {
-  return !!block.outputConnection;
-};
-
-/**
- * Render a round corner unless the block has an output connection.
- * @override
- */
-Blockly.zelos.BottomRow.prototype.hasRightSquareCorner = function(block) {
-  return !!block.outputConnection && !block.statementInputCount &&
-    !block.nextConnection;
-};
diff --git a/tests/deps.js b/tests/deps.js
index d59ccc233..940499b52 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -181,9 +181,10 @@ goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.Co
 goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/measurables/bottom_row.js', ['Blockly.zelos.BottomRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/measurables/rows.js', ['Blockly.zelos.BottomRow', 'Blockly.zelos.TopRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.TopRow', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);

From ede4d3630b6f65a927e888a1f57acf52896cea19 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 09:28:15 -0700
Subject: [PATCH 705/833] Migrate core/renderers/zelos/measurables/rows.js to
 ES6 const/let

---
 core/renderers/zelos/measurables/top_row.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/renderers/zelos/measurables/top_row.js b/core/renderers/zelos/measurables/top_row.js
index a1817801a..3f4dbafa8 100644
--- a/core/renderers/zelos/measurables/top_row.js
+++ b/core/renderers/zelos/measurables/top_row.js
@@ -49,7 +49,7 @@ Blockly.zelos.TopRow.prototype.endsWithElemSpacer = function() {
  * @override
  */
 Blockly.zelos.TopRow.prototype.hasLeftSquareCorner = function(block) {
-  var hasHat = (block.hat ?
+  const hasHat = (block.hat ?
       block.hat === 'cap' : this.constants_.ADD_START_HATS) &&
       !block.outputConnection && !block.previousConnection;
   return !!block.outputConnection || hasHat;

From c85714b1c695ef923b2a7c67c7b7455272eb454f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 09:29:51 -0700
Subject: [PATCH 706/833] Migrate core/renderers/zelos/measurables/rows.js to
 goog.module

---
 core/renderers/zelos/measurables/bottom_row.js | 17 ++++++++++-------
 core/renderers/zelos/measurables/top_row.js    | 17 ++++++++++-------
 tests/deps.js                                  |  4 ++--
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/core/renderers/zelos/measurables/bottom_row.js b/core/renderers/zelos/measurables/bottom_row.js
index 16aa4c86e..eb854466a 100644
--- a/core/renderers/zelos/measurables/bottom_row.js
+++ b/core/renderers/zelos/measurables/bottom_row.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.zelos.BottomRow');
+goog.module('Blockly.zelos.BottomRow');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.BottomRow');
 goog.require('Blockly.utils.object');
@@ -29,16 +30,16 @@ goog.requireType('Blockly.blockRendering.ConstantProvider');
  * @constructor
  * @extends {Blockly.blockRendering.BottomRow}
  */
-Blockly.zelos.BottomRow = function(constants) {
-  Blockly.zelos.BottomRow.superClass_.constructor.call(this, constants);
+const BottomRow = function(constants) {
+  BottomRow.superClass_.constructor.call(this, constants);
 };
-Blockly.utils.object.inherits(Blockly.zelos.BottomRow,
+Blockly.utils.object.inherits(BottomRow,
     Blockly.blockRendering.BottomRow);
 
 /**
  * @override
  */
-Blockly.zelos.BottomRow.prototype.endsWithElemSpacer = function() {
+BottomRow.prototype.endsWithElemSpacer = function() {
   return false;
 };
 
@@ -46,7 +47,7 @@ Blockly.zelos.BottomRow.prototype.endsWithElemSpacer = function() {
  * Render a round corner unless the block has an output connection.
  * @override
  */
-Blockly.zelos.BottomRow.prototype.hasLeftSquareCorner = function(block) {
+BottomRow.prototype.hasLeftSquareCorner = function(block) {
   return !!block.outputConnection;
 };
 
@@ -54,7 +55,9 @@ Blockly.zelos.BottomRow.prototype.hasLeftSquareCorner = function(block) {
  * Render a round corner unless the block has an output connection.
  * @override
  */
-Blockly.zelos.BottomRow.prototype.hasRightSquareCorner = function(block) {
+BottomRow.prototype.hasRightSquareCorner = function(block) {
   return !!block.outputConnection && !block.statementInputCount &&
     !block.nextConnection;
 };
+
+exports = BottomRow;
diff --git a/core/renderers/zelos/measurables/top_row.js b/core/renderers/zelos/measurables/top_row.js
index 3f4dbafa8..176b637e1 100644
--- a/core/renderers/zelos/measurables/top_row.js
+++ b/core/renderers/zelos/measurables/top_row.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.zelos.TopRow');
+goog.module('Blockly.zelos.TopRow');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.TopRow');
 goog.require('Blockly.utils.object');
@@ -31,16 +32,16 @@ goog.requireType('Blockly.blockRendering.ConstantProvider');
  * @constructor
  * @extends {Blockly.blockRendering.TopRow}
  */
-Blockly.zelos.TopRow = function(constants) {
-  Blockly.zelos.TopRow.superClass_.constructor.call(this, constants);
+const TopRow = function(constants) {
+  TopRow.superClass_.constructor.call(this, constants);
 };
-Blockly.utils.object.inherits(Blockly.zelos.TopRow,
+Blockly.utils.object.inherits(TopRow,
     Blockly.blockRendering.TopRow);
 
 /**
  * @override
  */
-Blockly.zelos.TopRow.prototype.endsWithElemSpacer = function() {
+TopRow.prototype.endsWithElemSpacer = function() {
   return false;
 };
 
@@ -48,7 +49,7 @@ Blockly.zelos.TopRow.prototype.endsWithElemSpacer = function() {
  * Render a round corner unless the block has an output connection.
  * @override
  */
-Blockly.zelos.TopRow.prototype.hasLeftSquareCorner = function(block) {
+TopRow.prototype.hasLeftSquareCorner = function(block) {
   const hasHat = (block.hat ?
       block.hat === 'cap' : this.constants_.ADD_START_HATS) &&
       !block.outputConnection && !block.previousConnection;
@@ -59,7 +60,9 @@ Blockly.zelos.TopRow.prototype.hasLeftSquareCorner = function(block) {
  * Render a round corner unless the block has an output connection.
  * @override
  */
-Blockly.zelos.TopRow.prototype.hasRightSquareCorner = function(block) {
+TopRow.prototype.hasRightSquareCorner = function(block) {
   return !!block.outputConnection && !block.statementInputCount &&
     !block.nextConnection;
 };
+
+exports = TopRow;
diff --git a/tests/deps.js b/tests/deps.js
index 940499b52..fbf988c97 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -181,10 +181,10 @@ goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.Co
 goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/measurables/bottom_row.js', ['Blockly.zelos.BottomRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/zelos/measurables/bottom_row.js', ['Blockly.zelos.BottomRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);

From 297f2a0b60d20fe686b23fd2572e90979307233f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 09:32:25 -0700
Subject: [PATCH 707/833] Migrate core/renderers/zelos/measurables/rows.js
 named requires

---
 core/renderers/zelos/measurables/bottom_row.js | 16 ++++++++--------
 core/renderers/zelos/measurables/top_row.js    | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/core/renderers/zelos/measurables/bottom_row.js b/core/renderers/zelos/measurables/bottom_row.js
index eb854466a..d3ba8a3b2 100644
--- a/core/renderers/zelos/measurables/bottom_row.js
+++ b/core/renderers/zelos/measurables/bottom_row.js
@@ -13,10 +13,10 @@
 goog.module('Blockly.zelos.BottomRow');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.BottomRow');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
+const BaseBottomRow = goog.require('Blockly.blockRendering.BottomRow');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -24,17 +24,17 @@ goog.requireType('Blockly.blockRendering.ConstantProvider');
  * a block as well as spacing information for the top row.
  * Elements in a bottom row can consist of corners, spacers and next
  * connections.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.BottomRow}
+ * @extends {BaseBottomRow}
  */
 const BottomRow = function(constants) {
   BottomRow.superClass_.constructor.call(this, constants);
 };
-Blockly.utils.object.inherits(BottomRow,
-    Blockly.blockRendering.BottomRow);
+object.inherits(BottomRow,
+    BaseBottomRow);
 
 /**
  * @override
diff --git a/core/renderers/zelos/measurables/top_row.js b/core/renderers/zelos/measurables/top_row.js
index 176b637e1..76777263c 100644
--- a/core/renderers/zelos/measurables/top_row.js
+++ b/core/renderers/zelos/measurables/top_row.js
@@ -13,10 +13,10 @@
 goog.module('Blockly.zelos.TopRow');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.TopRow');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
+const BaseTopRow = goog.require('Blockly.blockRendering.TopRow');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -26,17 +26,17 @@ goog.requireType('Blockly.blockRendering.ConstantProvider');
  * connections.
  * After this constructor is called, the row will contain all non-spacer
  * elements it needs.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.TopRow}
+ * @extends {BaseTopRow}
  */
 const TopRow = function(constants) {
   TopRow.superClass_.constructor.call(this, constants);
 };
-Blockly.utils.object.inherits(TopRow,
-    Blockly.blockRendering.TopRow);
+object.inherits(TopRow,
+    BaseTopRow);
 
 /**
  * @override

From 26802bcb7fb5b3a000a15861067807c416a51577 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 09:39:25 -0700
Subject: [PATCH 708/833] clang-format core/renderers/zelos/measurables/rows.js

---
 core/renderers/zelos/measurables/bottom_row.js | 5 ++---
 core/renderers/zelos/measurables/top_row.js    | 9 ++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/core/renderers/zelos/measurables/bottom_row.js b/core/renderers/zelos/measurables/bottom_row.js
index d3ba8a3b2..cf7b580cb 100644
--- a/core/renderers/zelos/measurables/bottom_row.js
+++ b/core/renderers/zelos/measurables/bottom_row.js
@@ -33,8 +33,7 @@ const object = goog.require('Blockly.utils.object');
 const BottomRow = function(constants) {
   BottomRow.superClass_.constructor.call(this, constants);
 };
-object.inherits(BottomRow,
-    BaseBottomRow);
+object.inherits(BottomRow, BaseBottomRow);
 
 /**
  * @override
@@ -57,7 +56,7 @@ BottomRow.prototype.hasLeftSquareCorner = function(block) {
  */
 BottomRow.prototype.hasRightSquareCorner = function(block) {
   return !!block.outputConnection && !block.statementInputCount &&
-    !block.nextConnection;
+      !block.nextConnection;
 };
 
 exports = BottomRow;
diff --git a/core/renderers/zelos/measurables/top_row.js b/core/renderers/zelos/measurables/top_row.js
index 76777263c..b602e7df5 100644
--- a/core/renderers/zelos/measurables/top_row.js
+++ b/core/renderers/zelos/measurables/top_row.js
@@ -35,8 +35,7 @@ const object = goog.require('Blockly.utils.object');
 const TopRow = function(constants) {
   TopRow.superClass_.constructor.call(this, constants);
 };
-object.inherits(TopRow,
-    BaseTopRow);
+object.inherits(TopRow, BaseTopRow);
 
 /**
  * @override
@@ -50,8 +49,8 @@ TopRow.prototype.endsWithElemSpacer = function() {
  * @override
  */
 TopRow.prototype.hasLeftSquareCorner = function(block) {
-  const hasHat = (block.hat ?
-      block.hat === 'cap' : this.constants_.ADD_START_HATS) &&
+  const hasHat =
+      (block.hat ? block.hat === 'cap' : this.constants_.ADD_START_HATS) &&
       !block.outputConnection && !block.previousConnection;
   return !!block.outputConnection || hasHat;
 };
@@ -62,7 +61,7 @@ TopRow.prototype.hasLeftSquareCorner = function(block) {
  */
 TopRow.prototype.hasRightSquareCorner = function(block) {
   return !!block.outputConnection && !block.statementInputCount &&
-    !block.nextConnection;
+      !block.nextConnection;
 };
 
 exports = TopRow;

From cf5c38c3f577878f8950339f002658ed2f47277a Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 14:37:23 -0700
Subject: [PATCH 709/833] Migrate core/utils/svg.js to goog.module

---
 core/utils/svg.js | 151 +++++++++++++++++++++++-----------------------
 tests/deps.js     |   2 +-
 2 files changed, 78 insertions(+), 75 deletions(-)

diff --git a/core/utils/svg.js b/core/utils/svg.js
index dde7f7b3c..644018bb8 100644
--- a/core/utils/svg.js
+++ b/core/utils/svg.js
@@ -5,17 +5,18 @@
  */
 
 /**
- * @fileoverview Defines the Blockly.utils.Svg class. Its constants enumerate
+ * @fileoverview Defines the Svg class. Its constants enumerate
  * all SVG tag names used by Blockly.
  * @author samelh@google.com (Sam El-Husseini)
  */
 'use strict';
 
 /**
- * @name Blockly.utils.Svg
+ * @name Svg
  * @namespace
  */
-goog.provide('Blockly.utils.Svg');
+goog.module('Blockly.utils.Svg');
+goog.module.declareLegacyNamespace();
 
 
 /**
@@ -25,7 +26,7 @@ goog.provide('Blockly.utils.Svg');
  * @template T
  * @private
  */
-Blockly.utils.Svg = function(tagName) {
+const Svg = function(tagName) {
   /**
    * @type {string}
    * @private
@@ -38,144 +39,146 @@ Blockly.utils.Svg = function(tagName) {
  * @return {string} The name.
  * @override
  */
-Blockly.utils.Svg.prototype.toString = function() {
+Svg.prototype.toString = function() {
   return this.tagName_;
 };
 
-/** @type {!Blockly.utils.Svg<!SVGAnimateElement>}
+/** @type {!Svg<!SVGAnimateElement>}
  * @package
  */
-Blockly.utils.Svg.ANIMATE =
-    new Blockly.utils.Svg('animate');
+Svg.ANIMATE =
+    new Svg('animate');
 
-/** @type {!Blockly.utils.Svg<!SVGCircleElement>}
+/** @type {!Svg<!SVGCircleElement>}
 * @package
  */
-Blockly.utils.Svg.CIRCLE =
-    new Blockly.utils.Svg('circle');
+Svg.CIRCLE =
+    new Svg('circle');
 
-/** @type {!Blockly.utils.Svg<!SVGClipPathElement>}
+/** @type {!Svg<!SVGClipPathElement>}
  * @package
  */
-Blockly.utils.Svg.CLIPPATH =
-    new Blockly.utils.Svg('clipPath');
+Svg.CLIPPATH =
+    new Svg('clipPath');
 
-/** @type {!Blockly.utils.Svg<!SVGDefsElement>}
+/** @type {!Svg<!SVGDefsElement>}
  * @package
  */
-Blockly.utils.Svg.DEFS =
-    new Blockly.utils.Svg('defs');
+Svg.DEFS =
+    new Svg('defs');
 
-/** @type {!Blockly.utils.Svg<!SVGFECompositeElement>}
+/** @type {!Svg<!SVGFECompositeElement>}
  * @package
  */
-Blockly.utils.Svg.FECOMPOSITE =
-    new Blockly.utils.Svg('feComposite');
+Svg.FECOMPOSITE =
+    new Svg('feComposite');
 
-/** @type {!Blockly.utils.Svg<!SVGFEComponentTransferElement>}
+/** @type {!Svg<!SVGFEComponentTransferElement>}
  * @package
  */
-Blockly.utils.Svg.FECOMPONENTTRANSFER =
-    new Blockly.utils.Svg('feComponentTransfer');
+Svg.FECOMPONENTTRANSFER =
+    new Svg('feComponentTransfer');
 
-/** @type {!Blockly.utils.Svg<!SVGFEFloodElement>}
+/** @type {!Svg<!SVGFEFloodElement>}
  * @package
  */
-Blockly.utils.Svg.FEFLOOD =
-    new Blockly.utils.Svg('feFlood');
+Svg.FEFLOOD =
+    new Svg('feFlood');
 
-/** @type {!Blockly.utils.Svg<!SVGFEFuncAElement>}
+/** @type {!Svg<!SVGFEFuncAElement>}
  * @package
  */
-Blockly.utils.Svg.FEFUNCA =
-    new Blockly.utils.Svg('feFuncA');
+Svg.FEFUNCA =
+    new Svg('feFuncA');
 
-/** @type {!Blockly.utils.Svg<!SVGFEGaussianBlurElement>}
+/** @type {!Svg<!SVGFEGaussianBlurElement>}
  * @package
  */
-Blockly.utils.Svg.FEGAUSSIANBLUR =
-    new Blockly.utils.Svg('feGaussianBlur');
+Svg.FEGAUSSIANBLUR =
+    new Svg('feGaussianBlur');
 
-/** @type {!Blockly.utils.Svg<!SVGFEPointLightElement>}
+/** @type {!Svg<!SVGFEPointLightElement>}
  * @package
  */
-Blockly.utils.Svg.FEPOINTLIGHT =
-    new Blockly.utils.Svg('fePointLight');
+Svg.FEPOINTLIGHT =
+    new Svg('fePointLight');
 
-/** @type {!Blockly.utils.Svg<!SVGFESpecularLightingElement>}
+/** @type {!Svg<!SVGFESpecularLightingElement>}
  * @package
  */
-Blockly.utils.Svg.FESPECULARLIGHTING =
-    new Blockly.utils.Svg('feSpecularLighting');
+Svg.FESPECULARLIGHTING =
+    new Svg('feSpecularLighting');
 
-/** @type {!Blockly.utils.Svg<!SVGFilterElement>}
+/** @type {!Svg<!SVGFilterElement>}
  * @package
  */
-Blockly.utils.Svg.FILTER =
-    new Blockly.utils.Svg('filter');
+Svg.FILTER =
+    new Svg('filter');
 
-/** @type {!Blockly.utils.Svg<!SVGForeignObjectElement>}
+/** @type {!Svg<!SVGForeignObjectElement>}
  * @package
  */
-Blockly.utils.Svg.FOREIGNOBJECT =
-    new Blockly.utils.Svg('foreignObject');
+Svg.FOREIGNOBJECT =
+    new Svg('foreignObject');
 
-/** @type {!Blockly.utils.Svg<!SVGGElement>}
+/** @type {!Svg<!SVGGElement>}
  * @package
  */
-Blockly.utils.Svg.G =
-    new Blockly.utils.Svg('g');
+Svg.G =
+    new Svg('g');
 
-/** @type {!Blockly.utils.Svg<!SVGImageElement>}
+/** @type {!Svg<!SVGImageElement>}
  * @package
  */
-Blockly.utils.Svg.IMAGE =
-    new Blockly.utils.Svg('image');
+Svg.IMAGE =
+    new Svg('image');
 
-/** @type {!Blockly.utils.Svg<!SVGLineElement>}
+/** @type {!Svg<!SVGLineElement>}
  * @package
  */
-Blockly.utils.Svg.LINE =
-    new Blockly.utils.Svg('line');
+Svg.LINE =
+    new Svg('line');
 
-/** @type {!Blockly.utils.Svg<!SVGPathElement>}
+/** @type {!Svg<!SVGPathElement>}
  * @package
  */
-Blockly.utils.Svg.PATH =
-    new Blockly.utils.Svg('path');
+Svg.PATH =
+    new Svg('path');
 
-/** @type {!Blockly.utils.Svg<!SVGPatternElement>}
+/** @type {!Svg<!SVGPatternElement>}
  * @package
  */
-Blockly.utils.Svg.PATTERN =
-    new Blockly.utils.Svg('pattern');
+Svg.PATTERN =
+    new Svg('pattern');
 
-/** @type {!Blockly.utils.Svg<!SVGPolygonElement>}
+/** @type {!Svg<!SVGPolygonElement>}
  * @package
  */
-Blockly.utils.Svg.POLYGON =
-    new Blockly.utils.Svg('polygon');
+Svg.POLYGON =
+    new Svg('polygon');
 
-/** @type {!Blockly.utils.Svg<!SVGRectElement>}
+/** @type {!Svg<!SVGRectElement>}
  * @package
  */
-Blockly.utils.Svg.RECT =
-    new Blockly.utils.Svg('rect');
+Svg.RECT =
+    new Svg('rect');
 
-/** @type {!Blockly.utils.Svg<!SVGSVGElement>}
+/** @type {!Svg<!SVGSVGElement>}
  * @package
  */
-Blockly.utils.Svg.SVG =
-    new Blockly.utils.Svg('svg');
+Svg.SVG =
+    new Svg('svg');
 
-/** @type {!Blockly.utils.Svg<!SVGTextElement>}
+/** @type {!Svg<!SVGTextElement>}
  * @package
  */
-Blockly.utils.Svg.TEXT =
-    new Blockly.utils.Svg('text');
+Svg.TEXT =
+    new Svg('text');
 
-/** @type {!Blockly.utils.Svg<!SVGTSpanElement>}
+/** @type {!Svg<!SVGTSpanElement>}
  * @package
  */
-Blockly.utils.Svg.TSPAN =
-    new Blockly.utils.Svg('tspan');
+Svg.TSPAN =
+    new Svg('tspan');
+
+exports = Svg;
diff --git a/tests/deps.js b/tests/deps.js
index fbf988c97..08cedc924 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -221,7 +221,7 @@ goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], [], {'lan
 goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Blockly.utils.Coordinate', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], []);
+goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global']);

From 8c95da03b5f495f63b72b5b87f987e6a49d1c7cd Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 18 Aug 2021 14:51:13 -0700
Subject: [PATCH 710/833] clang-format core/utils/svg.js

---
 core/utils/svg.js | 144 +++++++++++++++++++++++-----------------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/core/utils/svg.js b/core/utils/svg.js
index 644018bb8..39392790e 100644
--- a/core/utils/svg.js
+++ b/core/utils/svg.js
@@ -43,142 +43,142 @@ Svg.prototype.toString = function() {
   return this.tagName_;
 };
 
-/** @type {!Svg<!SVGAnimateElement>}
+/**
+ * @type {!Svg<!SVGAnimateElement>}
  * @package
  */
-Svg.ANIMATE =
-    new Svg('animate');
+Svg.ANIMATE = new Svg('animate');
 
-/** @type {!Svg<!SVGCircleElement>}
-* @package
- */
-Svg.CIRCLE =
-    new Svg('circle');
-
-/** @type {!Svg<!SVGClipPathElement>}
+/**
+ * @type {!Svg<!SVGCircleElement>}
  * @package
  */
-Svg.CLIPPATH =
-    new Svg('clipPath');
+Svg.CIRCLE = new Svg('circle');
 
-/** @type {!Svg<!SVGDefsElement>}
+/**
+ * @type {!Svg<!SVGClipPathElement>}
  * @package
  */
-Svg.DEFS =
-    new Svg('defs');
+Svg.CLIPPATH = new Svg('clipPath');
 
-/** @type {!Svg<!SVGFECompositeElement>}
+/**
+ * @type {!Svg<!SVGDefsElement>}
  * @package
  */
-Svg.FECOMPOSITE =
-    new Svg('feComposite');
+Svg.DEFS = new Svg('defs');
 
-/** @type {!Svg<!SVGFEComponentTransferElement>}
+/**
+ * @type {!Svg<!SVGFECompositeElement>}
  * @package
  */
-Svg.FECOMPONENTTRANSFER =
-    new Svg('feComponentTransfer');
+Svg.FECOMPOSITE = new Svg('feComposite');
 
-/** @type {!Svg<!SVGFEFloodElement>}
+/**
+ * @type {!Svg<!SVGFEComponentTransferElement>}
  * @package
  */
-Svg.FEFLOOD =
-    new Svg('feFlood');
+Svg.FECOMPONENTTRANSFER = new Svg('feComponentTransfer');
 
-/** @type {!Svg<!SVGFEFuncAElement>}
+/**
+ * @type {!Svg<!SVGFEFloodElement>}
  * @package
  */
-Svg.FEFUNCA =
-    new Svg('feFuncA');
+Svg.FEFLOOD = new Svg('feFlood');
 
-/** @type {!Svg<!SVGFEGaussianBlurElement>}
+/**
+ * @type {!Svg<!SVGFEFuncAElement>}
  * @package
  */
-Svg.FEGAUSSIANBLUR =
-    new Svg('feGaussianBlur');
+Svg.FEFUNCA = new Svg('feFuncA');
 
-/** @type {!Svg<!SVGFEPointLightElement>}
+/**
+ * @type {!Svg<!SVGFEGaussianBlurElement>}
  * @package
  */
-Svg.FEPOINTLIGHT =
-    new Svg('fePointLight');
+Svg.FEGAUSSIANBLUR = new Svg('feGaussianBlur');
 
-/** @type {!Svg<!SVGFESpecularLightingElement>}
+/**
+ * @type {!Svg<!SVGFEPointLightElement>}
  * @package
  */
-Svg.FESPECULARLIGHTING =
-    new Svg('feSpecularLighting');
+Svg.FEPOINTLIGHT = new Svg('fePointLight');
 
-/** @type {!Svg<!SVGFilterElement>}
+/**
+ * @type {!Svg<!SVGFESpecularLightingElement>}
  * @package
  */
-Svg.FILTER =
-    new Svg('filter');
+Svg.FESPECULARLIGHTING = new Svg('feSpecularLighting');
 
-/** @type {!Svg<!SVGForeignObjectElement>}
+/**
+ * @type {!Svg<!SVGFilterElement>}
  * @package
  */
-Svg.FOREIGNOBJECT =
-    new Svg('foreignObject');
+Svg.FILTER = new Svg('filter');
 
-/** @type {!Svg<!SVGGElement>}
+/**
+ * @type {!Svg<!SVGForeignObjectElement>}
  * @package
  */
-Svg.G =
-    new Svg('g');
+Svg.FOREIGNOBJECT = new Svg('foreignObject');
 
-/** @type {!Svg<!SVGImageElement>}
+/**
+ * @type {!Svg<!SVGGElement>}
  * @package
  */
-Svg.IMAGE =
-    new Svg('image');
+Svg.G = new Svg('g');
 
-/** @type {!Svg<!SVGLineElement>}
+/**
+ * @type {!Svg<!SVGImageElement>}
  * @package
  */
-Svg.LINE =
-    new Svg('line');
+Svg.IMAGE = new Svg('image');
 
-/** @type {!Svg<!SVGPathElement>}
+/**
+ * @type {!Svg<!SVGLineElement>}
  * @package
  */
-Svg.PATH =
-    new Svg('path');
+Svg.LINE = new Svg('line');
 
-/** @type {!Svg<!SVGPatternElement>}
+/**
+ * @type {!Svg<!SVGPathElement>}
  * @package
  */
-Svg.PATTERN =
-    new Svg('pattern');
+Svg.PATH = new Svg('path');
 
-/** @type {!Svg<!SVGPolygonElement>}
+/**
+ * @type {!Svg<!SVGPatternElement>}
  * @package
  */
-Svg.POLYGON =
-    new Svg('polygon');
+Svg.PATTERN = new Svg('pattern');
 
-/** @type {!Svg<!SVGRectElement>}
+/**
+ * @type {!Svg<!SVGPolygonElement>}
  * @package
  */
-Svg.RECT =
-    new Svg('rect');
+Svg.POLYGON = new Svg('polygon');
 
-/** @type {!Svg<!SVGSVGElement>}
+/**
+ * @type {!Svg<!SVGRectElement>}
  * @package
  */
-Svg.SVG =
-    new Svg('svg');
+Svg.RECT = new Svg('rect');
 
-/** @type {!Svg<!SVGTextElement>}
+/**
+ * @type {!Svg<!SVGSVGElement>}
  * @package
  */
-Svg.TEXT =
-    new Svg('text');
+Svg.SVG = new Svg('svg');
 
-/** @type {!Svg<!SVGTSpanElement>}
+/**
+ * @type {!Svg<!SVGTextElement>}
  * @package
  */
-Svg.TSPAN =
-    new Svg('tspan');
+Svg.TEXT = new Svg('text');
+
+/**
+ * @type {!Svg<!SVGTSpanElement>}
+ * @package
+ */
+Svg.TSPAN = new Svg('tspan');
 
 exports = Svg;

From 7037a15011ac1467543093144b66973becb86a62 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 13:50:50 -0700
Subject: [PATCH 711/833] Migrate core/utils/global.js to goog.module

---
 core/utils/global.js | 13 ++++++-------
 tests/deps.js        |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/utils/global.js b/core/utils/global.js
index bbb6eb898..7474f77c9 100644
--- a/core/utils/global.js
+++ b/core/utils/global.js
@@ -10,20 +10,17 @@
  */
 'use strict';
 
-/**
- * @name Blockly.utils.global
- * @namespace
- */
-goog.provide('Blockly.utils.global');
+goog.module('Blockly.utils.global');
+goog.module.declareLegacyNamespace();
 
 
 /**
  * Reference to the global object.
  *
  * More info on this implementation here:
- * https://docs.google.com/document/d/1NAeW4Wk7I7FV0Y2tcUFvQdGMc89k2vdgSXInw8_nvCI/edit
+ * https://docs.google.com/document/d/1NAeW4Wk7I7FV0Y2tcUFvQdGMc89k2vdgSXInw8_nvCI
  */
-Blockly.utils.global = function() {
+const utilsGlobal = function() {
   if (typeof self === 'object') {
     return self;
   }
@@ -35,3 +32,5 @@ Blockly.utils.global = function() {
   }
   return this;
 }();
+
+exports = utilsGlobal;
diff --git a/tests/deps.js b/tests/deps.js
index 08cedc924..3b96940dd 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -211,7 +211,7 @@ goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], [], {
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], []);
+goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.IdGenerator'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], [], {'lang': 'es6', 'module': 'goog'});

From 57644d1e293f4323428a6a2eee4de02ba2364a81 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 11:44:46 -0700
Subject: [PATCH 712/833] Migrate core/renderers/zelos/measurables/inputs.js to
 ES6 const/let

---
 core/renderers/zelos/measurables/inputs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/renderers/zelos/measurables/inputs.js b/core/renderers/zelos/measurables/inputs.js
index 287dc2921..37534f347 100644
--- a/core/renderers/zelos/measurables/inputs.js
+++ b/core/renderers/zelos/measurables/inputs.js
@@ -36,7 +36,7 @@ Blockly.zelos.StatementInput = function(constants, input) {
 
   if (this.connectedBlock) {
     // Find the bottom-most connected block in the stack.
-    var block = this.connectedBlock;
+    let block = this.connectedBlock;
     while (block.getNextBlock()) {
       block = block.getNextBlock();
     }

From 40474324f6b23186528829c2834389d27bc5ee30 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 11:44:56 -0700
Subject: [PATCH 713/833] Migrate core/renderers/zelos/measurables/inputs.js to
 goog.module

---
 core/renderers/zelos/measurables/inputs.js | 11 +++++++----
 tests/deps.js                              |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/renderers/zelos/measurables/inputs.js b/core/renderers/zelos/measurables/inputs.js
index 37534f347..db6fb9616 100644
--- a/core/renderers/zelos/measurables/inputs.js
+++ b/core/renderers/zelos/measurables/inputs.js
@@ -10,7 +10,8 @@
  * @author samelh@google.com (Sam El-Husseini)
  */
 
-goog.provide('Blockly.zelos.StatementInput');
+goog.module('Blockly.zelos.StatementInput');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.StatementInput');
 goog.require('Blockly.utils.object');
@@ -30,8 +31,8 @@ goog.requireType('Blockly.Input');
  * @constructor
  * @extends {Blockly.blockRendering.StatementInput}
  */
-Blockly.zelos.StatementInput = function(constants, input) {
-  Blockly.zelos.StatementInput.superClass_.constructor.call(this,
+const StatementInput = function(constants, input) {
+  StatementInput.superClass_.constructor.call(this,
       constants, input);
 
   if (this.connectedBlock) {
@@ -46,5 +47,7 @@ Blockly.zelos.StatementInput = function(constants, input) {
     }
   }
 };
-Blockly.utils.object.inherits(Blockly.zelos.StatementInput,
+Blockly.utils.object.inherits(StatementInput,
     Blockly.blockRendering.StatementInput);
+
+exports = StatementInput;
diff --git a/tests/deps.js b/tests/deps.js
index 3b96940dd..6ac800d65 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -182,7 +182,7 @@ goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawe
 goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/measurables/bottom_row.js', ['Blockly.zelos.BottomRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From a6271bb3d5daf796071f45f98669dceb6594e301 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 11:46:06 -0700
Subject: [PATCH 714/833] Migrate core/renderers/zelos/measurables/inputs.js
 named requires

---
 core/renderers/zelos/measurables/inputs.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/core/renderers/zelos/measurables/inputs.js b/core/renderers/zelos/measurables/inputs.js
index db6fb9616..0bae12068 100644
--- a/core/renderers/zelos/measurables/inputs.js
+++ b/core/renderers/zelos/measurables/inputs.js
@@ -13,23 +13,24 @@
 goog.module('Blockly.zelos.StatementInput');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.StatementInput');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.Input');
+const BaseStatementInput = goog.require('Blockly.blockRendering.StatementInput');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const Input = goog.requireType('Blockly.Input');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object containing information about the space a statement input takes up
  * during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
- * @param {!Blockly.Input} input The statement input to measure and store
+ * @param {!Input} input The statement input to measure and store
  *     information for.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.StatementInput}
+ * @extends {BaseStatementInput}
  */
 const StatementInput = function(constants, input) {
   StatementInput.superClass_.constructor.call(this,
@@ -47,7 +48,7 @@ const StatementInput = function(constants, input) {
     }
   }
 };
-Blockly.utils.object.inherits(StatementInput,
-    Blockly.blockRendering.StatementInput);
+object.inherits(StatementInput,
+    BaseStatementInput);
 
 exports = StatementInput;

From 810e1e19a5479f9da0708ddd850a338fad9d5463 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 11:46:10 -0700
Subject: [PATCH 715/833] clang-format
 core/renderers/zelos/measurables/inputs.js

---
 core/renderers/zelos/measurables/inputs.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/renderers/zelos/measurables/inputs.js b/core/renderers/zelos/measurables/inputs.js
index 0bae12068..1dd14f3c9 100644
--- a/core/renderers/zelos/measurables/inputs.js
+++ b/core/renderers/zelos/measurables/inputs.js
@@ -33,8 +33,7 @@ const object = goog.require('Blockly.utils.object');
  * @extends {BaseStatementInput}
  */
 const StatementInput = function(constants, input) {
-  StatementInput.superClass_.constructor.call(this,
-      constants, input);
+  StatementInput.superClass_.constructor.call(this, constants, input);
 
   if (this.connectedBlock) {
     // Find the bottom-most connected block in the stack.
@@ -48,7 +47,6 @@ const StatementInput = function(constants, input) {
     }
   }
 };
-object.inherits(StatementInput,
-    BaseStatementInput);
+object.inherits(StatementInput, BaseStatementInput);
 
 exports = StatementInput;

From 5dd4e1ed50095412af5e823085bc9e2c48284b1d Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 19 Aug 2021 09:41:21 -0700
Subject: [PATCH 716/833] Cleanup in core/renderers/zelos/measurables/inputs.js

---
 core/renderers/zelos/measurables/inputs.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/renderers/zelos/measurables/inputs.js b/core/renderers/zelos/measurables/inputs.js
index 1dd14f3c9..cff7b4dae 100644
--- a/core/renderers/zelos/measurables/inputs.js
+++ b/core/renderers/zelos/measurables/inputs.js
@@ -24,10 +24,9 @@ const object = goog.require('Blockly.utils.object');
 /**
  * An object containing information about the space a statement input takes up
  * during rendering
- * @param {!ConstantProvider} constants The rendering
- *   constants provider.
- * @param {!Input} input The statement input to measure and store
- *     information for.
+ * @param {!ConstantProvider} constants The rendering constants provider.
+ * @param {!Input} input The statement input to measure and store information
+ *    for.
  * @package
  * @constructor
  * @extends {BaseStatementInput}
@@ -38,8 +37,9 @@ const StatementInput = function(constants, input) {
   if (this.connectedBlock) {
     // Find the bottom-most connected block in the stack.
     let block = this.connectedBlock;
-    while (block.getNextBlock()) {
-      block = block.getNextBlock();
+    let nextBlock;
+    while ((nextBlock = block.getNextBlock())) {
+      block = nextBlock;
     }
     if (!block.nextConnection) {
       this.height = this.connectedBlockHeight;

From 72c0a55ad9a61d09c7363d4406749a0da6f6767f Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Tue, 20 Jul 2021 14:33:52 -0700
Subject: [PATCH 717/833] Migrate core/dropdowndiv.js to ES6 const/let

---
 core/dropdowndiv.js | 104 ++++++++++++++++++++++----------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/core/dropdowndiv.js b/core/dropdowndiv.js
index 5ebb22a5e..890e9b936 100644
--- a/core/dropdowndiv.js
+++ b/core/dropdowndiv.js
@@ -161,9 +161,9 @@ Blockly.DropDownDiv.createDom = function() {
   if (Blockly.DropDownDiv.DIV_) {
     return;  // Already created.
   }
-  var div = document.createElement('div');
+  const div = document.createElement('div');
   div.className = 'blocklyDropDownDiv';
-  var container = Blockly.common.getParentContainer() || document.body;
+  const container = Blockly.common.getParentContainer || document.body;
   container.appendChild(div);
   /**
    * The div element.
@@ -172,7 +172,7 @@ Blockly.DropDownDiv.createDom = function() {
    */
   Blockly.DropDownDiv.DIV_ = div;
 
-  var content = document.createElement('div');
+  const content = document.createElement('div');
   content.className = 'blocklyDropDownContent';
   div.appendChild(content);
   /**
@@ -182,7 +182,7 @@ Blockly.DropDownDiv.createDom = function() {
    */
   Blockly.DropDownDiv.content_ = content;
 
-  var arrow = document.createElement('div');
+  const arrow = document.createElement('div');
   arrow.className = 'blocklyDropDownArrow';
   div.appendChild(arrow);
   /**
@@ -291,12 +291,12 @@ Blockly.DropDownDiv.showPositionedByField = function(field,
  * @private
  */
 Blockly.DropDownDiv.getScaledBboxOfBlock_ = function(block) {
-  var blockSvg = block.getSvgRoot();
-  var bBox = blockSvg.getBBox();
-  var scale = block.workspace.scale;
-  var scaledHeight = bBox.height * scale;
-  var scaledWidth = bBox.width * scale;
-  var xy = Blockly.utils.style.getPageOffset(blockSvg);
+  const blockSvg = block.getSvgRoot();
+  const bBox = blockSvg.getBBox();
+  const scale = block.workspace.scale;
+  const scaledHeight = bBox.height * scale;
+  const scaledWidth = bBox.width * scale;
+  const xy = Blockly.utils.style.getPageOffset(blockSvg);
   return new Blockly.utils.Rect(
       xy.y, xy.y + scaledHeight, xy.x, xy.x + scaledWidth);
 };
@@ -308,7 +308,7 @@ Blockly.DropDownDiv.getScaledBboxOfBlock_ = function(block) {
  * @private
  */
 Blockly.DropDownDiv.getScaledBboxOfField_ = function(field) {
-  var bBox = field.getScaledBBox();
+  const bBox = field.getScaledBBox();
   return new Blockly.utils.Rect(
       bBox.top, bBox.bottom, bBox.left, bBox.right);
 };
@@ -330,17 +330,17 @@ Blockly.DropDownDiv.getScaledBboxOfField_ = function(field) {
 Blockly.DropDownDiv.showPositionedByRect_ = function(bBox, field,
     opt_onHide, opt_secondaryYOffset) {
   // If we can fit it, render below the block.
-  var primaryX = bBox.left + (bBox.right - bBox.left) / 2;
-  var primaryY = bBox.bottom;
+  const primaryX = bBox.left + (bBox.right - bBox.left) / 2;
+  const primaryY = bBox.bottom;
   // If we can't fit it, render above the entire parent block.
-  var secondaryX = primaryX;
-  var secondaryY = bBox.top;
+  const secondaryX = primaryX;
+  let secondaryY = bBox.top;
   if (opt_secondaryYOffset) {
     secondaryY += opt_secondaryYOffset;
   }
-  var sourceBlock = /** @type {!Blockly.BlockSvg} */ (field.getSourceBlock());
+  const sourceBlock = /** @type {!Blockly.BlockSvg} */ (field.getSourceBlock());
   // Set bounds to main workspace; show the drop-down.
-  var workspace = sourceBlock.workspace;
+  let workspace = sourceBlock.workspace;
   while (workspace.options.parentWorkspace) {
     workspace = /** @type {!Blockly.WorkspaceSvg} */ (
       workspace.options.parentWorkspace);
@@ -378,11 +378,11 @@ Blockly.DropDownDiv.show = function(owner, rtl, primaryX, primaryY,
   Blockly.DropDownDiv.owner_ = owner;
   Blockly.DropDownDiv.onHide_ = opt_onHide || null;
   // Set direction.
-  var div = Blockly.DropDownDiv.DIV_;
+  const div = Blockly.DropDownDiv.DIV_;
   div.style.direction = rtl ? 'rtl' : 'ltr';
 
-  var mainWorkspace =
-    /** @type {!Blockly.WorkspaceSvg} */ (Blockly.common.getMainWorkspace());
+  const mainWorkspace =
+  /** @type {!Blockly.WorkspaceSvg} */ (Blockly.common.getMainWorkspace());
   Blockly.DropDownDiv.rendererClassName_ =
       mainWorkspace.getRenderer().getClassName();
   Blockly.DropDownDiv.themeClassName_ = mainWorkspace.getTheme().getClassName();
@@ -409,9 +409,9 @@ Blockly.DropDownDiv.show = function(owner, rtl, primaryX, primaryY,
  * @private
  */
 Blockly.DropDownDiv.getBoundsInfo_ = function() {
-  var boundPosition = Blockly.utils.style.getPageOffset(
+  const boundPosition = Blockly.utils.style.getPageOffset(
       /** @type {!Element} */ (Blockly.DropDownDiv.boundsElement_));
-  var boundSize = Blockly.utils.style.getSize(
+  const boundSize = Blockly.utils.style.getSize(
       /** @type {!Element} */ (Blockly.DropDownDiv.boundsElement_));
 
   return {
@@ -439,8 +439,8 @@ Blockly.DropDownDiv.getBoundsInfo_ = function() {
  */
 Blockly.DropDownDiv.getPositionMetrics_ = function(primaryX, primaryY,
     secondaryX, secondaryY) {
-  var boundsInfo = Blockly.DropDownDiv.getBoundsInfo_();
-  var divSize = Blockly.utils.style.getSize(
+  const boundsInfo = Blockly.DropDownDiv.getBoundsInfo_();
+  const divSize = Blockly.utils.style.getSize(
       /** @type {!Element} */ (Blockly.DropDownDiv.DIV_));
 
   // Can we fit in-bounds below the target?
@@ -484,12 +484,12 @@ Blockly.DropDownDiv.getPositionMetrics_ = function(primaryX, primaryY,
 Blockly.DropDownDiv.getPositionBelowMetrics_ = function(
     primaryX, primaryY, boundsInfo, divSize) {
 
-  var xCoords = Blockly.DropDownDiv.getPositionX(
+  const xCoords = Blockly.DropDownDiv.getPositionX(
       primaryX, boundsInfo.left, boundsInfo.right, divSize.width);
 
-  var arrowY = -(Blockly.DropDownDiv.ARROW_SIZE / 2 +
+  const arrowY = -(Blockly.DropDownDiv.ARROW_SIZE / 2 +
       Blockly.DropDownDiv.BORDER_SIZE);
-  var finalY = primaryY + Blockly.DropDownDiv.PADDING_Y;
+  const finalY = primaryY + Blockly.DropDownDiv.PADDING_Y;
 
   return {
     initialX: xCoords.divX,
@@ -520,13 +520,13 @@ Blockly.DropDownDiv.getPositionBelowMetrics_ = function(
 Blockly.DropDownDiv.getPositionAboveMetrics_ = function(
     secondaryX, secondaryY, boundsInfo, divSize) {
 
-  var xCoords = Blockly.DropDownDiv.getPositionX(
+  const xCoords = Blockly.DropDownDiv.getPositionX(
       secondaryX, boundsInfo.left, boundsInfo.right, divSize.width);
 
-  var arrowY = divSize.height - (Blockly.DropDownDiv.BORDER_SIZE * 2) -
+  const arrowY = divSize.height - (Blockly.DropDownDiv.BORDER_SIZE * 2) -
       (Blockly.DropDownDiv.ARROW_SIZE / 2);
-  var finalY = secondaryY - divSize.height - Blockly.DropDownDiv.PADDING_Y;
-  var initialY = secondaryY - divSize.height;  // No padding on Y.
+  const finalY = secondaryY - divSize.height - Blockly.DropDownDiv.PADDING_Y;
+  const initialY = secondaryY - divSize.height;  // No padding on Y.
 
   return {
     initialX: xCoords.divX,
@@ -554,7 +554,7 @@ Blockly.DropDownDiv.getPositionAboveMetrics_ = function(
 Blockly.DropDownDiv.getPositionTopOfPageMetrics_ = function(
     sourceX, boundsInfo, divSize) {
 
-  var xCoords = Blockly.DropDownDiv.getPositionX(
+  const xCoords = Blockly.DropDownDiv.getPositionX(
       sourceX, boundsInfo.left, boundsInfo.right, divSize.width);
 
   // No need to provide arrow-specific information because it won't be visible.
@@ -585,7 +585,7 @@ Blockly.DropDownDiv.getPositionTopOfPageMetrics_ = function(
  */
 Blockly.DropDownDiv.getPositionX = function(
     sourceX, boundsLeft, boundsRight, divWidth) {
-  var arrowX, divX;
+  let arrowX, divX;
   arrowX = divX = sourceX;
 
   // Offset the topLeft coord so that the dropdowndiv is centered.
@@ -596,8 +596,8 @@ Blockly.DropDownDiv.getPositionX = function(
   // Offset the arrow coord so that the arrow is centered.
   arrowX -= Blockly.DropDownDiv.ARROW_SIZE / 2;
   // Convert the arrow position to be relative to the top left of the div.
-  var relativeArrowX = arrowX - divX;
-  var horizPadding = Blockly.DropDownDiv.ARROW_HORIZONTAL_PADDING;
+  let relativeArrowX = arrowX - divX;
+  const horizPadding = Blockly.DropDownDiv.ARROW_HORIZONTAL_PADDING;
   // Clamp the arrow position so that it stays attached to the dropdowndiv.
   relativeArrowX = Blockly.utils.math.clamp(
       horizPadding,
@@ -642,7 +642,7 @@ Blockly.DropDownDiv.hideIfOwner = function(owner, opt_withoutAnimation) {
  */
 Blockly.DropDownDiv.hide = function() {
   // Start the animation by setting the translation and fading out.
-  var div = Blockly.DropDownDiv.DIV_;
+  const div = Blockly.DropDownDiv.DIV_;
   // Reset to (initialX, initialY) - i.e., no translation.
   div.style.transform = 'translate(0, 0)';
   div.style.opacity = 0;
@@ -670,7 +670,7 @@ Blockly.DropDownDiv.hideWithoutAnimation = function() {
 
   // Reset style properties in case this gets called directly
   // instead of hide() - see discussion on #2551.
-  var div = Blockly.DropDownDiv.DIV_;
+  const div = Blockly.DropDownDiv.DIV_;
   div.style.transform = '';
   div.style.left = '';
   div.style.top = '';
@@ -711,7 +711,7 @@ Blockly.DropDownDiv.hideWithoutAnimation = function() {
  */
 Blockly.DropDownDiv.positionInternal_ = function(
     primaryX, primaryY, secondaryX, secondaryY) {
-  var metrics = Blockly.DropDownDiv.getPositionMetrics_(primaryX, primaryY,
+  const metrics = Blockly.DropDownDiv.getPositionMetrics_(primaryX, primaryY,
       secondaryX, secondaryY);
 
   // Update arrow CSS.
@@ -726,12 +726,12 @@ Blockly.DropDownDiv.positionInternal_ = function(
     Blockly.DropDownDiv.arrow_.style.display = 'none';
   }
 
-  var initialX = Math.floor(metrics.initialX);
-  var initialY = Math.floor(metrics.initialY);
-  var finalX = Math.floor(metrics.finalX);
-  var finalY = Math.floor(metrics.finalY);
+  const initialX = Math.floor(metrics.initialX);
+  const initialY = Math.floor(metrics.initialY);
+  const finalX = Math.floor(metrics.finalX);
+  const finalY = Math.floor(metrics.finalY);
 
-  var div = Blockly.DropDownDiv.DIV_;
+  const div = Blockly.DropDownDiv.DIV_;
   // First apply initial translation.
   div.style.left = initialX + 'px';
   div.style.top = initialY + 'px';
@@ -742,8 +742,8 @@ Blockly.DropDownDiv.positionInternal_ = function(
   // Add final translate, animated through `transition`.
   // Coordinates are relative to (initialX, initialY),
   // where the drop-down is absolutely positioned.
-  var dx = finalX - initialX;
-  var dy = finalY - initialY;
+  const dx = finalX - initialX;
+  const dy = finalY - initialY;
   div.style.transform = 'translate(' + dx + 'px,' + dy + 'px)';
 
   return !!metrics.arrowAtTop;
@@ -761,17 +761,17 @@ Blockly.DropDownDiv.repositionForWindowResize = function() {
   // event and we want the dropdown div to stick around so users can type into
   // it.
   if (Blockly.DropDownDiv.owner_) {
-    var field = /** @type {!Blockly.Field} */ (Blockly.DropDownDiv.owner_);
-    var block = /** @type {!Blockly.BlockSvg} */ (field.getSourceBlock());
-    var bBox = Blockly.DropDownDiv.positionToField_ ?
+    const field = /** @type {!Blockly.Field} */ (Blockly.DropDownDiv.owner_);
+    const block = /** @type {!Blockly.BlockSvg} */ (field.getSourceBlock());
+    const bBox = Blockly.DropDownDiv.positionToField_ ?
         Blockly.DropDownDiv.getScaledBboxOfField_(field) :
         Blockly.DropDownDiv.getScaledBboxOfBlock_(block);
     // If we can fit it, render below the block.
-    var primaryX = bBox.left + (bBox.right - bBox.left) / 2;
-    var primaryY = bBox.bottom;
+    const primaryX = bBox.left + (bBox.right - bBox.left) / 2;
+    const primaryY = bBox.bottom;
     // If we can't fit it, render above the entire parent block.
-    var secondaryX = primaryX;
-    var secondaryY = bBox.top;
+    const secondaryX = primaryX;
+    const secondaryY = bBox.top;
     Blockly.DropDownDiv.positionInternal_(
         primaryX, primaryY, secondaryX, secondaryY);
   } else {

From f29d795a7ef23199d31cd11a53454cfbf37e34b0 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Wed, 21 Jul 2021 17:43:20 -0700
Subject: [PATCH 718/833] Migrate core/dropdowndiv.js to goog.module

---
 core/dropdowndiv.js | 331 +++++++++++++++++++++----------------------
 tests/deps.js       | 332 ++++++++++++++++++++------------------------
 2 files changed, 312 insertions(+), 351 deletions(-)

diff --git a/core/dropdowndiv.js b/core/dropdowndiv.js
index 890e9b936..017b4a3f4 100644
--- a/core/dropdowndiv.js
+++ b/core/dropdowndiv.js
@@ -13,7 +13,8 @@
 
 'use strict';
 
-goog.provide('Blockly.DropDownDiv');
+goog.module('Blockly.DropDownDiv');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.common');
 goog.require('Blockly.utils.dom');
@@ -32,30 +33,27 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @constructor
  * @package
  */
-Blockly.DropDownDiv = function() {
+const DropDownDiv = function() {
 };
 
 /**
  * Drop-downs will appear within the bounds of this element if possible.
- * Set in Blockly.DropDownDiv.setBoundsElement.
+ * Set in DropDownDiv.setBoundsElement.
  * @type {Element}
- * @private
  */
-Blockly.DropDownDiv.boundsElement_ = null;
+let boundsElementInternal = null;
 
 /**
  * The object currently using the drop-down.
  * @type {Object}
- * @private
  */
-Blockly.DropDownDiv.owner_ = null;
+let ownerInternal = null;
 
 /**
  * Whether the dropdown was positioned to a field or the source block.
  * @type {?boolean}
- * @private
  */
-Blockly.DropDownDiv.positionToField_ = null;
+let positionToField = null;
 
 /**
  * Arrow size in px. Should match the value in CSS
@@ -63,7 +61,7 @@ Blockly.DropDownDiv.positionToField_ = null;
  * @type {number}
  * @const
  */
-Blockly.DropDownDiv.ARROW_SIZE = 16;
+DropDownDiv.ARROW_SIZE = 16;
 
 /**
  * Drop-down border size in px. Should match the value in CSS (need to position
@@ -71,7 +69,7 @@ Blockly.DropDownDiv.ARROW_SIZE = 16;
  * @type {number}
  * @const
  */
-Blockly.DropDownDiv.BORDER_SIZE = 1;
+DropDownDiv.BORDER_SIZE = 1;
 
 /**
  * Amount the arrow must be kept away from the edges of the main drop-down div,
@@ -79,50 +77,64 @@ Blockly.DropDownDiv.BORDER_SIZE = 1;
  * @type {number}
  * @const
  */
-Blockly.DropDownDiv.ARROW_HORIZONTAL_PADDING = 12;
+DropDownDiv.ARROW_HORIZONTAL_PADDING = 12;
 
 /**
  * Amount drop-downs should be padded away from the source, in px.
  * @type {number}
  * @const
  */
-Blockly.DropDownDiv.PADDING_Y = 16;
+DropDownDiv.PADDING_Y = 16;
 
 /**
  * Length of animations in seconds.
  * @type {number}
  * @const
  */
-Blockly.DropDownDiv.ANIMATION_TIME = 0.25;
+DropDownDiv.ANIMATION_TIME = 0.25;
 
 /**
  * Timer for animation out, to be cleared if we need to immediately hide
  * without disrupting new shows.
  * @type {?number}
- * @private
  */
-Blockly.DropDownDiv.animateOutTimer_ = null;
+let animateOutTimer = null;
 
 /**
  * Callback for when the drop-down is hidden.
  * @type {?Function}
- * @private
  */
-Blockly.DropDownDiv.onHide_ = null;
+let onHide = null;
 
 /**
  * A class name representing the current owner's workspace renderer.
  * @type {string}
- * @private
  */
-Blockly.DropDownDiv.rendererClassName_ = '';
+let rendererClassName = '';
 
 /**
  * A class name representing the current owner's workspace theme.
  * @type {string}
- * @private
  */
-Blockly.DropDownDiv.themeClassName_ = '';
+let themeClassName = '';
+
+/**
+ * The content element.
+ * @type {?Element}
+ */
+let divInternal = null;
+
+/**
+ * The content element.
+ * @type {!Element}
+ */
+let contentInternal;
+
+/**
+ * The arrow element.
+ * @type {!Element}
+ */
+let arrowInternal;
 
 /**
  * Dropdown bounds info object used to encapsulate sizing information about a
@@ -136,7 +148,7 @@ Blockly.DropDownDiv.themeClassName_ = '';
  *        height:number
  * }}
  */
-Blockly.DropDownDiv.BoundsInfo;
+DropDownDiv.BoundsInfo;
 
 /**
  * Dropdown position metrics.
@@ -151,53 +163,39 @@ Blockly.DropDownDiv.BoundsInfo;
  *        arrowVisible:boolean
  * }}
  */
-Blockly.DropDownDiv.PositionMetrics;
+DropDownDiv.PositionMetrics;
 
 /**
  * Create and insert the DOM element for this div.
  * @package
  */
-Blockly.DropDownDiv.createDom = function() {
-  if (Blockly.DropDownDiv.DIV_) {
+DropDownDiv.createDom = function() {
+  if (divInternal) {
     return;  // Already created.
   }
   const div = document.createElement('div');
   div.className = 'blocklyDropDownDiv';
   const container = Blockly.common.getParentContainer || document.body;
   container.appendChild(div);
-  /**
-   * The div element.
-   * @type {!Element}
-   * @private
-   */
-  Blockly.DropDownDiv.DIV_ = div;
+
+  divInternal = div;
 
   const content = document.createElement('div');
   content.className = 'blocklyDropDownContent';
   div.appendChild(content);
-  /**
-   * The content element.
-   * @type {!Element}
-   * @private
-   */
-  Blockly.DropDownDiv.content_ = content;
+  contentInternal = content;
 
   const arrow = document.createElement('div');
   arrow.className = 'blocklyDropDownArrow';
   div.appendChild(arrow);
-  /**
-   * The arrow element.
-   * @type {!Element}
-   * @private
-   */
-  Blockly.DropDownDiv.arrow_ = arrow;
+  arrowInternal = arrow;
 
-  Blockly.DropDownDiv.DIV_.style.opacity = 0;
+  divInternal.style.opacity = 0;
 
   // Transition animation for transform: translate() and opacity.
-  Blockly.DropDownDiv.DIV_.style.transition = 'transform ' +
-    Blockly.DropDownDiv.ANIMATION_TIME + 's, ' +
-    'opacity ' + Blockly.DropDownDiv.ANIMATION_TIME + 's';
+  divInternal.style.transition = 'transform ' +
+    DropDownDiv.ANIMATION_TIME + 's, ' +
+    'opacity ' + DropDownDiv.ANIMATION_TIME + 's';
 
   // Handle focusin/out events to add a visual indicator when
   // a child is focused or blurred.
@@ -214,24 +212,24 @@ Blockly.DropDownDiv.createDom = function() {
  * within the box of this element if possible.
  * @param {Element} boundsElement Element to bind drop-down to.
  */
-Blockly.DropDownDiv.setBoundsElement = function(boundsElement) {
-  Blockly.DropDownDiv.boundsElement_ = boundsElement;
+DropDownDiv.setBoundsElement = function(boundsElement) {
+  boundsElementInternal = boundsElement;
 };
 
 /**
  * Provide the div for inserting content into the drop-down.
  * @return {!Element} Div to populate with content.
  */
-Blockly.DropDownDiv.getContentDiv = function() {
-  return Blockly.DropDownDiv.content_;
+DropDownDiv.getContentDiv = function() {
+  return contentInternal;
 };
 
 /**
  * Clear the content of the drop-down.
  */
-Blockly.DropDownDiv.clearContent = function() {
-  Blockly.DropDownDiv.content_.textContent = '';
-  Blockly.DropDownDiv.content_.style.width = '';
+DropDownDiv.clearContent = function() {
+  contentInternal.textContent = '';
+  contentInternal.style.width = '';
 };
 
 /**
@@ -239,9 +237,9 @@ Blockly.DropDownDiv.clearContent = function() {
  * @param {string} backgroundColour Any CSS colour for the background.
  * @param {string} borderColour Any CSS colour for the border.
  */
-Blockly.DropDownDiv.setColour = function(backgroundColour, borderColour) {
-  Blockly.DropDownDiv.DIV_.style.backgroundColor = backgroundColour;
-  Blockly.DropDownDiv.DIV_.style.borderColor = borderColour;
+DropDownDiv.setColour = function(backgroundColour, borderColour) {
+  divInternal.style.backgroundColor = backgroundColour;
+  divInternal.style.borderColor = borderColour;
 };
 
 /**
@@ -257,10 +255,10 @@ Blockly.DropDownDiv.setColour = function(backgroundColour, borderColour) {
  *   positioning.
  * @return {boolean} True if the menu rendered below block; false if above.
  */
-Blockly.DropDownDiv.showPositionedByBlock = function(field, block,
+DropDownDiv.showPositionedByBlock = function(field, block,
     opt_onHide, opt_secondaryYOffset) {
-  return Blockly.DropDownDiv.showPositionedByRect_(
-      Blockly.DropDownDiv.getScaledBboxOfBlock_(block),
+  return showPositionedByRect(
+      getScaledBboxOfBlock(block),
       field, opt_onHide, opt_secondaryYOffset);
 };
 
@@ -276,11 +274,11 @@ Blockly.DropDownDiv.showPositionedByBlock = function(field, block,
  *   positioning.
  * @return {boolean} True if the menu rendered below block; false if above.
  */
-Blockly.DropDownDiv.showPositionedByField = function(field,
+DropDownDiv.showPositionedByField = function(field,
     opt_onHide, opt_secondaryYOffset) {
-  Blockly.DropDownDiv.positionToField_ = true;
-  return Blockly.DropDownDiv.showPositionedByRect_(
-      Blockly.DropDownDiv.getScaledBboxOfField_(field),
+  positionToField = true;
+  return showPositionedByRect(
+      getScaledBboxOfField(field),
       field, opt_onHide, opt_secondaryYOffset);
 };
 
@@ -288,9 +286,8 @@ Blockly.DropDownDiv.showPositionedByField = function(field,
  * Get the scaled bounding box of a block.
  * @param {!Blockly.BlockSvg} block The block.
  * @return {!Blockly.utils.Rect} The scaled bounding box of the block.
- * @private
  */
-Blockly.DropDownDiv.getScaledBboxOfBlock_ = function(block) {
+const getScaledBboxOfBlock = function(block) {
   const blockSvg = block.getSvgRoot();
   const bBox = blockSvg.getBBox();
   const scale = block.workspace.scale;
@@ -305,9 +302,8 @@ Blockly.DropDownDiv.getScaledBboxOfBlock_ = function(block) {
  * Get the scaled bounding box of a field.
  * @param {!Blockly.Field} field The field.
  * @return {!Blockly.utils.Rect} The scaled bounding box of the field.
- * @private
  */
-Blockly.DropDownDiv.getScaledBboxOfField_ = function(field) {
+const getScaledBboxOfField = function(field) {
   const bBox = field.getScaledBBox();
   return new Blockly.utils.Rect(
       bBox.top, bBox.bottom, bBox.left, bBox.right);
@@ -325,9 +321,8 @@ Blockly.DropDownDiv.getScaledBboxOfField_ = function(field) {
  * @param {number=} opt_secondaryYOffset Optional Y offset for above-block
  *   positioning.
  * @return {boolean} True if the menu rendered below block; false if above.
- * @private
  */
-Blockly.DropDownDiv.showPositionedByRect_ = function(bBox, field,
+const showPositionedByRect = function(bBox, field,
     opt_onHide, opt_secondaryYOffset) {
   // If we can fit it, render below the block.
   const primaryX = bBox.left + (bBox.right - bBox.left) / 2;
@@ -345,9 +340,9 @@ Blockly.DropDownDiv.showPositionedByRect_ = function(bBox, field,
     workspace = /** @type {!Blockly.WorkspaceSvg} */ (
       workspace.options.parentWorkspace);
   }
-  Blockly.DropDownDiv.setBoundsElement(
+  DropDownDiv.setBoundsElement(
       /** @type {Element} */ (workspace.getParentSvg().parentNode));
-  return Blockly.DropDownDiv.show(
+  return DropDownDiv.show(
       field, sourceBlock.RTL,
       primaryX, primaryY, secondaryX, secondaryY, opt_onHide);
 };
@@ -373,21 +368,21 @@ Blockly.DropDownDiv.showPositionedByRect_ = function(bBox, field,
  * @return {boolean} True if the menu rendered at the primary origin point.
  * @package
  */
-Blockly.DropDownDiv.show = function(owner, rtl, primaryX, primaryY,
+DropDownDiv.show = function(owner, rtl, primaryX, primaryY,
     secondaryX, secondaryY, opt_onHide) {
-  Blockly.DropDownDiv.owner_ = owner;
-  Blockly.DropDownDiv.onHide_ = opt_onHide || null;
+  ownerInternal = owner;
+  onHide = opt_onHide || null;
   // Set direction.
-  const div = Blockly.DropDownDiv.DIV_;
+  const div = divInternal;
   div.style.direction = rtl ? 'rtl' : 'ltr';
 
   const mainWorkspace =
-  /** @type {!Blockly.WorkspaceSvg} */ (Blockly.common.getMainWorkspace());
-  Blockly.DropDownDiv.rendererClassName_ =
+      /** @type {!Blockly.WorkspaceSvg} */ (Blockly.common.getMainWorkspace());
+  rendererClassName =
       mainWorkspace.getRenderer().getClassName();
-  Blockly.DropDownDiv.themeClassName_ = mainWorkspace.getTheme().getClassName();
-  Blockly.utils.dom.addClass(div, Blockly.DropDownDiv.rendererClassName_);
-  Blockly.utils.dom.addClass(div, Blockly.DropDownDiv.themeClassName_);
+  themeClassName = mainWorkspace.getTheme().getClassName();
+  Blockly.utils.dom.addClass(div, rendererClassName);
+  Blockly.utils.dom.addClass(div, themeClassName);
 
   // When we change `translate` multiple times in close succession,
   // Chrome may choose to wait and apply them all at once.
@@ -398,21 +393,20 @@ Blockly.DropDownDiv.show = function(owner, rtl, primaryX, primaryY,
   // Using both `left`, `top` for the initial translation and then `translate`
   // for the animated transition to final X, Y is a workaround.
 
-  return Blockly.DropDownDiv.positionInternal_(
+  return positionInternal(
       primaryX, primaryY, secondaryX, secondaryY);
 };
 
 /**
  * Get sizing info about the bounding element.
- * @return {!Blockly.DropDownDiv.BoundsInfo} An object containing size
+ * @return {!DropDownDiv.BoundsInfo} An object containing size
  *     information about the bounding element (bounding box and width/height).
- * @private
  */
-Blockly.DropDownDiv.getBoundsInfo_ = function() {
+DropDownDiv.getBoundsInfo_ = function() {
   const boundPosition = Blockly.utils.style.getPageOffset(
-      /** @type {!Element} */ (Blockly.DropDownDiv.boundsElement_));
+      /** @type {!Element} */ (boundsElementInternal));
   const boundSize = Blockly.utils.style.getSize(
-      /** @type {!Element} */ (Blockly.DropDownDiv.boundsElement_));
+      /** @type {!Element} */ (boundsElementInternal));
 
   return {
     left: boundPosition.x,
@@ -426,46 +420,45 @@ Blockly.DropDownDiv.getBoundsInfo_ = function() {
 
 /**
  * Helper to position the drop-down and the arrow, maintaining bounds.
- * See explanation of origin points in Blockly.DropDownDiv.show.
+ * See explanation of origin points in DropDownDiv.show.
  * @param {number} primaryX Desired origin point x, in absolute px.
  * @param {number} primaryY Desired origin point y, in absolute px.
  * @param {number} secondaryX Secondary/alternative origin point x,
  *     in absolute px.
  * @param {number} secondaryY Secondary/alternative origin point y,
  *     in absolute px.
- * @return {!Blockly.DropDownDiv.PositionMetrics} Various final metrics,
+ * @return {!DropDownDiv.PositionMetrics} Various final metrics,
  *     including rendered positions for drop-down and arrow.
- * @private
  */
-Blockly.DropDownDiv.getPositionMetrics_ = function(primaryX, primaryY,
+DropDownDiv.getPositionMetrics_ = function(primaryX, primaryY,
     secondaryX, secondaryY) {
-  const boundsInfo = Blockly.DropDownDiv.getBoundsInfo_();
+  const boundsInfo = DropDownDiv.getBoundsInfo_();
   const divSize = Blockly.utils.style.getSize(
-      /** @type {!Element} */ (Blockly.DropDownDiv.DIV_));
+      /** @type {!Element} */ (divInternal));
 
   // Can we fit in-bounds below the target?
   if (primaryY + divSize.height < boundsInfo.bottom) {
-    return Blockly.DropDownDiv.getPositionBelowMetrics_(
+    return getPositionBelowMetrics(
         primaryX, primaryY, boundsInfo, divSize);
   }
   // Can we fit in-bounds above the target?
   if (secondaryY - divSize.height > boundsInfo.top) {
-    return Blockly.DropDownDiv.getPositionAboveMetrics_(
+    return getPositionAboveMetrics(
         secondaryX, secondaryY, boundsInfo, divSize);
   }
   // Can we fit outside the workspace bounds (but inside the window) below?
   if (primaryY + divSize.height < document.documentElement.clientHeight) {
-    return Blockly.DropDownDiv.getPositionBelowMetrics_(
+    return getPositionBelowMetrics(
         primaryX, primaryY, boundsInfo, divSize);
   }
   // Can we fit outside the workspace bounds (but inside the window) above?
   if (secondaryY - divSize.height > document.documentElement.clientTop) {
-    return Blockly.DropDownDiv.getPositionAboveMetrics_(
+    return getPositionAboveMetrics(
         secondaryX, secondaryY, boundsInfo, divSize);
   }
 
   // Last resort, render at top of page.
-  return Blockly.DropDownDiv.getPositionTopOfPageMetrics_(
+  return getPositionTopOfPageMetrics(
       primaryX, boundsInfo, divSize);
 };
 
@@ -473,23 +466,22 @@ Blockly.DropDownDiv.getPositionMetrics_ = function(primaryX, primaryY,
  * Get the metrics for positioning the div below the source.
  * @param {number} primaryX Desired origin point x, in absolute px.
  * @param {number} primaryY Desired origin point y, in absolute px.
- * @param {!Blockly.DropDownDiv.BoundsInfo} boundsInfo An object containing size
+ * @param {!DropDownDiv.BoundsInfo} boundsInfo An object containing size
  *     information about the bounding element (bounding box and width/height).
  * @param {!Blockly.utils.Size} divSize An object containing information about
  *     the size of the DropDownDiv (width & height).
- * @return {!Blockly.DropDownDiv.PositionMetrics} Various final metrics,
+ * @return {!DropDownDiv.PositionMetrics} Various final metrics,
  *     including rendered positions for drop-down and arrow.
- * @private
  */
-Blockly.DropDownDiv.getPositionBelowMetrics_ = function(
+const getPositionBelowMetrics = function(
     primaryX, primaryY, boundsInfo, divSize) {
 
-  const xCoords = Blockly.DropDownDiv.getPositionX(
+  const xCoords = DropDownDiv.getPositionX(
       primaryX, boundsInfo.left, boundsInfo.right, divSize.width);
 
-  const arrowY = -(Blockly.DropDownDiv.ARROW_SIZE / 2 +
-      Blockly.DropDownDiv.BORDER_SIZE);
-  const finalY = primaryY + Blockly.DropDownDiv.PADDING_Y;
+  const arrowY = -(DropDownDiv.ARROW_SIZE / 2 +
+      DropDownDiv.BORDER_SIZE);
+  const finalY = primaryY + DropDownDiv.PADDING_Y;
 
   return {
     initialX: xCoords.divX,
@@ -509,23 +501,22 @@ Blockly.DropDownDiv.getPositionBelowMetrics_ = function(
  *     in absolute px.
  * @param {number} secondaryY Secondary/alternative origin point y,
  *     in absolute px.
- * @param {!Blockly.DropDownDiv.BoundsInfo} boundsInfo An object containing size
+ * @param {!DropDownDiv.BoundsInfo} boundsInfo An object containing size
  *     information about the bounding element (bounding box and width/height).
  * @param {!Blockly.utils.Size} divSize An object containing information about
  *     the size of the DropDownDiv (width & height).
- * @return {!Blockly.DropDownDiv.PositionMetrics} Various final metrics,
+ * @return {!DropDownDiv.PositionMetrics} Various final metrics,
  *     including rendered positions for drop-down and arrow.
- * @private
  */
-Blockly.DropDownDiv.getPositionAboveMetrics_ = function(
+const getPositionAboveMetrics = function(
     secondaryX, secondaryY, boundsInfo, divSize) {
 
-  const xCoords = Blockly.DropDownDiv.getPositionX(
+  const xCoords = DropDownDiv.getPositionX(
       secondaryX, boundsInfo.left, boundsInfo.right, divSize.width);
 
-  const arrowY = divSize.height - (Blockly.DropDownDiv.BORDER_SIZE * 2) -
-      (Blockly.DropDownDiv.ARROW_SIZE / 2);
-  const finalY = secondaryY - divSize.height - Blockly.DropDownDiv.PADDING_Y;
+  const arrowY = divSize.height - (DropDownDiv.BORDER_SIZE * 2) -
+      (DropDownDiv.ARROW_SIZE / 2);
+  const finalY = secondaryY - divSize.height - DropDownDiv.PADDING_Y;
   const initialY = secondaryY - divSize.height;  // No padding on Y.
 
   return {
@@ -543,18 +534,17 @@ Blockly.DropDownDiv.getPositionAboveMetrics_ = function(
 /**
  * Get the metrics for positioning the div at the top of the page.
  * @param {number} sourceX Desired origin point x, in absolute px.
- * @param {!Blockly.DropDownDiv.BoundsInfo} boundsInfo An object containing size
+ * @param {!DropDownDiv.BoundsInfo} boundsInfo An object containing size
  *     information about the bounding element (bounding box and width/height).
  * @param {!Blockly.utils.Size} divSize An object containing information about
  *     the size of the DropDownDiv (width & height).
- * @return {!Blockly.DropDownDiv.PositionMetrics} Various final metrics,
+ * @return {!DropDownDiv.PositionMetrics} Various final metrics,
  *     including rendered positions for drop-down and arrow.
- * @private
  */
-Blockly.DropDownDiv.getPositionTopOfPageMetrics_ = function(
+const getPositionTopOfPageMetrics = function(
     sourceX, boundsInfo, divSize) {
 
-  const xCoords = Blockly.DropDownDiv.getPositionX(
+  const xCoords = DropDownDiv.getPositionX(
       sourceX, boundsInfo.left, boundsInfo.right, divSize.width);
 
   // No need to provide arrow-specific information because it won't be visible.
@@ -583,7 +573,7 @@ Blockly.DropDownDiv.getPositionTopOfPageMetrics_ = function(
  *    the x positions of the left side of the DropDownDiv and the arrow.
  * @package
  */
-Blockly.DropDownDiv.getPositionX = function(
+DropDownDiv.getPositionX = function(
     sourceX, boundsLeft, boundsRight, divWidth) {
   let arrowX, divX;
   arrowX = divX = sourceX;
@@ -594,15 +584,15 @@ Blockly.DropDownDiv.getPositionX = function(
   divX = Blockly.utils.math.clamp(boundsLeft, divX, boundsRight - divWidth);
 
   // Offset the arrow coord so that the arrow is centered.
-  arrowX -= Blockly.DropDownDiv.ARROW_SIZE / 2;
+  arrowX -= DropDownDiv.ARROW_SIZE / 2;
   // Convert the arrow position to be relative to the top left of the div.
   let relativeArrowX = arrowX - divX;
-  const horizPadding = Blockly.DropDownDiv.ARROW_HORIZONTAL_PADDING;
+  const horizPadding = DropDownDiv.ARROW_HORIZONTAL_PADDING;
   // Clamp the arrow position so that it stays attached to the dropdowndiv.
   relativeArrowX = Blockly.utils.math.clamp(
       horizPadding,
       relativeArrowX,
-      divWidth - horizPadding - Blockly.DropDownDiv.ARROW_SIZE);
+      divWidth - horizPadding - DropDownDiv.ARROW_SIZE);
 
   return {
     arrowX: relativeArrowX,
@@ -614,8 +604,8 @@ Blockly.DropDownDiv.getPositionX = function(
  * Is the container visible?
  * @return {boolean} True if visible.
  */
-Blockly.DropDownDiv.isVisible = function() {
-  return !!Blockly.DropDownDiv.owner_;
+DropDownDiv.isVisible = function() {
+  return !!ownerInternal;
 };
 
 /**
@@ -625,12 +615,12 @@ Blockly.DropDownDiv.isVisible = function() {
  *     without animating.
  * @return {boolean} True if hidden.
  */
-Blockly.DropDownDiv.hideIfOwner = function(owner, opt_withoutAnimation) {
-  if (Blockly.DropDownDiv.owner_ === owner) {
+DropDownDiv.hideIfOwner = function(owner, opt_withoutAnimation) {
+  if (ownerInternal === owner) {
     if (opt_withoutAnimation) {
-      Blockly.DropDownDiv.hideWithoutAnimation();
+      DropDownDiv.hideWithoutAnimation();
     } else {
-      Blockly.DropDownDiv.hide();
+      DropDownDiv.hide();
     }
     return true;
   }
@@ -640,37 +630,37 @@ Blockly.DropDownDiv.hideIfOwner = function(owner, opt_withoutAnimation) {
 /**
  * Hide the menu, triggering animation.
  */
-Blockly.DropDownDiv.hide = function() {
+DropDownDiv.hide = function() {
   // Start the animation by setting the translation and fading out.
-  const div = Blockly.DropDownDiv.DIV_;
+  const div = divInternal;
   // Reset to (initialX, initialY) - i.e., no translation.
   div.style.transform = 'translate(0, 0)';
   div.style.opacity = 0;
   // Finish animation - reset all values to default.
-  Blockly.DropDownDiv.animateOutTimer_ =
+  animateOutTimer =
       setTimeout(function() {
-        Blockly.DropDownDiv.hideWithoutAnimation();
-      }, Blockly.DropDownDiv.ANIMATION_TIME * 1000);
-  if (Blockly.DropDownDiv.onHide_) {
-    Blockly.DropDownDiv.onHide_();
-    Blockly.DropDownDiv.onHide_ = null;
+        DropDownDiv.hideWithoutAnimation();
+      }, DropDownDiv.ANIMATION_TIME * 1000);
+  if (onHide) {
+    onHide();
+    onHide = null;
   }
 };
 
 /**
  * Hide the menu, without animation.
  */
-Blockly.DropDownDiv.hideWithoutAnimation = function() {
-  if (!Blockly.DropDownDiv.isVisible()) {
+DropDownDiv.hideWithoutAnimation = function() {
+  if (!DropDownDiv.isVisible()) {
     return;
   }
-  if (Blockly.DropDownDiv.animateOutTimer_) {
-    clearTimeout(Blockly.DropDownDiv.animateOutTimer_);
+  if (animateOutTimer) {
+    clearTimeout(animateOutTimer);
   }
 
   // Reset style properties in case this gets called directly
   // instead of hide() - see discussion on #2551.
-  const div = Blockly.DropDownDiv.DIV_;
+  const div = divInternal;
   div.style.transform = '';
   div.style.left = '';
   div.style.top = '';
@@ -679,20 +669,20 @@ Blockly.DropDownDiv.hideWithoutAnimation = function() {
   div.style.backgroundColor = '';
   div.style.borderColor = '';
 
-  if (Blockly.DropDownDiv.onHide_) {
-    Blockly.DropDownDiv.onHide_();
-    Blockly.DropDownDiv.onHide_ = null;
+  if (onHide) {
+    onHide();
+    onHide = null;
   }
-  Blockly.DropDownDiv.clearContent();
-  Blockly.DropDownDiv.owner_ = null;
+  DropDownDiv.clearContent();
+  ownerInternal = null;
 
-  if (Blockly.DropDownDiv.rendererClassName_) {
-    Blockly.utils.dom.removeClass(div, Blockly.DropDownDiv.rendererClassName_);
-    Blockly.DropDownDiv.rendererClassName_ = '';
+  if (rendererClassName) {
+    Blockly.utils.dom.removeClass(div, rendererClassName);
+    rendererClassName = '';
   }
-  if (Blockly.DropDownDiv.themeClassName_) {
-    Blockly.utils.dom.removeClass(div, Blockly.DropDownDiv.themeClassName_);
-    Blockly.DropDownDiv.themeClassName_ = '';
+  if (themeClassName) {
+    Blockly.utils.dom.removeClass(div, themeClassName);
+    themeClassName = '';
   }
   (/** @type {!Blockly.WorkspaceSvg} */ (
     Blockly.common.getMainWorkspace())).markFocused();
@@ -707,23 +697,22 @@ Blockly.DropDownDiv.hideWithoutAnimation = function() {
  * @param {number} secondaryY Secondary/alternative origin point y,
  *    in absolute px.
  * @return {boolean} True if the menu rendered at the primary origin point.
- * @private
  */
-Blockly.DropDownDiv.positionInternal_ = function(
+const positionInternal = function(
     primaryX, primaryY, secondaryX, secondaryY) {
-  const metrics = Blockly.DropDownDiv.getPositionMetrics_(primaryX, primaryY,
+  const metrics = getPositionMetrics(primaryX, primaryY,
       secondaryX, secondaryY);
 
   // Update arrow CSS.
   if (metrics.arrowVisible) {
-    Blockly.DropDownDiv.arrow_.style.display = '';
-    Blockly.DropDownDiv.arrow_.style.transform = 'translate(' +
+    arrowInternal.style.display = '';
+    arrowInternal.style.transform = 'translate(' +
         metrics.arrowX + 'px,' + metrics.arrowY + 'px) rotate(45deg)';
-    Blockly.DropDownDiv.arrow_.setAttribute('class', metrics.arrowAtTop ?
+    arrowInternal.setAttribute('class', metrics.arrowAtTop ?
         'blocklyDropDownArrow blocklyArrowTop' :
         'blocklyDropDownArrow blocklyArrowBottom');
   } else {
-    Blockly.DropDownDiv.arrow_.style.display = 'none';
+    arrowInternal.style.display = 'none';
   }
 
   const initialX = Math.floor(metrics.initialX);
@@ -731,7 +720,7 @@ Blockly.DropDownDiv.positionInternal_ = function(
   const finalX = Math.floor(metrics.finalX);
   const finalY = Math.floor(metrics.finalY);
 
-  const div = Blockly.DropDownDiv.DIV_;
+  const div = divInternal;
   // First apply initial translation.
   div.style.left = initialX + 'px';
   div.style.top = initialY + 'px';
@@ -754,27 +743,29 @@ Blockly.DropDownDiv.positionInternal_ = function(
  * calculate the new position, it will just hide it instead.
  * @package
  */
-Blockly.DropDownDiv.repositionForWindowResize = function() {
+DropDownDiv.repositionForWindowResize = function() {
   // This condition mainly catches the dropdown div when it is being used as a
   // dropdown.  It is important not to close it in this case because on Android,
   // when a field is focused, the soft keyboard opens triggering a window resize
   // event and we want the dropdown div to stick around so users can type into
   // it.
-  if (Blockly.DropDownDiv.owner_) {
-    const field = /** @type {!Blockly.Field} */ (Blockly.DropDownDiv.owner_);
+  if (ownerInternal) {
+    const field = /** @type {!Blockly.Field} */ (ownerInternal);
     const block = /** @type {!Blockly.BlockSvg} */ (field.getSourceBlock());
-    const bBox = Blockly.DropDownDiv.positionToField_ ?
-        Blockly.DropDownDiv.getScaledBboxOfField_(field) :
-        Blockly.DropDownDiv.getScaledBboxOfBlock_(block);
+    const bBox = positionToField ?
+        getScaledBboxOfField(field) :
+        getScaledBboxOfBlock(block);
     // If we can fit it, render below the block.
     const primaryX = bBox.left + (bBox.right - bBox.left) / 2;
     const primaryY = bBox.bottom;
     // If we can't fit it, render above the entire parent block.
     const secondaryX = primaryX;
     const secondaryY = bBox.top;
-    Blockly.DropDownDiv.positionInternal_(
+    positionInternal(
         primaryX, primaryY, secondaryX, secondaryY);
   } else {
-    Blockly.DropDownDiv.hide();
+    DropDownDiv.hide();
   }
 };
+
+exports = DropDownDiv;
diff --git a/tests/deps.js b/tests/deps.js
index 6ac800d65..9504969e7 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -7,239 +7,209 @@ goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'],
 goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator']);
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
-goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.IASTNodeLocation', 'Blockly.IDeletable', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.Workspace', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es5'});
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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.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.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/blockly_options.js', ['Blockly.BlocklyOptions'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom']);
+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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', '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']);
+goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 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'});
-goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global']);
+goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.RenderedConnection', 'Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es5'});
+goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es5'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style']);
+goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea']);
+goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/block_events.js', ['Blockly.Events.BlockBase', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Events.Change', 'Blockly.Events.Create', 'Blockly.Events.Delete', 'Blockly.Events.Move'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils']);
-goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.BlockBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_ui.js', ['Blockly.Events.Ui'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_ui_base.js', ['Blockly.Events.UiBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_var_base.js', ['Blockly.Events.VarBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_var_create.js', ['Blockly.Events.VarCreate'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.VarDelete'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events']);
+goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/variable_events.js', ['Blockly.Events.VarBase', 'Blockly.Events.VarCreate', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es5'});
 goog.addDependency('../../core/events/ws_comment_events.js', ['Blockly.Events.CommentBase', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible', 'Blockly.IRegistrable', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.IdGenerator', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['Blockly.DropDownDiv', 'Blockly.Field', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabelSerializable'], ['Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabelSerializable'], ['Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.object']);
+goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es5'});
 goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.common', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry']);
+goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object']);
+goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
+goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es5'});
+goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.Block', 'Blockly.internalConstants', 'Blockly.utils.deprecation']);
+goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
+goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.Connection', 'Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es5'});
+goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes']);
+goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.internalConstants'], {'lang': 'es5'});
 goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], ['Blockly.IASTNodeLocation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], ['Blockly.IASTNodeLocation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_collapsible_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], ['Blockly.IContextMenu', 'Blockly.IDraggable'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_collapsible_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem'], ['Blockly.ISelectableToolboxItem'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_copyable.js', ['Blockly.ICopyable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_deletable.js', ['Blockly.IDeletable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], ['Blockly.IDeletable'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], ['Blockly.IRegistrable'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_keyboard_accessible.js', ['Blockly.IKeyboardAccessible'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], []);
 goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_selectable_toolbox_item.js', ['Blockly.ISelectableToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_selectable_toolbox_item.js', ['Blockly.ISelectableToolboxItem'], ['Blockly.IToolboxItem'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], ['Blockly.IRegistrable'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.IToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstants'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.utils.Coordinate'], {'lang': 'es5'});
 goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], ['Blockly.ASTNode']);
 goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], [], {'lang': 'es6', 'module': 'goog'});
-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.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/metrics_manager.js', ['Blockly.MetricsManager'], ['Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], ['Blockly.Cursor', 'Blockly.Marker']);
+goog.addDependency('../../core/menu.js', ['Blockly.Menu'], ['Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.style']);
+goog.addDependency('../../core/menuitem.js', ['Blockly.MenuItem'], ['Blockly.utils.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom']);
+goog.addDependency('../../core/metrics_manager.js', ['Blockly.FlyoutMetricsManager', 'Blockly.MetricsManager'], ['Blockly.IMetricsManager', 'Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global']);
-goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', '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', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/measurables/inline_input.js', ['Blockly.geras.InlineInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/measurables/statement_input.js', ['Blockly.geras.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/bottom_row.js', ['Blockly.blockRendering.BottomRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/connection.js', ['Blockly.blockRendering.Connection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/external_value_input.js', ['Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/field.js', ['Blockly.blockRendering.Field'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/hat.js', ['Blockly.blockRendering.Hat'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/icon.js', ['Blockly.blockRendering.Icon'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/in_row_spacer.js', ['Blockly.blockRendering.InRowSpacer'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/inline_input.js', ['Blockly.blockRendering.InlineInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/input_connection.js', ['Blockly.blockRendering.InputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/input_row.js', ['Blockly.blockRendering.InputRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/jagged_edge.js', ['Blockly.blockRendering.JaggedEdge'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/next_connection.js', ['Blockly.blockRendering.NextConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/output_connection.js', ['Blockly.blockRendering.OutputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/previous_connection.js', ['Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/round_corner.js', ['Blockly.blockRendering.RoundCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/row.js', ['Blockly.blockRendering.Row'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/spacer_row.js', ['Blockly.blockRendering.SpacerRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/square_corner.js', ['Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/top_row.js', ['Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist.RenderInfo'], ['Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/measurables/bottom_row.js', ['Blockly.zelos.BottomRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
+goog.addDependency('../../core/names.js', ['Blockly.Names'], ['Blockly.Msg', 'Blockly.internalConstants']);
+goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.Metrics', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.xml']);
+goog.addDependency('../../core/registry.js', ['Blockly.registry'], []);
+goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry']);
+goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es5'});
+goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
+goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], []);
+goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
+goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es5'});
+goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.geras.RenderInfo', 'Blockly.utils.object', 'Blockly.utils.svgPaths']);
+goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.svgPaths'], {'lang': 'es5'});
+goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths']);
+goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras', 'Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/geras/measurables/inputs.js', ['Blockly.geras.InlineInput', 'Blockly.geras.StatementInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.PathObject', 'Blockly.geras.ConstantProvider', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types']);
+goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/inputs.js', ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/row_elements.js', ['Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/rows.js', ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], []);
+goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist', 'Blockly.minimalist.RenderInfo'], ['Blockly.utils.object']);
+goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos', 'Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es5'});
+goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.zelos.RenderInfo']);
+goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos', 'Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow']);
+goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/zelos/measurables/rows.js', ['Blockly.zelos.BottomRow', 'Blockly.zelos.TopRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.TopRow', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider']);
+goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo']);
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
-goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly', 'Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly', 'Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.string']);
-goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
-goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar', 'Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.utils.KeyCodes']);
+goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object']);
+goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils', 'Blockly.utils.object']);
+goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);
+goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme']);
+goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.Theme']);
+goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.IToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es5'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem']);
+goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.utils.string']);
+goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.string']);
+goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
+goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.Svg', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], []);
 goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.IdGenerator'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], []);
+goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], []);
 goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Blockly.utils.Coordinate', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], []);
 goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global']);
 goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
-goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.utils', 'Blockly.utils.object']);
+goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils']);
+goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.xml']);
+goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml']);
+goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.utils.dom']);
+goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);
+goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es5'});
+goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml']);
+goog.addDependency('../../core/workspace_comment_render_svg.js', ['Blockly.WorkspaceCommentSvg.render'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.WorkspaceComment', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate']);
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
+goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
 goog.addDependency('base.js', [], []);
 

From cbd5e862910908c6d5a0ac1f67c49b95ccac676a Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Fri, 23 Jul 2021 13:21:06 -0700
Subject: [PATCH 719/833] Migrate core/dropdowndiv.js to goog.module

---
 core/dropdowndiv.js | 90 +++++++++++++++++++++++----------------------
 1 file changed, 46 insertions(+), 44 deletions(-)

diff --git a/core/dropdowndiv.js b/core/dropdowndiv.js
index 017b4a3f4..629eb77e1 100644
--- a/core/dropdowndiv.js
+++ b/core/dropdowndiv.js
@@ -16,16 +16,19 @@
 goog.module('Blockly.DropDownDiv');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.common');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.math');
-goog.require('Blockly.utils.Rect');
-goog.require('Blockly.utils.style');
-
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.Field');
-goog.requireType('Blockly.utils.Size');
-goog.requireType('Blockly.WorkspaceSvg');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+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');
 
 
 /**
@@ -175,7 +178,7 @@ DropDownDiv.createDom = function() {
   }
   const div = document.createElement('div');
   div.className = 'blocklyDropDownDiv';
-  const container = Blockly.common.getParentContainer || document.body;
+  const container = common.getParentContainer || document.body;
   container.appendChild(div);
 
   divInternal = div;
@@ -200,10 +203,10 @@ DropDownDiv.createDom = function() {
   // Handle focusin/out events to add a visual indicator when
   // a child is focused or blurred.
   div.addEventListener('focusin', function() {
-    Blockly.utils.dom.addClass(div, 'blocklyFocused');
+    dom.addClass(div, 'blocklyFocused');
   });
   div.addEventListener('focusout', function() {
-    Blockly.utils.dom.removeClass(div, 'blocklyFocused');
+    dom.removeClass(div, 'blocklyFocused');
   });
 };
 
@@ -247,8 +250,8 @@ DropDownDiv.setColour = function(backgroundColour, borderColour) {
  * by a particular block. The primary position will be below the block,
  * and the secondary position above the block. Drop-down will be
  * constrained to the block's workspace.
- * @param {!Blockly.Field} field The field showing the drop-down.
- * @param {!Blockly.BlockSvg} block Block to position the drop-down around.
+ * @param {!Field} field The field showing the drop-down.
+ * @param {!BlockSvg} block Block to position the drop-down around.
  * @param {Function=} opt_onHide Optional callback for when the drop-down is
  *   hidden.
  * @param {number=} opt_secondaryYOffset Optional Y offset for above-block
@@ -267,7 +270,7 @@ DropDownDiv.showPositionedByBlock = function(field, block,
  * by a particular field. The primary position will be below the field,
  * and the secondary position above the field. Drop-down will be
  * constrained to the block's workspace.
- * @param {!Blockly.Field} field The field to position the dropdown against.
+ * @param {!Field} field The field to position the dropdown against.
  * @param {Function=} opt_onHide Optional callback for when the drop-down is
  *   hidden.
  * @param {number=} opt_secondaryYOffset Optional Y offset for above-block
@@ -284,8 +287,8 @@ DropDownDiv.showPositionedByField = function(field,
 
 /**
  * Get the scaled bounding box of a block.
- * @param {!Blockly.BlockSvg} block The block.
- * @return {!Blockly.utils.Rect} The scaled bounding box of the block.
+ * @param {!BlockSvg} block The block.
+ * @return {!Rect} The scaled bounding box of the block.
  */
 const getScaledBboxOfBlock = function(block) {
   const blockSvg = block.getSvgRoot();
@@ -293,19 +296,19 @@ const getScaledBboxOfBlock = function(block) {
   const scale = block.workspace.scale;
   const scaledHeight = bBox.height * scale;
   const scaledWidth = bBox.width * scale;
-  const xy = Blockly.utils.style.getPageOffset(blockSvg);
-  return new Blockly.utils.Rect(
+  const xy = style.getPageOffset(blockSvg);
+  return new Rect(
       xy.y, xy.y + scaledHeight, xy.x, xy.x + scaledWidth);
 };
 
 /**
  * Get the scaled bounding box of a field.
- * @param {!Blockly.Field} field The field.
- * @return {!Blockly.utils.Rect} The scaled bounding box of the field.
+ * @param {!Field} field The field.
+ * @return {!Rect} The scaled bounding box of the field.
  */
 const getScaledBboxOfField = function(field) {
   const bBox = field.getScaledBBox();
-  return new Blockly.utils.Rect(
+  return new Rect(
       bBox.top, bBox.bottom, bBox.left, bBox.right);
 };
 
@@ -314,8 +317,8 @@ const getScaledBboxOfField = function(field) {
  * by a scaled bounding box.  The primary position will be below the rect,
  * and the secondary position above the rect. Drop-down will be constrained to
  * the block's workspace.
- * @param {!Blockly.utils.Rect} bBox The scaled bounding box.
- * @param {!Blockly.Field} field The field to position the dropdown against.
+ * @param {!Rect} bBox The scaled bounding box.
+ * @param {!Field} field The field to position the dropdown against.
  * @param {Function=} opt_onHide Optional callback for when the drop-down is
  *   hidden.
  * @param {number=} opt_secondaryYOffset Optional Y offset for above-block
@@ -333,11 +336,11 @@ const showPositionedByRect = function(bBox, field,
   if (opt_secondaryYOffset) {
     secondaryY += opt_secondaryYOffset;
   }
-  const sourceBlock = /** @type {!Blockly.BlockSvg} */ (field.getSourceBlock());
+  const sourceBlock = /** @type {!BlockSvg} */ (field.getSourceBlock());
   // Set bounds to main workspace; show the drop-down.
   let workspace = sourceBlock.workspace;
   while (workspace.options.parentWorkspace) {
-    workspace = /** @type {!Blockly.WorkspaceSvg} */ (
+    workspace = /** @type {!WorkspaceSvg} */ (
       workspace.options.parentWorkspace);
   }
   DropDownDiv.setBoundsElement(
@@ -377,12 +380,12 @@ DropDownDiv.show = function(owner, rtl, primaryX, primaryY,
   div.style.direction = rtl ? 'rtl' : 'ltr';
 
   const mainWorkspace =
-      /** @type {!Blockly.WorkspaceSvg} */ (Blockly.common.getMainWorkspace());
+      /** @type {!WorkspaceSvg} */ (common.getMainWorkspace());
   rendererClassName =
       mainWorkspace.getRenderer().getClassName();
   themeClassName = mainWorkspace.getTheme().getClassName();
-  Blockly.utils.dom.addClass(div, rendererClassName);
-  Blockly.utils.dom.addClass(div, themeClassName);
+  dom.addClass(div, rendererClassName);
+  dom.addClass(div, themeClassName);
 
   // When we change `translate` multiple times in close succession,
   // Chrome may choose to wait and apply them all at once.
@@ -403,9 +406,9 @@ DropDownDiv.show = function(owner, rtl, primaryX, primaryY,
  *     information about the bounding element (bounding box and width/height).
  */
 DropDownDiv.getBoundsInfo_ = function() {
-  const boundPosition = Blockly.utils.style.getPageOffset(
+  const boundPosition = style.getPageOffset(
       /** @type {!Element} */ (boundsElementInternal));
-  const boundSize = Blockly.utils.style.getSize(
+  const boundSize = style.getSize(
       /** @type {!Element} */ (boundsElementInternal));
 
   return {
@@ -433,7 +436,7 @@ DropDownDiv.getBoundsInfo_ = function() {
 DropDownDiv.getPositionMetrics_ = function(primaryX, primaryY,
     secondaryX, secondaryY) {
   const boundsInfo = DropDownDiv.getBoundsInfo_();
-  const divSize = Blockly.utils.style.getSize(
+  const divSize = style.getSize(
       /** @type {!Element} */ (divInternal));
 
   // Can we fit in-bounds below the target?
@@ -468,7 +471,7 @@ DropDownDiv.getPositionMetrics_ = function(primaryX, primaryY,
  * @param {number} primaryY Desired origin point y, in absolute px.
  * @param {!DropDownDiv.BoundsInfo} boundsInfo An object containing size
  *     information about the bounding element (bounding box and width/height).
- * @param {!Blockly.utils.Size} divSize An object containing information about
+ * @param {!Size} divSize An object containing information about
  *     the size of the DropDownDiv (width & height).
  * @return {!DropDownDiv.PositionMetrics} Various final metrics,
  *     including rendered positions for drop-down and arrow.
@@ -503,7 +506,7 @@ const getPositionBelowMetrics = function(
  *     in absolute px.
  * @param {!DropDownDiv.BoundsInfo} boundsInfo An object containing size
  *     information about the bounding element (bounding box and width/height).
- * @param {!Blockly.utils.Size} divSize An object containing information about
+ * @param {!Size} divSize An object containing information about
  *     the size of the DropDownDiv (width & height).
  * @return {!DropDownDiv.PositionMetrics} Various final metrics,
  *     including rendered positions for drop-down and arrow.
@@ -536,7 +539,7 @@ const getPositionAboveMetrics = function(
  * @param {number} sourceX Desired origin point x, in absolute px.
  * @param {!DropDownDiv.BoundsInfo} boundsInfo An object containing size
  *     information about the bounding element (bounding box and width/height).
- * @param {!Blockly.utils.Size} divSize An object containing information about
+ * @param {!Size} divSize An object containing information about
  *     the size of the DropDownDiv (width & height).
  * @return {!DropDownDiv.PositionMetrics} Various final metrics,
  *     including rendered positions for drop-down and arrow.
@@ -581,7 +584,7 @@ DropDownDiv.getPositionX = function(
   // Offset the topLeft coord so that the dropdowndiv is centered.
   divX -= divWidth / 2;
   // Fit the dropdowndiv within the bounds of the workspace.
-  divX = Blockly.utils.math.clamp(boundsLeft, divX, boundsRight - divWidth);
+  divX = math.clamp(boundsLeft, divX, boundsRight - divWidth);
 
   // Offset the arrow coord so that the arrow is centered.
   arrowX -= DropDownDiv.ARROW_SIZE / 2;
@@ -589,7 +592,7 @@ DropDownDiv.getPositionX = function(
   let relativeArrowX = arrowX - divX;
   const horizPadding = DropDownDiv.ARROW_HORIZONTAL_PADDING;
   // Clamp the arrow position so that it stays attached to the dropdowndiv.
-  relativeArrowX = Blockly.utils.math.clamp(
+  relativeArrowX = math.clamp(
       horizPadding,
       relativeArrowX,
       divWidth - horizPadding - DropDownDiv.ARROW_SIZE);
@@ -677,15 +680,14 @@ DropDownDiv.hideWithoutAnimation = function() {
   ownerInternal = null;
 
   if (rendererClassName) {
-    Blockly.utils.dom.removeClass(div, rendererClassName);
+    dom.removeClass(div, rendererClassName);
     rendererClassName = '';
   }
   if (themeClassName) {
-    Blockly.utils.dom.removeClass(div, themeClassName);
+    dom.removeClass(div, themeClassName);
     themeClassName = '';
   }
-  (/** @type {!Blockly.WorkspaceSvg} */ (
-    Blockly.common.getMainWorkspace())).markFocused();
+  (/** @type {!WorkspaceSvg} */ (common.getMainWorkspace())).markFocused();
 };
 
 /**
@@ -750,8 +752,8 @@ DropDownDiv.repositionForWindowResize = function() {
   // event and we want the dropdown div to stick around so users can type into
   // it.
   if (ownerInternal) {
-    const field = /** @type {!Blockly.Field} */ (ownerInternal);
-    const block = /** @type {!Blockly.BlockSvg} */ (field.getSourceBlock());
+    const field = /** @type {!Field} */ (ownerInternal);
+    const block = /** @type {!BlockSvg} */ (field.getSourceBlock());
     const bBox = positionToField ?
         getScaledBboxOfField(field) :
         getScaledBboxOfBlock(block);

From 4c270c0e9dc2c9f950ab4a93e5749df3d93a458f Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Fri, 23 Jul 2021 13:22:31 -0700
Subject: [PATCH 720/833] clang-format core/dropdowndiv.js

---
 core/dropdowndiv.js | 126 ++++++++++++++++++--------------------------
 1 file changed, 51 insertions(+), 75 deletions(-)

diff --git a/core/dropdowndiv.js b/core/dropdowndiv.js
index 629eb77e1..ac9ebdfc4 100644
--- a/core/dropdowndiv.js
+++ b/core/dropdowndiv.js
@@ -36,8 +36,7 @@ const style = goog.require('Blockly.utils.style');
  * @constructor
  * @package
  */
-const DropDownDiv = function() {
-};
+const DropDownDiv = function() {};
 
 /**
  * Drop-downs will appear within the bounds of this element if possible.
@@ -196,9 +195,9 @@ DropDownDiv.createDom = function() {
   divInternal.style.opacity = 0;
 
   // Transition animation for transform: translate() and opacity.
-  divInternal.style.transition = 'transform ' +
-    DropDownDiv.ANIMATION_TIME + 's, ' +
-    'opacity ' + DropDownDiv.ANIMATION_TIME + 's';
+  divInternal.style.transition = 'transform ' + DropDownDiv.ANIMATION_TIME +
+      's, ' +
+      'opacity ' + DropDownDiv.ANIMATION_TIME + 's';
 
   // Handle focusin/out events to add a visual indicator when
   // a child is focused or blurred.
@@ -258,11 +257,10 @@ DropDownDiv.setColour = function(backgroundColour, borderColour) {
  *   positioning.
  * @return {boolean} True if the menu rendered below block; false if above.
  */
-DropDownDiv.showPositionedByBlock = function(field, block,
-    opt_onHide, opt_secondaryYOffset) {
+DropDownDiv.showPositionedByBlock = function(
+    field, block, opt_onHide, opt_secondaryYOffset) {
   return showPositionedByRect(
-      getScaledBboxOfBlock(block),
-      field, opt_onHide, opt_secondaryYOffset);
+      getScaledBboxOfBlock(block), field, opt_onHide, opt_secondaryYOffset);
 };
 
 /**
@@ -277,12 +275,11 @@ DropDownDiv.showPositionedByBlock = function(field, block,
  *   positioning.
  * @return {boolean} True if the menu rendered below block; false if above.
  */
-DropDownDiv.showPositionedByField = function(field,
-    opt_onHide, opt_secondaryYOffset) {
+DropDownDiv.showPositionedByField = function(
+    field, opt_onHide, opt_secondaryYOffset) {
   positionToField = true;
   return showPositionedByRect(
-      getScaledBboxOfField(field),
-      field, opt_onHide, opt_secondaryYOffset);
+      getScaledBboxOfField(field), field, opt_onHide, opt_secondaryYOffset);
 };
 
 /**
@@ -297,8 +294,7 @@ const getScaledBboxOfBlock = function(block) {
   const scaledHeight = bBox.height * scale;
   const scaledWidth = bBox.width * scale;
   const xy = style.getPageOffset(blockSvg);
-  return new Rect(
-      xy.y, xy.y + scaledHeight, xy.x, xy.x + scaledWidth);
+  return new Rect(xy.y, xy.y + scaledHeight, xy.x, xy.x + scaledWidth);
 };
 
 /**
@@ -308,8 +304,7 @@ const getScaledBboxOfBlock = function(block) {
  */
 const getScaledBboxOfField = function(field) {
   const bBox = field.getScaledBBox();
-  return new Rect(
-      bBox.top, bBox.bottom, bBox.left, bBox.right);
+  return new Rect(bBox.top, bBox.bottom, bBox.left, bBox.right);
 };
 
 /**
@@ -325,8 +320,8 @@ const getScaledBboxOfField = function(field) {
  *   positioning.
  * @return {boolean} True if the menu rendered below block; false if above.
  */
-const showPositionedByRect = function(bBox, field,
-    opt_onHide, opt_secondaryYOffset) {
+const showPositionedByRect = function(
+    bBox, field, opt_onHide, opt_secondaryYOffset) {
   // If we can fit it, render below the block.
   const primaryX = bBox.left + (bBox.right - bBox.left) / 2;
   const primaryY = bBox.bottom;
@@ -340,14 +335,14 @@ const showPositionedByRect = function(bBox, field,
   // Set bounds to main workspace; show the drop-down.
   let workspace = sourceBlock.workspace;
   while (workspace.options.parentWorkspace) {
-    workspace = /** @type {!WorkspaceSvg} */ (
-      workspace.options.parentWorkspace);
+    workspace =
+        /** @type {!WorkspaceSvg} */ (workspace.options.parentWorkspace);
   }
   DropDownDiv.setBoundsElement(
       /** @type {Element} */ (workspace.getParentSvg().parentNode));
   return DropDownDiv.show(
-      field, sourceBlock.RTL,
-      primaryX, primaryY, secondaryX, secondaryY, opt_onHide);
+      field, sourceBlock.RTL, primaryX, primaryY, secondaryX, secondaryY,
+      opt_onHide);
 };
 
 /**
@@ -371,8 +366,8 @@ const showPositionedByRect = function(bBox, field,
  * @return {boolean} True if the menu rendered at the primary origin point.
  * @package
  */
-DropDownDiv.show = function(owner, rtl, primaryX, primaryY,
-    secondaryX, secondaryY, opt_onHide) {
+DropDownDiv.show = function(
+    owner, rtl, primaryX, primaryY, secondaryX, secondaryY, opt_onHide) {
   ownerInternal = owner;
   onHide = opt_onHide || null;
   // Set direction.
@@ -381,8 +376,7 @@ DropDownDiv.show = function(owner, rtl, primaryX, primaryY,
 
   const mainWorkspace =
       /** @type {!WorkspaceSvg} */ (common.getMainWorkspace());
-  rendererClassName =
-      mainWorkspace.getRenderer().getClassName();
+  rendererClassName = mainWorkspace.getRenderer().getClassName();
   themeClassName = mainWorkspace.getTheme().getClassName();
   dom.addClass(div, rendererClassName);
   dom.addClass(div, themeClassName);
@@ -396,8 +390,7 @@ DropDownDiv.show = function(owner, rtl, primaryX, primaryY,
   // Using both `left`, `top` for the initial translation and then `translate`
   // for the animated transition to final X, Y is a workaround.
 
-  return positionInternal(
-      primaryX, primaryY, secondaryX, secondaryY);
+  return positionInternal(primaryX, primaryY, secondaryX, secondaryY);
 };
 
 /**
@@ -433,36 +426,31 @@ DropDownDiv.getBoundsInfo_ = function() {
  * @return {!DropDownDiv.PositionMetrics} Various final metrics,
  *     including rendered positions for drop-down and arrow.
  */
-DropDownDiv.getPositionMetrics_ = function(primaryX, primaryY,
-    secondaryX, secondaryY) {
+DropDownDiv.getPositionMetrics_ = function(
+    primaryX, primaryY, secondaryX, secondaryY) {
   const boundsInfo = DropDownDiv.getBoundsInfo_();
   const divSize = style.getSize(
       /** @type {!Element} */ (divInternal));
 
   // Can we fit in-bounds below the target?
   if (primaryY + divSize.height < boundsInfo.bottom) {
-    return getPositionBelowMetrics(
-        primaryX, primaryY, boundsInfo, divSize);
+    return getPositionBelowMetrics(primaryX, primaryY, boundsInfo, divSize);
   }
   // Can we fit in-bounds above the target?
   if (secondaryY - divSize.height > boundsInfo.top) {
-    return getPositionAboveMetrics(
-        secondaryX, secondaryY, boundsInfo, divSize);
+    return getPositionAboveMetrics(secondaryX, secondaryY, boundsInfo, divSize);
   }
   // Can we fit outside the workspace bounds (but inside the window) below?
   if (primaryY + divSize.height < document.documentElement.clientHeight) {
-    return getPositionBelowMetrics(
-        primaryX, primaryY, boundsInfo, divSize);
+    return getPositionBelowMetrics(primaryX, primaryY, boundsInfo, divSize);
   }
   // Can we fit outside the workspace bounds (but inside the window) above?
   if (secondaryY - divSize.height > document.documentElement.clientTop) {
-    return getPositionAboveMetrics(
-        secondaryX, secondaryY, boundsInfo, divSize);
+    return getPositionAboveMetrics(secondaryX, secondaryY, boundsInfo, divSize);
   }
 
   // Last resort, render at top of page.
-  return getPositionTopOfPageMetrics(
-      primaryX, boundsInfo, divSize);
+  return getPositionTopOfPageMetrics(primaryX, boundsInfo, divSize);
 };
 
 /**
@@ -478,17 +466,15 @@ DropDownDiv.getPositionMetrics_ = function(primaryX, primaryY,
  */
 const getPositionBelowMetrics = function(
     primaryX, primaryY, boundsInfo, divSize) {
-
   const xCoords = DropDownDiv.getPositionX(
       primaryX, boundsInfo.left, boundsInfo.right, divSize.width);
 
-  const arrowY = -(DropDownDiv.ARROW_SIZE / 2 +
-      DropDownDiv.BORDER_SIZE);
+  const arrowY = -(DropDownDiv.ARROW_SIZE / 2 + DropDownDiv.BORDER_SIZE);
   const finalY = primaryY + DropDownDiv.PADDING_Y;
 
   return {
     initialX: xCoords.divX,
-    initialY : primaryY,
+    initialY: primaryY,
     finalX: xCoords.divX,  // X position remains constant during animation.
     finalY: finalY,
     arrowX: xCoords.arrowX,
@@ -513,7 +499,6 @@ const getPositionBelowMetrics = function(
  */
 const getPositionAboveMetrics = function(
     secondaryX, secondaryY, boundsInfo, divSize) {
-
   const xCoords = DropDownDiv.getPositionX(
       secondaryX, boundsInfo.left, boundsInfo.right, divSize.width);
 
@@ -524,7 +509,7 @@ const getPositionAboveMetrics = function(
 
   return {
     initialX: xCoords.divX,
-    initialY : initialY,
+    initialY: initialY,
     finalX: xCoords.divX,  // X position remains constant during animation.
     finalY: finalY,
     arrowX: xCoords.arrowX,
@@ -544,16 +529,14 @@ const getPositionAboveMetrics = function(
  * @return {!DropDownDiv.PositionMetrics} Various final metrics,
  *     including rendered positions for drop-down and arrow.
  */
-const getPositionTopOfPageMetrics = function(
-    sourceX, boundsInfo, divSize) {
-
+const getPositionTopOfPageMetrics = function(sourceX, boundsInfo, divSize) {
   const xCoords = DropDownDiv.getPositionX(
       sourceX, boundsInfo.left, boundsInfo.right, divSize.width);
 
   // No need to provide arrow-specific information because it won't be visible.
   return {
     initialX: xCoords.divX,
-    initialY : 0,
+    initialY: 0,
     finalX: xCoords.divX,  // X position remains constant during animation.
     finalY: 0,             // Y position remains constant during animation.
     arrowAtTop: null,
@@ -593,14 +576,10 @@ DropDownDiv.getPositionX = function(
   const horizPadding = DropDownDiv.ARROW_HORIZONTAL_PADDING;
   // Clamp the arrow position so that it stays attached to the dropdowndiv.
   relativeArrowX = math.clamp(
-      horizPadding,
-      relativeArrowX,
+      horizPadding, relativeArrowX,
       divWidth - horizPadding - DropDownDiv.ARROW_SIZE);
 
-  return {
-    arrowX: relativeArrowX,
-    divX: divX
-  };
+  return {arrowX: relativeArrowX, divX: divX};
 };
 
 /**
@@ -640,10 +619,9 @@ DropDownDiv.hide = function() {
   div.style.transform = 'translate(0, 0)';
   div.style.opacity = 0;
   // Finish animation - reset all values to default.
-  animateOutTimer =
-      setTimeout(function() {
-        DropDownDiv.hideWithoutAnimation();
-      }, DropDownDiv.ANIMATION_TIME * 1000);
+  animateOutTimer = setTimeout(function() {
+    DropDownDiv.hideWithoutAnimation();
+  }, DropDownDiv.ANIMATION_TIME * 1000);
   if (onHide) {
     onHide();
     onHide = null;
@@ -700,19 +678,19 @@ DropDownDiv.hideWithoutAnimation = function() {
  *    in absolute px.
  * @return {boolean} True if the menu rendered at the primary origin point.
  */
-const positionInternal = function(
-    primaryX, primaryY, secondaryX, secondaryY) {
-  const metrics = getPositionMetrics(primaryX, primaryY,
-      secondaryX, secondaryY);
+const positionInternal = function(primaryX, primaryY, secondaryX, secondaryY) {
+  const metrics =
+      getPositionMetrics(primaryX, primaryY, secondaryX, secondaryY);
 
   // Update arrow CSS.
   if (metrics.arrowVisible) {
     arrowInternal.style.display = '';
-    arrowInternal.style.transform = 'translate(' +
-        metrics.arrowX + 'px,' + metrics.arrowY + 'px) rotate(45deg)';
-    arrowInternal.setAttribute('class', metrics.arrowAtTop ?
-        'blocklyDropDownArrow blocklyArrowTop' :
-        'blocklyDropDownArrow blocklyArrowBottom');
+    arrowInternal.style.transform = 'translate(' + metrics.arrowX + 'px,' +
+        metrics.arrowY + 'px) rotate(45deg)';
+    arrowInternal.setAttribute(
+        'class',
+        metrics.arrowAtTop ? 'blocklyDropDownArrow blocklyArrowTop' :
+                             'blocklyDropDownArrow blocklyArrowBottom');
   } else {
     arrowInternal.style.display = 'none';
   }
@@ -754,17 +732,15 @@ DropDownDiv.repositionForWindowResize = function() {
   if (ownerInternal) {
     const field = /** @type {!Field} */ (ownerInternal);
     const block = /** @type {!BlockSvg} */ (field.getSourceBlock());
-    const bBox = positionToField ?
-        getScaledBboxOfField(field) :
-        getScaledBboxOfBlock(block);
+    const bBox = positionToField ? getScaledBboxOfField(field) :
+                                   getScaledBboxOfBlock(block);
     // If we can fit it, render below the block.
     const primaryX = bBox.left + (bBox.right - bBox.left) / 2;
     const primaryY = bBox.bottom;
     // If we can't fit it, render above the entire parent block.
     const secondaryX = primaryX;
     const secondaryY = bBox.top;
-    positionInternal(
-        primaryX, primaryY, secondaryX, secondaryY);
+    positionInternal(primaryX, primaryY, secondaryX, secondaryY);
   } else {
     DropDownDiv.hide();
   }

From 3d75bd6493382c926fd4250904a6ec6a5a9a0814 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Fri, 23 Jul 2021 16:06:37 -0700
Subject: [PATCH 721/833] Attempt to fix tests

---
 core/dropdowndiv.js              |  14 ++--
 scripts/gulpfiles/build_tasks.js |   2 +
 tests/deps.js                    | 107 +++++++++++++++++++++++++++++++
 tests/mocha/dropdowndiv_test.js  |  33 ++++++----
 tests/mocha/index.html           |   2 +-
 5 files changed, 139 insertions(+), 19 deletions(-)

diff --git a/core/dropdowndiv.js b/core/dropdowndiv.js
index ac9ebdfc4..fb4a31050 100644
--- a/core/dropdowndiv.js
+++ b/core/dropdowndiv.js
@@ -398,7 +398,7 @@ DropDownDiv.show = function(
  * @return {!DropDownDiv.BoundsInfo} An object containing size
  *     information about the bounding element (bounding box and width/height).
  */
-DropDownDiv.getBoundsInfo_ = function() {
+let getBoundsInfo = function() {
   const boundPosition = style.getPageOffset(
       /** @type {!Element} */ (boundsElementInternal));
   const boundSize = style.getSize(
@@ -426,9 +426,9 @@ DropDownDiv.getBoundsInfo_ = function() {
  * @return {!DropDownDiv.PositionMetrics} Various final metrics,
  *     including rendered positions for drop-down and arrow.
  */
-DropDownDiv.getPositionMetrics_ = function(
+const getPositionMetrics = function(
     primaryX, primaryY, secondaryX, secondaryY) {
-  const boundsInfo = DropDownDiv.getBoundsInfo_();
+  const boundsInfo = getBoundsInfo();
   const divSize = style.getSize(
       /** @type {!Element} */ (divInternal));
 
@@ -745,5 +745,11 @@ DropDownDiv.repositionForWindowResize = function() {
     DropDownDiv.hide();
   }
 };
-
 exports = DropDownDiv;
+
+exports.testOnly_setGetBoundsInfo = function(getBoundsInfoMock) {
+  goog.setTestOnly();
+  getBoundsInfo = getBoundsInfoMock;
+};
+
+exports.testOnly_getPositionMetrics = getPositionMetrics;
diff --git a/scripts/gulpfiles/build_tasks.js b/scripts/gulpfiles/build_tasks.js
index 318304189..f5f331a7a 100644
--- a/scripts/gulpfiles/build_tasks.js
+++ b/scripts/gulpfiles/build_tasks.js
@@ -341,6 +341,8 @@ function buildDeps(done) {
     closurePath,
     'core',
     'blocks',
+      'generators',
+      'tests/mocha'
   ];
   const args = roots.map(root => `--root '${root}' `).join('');
   execSync(`closure-make-deps ${args} > tests/deps.js`, {stdio: 'inherit'});
diff --git a/tests/deps.js b/tests/deps.js
index 9504969e7..c271c44fd 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -211,5 +211,112 @@ goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
+goog.addDependency('../../generators/dart.js', ['Blockly.Dart'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.string']);
+goog.addDependency('../../generators/dart/colour.js', ['Blockly.Dart.colour'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/lists.js', ['Blockly.Dart.lists'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/logic.js', ['Blockly.Dart.logic'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/loops.js', ['Blockly.Dart.loops'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/math.js', ['Blockly.Dart.math'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/procedures.js', ['Blockly.Dart.procedures'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/text.js', ['Blockly.Dart.texts'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/variables.js', ['Blockly.Dart.variables'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/variables_dynamic.js', ['Blockly.Dart.variablesDynamic'], ['Blockly.Dart', 'Blockly.Dart.variables']);
+goog.addDependency('../../generators/javascript.js', ['Blockly.JavaScript'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.global', 'Blockly.utils.object', 'Blockly.utils.string']);
+goog.addDependency('../../generators/javascript/colour.js', ['Blockly.JavaScript.colour'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/lists.js', ['Blockly.JavaScript.lists'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/logic.js', ['Blockly.JavaScript.logic'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/loops.js', ['Blockly.JavaScript.loops'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/math.js', ['Blockly.JavaScript.math'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/procedures.js', ['Blockly.JavaScript.procedures'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/text.js', ['Blockly.JavaScript.texts'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/variables.js', ['Blockly.JavaScript.variables'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/variables_dynamic.js', ['Blockly.JavaScript.variablesDynamic'], ['Blockly.JavaScript', 'Blockly.JavaScript.variables']);
+goog.addDependency('../../generators/lua.js', ['Blockly.Lua'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.utils.string']);
+goog.addDependency('../../generators/lua/colour.js', ['Blockly.Lua.colour'], ['Blockly.Lua']);
+goog.addDependency('../../generators/lua/lists.js', ['Blockly.Lua.lists'], ['Blockly.Lua']);
+goog.addDependency('../../generators/lua/logic.js', ['Blockly.Lua.logic'], ['Blockly.Lua']);
+goog.addDependency('../../generators/lua/loops.js', ['Blockly.Lua.loops'], ['Blockly.Lua']);
+goog.addDependency('../../generators/lua/math.js', ['Blockly.Lua.math'], ['Blockly.Lua']);
+goog.addDependency('../../generators/lua/procedures.js', ['Blockly.Lua.procedures'], ['Blockly.Lua']);
+goog.addDependency('../../generators/lua/text.js', ['Blockly.Lua.texts'], ['Blockly.Lua'], {'lang': 'es5'});
+goog.addDependency('../../generators/lua/variables.js', ['Blockly.Lua.variables'], ['Blockly.Lua']);
+goog.addDependency('../../generators/lua/variables_dynamic.js', ['Blockly.Lua.variablesDynamic'], ['Blockly.Lua', 'Blockly.Lua.variables']);
+goog.addDependency('../../generators/php.js', ['Blockly.PHP'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.utils.string']);
+goog.addDependency('../../generators/php/colour.js', ['Blockly.PHP.colour'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/lists.js', ['Blockly.PHP.lists'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/logic.js', ['Blockly.PHP.logic'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/loops.js', ['Blockly.PHP.loops'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/math.js', ['Blockly.PHP.math'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/procedures.js', ['Blockly.PHP.procedures'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/text.js', ['Blockly.PHP.texts'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/variables.js', ['Blockly.PHP.variables'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/variables_dynamic.js', ['Blockly.PHP.variablesDynamic'], ['Blockly.PHP', 'Blockly.PHP.variables']);
+goog.addDependency('../../generators/python.js', ['Blockly.Python'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.string']);
+goog.addDependency('../../generators/python/colour.js', ['Blockly.Python.colour'], ['Blockly.Python']);
+goog.addDependency('../../generators/python/lists.js', ['Blockly.Python.lists'], ['Blockly.Python']);
+goog.addDependency('../../generators/python/logic.js', ['Blockly.Python.logic'], ['Blockly.Python']);
+goog.addDependency('../../generators/python/loops.js', ['Blockly.Python.loops'], ['Blockly.Python']);
+goog.addDependency('../../generators/python/math.js', ['Blockly.Python.math'], ['Blockly.Python']);
+goog.addDependency('../../generators/python/procedures.js', ['Blockly.Python.procedures'], ['Blockly.Python']);
+goog.addDependency('../../generators/python/text.js', ['Blockly.Python.texts'], ['Blockly.Python']);
+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', [], [], {'lang': 'es5'});
+goog.addDependency('../../tests/mocha/block_json_test.js', [], [], {'lang': 'es5'});
+goog.addDependency('../../tests/mocha/block_test.js', [], [], {'lang': 'es6'});
+goog.addDependency('../../tests/mocha/comment_test.js', [], [], {'lang': 'es5'});
+goog.addDependency('../../tests/mocha/connection_checker_test.js', [], []);
+goog.addDependency('../../tests/mocha/connection_db_test.js', [], []);
+goog.addDependency('../../tests/mocha/connection_test.js', [], [], {'lang': 'es6'});
+goog.addDependency('../../tests/mocha/contextmenu_items_test.js', [], []);
+goog.addDependency('../../tests/mocha/cursor_test.js', [], [], {'lang': 'es5'});
+goog.addDependency('../../tests/mocha/dropdowndiv_test.js', ['DropDownDivTests'], ['Blockly.DropDownDiv'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/event_test.js', [], ['Blockly.WorkspaceComment'], {'lang': 'es6'});
+goog.addDependency('../../tests/mocha/extensions_test.js', [], [], {'lang': 'es6'});
+goog.addDependency('../../tests/mocha/field_angle_test.js', [], [], {'lang': 'es5'});
+goog.addDependency('../../tests/mocha/field_checkbox_test.js', [], [], {'lang': 'es5'});
+goog.addDependency('../../tests/mocha/field_colour_test.js', [], [], {'lang': 'es5'});
+goog.addDependency('../../tests/mocha/field_dropdown_test.js', [], [], {'lang': 'es6'});
+goog.addDependency('../../tests/mocha/field_image_test.js', [], [], {'lang': 'es5'});
+goog.addDependency('../../tests/mocha/field_label_serializable_test.js', [], [], {'lang': 'es5'});
+goog.addDependency('../../tests/mocha/field_label_test.js', [], [], {'lang': 'es5'});
+goog.addDependency('../../tests/mocha/field_multilineinput_test.js', [], [], {'lang': 'es6'});
+goog.addDependency('../../tests/mocha/field_number_test.js', [], [], {'lang': 'es5'});
+goog.addDependency('../../tests/mocha/field_registry_test.js', [], [], {'lang': 'es5'});
+goog.addDependency('../../tests/mocha/field_test.js', [], [], {'lang': 'es6'});
+goog.addDependency('../../tests/mocha/field_textinput_test.js', [], [], {'lang': 'es5'});
+goog.addDependency('../../tests/mocha/field_variable_test.js', [], [], {'lang': 'es6'});
+goog.addDependency('../../tests/mocha/flyout_test.js', [], [], {'lang': 'es5'});
+goog.addDependency('../../tests/mocha/generator_test.js', [], ['Blockly.Dart', 'Blockly.JavaScript', 'Blockly.Lua', 'Blockly.PHP', 'Blockly.Python']);
+goog.addDependency('../../tests/mocha/gesture_test.js', [], []);
+goog.addDependency('../../tests/mocha/input_test.js', [], [], {'lang': 'es5'});
+goog.addDependency('../../tests/mocha/insertion_marker_test.js', [], []);
+goog.addDependency('../../tests/mocha/json_test.js', [], [], {'lang': 'es6'});
+goog.addDependency('../../tests/mocha/keydown_test.js', [], []);
+goog.addDependency('../../tests/mocha/logic_ternary_test.js', [], [], {'lang': 'es6'});
+goog.addDependency('../../tests/mocha/metrics_test.js', [], []);
+goog.addDependency('../../tests/mocha/names_test.js', [], []);
+goog.addDependency('../../tests/mocha/procedures_test.js', [], ['Blockly.Blocks.procedures', 'Blockly.Msg'], {'lang': 'es6'});
+goog.addDependency('../../tests/mocha/procedures_test_helpers.js', [], [], {'lang': 'es6'});
+goog.addDependency('../../tests/mocha/registry_test.js', [], [], {'lang': 'es6'});
+goog.addDependency('../../tests/mocha/run_mocha_tests_in_browser.js', [], [], {'lang': 'es8'});
+goog.addDependency('../../tests/mocha/shortcut_registry_test.js', [], [], {'lang': 'es5'});
+goog.addDependency('../../tests/mocha/test_helpers.js', [], [], {'lang': 'es6'});
+goog.addDependency('../../tests/mocha/theme_test.js', [], [], {'lang': 'es5'});
+goog.addDependency('../../tests/mocha/toolbox_helper.js', [], [], {'lang': 'es5'});
+goog.addDependency('../../tests/mocha/toolbox_test.js', [], [], {'lang': 'es5'});
+goog.addDependency('../../tests/mocha/tooltip_test.js', [], [], {'lang': 'es6'});
+goog.addDependency('../../tests/mocha/trashcan_test.js', [], []);
+goog.addDependency('../../tests/mocha/utils_test.js', [], []);
+goog.addDependency('../../tests/mocha/variable_map_test.js', [], [], {'lang': 'es5'});
+goog.addDependency('../../tests/mocha/variable_model_test.js', [], []);
+goog.addDependency('../../tests/mocha/variables_test.js', [], []);
+goog.addDependency('../../tests/mocha/widget_div_test.js', [], []);
+goog.addDependency('../../tests/mocha/workspace_comment_test.js', [], ['Blockly.WorkspaceComment']);
+goog.addDependency('../../tests/mocha/workspace_svg_test.js', [], [], {'lang': 'es6'});
+goog.addDependency('../../tests/mocha/workspace_test.js', [], [], {'lang': 'es6'});
+goog.addDependency('../../tests/mocha/xml_test.js', [], [], {'lang': 'es5'});
+goog.addDependency('../../tests/mocha/zoom_controls_test.js', [], []);
 goog.addDependency('base.js', [], []);
 
diff --git a/tests/mocha/dropdowndiv_test.js b/tests/mocha/dropdowndiv_test.js
index c51c83dea..332cac467 100644
--- a/tests/mocha/dropdowndiv_test.js
+++ b/tests/mocha/dropdowndiv_test.js
@@ -4,19 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('DropDownDivTests');
+goog.setTestOnly();
+
+const DropDownDiv = goog.require('Blockly.DropDownDiv');
 suite('DropDownDiv', function() {
   suite('Positioning', function() {
     setup(function() {
       sharedTestSetup.call(this);
-      this.boundsStub = sinon.stub(Blockly.DropDownDiv, 'getBoundsInfo_')
-          .returns({
-            left: 0,
-            right: 100,
-            top: 0,
-            bottom: 100,
-            width: 100,
-            height: 100
-          });
+      DropDownDiv.testOnly_setGetBoundsInfo(function() {
+        return {
+          left: 0,
+          right: 100,
+          top: 0,
+          bottom: 100,
+          width: 100,
+          height: 100
+        };
+      });
       this.sizeStub = sinon.stub(Blockly.utils.style, 'getSize')
           .returns({
             width: 60,
@@ -31,7 +36,7 @@ suite('DropDownDiv', function() {
       sharedTestTeardown.call(this);
     });
     test('Below, in Bounds', function() {
-      var metrics = Blockly.DropDownDiv.getPositionMetrics_(50, 0, 50, -10);
+      var metrics = DropDownDiv.testOnly_getPositionMetrics(50, 0, 50, -10);
       // "Above" in value actually means below in render.
       chai.assert.isAtLeast(metrics.initialY, 0);
       chai.assert.isAbove(metrics.finalY, 0);
@@ -39,7 +44,7 @@ suite('DropDownDiv', function() {
       chai.assert.isTrue(metrics.arrowAtTop);
     });
     test('Above, in Bounds', function() {
-      var metrics = Blockly.DropDownDiv.getPositionMetrics_(50, 100, 50, 90);
+      var metrics = DropDownDiv.testOnly_getPositionMetrics(50, 100, 50, 90);
       // "Below" in value actually means above in render.
       chai.assert.isAtMost(metrics.initialY, 100);
       chai.assert.isBelow(metrics.finalY, 100);
@@ -47,7 +52,7 @@ suite('DropDownDiv', function() {
       chai.assert.isFalse(metrics.arrowAtTop);
     });
     test('Below, out of Bounds', function() {
-      var metrics = Blockly.DropDownDiv.getPositionMetrics_(50, 60, 50, 50);
+      var metrics = DropDownDiv.testOnly_getPositionMetrics(50, 60, 50, 50);
       // "Above" in value actually means below in render.
       chai.assert.isAtLeast(metrics.initialY, 60);
       chai.assert.isAbove(metrics.finalY, 60);
@@ -55,7 +60,7 @@ suite('DropDownDiv', function() {
       chai.assert.isTrue(metrics.arrowAtTop);
     });
     test('Above, in Bounds', function() {
-      var metrics = Blockly.DropDownDiv.getPositionMetrics_(50, 100, 50, 90);
+      var metrics = DropDownDiv.testOnly_getPositionMetrics(50, 100, 50, 90);
       // "Below" in value actually means above in render.
       chai.assert.isAtMost(metrics.initialY, 100);
       chai.assert.isBelow(metrics.finalY, 100);
@@ -64,7 +69,7 @@ suite('DropDownDiv', function() {
     });
     test('No Solution, Render At Top', function() {
       this.clientHeightStub.get(function() { return 100; });
-      var metrics = Blockly.DropDownDiv.getPositionMetrics_(50, 60, 50, 50);
+      var metrics = DropDownDiv.testOnly_getPositionMetrics(50, 60, 50, 50);
       // "Above" in value actually means below in render.
       chai.assert.equal(metrics.initialY, 0);
       chai.assert.equal(metrics.finalY, 0);
diff --git a/tests/mocha/index.html b/tests/mocha/index.html
index 71b7de6b4..ee7480b92 100644
--- a/tests/mocha/index.html
+++ b/tests/mocha/index.html
@@ -60,7 +60,7 @@
     <script src="connection_test.js"></script>
     <script src="contextmenu_items_test.js"></script>
     <script src="cursor_test.js"></script>
-    <script src="dropdowndiv_test.js"></script>
+    <script>goog.require('DropDownDivTests');</script>
     <script src="event_test.js"></script>
     <script src="extensions_test.js"></script>
     <script src="field_test.js"></script>

From 9939915252a4161e7be140d7b8f629b45b04183c Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 29 Jul 2021 17:18:19 -0700
Subject: [PATCH 722/833] Address PR comments

---
 core/dropdowndiv.js              | 204 ++++++++++++++++---------------
 scripts/gulpfiles/build_tasks.js |   4 +-
 2 files changed, 110 insertions(+), 98 deletions(-)

diff --git a/core/dropdowndiv.js b/core/dropdowndiv.js
index fb4a31050..86f40853f 100644
--- a/core/dropdowndiv.js
+++ b/core/dropdowndiv.js
@@ -38,25 +38,6 @@ const style = goog.require('Blockly.utils.style');
  */
 const DropDownDiv = function() {};
 
-/**
- * Drop-downs will appear within the bounds of this element if possible.
- * Set in DropDownDiv.setBoundsElement.
- * @type {Element}
- */
-let boundsElementInternal = null;
-
-/**
- * The object currently using the drop-down.
- * @type {Object}
- */
-let ownerInternal = null;
-
-/**
- * Whether the dropdown was positioned to a field or the source block.
- * @type {?boolean}
- */
-let positionToField = null;
-
 /**
  * Arrow size in px. Should match the value in CSS
  * (need to position pre-render).
@@ -99,44 +80,73 @@ DropDownDiv.ANIMATION_TIME = 0.25;
  * Timer for animation out, to be cleared if we need to immediately hide
  * without disrupting new shows.
  * @type {?number}
+ * @private
  */
-let animateOutTimer = null;
+DropDownDiv.animateOutTimer_ = null;
 
 /**
  * Callback for when the drop-down is hidden.
  * @type {?Function}
+ * @private
  */
-let onHide = null;
+DropDownDiv.onHide_ = null;
 
 /**
  * A class name representing the current owner's workspace renderer.
  * @type {string}
+ * @private
  */
-let rendererClassName = '';
+DropDownDiv.rendererClassName_ = '';
 
 /**
  * A class name representing the current owner's workspace theme.
  * @type {string}
+ * @private
  */
-let themeClassName = '';
-
-/**
- * The content element.
- * @type {?Element}
- */
-let divInternal = null;
+DropDownDiv.themeClassName_ = '';
 
 /**
  * The content element.
  * @type {!Element}
+ * @private
  */
-let contentInternal;
+DropDownDiv.DIV_;
+
+/**
+ * The content element.
+ * @type {!Element}
+ * @private
+ */
+DropDownDiv.content_;
 
 /**
  * The arrow element.
  * @type {!Element}
+ * @private
  */
-let arrowInternal;
+DropDownDiv.arrow_;
+
+/**
+ * Drop-downs will appear within the bounds of this element if possible.
+ * Set in DropDownDiv.setBoundsElement.
+ * @type {Element}
+ * @private
+ */
+DropDownDiv.boundsElement_ = null;
+
+/**
+ * The object currently using the drop-down.
+ * @type {Object}
+ * @private
+ */
+DropDownDiv.owner_ = null;
+
+/**
+ * Whether the dropdown was positioned to a field or the source block.
+ * @type {?boolean}
+ * @private
+ */
+DropDownDiv.positionToField_ = null;
 
 /**
  * Dropdown bounds info object used to encapsulate sizing information about a
@@ -172,40 +182,40 @@ DropDownDiv.PositionMetrics;
  * @package
  */
 DropDownDiv.createDom = function() {
-  if (divInternal) {
+  if (DropDownDiv.DIV_) {
     return;  // Already created.
   }
-  const div = document.createElement('div');
-  div.className = 'blocklyDropDownDiv';
-  const container = common.getParentContainer || document.body;
-  container.appendChild(div);
+  const containerDiv = document.createElement('div');
+  containerDiv.className = 'blocklyDropDownDiv';
+  const parentDiv = Blockly.parentContainer || document.body;
+  parentDiv.appendChild(containerDiv);
 
-  divInternal = div;
+  DropDownDiv.DIV_ = containerDiv;
 
   const content = document.createElement('div');
   content.className = 'blocklyDropDownContent';
-  div.appendChild(content);
-  contentInternal = content;
+  DropDownDiv.DIV_.appendChild(content);
+  DropDownDiv.content_ = content;
 
   const arrow = document.createElement('div');
   arrow.className = 'blocklyDropDownArrow';
-  div.appendChild(arrow);
-  arrowInternal = arrow;
+  DropDownDiv.DIV_.appendChild(arrow);
+  DropDownDiv.arrow_ = arrow;
 
-  divInternal.style.opacity = 0;
+  DropDownDiv.DIV_.style.opacity = 0;
 
   // Transition animation for transform: translate() and opacity.
-  divInternal.style.transition = 'transform ' + DropDownDiv.ANIMATION_TIME +
+  DropDownDiv.DIV_.style.transition = 'transform ' + DropDownDiv.ANIMATION_TIME +
       's, ' +
       'opacity ' + DropDownDiv.ANIMATION_TIME + 's';
 
   // Handle focusin/out events to add a visual indicator when
   // a child is focused or blurred.
-  div.addEventListener('focusin', function() {
-    dom.addClass(div, 'blocklyFocused');
+  DropDownDiv.DIV_.addEventListener('focusin', function() {
+    dom.addClass(DropDownDiv.DIV_, 'blocklyFocused');
   });
-  div.addEventListener('focusout', function() {
-    dom.removeClass(div, 'blocklyFocused');
+  DropDownDiv.DIV_.addEventListener('focusout', function() {
+    dom.removeClass(DropDownDiv.DIV_, 'blocklyFocused');
   });
 };
 
@@ -215,7 +225,7 @@ DropDownDiv.createDom = function() {
  * @param {Element} boundsElement Element to bind drop-down to.
  */
 DropDownDiv.setBoundsElement = function(boundsElement) {
-  boundsElementInternal = boundsElement;
+  DropDownDiv.boundsElement_ = boundsElement;
 };
 
 /**
@@ -223,15 +233,15 @@ DropDownDiv.setBoundsElement = function(boundsElement) {
  * @return {!Element} Div to populate with content.
  */
 DropDownDiv.getContentDiv = function() {
-  return contentInternal;
+  return DropDownDiv.content_;
 };
 
 /**
  * Clear the content of the drop-down.
  */
 DropDownDiv.clearContent = function() {
-  contentInternal.textContent = '';
-  contentInternal.style.width = '';
+  DropDownDiv.content_.textContent = '';
+  DropDownDiv.content_.style.width = '';
 };
 
 /**
@@ -240,8 +250,8 @@ DropDownDiv.clearContent = function() {
  * @param {string} borderColour Any CSS colour for the border.
  */
 DropDownDiv.setColour = function(backgroundColour, borderColour) {
-  divInternal.style.backgroundColor = backgroundColour;
-  divInternal.style.borderColor = borderColour;
+  DropDownDiv.DIV_.style.backgroundColor = backgroundColour;
+  DropDownDiv.DIV_.style.borderColor = borderColour;
 };
 
 /**
@@ -277,7 +287,7 @@ DropDownDiv.showPositionedByBlock = function(
  */
 DropDownDiv.showPositionedByField = function(
     field, opt_onHide, opt_secondaryYOffset) {
-  positionToField = true;
+  DropDownDiv.positionToField_ = true;
   return showPositionedByRect(
       getScaledBboxOfField(field), field, opt_onHide, opt_secondaryYOffset);
 };
@@ -368,18 +378,18 @@ const showPositionedByRect = function(
  */
 DropDownDiv.show = function(
     owner, rtl, primaryX, primaryY, secondaryX, secondaryY, opt_onHide) {
-  ownerInternal = owner;
-  onHide = opt_onHide || null;
+  DropDownDiv.owner_ = owner;
+  DropDownDiv.onHide_ = opt_onHide || null;
   // Set direction.
-  const div = divInternal;
+  const div = DropDownDiv.DIV_;
   div.style.direction = rtl ? 'rtl' : 'ltr';
 
   const mainWorkspace =
-      /** @type {!WorkspaceSvg} */ (common.getMainWorkspace());
-  rendererClassName = mainWorkspace.getRenderer().getClassName();
-  themeClassName = mainWorkspace.getTheme().getClassName();
-  dom.addClass(div, rendererClassName);
-  dom.addClass(div, themeClassName);
+      /** @type {!WorkspaceSvg} */ (Blockly.getMainWorkspace());
+  DropDownDiv.rendererClassName_ = mainWorkspace.getRenderer().getClassName();
+  DropDownDiv.themeClassName_ = mainWorkspace.getTheme().getClassName();
+  dom.addClass(div, DropDownDiv.rendererClassName_);
+  dom.addClass(div, DropDownDiv.themeClassName_);
 
   // When we change `translate` multiple times in close succession,
   // Chrome may choose to wait and apply them all at once.
@@ -400,9 +410,9 @@ DropDownDiv.show = function(
  */
 let getBoundsInfo = function() {
   const boundPosition = style.getPageOffset(
-      /** @type {!Element} */ (boundsElementInternal));
+      /** @type {!Element} */ (DropDownDiv.boundsElement_));
   const boundSize = style.getSize(
-      /** @type {!Element} */ (boundsElementInternal));
+      /** @type {!Element} */ (DropDownDiv.boundsElement_));
 
   return {
     left: boundPosition.x,
@@ -430,7 +440,7 @@ const getPositionMetrics = function(
     primaryX, primaryY, secondaryX, secondaryY) {
   const boundsInfo = getBoundsInfo();
   const divSize = style.getSize(
-      /** @type {!Element} */ (divInternal));
+      /** @type {!Element} */ (DropDownDiv.DIV_));
 
   // Can we fit in-bounds below the target?
   if (primaryY + divSize.height < boundsInfo.bottom) {
@@ -587,7 +597,7 @@ DropDownDiv.getPositionX = function(
  * @return {boolean} True if visible.
  */
 DropDownDiv.isVisible = function() {
-  return !!ownerInternal;
+  return !!DropDownDiv.owner_;
 };
 
 /**
@@ -598,7 +608,7 @@ DropDownDiv.isVisible = function() {
  * @return {boolean} True if hidden.
  */
 DropDownDiv.hideIfOwner = function(owner, opt_withoutAnimation) {
-  if (ownerInternal === owner) {
+  if (DropDownDiv.owner_ === owner) {
     if (opt_withoutAnimation) {
       DropDownDiv.hideWithoutAnimation();
     } else {
@@ -614,17 +624,16 @@ DropDownDiv.hideIfOwner = function(owner, opt_withoutAnimation) {
  */
 DropDownDiv.hide = function() {
   // Start the animation by setting the translation and fading out.
-  const div = divInternal;
   // Reset to (initialX, initialY) - i.e., no translation.
-  div.style.transform = 'translate(0, 0)';
-  div.style.opacity = 0;
+  DropDownDiv.DIV_.style.transform = 'translate(0, 0)';
+  DropDownDiv.DIV_.style.opacity = 0;
   // Finish animation - reset all values to default.
-  animateOutTimer = setTimeout(function() {
+  DropDownDiv.animateOutTimer_ = setTimeout(function() {
     DropDownDiv.hideWithoutAnimation();
   }, DropDownDiv.ANIMATION_TIME * 1000);
-  if (onHide) {
-    onHide();
-    onHide = null;
+  if (DropDownDiv.onHide_) {
+    DropDownDiv.onHide_();
+    DropDownDiv.onHide_ = null;
   }
 };
 
@@ -635,13 +644,13 @@ DropDownDiv.hideWithoutAnimation = function() {
   if (!DropDownDiv.isVisible()) {
     return;
   }
-  if (animateOutTimer) {
-    clearTimeout(animateOutTimer);
+  if (DropDownDiv.animateOutTimer_) {
+    clearTimeout(DropDownDiv.animateOutTimer_);
   }
 
   // Reset style properties in case this gets called directly
   // instead of hide() - see discussion on #2551.
-  const div = divInternal;
+  const div = DropDownDiv.DIV_;
   div.style.transform = '';
   div.style.left = '';
   div.style.top = '';
@@ -650,20 +659,20 @@ DropDownDiv.hideWithoutAnimation = function() {
   div.style.backgroundColor = '';
   div.style.borderColor = '';
 
-  if (onHide) {
-    onHide();
-    onHide = null;
+  if (DropDownDiv.onHide_) {
+    DropDownDiv.onHide_();
+    DropDownDiv.onHide_ = null;
   }
   DropDownDiv.clearContent();
-  ownerInternal = null;
+  DropDownDiv.owner_ = null;
 
-  if (rendererClassName) {
-    dom.removeClass(div, rendererClassName);
-    rendererClassName = '';
+  if (DropDownDiv.rendererClassName_) {
+    dom.removeClass(div, DropDownDiv.rendererClassName_);
+    DropDownDiv.rendererClassName_ = '';
   }
-  if (themeClassName) {
-    dom.removeClass(div, themeClassName);
-    themeClassName = '';
+  if (DropDownDiv.themeClassName_) {
+    dom.removeClass(div, DropDownDiv.themeClassName_);
+    DropDownDiv.themeClassName_ = '';
   }
   (/** @type {!WorkspaceSvg} */ (common.getMainWorkspace())).markFocused();
 };
@@ -684,15 +693,15 @@ const positionInternal = function(primaryX, primaryY, secondaryX, secondaryY) {
 
   // Update arrow CSS.
   if (metrics.arrowVisible) {
-    arrowInternal.style.display = '';
-    arrowInternal.style.transform = 'translate(' + metrics.arrowX + 'px,' +
+    DropDownDiv.arrow_.style.display = '';
+    DropDownDiv.arrow_.style.transform = 'translate(' + metrics.arrowX + 'px,' +
         metrics.arrowY + 'px) rotate(45deg)';
-    arrowInternal.setAttribute(
+    DropDownDiv.arrow_.setAttribute(
         'class',
         metrics.arrowAtTop ? 'blocklyDropDownArrow blocklyArrowTop' :
                              'blocklyDropDownArrow blocklyArrowBottom');
   } else {
-    arrowInternal.style.display = 'none';
+    DropDownDiv.arrow_.style.display = 'none';
   }
 
   const initialX = Math.floor(metrics.initialX);
@@ -700,7 +709,7 @@ const positionInternal = function(primaryX, primaryY, secondaryX, secondaryY) {
   const finalX = Math.floor(metrics.finalX);
   const finalY = Math.floor(metrics.finalY);
 
-  const div = divInternal;
+  const div = DropDownDiv.DIV_;
   // First apply initial translation.
   div.style.left = initialX + 'px';
   div.style.top = initialY + 'px';
@@ -729,10 +738,10 @@ DropDownDiv.repositionForWindowResize = function() {
   // when a field is focused, the soft keyboard opens triggering a window resize
   // event and we want the dropdown div to stick around so users can type into
   // it.
-  if (ownerInternal) {
-    const field = /** @type {!Field} */ (ownerInternal);
+  if (DropDownDiv.owner_) {
+    const field = /** @type {!Field} */ (DropDownDiv.owner_);
     const block = /** @type {!BlockSvg} */ (field.getSourceBlock());
-    const bBox = positionToField ? getScaledBboxOfField(field) :
+    const bBox = DropDownDiv.positionToField_ ? getScaledBboxOfField(field) :
                                    getScaledBboxOfBlock(block);
     // If we can fit it, render below the block.
     const primaryX = bBox.left + (bBox.right - bBox.left) / 2;
@@ -752,4 +761,7 @@ exports.testOnly_setGetBoundsInfo = function(getBoundsInfoMock) {
   getBoundsInfo = getBoundsInfoMock;
 };
 
-exports.testOnly_getPositionMetrics = getPositionMetrics;
+exports.testOnly_getPositionMetrics = function (...args) {
+  goog.setTestOnly();
+  return getPositionMetrics(...args);
+}
diff --git a/scripts/gulpfiles/build_tasks.js b/scripts/gulpfiles/build_tasks.js
index f5f331a7a..7ce0e9be9 100644
--- a/scripts/gulpfiles/build_tasks.js
+++ b/scripts/gulpfiles/build_tasks.js
@@ -341,8 +341,8 @@ function buildDeps(done) {
     closurePath,
     'core',
     'blocks',
-      'generators',
-      'tests/mocha'
+    'generators',
+    'tests/mocha'
   ];
   const args = roots.map(root => `--root '${root}' `).join('');
   execSync(`closure-make-deps ${args} > tests/deps.js`, {stdio: 'inherit'});

From 168b71e9648e82197a7af0dc8d9c47c344bbdb9f Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 19 Aug 2021 16:50:37 -0700
Subject: [PATCH 723/833] Updates to the new pattern for testing private

---
 core/dropdowndiv.js              |  20 ++----
 scripts/gulpfiles/build_tasks.js |   2 -
 tests/deps.js                    | 107 -------------------------------
 tests/mocha/dropdowndiv_test.js  |  31 ++++-----
 tests/mocha/index.html           |   2 +-
 5 files changed, 22 insertions(+), 140 deletions(-)

diff --git a/core/dropdowndiv.js b/core/dropdowndiv.js
index 86f40853f..488ac5338 100644
--- a/core/dropdowndiv.js
+++ b/core/dropdowndiv.js
@@ -292,6 +292,8 @@ DropDownDiv.showPositionedByField = function(
       getScaledBboxOfField(field), field, opt_onHide, opt_secondaryYOffset);
 };
 
+const internal = {};
+
 /**
  * Get the scaled bounding box of a block.
  * @param {!BlockSvg} block The block.
@@ -408,7 +410,7 @@ DropDownDiv.show = function(
  * @return {!DropDownDiv.BoundsInfo} An object containing size
  *     information about the bounding element (bounding box and width/height).
  */
-let getBoundsInfo = function() {
+internal.getBoundsInfo = function() {
   const boundPosition = style.getPageOffset(
       /** @type {!Element} */ (DropDownDiv.boundsElement_));
   const boundSize = style.getSize(
@@ -436,9 +438,9 @@ let getBoundsInfo = function() {
  * @return {!DropDownDiv.PositionMetrics} Various final metrics,
  *     including rendered positions for drop-down and arrow.
  */
-const getPositionMetrics = function(
+internal.getPositionMetrics = function(
     primaryX, primaryY, secondaryX, secondaryY) {
-  const boundsInfo = getBoundsInfo();
+  const boundsInfo = internal.getBoundsInfo();
   const divSize = style.getSize(
       /** @type {!Element} */ (DropDownDiv.DIV_));
 
@@ -689,7 +691,7 @@ DropDownDiv.hideWithoutAnimation = function() {
  */
 const positionInternal = function(primaryX, primaryY, secondaryX, secondaryY) {
   const metrics =
-      getPositionMetrics(primaryX, primaryY, secondaryX, secondaryY);
+      internal.getPositionMetrics(primaryX, primaryY, secondaryX, secondaryY);
 
   // Update arrow CSS.
   if (metrics.arrowVisible) {
@@ -756,12 +758,4 @@ DropDownDiv.repositionForWindowResize = function() {
 };
 exports = DropDownDiv;
 
-exports.testOnly_setGetBoundsInfo = function(getBoundsInfoMock) {
-  goog.setTestOnly();
-  getBoundsInfo = getBoundsInfoMock;
-};
-
-exports.testOnly_getPositionMetrics = function (...args) {
-  goog.setTestOnly();
-  return getPositionMetrics(...args);
-}
+exports.TEST_ONLY = internal;
diff --git a/scripts/gulpfiles/build_tasks.js b/scripts/gulpfiles/build_tasks.js
index 7ce0e9be9..318304189 100644
--- a/scripts/gulpfiles/build_tasks.js
+++ b/scripts/gulpfiles/build_tasks.js
@@ -341,8 +341,6 @@ function buildDeps(done) {
     closurePath,
     'core',
     'blocks',
-    'generators',
-    'tests/mocha'
   ];
   const args = roots.map(root => `--root '${root}' `).join('');
   execSync(`closure-make-deps ${args} > tests/deps.js`, {stdio: 'inherit'});
diff --git a/tests/deps.js b/tests/deps.js
index c271c44fd..9504969e7 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -211,112 +211,5 @@ goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
-goog.addDependency('../../generators/dart.js', ['Blockly.Dart'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.string']);
-goog.addDependency('../../generators/dart/colour.js', ['Blockly.Dart.colour'], ['Blockly.Dart']);
-goog.addDependency('../../generators/dart/lists.js', ['Blockly.Dart.lists'], ['Blockly.Dart']);
-goog.addDependency('../../generators/dart/logic.js', ['Blockly.Dart.logic'], ['Blockly.Dart']);
-goog.addDependency('../../generators/dart/loops.js', ['Blockly.Dart.loops'], ['Blockly.Dart']);
-goog.addDependency('../../generators/dart/math.js', ['Blockly.Dart.math'], ['Blockly.Dart']);
-goog.addDependency('../../generators/dart/procedures.js', ['Blockly.Dart.procedures'], ['Blockly.Dart']);
-goog.addDependency('../../generators/dart/text.js', ['Blockly.Dart.texts'], ['Blockly.Dart']);
-goog.addDependency('../../generators/dart/variables.js', ['Blockly.Dart.variables'], ['Blockly.Dart']);
-goog.addDependency('../../generators/dart/variables_dynamic.js', ['Blockly.Dart.variablesDynamic'], ['Blockly.Dart', 'Blockly.Dart.variables']);
-goog.addDependency('../../generators/javascript.js', ['Blockly.JavaScript'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.global', 'Blockly.utils.object', 'Blockly.utils.string']);
-goog.addDependency('../../generators/javascript/colour.js', ['Blockly.JavaScript.colour'], ['Blockly.JavaScript']);
-goog.addDependency('../../generators/javascript/lists.js', ['Blockly.JavaScript.lists'], ['Blockly.JavaScript']);
-goog.addDependency('../../generators/javascript/logic.js', ['Blockly.JavaScript.logic'], ['Blockly.JavaScript']);
-goog.addDependency('../../generators/javascript/loops.js', ['Blockly.JavaScript.loops'], ['Blockly.JavaScript']);
-goog.addDependency('../../generators/javascript/math.js', ['Blockly.JavaScript.math'], ['Blockly.JavaScript']);
-goog.addDependency('../../generators/javascript/procedures.js', ['Blockly.JavaScript.procedures'], ['Blockly.JavaScript']);
-goog.addDependency('../../generators/javascript/text.js', ['Blockly.JavaScript.texts'], ['Blockly.JavaScript']);
-goog.addDependency('../../generators/javascript/variables.js', ['Blockly.JavaScript.variables'], ['Blockly.JavaScript']);
-goog.addDependency('../../generators/javascript/variables_dynamic.js', ['Blockly.JavaScript.variablesDynamic'], ['Blockly.JavaScript', 'Blockly.JavaScript.variables']);
-goog.addDependency('../../generators/lua.js', ['Blockly.Lua'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.utils.string']);
-goog.addDependency('../../generators/lua/colour.js', ['Blockly.Lua.colour'], ['Blockly.Lua']);
-goog.addDependency('../../generators/lua/lists.js', ['Blockly.Lua.lists'], ['Blockly.Lua']);
-goog.addDependency('../../generators/lua/logic.js', ['Blockly.Lua.logic'], ['Blockly.Lua']);
-goog.addDependency('../../generators/lua/loops.js', ['Blockly.Lua.loops'], ['Blockly.Lua']);
-goog.addDependency('../../generators/lua/math.js', ['Blockly.Lua.math'], ['Blockly.Lua']);
-goog.addDependency('../../generators/lua/procedures.js', ['Blockly.Lua.procedures'], ['Blockly.Lua']);
-goog.addDependency('../../generators/lua/text.js', ['Blockly.Lua.texts'], ['Blockly.Lua'], {'lang': 'es5'});
-goog.addDependency('../../generators/lua/variables.js', ['Blockly.Lua.variables'], ['Blockly.Lua']);
-goog.addDependency('../../generators/lua/variables_dynamic.js', ['Blockly.Lua.variablesDynamic'], ['Blockly.Lua', 'Blockly.Lua.variables']);
-goog.addDependency('../../generators/php.js', ['Blockly.PHP'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.utils.string']);
-goog.addDependency('../../generators/php/colour.js', ['Blockly.PHP.colour'], ['Blockly.PHP']);
-goog.addDependency('../../generators/php/lists.js', ['Blockly.PHP.lists'], ['Blockly.PHP']);
-goog.addDependency('../../generators/php/logic.js', ['Blockly.PHP.logic'], ['Blockly.PHP']);
-goog.addDependency('../../generators/php/loops.js', ['Blockly.PHP.loops'], ['Blockly.PHP']);
-goog.addDependency('../../generators/php/math.js', ['Blockly.PHP.math'], ['Blockly.PHP']);
-goog.addDependency('../../generators/php/procedures.js', ['Blockly.PHP.procedures'], ['Blockly.PHP']);
-goog.addDependency('../../generators/php/text.js', ['Blockly.PHP.texts'], ['Blockly.PHP']);
-goog.addDependency('../../generators/php/variables.js', ['Blockly.PHP.variables'], ['Blockly.PHP']);
-goog.addDependency('../../generators/php/variables_dynamic.js', ['Blockly.PHP.variablesDynamic'], ['Blockly.PHP', 'Blockly.PHP.variables']);
-goog.addDependency('../../generators/python.js', ['Blockly.Python'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.string']);
-goog.addDependency('../../generators/python/colour.js', ['Blockly.Python.colour'], ['Blockly.Python']);
-goog.addDependency('../../generators/python/lists.js', ['Blockly.Python.lists'], ['Blockly.Python']);
-goog.addDependency('../../generators/python/logic.js', ['Blockly.Python.logic'], ['Blockly.Python']);
-goog.addDependency('../../generators/python/loops.js', ['Blockly.Python.loops'], ['Blockly.Python']);
-goog.addDependency('../../generators/python/math.js', ['Blockly.Python.math'], ['Blockly.Python']);
-goog.addDependency('../../generators/python/procedures.js', ['Blockly.Python.procedures'], ['Blockly.Python']);
-goog.addDependency('../../generators/python/text.js', ['Blockly.Python.texts'], ['Blockly.Python']);
-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', [], [], {'lang': 'es5'});
-goog.addDependency('../../tests/mocha/block_json_test.js', [], [], {'lang': 'es5'});
-goog.addDependency('../../tests/mocha/block_test.js', [], [], {'lang': 'es6'});
-goog.addDependency('../../tests/mocha/comment_test.js', [], [], {'lang': 'es5'});
-goog.addDependency('../../tests/mocha/connection_checker_test.js', [], []);
-goog.addDependency('../../tests/mocha/connection_db_test.js', [], []);
-goog.addDependency('../../tests/mocha/connection_test.js', [], [], {'lang': 'es6'});
-goog.addDependency('../../tests/mocha/contextmenu_items_test.js', [], []);
-goog.addDependency('../../tests/mocha/cursor_test.js', [], [], {'lang': 'es5'});
-goog.addDependency('../../tests/mocha/dropdowndiv_test.js', ['DropDownDivTests'], ['Blockly.DropDownDiv'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/event_test.js', [], ['Blockly.WorkspaceComment'], {'lang': 'es6'});
-goog.addDependency('../../tests/mocha/extensions_test.js', [], [], {'lang': 'es6'});
-goog.addDependency('../../tests/mocha/field_angle_test.js', [], [], {'lang': 'es5'});
-goog.addDependency('../../tests/mocha/field_checkbox_test.js', [], [], {'lang': 'es5'});
-goog.addDependency('../../tests/mocha/field_colour_test.js', [], [], {'lang': 'es5'});
-goog.addDependency('../../tests/mocha/field_dropdown_test.js', [], [], {'lang': 'es6'});
-goog.addDependency('../../tests/mocha/field_image_test.js', [], [], {'lang': 'es5'});
-goog.addDependency('../../tests/mocha/field_label_serializable_test.js', [], [], {'lang': 'es5'});
-goog.addDependency('../../tests/mocha/field_label_test.js', [], [], {'lang': 'es5'});
-goog.addDependency('../../tests/mocha/field_multilineinput_test.js', [], [], {'lang': 'es6'});
-goog.addDependency('../../tests/mocha/field_number_test.js', [], [], {'lang': 'es5'});
-goog.addDependency('../../tests/mocha/field_registry_test.js', [], [], {'lang': 'es5'});
-goog.addDependency('../../tests/mocha/field_test.js', [], [], {'lang': 'es6'});
-goog.addDependency('../../tests/mocha/field_textinput_test.js', [], [], {'lang': 'es5'});
-goog.addDependency('../../tests/mocha/field_variable_test.js', [], [], {'lang': 'es6'});
-goog.addDependency('../../tests/mocha/flyout_test.js', [], [], {'lang': 'es5'});
-goog.addDependency('../../tests/mocha/generator_test.js', [], ['Blockly.Dart', 'Blockly.JavaScript', 'Blockly.Lua', 'Blockly.PHP', 'Blockly.Python']);
-goog.addDependency('../../tests/mocha/gesture_test.js', [], []);
-goog.addDependency('../../tests/mocha/input_test.js', [], [], {'lang': 'es5'});
-goog.addDependency('../../tests/mocha/insertion_marker_test.js', [], []);
-goog.addDependency('../../tests/mocha/json_test.js', [], [], {'lang': 'es6'});
-goog.addDependency('../../tests/mocha/keydown_test.js', [], []);
-goog.addDependency('../../tests/mocha/logic_ternary_test.js', [], [], {'lang': 'es6'});
-goog.addDependency('../../tests/mocha/metrics_test.js', [], []);
-goog.addDependency('../../tests/mocha/names_test.js', [], []);
-goog.addDependency('../../tests/mocha/procedures_test.js', [], ['Blockly.Blocks.procedures', 'Blockly.Msg'], {'lang': 'es6'});
-goog.addDependency('../../tests/mocha/procedures_test_helpers.js', [], [], {'lang': 'es6'});
-goog.addDependency('../../tests/mocha/registry_test.js', [], [], {'lang': 'es6'});
-goog.addDependency('../../tests/mocha/run_mocha_tests_in_browser.js', [], [], {'lang': 'es8'});
-goog.addDependency('../../tests/mocha/shortcut_registry_test.js', [], [], {'lang': 'es5'});
-goog.addDependency('../../tests/mocha/test_helpers.js', [], [], {'lang': 'es6'});
-goog.addDependency('../../tests/mocha/theme_test.js', [], [], {'lang': 'es5'});
-goog.addDependency('../../tests/mocha/toolbox_helper.js', [], [], {'lang': 'es5'});
-goog.addDependency('../../tests/mocha/toolbox_test.js', [], [], {'lang': 'es5'});
-goog.addDependency('../../tests/mocha/tooltip_test.js', [], [], {'lang': 'es6'});
-goog.addDependency('../../tests/mocha/trashcan_test.js', [], []);
-goog.addDependency('../../tests/mocha/utils_test.js', [], []);
-goog.addDependency('../../tests/mocha/variable_map_test.js', [], [], {'lang': 'es5'});
-goog.addDependency('../../tests/mocha/variable_model_test.js', [], []);
-goog.addDependency('../../tests/mocha/variables_test.js', [], []);
-goog.addDependency('../../tests/mocha/widget_div_test.js', [], []);
-goog.addDependency('../../tests/mocha/workspace_comment_test.js', [], ['Blockly.WorkspaceComment']);
-goog.addDependency('../../tests/mocha/workspace_svg_test.js', [], [], {'lang': 'es6'});
-goog.addDependency('../../tests/mocha/workspace_test.js', [], [], {'lang': 'es6'});
-goog.addDependency('../../tests/mocha/xml_test.js', [], [], {'lang': 'es5'});
-goog.addDependency('../../tests/mocha/zoom_controls_test.js', [], []);
 goog.addDependency('base.js', [], []);
 
diff --git a/tests/mocha/dropdowndiv_test.js b/tests/mocha/dropdowndiv_test.js
index 332cac467..d54d8ad33 100644
--- a/tests/mocha/dropdowndiv_test.js
+++ b/tests/mocha/dropdowndiv_test.js
@@ -4,24 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.module('DropDownDivTests');
-goog.setTestOnly();
 
 const DropDownDiv = goog.require('Blockly.DropDownDiv');
 suite('DropDownDiv', function() {
   suite('Positioning', function() {
     setup(function() {
       sharedTestSetup.call(this);
-      DropDownDiv.testOnly_setGetBoundsInfo(function() {
-        return {
-          left: 0,
-          right: 100,
-          top: 0,
-          bottom: 100,
-          width: 100,
-          height: 100
-        };
-      });
+      this.boundsStub = sinon.stub(Blockly.DropDownDiv.TEST_ONLY, 'getBoundsInfo')
+          .returns({
+            left: 0,
+            right: 100,
+            top: 0,
+            bottom: 100,
+            width: 100,
+            height: 100
+          });
       this.sizeStub = sinon.stub(Blockly.utils.style, 'getSize')
           .returns({
             width: 60,
@@ -36,7 +33,7 @@ suite('DropDownDiv', function() {
       sharedTestTeardown.call(this);
     });
     test('Below, in Bounds', function() {
-      var metrics = DropDownDiv.testOnly_getPositionMetrics(50, 0, 50, -10);
+      var metrics = Blockly.DropDownDiv.TEST_ONLY.getPositionMetrics(50, 0, 50, -10);
       // "Above" in value actually means below in render.
       chai.assert.isAtLeast(metrics.initialY, 0);
       chai.assert.isAbove(metrics.finalY, 0);
@@ -44,7 +41,7 @@ suite('DropDownDiv', function() {
       chai.assert.isTrue(metrics.arrowAtTop);
     });
     test('Above, in Bounds', function() {
-      var metrics = DropDownDiv.testOnly_getPositionMetrics(50, 100, 50, 90);
+      var metrics = Blockly.DropDownDiv.TEST_ONLY.getPositionMetrics(50, 100, 50, 90);
       // "Below" in value actually means above in render.
       chai.assert.isAtMost(metrics.initialY, 100);
       chai.assert.isBelow(metrics.finalY, 100);
@@ -52,7 +49,7 @@ suite('DropDownDiv', function() {
       chai.assert.isFalse(metrics.arrowAtTop);
     });
     test('Below, out of Bounds', function() {
-      var metrics = DropDownDiv.testOnly_getPositionMetrics(50, 60, 50, 50);
+      var metrics = Blockly.DropDownDiv.TEST_ONLY.getPositionMetrics(50, 60, 50, 50);
       // "Above" in value actually means below in render.
       chai.assert.isAtLeast(metrics.initialY, 60);
       chai.assert.isAbove(metrics.finalY, 60);
@@ -60,7 +57,7 @@ suite('DropDownDiv', function() {
       chai.assert.isTrue(metrics.arrowAtTop);
     });
     test('Above, in Bounds', function() {
-      var metrics = DropDownDiv.testOnly_getPositionMetrics(50, 100, 50, 90);
+      var metrics = Blockly.DropDownDiv.TEST_ONLY.getPositionMetrics(50, 100, 50, 90);
       // "Below" in value actually means above in render.
       chai.assert.isAtMost(metrics.initialY, 100);
       chai.assert.isBelow(metrics.finalY, 100);
@@ -69,7 +66,7 @@ suite('DropDownDiv', function() {
     });
     test('No Solution, Render At Top', function() {
       this.clientHeightStub.get(function() { return 100; });
-      var metrics = DropDownDiv.testOnly_getPositionMetrics(50, 60, 50, 50);
+      var metrics = Blockly.DropDownDiv.TEST_ONLY.getPositionMetrics(50, 60, 50, 50);
       // "Above" in value actually means below in render.
       chai.assert.equal(metrics.initialY, 0);
       chai.assert.equal(metrics.finalY, 0);
diff --git a/tests/mocha/index.html b/tests/mocha/index.html
index ee7480b92..71b7de6b4 100644
--- a/tests/mocha/index.html
+++ b/tests/mocha/index.html
@@ -60,7 +60,7 @@
     <script src="connection_test.js"></script>
     <script src="contextmenu_items_test.js"></script>
     <script src="cursor_test.js"></script>
-    <script>goog.require('DropDownDivTests');</script>
+    <script src="dropdowndiv_test.js"></script>
     <script src="event_test.js"></script>
     <script src="extensions_test.js"></script>
     <script src="field_test.js"></script>

From c349db1a2e2e13cf7fd5f7db4beade4b057742ac Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 19 Aug 2021 17:14:05 -0700
Subject: [PATCH 724/833] Adds test deps back in

---
 tests/deps.js | 332 +++++++++++++++++++++++++++-----------------------
 1 file changed, 181 insertions(+), 151 deletions(-)

diff --git a/tests/deps.js b/tests/deps.js
index 9504969e7..a5777d487 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -7,209 +7,239 @@ goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'],
 goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator']);
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
-goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.IASTNodeLocation', 'Blockly.IDeletable', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.Workspace', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es5'});
+goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom']);
-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.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', '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']);
-goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', '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.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
+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']);
-goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.RenderedConnection', 'Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es5'});
-goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es5'});
+goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea']);
-goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/block_events.js', ['Blockly.Events.BlockBase', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Events.Change', 'Blockly.Events.Create', 'Blockly.Events.Delete', 'Blockly.Events.Move'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
+goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils']);
-goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events']);
-goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/variable_events.js', ['Blockly.Events.VarBase', 'Blockly.Events.VarCreate', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es5'});
+goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.BlockBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_ui.js', ['Blockly.Events.Ui'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_ui_base.js', ['Blockly.Events.UiBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_base.js', ['Blockly.Events.VarBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_create.js', ['Blockly.Events.VarCreate'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.VarDelete'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/ws_comment_events.js', ['Blockly.Events.CommentBase', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible', 'Blockly.IRegistrable', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.IdGenerator', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['Blockly.DropDownDiv', 'Blockly.Field', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
-goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.object']);
-goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabelSerializable'], ['Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.object']);
-goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es5'});
+goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabelSerializable'], ['Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry']);
-goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object']);
-goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
-goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es5'});
-goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.Block', 'Blockly.internalConstants', 'Blockly.utils.deprecation']);
-goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate']);
-goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.Connection', 'Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es5'});
-goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes']);
-goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.internalConstants'], {'lang': 'es5'});
+goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.common', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], ['Blockly.IASTNodeLocation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], ['Blockly.IASTNodeLocation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], ['Blockly.IContextMenu', 'Blockly.IDraggable'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_collapsible_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem'], ['Blockly.ISelectableToolboxItem'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_collapsible_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_copyable.js', ['Blockly.ICopyable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_deletable.js', ['Blockly.IDeletable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], ['Blockly.IDeletable'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], ['Blockly.IRegistrable'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_keyboard_accessible.js', ['Blockly.IKeyboardAccessible'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], []);
+goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_selectable_toolbox_item.js', ['Blockly.ISelectableToolboxItem'], ['Blockly.IToolboxItem'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_selectable_toolbox_item.js', ['Blockly.ISelectableToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], ['Blockly.IRegistrable'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.IToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstants'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.utils.Coordinate'], {'lang': 'es5'});
+goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], ['Blockly.ASTNode']);
+goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], ['Blockly.Cursor', 'Blockly.Marker']);
-goog.addDependency('../../core/menu.js', ['Blockly.Menu'], ['Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.style']);
-goog.addDependency('../../core/menuitem.js', ['Blockly.MenuItem'], ['Blockly.utils.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom']);
-goog.addDependency('../../core/metrics_manager.js', ['Blockly.FlyoutMetricsManager', 'Blockly.MetricsManager'], ['Blockly.IMetricsManager', 'Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], [], {'lang': 'es6', 'module': 'goog'});
+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.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/metrics_manager.js', ['Blockly.MetricsManager'], ['Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global']);
-goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
-goog.addDependency('../../core/names.js', ['Blockly.Names'], ['Blockly.Msg', 'Blockly.internalConstants']);
-goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.Metrics', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.xml']);
-goog.addDependency('../../core/registry.js', ['Blockly.registry'], []);
-goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry']);
-goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es5'});
-goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
-goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], []);
-goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
-goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es5'});
-goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.geras.RenderInfo', 'Blockly.utils.object', 'Blockly.utils.svgPaths']);
-goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.svgPaths'], {'lang': 'es5'});
-goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths']);
-goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras', 'Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/geras/measurables/inputs.js', ['Blockly.geras.InlineInput', 'Blockly.geras.StatementInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.PathObject', 'Blockly.geras.ConstantProvider', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types']);
-goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/inputs.js', ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/row_elements.js', ['Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/rows.js', ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], []);
-goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist', 'Blockly.minimalist.RenderInfo'], ['Blockly.utils.object']);
-goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos', 'Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es5'});
-goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.zelos.RenderInfo']);
-goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos', 'Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow']);
-goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/zelos/measurables/rows.js', ['Blockly.zelos.BottomRow', 'Blockly.zelos.TopRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.TopRow', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider']);
-goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo']);
+goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', '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', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/measurables/inline_input.js', ['Blockly.geras.InlineInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/measurables/statement_input.js', ['Blockly.geras.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/bottom_row.js', ['Blockly.blockRendering.BottomRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/connection.js', ['Blockly.blockRendering.Connection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/external_value_input.js', ['Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/field.js', ['Blockly.blockRendering.Field'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/hat.js', ['Blockly.blockRendering.Hat'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/icon.js', ['Blockly.blockRendering.Icon'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/in_row_spacer.js', ['Blockly.blockRendering.InRowSpacer'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/inline_input.js', ['Blockly.blockRendering.InlineInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/input_connection.js', ['Blockly.blockRendering.InputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/input_row.js', ['Blockly.blockRendering.InputRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/jagged_edge.js', ['Blockly.blockRendering.JaggedEdge'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/next_connection.js', ['Blockly.blockRendering.NextConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/output_connection.js', ['Blockly.blockRendering.OutputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/previous_connection.js', ['Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/round_corner.js', ['Blockly.blockRendering.RoundCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/row.js', ['Blockly.blockRendering.Row'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/spacer_row.js', ['Blockly.blockRendering.SpacerRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/square_corner.js', ['Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/top_row.js', ['Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist.RenderInfo'], ['Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/measurables/bottom_row.js', ['Blockly.zelos.BottomRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
-goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar', 'Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.utils.KeyCodes']);
-goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object']);
-goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils', 'Blockly.utils.object']);
-goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);
-goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme']);
-goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.Theme']);
-goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
-goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.IToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es5'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
-goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem']);
-goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.utils.string']);
-goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.string']);
-goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
-goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly', 'Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly', 'Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.string']);
+goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
+goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
+goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.Svg', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], []);
+goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.IdGenerator'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], []);
-goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], []);
+goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Blockly.utils.Coordinate', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], []);
+goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global']);
 goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
-goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.utils', 'Blockly.utils.object']);
-goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils']);
-goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.xml']);
-goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml']);
-goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
-goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.utils.dom']);
-goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);
-goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es5'});
-goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml']);
-goog.addDependency('../../core/workspace_comment_render_svg.js', ['Blockly.WorkspaceCommentSvg.render'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.WorkspaceComment', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
-goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate']);
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
-goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
-goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
+goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);
 

From 0fa81f33de39406a8522b8471e14cc1c888a15cc Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 19 Aug 2021 17:23:18 -0700
Subject: [PATCH 725/833] PR comments and clang format after rebase

---
 core/dropdowndiv.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/dropdowndiv.js b/core/dropdowndiv.js
index 488ac5338..070fb89bf 100644
--- a/core/dropdowndiv.js
+++ b/core/dropdowndiv.js
@@ -129,14 +129,14 @@ DropDownDiv.arrow_;
 /**
  * Drop-downs will appear within the bounds of this element if possible.
  * Set in DropDownDiv.setBoundsElement.
- * @type {Element}
+ * @type {?Element}
  * @private
  */
 DropDownDiv.boundsElement_ = null;
 
 /**
  * The object currently using the drop-down.
- * @type {Object}
+ * @type {?Object}
  * @private
  */
 DropDownDiv.owner_ = null;
@@ -205,8 +205,8 @@ DropDownDiv.createDom = function() {
   DropDownDiv.DIV_.style.opacity = 0;
 
   // Transition animation for transform: translate() and opacity.
-  DropDownDiv.DIV_.style.transition = 'transform ' + DropDownDiv.ANIMATION_TIME +
-      's, ' +
+  DropDownDiv.DIV_.style.transition = 'transform ' +
+      DropDownDiv.ANIMATION_TIME + 's, ' +
       'opacity ' + DropDownDiv.ANIMATION_TIME + 's';
 
   // Handle focusin/out events to add a visual indicator when
@@ -222,7 +222,7 @@ DropDownDiv.createDom = function() {
 /**
  * Set an element to maintain bounds within. Drop-downs will appear
  * within the box of this element if possible.
- * @param {Element} boundsElement Element to bind drop-down to.
+ * @param {?Element} boundsElement Element to bind drop-down to.
  */
 DropDownDiv.setBoundsElement = function(boundsElement) {
   DropDownDiv.boundsElement_ = boundsElement;
@@ -351,7 +351,7 @@ const showPositionedByRect = function(
         /** @type {!WorkspaceSvg} */ (workspace.options.parentWorkspace);
   }
   DropDownDiv.setBoundsElement(
-      /** @type {Element} */ (workspace.getParentSvg().parentNode));
+      /** @type {?Element} */ (workspace.getParentSvg().parentNode));
   return DropDownDiv.show(
       field, sourceBlock.RTL, primaryX, primaryY, secondaryX, secondaryY,
       opt_onHide);
@@ -365,7 +365,7 @@ const showPositionedByRect = function(
  * will point there, and the container will be positioned below it.
  * If we can't maintain the container bounds at the primary point, fall-back to
  * the secondary point and position above.
- * @param {Object} owner The object showing the drop-down
+ * @param {?Object} owner The object showing the drop-down
  * @param {boolean} rtl Right-to-left (true) or left-to-right (false).
  * @param {number} primaryX Desired origin point x, in absolute px.
  * @param {number} primaryY Desired origin point y, in absolute px.
@@ -604,7 +604,7 @@ DropDownDiv.isVisible = function() {
 
 /**
  * Hide the menu only if it is owned by the provided object.
- * @param {Object} owner Object which must be owning the drop-down to hide.
+ * @param {?Object} owner Object which must be owning the drop-down to hide.
  * @param {boolean=} opt_withoutAnimation True if we should hide the dropdown
  *     without animating.
  * @return {boolean} True if hidden.
@@ -744,7 +744,7 @@ DropDownDiv.repositionForWindowResize = function() {
     const field = /** @type {!Field} */ (DropDownDiv.owner_);
     const block = /** @type {!BlockSvg} */ (field.getSourceBlock());
     const bBox = DropDownDiv.positionToField_ ? getScaledBboxOfField(field) :
-                                   getScaledBboxOfBlock(block);
+                                                getScaledBboxOfBlock(block);
     // If we can fit it, render below the block.
     const primaryX = bBox.left + (bBox.right - bBox.left) / 2;
     const primaryY = bBox.bottom;

From 4751eea52965c67f6a6f6407e5588568f23a8ce4 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Tue, 24 Aug 2021 08:00:27 -0700
Subject: [PATCH 726/833] Migrate core/events/ws_comment_events.js to
 goog.module syntax (#5380)

* Split provides in core/events/ws_comment_events.js into individual files

* Migrate core/events/events_comment_* to ES6 const/let

* Migrate core/events/events_comment_* to goog.module

* Migrate core/events/events_comment_* to named requires

* clang-format core/events/events_comment_*

* Revert now-unnecessary changes to tests/mocha/event_test.js

* Update fileoverview comments for separated comment event classes
---
 core/events/events_comment_base.js   | 111 +++++++
 core/events/events_comment_change.js |  99 +++++++
 core/events/events_comment_create.js |  78 +++++
 core/events/events_comment_delete.js |  75 +++++
 core/events/events_comment_move.js   | 152 ++++++++++
 core/events/ws_comment_events.js     | 429 ---------------------------
 tests/deps.js                        |   6 +-
 7 files changed, 520 insertions(+), 430 deletions(-)
 create mode 100644 core/events/events_comment_base.js
 create mode 100644 core/events/events_comment_change.js
 create mode 100644 core/events/events_comment_create.js
 create mode 100644 core/events/events_comment_delete.js
 create mode 100644 core/events/events_comment_move.js
 delete mode 100644 core/events/ws_comment_events.js

diff --git a/core/events/events_comment_base.js b/core/events/events_comment_base.js
new file mode 100644
index 000000000..70b81e056
--- /dev/null
+++ b/core/events/events_comment_base.js
@@ -0,0 +1,111 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Base class for comment events.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.module('Blockly.Events.CommentBase');
+goog.module.declareLegacyNamespace();
+
+const AbstractEvents = goog.require('Blockly.Events.Abstract');
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment');
+const Xml = goog.require('Blockly.Xml');
+const object = goog.require('Blockly.utils.object');
+const utilsXml = goog.require('Blockly.utils.xml');
+
+
+/**
+ * Abstract class for a comment event.
+ * @param {!WorkspaceComment=} opt_comment The comment this event
+ *     corresponds to.  Undefined for a blank event.
+ * @extends {AbstractEvents}
+ * @constructor
+ */
+const CommentBase = function(opt_comment) {
+  /**
+   * Whether or not an event is blank.
+   * @type {boolean}
+   */
+  this.isBlank = typeof opt_comment == 'undefined';
+
+  /**
+   * The ID of the comment this event pertains to.
+   * @type {string}
+   */
+  this.commentId = this.isBlank ? '' : opt_comment.id;
+
+  /**
+   * The workspace identifier for this event.
+   * @type {string}
+   */
+  this.workspaceId = this.isBlank ? '' : opt_comment.workspace.id;
+
+  /**
+   * The event group id for the group this event belongs to. Groups define
+   * events that should be treated as an single action from the user's
+   * perspective, and should be undone together.
+   * @type {string}
+   */
+  this.group = Events.getGroup();
+
+  /**
+   * Sets whether the event should be added to the undo stack.
+   * @type {boolean}
+   */
+  this.recordUndo = Events.recordUndo;
+};
+object.inherits(CommentBase, AbstractEvents);
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+CommentBase.prototype.toJson = function() {
+  const json = CommentBase.superClass_.toJson.call(this);
+  if (this.commentId) {
+    json['commentId'] = this.commentId;
+  }
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+CommentBase.prototype.fromJson = function(json) {
+  CommentBase.superClass_.fromJson.call(this, json);
+  this.commentId = json['commentId'];
+};
+
+/**
+ * Helper function for Comment[Create|Delete]
+ * @param {!Events.CommentCreate|!Events.CommentDelete} event
+ *     The event to run.
+ * @param {boolean} create if True then Create, if False then Delete
+ */
+CommentBase.CommentCreateDeleteHelper = function(event, create) {
+  const workspace = event.getEventWorkspace_();
+  if (create) {
+    const xmlElement = utilsXml.createElement('xml');
+    xmlElement.appendChild(event.xml);
+    Xml.domToWorkspace(xmlElement, workspace);
+  } else {
+    const comment = workspace.getCommentById(event.commentId);
+    if (comment) {
+      comment.dispose();
+    } else {
+      // Only complain about root-level block.
+      console.warn('Can\'t uncreate non-existent comment: ' + event.commentId);
+    }
+  }
+};
+
+exports = CommentBase;
diff --git a/core/events/events_comment_change.js b/core/events/events_comment_change.js
new file mode 100644
index 000000000..458785db3
--- /dev/null
+++ b/core/events/events_comment_change.js
@@ -0,0 +1,99 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class for comment change event.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.module('Blockly.Events.CommentChange');
+goog.module.declareLegacyNamespace();
+
+const CommentBase = goog.require('Blockly.Events.CommentBase');
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
+
+
+/**
+ * Class for a comment change event.
+ * @param {!WorkspaceComment=} opt_comment The comment that is being
+ *     changed.  Undefined for a blank event.
+ * @param {string=} opt_oldContents Previous contents of the comment.
+ * @param {string=} opt_newContents New contents of the comment.
+ * @extends {CommentBase}
+ * @constructor
+ */
+const CommentChange = function(opt_comment, opt_oldContents, opt_newContents) {
+  CommentChange.superClass_.constructor.call(this, opt_comment);
+  if (!opt_comment) {
+    return;  // Blank event to be populated by fromJson.
+  }
+
+  this.oldContents_ =
+      typeof opt_oldContents == 'undefined' ? '' : opt_oldContents;
+  this.newContents_ =
+      typeof opt_newContents == 'undefined' ? '' : opt_newContents;
+};
+object.inherits(CommentChange, CommentBase);
+
+/**
+ * Type of this event.
+ * @type {string}
+ */
+CommentChange.prototype.type = Events.COMMENT_CHANGE;
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+CommentChange.prototype.toJson = function() {
+  const json = CommentChange.superClass_.toJson.call(this);
+  json['oldContents'] = this.oldContents_;
+  json['newContents'] = this.newContents_;
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+CommentChange.prototype.fromJson = function(json) {
+  CommentChange.superClass_.fromJson.call(this, json);
+  this.oldContents_ = json['oldContents'];
+  this.newContents_ = json['newContents'];
+};
+
+/**
+ * Does this event record any change of state?
+ * @return {boolean} False if something changed.
+ */
+CommentChange.prototype.isNull = function() {
+  return this.oldContents_ == this.newContents_;
+};
+
+/**
+ * Run a change event.
+ * @param {boolean} forward True if run forward, false if run backward (undo).
+ */
+CommentChange.prototype.run = function(forward) {
+  const workspace = this.getEventWorkspace_();
+  const comment = workspace.getCommentById(this.commentId);
+  if (!comment) {
+    console.warn('Can\'t change non-existent comment: ' + this.commentId);
+    return;
+  }
+  const contents = forward ? this.newContents_ : this.oldContents_;
+
+  comment.setContent(contents);
+};
+
+registry.register(registry.Type.EVENT, Events.COMMENT_CHANGE, CommentChange);
+
+exports = CommentChange;
diff --git a/core/events/events_comment_create.js b/core/events/events_comment_create.js
new file mode 100644
index 000000000..330d6ce4e
--- /dev/null
+++ b/core/events/events_comment_create.js
@@ -0,0 +1,78 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class for comment creation event.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.module('Blockly.Events.CommentCreate');
+goog.module.declareLegacyNamespace();
+
+const CommentBase = goog.require('Blockly.Events.CommentBase');
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment');
+const Xml = goog.require('Blockly.Xml');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
+
+
+/**
+ * Class for a comment creation event.
+ * @param {!WorkspaceComment=} opt_comment The created comment.
+ *     Undefined for a blank event.
+ * @extends {CommentBase}
+ * @constructor
+ */
+const CommentCreate = function(opt_comment) {
+  CommentCreate.superClass_.constructor.call(this, opt_comment);
+  if (!opt_comment) {
+    return;  // Blank event to be populated by fromJson.
+  }
+
+  this.xml = opt_comment.toXmlWithXY();
+};
+object.inherits(CommentCreate, CommentBase);
+
+/**
+ * Type of this event.
+ * @type {string}
+ */
+CommentCreate.prototype.type = Events.COMMENT_CREATE;
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+// TODO (#1266): "Full" and "minimal" serialization.
+CommentCreate.prototype.toJson = function() {
+  const json = CommentCreate.superClass_.toJson.call(this);
+  json['xml'] = Xml.domToText(this.xml);
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+CommentCreate.prototype.fromJson = function(json) {
+  CommentCreate.superClass_.fromJson.call(this, json);
+  this.xml = Xml.textToDom(json['xml']);
+};
+
+/**
+ * Run a creation event.
+ * @param {boolean} forward True if run forward, false if run backward (undo).
+ */
+CommentCreate.prototype.run = function(forward) {
+  CommentBase.CommentCreateDeleteHelper(this, forward);
+};
+
+registry.register(registry.Type.EVENT, Events.COMMENT_CREATE, CommentCreate);
+
+exports = CommentCreate;
diff --git a/core/events/events_comment_delete.js b/core/events/events_comment_delete.js
new file mode 100644
index 000000000..85db6cb83
--- /dev/null
+++ b/core/events/events_comment_delete.js
@@ -0,0 +1,75 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class for comment deletion event.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.module('Blockly.Events.CommentDelete');
+goog.module.declareLegacyNamespace();
+
+const CommentBase = goog.require('Blockly.Events.CommentBase');
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
+
+
+/**
+ * Class for a comment deletion event.
+ * @param {!WorkspaceComment=} opt_comment The deleted comment.
+ *     Undefined for a blank event.
+ * @extends {CommentBase}
+ * @constructor
+ */
+const CommentDelete = function(opt_comment) {
+  CommentDelete.superClass_.constructor.call(this, opt_comment);
+  if (!opt_comment) {
+    return;  // Blank event to be populated by fromJson.
+  }
+
+  this.xml = opt_comment.toXmlWithXY();
+};
+object.inherits(CommentDelete, CommentBase);
+
+/**
+ * Type of this event.
+ * @type {string}
+ */
+CommentDelete.prototype.type = Events.COMMENT_DELETE;
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+// TODO (#1266): "Full" and "minimal" serialization.
+CommentDelete.prototype.toJson = function() {
+  const json = CommentDelete.superClass_.toJson.call(this);
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+CommentDelete.prototype.fromJson = function(json) {
+  CommentDelete.superClass_.fromJson.call(this, json);
+};
+
+/**
+ * Run a creation event.
+ * @param {boolean} forward True if run forward, false if run backward (undo).
+ */
+CommentDelete.prototype.run = function(forward) {
+  CommentBase.CommentCreateDeleteHelper(this, !forward);
+};
+
+registry.register(registry.Type.EVENT, Events.COMMENT_DELETE, CommentDelete);
+
+exports = CommentDelete;
diff --git a/core/events/events_comment_move.js b/core/events/events_comment_move.js
new file mode 100644
index 000000000..148bff8ad
--- /dev/null
+++ b/core/events/events_comment_move.js
@@ -0,0 +1,152 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class for comment move event.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.module('Blockly.Events.CommentMove');
+goog.module.declareLegacyNamespace();
+
+const CommentBase = goog.require('Blockly.Events.CommentBase');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
+
+
+/**
+ * Class for a comment move event.  Created before the move.
+ * @param {!WorkspaceComment=} opt_comment The comment that is being
+ *     moved.  Undefined for a blank event.
+ * @extends {CommentBase}
+ * @constructor
+ */
+const CommentMove = function(opt_comment) {
+  CommentMove.superClass_.constructor.call(this, opt_comment);
+  if (!opt_comment) {
+    return;  // Blank event to be populated by fromJson.
+  }
+
+  /**
+   * The comment that is being moved.  Will be cleared after recording the new
+   * location.
+   * @type {WorkspaceComment}
+   */
+  this.comment_ = opt_comment;
+
+  /**
+   * The location before the move, in workspace coordinates.
+   * @type {!Coordinate}
+   */
+  this.oldCoordinate_ = opt_comment.getXY();
+
+  /**
+   * The location after the move, in workspace coordinates.
+   * @type {Coordinate}
+   */
+  this.newCoordinate_ = null;
+};
+object.inherits(CommentMove, CommentBase);
+
+/**
+ * Record the comment's new location.  Called after the move.  Can only be
+ * called once.
+ */
+CommentMove.prototype.recordNew = function() {
+  if (!this.comment_) {
+    throw Error(
+        'Tried to record the new position of a comment on the ' +
+        'same event twice.');
+  }
+  this.newCoordinate_ = this.comment_.getXY();
+  this.comment_ = null;
+};
+
+/**
+ * Type of this event.
+ * @type {string}
+ */
+CommentMove.prototype.type = Events.COMMENT_MOVE;
+
+/**
+ * Override the location before the move.  Use this if you don't create the
+ * event until the end of the move, but you know the original location.
+ * @param {!Coordinate} xy The location before the move,
+ *     in workspace coordinates.
+ */
+CommentMove.prototype.setOldCoordinate = function(xy) {
+  this.oldCoordinate_ = xy;
+};
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+// TODO (#1266): "Full" and "minimal" serialization.
+CommentMove.prototype.toJson = function() {
+  const json = CommentMove.superClass_.toJson.call(this);
+  if (this.oldCoordinate_) {
+    json['oldCoordinate'] = Math.round(this.oldCoordinate_.x) + ',' +
+        Math.round(this.oldCoordinate_.y);
+  }
+  if (this.newCoordinate_) {
+    json['newCoordinate'] = Math.round(this.newCoordinate_.x) + ',' +
+        Math.round(this.newCoordinate_.y);
+  }
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+CommentMove.prototype.fromJson = function(json) {
+  CommentMove.superClass_.fromJson.call(this, json);
+
+  if (json['oldCoordinate']) {
+    const xy = json['oldCoordinate'].split(',');
+    this.oldCoordinate_ = new Coordinate(Number(xy[0]), Number(xy[1]));
+  }
+  if (json['newCoordinate']) {
+    const xy = json['newCoordinate'].split(',');
+    this.newCoordinate_ = new Coordinate(Number(xy[0]), Number(xy[1]));
+  }
+};
+
+/**
+ * Does this event record any change of state?
+ * @return {boolean} False if something changed.
+ */
+CommentMove.prototype.isNull = function() {
+  return Coordinate.equals(this.oldCoordinate_, this.newCoordinate_);
+};
+
+/**
+ * Run a move event.
+ * @param {boolean} forward True if run forward, false if run backward (undo).
+ */
+CommentMove.prototype.run = function(forward) {
+  const workspace = this.getEventWorkspace_();
+  const comment = workspace.getCommentById(this.commentId);
+  if (!comment) {
+    console.warn('Can\'t move non-existent comment: ' + this.commentId);
+    return;
+  }
+
+  const target = forward ? this.newCoordinate_ : this.oldCoordinate_;
+  // TODO: Check if the comment is being dragged, and give up if so.
+  const current = comment.getXY();
+  comment.moveBy(target.x - current.x, target.y - current.y);
+};
+
+registry.register(registry.Type.EVENT, Events.COMMENT_MOVE, CommentMove);
+
+exports = CommentMove;
diff --git a/core/events/ws_comment_events.js b/core/events/ws_comment_events.js
deleted file mode 100644
index e54441ec7..000000000
--- a/core/events/ws_comment_events.js
+++ /dev/null
@@ -1,429 +0,0 @@
-/**
- * @license
- * Copyright 2018 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Classes for all comment events.
- * @author fenichel@google.com (Rachel Fenichel)
- */
-'use strict';
-
-goog.provide('Blockly.Events.CommentBase');
-goog.provide('Blockly.Events.CommentChange');
-goog.provide('Blockly.Events.CommentCreate');
-goog.provide('Blockly.Events.CommentDelete');
-goog.provide('Blockly.Events.CommentMove');
-
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.Abstract');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.xml');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.WorkspaceComment');
-
-
-/**
- * Abstract class for a comment event.
- * @param {!Blockly.WorkspaceComment=} opt_comment The comment this event
- *     corresponds to.  Undefined for a blank event.
- * @extends {Blockly.Events.Abstract}
- * @constructor
- */
-Blockly.Events.CommentBase = function(opt_comment) {
-
-  /**
-   * Whether or not an event is blank.
-   * @type {boolean}
-   */
-  this.isBlank = typeof opt_comment == 'undefined';
-
-  /**
-   * The ID of the comment this event pertains to.
-   * @type {string}
-   */
-  this.commentId = this.isBlank ? '' : opt_comment.id;
-
-  /**
-   * The workspace identifier for this event.
-   * @type {string}
-   */
-  this.workspaceId = this.isBlank ? '' : opt_comment.workspace.id;
-
-  /**
-   * The event group id for the group this event belongs to. Groups define
-   * events that should be treated as an single action from the user's
-   * perspective, and should be undone together.
-   * @type {string}
-   */
-  this.group = Blockly.Events.getGroup();
-
-  /**
-   * Sets whether the event should be added to the undo stack.
-   * @type {boolean}
-   */
-  this.recordUndo = Blockly.Events.recordUndo;
-};
-Blockly.utils.object.inherits(Blockly.Events.CommentBase,
-    Blockly.Events.Abstract);
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Blockly.Events.CommentBase.prototype.toJson = function() {
-  var json = Blockly.Events.CommentBase.superClass_.toJson.call(this);
-  if (this.commentId) {
-    json['commentId'] = this.commentId;
-  }
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.CommentBase.prototype.fromJson = function(json) {
-  Blockly.Events.CommentBase.superClass_.fromJson.call(this, json);
-  this.commentId = json['commentId'];
-};
-
-/**
- * Class for a comment change event.
- * @param {!Blockly.WorkspaceComment=} opt_comment The comment that is being
- *     changed.  Undefined for a blank event.
- * @param {string=} opt_oldContents Previous contents of the comment.
- * @param {string=} opt_newContents New contents of the comment.
- * @extends {Blockly.Events.CommentBase}
- * @constructor
- */
-Blockly.Events.CommentChange = function(opt_comment, opt_oldContents,
-    opt_newContents) {
-  Blockly.Events.CommentChange.superClass_.constructor.call(this, opt_comment);
-  if (!opt_comment) {
-    return;  // Blank event to be populated by fromJson.
-  }
-
-  this.oldContents_ = typeof opt_oldContents == 'undefined' ? '' :
-      opt_oldContents;
-  this.newContents_ = typeof opt_newContents == 'undefined' ? '' :
-      opt_newContents;
-};
-Blockly.utils.object.inherits(Blockly.Events.CommentChange,
-    Blockly.Events.CommentBase);
-
-/**
- * Type of this event.
- * @type {string}
- */
-Blockly.Events.CommentChange.prototype.type = Blockly.Events.COMMENT_CHANGE;
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Blockly.Events.CommentChange.prototype.toJson = function() {
-  var json = Blockly.Events.CommentChange.superClass_.toJson.call(this);
-  json['oldContents'] = this.oldContents_;
-  json['newContents'] = this.newContents_;
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.CommentChange.prototype.fromJson = function(json) {
-  Blockly.Events.CommentChange.superClass_.fromJson.call(this, json);
-  this.oldContents_ = json['oldContents'];
-  this.newContents_ = json['newContents'];
-};
-
-/**
- * Does this event record any change of state?
- * @return {boolean} False if something changed.
- */
-Blockly.Events.CommentChange.prototype.isNull = function() {
-  return this.oldContents_ == this.newContents_;
-};
-
-/**
- * Run a change event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-Blockly.Events.CommentChange.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
-  var comment = workspace.getCommentById(this.commentId);
-  if (!comment) {
-    console.warn('Can\'t change non-existent comment: ' + this.commentId);
-    return;
-  }
-  var contents = forward ? this.newContents_ : this.oldContents_;
-
-  comment.setContent(contents);
-};
-
-/**
- * Class for a comment creation event.
- * @param {!Blockly.WorkspaceComment=} opt_comment The created comment.
- *     Undefined for a blank event.
- * @extends {Blockly.Events.CommentBase}
- * @constructor
- */
-Blockly.Events.CommentCreate = function(opt_comment) {
-  Blockly.Events.CommentCreate.superClass_.constructor.call(this, opt_comment);
-  if (!opt_comment) {
-    return;  // Blank event to be populated by fromJson.
-  }
-
-  this.xml = opt_comment.toXmlWithXY();
-};
-Blockly.utils.object.inherits(Blockly.Events.CommentCreate,
-    Blockly.Events.CommentBase);
-
-/**
- * Type of this event.
- * @type {string}
- */
-Blockly.Events.CommentCreate.prototype.type = Blockly.Events.COMMENT_CREATE;
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-// TODO (#1266): "Full" and "minimal" serialization.
-Blockly.Events.CommentCreate.prototype.toJson = function() {
-  var json = Blockly.Events.CommentCreate.superClass_.toJson.call(this);
-  json['xml'] = Blockly.Xml.domToText(this.xml);
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.CommentCreate.prototype.fromJson = function(json) {
-  Blockly.Events.CommentCreate.superClass_.fromJson.call(this, json);
-  this.xml = Blockly.Xml.textToDom(json['xml']);
-};
-
-/**
- * Run a creation event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-Blockly.Events.CommentCreate.prototype.run = function(forward) {
-  Blockly.Events.CommentCreateDeleteHelper(this, forward);
-};
-
-/**
- * Helper function for Comment[Create|Delete]
- * @param {!Blockly.Events.CommentCreate|!Blockly.Events.CommentDelete} event
- *     The event to run.
- * @param {boolean} create if True then Create, if False then Delete
- */
-Blockly.Events.CommentCreateDeleteHelper = function(event, create) {
-  var workspace = event.getEventWorkspace_();
-  if (create) {
-    var xml = Blockly.utils.xml.createElement('xml');
-    xml.appendChild(event.xml);
-    Blockly.Xml.domToWorkspace(xml, workspace);
-  } else {
-    var comment = workspace.getCommentById(event.commentId);
-    if (comment) {
-      comment.dispose();
-    } else {
-      // Only complain about root-level block.
-      console.warn("Can't uncreate non-existent comment: " + event.commentId);
-    }
-  }
-};
-/**
- * Class for a comment deletion event.
- * @param {!Blockly.WorkspaceComment=} opt_comment The deleted comment.
- *     Undefined for a blank event.
- * @extends {Blockly.Events.CommentBase}
- * @constructor
- */
-Blockly.Events.CommentDelete = function(opt_comment) {
-  Blockly.Events.CommentDelete.superClass_.constructor.call(this, opt_comment);
-  if (!opt_comment) {
-    return;  // Blank event to be populated by fromJson.
-  }
-
-  this.xml = opt_comment.toXmlWithXY();
-};
-Blockly.utils.object.inherits(Blockly.Events.CommentDelete,
-    Blockly.Events.CommentBase);
-
-/**
- * Type of this event.
- * @type {string}
- */
-Blockly.Events.CommentDelete.prototype.type = Blockly.Events.COMMENT_DELETE;
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-// TODO (#1266): "Full" and "minimal" serialization.
-Blockly.Events.CommentDelete.prototype.toJson = function() {
-  var json = Blockly.Events.CommentDelete.superClass_.toJson.call(this);
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.CommentDelete.prototype.fromJson = function(json) {
-  Blockly.Events.CommentDelete.superClass_.fromJson.call(this, json);
-};
-
-/**
- * Run a creation event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-Blockly.Events.CommentDelete.prototype.run = function(forward) {
-  Blockly.Events.CommentCreateDeleteHelper(this, !forward);
-};
-
-/**
- * Class for a comment move event.  Created before the move.
- * @param {!Blockly.WorkspaceComment=} opt_comment The comment that is being
- *     moved.  Undefined for a blank event.
- * @extends {Blockly.Events.CommentBase}
- * @constructor
- */
-Blockly.Events.CommentMove = function(opt_comment) {
-  Blockly.Events.CommentMove.superClass_.constructor.call(this, opt_comment);
-  if (!opt_comment) {
-    return;  // Blank event to be populated by fromJson.
-  }
-
-  /**
-   * The comment that is being moved.  Will be cleared after recording the new
-   * location.
-   * @type {Blockly.WorkspaceComment}
-   */
-  this.comment_ = opt_comment;
-
-  /**
-   * The location before the move, in workspace coordinates.
-   * @type {!Blockly.utils.Coordinate}
-   */
-  this.oldCoordinate_ = opt_comment.getXY();
-
-  /**
-   * The location after the move, in workspace coordinates.
-   * @type {Blockly.utils.Coordinate}
-   */
-  this.newCoordinate_ = null;
-};
-Blockly.utils.object.inherits(Blockly.Events.CommentMove,
-    Blockly.Events.CommentBase);
-
-/**
- * Record the comment's new location.  Called after the move.  Can only be
- * called once.
- */
-Blockly.Events.CommentMove.prototype.recordNew = function() {
-  if (!this.comment_) {
-    throw Error('Tried to record the new position of a comment on the ' +
-        'same event twice.');
-  }
-  this.newCoordinate_ = this.comment_.getXY();
-  this.comment_ = null;
-};
-
-/**
- * Type of this event.
- * @type {string}
- */
-Blockly.Events.CommentMove.prototype.type = Blockly.Events.COMMENT_MOVE;
-
-/**
- * Override the location before the move.  Use this if you don't create the
- * event until the end of the move, but you know the original location.
- * @param {!Blockly.utils.Coordinate} xy The location before the move,
- *     in workspace coordinates.
- */
-Blockly.Events.CommentMove.prototype.setOldCoordinate = function(xy) {
-  this.oldCoordinate_ = xy;
-};
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-// TODO (#1266): "Full" and "minimal" serialization.
-Blockly.Events.CommentMove.prototype.toJson = function() {
-  var json = Blockly.Events.CommentMove.superClass_.toJson.call(this);
-  if (this.oldCoordinate_) {
-    json['oldCoordinate'] = Math.round(this.oldCoordinate_.x) + ',' +
-        Math.round(this.oldCoordinate_.y);
-  }
-  if (this.newCoordinate_) {
-    json['newCoordinate'] = Math.round(this.newCoordinate_.x) + ',' +
-        Math.round(this.newCoordinate_.y);
-  }
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.CommentMove.prototype.fromJson = function(json) {
-  Blockly.Events.CommentMove.superClass_.fromJson.call(this, json);
-
-  if (json['oldCoordinate']) {
-    var xy = json['oldCoordinate'].split(',');
-    this.oldCoordinate_ =
-        new Blockly.utils.Coordinate(Number(xy[0]), Number(xy[1]));
-  }
-  if (json['newCoordinate']) {
-    var xy = json['newCoordinate'].split(',');
-    this.newCoordinate_ =
-        new Blockly.utils.Coordinate(Number(xy[0]), Number(xy[1]));
-  }
-};
-
-/**
- * Does this event record any change of state?
- * @return {boolean} False if something changed.
- */
-Blockly.Events.CommentMove.prototype.isNull = function() {
-  return Blockly.utils.Coordinate.equals(this.oldCoordinate_,
-      this.newCoordinate_);
-};
-
-/**
- * Run a move event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-Blockly.Events.CommentMove.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
-  var comment = workspace.getCommentById(this.commentId);
-  if (!comment) {
-    console.warn('Can\'t move non-existent comment: ' + this.commentId);
-    return;
-  }
-
-  var target = forward ? this.newCoordinate_ : this.oldCoordinate_;
-  // TODO: Check if the comment is being dragged, and give up if so.
-  var current = comment.getXY();
-  comment.moveBy(target.x - current.x, target.y - current.y);
-};
-
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.COMMENT_CREATE, Blockly.Events.CommentCreate);
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.COMMENT_CHANGE, Blockly.Events.CommentChange);
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.COMMENT_MOVE, Blockly.Events.CommentMove);
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.COMMENT_DELETE, Blockly.Events.CommentDelete);
diff --git a/tests/deps.js b/tests/deps.js
index 6ac800d65..fb6a088b1 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -44,6 +44,11 @@ goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.Bl
 goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_base.js', ['Blockly.Events.CommentBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_change.js', ['Blockly.Events.CommentChange'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_create.js', ['Blockly.Events.CommentCreate'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_delete.js', ['Blockly.Events.CommentDelete'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_move.js', ['Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -57,7 +62,6 @@ goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.Va
 goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/ws_comment_events.js', ['Blockly.Events.CommentBase', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent']);

From a3b52aaab38c07f8a488970b4739d56c4c15bfb4 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 26 Aug 2021 08:53:31 -0700
Subject: [PATCH 727/833] Migrate core/events/events.js to goog.module syntax
 (#5302)

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

* Migrate core/events/events.js to goog.module

* Migrate core/events/events.js to named requires

* clang-format core/events/events.js

* Migrate Blockly core to use getRecordUndo/setRecordUndo

* Update core/events.js to reflect latest guidance around exporting mutable fields
---
 core/block.js                      |   8 +-
 core/events/events.js              | 352 ++++++++++++++++++-----------
 core/events/events_abstract.js     |   2 +-
 core/events/events_comment_base.js |   2 +-
 core/procedures.js                 |   6 +-
 core/rendered_connection.js        |   2 +-
 core/workspace.js                  |   4 +-
 core/xml.js                        |   9 +-
 tests/deps.js                      |   2 +-
 9 files changed, 242 insertions(+), 145 deletions(-)

diff --git a/core/block.js b/core/block.js
index 0f610c2e7..f11bc8490 100644
--- a/core/block.js
+++ b/core/block.js
@@ -224,14 +224,14 @@ const Block = function(workspace, prototypeName, opt_id) {
   if (!existingGroup) {
     Events.setGroup(true);
   }
-  const initialUndoFlag = Events.recordUndo;
+  const initialUndoFlag = Events.getRecordUndo();
 
   try {
     // Call an initialization function, if it exists.
     if (typeof this.init == 'function') {
-      Events.recordUndo = false;
+      Events.setRecordUndo(false);
       this.init();
-      Events.recordUndo = initialUndoFlag;
+      Events.setRecordUndo(initialUndoFlag);
     }
 
     // Fire a create event.
@@ -244,7 +244,7 @@ const Block = function(workspace, prototypeName, opt_id) {
       Events.setGroup(false);
     }
     // In case init threw, recordUndo flag should still be reset.
-    Events.recordUndo = initialUndoFlag;
+    Events.setRecordUndo(initialUndoFlag);
   }
 
   // Record initial inline state.
diff --git a/core/events/events.js b/core/events/events.js
index 982e84577..63d8d97f7 100644
--- a/core/events/events.js
+++ b/core/events/events.js
@@ -14,190 +14,274 @@
  * Events fired as a result of actions in Blockly's editor.
  * @namespace Blockly.Events
  */
-goog.provide('Blockly.Events');
+goog.module('Blockly.Events');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.registry');
-goog.require('Blockly.utils');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.Events.Abstract');
-goog.requireType('Blockly.Workspace');
+/* eslint-disable-next-line no-unused-vars */
+const Abstract = goog.requireType('Blockly.Events.Abstract');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+/* 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 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 deprecation = goog.require('Blockly.utils.deprecation');
+const registry = goog.require('Blockly.registry');
+const utils = goog.require('Blockly.utils');
 
 
 /**
  * Group ID for new events.  Grouped events are indivisible.
  * @type {string}
- * @private
  */
-Blockly.Events.group_ = '';
+let group = '';
 
 /**
  * Sets whether the next event should be added to the undo stack.
  * @type {boolean}
  */
-Blockly.Events.recordUndo = true;
+let recordUndo = true;
+/** @deprecated September 2021 */
+exports.recordUndo = recordUndo;
+
+/**
+ * Sets whether events should be added to the undo stack.
+ * @param {boolean} newValue True if events should be added to the undo stack.
+ */
+const setRecordUndo = function(newValue) {
+  recordUndo = newValue;
+};
+exports.setRecordUndo = setRecordUndo;
+
+/**
+ * Returns whether or not events will be added to the undo stack.
+ * @returns {boolean} True if events will be added to the undo stack.
+ */
+const getRecordUndo = function() {
+  return recordUndo;
+};
+exports.getRecordUndo = getRecordUndo;
+
+Object.defineProperties(exports, {
+  recordUndo: {
+    get: function() {
+      deprecation.warn(
+        'Blockly.Events.recordUndo', 'September 2021', 'September 2022',
+        'Blockly.Events.getRecordUndo()');
+      return getRecordUndo();
+    },
+    set: function(record) {
+      deprecation.warn(
+        'Blockly.Events.recordUndo', 'September 2021', 'September 2022',
+        'Blockly.Events.setRecordUndo()');
+      setRecordUndo(record);
+    },
+  }
+ });
 
 /**
  * Allow change events to be created and fired.
  * @type {number}
- * @private
  */
-Blockly.Events.disabled_ = 0;
+let disabled = 0;
+/** @private */
+exports.disabled_ = disabled;
+
+
+Object.defineProperties(exports, {
+  disabled_: {
+    set: function(newValue) {
+      disabled = newValue;
+    },
+  },
+});
 
 /**
  * Name of event that creates a block. Will be deprecated for BLOCK_CREATE.
  * @const
  */
-Blockly.Events.CREATE = 'create';
+const CREATE = 'create';
+exports.CREATE = CREATE;
 
 /**
  * Name of event that creates a block.
  * @const
  */
-Blockly.Events.BLOCK_CREATE = Blockly.Events.CREATE;
+const BLOCK_CREATE = CREATE;
+exports.BLOCK_CREATE = BLOCK_CREATE;
 
 /**
  * Name of event that deletes a block. Will be deprecated for BLOCK_DELETE.
  * @const
  */
-Blockly.Events.DELETE = 'delete';
+const DELETE = 'delete';
+exports.DELETE = DELETE;
 
 /**
  * Name of event that deletes a block.
  * @const
  */
-Blockly.Events.BLOCK_DELETE = Blockly.Events.DELETE;
+const BLOCK_DELETE = DELETE;
+exports.BLOCK_DELETE = BLOCK_DELETE;
 
 /**
  * Name of event that changes a block. Will be deprecated for BLOCK_CHANGE.
  * @const
  */
-Blockly.Events.CHANGE = 'change';
+const CHANGE = 'change';
+exports.CHANGE = CHANGE;
 
 /**
  * Name of event that changes a block.
  * @const
  */
-Blockly.Events.BLOCK_CHANGE = Blockly.Events.CHANGE;
+const BLOCK_CHANGE = CHANGE;
+exports.BLOCK_CHANGE = BLOCK_CHANGE;
 
 /**
  * Name of event that moves a block. Will be deprecated for BLOCK_MOVE.
  * @const
  */
-Blockly.Events.MOVE = 'move';
+const MOVE = 'move';
+exports.MOVE = MOVE;
 
 /**
  * Name of event that moves a block.
  * @const
  */
-Blockly.Events.BLOCK_MOVE = Blockly.Events.MOVE;
+const BLOCK_MOVE = MOVE;
+exports.BLOCK_MOVE = BLOCK_MOVE;
 
 /**
  * Name of event that creates a variable.
  * @const
  */
-Blockly.Events.VAR_CREATE = 'var_create';
+const VAR_CREATE = 'var_create';
+exports.VAR_CREATE = VAR_CREATE;
 
 /**
  * Name of event that deletes a variable.
  * @const
  */
-Blockly.Events.VAR_DELETE = 'var_delete';
+const VAR_DELETE = 'var_delete';
+exports.VAR_DELETE = VAR_DELETE;
 
 /**
  * Name of event that renames a variable.
  * @const
  */
-Blockly.Events.VAR_RENAME = 'var_rename';
+const VAR_RENAME = 'var_rename';
+exports.VAR_RENAME = VAR_RENAME;
 
 /**
  * Name of generic event that records a UI change.
  * @const
  */
-Blockly.Events.UI = 'ui';
+const UI = 'ui';
+exports.UI = UI;
 
 /**
  * Name of event that record a block drags a block.
  * @const
  */
-Blockly.Events.BLOCK_DRAG = 'drag';
+const BLOCK_DRAG = 'drag';
+exports.BLOCK_DRAG = BLOCK_DRAG;
 
 /**
  * Name of event that records a change in selected element.
  * @const
  */
-Blockly.Events.SELECTED = 'selected';
+const SELECTED = 'selected';
+exports.SELECTED = SELECTED;
 
 /**
  * Name of event that records a click.
  * @const
  */
-Blockly.Events.CLICK = 'click';
+const CLICK = 'click';
+exports.CLICK = CLICK;
 
 /**
  * Name of event that records a marker move.
  * @const
  */
-Blockly.Events.MARKER_MOVE = 'marker_move';
+const MARKER_MOVE = 'marker_move';
+exports.MARKER_MOVE = MARKER_MOVE;
 
 /**
  * Name of event that records a bubble open.
  * @const
  */
-Blockly.Events.BUBBLE_OPEN = 'bubble_open';
+const BUBBLE_OPEN = 'bubble_open';
+exports.BUBBLE_OPEN = BUBBLE_OPEN;
 
 /**
  * Name of event that records a trashcan open.
  * @const
  */
-Blockly.Events.TRASHCAN_OPEN = 'trashcan_open';
+const TRASHCAN_OPEN = 'trashcan_open';
+exports.TRASHCAN_OPEN = TRASHCAN_OPEN;
 
 /**
  * Name of event that records a toolbox item select.
  * @const
  */
-Blockly.Events.TOOLBOX_ITEM_SELECT = 'toolbox_item_select';
+const TOOLBOX_ITEM_SELECT = 'toolbox_item_select';
+exports.TOOLBOX_ITEM_SELECT = TOOLBOX_ITEM_SELECT;
 
 /**
  * Name of event that records a theme change.
  * @const
  */
-Blockly.Events.THEME_CHANGE = 'theme_change';
+const THEME_CHANGE = 'theme_change';
+exports.THEME_CHANGE = THEME_CHANGE;
 
 /**
  * Name of event that records a viewport change.
  * @const
  */
-Blockly.Events.VIEWPORT_CHANGE = 'viewport_change';
+const VIEWPORT_CHANGE = 'viewport_change';
+exports.VIEWPORT_CHANGE = VIEWPORT_CHANGE;
 
 /**
  * Name of event that creates a comment.
  * @const
  */
-Blockly.Events.COMMENT_CREATE = 'comment_create';
+const COMMENT_CREATE = 'comment_create';
+exports.COMMENT_CREATE = COMMENT_CREATE;
 
 /**
  * Name of event that deletes a comment.
  * @const
  */
-Blockly.Events.COMMENT_DELETE = 'comment_delete';
+const COMMENT_DELETE = 'comment_delete';
+exports.COMMENT_DELETE = COMMENT_DELETE;
 
 /**
  * Name of event that changes a comment.
  * @const
  */
-Blockly.Events.COMMENT_CHANGE = 'comment_change';
+const COMMENT_CHANGE = 'comment_change';
+exports.COMMENT_CHANGE = COMMENT_CHANGE;
 
 /**
  * Name of event that moves a comment.
  * @const
  */
-Blockly.Events.COMMENT_MOVE = 'comment_move';
+const COMMENT_MOVE = 'comment_move';
+exports.COMMENT_MOVE = COMMENT_MOVE;
 
 /**
  * Name of event that records a workspace load.
  */
-Blockly.Events.FINISHED_LOADING = 'finished_loading';
+const FINISHED_LOADING = 'finished_loading';
+exports.FINISHED_LOADING = FINISHED_LOADING;
 
 /**
  * Type of events that cause objects to be bumped back into the visible
@@ -205,10 +289,11 @@ Blockly.Events.FINISHED_LOADING = 'finished_loading';
  *
  * Not to be confused with bumping so that disconnected connections do not
  * appear connected.
- * @typedef {!Blockly.Events.BlockCreate|!Blockly.Events.BlockMove|
- * !Blockly.Events.CommentCreate|!Blockly.Events.CommentMove}
+ * @typedef {!BlockCreate|!BlockMove|
+ * !CommentCreate|!CommentMove}
  */
-Blockly.Events.BumpEvent;
+let BumpEvent;
+exports.BumpEvent = BumpEvent;
 
 /**
  * List of events that cause objects to be bumped back into the visible
@@ -218,101 +303,99 @@ Blockly.Events.BumpEvent;
  * appear connected.
  * @const
  */
-Blockly.Events.BUMP_EVENTS = [
-  Blockly.Events.BLOCK_CREATE,
-  Blockly.Events.BLOCK_MOVE,
-  Blockly.Events.COMMENT_CREATE,
-  Blockly.Events.COMMENT_MOVE
-];
+const BUMP_EVENTS = [BLOCK_CREATE, BLOCK_MOVE, COMMENT_CREATE, COMMENT_MOVE];
+exports.BUMP_EVENTS = BUMP_EVENTS;
 
 /**
  * List of events queued for firing.
- * @private
  */
-Blockly.Events.FIRE_QUEUE_ = [];
+const FIRE_QUEUE = [];
+/** @private */
+exports.FIRE_QUEUE_ = FIRE_QUEUE;
 
 /**
  * Create a custom event and fire it.
- * @param {!Blockly.Events.Abstract} event Custom data for event.
+ * @param {!Abstract} event Custom data for event.
  */
-Blockly.Events.fire = function(event) {
-  if (!Blockly.Events.isEnabled()) {
+const fire = function(event) {
+  if (!isEnabled()) {
     return;
   }
-  if (!Blockly.Events.FIRE_QUEUE_.length) {
+  if (!FIRE_QUEUE.length) {
     // First event added; schedule a firing of the event queue.
-    setTimeout(Blockly.Events.fireNow_, 0);
+    setTimeout(fireNow, 0);
   }
-  Blockly.Events.FIRE_QUEUE_.push(event);
+  FIRE_QUEUE.push(event);
 };
+exports.fire = fire;
 
 /**
  * Fire all queued events.
- * @private
  */
-Blockly.Events.fireNow_ = function() {
-  var queue = Blockly.Events.filter(Blockly.Events.FIRE_QUEUE_, true);
-  Blockly.Events.FIRE_QUEUE_.length = 0;
-  for (var i = 0, event; (event = queue[i]); i++) {
+const fireNow = function() {
+  const queue = filter(FIRE_QUEUE, true);
+  FIRE_QUEUE.length = 0;
+  for (let i = 0, event; (event = queue[i]); i++) {
     if (!event.workspaceId) {
       continue;
     }
-    var workspace = Blockly.Workspace.getById(event.workspaceId);
-    if (workspace) {
-      workspace.fireChangeListener(event);
+    const Workspace = goog.module.get('Blockly.Workspace');
+    const eventWorkspace = Workspace.getById(event.workspaceId);
+    if (eventWorkspace) {
+      eventWorkspace.fireChangeListener(event);
     }
   }
 };
+/** @private */
+exports.fireNow_ = fireNow;
 
 /**
  * Filter the queued events and merge duplicates.
- * @param {!Array<!Blockly.Events.Abstract>} queueIn Array of events.
+ * @param {!Array<!Abstract>} queueIn Array of events.
  * @param {boolean} forward True if forward (redo), false if backward (undo).
- * @return {!Array<!Blockly.Events.Abstract>} Array of filtered events.
+ * @return {!Array<!Abstract>} Array of filtered events.
  */
-Blockly.Events.filter = function(queueIn, forward) {
-  var queue = queueIn.slice();  // Shallow copy of queue.
+const filter = function(queueIn, forward) {
+  let queue = queueIn.slice();  // Shallow copy of queue.
   if (!forward) {
     // Undo is merged in reverse order.
     queue.reverse();
   }
-  var mergedQueue = [];
-  var hash = Object.create(null);
+  const mergedQueue = [];
+  const hash = Object.create(null);
   // Merge duplicates.
-  for (var i = 0, event; (event = queue[i]); i++) {
+  for (let i = 0, event; (event = queue[i]); i++) {
     if (!event.isNull()) {
       // Treat all UI events as the same type in hash table.
-      var eventType = event.isUiEvent ? Blockly.Events.UI : event.type;
-      var key = [eventType, event.blockId, event.workspaceId].join(' ');
+      const eventType = event.isUiEvent ? UI : event.type;
+      const key = [eventType, event.blockId, event.workspaceId].join(' ');
 
-      var lastEntry = hash[key];
-      var lastEvent = lastEntry ? lastEntry.event : null;
+      const lastEntry = hash[key];
+      const lastEvent = lastEntry ? lastEntry.event : null;
       if (!lastEntry) {
         // Each item in the hash table has the event and the index of that event
         // in the input array.  This lets us make sure we only merge adjacent
         // move events.
-        hash[key] = { event: event, index: i};
+        hash[key] = {event: event, index: i};
         mergedQueue.push(event);
-      } else if (event.type == Blockly.Events.MOVE &&
-          lastEntry.index == i - 1) {
+      } else if (event.type == MOVE && lastEntry.index == i - 1) {
         // Merge move events.
         lastEvent.newParentId = event.newParentId;
         lastEvent.newInputName = event.newInputName;
         lastEvent.newCoordinate = event.newCoordinate;
         lastEntry.index = i;
-      } else if (event.type == Blockly.Events.CHANGE &&
-          event.element == lastEvent.element &&
+      } else if (
+          event.type == CHANGE && event.element == lastEvent.element &&
           event.name == lastEvent.name) {
         // Merge change events.
         lastEvent.newValue = event.newValue;
-      } else if (event.type == Blockly.Events.VIEWPORT_CHANGE) {
+      } else if (event.type == VIEWPORT_CHANGE) {
         // Merge viewport change events.
         lastEvent.viewTop = event.viewTop;
         lastEvent.viewLeft = event.viewLeft;
         lastEvent.scale = event.scale;
         lastEvent.oldScale = event.oldScale;
-      } else if (event.type == Blockly.Events.CLICK &&
-          lastEvent.type == Blockly.Events.BUBBLE_OPEN) {
+      } else if (event.type == CLICK && lastEvent.type == BUBBLE_OPEN) {
         // Drop click events caused by opening/closing bubbles.
       } else {
         // Collision: newer events should merge into this event to maintain
@@ -323,155 +406,168 @@ Blockly.Events.filter = function(queueIn, forward) {
     }
   }
   // Filter out any events that have become null due to merging.
-  queue = mergedQueue.filter(function(e) { return !e.isNull(); });
+  queue = mergedQueue.filter(function(e) {
+    return !e.isNull();
+  });
   if (!forward) {
     // Restore undo order.
     queue.reverse();
   }
   // Move mutation events to the top of the queue.
   // Intentionally skip first event.
-  for (var i = 1, event; (event = queue[i]); i++) {
-    if (event.type == Blockly.Events.CHANGE &&
-        event.element == 'mutation') {
+  for (let i = 1, event; (event = queue[i]); i++) {
+    if (event.type == CHANGE && event.element == 'mutation') {
       queue.unshift(queue.splice(i, 1)[0]);
     }
   }
   return queue;
 };
+exports.filter = filter;
 
 /**
  * Modify pending undo events so that when they are fired they don't land
- * in the undo stack.  Called by Blockly.Workspace.clearUndo.
+ * in the undo stack.  Called by Workspace.clearUndo.
  */
-Blockly.Events.clearPendingUndo = function() {
-  for (var i = 0, event; (event = Blockly.Events.FIRE_QUEUE_[i]); i++) {
+const clearPendingUndo = function() {
+  for (let i = 0, event; (event = FIRE_QUEUE[i]); i++) {
     event.recordUndo = false;
   }
 };
+exports.clearPendingUndo = clearPendingUndo;
 
 /**
  * Stop sending events.  Every call to this function MUST also call enable.
  */
-Blockly.Events.disable = function() {
-  Blockly.Events.disabled_++;
+const disable = function() {
+  disabled++;
 };
+exports.disable = disable;
 
 /**
  * Start sending events.  Unless events were already disabled when the
  * corresponding call to disable was made.
  */
-Blockly.Events.enable = function() {
-  Blockly.Events.disabled_--;
+const enable = function() {
+  disabled--;
 };
+exports.enable = enable;
 
 /**
  * Returns whether events may be fired or not.
  * @return {boolean} True if enabled.
  */
-Blockly.Events.isEnabled = function() {
-  return Blockly.Events.disabled_ == 0;
+const isEnabled = function() {
+  return disabled == 0;
 };
+exports.isEnabled = isEnabled;
 
 /**
  * Current group.
  * @return {string} ID string.
  */
-Blockly.Events.getGroup = function() {
-  return Blockly.Events.group_;
+const getGroup = function() {
+  return group;
 };
+exports.getGroup = getGroup;
 
 /**
  * Start or stop a group.
  * @param {boolean|string} state True to start new group, false to end group.
  *   String to set group explicitly.
  */
-Blockly.Events.setGroup = function(state) {
+const setGroup = function(state) {
   if (typeof state == 'boolean') {
-    Blockly.Events.group_ = state ? Blockly.utils.genUid() : '';
+    group = state ? utils.genUid() : '';
   } else {
-    Blockly.Events.group_ = state;
+    group = state;
   }
 };
+exports.setGroup = setGroup;
 
 /**
  * Compute a list of the IDs of the specified block and all its descendants.
- * @param {!Blockly.Block} block The root block.
+ * @param {!Block} block The root block.
  * @return {!Array<string>} List of block IDs.
- * @package
  */
-Blockly.Events.getDescendantIds = function(block) {
-  var ids = [];
-  var descendants = block.getDescendants(false);
-  for (var i = 0, descendant; (descendant = descendants[i]); i++) {
+const getDescendantIds = function(block) {
+  const ids = [];
+  const descendants = block.getDescendants(false);
+  for (let i = 0, descendant; (descendant = descendants[i]); i++) {
     ids[i] = descendant.id;
   }
   return ids;
 };
+/** @package */
+exports.getDescendantIds = getDescendantIds;
 
 /**
  * Decode the JSON into an event.
  * @param {!Object} json JSON representation.
- * @param {!Blockly.Workspace} workspace Target workspace for event.
- * @return {!Blockly.Events.Abstract} The event represented by the JSON.
+ * @param {!Workspace} workspace Target workspace for event.
+ * @return {!Abstract} The event represented by the JSON.
  * @throws {Error} if an event type is not found in the registry.
  */
-Blockly.Events.fromJson = function(json, workspace) {
-  var eventClass = Blockly.Events.get(json.type);
+const fromJson = function(json, workspace) {
+  const eventClass = get(json.type);
   if (!eventClass) {
     throw Error('Unknown event type.');
   }
-  var event = new eventClass();
+  const event = new eventClass();
   event.fromJson(json);
   event.workspaceId = workspace.id;
   return event;
 };
+exports.fromJson = fromJson;
 
 /**
  * Gets the class for a specific event type from the registry.
  * @param {string} eventType The type of the event to get.
- * @return {?function(new:Blockly.Events.Abstract, ...?)} The event class with
+ * @return {?function(new:Abstract, ...?)} The event class with
  *     the given type or null if none exists.
  */
-Blockly.Events.get = function(eventType) {
-  return Blockly.registry.getClass(Blockly.registry.Type.EVENT, eventType);
+const get = function(eventType) {
+  return registry.getClass(registry.Type.EVENT, eventType);
 };
+exports.get = get;
 
 /**
  * Enable/disable a block depending on whether it is properly connected.
  * Use this on applications where all blocks should be connected to a top block.
  * Recommend setting the 'disable' option to 'false' in the config so that
  * users don't try to re-enable disabled orphan blocks.
- * @param {!Blockly.Events.Abstract} event Custom data for event.
+ * @param {!Abstract} event Custom data for event.
  */
-Blockly.Events.disableOrphans = function(event) {
-  if (event.type == Blockly.Events.MOVE ||
-      event.type == Blockly.Events.CREATE) {
+const disableOrphans = function(event) {
+  if (event.type == MOVE || event.type == CREATE) {
     if (!event.workspaceId) {
       return;
     }
-    var workspace = Blockly.Workspace.getById(event.workspaceId);
-    var block = workspace.getBlockById(event.blockId);
+    const Workspace = goog.module.get('Blockly.Workspace');
+    const eventWorkspace = Workspace.getById(event.workspaceId);
+    let block = eventWorkspace.getBlockById(event.blockId);
     if (block) {
       // Changing blocks as part of this event shouldn't be undoable.
-      var initialUndoFlag = Blockly.Events.recordUndo;
+      const initialUndoFlag = recordUndo;
       try {
-        Blockly.Events.recordUndo = false;
-        var parent = block.getParent();
+        recordUndo = false;
+        const parent = block.getParent();
         if (parent && parent.isEnabled()) {
-          var children = block.getDescendants(false);
-          for (var i = 0, child; (child = children[i]); i++) {
+          const children = block.getDescendants(false);
+          for (let i = 0, child; (child = children[i]); i++) {
             child.setEnabled(true);
           }
-        } else if ((block.outputConnection || block.previousConnection) &&
-                  !workspace.isDragging()) {
+        } else if (
+            (block.outputConnection || block.previousConnection) &&
+            !eventWorkspace.isDragging()) {
           do {
             block.setEnabled(false);
             block = block.getNextBlock();
           } while (block);
         }
       } finally {
-        Blockly.Events.recordUndo = initialUndoFlag;
+        recordUndo = initialUndoFlag;
       }
     }
   }
 };
+exports.disableOrphans = disableOrphans;
diff --git a/core/events/events_abstract.js b/core/events/events_abstract.js
index 9a14e82b2..eff43fdac 100644
--- a/core/events/events_abstract.js
+++ b/core/events/events_abstract.js
@@ -48,7 +48,7 @@ const Abstract = function() {
    * Sets whether the event should be added to the undo stack.
    * @type {boolean}
    */
-  this.recordUndo = Events.recordUndo;
+  this.recordUndo = Events.getRecordUndo();
 };
 
 /**
diff --git a/core/events/events_comment_base.js b/core/events/events_comment_base.js
index 70b81e056..59880d3db 100644
--- a/core/events/events_comment_base.js
+++ b/core/events/events_comment_base.js
@@ -60,7 +60,7 @@ const CommentBase = function(opt_comment) {
    * Sets whether the event should be added to the undo stack.
    * @type {boolean}
    */
-  this.recordUndo = Events.recordUndo;
+  this.recordUndo = Events.getRecordUndo();
 };
 object.inherits(CommentBase, AbstractEvents);
 
diff --git a/core/procedures.js b/core/procedures.js
index e63618e7c..57a18b5dd 100644
--- a/core/procedures.js
+++ b/core/procedures.js
@@ -362,7 +362,7 @@ exports.getCallers = getCallers;
  * @param {!Block} defBlock Procedure definition block.
  */
 const mutateCallers = function(defBlock) {
-  const oldRecordUndo = Events.recordUndo;
+  const oldRecordUndo = Events.getRecordUndo();
   const procedureBlock = /** @type {!ProcedureBlock} */ (defBlock);
   const name = procedureBlock.getProcedureDef()[0];
   const xmlElement = defBlock.mutationToDom(true);
@@ -377,10 +377,10 @@ const mutateCallers = function(defBlock) {
       // Fire a mutation on every caller block.  But don't record this as an
       // undo action since it is deterministically tied to the procedure's
       // definition mutation.
-      Events.recordUndo = false;
+      Events.setRecordUndo(false);
       Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
           caller, 'mutation', null, oldMutation, newMutation));
-      Events.recordUndo = oldRecordUndo;
+      Events.setRecordUndo(oldRecordUndo);
     }
   }
 };
diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index 0abc123e5..39dee432c 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -458,7 +458,7 @@ RenderedConnection.prototype.isConnectionAllowed = function(
  */
 RenderedConnection.prototype.onFailedConnect = function(otherConnection) {
   const block = this.getSourceBlock();
-  if (Events.recordUndo) {
+  if (Events.getRecordUndo()) {
     const group = Events.getGroup();
     setTimeout(function() {
       if (!block.isDisposed() && !block.getParent()) {
diff --git a/core/workspace.js b/core/workspace.js
index 77b50967e..f1acb4aec 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -633,14 +633,14 @@ Workspace.prototype.undo = function(redo) {
     outputStack.push(event);
   }
   events = Events.filter(events, redo);
-  Events.recordUndo = false;
+  Events.setRecordUndo(false);
   try {
     for (let i = 0; i < events.length; i++) {
       const event = events[i];
       event.run(redo);
     }
   } finally {
-    Events.recordUndo = true;
+    Events.setRecordUndo(true);
   }
 };
 
diff --git a/core/xml.js b/core/xml.js
index 661631d27..7406e0e09 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -25,6 +25,8 @@ const Size = goog.require('Blockly.utils.Size');
 const VariableModel = goog.requireType('Blockly.VariableModel');
 /* 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 dom = goog.require('Blockly.utils.dom');
 const inputTypes = goog.require('Blockly.inputTypes');
 const utilsXml = goog.require('Blockly.utils.xml');
@@ -433,11 +435,10 @@ const domToWorkspace = function(xml, workspace) {
   }
   let variablesFirst = true;
   try {
-    for (let i = 0; i < xml.childNodes.length; i++) {
-      const xmlChild = xml.childNodes[i];
+    for (let i = 0, xmlChild; (xmlChild = xml.childNodes[i]); i++) {
       const name = xmlChild.nodeName.toLowerCase();
       const xmlChildElement = /** @type {!Element} */ (xmlChild);
-      if (name == 'block' || (name == 'shadow' && !Events.recordUndo)) {
+      if (name == 'block' || (name == 'shadow' && !Events.getRecordUndo())) {
         // Allow top-level shadow blocks if recordUndo is disabled since
         // that means an undo is in progress.  Such a block is expected
         // to be moved to a nested destination in the next operation.
@@ -466,7 +467,7 @@ const domToWorkspace = function(xml, workspace) {
           } else {
             WorkspaceCommentSvg.fromXml(
                 xmlChildElement,
-                /** @type {!Blockly.WorkspaceSvg} */ (workspace), width);
+                /** @type {!WorkspaceSvg} */ (workspace), width);
           }
         } else {
           const WorkspaceComment = goog.module.get('Blockly.WorkspaceComment');
diff --git a/tests/deps.js b/tests/deps.js
index 2ec43e967..41eb31f3d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -34,7 +34,7 @@ goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'mo
 goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils']);
+goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.BlockBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 24d73be1c375c8cb93a867c37c28030cc9f8b1ea Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Fri, 3 Sep 2021 17:57:31 +0100
Subject: [PATCH 728/833] docs: Create renamings.js to collect renamed API
 entries (#5426)

Create a file scripts/migration/renamings.js to collect information about renamed API entries. Start by filling it with the renamings already done to blockly.js.
---
 scripts/migration/renamings.js | 73 ++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 scripts/migration/renamings.js

diff --git a/scripts/migration/renamings.js b/scripts/migration/renamings.js
new file mode 100644
index 000000000..23d6f3e93
--- /dev/null
+++ b/scripts/migration/renamings.js
@@ -0,0 +1,73 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Collected information about modules and module
+ * exports that have been renamed between versions.
+ *
+ * For now this is a node module, not a goog.module.
+ */
+'use strict';
+
+/**
+ * Map from Blockly core version number to table of renamings made
+ * *since* that version was released (since we don't know for sure
+ * what the version number of the release that will incorporate those
+ * renamings will be yet).
+ * @type {Object<string, ?>}
+ */
+const renamings = {
+  '4.20201217.0': {
+    Blockly: {
+      exports: {
+        // bind/unbind events functions.  See PR #4642
+        EventData: {module: 'Blockly.eventHandling', export: 'Data'},
+        bindEvent_: {module: 'Blockly.browserEvents', export: 'bind'},
+        unbindEvent_: {module: 'Blockly.browserEvents', export: 'unbind'},
+        bindEventWithChecks_: {
+          module: 'Blockly.browserEvents',
+          export: 'conditionalBind',
+        },
+      },
+    }
+  },
+  '6.20210701.0': {
+    Blockly: {
+      exports: {
+        // Clipboard.  See PR #5237.
+        clipboardXml_: {module: 'Blockly.clipboard', export: 'xml'},
+        clipboardSource_: {module: 'Blockly.clipboard', export: 'source'},
+        clipboardTypeCounts_: {
+          module: 'Blockly.clipboard',
+          export: 'typeCounts',
+        },
+        copy: {module: 'Blockly.clipboard'},
+        paste: {module: 'Blockly.clipboard'},
+        duplicate: {module: 'Blockly.clipboard'},
+
+        // mainWorkspace.  See PR #5244.
+        mainWorkspace: {
+          module: 'Blockly.common',
+          get: 'getMainWorkspace',
+          set: 'setMainWorkspace',
+        },
+        getMainWorkspace: {module: 'Blockly.common'},
+
+        // parentContainer, draggingConnections.  See PR #5262.
+        parentContainer: {
+          module: 'Blockly.common',
+          get: 'getParentContainer',
+          set: 'setParentContainer',
+        },
+        setParentContainer: {module: 'Blockly.common'},
+        draggingConnections: {module: 'Blockly.common'},
+
+      },
+    },
+  },
+};
+
+exports.renamings = renamings;

From c31895dc60eaebe75b3606fe4ad20be08e49008a Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Fri, 3 Sep 2021 22:45:54 +0100
Subject: [PATCH 729/833] fix: Add missing require for Blockly.utils.object,
 .Size (#5427)

Some files were using Blockly.utils.object.inherits (or .mixin) without
having imported Blockly.utils.object.

Similarly, trashcan.js tried to use utils.Size as a constructor
instead of importing Size from Blockly.utils.Size.
---
 core/flyout_base.js                |  3 ++-
 core/renderers/common/constants.js |  3 ++-
 core/toolbox/toolbox.js            |  3 ++-
 core/trashcan.js                   |  7 ++++---
 core/zoom_controls.js              |  4 ++--
 tests/deps.js                      | 10 +++++-----
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/core/flyout_base.js b/core/flyout_base.js
index c37d2a1ef..011149a97 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -37,6 +37,7 @@ const WorkspaceSvg = goog.require('Blockly.WorkspaceSvg');
 const Xml = goog.require('Blockly.Xml');
 const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
+const object = goog.require('Blockly.utils.object');
 const toolbox = goog.require('Blockly.utils.toolbox');
 const utils = goog.require('Blockly.utils');
 const utilsXml = goog.require('Blockly.utils.xml');
@@ -155,7 +156,7 @@ const Flyout = function(workspaceOptions) {
    */
   this.targetWorkspace = null;
 };
-utils.object.inherits(Flyout, DeleteArea);
+object.inherits(Flyout, DeleteArea);
 
 /**
  * Does the flyout automatically close when a block is created?
diff --git a/core/renderers/common/constants.js b/core/renderers/common/constants.js
index 5e5ecb747..08c0d61ca 100644
--- a/core/renderers/common/constants.js
+++ b/core/renderers/common/constants.js
@@ -21,6 +21,7 @@ const Theme = goog.requireType('Blockly.Theme');
 const colour = goog.require('Blockly.utils.colour');
 const connectionTypes = goog.require('Blockly.connectionTypes');
 const dom = goog.require('Blockly.utils.dom');
+const object = goog.require('Blockly.utils.object');
 const svgPaths = goog.require('Blockly.utils.svgPaths');
 const userAgent = goog.require('Blockly.utils.userAgent');
 const utils = goog.require('Blockly.utils');
@@ -715,7 +716,7 @@ ConstantProvider.prototype.validatedBlockStyle_ = function(blockStyle) {
   // Make a new object with all of the same properties.
   const valid = /** @type {!Theme.BlockStyle} */ ({});
   if (blockStyle) {
-    utils.object.mixin(valid, blockStyle);
+    object.mixin(valid, blockStyle);
   }
   // Validate required properties.
   const parsedColour = utils.parseBlockColour(valid['colourPrimary'] || '#000');
diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index 37808a80d..1bff6d844 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -50,6 +50,7 @@ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const aria = goog.require('Blockly.utils.aria');
 const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
+const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
 const utils = goog.require('Blockly.utils');
 const toolbox = goog.require('Blockly.utils.toolbox');
@@ -189,7 +190,7 @@ const Toolbox = function(workspace) {
    */
   this.boundEvents_ = [];
 };
-utils.object.inherits(Toolbox, DeleteArea);
+object.inherits(Toolbox, DeleteArea);
 
 /**
  * Handles the given keyboard shortcut.
diff --git a/core/trashcan.js b/core/trashcan.js
index 49596ae83..b3a459f01 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -32,6 +32,7 @@ const IPositionable = goog.requireType('Blockly.IPositionable');
 const MetricsManager = goog.requireType('Blockly.MetricsManager');
 const Options = goog.require('Blockly.Options');
 const Rect = goog.require('Blockly.utils.Rect');
+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');
@@ -39,10 +40,10 @@ const Xml = goog.require('Blockly.Xml');
 const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
 const internalConstants = goog.require('Blockly.internalConstants');
+const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
 const toolbox = goog.require('Blockly.utils.toolbox');
 const uiPosition = goog.require('Blockly.uiPosition');
-const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.TrashcanOpen');
 
@@ -123,7 +124,7 @@ const Trashcan = function(workspace) {
   }
   this.workspace_.addChangeListener(this.onDelete_.bind(this));
 };
-utils.object.inherits(Trashcan, DeleteArea);
+object.inherits(Trashcan, DeleteArea);
 
 /**
  * Width of both the trash can and lid images.
@@ -453,7 +454,7 @@ Trashcan.prototype.position = function(metrics, savedPositions) {
 
   const height = BODY_HEIGHT + LID_HEIGHT;
   const startRect = uiPosition.getStartPositionRect(
-      cornerPosition, new utils.Size(WIDTH, height), MARGIN_HORIZONTAL,
+      cornerPosition, new Size(WIDTH, height), MARGIN_HORIZONTAL,
       MARGIN_VERTICAL, metrics, this.workspace_);
 
   const verticalPosition = cornerPosition.vertical;
diff --git a/core/zoom_controls.js b/core/zoom_controls.js
index eb27b17e3..0348a202f 100644
--- a/core/zoom_controls.js
+++ b/core/zoom_controls.js
@@ -19,6 +19,7 @@ const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const IPositionable = goog.requireType('Blockly.IPositionable');
 const Rect = goog.require('Blockly.utils.Rect');
+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 */
@@ -27,7 +28,6 @@ const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
 const internalConstants = goog.require('Blockly.internalConstants');
 const uiPosition = goog.require('Blockly.uiPosition');
-const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.Click');
 
@@ -264,7 +264,7 @@ ZoomControls.prototype.position = function(metrics, savedPositions) {
     height += this.LARGE_SPACING_ + this.HEIGHT_;
   }
   const startRect = uiPosition.getStartPositionRect(
-      cornerPosition, new utils.Size(this.WIDTH_, height),
+      cornerPosition, new Size(this.WIDTH_, height),
       this.MARGIN_HORIZONTAL_, this.MARGIN_VERTICAL_, metrics, this.workspace_);
 
   const verticalPosition = cornerPosition.vertical;
diff --git a/tests/deps.js b/tests/deps.js
index 41eb31f3d..0914683b2 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -76,7 +76,7 @@ goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Bloc
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -136,7 +136,7 @@ goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
@@ -203,12 +203,12 @@ goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Bl
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly', 'Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
-goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], [], {'lang': 'es6', 'module': 'goog'});
@@ -244,6 +244,6 @@ goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.Workspa
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);
 

From 2d89a36e7d756a24d9c924434ea0723bac54c811 Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Tue, 7 Sep 2021 18:48:18 +0100
Subject: [PATCH 730/833] Migrate core/utils/useragent.js to goog.module syntax
 (#5435)

* Migrate core/utils/useragent.js to ES6 const/let
* Migrate core/utils/useragent.js to goog.module
* Migrate core/utils/useragent.js named requires
* clang-format core/utils/useragent.js
---
 core/utils/useragent.js | 192 ++++++++++++++++++++++++----------------
 tests/deps.js           |   2 +-
 2 files changed, 117 insertions(+), 77 deletions(-)

diff --git a/core/utils/useragent.js b/core/utils/useragent.js
index fb6fadd69..8ae95381d 100644
--- a/core/utils/useragent.js
+++ b/core/utils/useragent.js
@@ -16,100 +16,140 @@
  * @name Blockly.utils.userAgent
  * @namespace
  */
-goog.provide('Blockly.utils.userAgent');
+goog.module('Blockly.utils.userAgent');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.utils.global');
+const global = goog.require('Blockly.utils.global');
 
 
-/** @const {boolean} */
-Blockly.utils.userAgent.IE;
+/**
+ * @type {string}
+ * The raw useragent string.
+ */
+let rawUserAgent;
 
-/** @const {boolean} */
-Blockly.utils.userAgent.EDGE;
+/** @type {boolean} */
+let isIe;
 
-/** @const {boolean} */
-Blockly.utils.userAgent.JAVA_FX;
+/** @type {boolean} */
+let isEdge;
 
-/** @const {boolean} */
-Blockly.utils.userAgent.CHROME;
+/** @type {boolean} */
+let isJavaFx;
 
-/** @const {boolean} */
-Blockly.utils.userAgent.WEBKIT;
+/** @type {boolean} */
+let isChrome;
 
-/** @const {boolean} */
-Blockly.utils.userAgent.GECKO;
+/** @type {boolean} */
+let isWebKit;
 
-/** @const {boolean} */
-Blockly.utils.userAgent.ANDROID;
+/** @type {boolean} */
+let isGecko;
 
-/** @const {boolean} */
-Blockly.utils.userAgent.IPAD;
+/** @type {boolean} */
+let isAndroid;
 
-/** @const {boolean} */
-Blockly.utils.userAgent.IPOD;
+/** @type {boolean} */
+let isIPad;
 
-/** @const {boolean} */
-Blockly.utils.userAgent.IPHONE;
+/** @type {boolean} */
+let isIPod;
 
-/** @const {boolean} */
-Blockly.utils.userAgent.MAC;
+/** @type {boolean} */
+let isIPhone;
 
-/** @const {boolean} */
-Blockly.utils.userAgent.TABLET;
+/** @type {boolean} */
+let isMac;
 
-/** @const {boolean} */
-Blockly.utils.userAgent.MOBILE;
+/** @type {boolean} */
+let isTablet;
+
+/** @type {boolean} */
+let isMobile;
 
 (function(raw) {
-  Blockly.utils.userAgent.raw = raw;
-  var rawUpper = Blockly.utils.userAgent.raw.toUpperCase();
-  /**
-   * Case-insensitive test of whether name is in the useragent string.
-   * @param {string} name Name to test.
-   * @return {boolean} True if name is present.
-   */
-  function has(name) {
-    return rawUpper.indexOf(name.toUpperCase()) != -1;
-  }
+rawUserAgent = raw;
+const rawUpper = rawUserAgent.toUpperCase();
+/**
+ * Case-insensitive test of whether name is in the useragent string.
+ * @param {string} name Name to test.
+ * @return {boolean} True if name is present.
+ */
+function has(name) {
+  return rawUpper.indexOf(name.toUpperCase()) != -1;
+}
 
-  // Browsers.  Logic from:
-  // https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/browser.js
-  Blockly.utils.userAgent.IE = has('Trident') || has('MSIE');
-  Blockly.utils.userAgent.EDGE = has('Edge');
-  // Useragent for JavaFX:
-  // Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.44
-  //     (KHTML, like Gecko) JavaFX/8.0 Safari/537.44
-  Blockly.utils.userAgent.JAVA_FX = has('JavaFX');
-  Blockly.utils.userAgent.CHROME = (has('Chrome') || has('CriOS')) &&
-        !Blockly.utils.userAgent.EDGE;
+// Browsers.  Logic from:
+// https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/browser.js
+isIe = has('Trident') || has('MSIE');
+isEdge = has('Edge');
+// Useragent for JavaFX:
+// Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.44
+//     (KHTML, like Gecko) JavaFX/8.0 Safari/537.44
+isJavaFx = has('JavaFX');
+isChrome = (has('Chrome') || has('CriOS')) && !isEdge;
 
-  // Engines.  Logic from:
-  // https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/engine.js
-  Blockly.utils.userAgent.WEBKIT = has('WebKit') &&
-      !Blockly.utils.userAgent.EDGE;
-  Blockly.utils.userAgent.GECKO = has('Gecko') &&
-      !Blockly.utils.userAgent.WEBKIT &&
-      !Blockly.utils.userAgent.IE &&
-      !Blockly.utils.userAgent.EDGE;
+// Engines.  Logic from:
+// https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/engine.js
+isWebKit = has('WebKit') && !isEdge;
+isGecko = has('Gecko') && !isWebKit && !isIe && !isEdge;
 
-  // Platforms.  Logic from:
-  // https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/platform.js and
-  // https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/extra.js
-  Blockly.utils.userAgent.ANDROID = has('Android');
-  var maxTouchPoints = Blockly.utils.global['navigator'] &&
-      Blockly.utils.global['navigator']['maxTouchPoints'];
-  Blockly.utils.userAgent.IPAD = has('iPad') ||
-      has('Macintosh') && maxTouchPoints > 0;
-  Blockly.utils.userAgent.IPOD = has('iPod');
-  Blockly.utils.userAgent.IPHONE = has('iPhone') &&
-      !Blockly.utils.userAgent.IPAD && !Blockly.utils.userAgent.IPOD;
-  Blockly.utils.userAgent.MAC = has('Macintosh');
+// Platforms.  Logic from:
+// https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/platform.js
+// and
+// https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/extra.js
+isAndroid = has('Android');
+const maxTouchPoints =
+    global['navigator'] && global['navigator']['maxTouchPoints'];
+isIPad = has('iPad') || has('Macintosh') && maxTouchPoints > 0;
+isIPod = has('iPod');
+isIPhone = has('iPhone') && !isIPad && !isIPod;
+isMac = has('Macintosh');
 
-  // Devices.  Logic from:
-  // https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/device.js
-  Blockly.utils.userAgent.TABLET = Blockly.utils.userAgent.IPAD ||
-      (Blockly.utils.userAgent.ANDROID && !has('Mobile')) || has('Silk');
-  Blockly.utils.userAgent.MOBILE = !Blockly.utils.userAgent.TABLET &&
-      (Blockly.utils.userAgent.IPOD || Blockly.utils.userAgent.IPHONE ||
-       Blockly.utils.userAgent.ANDROID || has('IEMobile'));
-})((Blockly.utils.global['navigator'] && Blockly.utils.global['navigator']['userAgent']) || '');
+// Devices.  Logic from:
+// https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/device.js
+isTablet = isIPad || (isAndroid && !has('Mobile')) || has('Silk');
+isMobile = !isTablet && (isIPod || isIPhone || isAndroid || has('IEMobile'));
+})((global['navigator'] && global['navigator']['userAgent']) || '');
+
+/** @const {string} */
+exports.raw = rawUserAgent;
+
+/** @const {boolean} */
+exports.IE = isIe;
+
+/** @const {boolean} */
+exports.EDGE = isEdge;
+
+/** @const {boolean} */
+exports.JavaFx = isJavaFx;
+
+/** @const {boolean} */
+exports.CHROME = isChrome;
+
+/** @const {boolean} */
+exports.WEBKIT = isWebKit;
+
+/** @const {boolean} */
+exports.GECKO = isGecko;
+
+/** @const {boolean} */
+exports.ANDROID = isAndroid;
+
+/** @const {boolean} */
+exports.IPAD = isIPad;
+
+/** @const {boolean} */
+exports.IPOD = isIPod;
+
+/** @const {boolean} */
+exports.IPHONE = isIPhone;
+
+/** @const {boolean} */
+exports.MAC = isMac;
+
+/** @const {boolean} */
+exports.TABLET = isTablet;
+
+/** @const {boolean} */
+exports.MOBILE = isMobile;
diff --git a/tests/deps.js b/tests/deps.js
index 0914683b2..c2fb85fb7 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -228,7 +228,7 @@ goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Block
 goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global']);
+goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
 goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils'], {'lang': 'es6', 'module': 'goog'});

From a6471c4276d955db4288408a6a2639ff2f61788f Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Thu, 9 Sep 2021 17:08:44 +0100
Subject: [PATCH 731/833] Rename `Blockly.utils.IdGenerator` to `idGenerator`
 and move `Blockly.utils.genUid` to there (#5441)

* Rename Blockly.utils.IdGenerator -> idGenerator
* Move genUid from Blockly.utils to Blockly.utils.idGenerator
---
 core/block.js                  |  5 +--
 core/contextmenu_items.js      |  4 +--
 core/events/events.js          |  4 +--
 core/field_colour.js           |  4 +--
 core/flyout_base.js            |  3 +-
 core/menuitem.js               |  2 +-
 core/options.js                |  4 +--
 core/toolbox/toolbox_item.js   |  4 +--
 core/utils.js                  | 26 +++++-----------
 core/utils/idgenerator.js      | 56 ++++++++++++++++++++++++++++++----
 core/variable_map.js           |  4 +--
 core/variable_model.js         |  4 +--
 core/workspace.js              |  3 +-
 core/workspace_comment.js      |  7 +++--
 package.json                   |  2 +-
 scripts/migration/renamings.js | 12 ++++++--
 tests/deps.js                  | 28 ++++++++---------
 tests/mocha/test_helpers.js    |  2 +-
 tests/mocha/utils_test.js      |  2 +-
 19 files changed, 110 insertions(+), 66 deletions(-)

diff --git a/core/block.js b/core/block.js
index f11bc8490..b32a724f8 100644
--- a/core/block.js
+++ b/core/block.js
@@ -41,6 +41,7 @@ const Workspace = goog.requireType('Blockly.Workspace');
 const connectionTypes = goog.require('Blockly.connectionTypes');
 const constants = goog.require('Blockly.constants');
 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');
@@ -77,8 +78,8 @@ const Block = function(workspace, prototypeName, opt_id) {
   }
 
   /** @type {string} */
-  this.id =
-      (opt_id && !workspace.getBlockById(opt_id)) ? opt_id : utils.genUid();
+  this.id = (opt_id && !workspace.getBlockById(opt_id)) ? opt_id :
+                                                          idGenerator.genUid();
   workspace.setBlockById(this.id, this);
   /** @type {Connection} */
   this.outputConnection = null;
diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js
index 35cb5eddc..e1cb02c59 100644
--- a/core/contextmenu_items.js
+++ b/core/contextmenu_items.js
@@ -22,9 +22,9 @@ 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 idGenerator = goog.require('Blockly.utils.idGenerator');
 const inputTypes = goog.require('Blockly.inputTypes');
 const userAgent = goog.require('Blockly.utils.userAgent');
-const utils = goog.require('Blockly.utils');
 
 
 /** Option to undo previous action. */
@@ -288,7 +288,7 @@ const registerDeleteAll = function() {
       }
       scope.workspace.cancelCurrentGesture();
       const deletableBlocks = getDeletableBlocks_(scope.workspace);
-      const eventGroup = utils.genUid();
+      const eventGroup = idGenerator.genUid();
       if (deletableBlocks.length < 2) {
         deleteNext_(deletableBlocks, eventGroup);
       } else {
diff --git a/core/events/events.js b/core/events/events.js
index 63d8d97f7..1f9c26bba 100644
--- a/core/events/events.js
+++ b/core/events/events.js
@@ -32,8 +32,8 @@ const CommentMove = goog.requireType('Blockly.Events.CommentMove');
 /* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
 const deprecation = goog.require('Blockly.utils.deprecation');
+const idGenerator = goog.require('Blockly.utils.idGenerator');
 const registry = goog.require('Blockly.registry');
-const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -477,7 +477,7 @@ exports.getGroup = getGroup;
  */
 const setGroup = function(state) {
   if (typeof state == 'boolean') {
-    group = state ? utils.genUid() : '';
+    group = state ? idGenerator.genUid() : '';
   } else {
     group = state;
   }
diff --git a/core/field_colour.js b/core/field_colour.js
index b4f53967d..b05290460 100644
--- a/core/field_colour.js
+++ b/core/field_colour.js
@@ -16,7 +16,6 @@ goog.module.declareLegacyNamespace();
 const Css = goog.require('Blockly.Css');
 const DropDownDiv = goog.require('Blockly.DropDownDiv');
 const Field = goog.require('Blockly.Field');
-const IdGenerator = goog.require('Blockly.utils.IdGenerator');
 const KeyCodes = goog.require('Blockly.utils.KeyCodes');
 const Size = goog.require('Blockly.utils.Size');
 const aria = goog.require('Blockly.utils.aria');
@@ -24,6 +23,7 @@ const browserEvents = goog.require('Blockly.browserEvents');
 const colour = goog.require('Blockly.utils.colour');
 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');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
@@ -545,7 +545,7 @@ FieldColour.prototype.dropdownCreate_ = function() {
     row.appendChild(cell);
     cell.label = colours[i];  // This becomes the value, if clicked.
     cell.title = titles[i] || colours[i];
-    cell.id = IdGenerator.getNextUniqueId();
+    cell.id = idGenerator.getNextUniqueId();
     cell.setAttribute('data-index', i);
     aria.setRole(cell, aria.Role.GRIDCELL);
     aria.setState(cell, aria.State.LABEL, colours[i]);
diff --git a/core/flyout_base.js b/core/flyout_base.js
index 011149a97..43b099aeb 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -37,6 +37,7 @@ const WorkspaceSvg = goog.require('Blockly.WorkspaceSvg');
 const Xml = goog.require('Blockly.Xml');
 const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
+const idGenerator = goog.require('Blockly.utils.idGenerator');
 const object = goog.require('Blockly.utils.object');
 const toolbox = goog.require('Blockly.utils.toolbox');
 const utils = goog.require('Blockly.utils');
@@ -83,7 +84,7 @@ const Flyout = function(workspaceOptions) {
    * ComponentManager.
    * @type {string}
    */
-  this.id = utils.genUid();
+  this.id = idGenerator.genUid();
 
   /**
    * Is RTL vs LTR.
diff --git a/core/menuitem.js b/core/menuitem.js
index 9a8ea2c67..b06ca83f8 100644
--- a/core/menuitem.js
+++ b/core/menuitem.js
@@ -15,7 +15,7 @@ goog.module.declareLegacyNamespace();
 
 const aria = goog.require('Blockly.utils.aria');
 const dom = goog.require('Blockly.utils.dom');
-const idGenerator = goog.require('Blockly.utils.IdGenerator');
+const idGenerator = goog.require('Blockly.utils.idGenerator');
 
 
 /**
diff --git a/core/options.js b/core/options.js
index 0ed544bae..14db8c0a2 100644
--- a/core/options.js
+++ b/core/options.js
@@ -16,13 +16,13 @@ goog.module.declareLegacyNamespace();
 /* eslint-disable-next-line no-unused-vars */
 const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
 const Classic = goog.require('Blockly.Themes.Classic');
-const IdGenerator = goog.require('Blockly.utils.IdGenerator');
 /* eslint-disable-next-line no-unused-vars */
 const Metrics = goog.requireType('Blockly.utils.Metrics');
 const Theme = goog.require('Blockly.Theme');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const deprecation = goog.require('Blockly.utils.deprecation');
+const idGenerator = goog.require('Blockly.utils.idGenerator');
 const registry = goog.require('Blockly.registry');
 const toolbox = goog.require('Blockly.utils.toolbox');
 
@@ -377,7 +377,7 @@ Options.parseThemeOptions_ = function(options) {
     return /** @type {!Theme} */ (theme);
   }
   return Theme.defineTheme(
-      theme.name || ('builtin' + IdGenerator.getNextUniqueId()), theme);
+      theme.name || ('builtin' + idGenerator.getNextUniqueId()), theme);
 };
 
 /**
diff --git a/core/toolbox/toolbox_item.js b/core/toolbox/toolbox_item.js
index 7cffe6540..8a51a020e 100644
--- a/core/toolbox/toolbox_item.js
+++ b/core/toolbox/toolbox_item.js
@@ -15,13 +15,13 @@ goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');
-const IdGenerator = goog.require('Blockly.utils.IdGenerator');
 /* eslint-disable-next-line no-unused-vars */
 const IToolbox = goog.requireType('Blockly.IToolbox');
 /* eslint-disable-next-line no-unused-vars */
 const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const idGenerator = goog.require('Blockly.utils.idGenerator');
 /* eslint-disable-next-line no-unused-vars */
 const toolbox = goog.requireType('Blockly.utils.toolbox');
 
@@ -42,7 +42,7 @@ const ToolboxItem = function(toolboxItemDef, toolbox, opt_parent) {
    * @type {string}
    * @protected
    */
-  this.id_ = toolboxItemDef['toolboxitemid'] || IdGenerator.getNextUniqueId();
+  this.id_ = toolboxItemDef['toolboxitemid'] || idGenerator.getNextUniqueId();
 
   /**
    * The parent of the category.
diff --git a/core/utils.js b/core/utils.js
index 8213d38d9..e6b756a9f 100644
--- a/core/utils.js
+++ b/core/utils.js
@@ -24,6 +24,7 @@ goog.require('Blockly.utils.colour');
 goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.global');
 goog.require('Blockly.utils.Rect');
+goog.require('Blockly.utils.idGenerator');
 goog.require('Blockly.utils.string');
 goog.require('Blockly.utils.style');
 goog.require('Blockly.utils.userAgent');
@@ -402,30 +403,17 @@ Blockly.utils.tokenizeInterpolation_ = function(message,
 };
 
 /**
- * Generate a unique ID.  This should be globally unique.
- * 87 characters ^ 20 length > 128 bits (better than a UUID).
+ * Generate a unique ID.
  * @return {string} A globally unique ID string.
+ * @deprecated Use Blockly.utils.idGenerator.genUid instead.
  */
 Blockly.utils.genUid = function() {
-  var length = 20;
-  var soupLength = Blockly.utils.genUid.soup_.length;
-  var id = [];
-  for (var i = 0; i < length; i++) {
-    id[i] = Blockly.utils.genUid.soup_.charAt(Math.random() * soupLength);
-  }
-  return id.join('');
+  Blockly.utils.deprecation.warn(
+      'Blockly.utils.genUid', 'September 2021', 'September 2022',
+      'Blockly.utils.idGenerator.genUid');
+  return Blockly.utils.idGenerator.genUid();
 };
 
-/**
- * Legal characters for the unique ID.  Should be all on a US keyboard.
- * No characters that conflict with XML or JSON.  Requests to remove additional
- * 'problematic' characters from this soup will be denied.  That's your failure
- * to properly escape in your own environment.  Issues #251, #625, #682, #1304.
- * @private
- */
-Blockly.utils.genUid.soup_ = '!#$%()*+,-./:;=?@[]^_`{|}~' +
-    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-
 /**
  * Check if 3D transforms are supported by adding an element
  * and attempting to set the property.
diff --git a/core/utils/idgenerator.js b/core/utils/idgenerator.js
index 537dfde2b..14f78747c 100644
--- a/core/utils/idgenerator.js
+++ b/core/utils/idgenerator.js
@@ -5,21 +5,26 @@
  */
 
 /**
- * @fileoverview Generator for unique element IDs.
- * For UUIDs use Blockly.utils.genUid. The ID generator should primarily be
- * used for IDs that end up in the DOM.
+ * @fileoverview Generators for unique IDs.
  * @author samelh@google.com (Sam El-Husseini)
  */
 'use strict';
 
 /**
- * @name Blockly.utils.IdGenerator
+ * @name Blockly.utils.idGenerator
  * @namespace
  */
-goog.module('Blockly.utils.IdGenerator');
+goog.module('Blockly.utils.idGenerator');
 goog.module.declareLegacyNamespace();
 
 
+/**
+ * Namespace object for internal implementations we want to be able to
+ * stub in tests.
+ */
+const internal = {};
+exports.TEST_ONLY = internal;
+
 /**
  * Next unique ID to use.
  * @type {number}
@@ -27,12 +32,51 @@ goog.module.declareLegacyNamespace();
 let nextId = 0;
 
 /**
- * Gets the next unique ID.
+ * Generate the next unique element IDs.
  * IDs are compatible with the HTML4 id attribute restrictions:
  * Use only ASCII letters, digits, '_', '-' and '.'
+ *
+ * For UUIDs use genUid (below) instead; this ID generator should
+ * primarily be used for IDs that end up in the DOM.
+ *
  * @return {string} The next unique identifier.
  */
 const getNextUniqueId = function() {
   return 'blockly-' + (nextId++).toString(36);
 };
 exports.getNextUniqueId = getNextUniqueId;
+
+/**
+ * Legal characters for the universally unique IDs.  Should be all on
+ * a US keyboard.  No characters that conflict with XML or JSON.
+ * Requests to remove additional 'problematic' characters from this
+ * soup will be denied.  That's your failure to properly escape in
+ * your own environment.  Issues #251, #625, #682, #1304.
+ */
+const soup = '!#$%()*+,-./:;=?@[]^_`{|}~' +
+    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+
+/**
+ * Generate a random unique ID.  This should be globally unique.
+ * 87 characters ^ 20 length > 128 bits (better than a UUID).
+ * @return {string} A globally unique ID string.
+ */
+internal.genUid = function() {
+  const length = 20;
+  const soupLength = soup.length;
+  const id = [];
+  for (let i = 0; i < length; i++) {
+    id[i] = soup.charAt(Math.random() * soupLength);
+  }
+  return id.join('');
+};
+
+/**
+ * Generate a random unique ID.
+ * @see internal.genUid
+ * @return {string} A globally unique ID string.
+ */
+const genUid = function() {
+  return internal.genUid();
+};
+exports.genUid = genUid;
diff --git a/core/variable_map.js b/core/variable_map.js
index a22ab75d5..d873ae22f 100644
--- a/core/variable_map.js
+++ b/core/variable_map.js
@@ -21,8 +21,8 @@ const Names = goog.require('Blockly.Names');
 const VariableModel = goog.require('Blockly.VariableModel');
 /* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
+const idGenerator = goog.require('Blockly.utils.idGenerator');
 const object = goog.require('Blockly.utils.object');
-const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.VarDelete');
 /** @suppress {extraRequire} */
@@ -183,7 +183,7 @@ VariableMap.prototype.createVariable = function(name, opt_type, opt_id) {
   if (opt_id && this.getVariableById(opt_id)) {
     throw Error('Variable id, "' + opt_id + '", is already in use.');
   }
-  const id = opt_id || utils.genUid();
+  const id = opt_id || idGenerator.genUid();
   const type = opt_type || '';
   variable = new VariableModel(this.workspace, name, type, id);
 
diff --git a/core/variable_model.js b/core/variable_model.js
index 2f5936f4e..f8ad7c6e3 100644
--- a/core/variable_model.js
+++ b/core/variable_model.js
@@ -16,7 +16,7 @@ goog.module.declareLegacyNamespace();
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
-const utils = goog.require('Blockly.utils');
+const idGenerator = goog.require('Blockly.utils.idGenerator');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.VarCreate');
 
@@ -65,7 +65,7 @@ const VariableModel = function(workspace, name, opt_type, opt_id) {
    * @type {string}
    * @private
    */
-  this.id_ = opt_id || utils.genUid();
+  this.id_ = opt_id || idGenerator.genUid();
 
   Events.fire(new (Events.get(Events.VAR_CREATE))(this));
 };
diff --git a/core/workspace.js b/core/workspace.js
index f1acb4aec..c0c3bb608 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -32,6 +32,7 @@ const VariableMap = goog.require('Blockly.VariableMap');
 const VariableModel = goog.requireType('Blockly.VariableModel');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment');
+const idGenerator = goog.require('Blockly.utils.idGenerator');
 const math = goog.require('Blockly.utils.math');
 const registry = goog.require('Blockly.registry');
 /* eslint-disable-next-line no-unused-vars */
@@ -56,7 +57,7 @@ const WorkspaceDB_ = Object.create(null);
  */
 const Workspace = function(opt_options) {
   /** @type {string} */
-  this.id = utils.genUid();
+  this.id = idGenerator.genUid();
   WorkspaceDB_[this.id] = this;
   /** @type {!Options} */
   this.options =
diff --git a/core/workspace_comment.js b/core/workspace_comment.js
index 78019bc80..0f5f981e2 100644
--- a/core/workspace_comment.js
+++ b/core/workspace_comment.js
@@ -17,7 +17,7 @@ const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
-const utils = goog.require('Blockly.utils');
+const idGenerator = goog.require('Blockly.utils.idGenerator');
 const xml = goog.require('Blockly.utils.xml');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.CommentChange');
@@ -41,8 +41,9 @@ goog.require('Blockly.Events.CommentMove');
  */
 const WorkspaceComment = function(workspace, content, height, width, opt_id) {
   /** @type {string} */
-  this.id =
-      (opt_id && !workspace.getCommentById(opt_id)) ? opt_id : utils.genUid();
+  this.id = (opt_id && !workspace.getCommentById(opt_id)) ?
+      opt_id :
+      idGenerator.genUid();
 
   workspace.addTopComment(this);
 
diff --git a/package.json b/package.json
index 6026bc4ec..d06842b0e 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@blockly/block-test": "^1.0.0",
-    "@blockly/dev-tools": "^2.0.1",
+    "@blockly/dev-tools": "^2.6.0",
     "@blockly/theme-modern": "^2.1.1",
     "@wdio/selenium-standalone-service": "^6.11.0",
     "babel-eslint": "^10.1.0",
diff --git a/scripts/migration/renamings.js b/scripts/migration/renamings.js
index 23d6f3e93..0454816f8 100644
--- a/scripts/migration/renamings.js
+++ b/scripts/migration/renamings.js
@@ -21,7 +21,7 @@
  */
 const renamings = {
   '4.20201217.0': {
-    Blockly: {
+    'Blockly': {
       exports: {
         // bind/unbind events functions.  See PR #4642
         EventData: {module: 'Blockly.eventHandling', export: 'Data'},
@@ -35,7 +35,7 @@ const renamings = {
     }
   },
   '6.20210701.0': {
-    Blockly: {
+    'Blockly': {
       exports: {
         // Clipboard.  See PR #5237.
         clipboardXml_: {module: 'Blockly.clipboard', export: 'xml'},
@@ -67,6 +67,14 @@ const renamings = {
 
       },
     },
+    'Blockly.utils': {
+      exports: {
+        genUid: {module: 'Blockly.utils.idGenerator'},
+      }
+    },
+    'Blockly.utils.IdGenerator': {
+      module: 'Blockly.utils.idGenerator',
+    }
   },
 };
 
diff --git a/tests/deps.js b/tests/deps.js
index c2fb85fb7..2ba08c906 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -7,7 +7,7 @@ goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'],
 goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator']);
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
-goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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.common', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
@@ -28,13 +28,13 @@ goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Bl
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils.deprecation', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.BlockBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -66,7 +66,7 @@ goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly
 goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.IdGenerator', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['Blockly.DropDownDiv', 'Blockly.Field', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -76,7 +76,7 @@ goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Bloc
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -125,12 +125,12 @@ goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], [],
 goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], [], {'lang': 'es6', 'module': 'goog'});
 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.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom'], {'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.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global']);
 goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', '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', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.deprecation', 'Blockly.utils.idGenerator', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
@@ -204,19 +204,19 @@ goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory']
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.IdGenerator'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.idGenerator'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], [], {'lang': 'es6', 'module': 'goog'});
@@ -230,15 +230,15 @@ goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'],
 goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
-goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.idGenerator', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils.Coordinate', 'Blockly.utils.idGenerator', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/test_helpers.js b/tests/mocha/test_helpers.js
index aa27dd66a..a63035bfe 100644
--- a/tests/mocha/test_helpers.js
+++ b/tests/mocha/test_helpers.js
@@ -255,7 +255,7 @@ function sharedTestTeardown() {
  * @return {!SinonStub} The created stub.
  */
 function createGenUidStubWithReturns(returnIds) {
-  var stub = sinon.stub(Blockly.utils, "genUid");
+  var stub = sinon.stub(Blockly.utils.idGenerator.TEST_ONLY, "genUid");
   if (Array.isArray(returnIds)) {
     for (var i = 0; i < returnIds.length; i++) {
       stub.onCall(i).returns(returnIds[i]);
diff --git a/tests/mocha/utils_test.js b/tests/mocha/utils_test.js
index 5a28ffc3c..75be27793 100644
--- a/tests/mocha/utils_test.js
+++ b/tests/mocha/utils_test.js
@@ -16,7 +16,7 @@ suite('Utils', function() {
     var uuids = {};
     chai.assert.equal([1, 2, 3].indexOf(4), -1);
     for (var i = 0; i < 1000; i++) {
-      var uuid = Blockly.utils.genUid();
+      var uuid = Blockly.utils.idGenerator.genUid();
       chai.assert.isFalse(uuid in uuids, 'UUID different: ' + uuid);
       uuids[uuid] = true;
     }

From 79b814018e5f909137c95707a83d0d06efec018a Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Thu, 9 Sep 2021 17:25:53 +0100
Subject: [PATCH 732/833] Migrate core/utils.js to goog.module syntax (#5446)

* Add missing requires for Blockly.utils.*
  - Blockly.utils.svgPaths in core/rendered_connection.js
  - Blockly.utils.colour in core/toolbox/category.js
  - Blockly.utils.KeyCodes in core/toolbox/toolbox.js
* Migrate core/utils.js to ES6 const/let
* Migrate core/utils.js to goog.module
* Migrate core/utils.js named requires
* clang-format core/utils.js
---
 core/rendered_connection.js |  13 +-
 core/toolbox/category.js    |   3 +-
 core/toolbox/toolbox.js     |  13 +-
 core/utils.js               | 340 +++++++++++++++++++-----------------
 tests/deps.js               |   8 +-
 5 files changed, 195 insertions(+), 182 deletions(-)

diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index 39dee432c..9a92cd354 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -28,6 +28,7 @@ const deprecation = goog.require('Blockly.utils.deprecation');
 const dom = goog.require('Blockly.utils.dom');
 const internalConstants = goog.require('Blockly.internalConstants');
 const object = goog.require('Blockly.utils.object');
+const svgPaths = goog.require('Blockly.utils.svgPaths');
 const utils = goog.require('Blockly.utils');
 
 
@@ -298,16 +299,16 @@ RenderedConnection.prototype.highlight = function() {
       this.type == connectionTypes.OUTPUT_VALUE) {
     // Vertical line, puzzle tab, vertical line.
     const yLen = renderConstants.TAB_OFFSET_FROM_TOP;
-    steps = utils.svgPaths.moveBy(0, -yLen) +
-        utils.svgPaths.lineOnAxis('v', yLen) + shape.pathDown +
-        utils.svgPaths.lineOnAxis('v', yLen);
+    steps = svgPaths.moveBy(0, -yLen) +
+        svgPaths.lineOnAxis('v', yLen) + shape.pathDown +
+        svgPaths.lineOnAxis('v', yLen);
   } else {
     const xLen =
         renderConstants.NOTCH_OFFSET_LEFT - renderConstants.CORNER_RADIUS;
     // Horizontal line, notch, horizontal line.
-    steps = utils.svgPaths.moveBy(-xLen, 0) +
-        utils.svgPaths.lineOnAxis('h', xLen) + shape.pathLeft +
-        utils.svgPaths.lineOnAxis('h', xLen);
+    steps = svgPaths.moveBy(-xLen, 0) +
+        svgPaths.lineOnAxis('h', xLen) + shape.pathLeft +
+        svgPaths.lineOnAxis('h', xLen);
   }
   const xy = this.sourceBlock_.getRelativeToSurfaceXY();
   const x = this.x - xy.x;
diff --git a/core/toolbox/category.js b/core/toolbox/category.js
index 962a5cb85..ecb79d911 100644
--- a/core/toolbox/category.js
+++ b/core/toolbox/category.js
@@ -23,6 +23,7 @@ const ISelectableToolboxItem = goog.requireType('Blockly.ISelectableToolboxItem'
 const IToolbox = goog.requireType('Blockly.IToolbox');
 const ToolboxItem = goog.require('Blockly.ToolboxItem');
 const aria = goog.require('Blockly.utils.aria');
+const colourUtils = goog.require('Blockly.utils.colour');
 const dom = goog.require('Blockly.utils.dom');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
@@ -429,7 +430,7 @@ ToolboxCategory.prototype.parseColour_ = function(colourValue) {
     if (!isNaN(hue)) {
       return Blockly.hueToHex(hue);
     } else {
-      const hex = utils.colour.parse(colour);
+      const hex = colourUtils.parse(colour);
       if (hex) {
         return hex;
       } else {
diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index 1bff6d844..f5eea1890 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -50,6 +50,7 @@ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const aria = goog.require('Blockly.utils.aria');
 const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
+const keyCodes = goog.require('Blockly.utils.KeyCodes');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
 const utils = goog.require('Blockly.utils');
@@ -339,20 +340,20 @@ Toolbox.prototype.onClick_ = function(e) {
 Toolbox.prototype.onKeyDown_ = function(e) {
   let handled = false;
   switch (e.keyCode) {
-    case utils.KeyCodes.DOWN:
+    case keyCodes.DOWN:
       handled = this.selectNext_();
       break;
-    case utils.KeyCodes.UP:
+    case keyCodes.UP:
       handled = this.selectPrevious_();
       break;
-    case utils.KeyCodes.LEFT:
+    case keyCodes.LEFT:
       handled = this.selectParent_();
       break;
-    case utils.KeyCodes.RIGHT:
+    case keyCodes.RIGHT:
       handled = this.selectChild_();
       break;
-    case utils.KeyCodes.ENTER:
-    case utils.KeyCodes.SPACE:
+    case keyCodes.ENTER:
+    case keyCodes.SPACE:
       if (this.selectedItem_ && this.selectedItem_.isCollapsible()) {
         const collapsibleItem =
             /** @type {!ICollapsibleToolboxItem} */ (this.selectedItem_);
diff --git a/core/utils.js b/core/utils.js
index e6b756a9f..33b7587a8 100644
--- a/core/utils.js
+++ b/core/utils.js
@@ -16,67 +16,72 @@
  * @name Blockly.utils
  * @namespace
  */
-goog.provide('Blockly.utils');
+goog.module('Blockly.utils');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.Msg');
-goog.require('Blockly.utils.colour');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.global');
-goog.require('Blockly.utils.Rect');
-goog.require('Blockly.utils.idGenerator');
-goog.require('Blockly.utils.string');
-goog.require('Blockly.utils.style');
-goog.require('Blockly.utils.userAgent');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.WorkspaceSvg');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Msg = goog.require('Blockly.Msg');
+const Rect = goog.require('Blockly.utils.Rect');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const colourUtils = goog.require('Blockly.utils.colour');
+const deprecation = goog.require('Blockly.utils.deprecation');
+const global = goog.require('Blockly.utils.global');
+const idGenerator = goog.require('Blockly.utils.idGenerator');
+const internalConstants = goog.require('Blockly.internalConstants');
+const stringUtils = goog.require('Blockly.utils.string');
+const style = goog.require('Blockly.utils.style');
+const userAgent = goog.require('Blockly.utils.userAgent');
 
 
 /**
  * Don't do anything for this event, just halt propagation.
  * @param {!Event} e An event.
  */
-Blockly.utils.noEvent = function(e) {
+const noEvent = function(e) {
   // This event has been handled.  No need to bubble up to the document.
   e.preventDefault();
   e.stopPropagation();
 };
+exports.noEvent = noEvent;
 
 /**
  * Is this event targeting a text input widget?
  * @param {!Event} e An event.
  * @return {boolean} True if text input.
  */
-Blockly.utils.isTargetInput = function(e) {
+const isTargetInput = function(e) {
   return e.target.type == 'textarea' || e.target.type == 'text' ||
-         e.target.type == 'number' || e.target.type == 'email' ||
-         e.target.type == 'password' || e.target.type == 'search' ||
-         e.target.type == 'tel' || e.target.type == 'url' ||
-         e.target.isContentEditable ||
-         (e.target.dataset && e.target.dataset.isTextInput == 'true');
+      e.target.type == 'number' || e.target.type == 'email' ||
+      e.target.type == 'password' || e.target.type == 'search' ||
+      e.target.type == 'tel' || e.target.type == 'url' ||
+      e.target.isContentEditable ||
+      (e.target.dataset && e.target.dataset.isTextInput == 'true');
 };
+exports.isTargetInput = isTargetInput;
 
 /**
  * Return the coordinates of the top-left corner of this element relative to
  * its parent.  Only for SVG elements and children (e.g. rect, g, path).
  * @param {!Element} element SVG element to find the coordinates of.
- * @return {!Blockly.utils.Coordinate} Object with .x and .y properties.
+ * @return {!Coordinate} Object with .x and .y properties.
  */
-Blockly.utils.getRelativeXY = function(element) {
-  var xy = new Blockly.utils.Coordinate(0, 0);
+const getRelativeXY = function(element) {
+  const xy = new Coordinate(0, 0);
   // First, check for x and y attributes.
-  var x = element.getAttribute('x');
+  const x = element.getAttribute('x');
   if (x) {
     xy.x = parseInt(x, 10);
   }
-  var y = element.getAttribute('y');
+  const y = element.getAttribute('y');
   if (y) {
     xy.y = parseInt(y, 10);
   }
   // Second, check for transform="translate(...)" attribute.
-  var transform = element.getAttribute('transform');
-  var r = transform && transform.match(Blockly.utils.getRelativeXY.XY_REGEX_);
+  const transform = element.getAttribute('transform');
+  const r = transform && transform.match(getRelativeXY.XY_REGEX_);
   if (r) {
     xy.x += Number(r[1]);
     if (r[3]) {
@@ -85,10 +90,9 @@ Blockly.utils.getRelativeXY = function(element) {
   }
 
   // Then check for style = transform: translate(...) or translate3d(...)
-  var style = element.getAttribute('style');
+  const style = element.getAttribute('style');
   if (style && style.indexOf('translate') > -1) {
-    var styleComponents =
-        style.match(Blockly.utils.getRelativeXY.XY_STYLE_REGEX_);
+    const styleComponents = style.match(getRelativeXY.XY_STYLE_REGEX_);
     if (styleComponents) {
       xy.x += Number(styleComponents[1]);
       if (styleComponents[3]) {
@@ -98,6 +102,7 @@ Blockly.utils.getRelativeXY = function(element) {
   }
   return xy;
 };
+exports.getRelativeXY = getRelativeXY;
 
 /**
  * Return the coordinates of the top-left corner of this element relative to
@@ -105,23 +110,24 @@ Blockly.utils.getRelativeXY = function(element) {
  * @param {!Element} element SVG element to find the coordinates of. If this is
  *     not a child of the div Blockly was injected into, the behaviour is
  *     undefined.
- * @return {!Blockly.utils.Coordinate} Object with .x and .y properties.
+ * @return {!Coordinate} Object with .x and .y properties.
  */
-Blockly.utils.getInjectionDivXY_ = function(element) {
-  var x = 0;
-  var y = 0;
+const getInjectionDivXY = function(element) {
+  let x = 0;
+  let y = 0;
   while (element) {
-    var xy = Blockly.utils.getRelativeXY(element);
+    const xy = getRelativeXY(element);
     x = x + xy.x;
     y = y + xy.y;
-    var classes = element.getAttribute('class') || '';
+    const classes = element.getAttribute('class') || '';
     if ((' ' + classes + ' ').indexOf(' injectionDiv ') != -1) {
       break;
     }
     element = /** @type {!Element} */ (element.parentNode);
   }
-  return new Blockly.utils.Coordinate(x, y);
+  return new Coordinate(x, y);
 };
+exports.getInjectionDivXY_ = getInjectionDivXY;
 
 /**
  * Static regex to pull the x,y values out of an SVG translate() directive.
@@ -132,8 +138,7 @@ Blockly.utils.getInjectionDivXY_ = function(element) {
  * @type {!RegExp}
  * @private
  */
-Blockly.utils.getRelativeXY.XY_REGEX_ =
-    /translate\(\s*([-+\d.e]+)([ ,]\s*([-+\d.e]+)\s*)?/;
+getRelativeXY.XY_REGEX_ = /translate\(\s*([-+\d.e]+)([ ,]\s*([-+\d.e]+)\s*)?/;
 
 /**
  * Static regex to pull the x,y values out of a translate() or translate3d()
@@ -142,7 +147,7 @@ Blockly.utils.getRelativeXY.XY_REGEX_ =
  * @type {!RegExp}
  * @private
  */
-Blockly.utils.getRelativeXY.XY_STYLE_REGEX_ =
+getRelativeXY.XY_STYLE_REGEX_ =
     /transform:\s*translate(?:3d)?\(\s*([-+\d.e]+)\s*px([ ,]\s*([-+\d.e]+)\s*px)?/;
 
 /**
@@ -150,14 +155,15 @@ Blockly.utils.getRelativeXY.XY_STYLE_REGEX_ =
  * @param {!Event} e Mouse event.
  * @return {boolean} True if right-click.
  */
-Blockly.utils.isRightButton = function(e) {
-  if (e.ctrlKey && Blockly.utils.userAgent.MAC) {
+const isRightButton = function(e) {
+  if (e.ctrlKey && userAgent.MAC) {
     // Control-clicking on Mac OS X is treated as a right-click.
     // WebKit on Mac OS X fails to change button to 2 (but Gecko does).
     return true;
   }
   return e.button == 2;
 };
+exports.isRightButton = isRightButton;
 
 /**
  * Return the converted coordinates of the given mouse event.
@@ -167,8 +173,8 @@ Blockly.utils.isRightButton = function(e) {
  * @param {?SVGMatrix} matrix Inverted screen CTM to use.
  * @return {!SVGPoint} Object with .x and .y properties.
  */
-Blockly.utils.mouseToSvg = function(e, svg, matrix) {
-  var svgPoint = svg.createSVGPoint();
+const mouseToSvg = function(e, svg, matrix) {
+  const svgPoint = svg.createSVGPoint();
   svgPoint.x = e.clientX;
   svgPoint.y = e.clientY;
 
@@ -177,6 +183,7 @@ Blockly.utils.mouseToSvg = function(e, svg, matrix) {
   }
   return svgPoint.matrixTransform(matrix);
 };
+exports.mouseToSvg = mouseToSvg;
 
 /**
  * Get the scroll delta of a mouse event in pixel units.
@@ -184,76 +191,76 @@ Blockly.utils.mouseToSvg = function(e, svg, matrix) {
  * @return {{x: number, y: number}} Scroll delta object with .x and .y
  *    properties.
  */
-Blockly.utils.getScrollDeltaPixels = function(e) {
+const getScrollDeltaPixels = function(e) {
   switch (e.deltaMode) {
     case 0x00:  // Pixel mode.
     default:
-      return {
-        x: e.deltaX,
-        y: e.deltaY
-      };
+      return {x: e.deltaX, y: e.deltaY};
     case 0x01:  // Line mode.
       return {
-        x: e.deltaX * Blockly.internalConstants.LINE_MODE_MULTIPLIER,
-        y: e.deltaY * Blockly.internalConstants.LINE_MODE_MULTIPLIER
+        x: e.deltaX * internalConstants.LINE_MODE_MULTIPLIER,
+        y: e.deltaY * internalConstants.LINE_MODE_MULTIPLIER
       };
     case 0x02:  // Page mode.
       return {
-        x: e.deltaX * Blockly.internalConstants.PAGE_MODE_MULTIPLIER,
-        y: e.deltaY * Blockly.internalConstants.PAGE_MODE_MULTIPLIER
+        x: e.deltaX * internalConstants.PAGE_MODE_MULTIPLIER,
+        y: e.deltaY * internalConstants.PAGE_MODE_MULTIPLIER
       };
   }
 };
+exports.getScrollDeltaPixels = getScrollDeltaPixels;
 
 /**
  * Parse a string with any number of interpolation tokens (%1, %2, ...).
  * It will also replace string table references (e.g., %{bky_my_msg} and
  * %{BKY_MY_MSG} will both be replaced with the value in
- * Blockly.Msg['MY_MSG']). Percentage sign characters '%' may be self-escaped
+ * Msg['MY_MSG']). Percentage sign characters '%' may be self-escaped
  * (e.g., '%%').
  * @param {string} message Text which might contain string table references and
  *     interpolation tokens.
  * @return {!Array<string|number>} Array of strings and numbers.
  */
-Blockly.utils.tokenizeInterpolation = function(message) {
-  return Blockly.utils.tokenizeInterpolation_(message, true);
+const tokenizeInterpolation = function(message) {
+  return tokenizeInterpolation_(message, true);
 };
+exports.tokenizeInterpolation = tokenizeInterpolation;
 
 /**
  * Replaces string table references in a message, if the message is a string.
  * For example, "%{bky_my_msg}" and "%{BKY_MY_MSG}" will both be replaced with
- * the value in Blockly.Msg['MY_MSG'].
+ * the value in Msg['MY_MSG'].
  * @param {string|?} message Message, which may be a string that contains
  *     string table references.
  * @return {string} String with message references replaced.
  */
-Blockly.utils.replaceMessageReferences = function(message) {
+const replaceMessageReferences = function(message) {
   if (typeof message != 'string') {
     return message;
   }
-  var interpolatedResult = Blockly.utils.tokenizeInterpolation_(message, false);
+  const interpolatedResult = tokenizeInterpolation_(message, false);
   // When parseInterpolationTokens == false, interpolatedResult should be at
   // most length 1.
   return interpolatedResult.length ? String(interpolatedResult[0]) : '';
 };
+exports.replaceMessageReferences = replaceMessageReferences;
 
 /**
  * Validates that any %{MSG_KEY} references in the message refer to keys of
- * the Blockly.Msg string table.
+ * the Msg string table.
  * @param {string} message Text which might contain string table references.
  * @return {boolean} True if all message references have matching values.
  *     Otherwise, false.
  */
-Blockly.utils.checkMessageReferences = function(message) {
-  var validSoFar = true;
+const checkMessageReferences = function(message) {
+  let validSoFar = true;
 
-  var msgTable = Blockly.Msg;
+  const msgTable = Msg;
 
   // TODO (#1169): Implement support for other string tables,
   // prefixes other than BKY_.
-  var m = message.match(/%{BKY_[A-Z]\w*}/ig);
-  for (var i = 0; i < m.length; i++) {
-    var msgKey = m[i].toUpperCase();
+  const m = message.match(/%{BKY_[A-Z]\w*}/ig);
+  for (let i = 0; i < m.length; i++) {
+    const msgKey = m[i].toUpperCase();
     if (msgTable[msgKey.slice(6, -1)] == undefined) {
       console.warn('No message string for ' + m[i] + ' in ' + message);
       validSoFar = false;  // Continue to report other errors.
@@ -262,6 +269,7 @@ Blockly.utils.checkMessageReferences = function(message) {
 
   return validSoFar;
 };
+exports.checkMessageReferences = checkMessageReferences;
 
 /**
  * Internal implementation of the message reference and interpolation token
@@ -271,26 +279,24 @@ Blockly.utils.checkMessageReferences = function(message) {
  * @param {boolean} parseInterpolationTokens Option to parse numeric
  *     interpolation tokens (%1, %2, ...) when true.
  * @return {!Array<string|number>} Array of strings and numbers.
- * @private
  */
-Blockly.utils.tokenizeInterpolation_ = function(message,
-    parseInterpolationTokens) {
-  var tokens = [];
-  var chars = message.split('');
+const tokenizeInterpolation_ = function(message, parseInterpolationTokens) {
+  const tokens = [];
+  const chars = message.split('');
   chars.push('');  // End marker.
   // Parse the message with a finite state machine.
   // 0 - Base case.
   // 1 - % found.
   // 2 - Digit found.
   // 3 - Message ref found.
-  var state = 0;
-  var buffer = [];
-  var number = null;
-  for (var i = 0; i < chars.length; i++) {
-    var c = chars[i];
+  let state = 0;
+  const buffer = [];
+  let number = null;
+  for (let i = 0; i < chars.length; i++) {
+    const c = chars[i];
     if (state == 0) {
       if (c == '%') {
-        var text = buffer.join('');
+        const text = buffer.join('');
         if (text) {
           tokens.push(text);
         }
@@ -306,7 +312,7 @@ Blockly.utils.tokenizeInterpolation_ = function(message,
       } else if (parseInterpolationTokens && '0' <= c && c <= '9') {
         state = 2;
         number = c;
-        var text = buffer.join('');
+        const text = buffer.join('');
         if (text) {
           tokens.push(text);
         }
@@ -329,28 +335,29 @@ Blockly.utils.tokenizeInterpolation_ = function(message,
       if (c == '') {
         // Premature end before closing '}'
         buffer.splice(0, 0, '%{');  // Re-insert leading delimiter
-        i--;  // Parse this char again.
-        state = 0;  // and parse as string literal.
+        i--;                        // Parse this char again.
+        state = 0;                  // and parse as string literal.
       } else if (c != '}') {
         buffer.push(c);
       } else {
-        var rawKey = buffer.join('');
+        const rawKey = buffer.join('');
         if (/[A-Z]\w*/i.test(rawKey)) {  // Strict matching
           // Found a valid string key. Attempt case insensitive match.
-          var keyUpper = rawKey.toUpperCase();
+          const keyUpper = rawKey.toUpperCase();
 
           // BKY_ is the prefix used to namespace the strings used in Blockly
           // core files and the predefined blocks in ../blocks/.
           // These strings are defined in ../msgs/ files.
-          var bklyKey = Blockly.utils.string.startsWith(keyUpper, 'BKY_') ?
-              keyUpper.substring(4) : null;
-          if (bklyKey && bklyKey in Blockly.Msg) {
-            var rawValue = Blockly.Msg[bklyKey];
+          const bklyKey = stringUtils.startsWith(keyUpper, 'BKY_') ?
+              keyUpper.substring(4) :
+              null;
+          if (bklyKey && bklyKey in Msg) {
+            const rawValue = Msg[bklyKey];
             if (typeof rawValue == 'string') {
               // Attempt to dereference substrings, too, appending to the end.
-              Array.prototype.push.apply(tokens,
-                  Blockly.utils.tokenizeInterpolation_(
-                      rawValue, parseInterpolationTokens));
+              Array.prototype.push.apply(
+                  tokens,
+                  tokenizeInterpolation_(rawValue, parseInterpolationTokens));
             } else if (parseInterpolationTokens) {
               // When parsing interpolation tokens, numbers are special
               // placeholders (%1, %2, etc). Make sure all other values are
@@ -373,15 +380,15 @@ Blockly.utils.tokenizeInterpolation_ = function(message,
       }
     }
   }
-  var text = buffer.join('');
+  let text = buffer.join('');
   if (text) {
     tokens.push(text);
   }
 
   // Merge adjacent text tokens into a single string.
-  var mergedTokens = [];
+  const mergedTokens = [];
   buffer.length = 0;
-  for (var i = 0; i < tokens.length; ++i) {
+  for (let i = 0; i < tokens.length; ++i) {
     if (typeof tokens[i] == 'string') {
       buffer.push(tokens[i]);
     } else {
@@ -407,31 +414,32 @@ Blockly.utils.tokenizeInterpolation_ = function(message,
  * @return {string} A globally unique ID string.
  * @deprecated Use Blockly.utils.idGenerator.genUid instead.
  */
-Blockly.utils.genUid = function() {
-  Blockly.utils.deprecation.warn(
+const genUid = function() {
+  deprecation.warn(
       'Blockly.utils.genUid', 'September 2021', 'September 2022',
       'Blockly.utils.idGenerator.genUid');
-  return Blockly.utils.idGenerator.genUid();
+  return idGenerator.genUid();
 };
+exports.genUid = genUid;
 
 /**
  * Check if 3D transforms are supported by adding an element
  * and attempting to set the property.
  * @return {boolean} True if 3D transforms are supported.
  */
-Blockly.utils.is3dSupported = function() {
-  if (Blockly.utils.is3dSupported.cached_ !== undefined) {
-    return Blockly.utils.is3dSupported.cached_;
+const is3dSupported = function() {
+  if (is3dSupported.cached_ !== undefined) {
+    return is3dSupported.cached_;
   }
   // CC-BY-SA Lorenzo Polidori
   // stackoverflow.com/questions/5661671/detecting-transform-translate3d-support
-  if (!Blockly.utils.global['getComputedStyle']) {
+  if (!global['getComputedStyle']) {
     return false;
   }
 
-  var el = document.createElement('p');
-  var has3d = 'none';
-  var transforms = {
+  const el = document.createElement('p');
+  let has3d = 'none';
+  const transforms = {
     'webkitTransform': '-webkit-transform',
     'OTransform': '-o-transform',
     'msTransform': '-ms-transform',
@@ -442,10 +450,10 @@ Blockly.utils.is3dSupported = function() {
   // Add it to the body to get the computed style.
   document.body.insertBefore(el, null);
 
-  for (var t in transforms) {
+  for (let t in transforms) {
     if (el.style[t] !== undefined) {
       el.style[t] = 'translate3d(1px,1px,1px)';
-      var computedStyle = Blockly.utils.global['getComputedStyle'](el);
+      const computedStyle = global['getComputedStyle'](el);
       if (!computedStyle) {
         // getComputedStyle in Firefox returns null when Blockly is loaded
         // inside an iframe with display: none.  Returning false and not
@@ -460,24 +468,25 @@ Blockly.utils.is3dSupported = function() {
     }
   }
   document.body.removeChild(el);
-  Blockly.utils.is3dSupported.cached_ = has3d !== 'none';
-  return Blockly.utils.is3dSupported.cached_;
+  is3dSupported.cached_ = has3d !== 'none';
+  return is3dSupported.cached_;
 };
+exports.is3dSupported = is3dSupported;
 
 /**
  * Calls a function after the page has loaded, possibly immediately.
  * @param {function()} fn Function to run.
  * @throws Error Will throw if no global document can be found (e.g., Node.js).
  */
-Blockly.utils.runAfterPageLoad = function(fn) {
+const runAfterPageLoad = function(fn) {
   if (typeof document != 'object') {
-    throw Error('Blockly.utils.runAfterPageLoad() requires browser document.');
+    throw Error('runAfterPageLoad() requires browser document.');
   }
   if (document.readyState == 'complete') {
     fn();  // Page has already loaded. Call immediately.
   } else {
     // Poll readyState.
-    var readyStateCheckInterval = setInterval(function() {
+    const readyStateCheckInterval = setInterval(function() {
       if (document.readyState == 'complete') {
         clearInterval(readyStateCheckInterval);
         fn();
@@ -485,24 +494,23 @@ Blockly.utils.runAfterPageLoad = function(fn) {
     }, 10);
   }
 };
+exports.runAfterPageLoad = runAfterPageLoad;
 
 /**
  * Get the position of the current viewport in window coordinates.  This takes
  * scroll into account.
- * @return {!Blockly.utils.Rect} An object containing window width, height, and
+ * @return {!Rect} An object containing window width, height, and
  *     scroll position in window coordinates.
- * @package
  */
-Blockly.utils.getViewportBBox = function() {
+const getViewportBBox = function() {
   // Pixels, in window coordinates.
-  var scrollOffset = Blockly.utils.style.getViewportPageOffset();
-  return new Blockly.utils.Rect(
-      scrollOffset.y,
-      document.documentElement.clientHeight + scrollOffset.y,
-      scrollOffset.x,
-      document.documentElement.clientWidth + scrollOffset.x
-  );
+  const scrollOffset = style.getViewportPageOffset();
+  return new Rect(
+      scrollOffset.y, document.documentElement.clientHeight + scrollOffset.y,
+      scrollOffset.x, document.documentElement.clientWidth + scrollOffset.x);
 };
+/** @package */
+exports.getViewportBBox = getViewportBBox;
 
 /**
  * Removes the first occurrence of a particular value from an array.
@@ -510,55 +518,57 @@ Blockly.utils.getViewportBBox = function() {
  *     value.
  * @param {*} obj Object to remove.
  * @return {boolean} True if an element was removed.
- * @package
  */
-Blockly.utils.arrayRemove = function(arr, obj) {
-  var i = arr.indexOf(obj);
+const arrayRemove = function(arr, obj) {
+  const i = arr.indexOf(obj);
   if (i == -1) {
     return false;
   }
   arr.splice(i, 1);
   return true;
 };
+/** @package */
+exports.arrayRemove = arrayRemove;
 
 /**
  * Gets the document scroll distance as a coordinate object.
  * Copied from Closure's goog.dom.getDocumentScroll.
- * @return {!Blockly.utils.Coordinate} Object with values 'x' and 'y'.
+ * @return {!Coordinate} Object with values 'x' and 'y'.
  */
-Blockly.utils.getDocumentScroll = function() {
-  var el = document.documentElement;
-  var win = window;
-  if (Blockly.utils.userAgent.IE && win.pageYOffset != el.scrollTop) {
+const getDocumentScroll = function() {
+  const el = document.documentElement;
+  const win = window;
+  if (userAgent.IE && win.pageYOffset != el.scrollTop) {
     // The keyboard on IE10 touch devices shifts the page using the pageYOffset
     // without modifying scrollTop. For this case, we want the body scroll
     // offsets.
-    return new Blockly.utils.Coordinate(el.scrollLeft, el.scrollTop);
+    return new Coordinate(el.scrollLeft, el.scrollTop);
   }
-  return new Blockly.utils.Coordinate(
+  return new Coordinate(
       win.pageXOffset || el.scrollLeft, win.pageYOffset || el.scrollTop);
 };
+exports.getDocumentScroll = getDocumentScroll;
 
 /**
  * Get a map of all the block's descendants mapping their type to the number of
  *    children with that type.
- * @param {!Blockly.Block} block The block to map.
+ * @param {!Block} block The block to map.
  * @param {boolean=} opt_stripFollowing Optionally ignore all following
  *    statements (blocks that are not inside a value or statement input
  *    of the block).
  * @return {!Object} Map of types to type counts for descendants of the bock.
  */
-Blockly.utils.getBlockTypeCounts = function(block, opt_stripFollowing) {
-  var typeCountsMap = Object.create(null);
-  var descendants = block.getDescendants(true);
+const getBlockTypeCounts = function(block, opt_stripFollowing) {
+  const typeCountsMap = Object.create(null);
+  const descendants = block.getDescendants(true);
   if (opt_stripFollowing) {
-    var nextBlock = block.getNextBlock();
+    const nextBlock = block.getNextBlock();
     if (nextBlock) {
-      var index = descendants.indexOf(nextBlock);
+      const index = descendants.indexOf(nextBlock);
       descendants.splice(index, descendants.length - index);
     }
   }
-  for (var i = 0, checkBlock; (checkBlock = descendants[i]); i++) {
+  for (let i = 0, checkBlock; (checkBlock = descendants[i]); i++) {
     if (typeCountsMap[checkBlock.type]) {
       typeCountsMap[checkBlock.type]++;
     } else {
@@ -567,42 +577,44 @@ Blockly.utils.getBlockTypeCounts = function(block, opt_stripFollowing) {
   }
   return typeCountsMap;
 };
+exports.getBlockTypeCounts = getBlockTypeCounts;
 
 /**
  * Converts screen coordinates to workspace coordinates.
- * @param {!Blockly.WorkspaceSvg} ws The workspace to find the coordinates on.
- * @param {!Blockly.utils.Coordinate} screenCoordinates The screen coordinates to
+ * @param {!WorkspaceSvg} ws The workspace to find the coordinates on.
+ * @param {!Coordinate} screenCoordinates The screen coordinates to
  * be converted to workspace coordinates
- * @return {!Blockly.utils.Coordinate} The workspace coordinates.
- * @package
+ * @return {!Coordinate} The workspace coordinates.
  */
-Blockly.utils.screenToWsCoordinates = function(ws, screenCoordinates) {
-  var screenX = screenCoordinates.x;
-  var screenY = screenCoordinates.y;
+const screenToWsCoordinates = function(ws, screenCoordinates) {
+  const screenX = screenCoordinates.x;
+  const screenY = screenCoordinates.y;
 
-  var injectionDiv = ws.getInjectionDiv();
+  const injectionDiv = ws.getInjectionDiv();
   // Bounding rect coordinates are in client coordinates, meaning that they
   // are in pixels relative to the upper left corner of the visible browser
   // window.  These coordinates change when you scroll the browser window.
-  var boundingRect = injectionDiv.getBoundingClientRect();
+  const boundingRect = injectionDiv.getBoundingClientRect();
 
   // The client coordinates offset by the injection div's upper left corner.
-  var clientOffsetPixels = new Blockly.utils.Coordinate(
-      screenX - boundingRect.left, screenY - boundingRect.top);
+  const clientOffsetPixels =
+      new Coordinate(screenX - boundingRect.left, screenY - boundingRect.top);
 
   // The offset in pixels between the main workspace's origin and the upper
   // left corner of the injection div.
-  var mainOffsetPixels = ws.getOriginOffsetInPixels();
+  const mainOffsetPixels = ws.getOriginOffsetInPixels();
 
   // The position of the new comment in pixels relative to the origin of the
   // main workspace.
-  var finalOffsetPixels = Blockly.utils.Coordinate.difference(
-      clientOffsetPixels, mainOffsetPixels);
+  const finalOffsetPixels =
+      Coordinate.difference(clientOffsetPixels, mainOffsetPixels);
 
   // The position in main workspace coordinates.
-  var finalOffsetMainWs = finalOffsetPixels.scale(1 / ws.scale);
+  const finalOffsetMainWs = finalOffsetPixels.scale(1 / ws.scale);
   return finalOffsetMainWs;
 };
+/** @package */
+exports.screenToWsCoordinates = screenToWsCoordinates;
 
 /**
  * Parse a block colour from a number or string, as provided in a block
@@ -613,28 +625,25 @@ Blockly.utils.screenToWsCoordinates = function(ws, screenCoordinates) {
  *     a #RRGGBB string, and the hue if the input was an HSV hue value.
  * @throws {Error} If the colour cannot be parsed.
  */
-Blockly.utils.parseBlockColour = function(colour) {
-  var dereferenced = (typeof colour == 'string') ?
-      Blockly.utils.replaceMessageReferences(colour) : colour;
+const parseBlockColour = function(colour) {
+  const dereferenced =
+      (typeof colour == 'string') ? replaceMessageReferences(colour) : colour;
 
-  var hue = Number(dereferenced);
+  const hue = Number(dereferenced);
   if (!isNaN(hue) && 0 <= hue && hue <= 360) {
     return {
       hue: hue,
-      hex: Blockly.utils.colour.hsvToHex(
-          hue, Blockly.internalConstants.HSV_SATURATION,
-          Blockly.internalConstants.HSV_VALUE * 255)
+      hex: colourUtils.hsvToHex(
+          hue, internalConstants.HSV_SATURATION,
+          internalConstants.HSV_VALUE * 255)
     };
   } else {
-    var hex = Blockly.utils.colour.parse(dereferenced);
+    const hex = colourUtils.parse(dereferenced);
     if (hex) {
       // Only store hue if colour is set as a hue.
-      return {
-        hue: null,
-        hex: hex
-      };
+      return {hue: null, hex: hex};
     } else {
-      var errorMsg = 'Invalid colour: "' + dereferenced + '"';
+      let errorMsg = 'Invalid colour: "' + dereferenced + '"';
       if (colour != dereferenced) {
         errorMsg += ' (from "' + colour + '")';
       }
@@ -642,3 +651,4 @@ Blockly.utils.parseBlockColour = function(colour) {
     }
   }
 };
+exports.parseBlockColour = parseBlockColour;
diff --git a/tests/deps.js b/tests/deps.js
index 2ba08c906..7429530ed 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -134,7 +134,7 @@ goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
@@ -200,16 +200,16 @@ goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry'
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly', 'Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly', 'Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});

From 646a931d77d3c875291fcca7164a1d1248d0c816 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 9 Sep 2021 12:45:16 -0700
Subject: [PATCH 733/833] Migrate core/tooltip.js to goog.module syntax (#5222)

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

* Migrate core/tooltip.js to goog.module

* Migrate core/tooltip.js to named requires

* clang-format core/tooltip.js

* Fix exports of mutable fields in core/tooltip.js

* Don't assign a value when exporting visible in core/tooltip.js
---
 core/tooltip.js | 308 +++++++++++++++++++++++++++---------------------
 tests/deps.js   |   4 +-
 2 files changed, 175 insertions(+), 137 deletions(-)

diff --git a/core/tooltip.js b/core/tooltip.js
index d93825815..b4f99de32 100644
--- a/core/tooltip.js
+++ b/core/tooltip.js
@@ -6,11 +6,11 @@
 
 /**
  * @fileoverview Library to create tooltips for Blockly.
- * First, call Blockly.Tooltip.init() after onload.
+ * First, call init() after onload.
  * Second, set the 'tooltip' property on any SVG element that needs a tooltip.
  * If the tooltip is a string, then that message will be displayed.
  * If the tooltip is an SVG element, then that object's tooltip will be used.
- * Third, call Blockly.Tooltip.bindMouseEvents(e) passing the SVG element.
+ * Third, call bindMouseEvents(e) passing the SVG element.
  * @author fraser@google.com (Neil Fraser)
  */
 'use strict';
@@ -19,11 +19,13 @@
  * @name Blockly.Tooltip
  * @namespace
  */
-goog.provide('Blockly.Tooltip');
+goog.module('Blockly.Tooltip');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.common');
-goog.require('Blockly.utils.string');
+const blocklyString = goog.require('Blockly.utils.string');
+const browserEvents = goog.require('Blockly.browserEvents');
+const common = goog.require('Blockly.common');
+const deprecation = goog.require('Blockly.utils.deprecation');
 
 
 /**
@@ -33,104 +35,141 @@ goog.require('Blockly.utils.string');
  * eventually unwinds to a string.
  * @typedef {string|{tooltip}|function(): (string|!Function)}
  */
-Blockly.Tooltip.TipInfo;
+let TipInfo;
+exports.TipInfo = TipInfo;
 
 /**
  * Is a tooltip currently showing?
+ * @type {boolean}
  */
-Blockly.Tooltip.visible = false;
+let visible = false;
+/** @deprecated September 2021 */
+exports.visible;
+
+const isVisible = function() {
+  return visible;
+};
+exports.isVisible = isVisible;
+
+Object.defineProperties(exports, {
+  visible: {
+    get: function() {
+      deprecation.warn(
+        'Blockly.Tooltip.visible', 'September 2021', 'September 2022',
+        'Blockly.Tooltip.isVisible()');
+      return isVisible();
+    }
+  }
+});
 
 /**
  * Is someone else blocking the tooltip from being shown?
  * @type {boolean}
- * @private
  */
-Blockly.Tooltip.blocked_ = false;
+let blocked = false;
 
 /**
  * Maximum width (in characters) of a tooltip.
  */
-Blockly.Tooltip.LIMIT = 50;
+const LIMIT = 50;
+exports.LIMIT = LIMIT;
 
 /**
  * PID of suspended thread to clear tooltip on mouse out.
- * @private
  */
-Blockly.Tooltip.mouseOutPid_ = 0;
+let mouseOutPid = 0;
 
 /**
  * PID of suspended thread to show the tooltip.
- * @private
  */
-Blockly.Tooltip.showPid_ = 0;
+let showPid = 0;
 
 /**
  * Last observed X location of the mouse pointer (freezes when tooltip appears).
- * @private
  */
-Blockly.Tooltip.lastX_ = 0;
+let lastX = 0;
 
 /**
  * Last observed Y location of the mouse pointer (freezes when tooltip appears).
- * @private
  */
-Blockly.Tooltip.lastY_ = 0;
+let lastY = 0;
 
 /**
  * Current element being pointed at.
  * @type {Element}
- * @private
  */
-Blockly.Tooltip.element_ = null;
+let element = null;
 
 /**
  * Once a tooltip has opened for an element, that element is 'poisoned' and
  * cannot respawn a tooltip until the pointer moves over a different element.
  * @type {Element}
- * @private
  */
-Blockly.Tooltip.poisonedElement_ = null;
+let poisonedElement = null;
 
 /**
  * Horizontal offset between mouse cursor and tooltip.
  */
-Blockly.Tooltip.OFFSET_X = 0;
+const OFFSET_X = 0;
+exports.OFFSET_X = OFFSET_X;
 
 /**
  * Vertical offset between mouse cursor and tooltip.
  */
-Blockly.Tooltip.OFFSET_Y = 10;
+const OFFSET_Y = 10;
+exports.OFFSET_Y = OFFSET_Y;
 
 /**
  * Radius mouse can move before killing tooltip.
  */
-Blockly.Tooltip.RADIUS_OK = 10;
+const RADIUS_OK = 10;
+exports.RADIUS_OK = RADIUS_OK;
 
 /**
  * Delay before tooltip appears.
  */
-Blockly.Tooltip.HOVER_MS = 750;
+const HOVER_MS = 750;
+exports.HOVER_MS = HOVER_MS;
 
 /**
  * Horizontal padding between tooltip and screen edge.
  */
-Blockly.Tooltip.MARGINS = 5;
+const MARGINS = 5;
+exports.MARGINS = MARGINS;
 
 /**
- * The HTML container.  Set once by Blockly.Tooltip.createDom.
+ * The HTML container.  Set once by createDom.
  * @type {Element}
  */
-Blockly.Tooltip.DIV = null;
+let DIV = null;
+/** @deprecated September 2021 */
+exports.DIV = DIV;
+
+const getDiv = function() {
+  return DIV;
+};
+exports.getDiv = getDiv;
+
+Object.defineProperties(exports, {
+  DIV: {
+    get: function() {
+      deprecation.warn(
+        'Blockly.Tooltip.DIV', 'September 2021', 'September 2022',
+        'Blockly.Tooltip.getDiv()');
+      return getDiv();
+    }
+  }
+});
 
 /**
  * Returns the tooltip text for the given element.
  * @param {?Object} object The object to get the tooltip text of.
  * @return {string} The tooltip text of the element.
  */
-Blockly.Tooltip.getTooltipOfObject = function(object) {
-  var obj = Blockly.Tooltip.getTargetObject_(object);
+const getTooltipOfObject = function(object) {
+  const obj = getTargetObject(object);
   if (obj) {
-    var tooltip = obj.tooltip;
+    let tooltip = obj.tooltip;
     while (typeof tooltip == 'function') {
       tooltip = tooltip();
     }
@@ -141,6 +180,7 @@ Blockly.Tooltip.getTooltipOfObject = function(object) {
   }
   return '';
 };
+exports.getTooltipOfObject = getTooltipOfObject;
 
 /**
  * Returns the target object that the given object is targeting for its
@@ -148,9 +188,8 @@ Blockly.Tooltip.getTooltipOfObject = function(object) {
  * @param {?Object} obj The object are trying to find the target tooltip
  *     object of.
  * @return {?{tooltip}} The target tooltip object.
- * @private
  */
-Blockly.Tooltip.getTargetObject_ = function(obj) {
+const getTargetObject = function(obj) {
   while (obj && obj.tooltip) {
     if ((typeof obj.tooltip == 'string') ||
         (typeof obj.tooltip == 'function')) {
@@ -164,77 +203,77 @@ Blockly.Tooltip.getTargetObject_ = function(obj) {
 /**
  * Create the tooltip div and inject it onto the page.
  */
-Blockly.Tooltip.createDom = function() {
-  if (Blockly.Tooltip.DIV) {
+const createDom = function() {
+  if (DIV) {
     return;  // Already created.
   }
   // Create an HTML container for popup overlays (e.g. editor widgets).
-  Blockly.Tooltip.DIV = document.createElement('div');
-  Blockly.Tooltip.DIV.className = 'blocklyTooltipDiv';
-  var container = Blockly.common.getParentContainer() || document.body;
-  container.appendChild(Blockly.Tooltip.DIV);
+  DIV = document.createElement('div');
+  DIV.className = 'blocklyTooltipDiv';
+  const container = common.getParentContainer() || document.body;
+  container.appendChild(DIV);
 };
+exports.createDom = createDom;
 
 /**
  * Binds the required mouse events onto an SVG element.
  * @param {!Element} element SVG element onto which tooltip is to be bound.
  */
-Blockly.Tooltip.bindMouseEvents = function(element) {
-  element.mouseOverWrapper_ = Blockly.browserEvents.bind(
-      element, 'mouseover', null, Blockly.Tooltip.onMouseOver_);
-  element.mouseOutWrapper_ = Blockly.browserEvents.bind(
-      element, 'mouseout', null, Blockly.Tooltip.onMouseOut_);
+const bindMouseEvents = function(element) {
+  element.mouseOverWrapper_ =
+      browserEvents.bind(element, 'mouseover', null, onMouseOver);
+  element.mouseOutWrapper_ =
+      browserEvents.bind(element, 'mouseout', null, onMouseOut);
 
   // Don't use bindEvent_ for mousemove since that would create a
   // corresponding touch handler, even though this only makes sense in the
   // context of a mouseover/mouseout.
-  element.addEventListener('mousemove', Blockly.Tooltip.onMouseMove_, false);
+  element.addEventListener('mousemove', onMouseMove, false);
 };
+exports.bindMouseEvents = bindMouseEvents;
 
 /**
  * Unbinds tooltip mouse events from the SVG element.
  * @param {!Element} element SVG element onto which tooltip is bound.
  */
-Blockly.Tooltip.unbindMouseEvents = function(element) {
+const unbindMouseEvents = function(element) {
   if (!element) {
     return;
   }
-  Blockly.browserEvents.unbind(element.mouseOverWrapper_);
-  Blockly.browserEvents.unbind(element.mouseOutWrapper_);
-  element.removeEventListener('mousemove', Blockly.Tooltip.onMouseMove_);
+  browserEvents.unbind(element.mouseOverWrapper_);
+  browserEvents.unbind(element.mouseOutWrapper_);
+  element.removeEventListener('mousemove', onMouseMove);
 };
+exports.unbindMouseEvents = unbindMouseEvents;
 
 /**
  * Hide the tooltip if the mouse is over a different object.
  * Initialize the tooltip to potentially appear for this object.
  * @param {!Event} e Mouse event.
- * @private
  */
-Blockly.Tooltip.onMouseOver_ = function(e) {
-  if (Blockly.Tooltip.blocked_) {
+const onMouseOver = function(e) {
+  if (blocked) {
     // Someone doesn't want us to show tooltips.
     return;
   }
   // If the tooltip is an object, treat it as a pointer to the next object in
   // the chain to look at.  Terminate when a string or function is found.
-  var element = /** @type {Element} */ (Blockly.Tooltip.getTargetObject_(
-      e.currentTarget));
-  if (Blockly.Tooltip.element_ != element) {
-    Blockly.Tooltip.hide();
-    Blockly.Tooltip.poisonedElement_ = null;
-    Blockly.Tooltip.element_ = element;
+  const newElement = /** @type {Element} */ (getTargetObject(e.currentTarget));
+  if (element != newElement) {
+    hide();
+    poisonedElement = null;
+    element = newElement;
   }
   // Forget about any immediately preceding mouseOut event.
-  clearTimeout(Blockly.Tooltip.mouseOutPid_);
+  clearTimeout(mouseOutPid);
 };
 
 /**
  * Hide the tooltip if the mouse leaves the object and enters the workspace.
  * @param {!Event} _e Mouse event.
- * @private
  */
-Blockly.Tooltip.onMouseOut_ = function(_e) {
-  if (Blockly.Tooltip.blocked_) {
+const onMouseOut = function(_e) {
+  if (blocked) {
     // Someone doesn't want us to show tooltips.
     return;
   }
@@ -242,149 +281,148 @@ Blockly.Tooltip.onMouseOut_ = function(_e) {
   // a mouseOut followed instantly by a mouseOver.  Fork off the mouseOut
   // event and kill it if a mouseOver is received immediately.
   // This way the task only fully executes if mousing into the void.
-  Blockly.Tooltip.mouseOutPid_ = setTimeout(function() {
-    Blockly.Tooltip.element_ = null;
-    Blockly.Tooltip.poisonedElement_ = null;
-    Blockly.Tooltip.hide();
+  mouseOutPid = setTimeout(function() {
+    element = null;
+    poisonedElement = null;
+    hide();
   }, 1);
-  clearTimeout(Blockly.Tooltip.showPid_);
+  clearTimeout(showPid);
 };
 
 /**
  * When hovering over an element, schedule a tooltip to be shown.  If a tooltip
  * is already visible, hide it if the mouse strays out of a certain radius.
  * @param {!Event} e Mouse event.
- * @private
  */
-Blockly.Tooltip.onMouseMove_ = function(e) {
-  if (!Blockly.Tooltip.element_ || !Blockly.Tooltip.element_.tooltip) {
+const onMouseMove = function(e) {
+  if (!element || !element.tooltip) {
     // No tooltip here to show.
     return;
-  } else if (Blockly.Tooltip.blocked_) {
+  } else if (blocked) {
     // Someone doesn't want us to show tooltips.  We are probably handling a
     // user gesture, such as a click or drag.
     return;
   }
-  if (Blockly.Tooltip.visible) {
+  if (visible) {
     // Compute the distance between the mouse position when the tooltip was
     // shown and the current mouse position.  Pythagorean theorem.
-    var dx = Blockly.Tooltip.lastX_ - e.pageX;
-    var dy = Blockly.Tooltip.lastY_ - e.pageY;
-    if (Math.sqrt(dx * dx + dy * dy) > Blockly.Tooltip.RADIUS_OK) {
-      Blockly.Tooltip.hide();
+    const dx = lastX - e.pageX;
+    const dy = lastY - e.pageY;
+    if (Math.sqrt(dx * dx + dy * dy) > RADIUS_OK) {
+      hide();
     }
-  } else if (Blockly.Tooltip.poisonedElement_ != Blockly.Tooltip.element_) {
+  } else if (poisonedElement != element) {
     // The mouse moved, clear any previously scheduled tooltip.
-    clearTimeout(Blockly.Tooltip.showPid_);
+    clearTimeout(showPid);
     // Maybe this time the mouse will stay put.  Schedule showing of tooltip.
-    Blockly.Tooltip.lastX_ = e.pageX;
-    Blockly.Tooltip.lastY_ = e.pageY;
-    Blockly.Tooltip.showPid_ =
-        setTimeout(Blockly.Tooltip.show_, Blockly.Tooltip.HOVER_MS);
+    lastX = e.pageX;
+    lastY = e.pageY;
+    showPid = setTimeout(show, HOVER_MS);
   }
 };
 
 /**
  * Dispose of the tooltip.
- * @package
  */
-Blockly.Tooltip.dispose = function() {
-  Blockly.Tooltip.element_ = null;
-  Blockly.Tooltip.poisonedElement_ = null;
-  Blockly.Tooltip.hide();
+const dispose = function() {
+  element = null;
+  poisonedElement = null;
+  hide();
 };
+/** @package */
+exports.dispose = dispose;
 
 /**
  * Hide the tooltip.
  */
-Blockly.Tooltip.hide = function() {
-  if (Blockly.Tooltip.visible) {
-    Blockly.Tooltip.visible = false;
-    if (Blockly.Tooltip.DIV) {
-      Blockly.Tooltip.DIV.style.display = 'none';
+const hide = function() {
+  if (visible) {
+    visible = false;
+    if (DIV) {
+      DIV.style.display = 'none';
     }
   }
-  if (Blockly.Tooltip.showPid_) {
-    clearTimeout(Blockly.Tooltip.showPid_);
+  if (showPid) {
+    clearTimeout(showPid);
   }
 };
+exports.hide = hide;
 
 /**
  * Hide any in-progress tooltips and block showing new tooltips until the next
  * call to unblock().
- * @package
  */
-Blockly.Tooltip.block = function() {
-  Blockly.Tooltip.hide();
-  Blockly.Tooltip.blocked_ = true;
+const block = function() {
+  hide();
+  blocked = true;
 };
+/** @package */
+exports.block = block;
 
 /**
  * Unblock tooltips: allow them to be scheduled and shown according to their own
  * logic.
- * @package
  */
-Blockly.Tooltip.unblock = function() {
-  Blockly.Tooltip.blocked_ = false;
+const unblock = function() {
+  blocked = false;
 };
+/** @package */
+exports.unblock = unblock;
 
 /**
  * Create the tooltip and show it.
- * @private
  */
-Blockly.Tooltip.show_ = function() {
-  if (Blockly.Tooltip.blocked_) {
+const show = function() {
+  if (blocked) {
     // Someone doesn't want us to show tooltips.
     return;
   }
-  Blockly.Tooltip.poisonedElement_ = Blockly.Tooltip.element_;
-  if (!Blockly.Tooltip.DIV) {
+  poisonedElement = element;
+  if (!DIV) {
     return;
   }
   // Erase all existing text.
-  Blockly.Tooltip.DIV.textContent = '';
-  var tip = Blockly.Tooltip.getTooltipOfObject(Blockly.Tooltip.element_);
-  tip = Blockly.utils.string.wrap(tip, Blockly.Tooltip.LIMIT);
+  DIV.textContent = '';
+  let tip = getTooltipOfObject(element);
+  tip = blocklyString.wrap(tip, LIMIT);
   // Create new text, line by line.
-  var lines = tip.split('\n');
-  for (var i = 0; i < lines.length; i++) {
-    var div = document.createElement('div');
+  const lines = tip.split('\n');
+  for (let i = 0; i < lines.length; i++) {
+    const div = document.createElement('div');
     div.appendChild(document.createTextNode(lines[i]));
-    Blockly.Tooltip.DIV.appendChild(div);
+    DIV.appendChild(div);
   }
-  var rtl = /** @type {{RTL: boolean}} */ (Blockly.Tooltip.element_).RTL;
-  var windowWidth = document.documentElement.clientWidth;
-  var windowHeight = document.documentElement.clientHeight;
+  const rtl = /** @type {{RTL: boolean}} */ (element).RTL;
+  const windowWidth = document.documentElement.clientWidth;
+  const windowHeight = document.documentElement.clientHeight;
   // Display the tooltip.
-  Blockly.Tooltip.DIV.style.direction = rtl ? 'rtl' : 'ltr';
-  Blockly.Tooltip.DIV.style.display = 'block';
-  Blockly.Tooltip.visible = true;
+  DIV.style.direction = rtl ? 'rtl' : 'ltr';
+  DIV.style.display = 'block';
+  visible = true;
   // Move the tooltip to just below the cursor.
-  var anchorX = Blockly.Tooltip.lastX_;
+  let anchorX = lastX;
   if (rtl) {
-    anchorX -= Blockly.Tooltip.OFFSET_X + Blockly.Tooltip.DIV.offsetWidth;
+    anchorX -= OFFSET_X + DIV.offsetWidth;
   } else {
-    anchorX += Blockly.Tooltip.OFFSET_X;
+    anchorX += OFFSET_X;
   }
-  var anchorY = Blockly.Tooltip.lastY_ + Blockly.Tooltip.OFFSET_Y;
+  let anchorY = lastY + OFFSET_Y;
 
-  if (anchorY + Blockly.Tooltip.DIV.offsetHeight >
-      windowHeight + window.scrollY) {
+  if (anchorY + DIV.offsetHeight > windowHeight + window.scrollY) {
     // Falling off the bottom of the screen; shift the tooltip up.
-    anchorY -= Blockly.Tooltip.DIV.offsetHeight + 2 * Blockly.Tooltip.OFFSET_Y;
+    anchorY -= DIV.offsetHeight + 2 * OFFSET_Y;
   }
   if (rtl) {
     // Prevent falling off left edge in RTL mode.
-    anchorX = Math.max(Blockly.Tooltip.MARGINS - window.scrollX, anchorX);
+    anchorX = Math.max(MARGINS - window.scrollX, anchorX);
   } else {
-    if (anchorX + Blockly.Tooltip.DIV.offsetWidth >
-        windowWidth + window.scrollX - 2 * Blockly.Tooltip.MARGINS) {
+    if (anchorX + DIV.offsetWidth >
+        windowWidth + window.scrollX - 2 * MARGINS) {
       // Falling off the right edge of the screen;
       // clamp the tooltip on the edge.
-      anchorX = windowWidth - Blockly.Tooltip.DIV.offsetWidth -
-          2 * Blockly.Tooltip.MARGINS;
+      anchorX = windowWidth - DIV.offsetWidth - 2 * MARGINS;
     }
   }
-  Blockly.Tooltip.DIV.style.top = anchorY + 'px';
-  Blockly.Tooltip.DIV.style.left = anchorX + 'px';
+  DIV.style.top = anchorY + 'px';
+  DIV.style.left = anchorX + 'px';
 };
diff --git a/tests/deps.js b/tests/deps.js
index 7429530ed..403324860 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -204,8 +204,8 @@ goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory']
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.string']);
+goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});

From 53061ac6e5b619b440f84bdc6e204237feb17d5c Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 9 Sep 2021 14:19:32 -0700
Subject: [PATCH 734/833] Migrate core/touch_gesture.js to goog.module syntax
 (#5449)

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

* Migrate core/touch_gesture.js to goog.module

* Migrate core/touch_gesture.js to named requires

* clang-format core/touch_gesture.js

* Remove Blockly prefix from Touch
---
 core/touch_gesture.js | 158 +++++++++++++++++++++---------------------
 tests/deps.js         |   2 +-
 2 files changed, 79 insertions(+), 81 deletions(-)

diff --git a/core/touch_gesture.js b/core/touch_gesture.js
index 7fa4b147f..85c3e1cf3 100644
--- a/core/touch_gesture.js
+++ b/core/touch_gesture.js
@@ -5,22 +5,23 @@
  */
 
 /**
- * @fileoverview The class extends Blockly.Gesture to support pinch to zoom
+ * @fileoverview The class extends Gesture to support pinch to zoom
  * for both pointer and touch events.
  * @author samelh@microsoft.com (Sam El-Husseini)
  */
 'use strict';
 
-goog.provide('Blockly.TouchGesture');
+goog.module('Blockly.TouchGesture');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.Gesture');
-goog.require('Blockly.Touch');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.WorkspaceSvg');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Gesture = goog.require('Blockly.Gesture');
+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 object = goog.require('Blockly.utils.object');
+const utils = goog.require('Blockly.utils');
 
 
 /*
@@ -31,13 +32,13 @@ goog.requireType('Blockly.WorkspaceSvg');
 /**
  * Class for one gesture.
  * @param {!Event} e The event that kicked off this gesture.
- * @param {!Blockly.WorkspaceSvg} creatorWorkspace The workspace that created
+ * @param {!WorkspaceSvg} creatorWorkspace The workspace that created
  *     this gesture and has a reference to it.
- * @extends {Blockly.Gesture}
+ * @extends {Gesture}
  * @constructor
  */
-Blockly.TouchGesture = function(e, creatorWorkspace) {
-  Blockly.TouchGesture.superClass_.constructor.call(this, e, creatorWorkspace);
+const TouchGesture = function(e, creatorWorkspace) {
+  TouchGesture.superClass_.constructor.call(this, e, creatorWorkspace);
 
   /**
    * Boolean for whether or not this gesture is a multi-touch gesture.
@@ -48,7 +49,7 @@ Blockly.TouchGesture = function(e, creatorWorkspace) {
 
   /**
    * A map of cached points used for tracking multi-touch gestures.
-   * @type {!Object<number|string, Blockly.utils.Coordinate>}
+   * @type {!Object<number|string, Coordinate>}
    * @private
    */
   this.cachedPoints_ = Object.create(null);
@@ -74,7 +75,7 @@ Blockly.TouchGesture = function(e, creatorWorkspace) {
    * A handle to use to unbind the second touch start or pointer down listener
    * at the end of a drag.
    * Opaque data returned from Blockly.bindEventWithChecks_.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onStartWrapper_ = null;
@@ -86,19 +87,19 @@ Blockly.TouchGesture = function(e, creatorWorkspace) {
    */
   this.isPinchZoomEnabled_ = null;
 };
-Blockly.utils.object.inherits(Blockly.TouchGesture, Blockly.Gesture);
+object.inherits(TouchGesture, Gesture);
 
 /**
  * A multiplier used to convert the gesture scale to a zoom in delta.
  * @const
  */
-Blockly.TouchGesture.ZOOM_IN_MULTIPLIER = 5;
+TouchGesture.ZOOM_IN_MULTIPLIER = 5;
 
 /**
  * A multiplier used to convert the gesture scale to a zoom out delta.
  * @const
  */
-Blockly.TouchGesture.ZOOM_OUT_MULTIPLIER = 6;
+TouchGesture.ZOOM_OUT_MULTIPLIER = 6;
 
 /**
  * Start a gesture: update the workspace to indicate that a gesture is in
@@ -106,11 +107,11 @@ Blockly.TouchGesture.ZOOM_OUT_MULTIPLIER = 6;
  * @param {!Event} e A mouse down, touch start or pointer down event.
  * @package
  */
-Blockly.TouchGesture.prototype.doStart = function(e) {
+TouchGesture.prototype.doStart = function(e) {
   this.isPinchZoomEnabled_ = this.startWorkspace_.options.zoomOptions &&
       this.startWorkspace_.options.zoomOptions.pinch;
-  Blockly.TouchGesture.superClass_.doStart.call(this, e);
-  if (!this.isEnding_ && Blockly.Touch.isTouchEvent(e)) {
+  TouchGesture.superClass_.doStart.call(this, e);
+  if (!this.isEnding_ && Touch.isTouchEvent(e)) {
     this.handleTouchStart(e);
   }
 };
@@ -124,14 +125,14 @@ Blockly.TouchGesture.prototype.doStart = function(e) {
  * @param {!Event} e A mouse down or touch start event.
  * @package
  */
-Blockly.TouchGesture.prototype.bindMouseEvents = function(e) {
-  this.onStartWrapper_ = Blockly.browserEvents.conditionalBind(
+TouchGesture.prototype.bindMouseEvents = function(e) {
+  this.onStartWrapper_ = browserEvents.conditionalBind(
       document, 'mousedown', null, this.handleStart.bind(this),
       /* opt_noCaptureIdentifier */ true);
-  this.onMoveWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onMoveWrapper_ = browserEvents.conditionalBind(
       document, 'mousemove', null, this.handleMove.bind(this),
       /* opt_noCaptureIdentifier */ true);
-  this.onUpWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onUpWrapper_ = browserEvents.conditionalBind(
       document, 'mouseup', null, this.handleUp.bind(this),
       /* opt_noCaptureIdentifier */ true);
 
@@ -144,16 +145,16 @@ Blockly.TouchGesture.prototype.bindMouseEvents = function(e) {
  * @param {!Event} e A mouse down, touch start, or pointer down event.
  * @package
  */
-Blockly.TouchGesture.prototype.handleStart = function(e) {
+TouchGesture.prototype.handleStart = function(e) {
   if (this.isDragging()) {
     // A drag has already started, so this can no longer be a pinch-zoom.
     return;
   }
-  if (Blockly.Touch.isTouchEvent(e)) {
+  if (Touch.isTouchEvent(e)) {
     this.handleTouchStart(e);
 
     if (this.isMultiTouch()) {
-      Blockly.Touch.longStop();
+      Touch.longStop();
     }
   }
 };
@@ -163,21 +164,21 @@ Blockly.TouchGesture.prototype.handleStart = function(e) {
  * @param {!Event} e A mouse move, touch move, or pointer move event.
  * @package
  */
-Blockly.TouchGesture.prototype.handleMove = function(e) {
+TouchGesture.prototype.handleMove = function(e) {
   if (this.isDragging()) {
     // We are in the middle of a drag, only handle the relevant events
-    if (Blockly.Touch.shouldHandleEvent(e)) {
-      Blockly.TouchGesture.superClass_.handleMove.call(this, e);
+    if (Touch.shouldHandleEvent(e)) {
+      TouchGesture.superClass_.handleMove.call(this, e);
     }
     return;
   }
   if (this.isMultiTouch()) {
-    if (Blockly.Touch.isTouchEvent(e)) {
+    if (Touch.isTouchEvent(e)) {
       this.handleTouchMove(e);
     }
-    Blockly.Touch.longStop();
+    Touch.longStop();
   } else {
-    Blockly.TouchGesture.superClass_.handleMove.call(this, e);
+    TouchGesture.superClass_.handleMove.call(this, e);
   }
 };
 
@@ -186,15 +187,15 @@ Blockly.TouchGesture.prototype.handleMove = function(e) {
  * @param {!Event} e A mouse up, touch end, or pointer up event.
  * @package
  */
-Blockly.TouchGesture.prototype.handleUp = function(e) {
-  if (Blockly.Touch.isTouchEvent(e) && !this.isDragging()) {
+TouchGesture.prototype.handleUp = function(e) {
+  if (Touch.isTouchEvent(e) && !this.isDragging()) {
     this.handleTouchEnd(e);
   }
   if (!this.isMultiTouch() || this.isDragging()) {
-    if (!Blockly.Touch.shouldHandleEvent(e)) {
+    if (!Touch.shouldHandleEvent(e)) {
       return;
     }
-    Blockly.TouchGesture.superClass_.handleUp.call(this, e);
+    TouchGesture.superClass_.handleUp.call(this, e);
   } else {
     e.preventDefault();
     e.stopPropagation();
@@ -208,7 +209,7 @@ Blockly.TouchGesture.prototype.handleUp = function(e) {
  * @return {boolean} Whether this gesture is part of a multi-touch gesture.
  * @package
  */
-Blockly.TouchGesture.prototype.isMultiTouch = function() {
+TouchGesture.prototype.isMultiTouch = function() {
   return this.isMultiTouch_;
 };
 
@@ -216,11 +217,11 @@ Blockly.TouchGesture.prototype.isMultiTouch = function() {
  * Sever all links from this object.
  * @package
  */
-Blockly.TouchGesture.prototype.dispose = function() {
-  Blockly.TouchGesture.superClass_.dispose.call(this);
+TouchGesture.prototype.dispose = function() {
+  TouchGesture.superClass_.dispose.call(this);
 
   if (this.onStartWrapper_) {
-    Blockly.browserEvents.unbind(this.onStartWrapper_);
+    browserEvents.unbind(this.onStartWrapper_);
   }
 };
 
@@ -230,18 +231,16 @@ Blockly.TouchGesture.prototype.dispose = function() {
  * @param {!Event} e A touch start, or pointer down event.
  * @package
  */
-Blockly.TouchGesture.prototype.handleTouchStart = function(e) {
-  var pointerId = Blockly.Touch.getTouchIdentifierFromEvent(e);
+TouchGesture.prototype.handleTouchStart = function(e) {
+  const pointerId = Touch.getTouchIdentifierFromEvent(e);
   // store the pointerId in the current list of pointers
   this.cachedPoints_[pointerId] = this.getTouchPoint(e);
-  var pointers = Object.keys(this.cachedPoints_);
+  const pointers = Object.keys(this.cachedPoints_);
   // If two pointers are down, store info
   if (pointers.length == 2) {
-    var point0 = /** @type {!Blockly.utils.Coordinate} */ (
-      this.cachedPoints_[pointers[0]]);
-    var point1 = /** @type {!Blockly.utils.Coordinate} */ (
-      this.cachedPoints_[pointers[1]]);
-    this.startDistance_ = Blockly.utils.Coordinate.distance(point0, point1);
+    const point0 = /** @type {!Coordinate} */ (this.cachedPoints_[pointers[0]]);
+    const point1 = /** @type {!Coordinate} */ (this.cachedPoints_[pointers[1]]);
+    this.startDistance_ = Coordinate.distance(point0, point1);
     this.isMultiTouch_ = true;
     e.preventDefault();
   }
@@ -253,41 +252,39 @@ Blockly.TouchGesture.prototype.handleTouchStart = function(e) {
  * @param {!Event} e A touch move, or pointer move event.
  * @package
  */
-Blockly.TouchGesture.prototype.handleTouchMove = function(e) {
-  var pointerId = Blockly.Touch.getTouchIdentifierFromEvent(e);
+TouchGesture.prototype.handleTouchMove = function(e) {
+  const pointerId = Touch.getTouchIdentifierFromEvent(e);
   // Update the cache
   this.cachedPoints_[pointerId] = this.getTouchPoint(e);
 
-  var pointers = Object.keys(this.cachedPoints_);
+  const pointers = Object.keys(this.cachedPoints_);
   if (this.isPinchZoomEnabled_ && pointers.length === 2) {
     this.handlePinch_(e);
   } else {
-    Blockly.TouchGesture.superClass_.handleMove.call(this, e);
+    TouchGesture.superClass_.handleMove.call(this, e);
   }
 };
 
 /**
-* Handle pinch zoom gesture.
-* @param {!Event} e A touch move, or pointer move event.
-* @private
-*/
-Blockly.TouchGesture.prototype.handlePinch_ = function(e) {
-  var pointers = Object.keys(this.cachedPoints_);
+ * Handle pinch zoom gesture.
+ * @param {!Event} e A touch move, or pointer move event.
+ * @private
+ */
+TouchGesture.prototype.handlePinch_ = function(e) {
+  const pointers = Object.keys(this.cachedPoints_);
   // Calculate the distance between the two pointers
-  var point0 = /** @type {!Blockly.utils.Coordinate} */ (
-    this.cachedPoints_[pointers[0]]);
-  var point1 = /** @type {!Blockly.utils.Coordinate} */ (
-    this.cachedPoints_[pointers[1]]);
-  var moveDistance = Blockly.utils.Coordinate.distance(point0, point1);
-  var scale = moveDistance / this.startDistance_;
+  const point0 = /** @type {!Coordinate} */ (this.cachedPoints_[pointers[0]]);
+  const point1 = /** @type {!Coordinate} */ (this.cachedPoints_[pointers[1]]);
+  const moveDistance = Coordinate.distance(point0, point1);
+  const scale = moveDistance / this.startDistance_;
 
   if (this.previousScale_ > 0 && this.previousScale_ < Infinity) {
-    var gestureScale = scale - this.previousScale_;
-    var delta = gestureScale > 0 ?
-        gestureScale * Blockly.TouchGesture.ZOOM_IN_MULTIPLIER :
-        gestureScale * Blockly.TouchGesture.ZOOM_OUT_MULTIPLIER;
-    var workspace = this.startWorkspace_;
-    var position = Blockly.utils.mouseToSvg(
+    const gestureScale = scale - this.previousScale_;
+    const delta = gestureScale > 0 ?
+        gestureScale * TouchGesture.ZOOM_IN_MULTIPLIER :
+        gestureScale * TouchGesture.ZOOM_OUT_MULTIPLIER;
+    const workspace = this.startWorkspace_;
+    const position = utils.mouseToSvg(
         e, workspace.getParentSvg(), workspace.getInverseScreenCTM());
     workspace.zoom(position.x, position.y, delta);
   }
@@ -301,8 +298,8 @@ Blockly.TouchGesture.prototype.handlePinch_ = function(e) {
  * @param {!Event} e A touch end, or pointer end event.
  * @package
  */
-Blockly.TouchGesture.prototype.handleTouchEnd = function(e) {
-  var pointerId = Blockly.Touch.getTouchIdentifierFromEvent(e);
+TouchGesture.prototype.handleTouchEnd = function(e) {
+  const pointerId = Touch.getTouchIdentifierFromEvent(e);
   if (this.cachedPoints_[pointerId]) {
     delete this.cachedPoints_[pointerId];
   }
@@ -315,15 +312,16 @@ Blockly.TouchGesture.prototype.handleTouchEnd = function(e) {
 /**
  * Helper function returning the current touch point coordinate.
  * @param {!Event} e A touch or pointer event.
- * @return {?Blockly.utils.Coordinate} The current touch point coordinate
+ * @return {?Coordinate} The current touch point coordinate
  * @package
  */
-Blockly.TouchGesture.prototype.getTouchPoint = function(e) {
+TouchGesture.prototype.getTouchPoint = function(e) {
   if (!this.startWorkspace_) {
     return null;
   }
-  return new Blockly.utils.Coordinate(
+  return new Coordinate(
       (e.pageX ? e.pageX : e.changedTouches[0].pageX),
-      (e.pageY ? e.pageY : e.changedTouches[0].pageY)
-  );
+      (e.pageY ? e.pageY : e.changedTouches[0].pageY));
 };
+
+exports = TouchGesture;
diff --git a/tests/deps.js b/tests/deps.js
index 403324860..ec33762a5 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -207,7 +207,7 @@ goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Block
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
+goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});

From 7a2e23876eaecb67050c0761515a2255258455ba Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Fri, 10 Sep 2021 18:10:23 +0100
Subject: [PATCH 735/833] Migrate core/msg.js to goog.module syntax (#5448)

* Migrate core/msg.js to goog.module
* Migrate core/msg.js named requires
---
 core/msg.js   | 13 +++++++------
 tests/deps.js |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/core/msg.js b/core/msg.js
index 8cf7a2c5b..506473094 100644
--- a/core/msg.js
+++ b/core/msg.js
@@ -14,18 +14,19 @@
  * Name space for the Msg singleton.
  * Msg gets populated in the message files.
  */
-goog.provide('Blockly.Msg');
+goog.module('Blockly.Msg');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.utils.global');
+const global = 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.
  */
-if (!Blockly.utils.global['Blockly']) {
-  Blockly.utils.global['Blockly'] = {};
+if (!global['Blockly']) {
+  global['Blockly'] = {};
 }
-if (!Blockly.utils.global['Blockly']['Msg']) {
-  Blockly.utils.global['Blockly']['Msg'] = Blockly.Msg;
+if (!global['Blockly']['Msg']) {
+  global['Blockly']['Msg'] = exports;
 }
diff --git a/tests/deps.js b/tests/deps.js
index ec33762a5..afb8f4031 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -127,7 +127,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.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global']);
+goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', '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', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.deprecation', 'Blockly.utils.idGenerator', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});

From 09fb59f6eed0253f48a81282cc832d545d9f3d09 Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Fri, 10 Sep 2021 22:16:48 +0100
Subject: [PATCH 736/833] Fix deps.js (#5452)

Running npm run build:deps in goog_module makes a change to tests/deps.js that was previously committed by PR #5441 but which appears to have been inadvertently undone by #5222.
---
 tests/deps.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/deps.js b/tests/deps.js
index afb8f4031..71227ec70 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -204,7 +204,7 @@ goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory']
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From f9d0caa11263fb606033eb5e2fc6c101e0e36e45 Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Tue, 14 Sep 2021 14:39:29 +0100
Subject: [PATCH 737/833] Migrate core.global.js to named exports (#5451)

This is part of #5153 but is being prioritised because we want remove
the declareLegacyNamespace calls from the core/utils/*.js modules and
then reexport them explicitly via utils.js, and it turns out that
doing so results in the exports object of this module being passed to
Object.freeze - which fails on the global object, which can't be made
non-extensible!

The new name chosen for the former default export is globalThis, since
it is intended to have the same value as the global variable of that
name; see:

https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/globalThis
---
 core/browser_events.js         |  6 +++---
 core/msg.js                    | 10 +++++-----
 core/touch.js                  | 14 +++++++-------
 core/utils.js                  |  6 +++---
 core/utils/global.js           |  9 +++++----
 core/utils/useragent.js        |  6 +++---
 core/workspace_audio.js        |  6 +++---
 generators/javascript.js       |  2 +-
 scripts/migration/renamings.js |  3 +++
 scripts/package/node/core.js   |  7 ++++---
 tests/deps.js                  |  2 +-
 11 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/core/browser_events.js b/core/browser_events.js
index b7ce3a61e..fc03c6028 100644
--- a/core/browser_events.js
+++ b/core/browser_events.js
@@ -14,7 +14,7 @@ goog.module('Blockly.browserEvents');
 goog.module.declareLegacyNamespace();
 
 const Touch = goog.require('Blockly.Touch');
-const global = goog.require('Blockly.utils.global');
+const {globalThis} = goog.require('Blockly.utils.global');
 
 
 /**
@@ -69,7 +69,7 @@ const conditionalBind = function(
   };
 
   const bindData = [];
-  if (global['PointerEvent'] && (name in Touch.TOUCH_MAP)) {
+  if (globalThis['PointerEvent'] && (name in Touch.TOUCH_MAP)) {
     for (let i = 0; i < Touch.TOUCH_MAP[name].length; i++) {
       const type = Touch.TOUCH_MAP[name][i];
       node.addEventListener(type, wrapFunc, false);
@@ -124,7 +124,7 @@ const bind = function(node, name, thisObject, func) {
   };
 
   const bindData = [];
-  if (global['PointerEvent'] && (name in Touch.TOUCH_MAP)) {
+  if (globalThis['PointerEvent'] && (name in Touch.TOUCH_MAP)) {
     for (let i = 0; i < Touch.TOUCH_MAP[name].length; i++) {
       const type = Touch.TOUCH_MAP[name][i];
       node.addEventListener(type, wrapFunc, false);
diff --git a/core/msg.js b/core/msg.js
index 506473094..ff2de0fc3 100644
--- a/core/msg.js
+++ b/core/msg.js
@@ -17,16 +17,16 @@
 goog.module('Blockly.Msg');
 goog.module.declareLegacyNamespace();
 
-const global = goog.require('Blockly.utils.global');
+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.
  */
-if (!global['Blockly']) {
-  global['Blockly'] = {};
+if (!globalThis['Blockly']) {
+  globalThis['Blockly'] = {};
 }
-if (!global['Blockly']['Msg']) {
-  global['Blockly']['Msg'] = exports;
+if (!globalThis['Blockly']['Msg']) {
+  globalThis['Blockly']['Msg'] = exports;
 }
diff --git a/core/touch.js b/core/touch.js
index daa95722f..f17667fff 100644
--- a/core/touch.js
+++ b/core/touch.js
@@ -16,7 +16,7 @@ goog.module.declareLegacyNamespace();
 /* eslint-disable-next-line no-unused-vars */
 const Gesture = goog.requireType('Blockly.Gesture');
 const internalConstants = goog.require('Blockly.internalConstants');
-const utilsGlobal = goog.require('Blockly.utils.global');
+const {globalThis} = goog.require('Blockly.utils.global');
 const utilsString = goog.require('Blockly.utils.string');
 
 
@@ -26,13 +26,13 @@ const utilsString = goog.require('Blockly.utils.string');
  * @const
  */
 const TOUCH_ENABLED =
-    ('ontouchstart' in utilsGlobal ||
-     !!(utilsGlobal['document'] && document.documentElement &&
+    ('ontouchstart' in globalThis ||
+     !!(globalThis['document'] && document.documentElement &&
         'ontouchstart' in document.documentElement) ||
      // IE10 uses non-standard touch events, so it has a different check.
-     !!(utilsGlobal['navigator'] &&
-        (utilsGlobal['navigator']['maxTouchPoints'] ||
-         utilsGlobal['navigator']['msMaxTouchPoints'])));
+     !!(globalThis['navigator'] &&
+        (globalThis['navigator']['maxTouchPoints'] ||
+         globalThis['navigator']['msMaxTouchPoints'])));
 exports.TOUCH_ENABLED = TOUCH_ENABLED;
 
 /**
@@ -47,7 +47,7 @@ let touchIdentifier_ = null;
  * @type {Object}
  */
 let TOUCH_MAP = {};
-if (utilsGlobal['PointerEvent']) {
+if (globalThis['PointerEvent']) {
   TOUCH_MAP = {
     'mousedown': ['pointerdown'],
     'mouseenter': ['pointerenter'],
diff --git a/core/utils.js b/core/utils.js
index 33b7587a8..cb711e1a8 100644
--- a/core/utils.js
+++ b/core/utils.js
@@ -28,7 +28,7 @@ const Rect = goog.require('Blockly.utils.Rect');
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const colourUtils = goog.require('Blockly.utils.colour');
 const deprecation = goog.require('Blockly.utils.deprecation');
-const global = goog.require('Blockly.utils.global');
+const {globalThis} = goog.require('Blockly.utils.global');
 const idGenerator = goog.require('Blockly.utils.idGenerator');
 const internalConstants = goog.require('Blockly.internalConstants');
 const stringUtils = goog.require('Blockly.utils.string');
@@ -433,7 +433,7 @@ const is3dSupported = function() {
   }
   // CC-BY-SA Lorenzo Polidori
   // stackoverflow.com/questions/5661671/detecting-transform-translate3d-support
-  if (!global['getComputedStyle']) {
+  if (!globalThis['getComputedStyle']) {
     return false;
   }
 
@@ -453,7 +453,7 @@ const is3dSupported = function() {
   for (let t in transforms) {
     if (el.style[t] !== undefined) {
       el.style[t] = 'translate3d(1px,1px,1px)';
-      const computedStyle = global['getComputedStyle'](el);
+      const computedStyle = globalThis['getComputedStyle'](el);
       if (!computedStyle) {
         // getComputedStyle in Firefox returns null when Blockly is loaded
         // inside an iframe with display: none.  Returning false and not
diff --git a/core/utils/global.js b/core/utils/global.js
index 7474f77c9..75b9241bf 100644
--- a/core/utils/global.js
+++ b/core/utils/global.js
@@ -20,7 +20,10 @@ goog.module.declareLegacyNamespace();
  * More info on this implementation here:
  * https://docs.google.com/document/d/1NAeW4Wk7I7FV0Y2tcUFvQdGMc89k2vdgSXInw8_nvCI
  */
-const utilsGlobal = function() {
+exports.globalThis = (function() {  // Not "let globalThis" to avoid shadowing.
+  if (typeof globalThis === 'object') {
+    return globalThis;
+  }
   if (typeof self === 'object') {
     return self;
   }
@@ -31,6 +34,4 @@ const utilsGlobal = function() {
     return global;
   }
   return this;
-}();
-
-exports = utilsGlobal;
+})();
diff --git a/core/utils/useragent.js b/core/utils/useragent.js
index 8ae95381d..011e72eb0 100644
--- a/core/utils/useragent.js
+++ b/core/utils/useragent.js
@@ -19,7 +19,7 @@
 goog.module('Blockly.utils.userAgent');
 goog.module.declareLegacyNamespace();
 
-const global = goog.require('Blockly.utils.global');
+const {globalThis} = goog.require('Blockly.utils.global');
 
 
 /**
@@ -100,7 +100,7 @@ isGecko = has('Gecko') && !isWebKit && !isIe && !isEdge;
 // https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/extra.js
 isAndroid = has('Android');
 const maxTouchPoints =
-    global['navigator'] && global['navigator']['maxTouchPoints'];
+    globalThis['navigator'] && globalThis['navigator']['maxTouchPoints'];
 isIPad = has('iPad') || has('Macintosh') && maxTouchPoints > 0;
 isIPod = has('iPod');
 isIPhone = has('iPhone') && !isIPad && !isIPod;
@@ -110,7 +110,7 @@ isMac = has('Macintosh');
 // https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/device.js
 isTablet = isIPad || (isAndroid && !has('Mobile')) || has('Silk');
 isMobile = !isTablet && (isIPod || isIPhone || isAndroid || has('IEMobile'));
-})((global['navigator'] && global['navigator']['userAgent']) || '');
+})((globalThis['navigator'] && globalThis['navigator']['userAgent']) || '');
 
 /** @const {string} */
 exports.raw = rawUserAgent;
diff --git a/core/workspace_audio.js b/core/workspace_audio.js
index ba1da0c95..178657baf 100644
--- a/core/workspace_audio.js
+++ b/core/workspace_audio.js
@@ -16,7 +16,7 @@ goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
-const global = goog.require('Blockly.utils.global');
+const {globalThis} = goog.require('Blockly.utils.global');
 const internalConstants = goog.require('Blockly.internalConstants');
 const userAgent = goog.require('Blockly.utils.userAgent');
 
@@ -72,7 +72,7 @@ WorkspaceAudio.prototype.load = function(filenames, name) {
   }
   let audioTest;
   try {
-    audioTest = new global['Audio']();
+    audioTest = new globalThis['Audio']();
   } catch (e) {
     // No browser support for Audio.
     // IE can throw an error even if the Audio object exists.
@@ -84,7 +84,7 @@ WorkspaceAudio.prototype.load = function(filenames, name) {
     const ext = filename.match(/\.(\w+)$/);
     if (ext && audioTest.canPlayType('audio/' + ext[1])) {
       // Found an audio format we can play.
-      sound = new global['Audio'](filename);
+      sound = new globalThis['Audio'](filename);
       break;
     }
   }
diff --git a/generators/javascript.js b/generators/javascript.js
index 0c1cbe7cb..48255c077 100644
--- a/generators/javascript.js
+++ b/generators/javascript.js
@@ -42,7 +42,7 @@ Blockly.JavaScript.addReservedWords(
     // Magic variable.
     'arguments,' +
     // Everything in the current environment (835 items in Chrome, 104 in Node).
-    Object.getOwnPropertyNames(Blockly.utils.global).join(','));
+    Object.getOwnPropertyNames(Blockly.utils.global.globalThis).join(','));
 
 /**
  * Order of operation ENUMs.
diff --git a/scripts/migration/renamings.js b/scripts/migration/renamings.js
index 0454816f8..15c0a07f7 100644
--- a/scripts/migration/renamings.js
+++ b/scripts/migration/renamings.js
@@ -72,6 +72,9 @@ const renamings = {
         genUid: {module: 'Blockly.utils.idGenerator'},
       }
     },
+    'Blockly.utils.global': {
+      export: 'globalThis',  // Previous default export now named.
+    },
     'Blockly.utils.IdGenerator': {
       module: 'Blockly.utils.idGenerator',
     }
diff --git a/scripts/package/node/core.js b/scripts/package/node/core.js
index 7935f0cc5..21c2ac812 100644
--- a/scripts/package/node/core.js
+++ b/scripts/package/node/core.js
@@ -22,9 +22,10 @@ Blockly.setLocale = function (locale) {
 
 // Override textToDomDocument and provide Node.js alternatives to DOMParser and
 // XMLSerializer.
-if (typeof Blockly.utils.global.document !== 'object') {
-  Blockly.utils.global.DOMParser = require('jsdom/lib/jsdom/living').DOMParser;
-  Blockly.utils.global.XMLSerializer = require('jsdom/lib/jsdom/living').XMLSerializer;
+const globalThis = Blockly.utils.global.globalThis;
+if (typeof globalThis.document !== 'object') {
+  globalThis.DOMParser = require('jsdom/lib/jsdom/living').DOMParser;
+  globalThis.XMLSerializer = require('jsdom/lib/jsdom/living').XMLSerializer;
   var doc = Blockly.utils.xml.textToDomDocument(
     '<xml xmlns="https://developers.google.com/blockly/xml"></xml>');
   Blockly.utils.xml.document = function() {
diff --git a/tests/deps.js b/tests/deps.js
index 71227ec70..8dd1373ea 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -215,7 +215,7 @@ goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], [], {
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], [], {'module': 'goog'});
 goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.idGenerator'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], [], {'lang': 'es6', 'module': 'goog'});

From ff9320f8d960f8f88d42c4fc62f2dd9260d61af0 Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Tue, 14 Sep 2021 15:51:06 +0100
Subject: [PATCH 738/833] Migrate core/utils/xml.js to goog.module syntax
 (#5459)

* Migrate core/utils/xml.js to ES6 const/let

* Migrate core/utils/xml.js to goog.module

  The document() function is renamed to getDocument() so as to avoid
  shadowing the global of the same name.

* clang-format core/utils/xml.js

* Call monkey-patchable exports.global internally too

  This fixes Node test failures due to the monkey-patching of
  Blockly.utils.xml.global in scripts/package/node/core.js not being
  able to affect the target calls in createElement and createTextNode.
---
 core/utils/xml.js | 40 +++++++++++++++++++++++-----------------
 tests/deps.js     |  2 +-
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/core/utils/xml.js b/core/utils/xml.js
index 26f7bfc47..d7e8d77cd 100644
--- a/core/utils/xml.js
+++ b/core/utils/xml.js
@@ -16,65 +16,71 @@
  * @name Blockly.utils.xml
  * @namespace
  */
-goog.provide('Blockly.utils.xml');
+goog.module('Blockly.utils.xml');
+goog.module.declareLegacyNamespace();
 
 
 /**
  * Namespace for Blockly's XML.
  */
-Blockly.utils.xml.NAME_SPACE = 'https://developers.google.com/blockly/xml';
+const NAME_SPACE = 'https://developers.google.com/blockly/xml';
+exports.NAME_SPACE = NAME_SPACE;
 
 /**
  * Get the document object.  This method is overridden in the Node.js build of
  * Blockly. See gulpfile.js, package-blockly-node task.
+ *
+ * Note that this function is named getDocument so as to not shadow the
+ * global of the same name, but (for now) exported as .document to not
+ * break existing importers.
+ *
  * @return {!Document} The document object.
- * @public
  */
-Blockly.utils.xml.document = function() {
+const getDocument = function() {
   return document;
 };
+exports.document = getDocument;
 
 /**
  * Create DOM element for XML.
  * @param {string} tagName Name of DOM element.
  * @return {!Element} New DOM element.
- * @public
  */
-Blockly.utils.xml.createElement = function(tagName) {
-  return Blockly.utils.xml.document().createElementNS(
-      Blockly.utils.xml.NAME_SPACE, tagName);
+const createElement = function(tagName) {
+  return exports.document().createElementNS(NAME_SPACE, tagName);
 };
+exports.createElement = createElement;
 
 /**
  * Create text element for XML.
  * @param {string} text Text content.
  * @return {!Text} New DOM text node.
- * @public
  */
-Blockly.utils.xml.createTextNode = function(text) {
-  return Blockly.utils.xml.document().createTextNode(text);
+const createTextNode = function(text) {
+  return exports.document().createTextNode(text);
 };
+exports.createTextNode = createTextNode;
 
 /**
  * Converts an XML string into a DOM tree.
  * @param {string} text XML string.
  * @return {Document} The DOM document.
  * @throws if XML doesn't parse.
- * @public
  */
-Blockly.utils.xml.textToDomDocument = function(text) {
-  var oParser = new DOMParser();
+const textToDomDocument = function(text) {
+  const oParser = new DOMParser();
   return oParser.parseFromString(text, 'text/xml');
 };
+exports.textToDomDocument = textToDomDocument;
 
 /**
  * Converts a DOM structure into plain text.
  * Currently the text format is fairly ugly: all one line with no whitespace.
  * @param {!Node} dom A tree of XML nodes.
  * @return {string} Text representation.
- * @public
  */
-Blockly.utils.xml.domToText = function(dom) {
-  var oSerializer = new XMLSerializer();
+const domToText = function(dom) {
+  const oSerializer = new XMLSerializer();
   return oSerializer.serializeToString(dom);
 };
+exports.domToText = domToText;
diff --git a/tests/deps.js b/tests/deps.js
index 8dd1373ea..33025e20b 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -229,7 +229,7 @@ goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], [], {'lang'
 goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
+goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});

From ce8e7921a24795ac46a2127967383a0d1228ff80 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Tue, 14 Sep 2021 08:19:53 -0700
Subject: [PATCH 739/833] Move alert/confirm/prompt to a new file, dialog.js
 (#5457)

* Migrate prompt/alert/confirm to dedicated module

* Update core/blockly.js to pass through calls to prompt/alert/confirm to core/dialog.js

* Update calls to Blockly.prompt/alert/confirm to dialog.prompt/alert/confirm

* Fix typo and errant redeclaration of Blockly.prompt

* Clarify JSDoc on customizing Blockly.dialog.alert/confirm/prompt
---
 core/blockly.js                          | 74 ++++++++++--------
 core/contextmenu_items.js                |  3 +-
 core/dialog.js                           | 98 ++++++++++++++++++++++++
 core/field_textinput.js                  |  4 +-
 core/variable_map.js                     |  5 +-
 core/variables.js                        |  7 +-
 demos/code/code.js                       |  2 +-
 demos/custom-dialogs/custom-dialog.js    | 18 ++---
 demos/custom-fields/pitch/field_pitch.js |  2 +-
 tests/deps.js                            | 11 +--
 tests/mocha/contextmenu_items_test.js    |  6 +-
 tests/mocha/workspace_test.js            |  4 +-
 12 files changed, 174 insertions(+), 60 deletions(-)
 create mode 100644 core/dialog.js

diff --git a/core/blockly.js b/core/blockly.js
index 1f8cfa55a..da9700c44 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -22,6 +22,7 @@ goog.require('Blockly.common');
 goog.require('Blockly.ComponentManager');
 goog.require('Blockly.connectionTypes');
 goog.require('Blockly.constants');
+goog.require('Blockly.dialog');
 goog.require('Blockly.DropDownDiv');
 goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
@@ -255,41 +256,50 @@ Blockly.hideChaff = function(opt_onlyClosePopups) {
  */
 Blockly.getMainWorkspace = Blockly.common.getMainWorkspace;
 
-/**
- * Wrapper to window.alert() that app developers may override to
- * provide alternatives to the modal browser window.
- * @param {string} message The message to display to the user.
- * @param {function()=} opt_callback The callback when the alert is dismissed.
- */
-Blockly.alert = function(message, opt_callback) {
-  alert(message);
-  if (opt_callback) {
-    opt_callback();
+// 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;
   }
-};
+});
 
-/**
- * Wrapper to window.confirm() that app developers may override to
- * provide alternatives to the modal browser window.
- * @param {string} message The message to display to the user.
- * @param {!function(boolean)} callback The callback for handling user response.
- */
-Blockly.confirm = function(message, callback) {
-  callback(confirm(message));
-};
+// 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;
+  }
+});
 
-/**
- * Wrapper to window.prompt() that app developers may override to provide
- * alternatives to the modal browser window. Built-in browser prompts are
- * often used for better text input experience on mobile device. We strongly
- * recommend testing mobile when overriding this.
- * @param {string} message The message to display to the user.
- * @param {string} defaultValue The value to initialize the prompt with.
- * @param {!function(?string)} callback The callback for handling user response.
- */
-Blockly.prompt = function(message, defaultValue, callback) {
-  callback(prompt(message, defaultValue));
-};
+// 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;
+  }
+});
 
 /**
  * Helper function for defining a block from JSON.  The resulting function has
diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js
index e1cb02c59..e98289251 100644
--- a/core/contextmenu_items.js
+++ b/core/contextmenu_items.js
@@ -22,6 +22,7 @@ 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 idGenerator = goog.require('Blockly.utils.idGenerator');
 const inputTypes = goog.require('Blockly.inputTypes');
 const userAgent = goog.require('Blockly.utils.userAgent');
@@ -292,7 +293,7 @@ const registerDeleteAll = function() {
       if (deletableBlocks.length < 2) {
         deleteNext_(deletableBlocks, eventGroup);
       } else {
-        Blockly.confirm(
+        dialog.confirm(
             Msg['DELETE_ALL_BLOCKS'].replace('%1', deletableBlocks.length),
             function(ok) {
               if (ok) {
diff --git a/core/dialog.js b/core/dialog.js
new file mode 100644
index 000000000..7235b6f94
--- /dev/null
+++ b/core/dialog.js
@@ -0,0 +1,98 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Wrapper functions around JS functions for showing
+ * alert/confirmation dialogs.
+ */
+
+'use strict';
+
+goog.module('Blockly.dialog');
+goog.module.declareLegacyNamespace();
+
+let alertImplementation = function(message, opt_callback) {
+  window.alert(message);
+  if (opt_callback) {
+    opt_callback();
+  }
+};
+
+let confirmImplementation = function(message, callback) {
+  callback(window.confirm(message));
+};
+
+let promptImplementation = function(message, defaultValue, callback) {
+  callback(window.prompt(message, defaultValue));
+};
+
+/**
+ * Wrapper to window.alert() that app developers may override via setAlert to
+ * provide alternatives to the modal browser window.
+ * @param {string} message The message to display to the user.
+ * @param {function()=} opt_callback The callback when the alert is dismissed.
+ */
+const alert = function(message, opt_callback) {
+  alertImplementation(message, opt_callback);
+};
+exports.alert = alert;
+
+/**
+ * Sets the function to be run when Blockly.dialog.alert() is called.
+ * @param {!function(string, function()=)} alertFunction The function to be run.
+ * @see Blockly.dialog.alert
+ */
+const setAlert = function(alertFunction) {
+  alertImplementation = alertFunction;
+};
+exports.setAlert = setAlert;
+
+/**
+ * Wrapper to window.confirm() that app developers may override via setConfirm
+ * to provide alternatives to the modal browser window.
+ * @param {string} message The message to display to the user.
+ * @param {!function(boolean)} callback The callback for handling user response.
+ */
+const confirm = function(message, callback) {
+  confirmImplementation(message, callback);
+};
+exports.confirm = confirm;
+
+/**
+ * Sets the function to be run when Blockly.dialog.confirm() is called.
+ * @param {!function(string, !function(boolean))} confirmFunction The function
+ *    to be run.
+ * @see Blockly.dialog.confirm
+ */
+const setConfirm = function(confirmFunction) {
+  confirmImplementation = confirmFunction;
+};
+exports.setConfirm = setConfirm;
+
+/**
+ * Wrapper to window.prompt() that app developers may override via setPrompt to
+ * provide alternatives to the modal browser window. Built-in browser prompts
+ * are often used for better text input experience on mobile device. We strongly
+ * recommend testing mobile when overriding this.
+ * @param {string} message The message to display to the user.
+ * @param {string} defaultValue The value to initialize the prompt with.
+ * @param {!function(?string)} callback The callback for handling user response.
+ */
+const prompt = function(message, defaultValue, callback) {
+  promptImplementation(message, defaultValue, callback);
+};
+exports.prompt = prompt;
+
+/**
+ * Sets the function to be run when Blockly.dialog.prompt() is called.
+ * @param {!function(string, string, !function(?string))} promptFunction The
+ *    function to be run.
+ * @see Blockly.dialog.prompt
+ */
+const setPrompt = function(promptFunction) {
+  promptImplementation = promptFunction;
+};
+exports.setPrompt = setPrompt;
diff --git a/core/field_textinput.js b/core/field_textinput.js
index a682cb2ff..789bc0a96 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -13,7 +13,6 @@
 goog.module('Blockly.FieldTextInput');
 goog.module.declareLegacyNamespace();
 
-const Blockly = goog.require('Blockly');
 /* eslint-disable-next-line no-unused-vars */
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
@@ -27,6 +26,7 @@ const WidgetDiv = goog.require('Blockly.WidgetDiv');
 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');
 const dom = goog.require('Blockly.utils.dom');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const object = goog.require('Blockly.utils.object');
@@ -312,7 +312,7 @@ FieldTextInput.prototype.showEditor_ = function(_opt_e, opt_quietInput) {
  * @private
  */
 FieldTextInput.prototype.showPromptEditor_ = function() {
-  Blockly.prompt(Msg['CHANGE_VALUE_TITLE'], this.getText(), function(text) {
+  dialog.prompt(Msg['CHANGE_VALUE_TITLE'], this.getText(), function(text) {
     this.setValue(this.getValueFromEditorText_(text));
   }.bind(this));
 };
diff --git a/core/variable_map.js b/core/variable_map.js
index d873ae22f..29988150c 100644
--- a/core/variable_map.js
+++ b/core/variable_map.js
@@ -21,6 +21,7 @@ const Names = goog.require('Blockly.Names');
 const VariableModel = goog.require('Blockly.VariableModel');
 /* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
+const dialog = goog.require('Blockly.dialog');
 const idGenerator = goog.require('Blockly.utils.idGenerator');
 const object = goog.require('Blockly.utils.object');
 /** @suppress {extraRequire} */
@@ -233,7 +234,7 @@ VariableMap.prototype.deleteVariableById = function(id) {
         const deleteText = Msg['CANNOT_DELETE_VARIABLE_PROCEDURE']
                                .replace('%1', variableName)
                                .replace('%2', procedureName);
-        Blockly.alert(deleteText);
+        dialog.alert(deleteText);
         return;
       }
     }
@@ -244,7 +245,7 @@ VariableMap.prototype.deleteVariableById = function(id) {
       const confirmText = Msg['DELETE_VARIABLE_CONFIRMATION']
                               .replace('%1', String(uses.length))
                               .replace('%2', variableName);
-      Blockly.confirm(confirmText, function(ok) {
+      dialog.confirm(confirmText, function(ok) {
         if (ok && variable) {
           map.deleteVariableInternal(variable, uses);
         }
diff --git a/core/variables.js b/core/variables.js
index f468163c4..311ea8ea9 100644
--- a/core/variables.js
+++ b/core/variables.js
@@ -23,6 +23,7 @@ const VariableModel = goog.require('Blockly.VariableModel');
 /* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
 const Xml = goog.require('Blockly.Xml');
+const dialog = goog.require('Blockly.dialog');
 const utilsXml = goog.require('Blockly.utils.xml');
 
 
@@ -267,7 +268,7 @@ const createVariableButtonHandler = function(
             msg = Msg['VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE'];
             msg = msg.replace('%1', existing.name).replace('%2', existing.type);
           }
-          Blockly.alert(msg, function() {
+          dialog.alert(msg, function() {
             promptAndCheckWithAlert(text);  // Recurse
           });
         } else {
@@ -313,7 +314,7 @@ const renameVariable = function(workspace, variable, opt_callback) {
           const msg = Msg['VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE']
                           .replace('%1', existing.name)
                           .replace('%2', existing.type);
-          Blockly.alert(msg, function() {
+          dialog.alert(msg, function() {
             promptAndCheckWithAlert(newName);  // Recurse
           });
         } else {
@@ -342,7 +343,7 @@ exports.renameVariable = renameVariable;
  *     variable name, or null if the user picked something illegal.
  */
 const promptName = function(promptText, defaultText, callback) {
-  Blockly.prompt(promptText, defaultText, function(newVar) {
+  dialog.prompt(promptText, defaultText, function(newVar) {
     // Merge runs of whitespace.  Strip leading and trailing whitespace.
     // Beyond this, all names are legal.
     if (newVar) {
diff --git a/demos/code/code.js b/demos/code/code.js
index 2377203a2..b86020649 100644
--- a/demos/code/code.js
+++ b/demos/code/code.js
@@ -375,7 +375,7 @@ Code.checkAllGeneratorFunctionsDefined = function(generator) {
   if (!valid) {
     var msg = 'The generator code for the following blocks not specified for ' +
         generator.name_ + ':\n - ' + missingBlockGenerators.join('\n - ');
-    Blockly.alert(msg);  // Assuming synchronous. No callback.
+    Blockly.dialog.alert(msg);  // Assuming synchronous. No callback.
   }
   return valid;
 };
diff --git a/demos/custom-dialogs/custom-dialog.js b/demos/custom-dialogs/custom-dialog.js
index 0918891f0..0dd45f406 100644
--- a/demos/custom-dialogs/custom-dialog.js
+++ b/demos/custom-dialogs/custom-dialog.js
@@ -13,16 +13,16 @@
  */
 CustomDialog = {};
 
-/** Override Blockly.alert() with custom implementation. */
-Blockly.alert = function(message, callback) {
+/** Override Blockly.dialog.alert() with custom implementation. */
+Blockly.dialog.setAlert(function(message, callback) {
   console.log('Alert: ' + message);
   CustomDialog.show('Alert', message, {
     onCancel: callback
   });
-};
+});
 
-/** Override Blockly.confirm() with custom implementation. */
-Blockly.confirm = function(message, callback) {
+/** Override Blockly.dialog.confirm() with custom implementation. */
+Blockly.dialog.setConfirm(function(message, callback) {
   console.log('Confirm: ' + message);
   CustomDialog.show('Confirm', message, {
     showOkay: true,
@@ -34,10 +34,10 @@ Blockly.confirm = function(message, callback) {
       callback(false);
     }
   });
-};
+});
 
-/** Override Blockly.prompt() with custom implementation. */
-Blockly.prompt = function(message, defaultValue, callback) {
+/** Override Blockly.dialog.prompt() with custom implementation. */
+Blockly.dialog.setPrompt(function(message, defaultValue, callback) {
   console.log('Prompt: ' + message);
   CustomDialog.show('Prompt', message, {
     showInput: true,
@@ -51,7 +51,7 @@ Blockly.prompt = function(message, defaultValue, callback) {
     }
   });
   CustomDialog.inputField.value = defaultValue;
-};
+});
 
 /** Hides any currently visible dialog. */
 CustomDialog.hide = function() {
diff --git a/demos/custom-fields/pitch/field_pitch.js b/demos/custom-fields/pitch/field_pitch.js
index 522461cef..279a964d5 100644
--- a/demos/custom-fields/pitch/field_pitch.js
+++ b/demos/custom-fields/pitch/field_pitch.js
@@ -70,7 +70,7 @@ CustomFields.FieldPitch.prototype.showEditor_ = function() {
 
   var div = Blockly.WidgetDiv.getDiv();
   if (!div.firstChild) {
-    // Mobile interface uses Blockly.prompt.
+    // Mobile interface uses Blockly.dialog.prompt.
     return;
   }
   // Build the DOM.
diff --git a/tests/deps.js b/tests/deps.js
index 33025e20b..864ddfb32 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.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.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 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'});
@@ -28,10 +28,11 @@ goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Bl
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.dialog', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/dialog.js', ['Blockly.dialog'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils.deprecation', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
@@ -74,7 +75,7 @@ goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabe
 goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
@@ -230,9 +231,9 @@ goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'],
 goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.dialog', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.dialog', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/contextmenu_items_test.js b/tests/mocha/contextmenu_items_test.js
index 0d69fa77e..44cd43b0f 100644
--- a/tests/mocha/contextmenu_items_test.js
+++ b/tests/mocha/contextmenu_items_test.js
@@ -255,7 +255,8 @@ suite('Context Menu Items', function() {
 
       test('Deletes all blocks after confirming', function() {
         // Mocks the confirmation dialog and calls the callback with 'true' simulating ok.
-        var confirmStub = sinon.stub(Blockly, 'confirm').callsArgWith(1, true);
+        var confirmStub = sinon.stub(
+          Blockly.dialog, 'confirm').callsArgWith(1, true);
 
         this.workspace.newBlock('text');
         this.workspace.newBlock('text');
@@ -267,7 +268,8 @@ suite('Context Menu Items', function() {
 
       test('Does not delete blocks if not confirmed', function() {
         // Mocks the confirmation dialog and calls the callback with 'false' simulating cancel.
-        var confirmStub = sinon.stub(Blockly, 'confirm').callsArgWith(1, false);
+        var confirmStub = sinon.stub(
+          Blockly.dialog, 'confirm').callsArgWith(1, false);
 
         this.workspace.newBlock('text');
         this.workspace.newBlock('text');
diff --git a/tests/mocha/workspace_test.js b/tests/mocha/workspace_test.js
index 136f2eab2..f75b8eda3 100644
--- a/tests/mocha/workspace_test.js
+++ b/tests/mocha/workspace_test.js
@@ -115,7 +115,7 @@ function testAWorkspace() {
     test('deleteVariableById(id1) multiple usages confirm', function() {
       // Deleting variable with multiple usages triggers confirm dialog.
       var stub =
-          sinon.stub(Blockly, "confirm").callsArgWith(1, true);
+          sinon.stub(Blockly.dialog, "confirm").callsArgWith(1, true);
       this.workspace.deleteVariableById('id1');
 
       sinon.assert.calledOnce(stub);
@@ -128,7 +128,7 @@ function testAWorkspace() {
     test('deleteVariableById(id1) multiple usages cancel', function() {
       // Deleting variable with multiple usages triggers confirm dialog.
       var stub =
-          sinon.stub(Blockly, "confirm").callsArgWith(1, false);
+          sinon.stub(Blockly.dialog, "confirm").callsArgWith(1, false);
       this.workspace.deleteVariableById('id1');
 
       sinon.assert.calledOnce(stub);

From f4430e9e4745e3b62c4e53a685651de7bbc4f675 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 14 Sep 2021 10:02:38 -0700
Subject: [PATCH 740/833] Move bump objects function into a separate module
 (#5453)

* Move bump objects function into a separate module

* Fix types

* Update core/bump_objects.js

Fix missing newline.

Co-authored-by: Christopher Allen <cpcallen+github@gmail.com>

Co-authored-by: Christopher Allen <cpcallen+github@gmail.com>
---
 core/block_dragger.js |  3 +-
 core/bump_objects.js  | 73 +++++++++++++++++++++++++++++++++++++++++++
 core/inject.js        | 62 ++++--------------------------------
 tests/deps.js         |  5 +--
 4 files changed, 84 insertions(+), 59 deletions(-)
 create mode 100644 core/bump_objects.js

diff --git a/core/block_dragger.js b/core/block_dragger.js
index 32a6f4922..5c523cb55 100644
--- a/core/block_dragger.js
+++ b/core/block_dragger.js
@@ -24,6 +24,7 @@ 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');
 const dom = goog.require('Blockly.utils.dom');
 const events = goog.require('Blockly.Events');
@@ -293,7 +294,7 @@ BlockDragger.prototype.endDrag = function(e, currentDragDeltaXY) {
     } else {
       // Blocks dragged directly from a flyout may need to be bumped into
       // bounds.
-      Blockly.bumpObjectIntoBounds_(
+      bumpObjects.bumpIntoBounds(
           this.draggingBlock_.workspace,
           this.workspace_.getMetricsManager().getScrollMetrics(true),
           this.draggingBlock_);
diff --git a/core/bump_objects.js b/core/bump_objects.js
new file mode 100644
index 000000000..efac96bf4
--- /dev/null
+++ b/core/bump_objects.js
@@ -0,0 +1,73 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Utilities for bumping objects back into worksapce bounds.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.module('Blockly.bumpObjects');
+
+/* 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 WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const mathUtils = goog.require('Blockly.utils.math');
+
+
+/**
+ * Bumps the given object that has passed out of bounds.
+ * @param {!WorkspaceSvg} workspace The workspace containing the object.
+ * @param {!MetricsManager.ContainerRegion} scrollMetrics Scroll metrics
+ *    in workspace coordinates.
+ * @param {!IBoundedElement} object The object to bump.
+ * @return {boolean} True if block was bumped.
+ */
+const bumpObjectIntoBounds = function(workspace, scrollMetrics, object) {
+  // Compute new top/left position for object.
+  const objectMetrics = object.getBoundingRectangle();
+  const height = objectMetrics.bottom - objectMetrics.top;
+  const width = objectMetrics.right - objectMetrics.left;
+
+  const topClamp = scrollMetrics.top;
+  const scrollMetricsBottom = scrollMetrics.top + scrollMetrics.height;
+  const bottomClamp = scrollMetricsBottom - height;
+  // If the object is taller than the workspace we want to
+  // top-align the block
+  const newYPosition =
+      mathUtils.clamp(topClamp, objectMetrics.top, bottomClamp);
+  const deltaY = newYPosition - objectMetrics.top;
+
+  // Note: Even in RTL mode the "anchor" of the object is the
+  // top-left corner of the object.
+  let leftClamp = scrollMetrics.left;
+  const scrollMetricsRight = scrollMetrics.left + scrollMetrics.width;
+  let rightClamp = scrollMetricsRight - width;
+  if (workspace.RTL) {
+    // If the object is wider than the workspace and we're in RTL
+    // mode we want to right-align the block, which means setting
+    // the left clamp to match.
+    leftClamp = Math.min(rightClamp, leftClamp);
+  } else {
+    // If the object is wider than the workspace and we're in LTR
+    // mode we want to left-align the block, which means setting
+    // the right clamp to match.
+    rightClamp = Math.max(leftClamp, rightClamp);
+  }
+  const newXPosition =
+      mathUtils.clamp(leftClamp, objectMetrics.left, rightClamp);
+  const deltaX = newXPosition - objectMetrics.left;
+
+  if (deltaX || deltaY) {
+    object.moveBy(deltaX, deltaY);
+    return true;
+  }
+  return false;
+};
+exports.bumpIntoBounds = bumpObjectIntoBounds;
diff --git a/core/inject.js b/core/inject.js
index c2446e602..663c015be 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -14,6 +14,7 @@ goog.provide('Blockly.inject');
 
 goog.require('Blockly.BlockDragSurfaceSvg');
 goog.require('Blockly.browserEvents');
+goog.require('Blockly.bumpObjects');
 goog.require('Blockly.common');
 goog.require('Blockly.Css');
 goog.require('Blockly.DropDownDiv');
@@ -27,7 +28,6 @@ goog.require('Blockly.Tooltip');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.aria');
 goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.math');
 goog.require('Blockly.utils.Svg');
 goog.require('Blockly.utils.userAgent');
 goog.require('Blockly.Workspace');
@@ -239,7 +239,7 @@ Blockly.bumpTopObjectsIntoBounds_ = function(workspace) {
   var scrollMetricsInWsCoords = metricsManager.getScrollMetrics(true);
   var topBlocks = workspace.getTopBoundedElements();
   for (var i = 0, block; (block = topBlocks[i]); i++) {
-    Blockly.bumpObjectIntoBounds_(workspace, scrollMetricsInWsCoords, block);
+    goog.module.get('Blockly.bumpObjects').bumpIntoBounds(workspace, scrollMetricsInWsCoords, block);
   }
 };
 
@@ -268,9 +268,10 @@ Blockly.bumpIntoBoundsHandler_ = function(workspace) {
       var oldGroup = Blockly.Events.getGroup();
       Blockly.Events.setGroup(e.group);
 
-      var wasBumped = Blockly.bumpObjectIntoBounds_(
-          workspace, scrollMetricsInWsCoords,
-          /** @type {!Blockly.IBoundedElement} */ (object));
+      var wasBumped = goog.module.get('Blockly.bumpObjects')
+                          .bumpIntoBounds(
+                              workspace, scrollMetricsInWsCoords,
+                              /** @type {!Blockly.IBoundedElement} */ (object));
 
       if (wasBumped && !e.group) {
         console.warn('Moved object in bounds but there was no' +
@@ -288,57 +289,6 @@ Blockly.bumpIntoBoundsHandler_ = function(workspace) {
   };
 };
 
-/**
- * Bumps the given object that has passed out of bounds.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace containing the object.
- * @param {!Blockly.MetricsManager.ContainerRegion} scrollMetrics Scroll metrics
- *    in workspace coordinates.
- * @param {!Blockly.IBoundedElement} object The object to bump.
- * @return {boolean} True if block was bumped.
- * @package
- */
-Blockly.bumpObjectIntoBounds_ = function(workspace, scrollMetrics, object) {
-  // Compute new top/left position for object.
-  var objectMetrics = object.getBoundingRectangle();
-  var height = objectMetrics.bottom - objectMetrics.top;
-  var width = objectMetrics.right - objectMetrics.left;
-
-  var topClamp = scrollMetrics.top;
-  var scrollMetricsBottom = scrollMetrics.top + scrollMetrics.height;
-  var bottomClamp = scrollMetricsBottom - height;
-  // If the object is taller than the workspace we want to
-  // top-align the block
-  var newYPosition =
-      Blockly.utils.math.clamp(topClamp, objectMetrics.top, bottomClamp);
-  var deltaY = newYPosition - objectMetrics.top;
-
-  // Note: Even in RTL mode the "anchor" of the object is the
-  // top-left corner of the object.
-  var leftClamp = scrollMetrics.left;
-  var scrollMetricsRight = scrollMetrics.left + scrollMetrics.width;
-  var rightClamp = scrollMetricsRight - width;
-  if (workspace.RTL) {
-    // If the object is wider than the workspace and we're in RTL
-    // mode we want to right-align the block, which means setting
-    // the left clamp to match.
-    leftClamp = Math.min(rightClamp, leftClamp);
-  } else {
-    // If the object is wider than the workspace and we're in LTR
-    // mode we want to left-align the block, which means setting
-    // the right clamp to match.
-    rightClamp = Math.max(leftClamp, rightClamp);
-  }
-  var newXPosition =
-      Blockly.utils.math.clamp(leftClamp, objectMetrics.left, rightClamp);
-  var deltaX = newXPosition - objectMetrics.left;
-
-  if (deltaX || deltaY) {
-    object.moveBy(deltaX, deltaY);
-    return true;
-  }
-  return false;
-};
-
 /**
  * Initialize Blockly with various handlers.
  * @param {!Blockly.WorkspaceSvg} mainWorkspace Newly created main workspace.
diff --git a/tests/deps.js b/tests/deps.js
index 864ddfb32..75844ca38 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -10,7 +10,7 @@ goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.Vari
 goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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.common', 'Blockly.registry', 'Blockly.utils.Coordinate', '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.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/blockly_options.js', ['Blockly.BlocklyOptions'], [], {'lang': 'es6', 'module': 'goog'});
@@ -18,6 +18,7 @@ goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6
 goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/bump_objects.js', ['Blockly.bumpObjects'], ['Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
@@ -86,7 +87,7 @@ goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.c
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});

From d202ae0201dbbfed8e52993ef63ef0853a520787 Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Tue, 14 Sep 2021 19:55:31 +0100
Subject: [PATCH 741/833] Don't monkey-patch Blocky.utils.xml.document (#5461)

Use Blockly.utils.xml.setDocument instead.
---
 core/utils/xml.js              | 36 +++++++++++++++++++++++-----------
 scripts/migration/renamings.js | 13 +++++++++---
 scripts/package/node/core.js   | 13 ++++++------
 tests/deps.js                  |  2 +-
 4 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/core/utils/xml.js b/core/utils/xml.js
index d7e8d77cd..34dfdb170 100644
--- a/core/utils/xml.js
+++ b/core/utils/xml.js
@@ -19,6 +19,8 @@
 goog.module('Blockly.utils.xml');
 goog.module.declareLegacyNamespace();
 
+const {globalThis} = goog.require('Blockly.utils.global');
+
 
 /**
  * Namespace for Blockly's XML.
@@ -27,19 +29,31 @@ const NAME_SPACE = 'https://developers.google.com/blockly/xml';
 exports.NAME_SPACE = NAME_SPACE;
 
 /**
- * Get the document object.  This method is overridden in the Node.js build of
- * Blockly. See gulpfile.js, package-blockly-node task.
- *
- * Note that this function is named getDocument so as to not shadow the
- * global of the same name, but (for now) exported as .document to not
- * break existing importers.
- *
+ * The Document object to use.  By default this is just document, but
+ * the Node.js build of Blockly (see scripts/package/node/core.js)
+ * calls setDocument to supply a Document implementation from the
+ * jsdom package instead.
+ * @type {!Document}
+ */
+let xmlDocument = globalThis.document;
+
+/**
+ * Get the document object to use for XML serialization.
  * @return {!Document} The document object.
  */
 const getDocument = function() {
-  return document;
+  return xmlDocument;
 };
-exports.document = getDocument;
+exports.getDocument = getDocument;
+
+/**
+ * Get the document object to use for XML serialization.
+ * @param {!Document} document The document object to use.
+ */
+const setDocument = function(document) {
+  xmlDocument = document;
+};
+exports.setDocument = setDocument;
 
 /**
  * Create DOM element for XML.
@@ -47,7 +61,7 @@ exports.document = getDocument;
  * @return {!Element} New DOM element.
  */
 const createElement = function(tagName) {
-  return exports.document().createElementNS(NAME_SPACE, tagName);
+  return xmlDocument.createElementNS(NAME_SPACE, tagName);
 };
 exports.createElement = createElement;
 
@@ -57,7 +71,7 @@ exports.createElement = createElement;
  * @return {!Text} New DOM text node.
  */
 const createTextNode = function(text) {
-  return exports.document().createTextNode(text);
+  return xmlDocument.createTextNode(text);
 };
 exports.createTextNode = createTextNode;
 
diff --git a/scripts/migration/renamings.js b/scripts/migration/renamings.js
index 15c0a07f7..087964eae 100644
--- a/scripts/migration/renamings.js
+++ b/scripts/migration/renamings.js
@@ -32,7 +32,7 @@ const renamings = {
           export: 'conditionalBind',
         },
       },
-    }
+    },
   },
   '6.20210701.0': {
     'Blockly': {
@@ -70,14 +70,21 @@ const renamings = {
     'Blockly.utils': {
       exports: {
         genUid: {module: 'Blockly.utils.idGenerator'},
-      }
+      },
     },
     'Blockly.utils.global': {
       export: 'globalThis',  // Previous default export now named.
     },
     'Blockly.utils.IdGenerator': {
       module: 'Blockly.utils.idGenerator',
-    }
+    },
+    'Blockly.utils.xml': {
+      exports: {
+        // document was a function before, too - not a static property
+        // or get accessor.
+        document: {export: 'getDocument'},
+      },
+    },
   },
 };
 
diff --git a/scripts/package/node/core.js b/scripts/package/node/core.js
index 21c2ac812..35e063b91 100644
--- a/scripts/package/node/core.js
+++ b/scripts/package/node/core.js
@@ -24,11 +24,10 @@ Blockly.setLocale = function (locale) {
 // XMLSerializer.
 const globalThis = Blockly.utils.global.globalThis;
 if (typeof globalThis.document !== 'object') {
-  globalThis.DOMParser = require('jsdom/lib/jsdom/living').DOMParser;
-  globalThis.XMLSerializer = require('jsdom/lib/jsdom/living').XMLSerializer;
-  var doc = Blockly.utils.xml.textToDomDocument(
-    '<xml xmlns="https://developers.google.com/blockly/xml"></xml>');
-  Blockly.utils.xml.document = function() {
-    return doc;
-  };
+  const jsdom = require('jsdom/lib/jsdom/living');
+  globalThis.DOMParser = jsdom.DOMParser;
+  globalThis.XMLSerializer = jsdom.XMLSerializer;
+  const xmlDocument = Blockly.utils.xml.textToDomDocument(
+    `<xml xmlns="${Blockly.utils.xml.NAME_SPACE}"></xml>`);
+  Blockly.utils.xml.setDocument(xmlDocument);
 }
diff --git a/tests/deps.js b/tests/deps.js
index 75844ca38..dd99899f3 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -231,7 +231,7 @@ goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], [], {'lang'
 goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.dialog', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.dialog', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});

From 2ba51d4d75029db1921371465408330a7af6a271 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Tue, 14 Sep 2021 14:13:24 -0700
Subject: [PATCH 742/833] Migrate Blockly.hueToHex to
 Blockly.utils.colour.hueToHex (#5462)

* Move hueToHex to core/utils/colour.js

* Mark Blockly.hueToHex as deprecated and pass calls through to Blockly.utils.colour.hueToHex

* Migrate core to use Blockly.utils.colour.hueToHex

* Migrate demos to use Blockly.utils.colour.hueToHex
---
 core/blockly.js                               | 19 +++++++++----------
 core/toolbox/category.js                      |  2 +-
 core/utils/colour.js                          | 13 +++++++++++++
 .../workspacefactory/wfactory_controller.js   |  3 ++-
 .../workspacefactory/wfactory_init.js         |  2 +-
 tests/deps.js                                 |  2 +-
 6 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index da9700c44..2cf685de4 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -354,16 +354,15 @@ Blockly.isNumber = function(str) {
   return /^\s*-?\d+(\.\d+)?\s*$/.test(str);
 };
 
-/**
- * Convert a hue (HSV model) into an RGB hex triplet.
- * @param {number} hue Hue on a colour wheel (0-360).
- * @return {string} RGB code, e.g. '#5ba65b'.
- */
-Blockly.hueToHex = function(hue) {
-  return Blockly.utils.colour.hsvToHex(
-      hue, Blockly.internalConstants.HSV_SATURATION,
-      Blockly.internalConstants.HSV_VALUE * 255);
-};
+// 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,
diff --git a/core/toolbox/category.js b/core/toolbox/category.js
index ecb79d911..88bf68847 100644
--- a/core/toolbox/category.js
+++ b/core/toolbox/category.js
@@ -428,7 +428,7 @@ ToolboxCategory.prototype.parseColour_ = function(colourValue) {
   } else {
     const hue = Number(colour);
     if (!isNaN(hue)) {
-      return Blockly.hueToHex(hue);
+      return colourUtils.hueToHex(hue);
     } else {
       const hex = colourUtils.parse(colour);
       if (hex) {
diff --git a/core/utils/colour.js b/core/utils/colour.js
index 29ba0187c..20f437cc7 100644
--- a/core/utils/colour.js
+++ b/core/utils/colour.js
@@ -19,6 +19,8 @@
 goog.module('Blockly.utils.colour');
 goog.module.declareLegacyNamespace();
 
+const internalConstants = goog.require('Blockly.internalConstants');
+
 
 /**
  * Parses a colour from a string.
@@ -212,3 +214,14 @@ const names = {
   'yellow': '#ffff00'
 };
 exports.names = names;
+
+/**
+ * Convert a hue (HSV model) into an RGB hex triplet.
+ * @param {number} hue Hue on a colour wheel (0-360).
+ * @return {string} RGB code, e.g. '#5ba65b'.
+ */
+const hueToHex = function(hue) {
+  return hsvToHex(
+      hue, internalConstants.HSV_SATURATION, internalConstants.HSV_VALUE * 255);
+};
+exports.hueToHex = hueToHex;
diff --git a/demos/blockfactory/workspacefactory/wfactory_controller.js b/demos/blockfactory/workspacefactory/wfactory_controller.js
index 02f9c8cda..a52ab93d3 100644
--- a/demos/blockfactory/workspacefactory/wfactory_controller.js
+++ b/demos/blockfactory/workspacefactory/wfactory_controller.js
@@ -590,7 +590,8 @@ WorkspaceFactoryController.prototype.loadCategoryByName = function(name) {
   }
   if (!standardCategory.colour && standardCategory.hue !== undefined) {
     // Calculate the hex colour based on the hue.
-    standardCategory.colour = Blockly.hueToHex(standardCategory.hue);
+    standardCategory.colour = Blockly.utils.colour.hueToHex(
+      standardCategory.hue);
   }
   // Transfers current flyout blocks to a category if it's the first category
   // created.
diff --git a/demos/blockfactory/workspacefactory/wfactory_init.js b/demos/blockfactory/workspacefactory/wfactory_init.js
index cc1839a00..b6b19b1d9 100644
--- a/demos/blockfactory/workspacefactory/wfactory_init.js
+++ b/demos/blockfactory/workspacefactory/wfactory_init.js
@@ -52,7 +52,7 @@ WorkspaceFactoryInit.initColourPicker_ = function(controller) {
   // Convert hue numbers to RRGGBB strings.
   for (var i = 0; i < colours.length; i++) {
     if (colours[i] !== '') {
-      colours[i] = Blockly.hueToHex(colours[i]).substring(1);
+      colours[i] = Blockly.utils.colour.hueToHex(colours[i]).substring(1);
     }
   }
   // Convert to 2D array.
diff --git a/tests/deps.js b/tests/deps.js
index dd99899f3..5d66d0cb3 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -213,7 +213,7 @@ goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Bl
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], ['Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});

From 9b8cd7ce5bb5c7197c4c18e8e67011b5ff424f12 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Wed, 15 Sep 2021 08:15:25 -0700
Subject: [PATCH 743/833] Migrate core/inject.js to goog_module syntax (#5456)

* Move bump objects function into a separate module

* Fix types

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

* Migrate core/inject.js to goog.module and move more functions to bump_objects.js

* Migrate core/inject.js named requires

* clang-format core/inject.js

* Rename private functions
---
 core/bump_objects.js |  98 +++++++++++
 core/inject.js       | 375 ++++++++++++++++---------------------------
 tests/deps.js        |   4 +-
 3 files changed, 242 insertions(+), 235 deletions(-)

diff --git a/core/bump_objects.js b/core/bump_objects.js
index efac96bf4..4c53356dc 100644
--- a/core/bump_objects.js
+++ b/core/bump_objects.js
@@ -12,11 +12,17 @@
 
 goog.module('Blockly.bumpObjects');
 
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const Events = goog.require('Blockly.Events');
 /* 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 WorkspaceCommentSvg = goog.requireType('Blockly.WorkspaceCommentSvg');
+/* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const mathUtils = goog.require('Blockly.utils.math');
 
@@ -71,3 +77,95 @@ const bumpObjectIntoBounds = function(workspace, scrollMetrics, object) {
   return false;
 };
 exports.bumpIntoBounds = bumpObjectIntoBounds;
+
+/**
+ * Creates a handler for bumping objects when they cross fixed bounds.
+ * @param {!WorkspaceSvg} workspace The workspace to handle.
+ * @return {function(Events.Abstract)} The event handler.
+ */
+const bumpIntoBoundsHandler = function(workspace) {
+  return function(e) {
+    const metricsManager = workspace.getMetricsManager();
+    if (!metricsManager.hasFixedEdges() || workspace.isDragging()) {
+      return;
+    }
+
+    if (Events.BUMP_EVENTS.indexOf(e.type) !== -1) {
+      const scrollMetricsInWsCoords = metricsManager.getScrollMetrics(true);
+
+      // Triggered by move/create event
+      const object = extractObjectFromEvent(workspace, e);
+      if (!object) {
+        return;
+      }
+      // Handle undo.
+      const oldGroup = Events.getGroup();
+      Events.setGroup(e.group);
+
+      const wasBumped = bumpObjectIntoBounds(
+          workspace, scrollMetricsInWsCoords,
+          /** @type {!IBoundedElement} */ (object));
+
+      if (wasBumped && !e.group) {
+        console.warn(
+            'Moved object in bounds but there was no' +
+            ' event group. This may break undo.');
+      }
+      if (oldGroup !== null) {
+        Events.setGroup(oldGroup);
+      }
+    } else if (e.type === Events.VIEWPORT_CHANGE) {
+      const viewportEvent = /** @type {!Events.ViewportChange} */ (e);
+      if (viewportEvent.scale > viewportEvent.oldScale) {
+        bumpTopObjectsIntoBounds(workspace);
+      }
+    }
+  };
+};
+exports.bumpIntoBoundsHandler = bumpIntoBoundsHandler;
+
+/**
+ * Extracts the object from the given event.
+ * @param {!WorkspaceSvg} workspace The workspace the event originated
+ *    from.
+ * @param {!Events.BumpEvent} e An event containing an object.
+ * @return {?BlockSvg|?WorkspaceCommentSvg} The extracted
+ *    object.
+ */
+const extractObjectFromEvent = function(workspace, e) {
+  let object = null;
+  switch (e.type) {
+    case Events.BLOCK_CREATE:
+    case Events.BLOCK_MOVE:
+      object = workspace.getBlockById(e.blockId);
+      if (object) {
+        object = object.getRootBlock();
+      }
+      break;
+    case Events.COMMENT_CREATE:
+    case Events.COMMENT_MOVE:
+      object = (
+          /** @type {?WorkspaceCommentSvg} */
+          (workspace.getCommentById(e.commentId)));
+      break;
+  }
+  return object;
+};
+
+/**
+ * Bumps the top objects in the given workspace into bounds.
+ * @param {!WorkspaceSvg} workspace The workspace.
+ */
+const bumpTopObjectsIntoBounds = function(workspace) {
+  const metricsManager = workspace.getMetricsManager();
+  if (!metricsManager.hasFixedEdges() || workspace.isDragging()) {
+    return;
+  }
+
+  const scrollMetricsInWsCoords = metricsManager.getScrollMetrics(true);
+  const topBlocks = workspace.getTopBoundedElements();
+  for (let i = 0, block; (block = topBlocks[i]); i++) {
+    bumpObjectIntoBounds(workspace, scrollMetricsInWsCoords, block);
+  }
+};
+exports.bumpTopObjectsIntoBounds = bumpTopObjectsIntoBounds;
diff --git a/core/inject.js b/core/inject.js
index 663c015be..3b807e490 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -10,81 +10,79 @@
  */
 'use strict';
 
-goog.provide('Blockly.inject');
+goog.module('Blockly.inject');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.BlockDragSurfaceSvg');
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.bumpObjects');
-goog.require('Blockly.common');
-goog.require('Blockly.Css');
-goog.require('Blockly.DropDownDiv');
-goog.require('Blockly.Events');
-goog.require('Blockly.Grid');
-goog.require('Blockly.Msg');
-goog.require('Blockly.Options');
-goog.require('Blockly.ScrollbarPair');
-goog.require('Blockly.Touch');
-goog.require('Blockly.Tooltip');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.aria');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.userAgent');
-goog.require('Blockly.Workspace');
-goog.require('Blockly.WorkspaceDragSurfaceSvg');
-goog.require('Blockly.WorkspaceSvg');
-goog.require('Blockly.WidgetDiv');
-
-goog.requireType('Blockly.BlocklyOptions');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.WorkspaceCommentSvg');
+const BlockDragSurfaceSvg = goog.require('Blockly.BlockDragSurfaceSvg');
+/* 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 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 WidgetDiv = goog.require('Blockly.WidgetDiv');
+const aria = goog.require('Blockly.utils.aria');
+const browserEvents = goog.require('Blockly.browserEvents');
+const bumpObjects = goog.require('Blockly.bumpObjects');
+const common = goog.require('Blockly.common');
+const dom = goog.require('Blockly.utils.dom');
+const userAgent = goog.require('Blockly.utils.userAgent');
+const utils = goog.require('Blockly.utils');
 
 
 /**
  * Inject a Blockly editor into the specified container element (usually a div).
  * @param {Element|string} container Containing element, or its ID,
  *     or a CSS selector.
- * @param {Blockly.BlocklyOptions=} opt_options Optional dictionary of options.
- * @return {!Blockly.WorkspaceSvg} Newly created main workspace.
+ * @param {BlocklyOptions=} opt_options Optional dictionary of options.
+ * @return {!WorkspaceSvg} Newly created main workspace.
  */
-Blockly.inject = function(container, opt_options) {
+const inject = function(container, opt_options) {
   if (typeof container == 'string') {
-    container = document.getElementById(container) ||
-        document.querySelector(container);
+    container =
+        document.getElementById(container) || document.querySelector(container);
   }
   // Verify that the container is in document.
-  if (!container || !Blockly.utils.dom.containsNode(document, container)) {
+  if (!container || !dom.containsNode(document, container)) {
     throw Error('Error: container is not in current document.');
   }
-  var options = new Blockly.Options(opt_options ||
-    (/** @type {!Blockly.BlocklyOptions} */ ({})));
-  var subContainer = document.createElement('div');
+  const options =
+      new Options(opt_options || (/** @type {!BlocklyOptions} */ ({})));
+  const subContainer = document.createElement('div');
   subContainer.className = 'injectionDiv';
   subContainer.tabIndex = 0;
-  Blockly.utils.aria.setState(subContainer,
-      Blockly.utils.aria.State.LABEL, Blockly.Msg['WORKSPACE_ARIA_LABEL']);
+  aria.setState(subContainer, aria.State.LABEL, Msg['WORKSPACE_ARIA_LABEL']);
 
   container.appendChild(subContainer);
-  var svg = Blockly.createDom_(subContainer, options);
+  const svg = createDom(subContainer, options);
 
   // Create surfaces for dragging things. These are optimizations
   // so that the browser does not repaint during the drag.
-  var blockDragSurface = new Blockly.BlockDragSurfaceSvg(subContainer);
+  const blockDragSurface = new BlockDragSurfaceSvg(subContainer);
 
-  var workspaceDragSurface = new Blockly.WorkspaceDragSurfaceSvg(subContainer);
+  const workspaceDragSurface = new WorkspaceDragSurfaceSvg(subContainer);
 
-  var workspace = Blockly.createMainWorkspace_(svg, options, blockDragSurface,
-      workspaceDragSurface);
+  const workspace =
+      createMainWorkspace(svg, options, blockDragSurface, workspaceDragSurface);
 
-  Blockly.init_(workspace);
+  init(workspace);
 
-  // Keep focus on the first workspace so entering keyboard navigation looks correct.
-  Blockly.common.setMainWorkspace(workspace);
+  // Keep focus on the first workspace so entering keyboard navigation looks
+  // correct.
+  common.setMainWorkspace(workspace);
 
   Blockly.svgResize(workspace);
 
   subContainer.addEventListener('focusin', function() {
-    Blockly.common.setMainWorkspace(workspace);
+    common.setMainWorkspace(workspace);
   });
 
   return workspace;
@@ -93,18 +91,17 @@ Blockly.inject = function(container, opt_options) {
 /**
  * Create the SVG image.
  * @param {!Element} container Containing element.
- * @param {!Blockly.Options} options Dictionary of options.
+ * @param {!Options} options Dictionary of options.
  * @return {!Element} Newly created SVG image.
- * @private
  */
-Blockly.createDom_ = function(container, options) {
+const createDom = function(container, options) {
   // Sadly browsers (Chrome vs Firefox) are currently inconsistent in laying
   // out content in RTL mode.  Therefore Blockly forces the use of LTR,
   // then manually positions content in RTL as needed.
   container.setAttribute('dir', 'LTR');
 
   // Load CSS.
-  Blockly.Css.inject(options.hasCss, options.pathToMedia);
+  Css.inject(options.hasCss, options.pathToMedia);
 
   // Build the SVG DOM.
   /*
@@ -117,61 +114,61 @@ Blockly.createDom_ = function(container, options) {
     ...
   </svg>
   */
-  var svg = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.SVG, {
-        'xmlns': Blockly.utils.dom.SVG_NS,
-        'xmlns:html': Blockly.utils.dom.HTML_NS,
-        'xmlns:xlink': Blockly.utils.dom.XLINK_NS,
+  const svg = dom.createSvgElement(
+      Svg.SVG, {
+        'xmlns': dom.SVG_NS,
+        'xmlns:html': dom.HTML_NS,
+        'xmlns:xlink': dom.XLINK_NS,
         'version': '1.1',
         'class': 'blocklySvg',
         'tabindex': '0'
-      }, container);
+      },
+      container);
   /*
   <defs>
     ... filters go here ...
   </defs>
   */
-  var defs = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.DEFS, {}, svg);
+  const defs = dom.createSvgElement(Svg.DEFS, {}, svg);
   // Each filter/pattern needs a unique ID for the case of multiple Blockly
   // instances on a page.  Browser behaviour becomes undefined otherwise.
   // https://neil.fraser.name/news/2015/11/01/
-  var rnd = String(Math.random()).substring(2);
+  const rnd = String(Math.random()).substring(2);
 
-  options.gridPattern = Blockly.Grid.createDom(rnd, options.gridOptions, defs);
+  options.gridPattern = Grid.createDom(rnd, options.gridOptions, defs);
   return svg;
 };
 
 /**
  * Create a main workspace and add it to the SVG.
  * @param {!Element} svg SVG element with pattern defined.
- * @param {!Blockly.Options} options Dictionary of options.
- * @param {!Blockly.BlockDragSurfaceSvg} blockDragSurface Drag surface SVG
+ * @param {!Options} options Dictionary of options.
+ * @param {!BlockDragSurfaceSvg} blockDragSurface Drag surface SVG
  *     for the blocks.
- * @param {!Blockly.WorkspaceDragSurfaceSvg} workspaceDragSurface Drag surface
+ * @param {!WorkspaceDragSurfaceSvg} workspaceDragSurface Drag surface
  *     SVG for the workspace.
- * @return {!Blockly.WorkspaceSvg} Newly created main workspace.
- * @private
+ * @return {!WorkspaceSvg} Newly created main workspace.
  */
-Blockly.createMainWorkspace_ = function(svg, options, blockDragSurface,
-    workspaceDragSurface) {
+const createMainWorkspace = function(
+    svg, options, blockDragSurface, workspaceDragSurface) {
   options.parentWorkspace = null;
-  var mainWorkspace =
-      new Blockly.WorkspaceSvg(options, blockDragSurface, workspaceDragSurface);
-  var wsOptions = mainWorkspace.options;
+  const mainWorkspace =
+      new WorkspaceSvg(options, blockDragSurface, workspaceDragSurface);
+  const wsOptions = mainWorkspace.options;
   mainWorkspace.scale = wsOptions.zoomOptions.startScale;
   svg.appendChild(mainWorkspace.createDom('blocklyMainBackground'));
 
   // Set the theme name and renderer name onto the injection div.
-  Blockly.utils.dom.addClass(mainWorkspace.getInjectionDiv(),
+  dom.addClass(
+      mainWorkspace.getInjectionDiv(),
       mainWorkspace.getRenderer().getClassName());
-  Blockly.utils.dom.addClass(mainWorkspace.getInjectionDiv(),
-      mainWorkspace.getTheme().getClassName());
+  dom.addClass(
+      mainWorkspace.getInjectionDiv(), mainWorkspace.getTheme().getClassName());
 
   if (!wsOptions.hasCategories && wsOptions.languageTree) {
     // Add flyout as an <svg> that is a sibling of the workspace SVG.
-    var flyout = mainWorkspace.addFlyout(Blockly.utils.Svg.SVG);
-    Blockly.utils.dom.insertAfter(flyout, svg);
+    const flyout = mainWorkspace.addFlyout(Svg.SVG);
+    dom.insertAfter(flyout, svg);
   }
   if (wsOptions.hasTrashcan) {
     mainWorkspace.addTrashcan();
@@ -180,146 +177,54 @@ Blockly.createMainWorkspace_ = function(svg, options, blockDragSurface,
     mainWorkspace.addZoomControls();
   }
   // Register the workspace svg as a UI component.
-  mainWorkspace.getThemeManager().subscribe(svg, 'workspaceBackgroundColour',
-      'background-color');
+  mainWorkspace.getThemeManager().subscribe(
+      svg, 'workspaceBackgroundColour', 'background-color');
 
   // A null translation will also apply the correct initial scale.
   mainWorkspace.translate(0, 0);
 
-  mainWorkspace.addChangeListener(Blockly.bumpIntoBoundsHandler_(mainWorkspace));
+  mainWorkspace.addChangeListener(
+      bumpObjects.bumpIntoBoundsHandler(mainWorkspace));
 
   // The SVG is now fully assembled.
   Blockly.svgResize(mainWorkspace);
-  Blockly.WidgetDiv.createDom();
-  Blockly.DropDownDiv.createDom();
-  Blockly.Tooltip.createDom();
+  WidgetDiv.createDom();
+  DropDownDiv.createDom();
+  Tooltip.createDom();
   return mainWorkspace;
 };
 
-/**
- * Extracts the object from the given event.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace the event originated
- *    from.
- * @param {!Blockly.Events.BumpEvent} e An event containing an object.
- * @return {?Blockly.BlockSvg|?Blockly.WorkspaceCommentSvg} The extracted
- *    object.
- * @private
- */
-Blockly.extractObjectFromEvent_ = function(workspace, e) {
-  var object = null;
-  switch (e.type) {
-    case Blockly.Events.BLOCK_CREATE:
-    case Blockly.Events.BLOCK_MOVE:
-      object = workspace.getBlockById(e.blockId);
-      if (object) {
-        object = object.getRootBlock();
-      }
-      break;
-    case Blockly.Events.COMMENT_CREATE:
-    case Blockly.Events.COMMENT_MOVE:
-      object = (
-          /** @type {?Blockly.WorkspaceCommentSvg} */
-          (workspace.getCommentById(e.commentId)));
-      break;
-  }
-  return object;
-};
-
-/**
- * Bumps the top objects in the given workspace into bounds.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace.
- * @private
- */
-Blockly.bumpTopObjectsIntoBounds_ = function(workspace) {
-  var metricsManager = workspace.getMetricsManager();
-  if (!metricsManager.hasFixedEdges() || workspace.isDragging()) {
-    return;
-  }
-
-  var scrollMetricsInWsCoords = metricsManager.getScrollMetrics(true);
-  var topBlocks = workspace.getTopBoundedElements();
-  for (var i = 0, block; (block = topBlocks[i]); i++) {
-    goog.module.get('Blockly.bumpObjects').bumpIntoBounds(workspace, scrollMetricsInWsCoords, block);
-  }
-};
-
-/**
- * Creates a handler for bumping objects when they cross fixed bounds.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace to handle.
- * @return {function(Blockly.Events.Abstract)} The event handler.
- * @private
- */
-Blockly.bumpIntoBoundsHandler_ = function(workspace) {
-  return function(e) {
-    var metricsManager = workspace.getMetricsManager();
-    if (!metricsManager.hasFixedEdges() || workspace.isDragging()) {
-      return;
-    }
-
-    if (Blockly.Events.BUMP_EVENTS.indexOf(e.type) !== -1) {
-      var scrollMetricsInWsCoords = metricsManager.getScrollMetrics(true);
-
-      // Triggered by move/create event
-      var object = Blockly.extractObjectFromEvent_(workspace, e);
-      if (!object) {
-        return;
-      }
-      // Handle undo.
-      var oldGroup = Blockly.Events.getGroup();
-      Blockly.Events.setGroup(e.group);
-
-      var wasBumped = goog.module.get('Blockly.bumpObjects')
-                          .bumpIntoBounds(
-                              workspace, scrollMetricsInWsCoords,
-                              /** @type {!Blockly.IBoundedElement} */ (object));
-
-      if (wasBumped && !e.group) {
-        console.warn('Moved object in bounds but there was no' +
-            ' event group. This may break undo.');
-      }
-      if (oldGroup !== null) {
-        Blockly.Events.setGroup(oldGroup);
-      }
-    } else if (e.type === Blockly.Events.VIEWPORT_CHANGE) {
-      var viewportEvent = /** @type {!Blockly.Events.ViewportChange} */ (e);
-      if (viewportEvent.scale > viewportEvent.oldScale) {
-        Blockly.bumpTopObjectsIntoBounds_(workspace);
-      }
-    }
-  };
-};
-
 /**
  * Initialize Blockly with various handlers.
- * @param {!Blockly.WorkspaceSvg} mainWorkspace Newly created main workspace.
- * @private
+ * @param {!WorkspaceSvg} mainWorkspace Newly created main workspace.
  */
-Blockly.init_ = function(mainWorkspace) {
-  var options = mainWorkspace.options;
-  var svg = mainWorkspace.getParentSvg();
+const init = function(mainWorkspace) {
+  const options = mainWorkspace.options;
+  const svg = mainWorkspace.getParentSvg();
 
   // Suppress the browser's context menu.
-  Blockly.browserEvents.conditionalBind(
+  browserEvents.conditionalBind(
       /** @type {!Element} */ (svg.parentNode), 'contextmenu', null,
       function(e) {
-        if (!Blockly.utils.isTargetInput(e)) {
+        if (!utils.isTargetInput(e)) {
           e.preventDefault();
         }
       });
 
-  var workspaceResizeHandler =
-      Blockly.browserEvents.conditionalBind(window, 'resize', null, function() {
+  const workspaceResizeHandler =
+      browserEvents.conditionalBind(window, 'resize', null, function() {
         Blockly.hideChaff(true);
         Blockly.svgResize(mainWorkspace);
-        Blockly.bumpTopObjectsIntoBounds_(mainWorkspace);
+        goog.module.get('Blockly.bumpObjects')
+            .bumpTopObjectsIntoBounds(mainWorkspace);
       });
   mainWorkspace.setResizeHandlerWrapper(workspaceResizeHandler);
 
-  Blockly.inject.bindDocumentEvents_();
+  bindDocumentEvents();
 
   if (options.languageTree) {
-    var toolbox = mainWorkspace.getToolbox();
-    var flyout = mainWorkspace.getFlyout(true);
+    const toolbox = mainWorkspace.getToolbox();
+    const flyout = mainWorkspace.getFlyout(true);
     if (toolbox) {
       toolbox.init();
     } else if (flyout) {
@@ -340,14 +245,13 @@ Blockly.init_ = function(mainWorkspace) {
   }
 
   if (options.moveOptions && options.moveOptions.scrollbars) {
-    var horizontalScroll = options.moveOptions.scrollbars === true ||
+    const horizontalScroll = options.moveOptions.scrollbars === true ||
         !!options.moveOptions.scrollbars.horizontal;
-    var verticalScroll = options.moveOptions.scrollbars === true ||
+    const verticalScroll = options.moveOptions.scrollbars === true ||
         !!options.moveOptions.scrollbars.vertical;
-    mainWorkspace.scrollbar =
-        new Blockly.ScrollbarPair(
-            mainWorkspace, horizontalScroll, verticalScroll,
-            'blocklyMainWorkspaceScrollbar');
+    mainWorkspace.scrollbar = new ScrollbarPair(
+        mainWorkspace, horizontalScroll, verticalScroll,
+        'blocklyMainWorkspaceScrollbar');
     mainWorkspace.scrollbar.resize();
   } else {
     mainWorkspace.setMetrics({x: 0.5, y: 0.5});
@@ -355,10 +259,17 @@ Blockly.init_ = function(mainWorkspace) {
 
   // Load the sounds.
   if (options.hasSounds) {
-    Blockly.inject.loadSounds_(options.pathToMedia, mainWorkspace);
+    loadSounds(options.pathToMedia, mainWorkspace);
   }
 };
 
+/**
+ * Whether event handlers have been bound. Document event handlers will only
+ * be bound once, even if Blockly is destroyed and reinjected.
+ * @type {boolean}
+ */
+let documentEventsBound = false;
+
 /**
  * Bind document events, but only once.  Destroying and reinjecting Blockly
  * should not bind again.
@@ -368,82 +279,80 @@ Blockly.init_ = function(mainWorkspace) {
  * out of bounds and released will know that it has been released.
  * Also, 'keydown' has to be on the whole document since the browser doesn't
  * understand a concept of focus on the SVG image.
- * @private
  */
-Blockly.inject.bindDocumentEvents_ = function() {
-  if (!Blockly.documentEventsBound_) {
-    Blockly.browserEvents.conditionalBind(document, 'scroll', null, function() {
-      var workspaces = Blockly.Workspace.getAll();
-      for (var i = 0, workspace; (workspace = workspaces[i]); i++) {
+const bindDocumentEvents = function() {
+  if (!documentEventsBound) {
+    browserEvents.conditionalBind(document, 'scroll', null, function() {
+      const workspaces = Workspace.getAll();
+      for (let i = 0, workspace; (workspace = workspaces[i]); i++) {
         if (workspace.updateInverseScreenCTM) {
           workspace.updateInverseScreenCTM();
         }
       }
     });
-    Blockly.browserEvents.conditionalBind(
-        document, 'keydown', null, Blockly.onKeyDown);
+    browserEvents.conditionalBind(document, 'keydown', null, Blockly.onKeyDown);
     // longStop needs to run to stop the context menu from showing up.  It
     // should run regardless of what other touch event handlers have run.
-    Blockly.browserEvents.bind(document, 'touchend', null, Blockly.Touch.longStop);
-    Blockly.browserEvents.bind(
-        document, 'touchcancel', null, Blockly.Touch.longStop);
+    browserEvents.bind(document, 'touchend', null, Touch.longStop);
+    browserEvents.bind(document, 'touchcancel', null, Touch.longStop);
     // Some iPad versions don't fire resize after portrait to landscape change.
-    if (Blockly.utils.userAgent.IPAD) {
-      Blockly.browserEvents.conditionalBind(
+    if (userAgent.IPAD) {
+      browserEvents.conditionalBind(
           window, 'orientationchange', document, function() {
             // TODO (#397): Fix for multiple Blockly workspaces.
-            Blockly.svgResize(/** @type {!Blockly.WorkspaceSvg} */
-                (Blockly.common.getMainWorkspace()));
+            Blockly.svgResize(/** @type {!WorkspaceSvg} */
+                              (common.getMainWorkspace()));
           });
     }
   }
-  Blockly.documentEventsBound_ = true;
+  documentEventsBound = true;
 };
 
 /**
  * Load sounds for the given workspace.
  * @param {string} pathToMedia The path to the media directory.
- * @param {!Blockly.Workspace} workspace The workspace to load sounds for.
- * @private
+ * @param {!Workspace} workspace The workspace to load sounds for.
  */
-Blockly.inject.loadSounds_ = function(pathToMedia, workspace) {
-  var audioMgr = workspace.getAudioManager();
+const loadSounds = function(pathToMedia, workspace) {
+  const audioMgr = workspace.getAudioManager();
   audioMgr.load(
       [
-        pathToMedia + 'click.mp3',
-        pathToMedia + 'click.wav',
+        pathToMedia + 'click.mp3', pathToMedia + 'click.wav',
         pathToMedia + 'click.ogg'
-      ], 'click');
+      ],
+      'click');
   audioMgr.load(
       [
-        pathToMedia + 'disconnect.wav',
-        pathToMedia + 'disconnect.mp3',
+        pathToMedia + 'disconnect.wav', pathToMedia + 'disconnect.mp3',
         pathToMedia + 'disconnect.ogg'
-      ], 'disconnect');
+      ],
+      'disconnect');
   audioMgr.load(
       [
-        pathToMedia + 'delete.mp3',
-        pathToMedia + 'delete.ogg',
+        pathToMedia + 'delete.mp3', pathToMedia + 'delete.ogg',
         pathToMedia + 'delete.wav'
-      ], 'delete');
+      ],
+      'delete');
 
   // Bind temporary hooks that preload the sounds.
-  var soundBinds = [];
-  var unbindSounds = function() {
+  const soundBinds = [];
+  const unbindSounds = function() {
     while (soundBinds.length) {
-      Blockly.browserEvents.unbind(soundBinds.pop());
+      browserEvents.unbind(soundBinds.pop());
     }
     audioMgr.preload();
   };
 
-  // These are bound on mouse/touch events with Blockly.bindEventWithChecks_, so
-  // they restrict the touch identifier that will be recognized.  But this is
-  // really something that happens on a click, not a drag, so that's not
-  // necessary.
+  // These are bound on mouse/touch events with
+  // Blockly.browserEvents.conditionalBind, so they restrict the touch
+  // identifier that will be recognized.  But this is really something that
+  // happens on a click, not a drag, so that's not necessary.
 
   // Android ignores any sound not loaded as a result of a user action.
-  soundBinds.push(Blockly.browserEvents.conditionalBind(
+  soundBinds.push(browserEvents.conditionalBind(
       document, 'mousemove', null, unbindSounds, true));
-  soundBinds.push(Blockly.browserEvents.conditionalBind(
+  soundBinds.push(browserEvents.conditionalBind(
       document, 'touchstart', null, unbindSounds, true));
 };
+
+exports = inject;
diff --git a/tests/deps.js b/tests/deps.js
index 5d66d0cb3..0366481cc 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -18,7 +18,7 @@ goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6
 goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/bump_objects.js', ['Blockly.bumpObjects'], ['Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/bump_objects.js', ['Blockly.bumpObjects'], ['Blockly.Events', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
@@ -87,7 +87,7 @@ goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.c
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});

From 57ac0ae33bbd80da313f512c510cb9830ba0af7b Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Wed, 15 Sep 2021 08:23:42 -0700
Subject: [PATCH 744/833] test: Changes mocha tests to use node_modules (#5467)

---
 tests/mocha/index.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/mocha/index.html b/tests/mocha/index.html
index 71b7de6b4..1fa12eb4c 100644
--- a/tests/mocha/index.html
+++ b/tests/mocha/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>Mocha Tests for Blockly</title>
 
-    <link href="https://unpkg.com/mocha@5.2.0/mocha.css" rel="stylesheet" />
+    <link href="../../node_modules/mocha/mocha.css" rel="stylesheet" />
     <script src="../../blockly_uncompressed.js"></script>
     <script src="../../generators/dart.js"></script>
     <script src="../../generators/javascript.js"></script>
@@ -38,10 +38,10 @@
 
     <div id="mocha"></div>
     <div id="failureCount" style="display:none" tests_failed="unset"></div>
-    <script src="https://unpkg.com/chai/chai.js"></script>
-    <script src="https://unpkg.com/mocha@5.2.0/mocha.js"></script>
-    <script src="https://unpkg.com/sinon/pkg/sinon.js"></script>
-    <script src="https://unpkg.com/@blockly/dev-tools/dist/index.js"></script>
+    <script src="../../node_modules/chai/chai.js"></script>
+    <script src="../../node_modules/mocha/mocha.js"></script>
+    <script src="../../node_modules/sinon/pkg/sinon.js"></script>
+    <script src="../../node_modules/@blockly/dev-tools/dist/index.js"></script>
     <script>
       mocha.setup({
         ui: 'tdd'

From 0e43ddc4ba0ad424f300397edc042116a84027d7 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Wed, 15 Sep 2021 13:12:02 -0700
Subject: [PATCH 745/833] fix: adds a fix for npm install failing (#5471)

---
 .github/workflows/build.yml |   7 ++
 package-lock.json           | 180 ++++++++++++++++++++----------------
 2 files changed, 109 insertions(+), 78 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9a7d2b859..e6712ada1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,6 +19,13 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+      with:
+        persist-credentials: false
+
+    - name: Reconfigure git to use HTTP authentication
+      run: >
+        git config --global url."https://github.com/".insteadOf
+        ssh://git@github.com/
 
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v1
diff --git a/package-lock.json b/package-lock.json
index 899eb7600..99f8989af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
       },
       "devDependencies": {
         "@blockly/block-test": "^1.0.0",
-        "@blockly/dev-tools": "^2.0.1",
+        "@blockly/dev-tools": "^2.6.0",
         "@blockly/theme-modern": "^2.1.1",
         "@wdio/selenium-standalone-service": "^6.11.0",
         "babel-eslint": "^10.1.0",
@@ -20,7 +20,7 @@
         "clang-format": "^1.5.0",
         "concurrently": "^6.0.0",
         "eslint": "^7.28.0",
-        "google-closure-compiler": "^20210505.0.0",
+        "google-closure-compiler": "^20210601.0.0",
         "google-closure-deps": "^20210601.0.0",
         "gulp": "^4.0.2",
         "gulp-concat": "^2.6.1",
@@ -266,28 +266,28 @@
       "dev": true
     },
     "node_modules/@blockly/block-test": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@blockly/block-test/-/block-test-1.1.0.tgz",
-      "integrity": "sha512-CxIgs1R+7G4ulPf+Op6q3JzpDMVUvQ8vZBQsbarDyC4vFkie1wU1gF0sweobiSPi6TvhZKtLokj6PctuEiveeA==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/@blockly/block-test/-/block-test-1.1.5.tgz",
+      "integrity": "sha512-lSDPuwOIEn8DLOzOLu/xNX6U4E4ps+9o5epxJ1JXxBjHqIBw7ghihHfsvuZ1c+rSsBnKGgwBzh5odq6ynIV2GQ==",
       "dev": true,
       "engines": {
         "node": ">=8.17.0"
       },
       "peerDependencies": {
-        "blockly": ">=2"
+        "blockly": "2 - 6"
       }
     },
     "node_modules/@blockly/dev-tools": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-2.5.1.tgz",
-      "integrity": "sha512-bv3X4iaNFZdrwUme9z3D2EeSI8SOURTGX8VtnBG2AeOIn3QB2XTHLZvnWgHRu/64epAo1eKc7W+bk9y14SWtMw==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-2.6.0.tgz",
+      "integrity": "sha512-/FRRg4/WQMEf2hMA5dcpjh2W6HwxgBK+a9fLuUDNckH+QMenO+6wk/YkZpQStyMu+EP8BDP8L2Z4iSORAenl8w==",
       "dev": true,
       "dependencies": {
-        "@blockly/block-test": "^1.1.0",
-        "@blockly/theme-dark": "^2.0.1",
-        "@blockly/theme-deuteranopia": "^1.0.2",
-        "@blockly/theme-highcontrast": "^1.0.2",
-        "@blockly/theme-tritanopia": "^1.0.2",
+        "@blockly/block-test": "^1.1.5",
+        "@blockly/theme-dark": "^2.0.6",
+        "@blockly/theme-deuteranopia": "^1.0.7",
+        "@blockly/theme-highcontrast": "^1.0.7",
+        "@blockly/theme-tritanopia": "^1.0.7",
         "chai": "^4.2.0",
         "dat.gui": "^0.7.7",
         "lodash.assign": "^4.2.0",
@@ -299,43 +299,43 @@
         "node": ">=8.0.0"
       },
       "peerDependencies": {
-        "blockly": ">=4.20201217.0"
+        "blockly": "4.20201217.0 - 6"
       }
     },
     "node_modules/@blockly/theme-dark": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-2.0.1.tgz",
-      "integrity": "sha512-hKbt8Q1f2yq4ler2Nxz8KFOOoqCnE5DfRFqg4bN/4gb0JI1IXdoxsToLevr47qPtZ6VHgvYUKAvp4pD5OQnr/g==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-2.0.6.tgz",
+      "integrity": "sha512-2gPz3Iw+VjBFaNhoYXm/zRA2Xhe/nDnpOyPxbav7sGs4XcO4F0yPruuXxBm7oGGbGudmxmJXhTdmV+4d8MpvSg==",
       "dev": true,
       "engines": {
         "node": ">=8.17.0"
       },
       "peerDependencies": {
-        "blockly": ">=3.20200123.0"
+        "blockly": "3.20200123.0 - 6"
       }
     },
     "node_modules/@blockly/theme-deuteranopia": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-1.0.2.tgz",
-      "integrity": "sha512-kNVVSbcNNmCmr+/R8fKbFcXk0bkOTeKyeHp+NcXH815P1nWdmnkXeMs64pgYIqR+3WLXmCibsvpvKDNty2000g==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-1.0.7.tgz",
+      "integrity": "sha512-m2Jo6lCYnVn3eLzmBoSBN31t2qQ8fAjEJmcUBcpJ56TGB1gks1vGVJHg/yhcK+vUB85IFuUUUJ6+MOjhEZFOvQ==",
       "dev": true,
       "engines": {
         "node": ">=8.17.0"
       },
       "peerDependencies": {
-        "blockly": ">=3.20200123.0"
+        "blockly": "3.20200123.0 - 6"
       }
     },
     "node_modules/@blockly/theme-highcontrast": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-1.0.2.tgz",
-      "integrity": "sha512-5Vhy9DaJL3aeoM+asEEb6khH0s+jP11m/I79I0J7GwEoK3vsiUEo9oK92fgZ2/wZ/8gc5I2XbP5asb+SoVzchA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-1.0.7.tgz",
+      "integrity": "sha512-FI/LyP/gGCatpeKvKTLSyColgyHETKSFo5RrgbZ+GTgVAQxXAj7MQ4DZDtlWECOKaT6WGQLNk5OserBXMCtDbQ==",
       "dev": true,
       "engines": {
         "node": ">=8.17.0"
       },
       "peerDependencies": {
-        "blockly": ">=3.20200123.0"
+        "blockly": "3.20200123.0 - 6"
       }
     },
     "node_modules/@blockly/theme-modern": {
@@ -351,15 +351,15 @@
       }
     },
     "node_modules/@blockly/theme-tritanopia": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-1.0.2.tgz",
-      "integrity": "sha512-/Sw0oi6kuOGi5VeHXTBwG5crpH3WeXKicxaxlhPbqF8qKnacFzZdDb01vhjF1Qw5fxYZok3bJ8iJs6QgWcI8Tw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-1.0.7.tgz",
+      "integrity": "sha512-Y6d8ZR3y9iz1GdihHbSYGTIwWEanWtp0tYPtsVx3QlcKMuc+NyAtGQVE324ZTA+N1ayH4L31CGRAAo7AAm3gPA==",
       "dev": true,
       "engines": {
         "node": ">=8.17.0"
       },
       "peerDependencies": {
-        "blockly": ">=3.20200123.0"
+        "blockly": "3.20200123.0 - 6"
       }
     },
     "node_modules/@eslint/eslintrc": {
@@ -2150,6 +2150,16 @@
         "node": ">= 6"
       }
     },
+    "node_modules/blockly": {
+      "version": "6.20210701.0",
+      "resolved": "https://registry.npmjs.org/blockly/-/blockly-6.20210701.0.tgz",
+      "integrity": "sha512-cNrwFOAxXE5Pbs1FJAyLTlSRzpNW/C+0gPT2rGQDOJVVKcyF3vhFC1StgnxvQNsv//ueuksKWIXxDuSWh1VI4w==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "jsdom": "15.2.1"
+      }
+    },
     "node_modules/bluebird": {
       "version": "3.5.5",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
@@ -5574,13 +5584,13 @@
       }
     },
     "node_modules/google-closure-compiler": {
-      "version": "20210505.0.0",
-      "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20210505.0.0.tgz",
-      "integrity": "sha512-moeYaj4S6YTdOOvjv1ZLdUld/2YXw7q1GqUUHJJd+rE/uViyesozg8yKQZWcB3tvurhb+qEvFFet8CYoeaQHng==",
+      "version": "20210601.0.0",
+      "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20210601.0.0.tgz",
+      "integrity": "sha512-lzzEoG2VTB7uUjnWnMyeZMU163w69HJpM27yh8Up9Ha5McHZeESjt3NRwU8cWMbCRdY06nFbRCDIVCRcadHCiw==",
       "dev": true,
       "dependencies": {
         "chalk": "2.x",
-        "google-closure-compiler-java": "^20210505.0.0",
+        "google-closure-compiler-java": "^20210601.0.0",
         "minimist": "1.x",
         "vinyl": "2.x",
         "vinyl-sourcemaps-apply": "^0.2.0"
@@ -5592,21 +5602,21 @@
         "node": ">=10"
       },
       "optionalDependencies": {
-        "google-closure-compiler-linux": "^20210505.0.0",
-        "google-closure-compiler-osx": "^20210505.0.0",
-        "google-closure-compiler-windows": "^20210505.0.0"
+        "google-closure-compiler-linux": "^20210601.0.0",
+        "google-closure-compiler-osx": "^20210601.0.0",
+        "google-closure-compiler-windows": "^20210601.0.0"
       }
     },
     "node_modules/google-closure-compiler-java": {
-      "version": "20210505.0.0",
-      "resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20210505.0.0.tgz",
-      "integrity": "sha512-h+DfQAaaCLFmmtasOS8eyh0M4D+JInTJfEP4byV5R1cnMninpGGLHOG3PNgLLzkXkIO/fu4ILEcVzoGmgJEoMA==",
+      "version": "20210601.0.0",
+      "resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20210601.0.0.tgz",
+      "integrity": "sha512-bH6nIwOmp4qDWvlbXx5/DE3XA2aDGQoCpmRYZJGONY1Sy6Xfbq0ioXRHH9eBDP9hxhCJ5Sd/K89A0NZ8Nz9RJA==",
       "dev": true
     },
     "node_modules/google-closure-compiler-linux": {
-      "version": "20210505.0.0",
-      "resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20210505.0.0.tgz",
-      "integrity": "sha512-ADN2kFfIR1NiR24kLYb4YkX4MeXDJaT5OfRQEkiuIdZMtd28oEkm80LxCGuC7ftKEixoMm3f9/OG01B4U+xsnA==",
+      "version": "20210601.0.0",
+      "resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20210601.0.0.tgz",
+      "integrity": "sha512-rnEQt7zz/1P1SfPhJiHQpfCgMPrsVVyEgDs09h67xn6+LXa9L0RP+hrJDEHqSWwjDPz0BkfUUv6zkqZvp1h/lw==",
       "cpu": [
         "x64",
         "x86"
@@ -5618,12 +5628,13 @@
       ]
     },
     "node_modules/google-closure-compiler-osx": {
-      "version": "20210505.0.0",
-      "resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20210505.0.0.tgz",
-      "integrity": "sha512-JTwdh23aD2pwRU4QZjujxp/+rGfhex3utNWEdUDRMNpUGstUK7XPCDG8jNBtUpyuRiXFnpZa90qButqRgotQBA==",
+      "version": "20210601.0.0",
+      "resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20210601.0.0.tgz",
+      "integrity": "sha512-A5r4s/WthR2iLMM0mxsluw8EW2AcOomC5ri/H6FjzpMq0RVEnLTgaGYdXolUAfEzH/7XtJJT2+JkYk3HSLCtrg==",
       "cpu": [
         "x64",
-        "x86"
+        "x86",
+        "arm64"
       ],
       "dev": true,
       "optional": true,
@@ -5632,9 +5643,9 @@
       ]
     },
     "node_modules/google-closure-compiler-windows": {
-      "version": "20210505.0.0",
-      "resolved": "https://registry.npmjs.org/google-closure-compiler-windows/-/google-closure-compiler-windows-20210505.0.0.tgz",
-      "integrity": "sha512-bKTbg/f4ak72OggEMaH/7oExqOO9dS+TxwGhoovYOt/YaVR/8MDfGdxsOhqoiboiFwYysTPz8bwINjYQK6AwnA==",
+      "version": "20210601.0.0",
+      "resolved": "https://registry.npmjs.org/google-closure-compiler-windows/-/google-closure-compiler-windows-20210601.0.0.tgz",
+      "integrity": "sha512-6r94bPShnB0XXh9+5/qXGDHJN2PQGhF9yJPcgBZj+FAZlQGzlYkT0pkyp+loZT3lG+YRbjD28Lgo7xMcY4xgkA==",
       "cpu": [
         "x64"
       ],
@@ -10610,6 +10621,7 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "devOptional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -12715,23 +12727,23 @@
       }
     },
     "@blockly/block-test": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@blockly/block-test/-/block-test-1.1.0.tgz",
-      "integrity": "sha512-CxIgs1R+7G4ulPf+Op6q3JzpDMVUvQ8vZBQsbarDyC4vFkie1wU1gF0sweobiSPi6TvhZKtLokj6PctuEiveeA==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/@blockly/block-test/-/block-test-1.1.5.tgz",
+      "integrity": "sha512-lSDPuwOIEn8DLOzOLu/xNX6U4E4ps+9o5epxJ1JXxBjHqIBw7ghihHfsvuZ1c+rSsBnKGgwBzh5odq6ynIV2GQ==",
       "dev": true,
       "requires": {}
     },
     "@blockly/dev-tools": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-2.5.1.tgz",
-      "integrity": "sha512-bv3X4iaNFZdrwUme9z3D2EeSI8SOURTGX8VtnBG2AeOIn3QB2XTHLZvnWgHRu/64epAo1eKc7W+bk9y14SWtMw==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-2.6.0.tgz",
+      "integrity": "sha512-/FRRg4/WQMEf2hMA5dcpjh2W6HwxgBK+a9fLuUDNckH+QMenO+6wk/YkZpQStyMu+EP8BDP8L2Z4iSORAenl8w==",
       "dev": true,
       "requires": {
-        "@blockly/block-test": "^1.1.0",
-        "@blockly/theme-dark": "^2.0.1",
-        "@blockly/theme-deuteranopia": "^1.0.2",
-        "@blockly/theme-highcontrast": "^1.0.2",
-        "@blockly/theme-tritanopia": "^1.0.2",
+        "@blockly/block-test": "^1.1.5",
+        "@blockly/theme-dark": "^2.0.6",
+        "@blockly/theme-deuteranopia": "^1.0.7",
+        "@blockly/theme-highcontrast": "^1.0.7",
+        "@blockly/theme-tritanopia": "^1.0.7",
         "chai": "^4.2.0",
         "dat.gui": "^0.7.7",
         "lodash.assign": "^4.2.0",
@@ -12741,23 +12753,23 @@
       }
     },
     "@blockly/theme-dark": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-2.0.1.tgz",
-      "integrity": "sha512-hKbt8Q1f2yq4ler2Nxz8KFOOoqCnE5DfRFqg4bN/4gb0JI1IXdoxsToLevr47qPtZ6VHgvYUKAvp4pD5OQnr/g==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-2.0.6.tgz",
+      "integrity": "sha512-2gPz3Iw+VjBFaNhoYXm/zRA2Xhe/nDnpOyPxbav7sGs4XcO4F0yPruuXxBm7oGGbGudmxmJXhTdmV+4d8MpvSg==",
       "dev": true,
       "requires": {}
     },
     "@blockly/theme-deuteranopia": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-1.0.2.tgz",
-      "integrity": "sha512-kNVVSbcNNmCmr+/R8fKbFcXk0bkOTeKyeHp+NcXH815P1nWdmnkXeMs64pgYIqR+3WLXmCibsvpvKDNty2000g==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-1.0.7.tgz",
+      "integrity": "sha512-m2Jo6lCYnVn3eLzmBoSBN31t2qQ8fAjEJmcUBcpJ56TGB1gks1vGVJHg/yhcK+vUB85IFuUUUJ6+MOjhEZFOvQ==",
       "dev": true,
       "requires": {}
     },
     "@blockly/theme-highcontrast": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-1.0.2.tgz",
-      "integrity": "sha512-5Vhy9DaJL3aeoM+asEEb6khH0s+jP11m/I79I0J7GwEoK3vsiUEo9oK92fgZ2/wZ/8gc5I2XbP5asb+SoVzchA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-1.0.7.tgz",
+      "integrity": "sha512-FI/LyP/gGCatpeKvKTLSyColgyHETKSFo5RrgbZ+GTgVAQxXAj7MQ4DZDtlWECOKaT6WGQLNk5OserBXMCtDbQ==",
       "dev": true,
       "requires": {}
     },
@@ -12769,9 +12781,9 @@
       "requires": {}
     },
     "@blockly/theme-tritanopia": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-1.0.2.tgz",
-      "integrity": "sha512-/Sw0oi6kuOGi5VeHXTBwG5crpH3WeXKicxaxlhPbqF8qKnacFzZdDb01vhjF1Qw5fxYZok3bJ8iJs6QgWcI8Tw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-1.0.7.tgz",
+      "integrity": "sha512-Y6d8ZR3y9iz1GdihHbSYGTIwWEanWtp0tYPtsVx3QlcKMuc+NyAtGQVE324ZTA+N1ayH4L31CGRAAo7AAm3gPA==",
       "dev": true,
       "requires": {}
     },
@@ -14175,6 +14187,16 @@
         }
       }
     },
+    "blockly": {
+      "version": "6.20210701.0",
+      "resolved": "https://registry.npmjs.org/blockly/-/blockly-6.20210701.0.tgz",
+      "integrity": "sha512-cNrwFOAxXE5Pbs1FJAyLTlSRzpNW/C+0gPT2rGQDOJVVKcyF3vhFC1StgnxvQNsv//ueuksKWIXxDuSWh1VI4w==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "jsdom": "15.2.1"
+      }
+    },
     "bluebird": {
       "version": "3.5.5",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
@@ -20879,7 +20901,8 @@
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "devOptional": true
     },
     "source-map-resolve": {
       "version": "0.5.2",
@@ -21533,9 +21556,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
-      "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.2.tgz",
+      "integrity": "sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==",
       "dev": true
     },
     "typescript-closure-tools": {
@@ -21554,6 +21577,7 @@
       "dependencies": {
         "doctrine": {
           "version": "git+ssh://git@github.com/fivetran/doctrine.git#169ebc1cbf23492363f9442543d1e78e1df9c3d5",
+          "integrity": "sha512-tzHUxJsn8qL76Uah/QZnbhmdCbx5N6Q5HD6iPxZ7Q30vX2+qgQZkuxuASOd1JyLCa0X+Yi6Y9IfwTK9G0QRmfg==",
           "dev": true,
           "from": "doctrine@github:fivetran/doctrine"
         }

From 6a4a359f7b53cc5916b2ed913f636acf5869ca24 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 15 Sep 2021 13:41:20 -0700
Subject: [PATCH 746/833] Migrate hideChaff() from Blockly to WorkspaceSvg
 (#5460)

* Add hideChaff() to core/workspace_svg.js

* Mark Blockly.hideChaff as deprecated

* Update uses of Blockly.hideChaff() to WorkspaceSvg.hideChaff() in core

* Update uses of Blockly.hideChaff() to WorkspaceSvg.hideChaff() in demos

* Style and formatting fixes

* Switch from accessor to stub wrapper for Blockly.hideChaff

Co-authored-by: Christopher Allen <cpcallen+github@gmail.com>

Co-authored-by: Christopher Allen <cpcallen+github@gmail.com>
---
 core/blockly.js                       | 21 +++++----------------
 core/bubble.js                        |  4 +---
 core/flyout_base.js                   |  3 +--
 core/gesture.js                       |  6 +++---
 core/inject.js                        |  2 +-
 core/interfaces/i_autohideable.js     |  4 ++--
 core/scrollbar.js                     |  2 +-
 core/shortcut_items.js                | 10 +++++-----
 core/theme_manager.js                 |  4 +++-
 core/toolbox/toolbox.js               |  7 ++++---
 core/trashcan.js                      |  2 +-
 core/workspace_comment_svg.js         |  2 +-
 core/workspace_svg.js                 | 25 ++++++++++++++++++++++---
 demos/blockfactory/app_controller.js  |  2 +-
 demos/blockfactory/factory.js         |  2 +-
 demos/blockfactory_old/factory.js     |  2 +-
 demos/custom-fields/turtle/index.html |  4 ++--
 tests/deps.js                         |  8 ++++----
 tests/mocha/keydown_test.js           | 18 ++++++++++++------
 tests/mocha/toolbox_test.js           |  3 ++-
 20 files changed, 73 insertions(+), 58 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index 2cf685de4..5d109460e 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -19,11 +19,9 @@ goog.provide('Blockly');
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.clipboard');
 goog.require('Blockly.common');
-goog.require('Blockly.ComponentManager');
 goog.require('Blockly.connectionTypes');
 goog.require('Blockly.constants');
 goog.require('Blockly.dialog');
-goog.require('Blockly.DropDownDiv');
 goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
@@ -42,7 +40,6 @@ goog.require('Blockly.internalConstants');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Procedures');
 goog.require('Blockly.ShortcutRegistry');
-goog.require('Blockly.Tooltip');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
@@ -52,7 +49,6 @@ goog.require('Blockly.utils.Size');
 goog.require('Blockly.utils.toolbox');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Variables');
-goog.require('Blockly.WidgetDiv');
 goog.require('Blockly.WorkspaceSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Xml');
@@ -184,7 +180,7 @@ Blockly.onKeyDown = function(e) {
 Blockly.deleteBlock = function(selected) {
   if (!selected.workspace.isFlyout) {
     Blockly.Events.setGroup(true);
-    Blockly.hideChaff();
+    Blockly.common.getMainWorkspace().hideChaff();
     if (selected.outputConnection) {
       // Do not attempt to heal rows
       // (https://github.com/google/blockly/issues/4832)
@@ -232,20 +228,13 @@ Blockly.onContextMenu_ = function(e) {
 
 /**
  * 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.Tooltip.hide();
-  Blockly.WidgetDiv.hide();
-  Blockly.DropDownDiv.hideWithoutAnimation();
-
-  var onlyClosePopups = !!opt_onlyClosePopups;
-  var workspace = Blockly.common.getMainWorkspace();
-  var autoHideables = workspace.getComponentManager().getComponents(
-      Blockly.ComponentManager.Capability.AUTOHIDEABLE, true);
-  autoHideables.forEach(function(autoHideable) {
-    autoHideable.autoHide(onlyClosePopups);
-  });
+  Blockly.utils.deprecation.warn(
+      'Blockly.hideChaff', 'September 2021', 'September 2022');
+  Blockly.common.getMainWorkspace().hideChaff(opt_onlyClosePopups);
 };
 
 /**
diff --git a/core/bubble.js b/core/bubble.js
index dbe10cd1b..3abfc61ad 100644
--- a/core/bubble.js
+++ b/core/bubble.js
@@ -13,8 +13,6 @@
 goog.module('Blockly.Bubble');
 goog.module.declareLegacyNamespace();
 
-// TODO(#5073): Fix Blockly requires for Blockly.hideChaff()
-// const Blockly = goog.require('Blockly');
 /* eslint-disable-next-line no-unused-vars */
 const BlockDragSurfaceSvg = goog.requireType('Blockly.BlockDragSurfaceSvg');
 /* eslint-disable-next-line no-unused-vars */
@@ -396,7 +394,7 @@ Bubble.prototype.resizeMouseDown_ = function(e) {
       document, 'mouseup', this, Bubble.bubbleMouseUp_);
   Bubble.onMouseMoveWrapper_ = browserEvents.conditionalBind(
       document, 'mousemove', this, this.resizeMouseMove_);
-  Blockly.hideChaff();
+  this.workspace_.hideChaff();
   // This event has been handled.  No need to bubble up to the document.
   e.stopPropagation();
 };
diff --git a/core/flyout_base.js b/core/flyout_base.js
index 43b099aeb..52c9367a1 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -15,7 +15,6 @@ goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Block = goog.requireType('Blockly.Block');
-const Blockly = goog.require('Blockly');
 /* eslint-disable-next-line no-unused-vars */
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const ComponentManager = goog.require('Blockly.ComponentManager');
@@ -858,7 +857,7 @@ Flyout.prototype.createBlock = function(originalBlock) {
   }
 
   // Close the flyout.
-  Blockly.hideChaff();
+  this.targetWorkspace.hideChaff();
 
   const newVariables = Variables.getAddedVariables(
       this.targetWorkspace, variablesBeforeCreation);
diff --git a/core/gesture.js b/core/gesture.js
index bf28e9315..679b4b69e 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -490,7 +490,7 @@ Gesture.prototype.doStart = function(e) {
 
   // Hide chaff also hides the flyout, so don't do it if the click is in a
   // flyout.
-  Blockly.hideChaff(!!this.flyout_);
+  this.startWorkspace_.hideChaff(!!this.flyout_);
 
   this.startWorkspace_.markFocused();
   this.mostRecentEvent_ = e;
@@ -625,12 +625,12 @@ Gesture.prototype.cancel = function() {
 Gesture.prototype.handleRightClick = function(e) {
   if (this.targetBlock_) {
     this.bringBlockToFront_();
-    Blockly.hideChaff(!!this.flyout_);
+    this.targetBlock_.workspace.hideChaff(!!this.flyout_);
     this.targetBlock_.showContextMenu(e);
   } else if (this.startBubble_) {
     this.startBubble_.showContextMenu(e);
   } else if (this.startWorkspace_ && !this.flyout_) {
-    Blockly.hideChaff();
+    this.startWorkspace_.hideChaff();
     this.startWorkspace_.showContextMenu(e);
   }
 
diff --git a/core/inject.js b/core/inject.js
index 3b807e490..be10e7c08 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -213,7 +213,7 @@ const init = function(mainWorkspace) {
 
   const workspaceResizeHandler =
       browserEvents.conditionalBind(window, 'resize', null, function() {
-        Blockly.hideChaff(true);
+        mainWorkspace.hideChaff(true);
         Blockly.svgResize(mainWorkspace);
         goog.module.get('Blockly.bumpObjects')
             .bumpTopObjectsIntoBounds(mainWorkspace);
diff --git a/core/interfaces/i_autohideable.js b/core/interfaces/i_autohideable.js
index c3c7a8125..fa881770a 100644
--- a/core/interfaces/i_autohideable.js
+++ b/core/interfaces/i_autohideable.js
@@ -6,7 +6,7 @@
 
 /**
  * @fileoverview The interface for a component that is automatically hidden
- * when Blockly.hideChaff is called.
+ * when WorkspaceSvg.hideChaff is called.
  * @author kozbial@google.com (Monica Kozbial)
  */
 
@@ -27,7 +27,7 @@ const IComponent = goog.requireType('Blockly.IComponent');
 const IAutoHideable = function() {};
 
 /**
- * Hides the component. Called in Blockly.hideChaff.
+ * Hides the component. Called in WorkspaceSvg.hideChaff.
  * @param {boolean} onlyClosePopups Whether only popups should be closed.
  *   Flyouts should not be closed if this is true.
  */
diff --git a/core/scrollbar.js b/core/scrollbar.js
index 9877d8201..980a16f45 100644
--- a/core/scrollbar.js
+++ b/core/scrollbar.js
@@ -774,7 +774,7 @@ Scrollbar.prototype.onMouseUpHandle_ = function() {
  * @private
  */
 Scrollbar.prototype.cleanUp_ = function() {
-  Blockly.hideChaff(true);
+  this.workspace_.hideChaff(true);
   if (Scrollbar.onMouseUpWrapper_) {
     browserEvents.unbind(Scrollbar.onMouseUpWrapper_);
     Scrollbar.onMouseUpWrapper_ = null;
diff --git a/core/shortcut_items.js b/core/shortcut_items.js
index 259a8c4bc..73ef30c65 100644
--- a/core/shortcut_items.js
+++ b/core/shortcut_items.js
@@ -47,8 +47,8 @@ const registerEscape = function() {
     preconditionFn: function(workspace) {
       return !workspace.options.readOnly;
     },
-    callback: function() {
-      Blockly.hideChaff();
+    callback: function(workspace) {
+      workspace.hideChaff();
       return true;
     }
   };
@@ -101,7 +101,7 @@ const registerCopy = function() {
       // Prevent the default copy behavior, which may beep or otherwise indicate
       // an error due to the lack of a selection.
       e.preventDefault();
-      Blockly.hideChaff();
+      workspace.hideChaff();
       clipboard.copy(/** @type {!ICopyable} */ (Blockly.selected));
       return true;
     }
@@ -194,7 +194,7 @@ const registerUndo = function() {
     },
     callback: function(workspace) {
       // 'z' for undo 'Z' is for redo.
-      Blockly.hideChaff();
+      workspace.hideChaff();
       workspace.undo(false);
       return true;
     }
@@ -228,7 +228,7 @@ const registerRedo = function() {
     },
     callback: function(workspace) {
       // 'z' for undo 'Z' is for redo.
-      Blockly.hideChaff();
+      workspace.hideChaff();
       workspace.undo(true);
       return true;
     }
diff --git a/core/theme_manager.js b/core/theme_manager.js
index 859a33658..d5d1908c7 100644
--- a/core/theme_manager.js
+++ b/core/theme_manager.js
@@ -113,7 +113,9 @@ ThemeManager.prototype.setTheme = function(theme) {
     }
   }
 
-  Blockly.hideChaff();
+  for (const workspace of this.subscribedWorkspaces_) {
+    workspace.hideChaff();
+  }
 };
 
 /**
diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index f5eea1890..3b44eb0c2 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -50,6 +50,7 @@ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const aria = goog.require('Blockly.utils.aria');
 const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
+const common = goog.require('Blockly.common');
 const keyCodes = goog.require('Blockly.utils.KeyCodes');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
@@ -315,7 +316,7 @@ Toolbox.prototype.attachEvents_ = function(container, contentsContainer) {
 Toolbox.prototype.onClick_ = function(e) {
   if (utils.isRightButton(e) || e.target == this.HtmlDiv) {
     // Close flyout.
-    Blockly.hideChaff(false);
+    common.getMainWorkspace().hideChaff(false);
   } else {
     const targetElement = e.target;
     const itemId = targetElement.getAttribute('id');
@@ -327,7 +328,7 @@ Toolbox.prototype.onClick_ = function(e) {
       }
     }
     // Just close popups.
-    Blockly.hideChaff(true);
+    common.getMainWorkspace().hideChaff(true);
   }
   Touch.clearTouchIdentifier();  // Don't block future drags.
 };
@@ -847,7 +848,7 @@ Toolbox.prototype.setVisible = function(isVisible) {
 };
 
 /**
- * Hides the component. Called in Blockly.hideChaff.
+ * Hides the component. Called in WorkspaceSvg.hideChaff.
  * @param {boolean} onlyClosePopups Whether only popups should be closed.
  *     Flyouts should not be closed if this is true.
  */
diff --git a/core/trashcan.js b/core/trashcan.js
index b3a459f01..d34cd0803 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -410,7 +410,7 @@ Trashcan.prototype.closeFlyout = function() {
 };
 
 /**
- * Hides the component. Called in Blockly.hideChaff.
+ * Hides the component. Called in WorkspaceSvg.hideChaff.
  * @param {boolean} onlyClosePopups Whether only popups should be closed.
  *     Flyouts should not be closed if this is true.
  */
diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 0b68db82e..1d009af0f 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -868,7 +868,7 @@ WorkspaceCommentSvg.prototype.resizeMouseDown_ = function(e) {
       document, 'mouseup', this, this.resizeMouseUp_);
   this.onMouseMoveWrapper_ = browserEvents.conditionalBind(
       document, 'mousemove', this, this.resizeMouseMove_);
-  Blockly.hideChaff();
+  this.workspace.hideChaff();
   // This event has been handled.  No need to bubble up to the document.
   e.stopPropagation();
 };
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 419879bad..d00289904 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -28,6 +28,7 @@ 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 */
 const FlyoutButton = goog.requireType('Blockly.FlyoutButton');
@@ -63,6 +64,7 @@ const Svg = goog.require('Blockly.utils.Svg');
 /* eslint-disable-next-line no-unused-vars */
 const Theme = goog.requireType('Blockly.Theme');
 const ThemeManager = goog.require('Blockly.ThemeManager');
+const Tooltip = goog.require('Blockly.Tooltip');
 const TouchGesture = goog.require('Blockly.TouchGesture');
 /* eslint-disable-next-line no-unused-vars */
 const Trashcan = goog.requireType('Blockly.Trashcan');
@@ -72,6 +74,7 @@ const VariableModel = goog.requireType('Blockly.VariableModel');
 const Variables = goog.requireType('Blockly.Variables');
 /* eslint-disable-next-line no-unused-vars */
 const VariablesDynamic = goog.requireType('Blockly.VariablesDynamic');
+const WidgetDiv = goog.require('Blockly.WidgetDiv');
 const Workspace = goog.require('Blockly.Workspace');
 const WorkspaceAudio = goog.require('Blockly.WorkspaceAudio');
 /* eslint-disable-next-line no-unused-vars */
@@ -1443,7 +1446,7 @@ WorkspaceSvg.prototype.setVisible = function(isVisible) {
       this.toolbox_.position();
     }
   } else {
-    Blockly.hideChaff(true);
+    this.hideChaff(true);
   }
 };
 
@@ -2273,7 +2276,7 @@ WorkspaceSvg.prototype.setScale = function(newScale) {
   }
   this.scale = newScale;
 
-  Blockly.hideChaff(false);
+  this.hideChaff(false);
   // Get the flyout, if any, whether our own or owned by the toolbox.
   const flyout = this.getFlyout(false);
   if (flyout && flyout.isVisible()) {
@@ -2328,7 +2331,7 @@ WorkspaceSvg.prototype.getScale = function() {
  * @package
  */
 WorkspaceSvg.prototype.scroll = function(x, y) {
-  Blockly.hideChaff(/* opt_onlyClosePopups */ true);
+  this.hideChaff(/* opt_onlyClosePopups= */ true);
 
   // Keep scrolling within the bounds of the content.
   const metrics = this.getMetrics();
@@ -2644,4 +2647,20 @@ WorkspaceSvg.prototype.getGrid = function() {
   return this.grid_;
 };
 
+/**
+ * Close tooltips, context menus, dropdown selections, etc.
+ * @param {boolean=} opt_onlyClosePopups Whether only popups should be closed.
+ */
+WorkspaceSvg.prototype.hideChaff = function(opt_onlyClosePopups) {
+  Tooltip.hide();
+  WidgetDiv.hide();
+  DropDownDiv.hideWithoutAnimation();
+
+  var onlyClosePopups = !!opt_onlyClosePopups;
+  var autoHideables = this.getComponentManager().getComponents(
+      Blockly.ComponentManager.Capability.AUTOHIDEABLE, true);
+  autoHideables.forEach(
+      (autoHideable) => autoHideable.autoHide(onlyClosePopups));
+};
+
 exports = WorkspaceSvg;
diff --git a/demos/blockfactory/app_controller.js b/demos/blockfactory/app_controller.js
index 58b70b88d..62157b04a 100644
--- a/demos/blockfactory/app_controller.js
+++ b/demos/blockfactory/app_controller.js
@@ -631,7 +631,7 @@ AppController.prototype.confirmLeavePage = function(e) {
  * @param {string} id ID of element to show.
  */
 AppController.prototype.openModal = function(id) {
-  Blockly.hideChaff();
+  Blockly.common.getMainWorkspace().hideChaff();
   this.modalName_ = id;
   document.getElementById(id).style.display = 'block';
   document.getElementById('modalShadow').style.display = 'block';
diff --git a/demos/blockfactory/factory.js b/demos/blockfactory/factory.js
index 9f01f36f2..49ee849c1 100644
--- a/demos/blockfactory/factory.js
+++ b/demos/blockfactory/factory.js
@@ -88,7 +88,7 @@ BlockFactory.formatChange = function() {
   var languageTA = document.getElementById('languageTA');
   if (document.getElementById('format').value == 'Manual-JSON' ||
       document.getElementById('format').value == 'Manual-JS') {
-    Blockly.hideChaff();
+    Blockly.common.getMainWorkspace().hideChaff();
     mask.style.display = 'block';
     languagePre.style.display = 'none';
     languageTA.style.display = 'block';
diff --git a/demos/blockfactory_old/factory.js b/demos/blockfactory_old/factory.js
index a324a567e..6486bc4f2 100644
--- a/demos/blockfactory_old/factory.js
+++ b/demos/blockfactory_old/factory.js
@@ -35,7 +35,7 @@ function formatChange() {
   var languagePre = document.getElementById('languagePre');
   var languageTA = document.getElementById('languageTA');
   if (document.getElementById('format').value == 'Manual') {
-    Blockly.hideChaff();
+    Blockly.common.getMainWorkspace().hideChaff();
     mask.style.display = 'block';
     languagePre.style.display = 'none';
     languageTA.style.display = 'block';
diff --git a/demos/custom-fields/turtle/index.html b/demos/custom-fields/turtle/index.html
index 975d20c8e..dd8cb40af 100644
--- a/demos/custom-fields/turtle/index.html
+++ b/demos/custom-fields/turtle/index.html
@@ -112,7 +112,7 @@
       }
 
       function toggleEditable() {
-        Blockly.hideChaff();
+        workspace.hideChaff();
         var blocks = workspace.getAllBlocks(false);
         for(var i = 0, block; block = blocks[i]; i++) {
           block.setEditable(!block.isEditable());
@@ -120,7 +120,7 @@
       }
 
       function toggleCollapsed() {
-        Blockly.hideChaff();
+        workspace.hideChaff();
         var blocks = workspace.getAllBlocks(false);
         for(var i = 0, block; block = blocks[i]; i++) {
           block.setCollapsed(!block.isCollapsed());
diff --git a/tests/deps.js b/tests/deps.js
index 0366481cc..d720d5640 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.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.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', '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', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 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'});
@@ -78,7 +78,7 @@ goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Bloc
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -205,7 +205,7 @@ goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Bl
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly', 'Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
@@ -244,7 +244,7 @@ goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.Tooltip', 'Blockly.TouchGesture', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);
diff --git a/tests/mocha/keydown_test.js b/tests/mocha/keydown_test.js
index 22fdbf96e..c7b39d885 100644
--- a/tests/mocha/keydown_test.js
+++ b/tests/mocha/keydown_test.js
@@ -39,7 +39,8 @@ suite('Key Down', function() {
   suite('Escape', function() {
     setup(function() {
       this.event = createKeyDownEvent(Blockly.utils.KeyCodes.ESC, 'NotAField');
-      this.hideChaffSpy = sinon.spy(Blockly, 'hideChaff');
+      this.hideChaffSpy = sinon.spy(
+        Blockly.WorkspaceSvg.prototype, 'hideChaff');
     });
     test('Simple', function() {
       Blockly.onKeyDown(this.event);
@@ -60,7 +61,8 @@ suite('Key Down', function() {
 
   suite('Delete Block', function() {
     setup(function() {
-      this.hideChaffSpy = sinon.spy(Blockly, 'hideChaff');
+      this.hideChaffSpy = sinon.spy(
+        Blockly.WorkspaceSvg.prototype, 'hideChaff');
       setSelectedBlock(this.workspace);
       this.deleteSpy = sinon.spy(Blockly.selected, 'dispose');
     });
@@ -94,7 +96,8 @@ suite('Key Down', function() {
     setup(function() {
       setSelectedBlock(this.workspace);
       this.copySpy = sinon.spy(Blockly.clipboard, 'copy');
-      this.hideChaffSpy = sinon.spy(Blockly, 'hideChaff');
+      this.hideChaffSpy = sinon.spy(
+        Blockly.WorkspaceSvg.prototype, 'hideChaff');
     });
     var testCases = [
       ['Control C', createKeyDownEvent(Blockly.utils.KeyCodes.C, 'NotAField', [Blockly.utils.KeyCodes.CTRL])],
@@ -165,7 +168,8 @@ suite('Key Down', function() {
   suite('Undo', function() {
     setup(function() {
       this.undoSpy = sinon.spy(this.workspace, 'undo');
-      this.hideChaffSpy = sinon.spy(Blockly, 'hideChaff');
+      this.hideChaffSpy = sinon.spy(
+        Blockly.WorkspaceSvg.prototype, 'hideChaff');
     });
     var testCases = [
       ['Control Z', createKeyDownEvent(Blockly.utils.KeyCodes.Z, 'NotAField', [Blockly.utils.KeyCodes.CTRL])],
@@ -211,7 +215,8 @@ suite('Key Down', function() {
   suite('Redo', function() {
     setup(function() {
       this.redoSpy = sinon.spy(this.workspace, 'undo');
-      this.hideChaffSpy = sinon.spy(Blockly, 'hideChaff');
+      this.hideChaffSpy = sinon.spy(
+        Blockly.WorkspaceSvg.prototype, 'hideChaff');
     });
     var testCases = [
       ['Control Shift Z', createKeyDownEvent(Blockly.utils.KeyCodes.Z, 'NotAField', [Blockly.utils.KeyCodes.CTRL, Blockly.utils.KeyCodes.SHIFT])],
@@ -258,7 +263,8 @@ suite('Key Down', function() {
     setup(function() {
       this.ctrlYEvent = createKeyDownEvent(Blockly.utils.KeyCodes.Y, 'NotAField', [Blockly.utils.KeyCodes.CTRL]);
       this.undoSpy = sinon.spy(this.workspace, 'undo');
-      this.hideChaffSpy = sinon.spy(Blockly, 'hideChaff');
+      this.hideChaffSpy = sinon.spy(
+        Blockly.WorkspaceSvg.prototype, 'hideChaff');
     });
     test('Simple', function() {
       Blockly.onKeyDown(this.ctrlYEvent);
diff --git a/tests/mocha/toolbox_test.js b/tests/mocha/toolbox_test.js
index f494aacc5..f19287664 100644
--- a/tests/mocha/toolbox_test.js
+++ b/tests/mocha/toolbox_test.js
@@ -135,7 +135,8 @@ suite('Toolbox', function() {
     });
 
     test('Toolbox clicked -> Should close flyout', function() {
-      var hideChaffStub = sinon.stub(Blockly, "hideChaff");
+      var hideChaffStub = sinon.stub(
+        Blockly.WorkspaceSvg.prototype, "hideChaff");
       var evt = new MouseEvent('click', {});
       this.toolbox.HtmlDiv.dispatchEvent(evt);
       sinon.assert.calledOnce(hideChaffStub);

From 81e645a77100f56d31095aa4d607a7022190bbff Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Thu, 16 Sep 2021 16:46:06 +0100
Subject: [PATCH 747/833] Remove vestigial (circular) require of Blockly
 (#5474)

---
 core/toolbox/category.js | 1 -
 tests/deps.js            | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/toolbox/category.js b/core/toolbox/category.js
index 88bf68847..c085420c5 100644
--- a/core/toolbox/category.js
+++ b/core/toolbox/category.js
@@ -13,7 +13,6 @@
 goog.module('Blockly.ToolboxCategory');
 goog.module.declareLegacyNamespace();
 
-const Blockly = goog.require('Blockly');
 const Css = goog.require('Blockly.Css');
 /* eslint-disable-next-line no-unused-vars */
 const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');
diff --git a/tests/deps.js b/tests/deps.js
index d720d5640..86ee6ee14 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -202,7 +202,7 @@ goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry'
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly', 'Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});

From 51d9dad31f8e185c9e6ae7bdda2aafd29786e823 Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Thu, 16 Sep 2021 18:23:33 +0100
Subject: [PATCH 748/833] Re-export `Blockly.utils.*` submodules from
 `Blockly.utils` (#5465)

* Reexport Blockly.utils.* modules from Blockly.utils

* Update metadata (file sizes) again

  blockly_compressed.js has gotten too big for the second time this
  quarter.  Update the expected file sizes for it so that tests
  will continue to pass.
---
 core/utils.js                   | 38 ++++++++++++++++++++++++++++++---
 core/utils/aria.js              |  1 -
 core/utils/colour.js            |  1 -
 core/utils/coordinate.js        |  1 -
 core/utils/deprecation.js       |  1 -
 core/utils/dom.js               |  1 -
 core/utils/global.js            |  1 -
 core/utils/idgenerator.js       |  1 -
 core/utils/keycodes.js          |  1 -
 core/utils/math.js              |  1 -
 core/utils/metrics.js           |  1 -
 core/utils/object.js            |  1 -
 core/utils/rect.js              |  1 -
 core/utils/size.js              |  1 -
 core/utils/string.js            |  1 -
 core/utils/style.js             |  1 -
 core/utils/svg.js               |  1 -
 core/utils/svg_paths.js         |  1 -
 core/utils/toolbox.js           |  1 -
 core/utils/useragent.js         |  1 -
 core/utils/xml.js               |  1 -
 package-lock.json               | 15 +++++++------
 package.json                    |  2 +-
 tests/deps.js                   |  2 +-
 tests/scripts/check_metadata.sh | 10 +++++----
 25 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/core/utils.js b/core/utils.js
index cb711e1a8..f09526afe 100644
--- a/core/utils.js
+++ b/core/utils.js
@@ -22,20 +22,52 @@ goog.module.declareLegacyNamespace();
 /* eslint-disable-next-line no-unused-vars */
 const Block = goog.requireType('Blockly.Block');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
+const KeyCodes = goog.require('Blockly.utils.KeyCodes');
+const Metrics = goog.require('Blockly.utils.Metrics');
 const Msg = goog.require('Blockly.Msg');
 const Rect = goog.require('Blockly.utils.Rect');
+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');
+const aria = goog.require('Blockly.utils.aria');
 const colourUtils = goog.require('Blockly.utils.colour');
 const deprecation = goog.require('Blockly.utils.deprecation');
-const {globalThis} = goog.require('Blockly.utils.global');
+const dom = goog.require('Blockly.utils.dom');
+const global = goog.require('Blockly.utils.global');
 const idGenerator = goog.require('Blockly.utils.idGenerator');
 const internalConstants = goog.require('Blockly.internalConstants');
+const math = goog.require('Blockly.utils.math');
+const object = goog.require('Blockly.utils.object');
 const stringUtils = goog.require('Blockly.utils.string');
 const style = goog.require('Blockly.utils.style');
+const svgPaths = goog.require('Blockly.utils.svgPaths');
+const toolbox = goog.require('Blockly.utils.toolbox');
 const userAgent = goog.require('Blockly.utils.userAgent');
+const xmlUtils = goog.require('Blockly.utils.xml');
 
 
+exports.aria = aria;
+exports.colour = colourUtils;
+exports.Coordinate = Coordinate;
+exports.deprecation = deprecation;
+exports.dom = dom;
+exports.global = global;
+exports.idGenerator = idGenerator;
+exports.KeyCodes = KeyCodes;
+exports.math = math;
+exports.Metrics = Metrics;
+exports.object = object;
+exports.Rect = Rect;
+exports.Size = Size;
+exports.string = stringUtils;
+exports.style = style;
+exports.Svg = Svg;
+exports.svgPaths = svgPaths;
+exports.toolbox = toolbox;
+exports.userAgent = userAgent;
+exports.xml = xmlUtils;
+
 /**
  * Don't do anything for this event, just halt propagation.
  * @param {!Event} e An event.
@@ -433,7 +465,7 @@ const is3dSupported = function() {
   }
   // CC-BY-SA Lorenzo Polidori
   // stackoverflow.com/questions/5661671/detecting-transform-translate3d-support
-  if (!globalThis['getComputedStyle']) {
+  if (!global.globalThis['getComputedStyle']) {
     return false;
   }
 
@@ -453,7 +485,7 @@ const is3dSupported = function() {
   for (let t in transforms) {
     if (el.style[t] !== undefined) {
       el.style[t] = 'translate3d(1px,1px,1px)';
-      const computedStyle = globalThis['getComputedStyle'](el);
+      const computedStyle = global.globalThis['getComputedStyle'](el);
       if (!computedStyle) {
         // getComputedStyle in Firefox returns null when Blockly is loaded
         // inside an iframe with display: none.  Returning false and not
diff --git a/core/utils/aria.js b/core/utils/aria.js
index b387b4677..6d9274117 100644
--- a/core/utils/aria.js
+++ b/core/utils/aria.js
@@ -17,7 +17,6 @@
  * @namespace
  */
 goog.module('Blockly.utils.aria');
-goog.module.declareLegacyNamespace();
 
 
 /** ARIA states/properties prefix. */
diff --git a/core/utils/colour.js b/core/utils/colour.js
index 20f437cc7..acdc18a8c 100644
--- a/core/utils/colour.js
+++ b/core/utils/colour.js
@@ -17,7 +17,6 @@
  * @namespace
  */
 goog.module('Blockly.utils.colour');
-goog.module.declareLegacyNamespace();
 
 const internalConstants = goog.require('Blockly.internalConstants');
 
diff --git a/core/utils/coordinate.js b/core/utils/coordinate.js
index ca5a248d3..4376fa83d 100644
--- a/core/utils/coordinate.js
+++ b/core/utils/coordinate.js
@@ -17,7 +17,6 @@
  * @namespace
  */
 goog.module('Blockly.utils.Coordinate');
-goog.module.declareLegacyNamespace();
 
 /**
  * Class for representing coordinates and positions.
diff --git a/core/utils/deprecation.js b/core/utils/deprecation.js
index 870294172..4edfef9a4 100644
--- a/core/utils/deprecation.js
+++ b/core/utils/deprecation.js
@@ -16,7 +16,6 @@
  * @namespace
  */
 goog.module('Blockly.utils.deprecation');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/core/utils/dom.js b/core/utils/dom.js
index f226cf406..f22a1a458 100644
--- a/core/utils/dom.js
+++ b/core/utils/dom.js
@@ -17,7 +17,6 @@
  * @namespace
  */
 goog.module('Blockly.utils.dom');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Svg = goog.requireType('Blockly.utils.Svg');
diff --git a/core/utils/global.js b/core/utils/global.js
index 75b9241bf..b969ad38a 100644
--- a/core/utils/global.js
+++ b/core/utils/global.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.utils.global');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/core/utils/idgenerator.js b/core/utils/idgenerator.js
index 14f78747c..5c8c61b08 100644
--- a/core/utils/idgenerator.js
+++ b/core/utils/idgenerator.js
@@ -15,7 +15,6 @@
  * @namespace
  */
 goog.module('Blockly.utils.idGenerator');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/core/utils/keycodes.js b/core/utils/keycodes.js
index 586d2f97e..1501fa2ac 100644
--- a/core/utils/keycodes.js
+++ b/core/utils/keycodes.js
@@ -17,7 +17,6 @@
  * @namespace
  */
 goog.module('Blockly.utils.KeyCodes');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/core/utils/math.js b/core/utils/math.js
index 9b717d065..c54f6fb0f 100644
--- a/core/utils/math.js
+++ b/core/utils/math.js
@@ -17,7 +17,6 @@
  * @namespace
  */
 goog.module('Blockly.utils.math');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/core/utils/metrics.js b/core/utils/metrics.js
index 55cadfae9..909c5fa39 100644
--- a/core/utils/metrics.js
+++ b/core/utils/metrics.js
@@ -15,7 +15,6 @@
  * @namespace
  */
 goog.module('Blockly.utils.Metrics');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/core/utils/object.js b/core/utils/object.js
index 3507d33ab..bb56d11fd 100644
--- a/core/utils/object.js
+++ b/core/utils/object.js
@@ -15,7 +15,6 @@
  * @namespace
  */
 goog.module('Blockly.utils.object');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/core/utils/rect.js b/core/utils/rect.js
index 85ade5388..a77ee3728 100644
--- a/core/utils/rect.js
+++ b/core/utils/rect.js
@@ -17,7 +17,6 @@
  * @namespace
  */
 goog.module('Blockly.utils.Rect');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/core/utils/size.js b/core/utils/size.js
index 56ec2eb91..11d604125 100644
--- a/core/utils/size.js
+++ b/core/utils/size.js
@@ -17,7 +17,6 @@
  * @namespace
  */
 goog.module('Blockly.utils.Size');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/core/utils/string.js b/core/utils/string.js
index ce815616f..f65673f09 100644
--- a/core/utils/string.js
+++ b/core/utils/string.js
@@ -17,7 +17,6 @@
  * @namespace
  */
 goog.module('Blockly.utils.string');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/core/utils/style.js b/core/utils/style.js
index 0fbd22093..13d05e752 100644
--- a/core/utils/style.js
+++ b/core/utils/style.js
@@ -17,7 +17,6 @@
  * @namespace
  */
 goog.module('Blockly.utils.style');
-goog.module.declareLegacyNamespace();
 
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Size = goog.require('Blockly.utils.Size');
diff --git a/core/utils/svg.js b/core/utils/svg.js
index 39392790e..79b55248e 100644
--- a/core/utils/svg.js
+++ b/core/utils/svg.js
@@ -16,7 +16,6 @@
  * @namespace
  */
 goog.module('Blockly.utils.Svg');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/core/utils/svg_paths.js b/core/utils/svg_paths.js
index 7286e8bc6..a1f9bf2e8 100644
--- a/core/utils/svg_paths.js
+++ b/core/utils/svg_paths.js
@@ -16,7 +16,6 @@
  * @namespace
  */
 goog.module('Blockly.utils.svgPaths');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/core/utils/toolbox.js b/core/utils/toolbox.js
index 73b57cbd7..34208bf13 100644
--- a/core/utils/toolbox.js
+++ b/core/utils/toolbox.js
@@ -15,7 +15,6 @@
  * @namespace
  */
 goog.module('Blockly.utils.toolbox');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ToolboxCategory = goog.requireType('Blockly.ToolboxCategory');
diff --git a/core/utils/useragent.js b/core/utils/useragent.js
index 011e72eb0..245a23c27 100644
--- a/core/utils/useragent.js
+++ b/core/utils/useragent.js
@@ -17,7 +17,6 @@
  * @namespace
  */
 goog.module('Blockly.utils.userAgent');
-goog.module.declareLegacyNamespace();
 
 const {globalThis} = goog.require('Blockly.utils.global');
 
diff --git a/core/utils/xml.js b/core/utils/xml.js
index 34dfdb170..af3043de2 100644
--- a/core/utils/xml.js
+++ b/core/utils/xml.js
@@ -17,7 +17,6 @@
  * @namespace
  */
 goog.module('Blockly.utils.xml');
-goog.module.declareLegacyNamespace();
 
 const {globalThis} = goog.require('Blockly.utils.global');
 
diff --git a/package-lock.json b/package-lock.json
index 99f8989af..c4172ca05 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,6 +5,7 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "blockly",
       "version": "6.20210701.0",
       "license": "Apache-2.0",
       "dependencies": {
@@ -12,7 +13,7 @@
       },
       "devDependencies": {
         "@blockly/block-test": "^1.0.0",
-        "@blockly/dev-tools": "^2.6.0",
+        "@blockly/dev-tools": "^2.6.1-beta.0",
         "@blockly/theme-modern": "^2.1.1",
         "@wdio/selenium-standalone-service": "^6.11.0",
         "babel-eslint": "^10.1.0",
@@ -278,9 +279,9 @@
       }
     },
     "node_modules/@blockly/dev-tools": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-2.6.0.tgz",
-      "integrity": "sha512-/FRRg4/WQMEf2hMA5dcpjh2W6HwxgBK+a9fLuUDNckH+QMenO+6wk/YkZpQStyMu+EP8BDP8L2Z4iSORAenl8w==",
+      "version": "2.6.1-beta.0",
+      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-2.6.1-beta.0.tgz",
+      "integrity": "sha512-GKnOT+EkvhRtwG6ZRseWEFB96xMyzzY6CPCkPHbCHGNnOB4Z4j3jmU2zIMkWG8lR8pQF0CCWKZinDrMtXSeLjQ==",
       "dev": true,
       "dependencies": {
         "@blockly/block-test": "^1.1.5",
@@ -12734,9 +12735,9 @@
       "requires": {}
     },
     "@blockly/dev-tools": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-2.6.0.tgz",
-      "integrity": "sha512-/FRRg4/WQMEf2hMA5dcpjh2W6HwxgBK+a9fLuUDNckH+QMenO+6wk/YkZpQStyMu+EP8BDP8L2Z4iSORAenl8w==",
+      "version": "2.6.1-beta.0",
+      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-2.6.1-beta.0.tgz",
+      "integrity": "sha512-GKnOT+EkvhRtwG6ZRseWEFB96xMyzzY6CPCkPHbCHGNnOB4Z4j3jmU2zIMkWG8lR8pQF0CCWKZinDrMtXSeLjQ==",
       "dev": true,
       "requires": {
         "@blockly/block-test": "^1.1.5",
diff --git a/package.json b/package.json
index d06842b0e..dc83a9df4 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@blockly/block-test": "^1.0.0",
-    "@blockly/dev-tools": "^2.6.0",
+    "@blockly/dev-tools": "^2.6.1-beta.0",
     "@blockly/theme-modern": "^2.1.1",
     "@wdio/selenium-standalone-service": "^6.11.0",
     "babel-eslint": "^10.1.0",
diff --git a/tests/deps.js b/tests/deps.js
index 86ee6ee14..86160bb66 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -211,7 +211,7 @@ goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.brows
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], ['Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/scripts/check_metadata.sh b/tests/scripts/check_metadata.sh
index 642be7191..b716d0063 100755
--- a/tests/scripts/check_metadata.sh
+++ b/tests/scripts/check_metadata.sh
@@ -25,8 +25,9 @@ readonly BUILD_DIR='build'
 # Q4 2020	4.20201217.0	653624
 # Q1 2021	5.20210325.0	653957
 # Q2 2021	6.20210701.0	664497
-# Q3 2021	6.20210701.0	731695 (mid-quarter goog.module conversion change)
-readonly BLOCKLY_SIZE_EXPECTED=731695
+# Q3 2021	6.20210701.0	731695 (mid-quarter goog.module conversion)
+# Q3 2021	6.20210701.0	808807 (late-quarter goog.module conversion)
+readonly BLOCKLY_SIZE_EXPECTED=808807
 
 # Size of blocks_compressed.js
 # Q2 2019	2.20190722.0	75618
@@ -51,8 +52,9 @@ readonly BLOCKS_SIZE_EXPECTED=76669
 # Q4 2020	4.20201217.0	138115
 # Q1 2021	5.20210325.0	136118
 # Q2 2021	6.20210701.0	142112
-# Q3 2021	6.20210701.0	147476 (mid-quarter goog.module conversion change)
-readonly BLOCKLY_GZ_SIZE_EXPECTED=147476
+# Q3 2021	6.20210701.0	147476 (mid-quarter goog.module conversion)
+# Q3 2021	6.20210701.0	152025 (late-quarter goog.module conversion)
+readonly BLOCKLY_GZ_SIZE_EXPECTED=152025
 
 # Size of blocks_compressed.js.gz
 # Q2 2019	2.20190722.0	14552

From 5b1586ee1b4e194270d69f9467d273a2c1bdba56 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 16 Sep 2021 13:00:38 -0700
Subject: [PATCH 749/833] test: update mocha tests to use goog_module (#5440)

* Use goog.module in mocha tests

* Fix compiler warnings

* Make test helpers a module

* Name test modules Blockly.test.*

This is to be more consistent with how non-test modules are named.

Also remove top-level goog.require of TestHelpers (now
Blockly.test.helpers) since requiring a side-effect-less module does
nothing.

* Convert block_test.js and comment_test.js to goog.module syntax

* Address PR comments

* Goog modulify tests

* Goog modulify toolbox helpers

* Fixes imports and moves common tests from workspace_test.js to a helper file.

* Update test deps after rebase

Co-authored-by: Christopher Allen <cpcallen+git@google.com>
---
 generators/javascript/text.js                |    4 +-
 generators/python/text.js                    |    4 +-
 scripts/gulpfiles/build_tasks.js             |   12 +
 tests/deps.mocha.js                          |  359 ++++
 tests/mocha/.eslintrc.json                   |   43 +-
 tests/mocha/astnode_test.js                  |    5 +
 tests/mocha/block_json_test.js               |    3 +
 tests/mocha/block_test.js                    |    5 +
 tests/mocha/comment_test.js                  |    5 +
 tests/mocha/connection_checker_test.js       |    5 +
 tests/mocha/connection_db_test.js            |    5 +
 tests/mocha/connection_test.js               |    5 +
 tests/mocha/contextmenu_items_test.js        |    5 +
 tests/mocha/cursor_test.js                   |    5 +
 tests/mocha/dropdowndiv_test.js              |    5 +-
 tests/mocha/event_test.js                    |    4 +
 tests/mocha/extensions_test.js               |    5 +
 tests/mocha/field_angle_test.js              |    5 +
 tests/mocha/field_checkbox_test.js           |    5 +
 tests/mocha/field_colour_test.js             |    5 +
 tests/mocha/field_dropdown_test.js           |    5 +
 tests/mocha/field_image_test.js              |    5 +
 tests/mocha/field_label_serializable_test.js |    5 +
 tests/mocha/field_label_test.js              |    5 +
 tests/mocha/field_multilineinput_test.js     |    5 +
 tests/mocha/field_number_test.js             |    5 +
 tests/mocha/field_registry_test.js           |    9 +-
 tests/mocha/field_test.js                    |    5 +
 tests/mocha/field_textinput_test.js          |    5 +
 tests/mocha/field_variable_test.js           |    5 +
 tests/mocha/flyout_test.js                   |    6 +
 tests/mocha/generator_test.js                |    4 +
 tests/mocha/gesture_test.js                  |    9 +-
 tests/mocha/index.html                       |  111 +-
 tests/mocha/input_test.js                    |    5 +
 tests/mocha/insertion_marker_test.js         |    5 +
 tests/mocha/json_test.js                     |    5 +
 tests/mocha/keydown_test.js                  |    5 +
 tests/mocha/logic_ternary_test.js            |    5 +
 tests/mocha/metrics_test.js                  |    9 +-
 tests/mocha/names_test.js                    |    9 +-
 tests/mocha/procedures_test.js               |    5 +
 tests/mocha/procedures_test_helpers.js       |   17 +-
 tests/mocha/registry_test.js                 |    9 +-
 tests/mocha/run_mocha_tests_in_browser.js    |    2 +-
 tests/mocha/shortcut_registry_test.js        |    5 +
 tests/mocha/test_helpers.js                  |   49 +-
 tests/mocha/theme_test.js                    |    9 +-
 tests/mocha/toolbox_helper.js                |   13 +
 tests/mocha/toolbox_test.js                  |    6 +
 tests/mocha/tooltip_test.js                  |    5 +
 tests/mocha/trashcan_test.js                 |    5 +
 tests/mocha/utils_test.js                    |    5 +
 tests/mocha/variable_map_test.js             |    5 +
 tests/mocha/variable_model_test.js           |    5 +
 tests/mocha/variables_test.js                |    5 +
 tests/mocha/widget_div_test.js               |    5 +
 tests/mocha/workspace_comment_test.js        |    4 +
 tests/mocha/workspace_helpers.js             | 1534 ++++++++++++++++++
 tests/mocha/workspace_svg_test.js            |    7 +-
 tests/mocha/workspace_test.js                | 1529 +----------------
 tests/mocha/xml_test.js                      |    5 +
 tests/mocha/zoom_controls_test.js            |    5 +
 63 files changed, 2284 insertions(+), 1671 deletions(-)
 create mode 100644 tests/deps.mocha.js
 create mode 100644 tests/mocha/workspace_helpers.js

diff --git a/generators/javascript/text.js b/generators/javascript/text.js
index 6c18c58d0..b723d8fc3 100644
--- a/generators/javascript/text.js
+++ b/generators/javascript/text.js
@@ -33,8 +33,8 @@ Blockly.JavaScript['text_multiline'] = function(block) {
  * Enclose the provided value in 'String(...)' function.
  * Leave string literals alone.
  * @param {string} value Code evaluating to a value.
- * @return {[string, number]} Array containing code evaluating to a string and
- *    the order of the returned code.
+ * @return {Array<string|number>} Array containing code evaluating to a string and
+ *    the order of the returned code.[string, number]
  * @private
  */
 Blockly.JavaScript.text.forceString_ = function(value) {
diff --git a/generators/python/text.js b/generators/python/text.js
index 0771f4ade..d277190f5 100644
--- a/generators/python/text.js
+++ b/generators/python/text.js
@@ -33,8 +33,8 @@ Blockly.Python['text_multiline'] = function(block) {
  * Enclose the provided value in 'str(...)' function.
  * Leave string literals alone.
  * @param {string} value Code evaluating to a value.
- * @return {[string, number]} Array containing code evaluating to a string and
- *    the order of the returned code.
+ * @return {Array<string|number>} Array containing code evaluating to a string and
+ *    the order of the returned code.[string, number]
  * @private
  */
 Blockly.Python.text.forceString_ = function(value) {
diff --git a/scripts/gulpfiles/build_tasks.js b/scripts/gulpfiles/build_tasks.js
index 318304189..0449e5ae0 100644
--- a/scripts/gulpfiles/build_tasks.js
+++ b/scripts/gulpfiles/build_tasks.js
@@ -337,13 +337,25 @@ function buildDeps(done) {
   const closurePath = argv.closureLibrary ?
       'node_modules/google-closure-library/closure/goog' :
       'closure/goog';
+
   const roots = [
     closurePath,
     'core',
     'blocks',
   ];
+
+  const testRoots = [
+    ...roots,
+    'generators',
+    'tests/mocha'
+  ];
+
   const args = roots.map(root => `--root '${root}' `).join('');
   execSync(`closure-make-deps ${args} > tests/deps.js`, {stdio: 'inherit'});
+
+  const testArgs = testRoots.map(root => `--root '${root}' `).join('');
+  execSync(`closure-make-deps ${testArgs} > tests/deps.mocha.js`,
+      {stdio: 'inherit'});
   done();
 };
 
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
new file mode 100644
index 000000000..4c5f41305
--- /dev/null
+++ b/tests/deps.mocha.js
@@ -0,0 +1,359 @@
+goog.addDependency('../../blocks/colour.js', ['Blockly.Blocks.colour', 'Blockly.Constants.Colour'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldColour', 'Blockly.FieldLabel']);
+goog.addDependency('../../blocks/lists.js', ['Blockly.Constants.Lists'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator']);
+goog.addDependency('../../blocks/logic.js', ['Blockly.Blocks.logic', 'Blockly.Constants.Logic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator']);
+goog.addDependency('../../blocks/loops.js', ['Blockly.Blocks.loops', 'Blockly.Constants.Loops'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable', 'Blockly.Warning']);
+goog.addDependency('../../blocks/math.js', ['Blockly.Blocks.math', 'Blockly.Constants.Math'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable']);
+goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'], ['Blockly', 'Blockly.Blocks', 'Blockly.Comment', 'Blockly.FieldCheckbox', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.Mutator', 'Blockly.Warning'], {'lang': 'es5'});
+goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator']);
+goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
+goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
+goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+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.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
+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'});
+goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/bump_objects.js', ['Blockly.bumpObjects'], ['Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.dialog', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/dialog.js', ['Blockly.dialog'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils.deprecation', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.BlockBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_base.js', ['Blockly.Events.CommentBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_change.js', ['Blockly.Events.CommentChange'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_create.js', ['Blockly.Events.CommentCreate'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_delete.js', ['Blockly.Events.CommentDelete'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_move.js', ['Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_ui.js', ['Blockly.Events.Ui'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_ui_base.js', ['Blockly.Events.UiBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_base.js', ['Blockly.Events.VarBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_create.js', ['Blockly.Events.VarCreate'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.VarDelete'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['Blockly.DropDownDiv', 'Blockly.Field', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabelSerializable'], ['Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.common', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_collapsible_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_copyable.js', ['Blockly.ICopyable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_deletable.js', ['Blockly.IDeletable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_keyboard_accessible.js', ['Blockly.IKeyboardAccessible'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_selectable_toolbox_item.js', ['Blockly.ISelectableToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.IToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstants'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], [], {'lang': 'es6', 'module': 'goog'});
+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.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/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', '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', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.deprecation', 'Blockly.utils.idGenerator', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/measurables/inline_input.js', ['Blockly.geras.InlineInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/measurables/statement_input.js', ['Blockly.geras.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/bottom_row.js', ['Blockly.blockRendering.BottomRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/connection.js', ['Blockly.blockRendering.Connection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/external_value_input.js', ['Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/field.js', ['Blockly.blockRendering.Field'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/hat.js', ['Blockly.blockRendering.Hat'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/icon.js', ['Blockly.blockRendering.Icon'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/in_row_spacer.js', ['Blockly.blockRendering.InRowSpacer'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/inline_input.js', ['Blockly.blockRendering.InlineInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/input_connection.js', ['Blockly.blockRendering.InputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/input_row.js', ['Blockly.blockRendering.InputRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/jagged_edge.js', ['Blockly.blockRendering.JaggedEdge'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/next_connection.js', ['Blockly.blockRendering.NextConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/output_connection.js', ['Blockly.blockRendering.OutputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/previous_connection.js', ['Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/round_corner.js', ['Blockly.blockRendering.RoundCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/row.js', ['Blockly.blockRendering.Row'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/spacer_row.js', ['Blockly.blockRendering.SpacerRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/square_corner.js', ['Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/top_row.js', ['Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist.RenderInfo'], ['Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/measurables/bottom_row.js', ['Blockly.zelos.BottomRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
+goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly', 'Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly', 'Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], ['Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], [], {'module': 'goog'});
+goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.idGenerator'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Blockly.utils.Coordinate', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.dialog', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.dialog', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.idGenerator', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils.Coordinate', 'Blockly.utils.idGenerator', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../generators/dart.js', ['Blockly.Dart'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.string']);
+goog.addDependency('../../generators/dart/colour.js', ['Blockly.Dart.colour'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/lists.js', ['Blockly.Dart.lists'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/logic.js', ['Blockly.Dart.logic'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/loops.js', ['Blockly.Dart.loops'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/math.js', ['Blockly.Dart.math'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/procedures.js', ['Blockly.Dart.procedures'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/text.js', ['Blockly.Dart.texts'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/variables.js', ['Blockly.Dart.variables'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/variables_dynamic.js', ['Blockly.Dart.variablesDynamic'], ['Blockly.Dart', 'Blockly.Dart.variables']);
+goog.addDependency('../../generators/javascript.js', ['Blockly.JavaScript'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.global', 'Blockly.utils.object', 'Blockly.utils.string']);
+goog.addDependency('../../generators/javascript/colour.js', ['Blockly.JavaScript.colour'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/lists.js', ['Blockly.JavaScript.lists'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/logic.js', ['Blockly.JavaScript.logic'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/loops.js', ['Blockly.JavaScript.loops'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/math.js', ['Blockly.JavaScript.math'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/procedures.js', ['Blockly.JavaScript.procedures'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/text.js', ['Blockly.JavaScript.texts'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/variables.js', ['Blockly.JavaScript.variables'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/variables_dynamic.js', ['Blockly.JavaScript.variablesDynamic'], ['Blockly.JavaScript', 'Blockly.JavaScript.variables']);
+goog.addDependency('../../generators/lua.js', ['Blockly.Lua'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.utils.string']);
+goog.addDependency('../../generators/lua/colour.js', ['Blockly.Lua.colour'], ['Blockly.Lua']);
+goog.addDependency('../../generators/lua/lists.js', ['Blockly.Lua.lists'], ['Blockly.Lua']);
+goog.addDependency('../../generators/lua/logic.js', ['Blockly.Lua.logic'], ['Blockly.Lua']);
+goog.addDependency('../../generators/lua/loops.js', ['Blockly.Lua.loops'], ['Blockly.Lua']);
+goog.addDependency('../../generators/lua/math.js', ['Blockly.Lua.math'], ['Blockly.Lua']);
+goog.addDependency('../../generators/lua/procedures.js', ['Blockly.Lua.procedures'], ['Blockly.Lua']);
+goog.addDependency('../../generators/lua/text.js', ['Blockly.Lua.texts'], ['Blockly.Lua'], {'lang': 'es5'});
+goog.addDependency('../../generators/lua/variables.js', ['Blockly.Lua.variables'], ['Blockly.Lua']);
+goog.addDependency('../../generators/lua/variables_dynamic.js', ['Blockly.Lua.variablesDynamic'], ['Blockly.Lua', 'Blockly.Lua.variables']);
+goog.addDependency('../../generators/php.js', ['Blockly.PHP'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.utils.string']);
+goog.addDependency('../../generators/php/colour.js', ['Blockly.PHP.colour'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/lists.js', ['Blockly.PHP.lists'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/logic.js', ['Blockly.PHP.logic'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/loops.js', ['Blockly.PHP.loops'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/math.js', ['Blockly.PHP.math'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/procedures.js', ['Blockly.PHP.procedures'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/text.js', ['Blockly.PHP.texts'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/variables.js', ['Blockly.PHP.variables'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/variables_dynamic.js', ['Blockly.PHP.variablesDynamic'], ['Blockly.PHP', 'Blockly.PHP.variables']);
+goog.addDependency('../../generators/python.js', ['Blockly.Python'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.string']);
+goog.addDependency('../../generators/python/colour.js', ['Blockly.Python.colour'], ['Blockly.Python']);
+goog.addDependency('../../generators/python/lists.js', ['Blockly.Python.lists'], ['Blockly.Python']);
+goog.addDependency('../../generators/python/logic.js', ['Blockly.Python.logic'], ['Blockly.Python']);
+goog.addDependency('../../generators/python/loops.js', ['Blockly.Python.loops'], ['Blockly.Python']);
+goog.addDependency('../../generators/python/math.js', ['Blockly.Python.math'], ['Blockly.Python']);
+goog.addDependency('../../generators/python/procedures.js', ['Blockly.Python.procedures'], ['Blockly.Python']);
+goog.addDependency('../../generators/python/text.js', ['Blockly.Python.texts'], ['Blockly.Python']);
+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/block_json_test.js', ['Blockly.test.blockJson'], [], {'lang': 'es5', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/block_test.js', ['Blockly.test.blocks'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/comment_test.js', ['Blockly.test.comments'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/connection_checker_test.js', ['Blockly.test.connectionChecker'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+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/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/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'});
+goog.addDependency('../../tests/mocha/field_colour_test.js', ['Blockly.test.fieldColour'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/field_dropdown_test.js', ['Blockly.test.fieldDropdown'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/field_image_test.js', ['Blockly.test.fieldImage'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/field_label_serializable_test.js', ['Blockly.test.fieldLabelSerialization'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/field_label_test.js', ['Blockly.test.fieldLabel'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/field_multilineinput_test.js', ['Blockly.test.fieldMultiline'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/field_number_test.js', ['Blockly.test.fieldNumber'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/field_registry_test.js', ['Blockly.test.fieldRegistry'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/field_test.js', ['Blockly.test.fieldTest'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/field_textinput_test.js', ['Blockly.test.fieldTextInput'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/field_variable_test.js', ['Blockly.test.fieldVariable'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/flyout_test.js', ['Blockly.test.flyout'], ['Blockly.test.helpers', 'Blockly.test.toolboxHelpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/generator_test.js', ['Blockly.test.generator'], ['Blockly.Dart', 'Blockly.JavaScript', 'Blockly.Lua', 'Blockly.PHP', 'Blockly.Python', 'Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/gesture_test.js', ['Blockly.test.gesture'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/input_test.js', ['Blockly.test.input'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/insertion_marker_test.js', ['Blockly.test.insertionMarker'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/json_test.js', ['Blockly.test.json'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/keydown_test.js', ['Blockly.test.keydown'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/logic_ternary_test.js', ['Blockly.test.logicTernary'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/metrics_test.js', ['Blockly.test.metrics'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/names_test.js', ['Blockly.test.names'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/procedures_test.js', ['Blockly.test.procedures'], ['Blockly.Blocks.procedures', 'Blockly.Msg', 'Blockly.test.helpers', 'Blockly.test.procedureHelpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/procedures_test_helpers.js', ['Blockly.test.procedureHelpers'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/registry_test.js', ['Blockly.test.registry'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/run_mocha_tests_in_browser.js', [], [], {'lang': 'es8'});
+goog.addDependency('../../tests/mocha/shortcut_registry_test.js', ['Blockly.test.shortcutRegistry'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/test_helpers.js', ['Blockly.test.helpers'], ['Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/theme_test.js', ['Blockly.test.theme'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/toolbox_helper.js', ['Blockly.test.toolboxHelpers'], [], {'lang': 'es5', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/toolbox_test.js', ['Blockly.test.toolbox'], ['Blockly.test.helpers', 'Blockly.test.toolboxHelpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/tooltip_test.js', ['Blockly.test.tooltip'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/trashcan_test.js', ['Blockly.test.trashcan'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/utils_test.js', ['Blockly.test.utils'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/variable_map_test.js', ['Blockly.test.variableMap'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/variable_model_test.js', ['Blockly.test.variableModel'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/variables_test.js', ['Blockly.test.variables'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/widget_div_test.js', ['Blockly.test.widgetDiv'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/workspace_comment_test.js', ['Blockly.test.workspaceComment'], ['Blockly.WorkspaceComment', 'Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/workspace_helpers.js', ['Blockly.test.workspaceHelpers'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/workspace_svg_test.js', ['Blockly.test.workspaceSvg'], ['Blockly.test.helpers', 'Blockly.test.workspaceHelpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/workspace_test.js', ['Blockly.test.workspace'], ['Blockly.test.helpers', 'Blockly.test.workspaceHelpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/xml_test.js', ['Blockly.test.xml'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/zoom_controls_test.js', ['Blockly.test.zoomControls'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('base.js', [], []);
+
diff --git a/tests/mocha/.eslintrc.json b/tests/mocha/.eslintrc.json
index 47ffaefb5..0aa6e5b1e 100644
--- a/tests/mocha/.eslintrc.json
+++ b/tests/mocha/.eslintrc.json
@@ -7,48 +7,7 @@
     "globals": {
         "chai": false,
         "sinon": false,
-        "addBlockTypeToCleanup": true,
-        "addMessageToCleanup": true,
-        "assertArrayEquals": true,
-        "assertCallBlockStructure": true,
-        "assertDefBlockStructure": true,
-        "assertDeprecationWarningCall": true,
-        "assertEventEquals": true,
-        "assertEventFired": true,
-        "assertEventNotFired": true,
-        "assertNthCallEventArgEquals": true,
-        "assertSingleDeprecationWarningCall": true,
-        "assertVariableValues": true,
-        "assertNoWarnings": true,
-        "assertWarnings": true,
-        "captureWarnings": false,
-        "createDeprecationWarningStub": true,
-        "createKeyDownEvent": true,
-        "createRenderedBlock": true,
-        "createTestBlock": true,
-        "defineBasicBlockWithField": true,
-        "defineRowBlock": true,
-        "defineStackBlock": true,
-        "defineStatementBlock": true,
-        "dispatchPointerEvent": true,
-        "createFireChangeListenerSpy": true,
-        "createGenUidStubWithReturns": true,
-        "getBasicToolbox": true,
-        "getCategoryJSON": true,
-        "getChildItem": true,
-        "getCollapsibleItem": true,
-        "getDeeplyNestedJSON": true,
-        "getInjectedToolbox": true,
-        "getNonCollapsibleItem": true,
-        "getSeparator": true,
-        "getSimpleJSON": true,
-        "getXmlArray": true,
-        "sharedTestSetup": true,
-        "sharedTestTeardown": true,
-        "simulateClick": true,
-        "testAWorkspace": true,
-        "testHelpers": true,
-        "workspaceTeardown": true
+        "testHelpers": true
     },
     "rules": {
         "no-unused-vars": ["off"],
diff --git a/tests/mocha/astnode_test.js b/tests/mocha/astnode_test.js
index c5169936e..c2bf7cd72 100644
--- a/tests/mocha/astnode_test.js
+++ b/tests/mocha/astnode_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.astNode');
+
+const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('ASTNode', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/block_json_test.js b/tests/mocha/block_json_test.js
index 5ed3a04b8..d067784d8 100644
--- a/tests/mocha/block_json_test.js
+++ b/tests/mocha/block_json_test.js
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.blockJson');
+
+
 suite('Block JSON initialization', function() {
   suite('validateTokens_', function() {
     setup(function() {
diff --git a/tests/mocha/block_test.js b/tests/mocha/block_test.js
index 7c841a134..19d2f750b 100644
--- a/tests/mocha/block_test.js
+++ b/tests/mocha/block_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.blocks');
+
+const {createDeprecationWarningStub, createRenderedBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Blocks', function() {
   setup(function() {
     sharedTestSetup.call(this, {fireEventsNow: false});
diff --git a/tests/mocha/comment_test.js b/tests/mocha/comment_test.js
index 5cedf6709..096fe6940 100644
--- a/tests/mocha/comment_test.js
+++ b/tests/mocha/comment_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.comments');
+
+const {assertEventFired, createDeprecationWarningStub, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Comments', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/connection_checker_test.js b/tests/mocha/connection_checker_test.js
index cb6b126db..ab2281198 100644
--- a/tests/mocha/connection_checker_test.js
+++ b/tests/mocha/connection_checker_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.connectionChecker');
+
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Connection checker', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/connection_db_test.js b/tests/mocha/connection_db_test.js
index d05c7ba98..91df4e819 100644
--- a/tests/mocha/connection_db_test.js
+++ b/tests/mocha/connection_db_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.connectionDb');
+
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Connection Database', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/connection_test.js b/tests/mocha/connection_test.js
index 67f2c75e2..eaaa07876 100644
--- a/tests/mocha/connection_test.js
+++ b/tests/mocha/connection_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.connection');
+
+const {assertSingleDeprecationWarningCall, createDeprecationWarningStub, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Connection', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/contextmenu_items_test.js b/tests/mocha/contextmenu_items_test.js
index 44cd43b0f..e9fd4efed 100644
--- a/tests/mocha/contextmenu_items_test.js
+++ b/tests/mocha/contextmenu_items_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.contextMenuItem');
+
+const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Context Menu Items', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/cursor_test.js b/tests/mocha/cursor_test.js
index f689526f2..1359b1a68 100644
--- a/tests/mocha/cursor_test.js
+++ b/tests/mocha/cursor_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.cursor');
+
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Cursor', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/dropdowndiv_test.js b/tests/mocha/dropdowndiv_test.js
index d54d8ad33..75027a82b 100644
--- a/tests/mocha/dropdowndiv_test.js
+++ b/tests/mocha/dropdowndiv_test.js
@@ -4,8 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.dropdown');
+
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
 
-const DropDownDiv = goog.require('Blockly.DropDownDiv');
 suite('DropDownDiv', function() {
   suite('Positioning', function() {
     setup(function() {
diff --git a/tests/mocha/event_test.js b/tests/mocha/event_test.js
index febcaf1c3..499ab6b47 100644
--- a/tests/mocha/event_test.js
+++ b/tests/mocha/event_test.js
@@ -4,8 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.event');
+
+const {assertEventEquals, assertNthCallEventArgEquals, assertVariableValues, createFireChangeListenerSpy, createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
 goog.require('Blockly.WorkspaceComment');
 
+
 suite('Events', function() {
   setup(function() {
     sharedTestSetup.call(this, {fireEventsNow: false});
diff --git a/tests/mocha/extensions_test.js b/tests/mocha/extensions_test.js
index 5c5cc23f5..1e0645b2e 100644
--- a/tests/mocha/extensions_test.js
+++ b/tests/mocha/extensions_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.extensions');
+
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Extensions', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/field_angle_test.js b/tests/mocha/field_angle_test.js
index 7a1eb928c..0ff4c4d15 100644
--- a/tests/mocha/field_angle_test.js
+++ b/tests/mocha/field_angle_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.fieldAngle');
+
+const {createTestBlock, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Angle Fields', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/field_checkbox_test.js b/tests/mocha/field_checkbox_test.js
index 5a10ef57f..e8478fac3 100644
--- a/tests/mocha/field_checkbox_test.js
+++ b/tests/mocha/field_checkbox_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.fieldCheckbox');
+
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Checkbox Fields', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/field_colour_test.js b/tests/mocha/field_colour_test.js
index e779bf831..883e7d388 100644
--- a/tests/mocha/field_colour_test.js
+++ b/tests/mocha/field_colour_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.fieldColour');
+
+const {createTestBlock, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Colour Fields', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/field_dropdown_test.js b/tests/mocha/field_dropdown_test.js
index 95ad8eacf..2923e8830 100644
--- a/tests/mocha/field_dropdown_test.js
+++ b/tests/mocha/field_dropdown_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.fieldDropdown');
+
+const {createTestBlock, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Dropdown Fields', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/field_image_test.js b/tests/mocha/field_image_test.js
index 2bbd06664..48d8b3e5f 100644
--- a/tests/mocha/field_image_test.js
+++ b/tests/mocha/field_image_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.fieldImage');
+
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Image Fields', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/field_label_serializable_test.js b/tests/mocha/field_label_serializable_test.js
index 330241503..99631a38d 100644
--- a/tests/mocha/field_label_serializable_test.js
+++ b/tests/mocha/field_label_serializable_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.fieldLabelSerialization');
+
+const {createTestBlock, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Label Serializable Fields', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/field_label_test.js b/tests/mocha/field_label_test.js
index b0b7162a0..d7e381ac8 100644
--- a/tests/mocha/field_label_test.js
+++ b/tests/mocha/field_label_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.fieldLabel');
+
+const {createTestBlock, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Label Fields', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/field_multilineinput_test.js b/tests/mocha/field_multilineinput_test.js
index 844593f86..7180b493b 100644
--- a/tests/mocha/field_multilineinput_test.js
+++ b/tests/mocha/field_multilineinput_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.fieldMultiline');
+
+const {createTestBlock, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Multiline Input Fields', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/field_number_test.js b/tests/mocha/field_number_test.js
index 338aa4ad0..2cb5e62d1 100644
--- a/tests/mocha/field_number_test.js
+++ b/tests/mocha/field_number_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.fieldNumber');
+
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Number Fields', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/field_registry_test.js b/tests/mocha/field_registry_test.js
index 29338d533..89e96760a 100644
--- a/tests/mocha/field_registry_test.js
+++ b/tests/mocha/field_registry_test.js
@@ -4,11 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @fileoverview Tests for Blockly.fieldRegistry
- * @author bekawestberg@gmail.com (Beka Westberg)
- */
-'use strict';
+goog.module('Blockly.test.fieldRegistry');
+
+const {createDeprecationWarningStub, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
 
 suite('Field Registry', function() {
   function CustomFieldType(value) {
diff --git a/tests/mocha/field_test.js b/tests/mocha/field_test.js
index f89193d4b..46fd65d69 100644
--- a/tests/mocha/field_test.js
+++ b/tests/mocha/field_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.fieldTest');
+
+const {addBlockTypeToCleanup, addMessageToCleanup, createDeprecationWarningStub, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Abstract Fields', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/field_textinput_test.js b/tests/mocha/field_textinput_test.js
index c777134c3..daf56d971 100644
--- a/tests/mocha/field_textinput_test.js
+++ b/tests/mocha/field_textinput_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.fieldTextInput');
+
+const {createTestBlock, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Text Input Fields', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/field_variable_test.js b/tests/mocha/field_variable_test.js
index eab65a16e..06a0912c2 100644
--- a/tests/mocha/field_variable_test.js
+++ b/tests/mocha/field_variable_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.fieldVariable');
+
+const {createGenUidStubWithReturns, createTestBlock, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Variable Fields', function() {
   var FAKE_VARIABLE_NAME = 'default_name';
   var FAKE_ID = 'id1';
diff --git a/tests/mocha/flyout_test.js b/tests/mocha/flyout_test.js
index 6ccd08d90..e860727d8 100644
--- a/tests/mocha/flyout_test.js
+++ b/tests/mocha/flyout_test.js
@@ -4,6 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.flyout');
+
+const {defineStackBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+const {getBasicToolbox, getChildItem, getCollapsibleItem, getDeeplyNestedJSON, getInjectedToolbox, getNonCollapsibleItem, getSeparator, getSimpleJSON, getXmlArray} = goog.require('Blockly.test.toolboxHelpers');
+
+
 suite('Flyout', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/generator_test.js b/tests/mocha/generator_test.js
index 9250557ab..945786c75 100644
--- a/tests/mocha/generator_test.js
+++ b/tests/mocha/generator_test.js
@@ -4,11 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.generator');
+
 goog.require('Blockly.Dart');
 goog.require('Blockly.JavaScript');
 goog.require('Blockly.Lua');
 goog.require('Blockly.PHP');
 goog.require('Blockly.Python');
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
 
 suite('Generator', function() {
   setup(function() {
diff --git a/tests/mocha/gesture_test.js b/tests/mocha/gesture_test.js
index ba77a27d1..9311112f9 100644
--- a/tests/mocha/gesture_test.js
+++ b/tests/mocha/gesture_test.js
@@ -4,11 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @fileoverview Tests for gesture.
- * @author marisaleung@google.com (Marisa Leung)
- */
-'use strict';
+goog.module('Blockly.test.gesture');
+
+const {assertEventFired, assertEventNotFired, defineBasicBlockWithField, dispatchPointerEvent, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
 
 suite('Gesture', function() {
   function testGestureIsFieldClick(block, isFieldClick, eventsFireStub){
diff --git a/tests/mocha/index.html b/tests/mocha/index.html
index 1fa12eb4c..ff4661314 100644
--- a/tests/mocha/index.html
+++ b/tests/mocha/index.html
@@ -6,6 +6,7 @@
 
     <link href="../../node_modules/mocha/mocha.css" rel="stylesheet" />
     <script src="../../blockly_uncompressed.js"></script>
+    <script src="../deps.mocha.js"></script>
     <script src="../../generators/dart.js"></script>
     <script src="../../generators/javascript.js"></script>
     <script src="../../generators/lua.js"></script>
@@ -48,62 +49,60 @@
       });
     </script>
 
-    <script src="test_helpers.js"></script>
-    <script src="toolbox_helper.js"></script>
-
-    <script src="astnode_test.js"></script>
-    <script src="block_json_test.js"></script>
-    <script src="block_test.js"></script>
-    <script src="comment_test.js"></script>
-    <script src="connection_db_test.js"></script>
-    <script src="connection_checker_test.js"></script>
-    <script src="connection_test.js"></script>
-    <script src="contextmenu_items_test.js"></script>
-    <script src="cursor_test.js"></script>
-    <script src="dropdowndiv_test.js"></script>
-    <script src="event_test.js"></script>
-    <script src="extensions_test.js"></script>
-    <script src="field_test.js"></script>
-    <script src="field_angle_test.js"></script>
-    <script src="field_checkbox_test.js"></script>
-    <script src="field_colour_test.js"></script>
-    <script src="field_dropdown_test.js"></script>
-    <script src="field_image_test.js"></script>
-    <script src="field_label_test.js"></script>
-    <script src="field_label_serializable_test.js"></script>
-    <script src="field_multilineinput_test.js"></script>
-    <script src="field_number_test.js"></script>
-    <script src="field_registry_test.js"></script>
-    <script src="field_textinput_test.js"></script>
-    <script src="field_variable_test.js"></script>
-    <script src="flyout_test.js"></script>
-    <script src="generator_test.js"></script>
-    <script src="gesture_test.js"></script>
-    <script src="input_test.js"></script>
-    <script src="insertion_marker_test.js"></script>
-    <script src="json_test.js"></script>
-    <script src="shortcut_registry_test.js"></script>
-    <script src="keydown_test.js"></script>
-    <script src="logic_ternary_test.js"></script>
-    <script src="metrics_test.js"></script>
-    <script src="names_test.js"></script>
-    <script src="procedures_test_helpers.js"></script>
-    <script src="procedures_test.js"></script>
-    <script src="registry_test.js"></script>
-    <script src="theme_test.js"></script>
-    <script src="toolbox_test.js"></script>
-    <script src="tooltip_test.js"></script>
-    <script src="trashcan_test.js"></script>
-    <script src="utils_test.js"></script>
-    <script src="variable_map_test.js"></script>
-    <script src="variable_model_test.js"></script>
-    <script src="variables_test.js"></script>
-    <script src="widget_div_test.js"></script>
-    <script src="workspace_test.js"></script>
-    <script src="workspace_svg_test.js"></script>
-    <script src="workspace_comment_test.js"></script>
-    <script src="xml_test.js"></script>
-    <script src="zoom_controls_test.js"></script>
+    <script>
+      goog.require('Blockly.test.astNode');
+      goog.require('Blockly.test.blockJson');
+      goog.require('Blockly.test.blocks');
+      goog.require('Blockly.test.comments');
+      goog.require('Blockly.test.connectionChecker');
+      goog.require('Blockly.test.connectionDb');
+      goog.require('Blockly.test.connection');
+      goog.require('Blockly.test.contextMenuItem');
+      goog.require('Blockly.test.cursor');
+      goog.require('Blockly.test.dropdown');
+      goog.require('Blockly.test.event');
+      goog.require('Blockly.test.extensions');
+      goog.require('Blockly.test.fieldAngle');
+      goog.require('Blockly.test.fieldCheckbox');
+      goog.require('Blockly.test.fieldColour');
+      goog.require('Blockly.test.fieldDropdown');
+      goog.require('Blockly.test.fieldImage');
+      goog.require('Blockly.test.fieldLabelSerialization');
+      goog.require('Blockly.test.fieldLabel');
+      goog.require('Blockly.test.fieldMultiline');
+      goog.require('Blockly.test.fieldNumber');
+      goog.require('Blockly.test.fieldRegistry');
+      goog.require('Blockly.test.fieldTest');
+      goog.require('Blockly.test.fieldTextInput');
+      goog.require('Blockly.test.fieldVariable');
+      goog.require('Blockly.test.flyout');
+      goog.require('Blockly.test.generator');
+      goog.require('Blockly.test.gesture');
+      goog.require('Blockly.test.input');
+      goog.require('Blockly.test.insertionMarker');
+      goog.require('Blockly.test.json');
+      goog.require('Blockly.test.keydown');
+      goog.require('Blockly.test.logicTernary');
+      goog.require('Blockly.test.metrics');
+      goog.require('Blockly.test.names');
+      goog.require('Blockly.test.procedures');
+      goog.require('Blockly.test.registry');
+      goog.require('Blockly.test.shortcutRegistry');
+      goog.require('Blockly.test.theme');
+      goog.require('Blockly.test.toolbox');
+      goog.require('Blockly.test.tooltip');
+      goog.require('Blockly.test.trashcan');
+      goog.require('Blockly.test.utils');
+      goog.require('Blockly.test.variableMap');
+      goog.require('Blockly.test.variableModel');
+      goog.require('Blockly.test.variables');
+      goog.require('Blockly.test.widgetDiv');
+      goog.require('Blockly.test.workspaceComment');
+      goog.require('Blockly.test.workspaceSvg');
+      goog.require('Blockly.test.workspace');
+      goog.require('Blockly.test.xml');
+      goog.require('Blockly.test.zoomControls');
+    </script>
 
     <div id="blocklyDiv"></div>
     <xml xmlns="https://developers.google.com/blockly/xml" id="toolbox-simple" style="display: none">
diff --git a/tests/mocha/input_test.js b/tests/mocha/input_test.js
index e88a84062..1b7f99b31 100644
--- a/tests/mocha/input_test.js
+++ b/tests/mocha/input_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.input');
+
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Inputs', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/insertion_marker_test.js b/tests/mocha/insertion_marker_test.js
index 629ac2c7b..c452e2d2e 100644
--- a/tests/mocha/insertion_marker_test.js
+++ b/tests/mocha/insertion_marker_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.insertionMarker');
+
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('InsertionMarkers', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/json_test.js b/tests/mocha/json_test.js
index d787d72bd..5c4a7a68e 100644
--- a/tests/mocha/json_test.js
+++ b/tests/mocha/json_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.json');
+
+const {addMessageToCleanup, assertNoWarnings, assertWarnings, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('JSON Block Definitions', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/keydown_test.js b/tests/mocha/keydown_test.js
index c7b39d885..f96b37cfb 100644
--- a/tests/mocha/keydown_test.js
+++ b/tests/mocha/keydown_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.keydown');
+
+const {createKeyDownEvent, defineStackBlock, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Key Down', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/logic_ternary_test.js b/tests/mocha/logic_ternary_test.js
index 8f580094f..5e208bfda 100644
--- a/tests/mocha/logic_ternary_test.js
+++ b/tests/mocha/logic_ternary_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.logicTernary');
+
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Logic ternary', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/metrics_test.js b/tests/mocha/metrics_test.js
index bdde32dff..d71191172 100644
--- a/tests/mocha/metrics_test.js
+++ b/tests/mocha/metrics_test.js
@@ -4,11 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @fileoverview Test for the metrics manager.
- * @author aschmiedt@google.com (Abby Schmiedt)
- */
-'use strict';
+goog.module('Blockly.test.metrics');
+
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
 
 suite('Metrics', function() {
   var SCROLL_X = 10;
diff --git a/tests/mocha/names_test.js b/tests/mocha/names_test.js
index 94fb3addc..a7b7458a7 100644
--- a/tests/mocha/names_test.js
+++ b/tests/mocha/names_test.js
@@ -4,11 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @fileoverview Blockly names tests.
- * @author samelh@google.com (Sam El-Husseini)
- */
-'use strict';
+goog.module('Blockly.test.names');
+
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
 
 suite('Names', function() {
   setup(function() {
diff --git a/tests/mocha/procedures_test.js b/tests/mocha/procedures_test.js
index 456997046..713c0aea1 100644
--- a/tests/mocha/procedures_test.js
+++ b/tests/mocha/procedures_test.js
@@ -4,8 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.procedures');
+
 goog.require('Blockly.Blocks.procedures');
 goog.require('Blockly.Msg');
+const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+const {assertCallBlockStructure, assertDefBlockStructure, createProcDefBlock, createProcCallBlock} = goog.require('Blockly.test.procedureHelpers');
+
 
 suite('Procedures', function() {
   setup(function() {
diff --git a/tests/mocha/procedures_test_helpers.js b/tests/mocha/procedures_test_helpers.js
index 3abe470ca..1479bcf30 100644
--- a/tests/mocha/procedures_test_helpers.js
+++ b/tests/mocha/procedures_test_helpers.js
@@ -1,10 +1,16 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+goog.module('Blockly.test.procedureHelpers');
+
 /**
  * Asserts that the procedure definition or call block has the expected var
  * models.
  * @param {!Blockly.Block} block The procedure definition or call block to
  *    check.
  * @param {!Array<string>} varIds An array of variable ids.
- * @private
  */
 function assertBlockVarModels(block, varIds) {
   const expectedVarModels = [];
@@ -18,9 +24,8 @@ function assertBlockVarModels(block, varIds) {
  * Asserts that the procedure call block has the expected arguments.
  * @param {!Blockly.Block} callBlock The procedure definition block.
  * @param {Array<string>=} args An array of argument names.
- * @private
  */
-function assertCallBlockArgsStructure_(callBlock, args) {
+function assertCallBlockArgsStructure(callBlock, args) {
   // inputList also contains "TOPROW"
   chai.assert.equal(callBlock.inputList.length - 1, args.length,
       'call block has the expected number of args');
@@ -74,6 +79,7 @@ function assertDefBlockStructure(defBlock, hasReturn = false,
   chai.assert.sameOrderedMembers(defBlock.getVars(), args);
   assertBlockVarModels(defBlock, varIds);
 }
+exports.assertDefBlockStructure = assertDefBlockStructure;
 
 /**
  * Asserts that the procedure definition block has the expected inputs and
@@ -89,9 +95,10 @@ function assertCallBlockStructure(callBlock, args = [], varIds = []) {
     chai.assert.notInclude(callBlock.toString(), 'with');
   }
 
-  assertCallBlockArgsStructure_(callBlock, args);
+  assertCallBlockArgsStructure(callBlock, args);
   assertBlockVarModels(callBlock, varIds);
 }
+exports.assertCallBlockStructure = assertCallBlockStructure;
 
 /**
  * Creates procedure definition block using domToBlock call.
@@ -115,6 +122,7 @@ function createProcDefBlock(
       '</block>';
   return Blockly.Xml.domToBlock(Blockly.Xml.textToDom(xml), workspace);
 }
+exports.createProcDefBlock = createProcDefBlock;
 
 /**
  * Creates procedure call block using domToBlock call.
@@ -133,3 +141,4 @@ function createProcCallBlock(
       '</block>'
   ), workspace);
 }
+exports.createProcCallBlock = createProcCallBlock;
diff --git a/tests/mocha/registry_test.js b/tests/mocha/registry_test.js
index 1ffff755a..10f01d958 100644
--- a/tests/mocha/registry_test.js
+++ b/tests/mocha/registry_test.js
@@ -4,11 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @fileoverview Tests for Blockly.registry
- * @author aschmiedt@google.com (Abby Schmiedt)
- */
-'use strict';
+goog.module('Blockly.test.registry');
+
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
 
 suite('Registry', function() {
   var TestClass = function() {};
diff --git a/tests/mocha/run_mocha_tests_in_browser.js b/tests/mocha/run_mocha_tests_in_browser.js
index 3034f38cc..7107f2cfe 100644
--- a/tests/mocha/run_mocha_tests_in_browser.js
+++ b/tests/mocha/run_mocha_tests_in_browser.js
@@ -15,7 +15,7 @@ module.exports = runMochaTestsInBrowser;
  * Runs the Mocha tests in this directory in Chrome. It uses webdriverio to
  * launch Chrome and load index.html. Outputs a summary of the test results
  * to the console.
- * @return 0 on success, 1 on failure.
+ * @return {number} 0 on success, 1 on failure.
  */
 async function runMochaTestsInBrowser() {
   var options = {
diff --git a/tests/mocha/shortcut_registry_test.js b/tests/mocha/shortcut_registry_test.js
index 9ca758645..1f01a1acd 100644
--- a/tests/mocha/shortcut_registry_test.js
+++ b/tests/mocha/shortcut_registry_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.shortcutRegistry');
+
+const {createKeyDownEvent, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Keyboard Shortcut Registry Test', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/test_helpers.js b/tests/mocha/test_helpers.js
index a63035bfe..c97ed8253 100644
--- a/tests/mocha/test_helpers.js
+++ b/tests/mocha/test_helpers.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.helpers');
+
+const KeyCodes = goog.require('Blockly.utils.KeyCodes');
+
+
 /**
  * Check if a variable with the given values exists.
  * @param {Blockly.Workspace|Blockly.VariableMap} container The workspace  or
@@ -19,10 +24,11 @@ function assertVariableValues(container, name, type, id) {
   chai.assert.equal(variable.type, type);
   chai.assert.equal(variable.getId(), id);
 }
+exports.assertVariableValues = assertVariableValues;
 
 /**
  * Asserts that the given function logs the provided warning messages.
- * @param {function} innerFunc The function to call.
+ * @param {function()} innerFunc The function to call.
  * @param {Array<!RegExp>|!RegExp} messages A list of regex for the expected
  *    messages (in the expected order).
  */
@@ -36,14 +42,16 @@ function assertWarnings(innerFunc, messages) {
     chai.assert.match(warnings[i], message);
   });
 }
+exports.assertWarnings = assertWarnings;
 
 /**
  * Asserts that the given function logs no warning messages.
- * @param {function} innerFunc The function to call.
+ * @param {function()} innerFunc The function to call.
  */
 function assertNoWarnings(innerFunc) {
   assertWarnings(innerFunc, []);
 }
+exports.assertNoWarnings = assertNoWarnings;
 
 /**
  * Stubs Blockly.utils.deprecation.warn call.
@@ -52,6 +60,7 @@ function assertNoWarnings(innerFunc) {
 function createDeprecationWarningStub() {
   return sinon.stub(Blockly.utils.deprecation, 'warn');
 }
+exports.createDeprecationWarningStub = createDeprecationWarningStub;
 
 /**
  * Asserts whether the given deprecation warning stub or call was called with
@@ -63,6 +72,7 @@ function createDeprecationWarningStub() {
 function assertDeprecationWarningCall(spyOrSpyCall, functionName) {
   sinon.assert.calledWith(spyOrSpyCall, functionName);
 }
+exports.assertDeprecationWarningCall = assertDeprecationWarningCall;
 
 /**
  * Asserts that there was a single deprecation warning call with the given
@@ -75,6 +85,7 @@ function assertSingleDeprecationWarningCall(spy, functionName) {
   sinon.assert.calledOnce(spy);
   assertDeprecationWarningCall(spy.getCall(0), functionName);
 }
+exports.assertSingleDeprecationWarningCall = assertSingleDeprecationWarningCall;
 
 /**
  * Safely disposes of Blockly workspace, logging any errors.
@@ -92,6 +103,7 @@ function workspaceTeardown(workspace) {
     console.error(testRef.fullTitle() + '\n', e);
   }
 }
+exports.workspaceTeardown = workspaceTeardown;
 
 /**
  * Creates stub for Blockly.Events.fire that advances the clock forward after
@@ -121,6 +133,7 @@ function createEventsFireStubFireImmediately_(clock) {
 function addMessageToCleanup(sharedCleanupObj, message) {
   sharedCleanupObj.messagesCleanup_.push(message);
 }
+exports.addMessageToCleanup = addMessageToCleanup;
 
 /**
  * Adds block type to shared cleanup object so that it is cleaned from
@@ -132,6 +145,7 @@ function addMessageToCleanup(sharedCleanupObj, message) {
 function addBlockTypeToCleanup(sharedCleanupObj, blockType) {
   sharedCleanupObj.blockTypesCleanup_.push(blockType);
 }
+exports.addBlockTypeToCleanup = addBlockTypeToCleanup;
 
 /**
  * Wraps Blockly.defineBlocksWithJsonArray using stub in order to keep track of
@@ -192,6 +206,7 @@ function sharedTestSetup(options = {}) {
   this.messagesCleanup_ = this.sharedCleanup.messagesCleanup_;
   wrapDefineBlocksWithJsonArrayWithCleanup_(this.sharedCleanup);
 }
+exports.sharedTestSetup = sharedTestSetup;
 
 /**
  * Shared cleanup method that clears up pending setTimeout calls, disposes of
@@ -244,6 +259,7 @@ function sharedTestTeardown() {
     Blockly.WidgetDiv.testOnly_setDiv(null);
   }
 }
+exports.sharedTestTeardown = sharedTestTeardown;
 
 /**
  * Creates stub for Blockly.utils.genUid that returns the provided id or ids.
@@ -265,6 +281,7 @@ function createGenUidStubWithReturns(returnIds) {
   }
   return stub;
 }
+exports.createGenUidStubWithReturns = createGenUidStubWithReturns;
 
 /**
  * Creates spy for workspace fireChangeListener
@@ -275,6 +292,7 @@ function createGenUidStubWithReturns(returnIds) {
 function createFireChangeListenerSpy(workspace) {
   return sinon.spy(workspace, 'fireChangeListener');
 }
+exports.createFireChangeListenerSpy = createFireChangeListenerSpy;
 
 /**
  * Asserts whether the given xml property has the expected property.
@@ -365,6 +383,7 @@ function assertEventEquals(event, expectedType,
     chai.assert.isFalse(event.isUiEvent);
   }
 }
+exports.assertEventEquals = assertEventEquals;
 
 /**
  * Asserts that an event with the given values was fired.
@@ -387,6 +406,7 @@ function assertEventFired(spy, instanceType, expectedProperties,
       sinon.match.instanceOf(instanceType).and(sinon.match(expectedProperties));
   sinon.assert.calledWith(spy, expectedEvent);
 }
+exports.assertEventFired = assertEventFired;
 
 /**
  * Asserts that an event with the given values was not fired.
@@ -411,12 +431,13 @@ function assertEventNotFired(spy, instanceType, expectedProperties,
       sinon.match.instanceOf(instanceType).and(sinon.match(expectedProperties));
   sinon.assert.neverCalledWith(spy, expectedEvent);
 }
+exports.assertEventNotFired = assertEventNotFired;
 
 /**
  * Filters out xml properties from given object based on key.
  * @param {Object<string, *>} properties The properties to filter.
- * @return {[Object<string, *>, Object<string, *>]} A list containing split non
- *    xml properties and xml properties.
+ * @return {Array<Object<string, *>>} A list containing split non
+ *    xml properties and xml properties. [Object<string, *>, Object<string, *>]
  * @private
  */
 function splitByXmlProperties_(properties) {
@@ -457,6 +478,7 @@ function assertNthCallEventArgEquals(spy, n, instanceType, expectedProperties,
   var eventArg = nthCall.firstArg;
   assertXmlProperties_(eventArg, xmlProperties);
 }
+exports.assertNthCallEventArgEquals = assertNthCallEventArgEquals;
 
 function defineStackBlock() {
   Blockly.defineBlocksWithJsonArray([{
@@ -466,6 +488,7 @@ function defineStackBlock() {
     "nextStatement": null
   }]);
 }
+exports.defineStackBlock = defineStackBlock;
 
 function defineRowBlock() {
   Blockly.defineBlocksWithJsonArray([{
@@ -480,6 +503,7 @@ function defineRowBlock() {
     "output": null
   }]);
 }
+exports.defineRowBlock = defineRowBlock;
 
 function defineStatementBlock() {
   Blockly.defineBlocksWithJsonArray([{
@@ -498,6 +522,8 @@ function defineStatementBlock() {
     "helpUrl": ""
   }]);
 }
+exports.defineStatementBlock = defineStatementBlock;
+
 function defineBasicBlockWithField() {
   Blockly.defineBlocksWithJsonArray([{
     "type": "test_field_block",
@@ -511,6 +537,7 @@ function defineBasicBlockWithField() {
     "output": null
   }]);
 }
+exports.defineBasicBlockWithField = defineBasicBlockWithField;
 
 function createTestBlock() {
   return {
@@ -526,6 +553,7 @@ function createTestBlock() {
     'updateVarName': Blockly.Block.prototype.updateVarName,
   };
 }
+exports.createTestBlock = createTestBlock;
 
 function createRenderedBlock(workspaceSvg, type) {
   var block = workspaceSvg.newBlock(type);
@@ -533,6 +561,7 @@ function createRenderedBlock(workspaceSvg, type) {
   block.render();
   return block;
 }
+exports.createRenderedBlock = createRenderedBlock;
 
 /**
  * Triggers pointer event on target.
@@ -557,6 +586,7 @@ function dispatchPointerEvent(target, type, properties) {
   const event = new PointerEvent(type, eventInitDict);
   target.dispatchEvent(event);
 }
+exports.dispatchPointerEvent = dispatchPointerEvent;
 
 /**
  * Creates a key down event used for testing.
@@ -586,14 +616,14 @@ function createKeyDownEvent(keyCode, type, modifiers) {
     preventDefault: function() {}
   };
   if (modifiers && modifiers.length > 0) {
-    event.altKey = modifiers.indexOf(Blockly.utils.KeyCodes.ALT) > -1;
-    event.ctrlKey = modifiers.indexOf(Blockly.utils.KeyCodes.CTRL) > -1;
-    event.metaKey = modifiers.indexOf(Blockly.utils.KeyCodes.META) > -1;
-    event.shiftKey = modifiers.indexOf(Blockly.utils.KeyCodes.SHIFT) > -1;
+    event.altKey = modifiers.indexOf(KeyCodes.ALT) > -1;
+    event.ctrlKey = modifiers.indexOf(KeyCodes.CTRL) > -1;
+    event.metaKey = modifiers.indexOf(KeyCodes.META) > -1;
+    event.shiftKey = modifiers.indexOf(KeyCodes.SHIFT) > -1;
   }
   return event;
 }
-
+exports.createKeyDownEvent = createKeyDownEvent;
 
 /**
  * Simulates mouse click by triggering relevant mouse events.
@@ -606,3 +636,4 @@ function simulateClick(target, properties) {
   dispatchPointerEvent(target, 'pointerup', properties);
   dispatchPointerEvent(target, 'click', properties);
 }
+exports.simulateClick = simulateClick;
diff --git a/tests/mocha/theme_test.js b/tests/mocha/theme_test.js
index f9a8cae22..feea9daa3 100644
--- a/tests/mocha/theme_test.js
+++ b/tests/mocha/theme_test.js
@@ -4,11 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @fileoverview Blockly Theme tests.
- * @author samelh@google.com (Sam El-Husseini)
- */
-'use strict';
+goog.module('Blockly.test.theme');
+
+const {assertEventFired, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+
 
 suite('Theme', function() {
   setup(function() {
diff --git a/tests/mocha/toolbox_helper.js b/tests/mocha/toolbox_helper.js
index 9d1f54e33..1d1fc8d3d 100644
--- a/tests/mocha/toolbox_helper.js
+++ b/tests/mocha/toolbox_helper.js
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.toolboxHelpers');
+
+
 /**
  * Get JSON for a toolbox that contains categories.
  * @return {Blockly.utils.toolbox.ToolboxJson} The array holding information
@@ -39,6 +42,7 @@ function getCategoryJSON() {
       "name": "Second"
     }]};
 }
+exports.getCategoryJSON = getCategoryJSON;
 
 /**
  * Get JSON for a simple toolbox.
@@ -67,6 +71,7 @@ function getSimpleJSON() {
     }
   ]};
 }
+exports.getSimpleJSON = getSimpleJSON;
 
 /**
  * Get JSON for a toolbox that contains categories that contain categories.
@@ -111,6 +116,7 @@ function getDeeplyNestedJSON() {
       "name": "Second"
     }]};
 }
+exports.getDeeplyNestedJSON = getDeeplyNestedJSON;
 
 /**
  * Get an array filled with xml elements.
@@ -126,6 +132,7 @@ function getXmlArray() {
   var label = Blockly.Xml.textToDom('<label text="tooltips"></label>');
   return [block, separator, button, label];
 }
+exports.getXmlArray = getXmlArray;
 
 function getInjectedToolbox() {
   /**
@@ -147,6 +154,7 @@ function getInjectedToolbox() {
       });
   return workspace.getToolbox();
 }
+exports.getInjectedToolbox = getInjectedToolbox;
 
 function getBasicToolbox() {
   var workspace = new Blockly.WorkspaceSvg(new Blockly.Options({}));
@@ -155,6 +163,7 @@ function getBasicToolbox() {
   toolbox.flyout_ = sinon.createStubInstance(Blockly.VerticalFlyout);
   return toolbox;
 }
+exports.getBasicToolbox = getBasicToolbox;
 
 function getCollapsibleItem(toolbox) {
   var contents = toolbox.contents_;
@@ -165,6 +174,7 @@ function getCollapsibleItem(toolbox) {
     }
   }
 }
+exports.getCollapsibleItem = getCollapsibleItem;
 
 function getNonCollapsibleItem(toolbox) {
   var contents = toolbox.contents_;
@@ -175,11 +185,14 @@ function getNonCollapsibleItem(toolbox) {
     }
   }
 }
+exports.getNonCollapsibleItem = getNonCollapsibleItem;
 
 function getChildItem(toolbox) {
   return toolbox.getToolboxItemById('nestedCategory');
 }
+exports.getChildItem = getChildItem;
 
 function getSeparator(toolbox) {
   return toolbox.getToolboxItemById('separator');
 }
+exports.getSeparator = getSeparator;
diff --git a/tests/mocha/toolbox_test.js b/tests/mocha/toolbox_test.js
index f19287664..c2cc2cece 100644
--- a/tests/mocha/toolbox_test.js
+++ b/tests/mocha/toolbox_test.js
@@ -4,6 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.toolbox');
+
+const {defineStackBlock, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+const {getBasicToolbox, getCategoryJSON, getChildItem, getCollapsibleItem, getDeeplyNestedJSON, getInjectedToolbox, getNonCollapsibleItem, getSeparator, getSimpleJSON, getXmlArray} = goog.require('Blockly.test.toolboxHelpers');
+
+
 suite('Toolbox', function() {
 
   setup(function() {
diff --git a/tests/mocha/tooltip_test.js b/tests/mocha/tooltip_test.js
index f378bd506..d3ecf340a 100644
--- a/tests/mocha/tooltip_test.js
+++ b/tests/mocha/tooltip_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.tooltip');
+
+const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Tooltip', function() {
 
   setup(function() {
diff --git a/tests/mocha/trashcan_test.js b/tests/mocha/trashcan_test.js
index 3a8bed245..b8641292b 100644
--- a/tests/mocha/trashcan_test.js
+++ b/tests/mocha/trashcan_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.trashcan');
+
+const {assertEventFired, assertEventNotFired, sharedTestSetup, sharedTestTeardown, simulateClick} = goog.require('Blockly.test.helpers');
+
+
 suite("Trashcan", function() {
   function fireDeleteEvent(workspace, xmlString) {
     var xml = Blockly.Xml.textToDom(
diff --git a/tests/mocha/utils_test.js b/tests/mocha/utils_test.js
index 75be27793..3e85838f9 100644
--- a/tests/mocha/utils_test.js
+++ b/tests/mocha/utils_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.utils');
+
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Utils', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/variable_map_test.js b/tests/mocha/variable_map_test.js
index 35078f17f..85c37e812 100644
--- a/tests/mocha/variable_map_test.js
+++ b/tests/mocha/variable_map_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.variableMap');
+
+const {assertVariableValues, createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Variable Map', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/variable_model_test.js b/tests/mocha/variable_model_test.js
index 0598da755..d37ddca3a 100644
--- a/tests/mocha/variable_model_test.js
+++ b/tests/mocha/variable_model_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.variableModel');
+
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Variable Model', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/variables_test.js b/tests/mocha/variables_test.js
index 2ed765cdb..a496e4e74 100644
--- a/tests/mocha/variables_test.js
+++ b/tests/mocha/variables_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.variables');
+
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('Variables', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/widget_div_test.js b/tests/mocha/widget_div_test.js
index 31d0620e7..6ee49f052 100644
--- a/tests/mocha/widget_div_test.js
+++ b/tests/mocha/widget_div_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.widgetDiv');
+
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('WidgetDiv', function() {
   setup(function() {
     sharedTestSetup.call(this);
diff --git a/tests/mocha/workspace_comment_test.js b/tests/mocha/workspace_comment_test.js
index dec574e84..d018e8267 100644
--- a/tests/mocha/workspace_comment_test.js
+++ b/tests/mocha/workspace_comment_test.js
@@ -4,7 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.workspaceComment');
+
 goog.require('Blockly.WorkspaceComment');
+const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
 
 suite('Workspace comment', function() {
   setup(function() {
diff --git a/tests/mocha/workspace_helpers.js b/tests/mocha/workspace_helpers.js
new file mode 100644
index 000000000..f513e5eb0
--- /dev/null
+++ b/tests/mocha/workspace_helpers.js
@@ -0,0 +1,1534 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+goog.module('Blockly.test.workspaceHelpers');
+
+const {assertVariableValues, workspaceTeardown} = goog.require('Blockly.test.helpers');
+
+
+function testAWorkspace() {
+  setup(function() {
+    Blockly.defineBlocksWithJsonArray([{
+      "type": "get_var_block",
+      "message0": "%1",
+      "args0": [
+        {
+          "type": "field_variable",
+          "name": "VAR",
+          "variableTypes": ["", "type1", "type2"]
+        }
+      ]
+    }]);
+  });
+
+  teardown(function() {
+    // Clear Blockly.Event state.
+    Blockly.Events.setGroup(false);
+    Blockly.Events.disabled_ = 0;
+    sinon.restore();
+  });
+
+  function assertBlockVarModelName(workspace, blockIndex, name) {
+    var block = workspace.topBlocks_[blockIndex];
+    chai.assert.exists(block, 'Block at topBlocks_[' + blockIndex + ']');
+    var varModel = block.getVarModels()[0];
+    chai.assert.exists(varModel,
+        'VariableModel for block at topBlocks_[' + blockIndex + ']');
+    var blockVarName = varModel.name;
+    chai.assert.equal(blockVarName, name,
+        'VariableModel name for block at topBlocks_[' + blockIndex + ']');
+  }
+
+  function createVarBlocksNoEvents(workspace, ids) {
+    var blocks = [];
+    // Turn off events to avoid testing XML at the same time.
+    Blockly.Events.disable();
+    for (var i = 0, id; (id = ids[i]); i++) {
+      var block = new Blockly.Block(workspace, 'get_var_block');
+      block.inputList[0].fieldRow[0].setValue(id);
+      blocks.push(block);
+    }
+    Blockly.Events.enable();
+    return blocks;
+  }
+
+  suite('clear', function() {
+    test('Trivial', function() {
+      sinon.stub(Blockly.Events, "setGroup").returns(null);
+      this.workspace.createVariable('name1', 'type1', 'id1');
+      this.workspace.createVariable('name2', 'type2', 'id2');
+      this.workspace.newBlock('');
+
+      this.workspace.clear();
+      chai.assert.equal(this.workspace.topBlocks_.length, 0);
+      var varMapLength =
+          Object.keys(this.workspace.variableMap_.variableMap_).length;
+      chai.assert.equal(varMapLength, 0);
+    });
+
+    test('No variables', function() {
+      sinon.stub(Blockly.Events, "setGroup").returns(null);
+      this.workspace.newBlock('');
+
+      this.workspace.clear();
+      chai.assert.equal(this.workspace.topBlocks_.length, 0);
+      var varMapLength =
+          Object.keys(this.workspace.variableMap_.variableMap_).length;
+      chai.assert.equal(varMapLength, 0);
+    });
+  });
+
+  suite('deleteVariable', function() {
+    setup(function() {
+      // Create two variables of different types.
+      this.var1 = this.workspace.createVariable('name1', 'type1', 'id1');
+      this.var2 = this.workspace.createVariable('name2', 'type2', 'id2');
+      // Create blocks to refer to both of them.
+      createVarBlocksNoEvents(this.workspace, ['id1', 'id1', 'id2']);
+    });
+
+    test('deleteVariableById(id2) one usage', function() {
+      // Deleting variable one usage should not trigger confirm dialog.
+      var stub =
+          sinon.stub(Blockly, "confirm").callsArgWith(1, true);
+      this.workspace.deleteVariableById('id2');
+
+      sinon.assert.notCalled(stub);
+      var variable = this.workspace.getVariableById('id2');
+      chai.assert.isNull(variable);
+      assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+      assertBlockVarModelName(this.workspace, 0, 'name1');
+    });
+
+    test('deleteVariableById(id1) multiple usages confirm', function() {
+      // Deleting variable with multiple usages triggers confirm dialog.
+      var stub =
+          sinon.stub(Blockly.dialog, "confirm").callsArgWith(1, true);
+      this.workspace.deleteVariableById('id1');
+
+      sinon.assert.calledOnce(stub);
+      var variable = this.workspace.getVariableById('id1');
+      chai.assert.isNull(variable);
+      assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+      assertBlockVarModelName(this.workspace, 0, 'name2');
+    });
+
+    test('deleteVariableById(id1) multiple usages cancel', function() {
+      // Deleting variable with multiple usages triggers confirm dialog.
+      var stub =
+          sinon.stub(Blockly.dialog, "confirm").callsArgWith(1, false);
+      this.workspace.deleteVariableById('id1');
+
+      sinon.assert.calledOnce(stub);
+      assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+      assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+      assertBlockVarModelName(this.workspace, 0, 'name1');
+      assertBlockVarModelName(this.workspace, 1, 'name1');
+      assertBlockVarModelName(this.workspace, 2, 'name2');
+    });
+  });
+
+  suite('renameVariableById', function() {
+    setup(function() {
+      this.workspace.createVariable('name1', 'type1', 'id1');
+    });
+
+    test('No references rename to name2', function() {
+      this.workspace.renameVariableById('id1', 'name2');
+      assertVariableValues(this.workspace, 'name2', 'type1', 'id1');
+      // Renaming should not have created a new variable.
+      chai.assert.equal(this.workspace.getAllVariables().length, 1);
+    });
+
+    test('Reference exists rename to name2', function() {
+      createVarBlocksNoEvents(this.workspace, ['id1']);
+
+      this.workspace.renameVariableById('id1', 'name2');
+      assertVariableValues(this.workspace, 'name2', 'type1', 'id1');
+      // Renaming should not have created a new variable.
+      chai.assert.equal(this.workspace.getAllVariables().length, 1);
+      assertBlockVarModelName(this.workspace, 0, 'name2');
+    });
+
+    test('Reference exists different capitalization rename to Name1', function() {
+      createVarBlocksNoEvents(this.workspace, ['id1']);
+
+      this.workspace.renameVariableById('id1', 'Name1');
+      assertVariableValues(this.workspace, 'Name1', 'type1', 'id1');
+      // Renaming should not have created a new variable.
+      chai.assert.equal(this.workspace.getAllVariables().length, 1);
+      assertBlockVarModelName(this.workspace, 0, 'Name1');
+    });
+
+    suite('Two variables rename overlap', function() {
+      test('Same type rename variable with id1 to name2', function() {
+        this.workspace.createVariable('name2', 'type1', 'id2');
+        createVarBlocksNoEvents(this.workspace, ['id1', 'id2']);
+
+        this.workspace.renameVariableById('id1', 'name2');
+
+        // The second variable should remain unchanged.
+        assertVariableValues(this.workspace, 'name2', 'type1', 'id2');
+        // The first variable should have been deleted.
+        var variable = this.workspace.getVariableById('id1');
+        chai.assert.isNull(variable);
+        // There should only be one variable left.
+        chai.assert.equal(this.workspace.getAllVariables().length, 1);
+
+        // Both blocks should now reference variable with name2.
+        assertBlockVarModelName(this.workspace, 0, 'name2');
+        assertBlockVarModelName(this.workspace, 1, 'name2');
+      });
+
+      test('Different type rename variable with id1 to name2', function() {
+        this.workspace.createVariable('name2', 'type2', 'id2');
+        createVarBlocksNoEvents(this.workspace, ['id1', 'id2']);
+
+        this.workspace.renameVariableById('id1', 'name2');
+
+        // Variables with different type are allowed to have the same name.
+        assertVariableValues(this.workspace, 'name2', 'type1', 'id1');
+        assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+
+        // Both blocks should now reference variable with name2.
+        assertBlockVarModelName(this.workspace, 0, 'name2');
+        assertBlockVarModelName(this.workspace, 1, 'name2');
+      });
+
+      test('Same type different capitalization rename variable with id1 to Name2', function() {
+        this.workspace.createVariable('name2', 'type1', 'id2');
+        createVarBlocksNoEvents(this.workspace, ['id1', 'id2']);
+
+        this.workspace.renameVariableById('id1', 'Name2');
+
+        // The second variable should be updated.
+        assertVariableValues(this.workspace, 'Name2', 'type1', 'id2');
+        // The first variable should have been deleted.
+        var variable = this.workspace.getVariableById('id1');
+        chai.assert.isNull(variable);
+        // There should only be one variable left.
+        chai.assert.equal(this.workspace.getAllVariables().length, 1);
+
+        // Both blocks should now reference variable with Name2.
+        assertBlockVarModelName(this.workspace, 0, 'Name2');
+        assertBlockVarModelName(this.workspace, 1, 'Name2');
+      });
+
+      test('Different type different capitalization rename variable with id1 to Name2', function() {
+        this.workspace.createVariable('name2', 'type2', 'id2');
+        createVarBlocksNoEvents(this.workspace, ['id1', 'id2']);
+
+        this.workspace.renameVariableById('id1', 'Name2');
+
+        // Variables with different type are allowed to have the same name.
+        assertVariableValues(this.workspace, 'Name2', 'type1', 'id1');
+        // Second variable should remain unchanged.
+        assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+
+        // Only first block should use new capitalization.
+        assertBlockVarModelName(this.workspace, 0, 'Name2');
+        assertBlockVarModelName(this.workspace, 1, 'name2');
+      });
+    });
+  });
+
+  suite('getTopBlocks(ordered=true)', function() {
+    test('Empty workspace', function() {
+      chai.assert.equal(this.workspace.getTopBlocks(true).length, 0);
+    });
+
+    test('Flat workspace one block', function() {
+      this.workspace.newBlock('');
+      chai.assert.equal(this.workspace.getTopBlocks(true).length, 1);
+    });
+
+    test('Flat workspace one block after dispose', function() {
+      var blockA = this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      blockA.dispose();
+      chai.assert.equal(this.workspace.getTopBlocks(true).length, 1);
+    });
+
+    test('Flat workspace two blocks', function() {
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      chai.assert.equal(this.workspace.getTopBlocks(true).length, 2);
+    });
+
+    test('Clear', function() {
+      this.workspace.clear();
+      chai.assert.equal(this.workspace.getTopBlocks(true).length, 0,
+          'Clear empty workspace');
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.clear();
+      chai.assert.equal(this.workspace.getTopBlocks(true).length, 0);
+    });
+  });
+
+  suite('getTopBlocks(ordered=false)', function() {
+    test('Empty workspace', function() {
+      chai.assert.equal(this.workspace.getTopBlocks(false).length, 0);
+    });
+
+    test('Flat workspace one block', function() {
+      this.workspace.newBlock('');
+      chai.assert.equal(this.workspace.getTopBlocks(false).length, 1);
+    });
+
+    test('Flat workspace one block after dispose', function() {
+      var blockA = this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      blockA.dispose();
+      chai.assert.equal(this.workspace.getTopBlocks(false).length, 1);
+    });
+
+    test('Flat workspace two blocks', function() {
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      chai.assert.equal(this.workspace.getTopBlocks(false).length, 2);
+    });
+
+    test('Clear empty workspace', function() {
+      this.workspace.clear();
+      chai.assert.equal(this.workspace.getTopBlocks(false).length, 0);
+    });
+
+    test('Clear non-empty workspace', function() {
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.clear();
+      chai.assert.equal(this.workspace.getTopBlocks(false).length, 0);
+    });
+  });
+
+  suite('getAllBlocks', function() {
+    test('Empty workspace', function() {
+      chai.assert.equal(this.workspace.getAllBlocks(true).length, 0);
+    });
+
+    test('Flat workspace one block', function() {
+      this.workspace.newBlock('');
+      chai.assert.equal(this.workspace.getAllBlocks(true).length, 1);
+    });
+
+    test('Flat workspace one block after dispose', function() {
+      var blockA = this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      blockA.dispose();
+      chai.assert.equal(this.workspace.getAllBlocks(true).length, 1);
+    });
+
+    test('Flat workspace two blocks', function() {
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      chai.assert.equal(this.workspace.getAllBlocks(true).length, 2);
+    });
+
+    test('Clear', function() {
+      this.workspace.clear();
+      chai.assert.equal(this.workspace.getAllBlocks(true).length, 0,
+          'Clear empty workspace');
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.clear();
+      chai.assert.equal(this.workspace.getAllBlocks(true).length, 0);
+    });
+  });
+
+  suite('remainingCapacity', function() {
+    setup(function() {
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+    });
+
+    test('No block limit', function() {
+      chai.assert.equal(this.workspace.remainingCapacity(), Infinity);
+    });
+
+    test('Under block limit', function() {
+      this.workspace.options.maxBlocks = 3;
+      chai.assert.equal(this.workspace.remainingCapacity(), 1);
+      this.workspace.options.maxBlocks = 4;
+      chai.assert.equal(this.workspace.remainingCapacity(), 2);
+    });
+
+    test('At block limit', function() {
+      this.workspace.options.maxBlocks = 2;
+      chai.assert.equal(this.workspace.remainingCapacity(), 0);
+    });
+
+    test('At block limit of 0 after clear', function() {
+      this.workspace.options.maxBlocks = 0;
+      this.workspace.clear();
+      chai.assert.equal(this.workspace.remainingCapacity(), 0);
+    });
+
+    test('Over block limit', function() {
+      this.workspace.options.maxBlocks = 1;
+      chai.assert.equal(this.workspace.remainingCapacity(), -1);
+    });
+
+    test('Over block limit of 0', function() {
+      this.workspace.options.maxBlocks = 0;
+      chai.assert.equal(this.workspace.remainingCapacity(), -2);
+    });
+  });
+
+  suite('remainingCapacityOfType', function() {
+    setup(function() {
+      this.workspace.newBlock('get_var_block');
+      this.workspace.newBlock('get_var_block');
+      this.workspace.options.maxInstances = {};
+    });
+
+    test('No instance limit', function() {
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          Infinity);
+    });
+
+    test('Under instance limit', function() {
+      this.workspace.options.maxInstances['get_var_block'] = 3;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          1, 'With maxInstances limit 3');
+      this.workspace.options.maxInstances['get_var_block'] = 4;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          2, 'With maxInstances limit 4');
+    });
+
+    test('Under instance limit with multiple block types', function() {
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.options.maxInstances['get_var_block'] = 3;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          1, 'With maxInstances limit 3');
+      this.workspace.options.maxInstances['get_var_block'] = 4;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          2, 'With maxInstances limit 4');
+    });
+
+    test('At instance limit', function() {
+      this.workspace.options.maxInstances['get_var_block'] = 2;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          0, 'With maxInstances limit 2');
+    });
+
+    test('At instance limit of 0 after clear', function() {
+      this.workspace.clear();
+      this.workspace.options.maxInstances['get_var_block'] = 0;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          0);
+    });
+
+    test('At instance limit with multiple block types', function() {
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.options.maxInstances['get_var_block'] = 2;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          0, 'With maxInstances limit 2');
+    });
+
+    test('At instance limit of 0 with multiple block types', function() {
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.options.maxInstances['get_var_block'] = 0;
+      this.workspace.clear();
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          0);
+    });
+
+    test('Over instance limit', function() {
+      this.workspace.options.maxInstances['get_var_block'] = 1;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          -1, 'With maxInstances limit 1');
+    });
+
+    test('Over instance limit of 0', function() {
+      this.workspace.options.maxInstances['get_var_block'] = 0;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          -2, 'With maxInstances limit 0');
+    });
+
+    test('Over instance limit with multiple block types', function() {
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.options.maxInstances['get_var_block'] = 1;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          -1, 'With maxInstances limit 1');
+    });
+
+    test('Over instance limit of 0 with multiple block types', function() {
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.options.maxInstances['get_var_block'] = 0;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          -2, 'With maxInstances limit 0');
+    });
+  });
+
+  suite('isCapacityAvailable', function() {
+    setup(function() {
+      this.workspace.newBlock('get_var_block');
+      this.workspace.newBlock('get_var_block');
+      this.workspace.options.maxInstances = {};
+    });
+
+    test('Under block limit and no instance limit', function() {
+      this.workspace.options.maxBlocks = 3;
+      var typeCountsMap = {'get_var_block': 1};
+      chai.assert.isTrue(this.workspace.isCapacityAvailable(typeCountsMap));
+    });
+
+    test('At block limit and no instance limit', function() {
+      this.workspace.options.maxBlocks = 2;
+      var typeCountsMap = {'get_var_block': 1};
+      chai.assert.isFalse(this.workspace.isCapacityAvailable(typeCountsMap));
+    });
+
+    test('Over block limit of 0 and no instance limit', function() {
+      this.workspace.options.maxBlocks = 0;
+      var typeCountsMap = {'get_var_block': 1};
+      chai.assert.isFalse(this.workspace.isCapacityAvailable(typeCountsMap));
+    });
+
+    test('Over block limit but under instance limit', function() {
+      this.workspace.options.maxBlocks = 1;
+      this.workspace.options.maxInstances['get_var_block'] = 3;
+      var typeCountsMap = {'get_var_block': 1};
+      chai.assert.isFalse(this.workspace.isCapacityAvailable(typeCountsMap),
+          'With maxBlocks limit 1 and maxInstances limit 3');
+    });
+
+    test('Over block limit of 0 but under instance limit', function() {
+      this.workspace.options.maxBlocks = 0;
+      this.workspace.options.maxInstances['get_var_block'] = 3;
+      var typeCountsMap = {'get_var_block': 1};
+      chai.assert.isFalse(this.workspace.isCapacityAvailable(typeCountsMap),
+          'With maxBlocks limit 0 and maxInstances limit 3');
+    });
+
+    test('Over block limit but at instance limit', function() {
+      this.workspace.options.maxBlocks = 1;
+      this.workspace.options.maxInstances['get_var_block'] = 2;
+      var typeCountsMap = {'get_var_block': 1};
+      chai.assert.isFalse(this.workspace.isCapacityAvailable(typeCountsMap),
+          'With maxBlocks limit 1 and maxInstances limit 2');
+    });
+
+    test('Over block limit and over instance limit', function() {
+      this.workspace.options.maxBlocks = 1;
+      this.workspace.options.maxInstances['get_var_block'] = 1;
+      var typeCountsMap = {'get_var_block': 1};
+      chai.assert.isFalse(this.workspace.isCapacityAvailable(typeCountsMap),
+          'With maxBlocks limit 1 and maxInstances limit 1');
+    });
+
+    test('Over block limit of 0 and over instance limit', function() {
+      this.workspace.options.maxBlocks = 0;
+      this.workspace.options.maxInstances['get_var_block'] = 1;
+      var typeCountsMap = {'get_var_block': 1};
+      chai.assert.isFalse(this.workspace.isCapacityAvailable(typeCountsMap),
+          'With maxBlocks limit 0 and maxInstances limit 1');
+    });
+
+    test('Over block limit and over instance limit of 0', function() {
+      this.workspace.options.maxBlocks = 1;
+      this.workspace.options.maxInstances['get_var_block'] = 0;
+      var typeCountsMap = {'get_var_block': 1};
+      chai.assert.isFalse(this.workspace.isCapacityAvailable(typeCountsMap),
+          'With maxBlocks limit 1 and maxInstances limit 0');
+    });
+
+    test('Over block limit of 0 and over instance limit of 0', function() {
+      this.workspace.options.maxBlocks = 0;
+      this.workspace.options.maxInstances['get_var_block'] = 0;
+      var typeCountsMap = {'get_var_block': 1};
+      chai.assert.isFalse(this.workspace.isCapacityAvailable(typeCountsMap));
+    });
+  });
+
+  suite('getById', function() {
+    setup(function() {
+      this.workspaceB = this.workspace.rendered ?
+          new Blockly.WorkspaceSvg(new Blockly.Options({})) :
+          new Blockly.Workspace();
+    });
+
+    teardown(function() {
+      workspaceTeardown.call(this, this.workspaceB);
+    });
+
+    test('Trivial', function() {
+      chai.assert.equal(Blockly.Workspace.getById(
+          this.workspace.id), this.workspace, 'Find workspace');
+      chai.assert.equal(Blockly.Workspace.getById(
+          this.workspaceB.id), this.workspaceB, 'Find workspaceB');
+    });
+
+    test('Null id', function() {
+      chai.assert.isNull(Blockly.Workspace.getById(null));
+    });
+
+    test('Non-existent id', function() {
+      chai.assert.isNull(Blockly.Workspace.getById('badId'));
+    });
+
+    test('After dispose', function() {
+      this.workspaceB.dispose();
+      chai.assert.isNull(Blockly.Workspace.getById(this.workspaceB.id));
+    });
+  });
+
+  suite('getBlockById', function() {
+    setup(function() {
+      this.blockA = this.workspace.newBlock('');
+      this.blockB = this.workspace.newBlock('');
+      this.workspaceB = this.workspace.rendered ?
+          new Blockly.WorkspaceSvg(new Blockly.Options({})) :
+          new Blockly.Workspace();
+    });
+
+    teardown(function() {
+      workspaceTeardown.call(this, this.workspaceB);
+    });
+
+    test('Trivial', function() {
+      chai.assert.equal(
+          this.workspace.getBlockById(this.blockA.id), this.blockA);
+      chai.assert.equal(
+          this.workspace.getBlockById(this.blockB.id), this.blockB);
+    });
+
+    test('Null id', function() {
+      chai.assert.isNull(this.workspace.getBlockById(null));
+    });
+
+    test('Non-existent id', function() {
+      chai.assert.isNull(this.workspace.getBlockById('badId'));
+    });
+
+    test('After dispose', function() {
+      this.blockA.dispose();
+      chai.assert.isNull(this.workspace.getBlockById(this.blockA.id));
+      chai.assert.equal(
+          this.workspace.getBlockById(this.blockB.id), this.blockB);
+    });
+
+    test('After clear', function() {
+      this.workspace.clear();
+      chai.assert.isNull(this.workspace.getBlockById(this.blockA.id));
+      chai.assert.isNull(this.workspace.getBlockById(this.blockB.id));
+    });
+  });
+
+  suite('Undo/Redo', function() {
+
+    /**
+     * Assert that two nodes are equal.
+     * @param {!Element} actual the actual node.
+     * @param {!Element} expected the expected node.
+     */
+    function assertNodesEqual(actual, expected) {
+      var actualString = '\n' + Blockly.Xml.domToPrettyText(actual) + '\n';
+      var expectedString = '\n' + Blockly.Xml.domToPrettyText(expected) + '\n';
+
+      chai.assert.equal(actual.tagName, expected.tagName);
+      for (var i = 0, attr; (attr = expected.attributes[i]); i++) {
+        chai.assert.equal(actual.getAttribute(attr.name), attr.value,
+            `expected attribute ${attr.name} on ${actualString} to match ` +
+            `${expectedString}`);
+      }
+      chai.assert.equal(actual.childElementCount, expected.childElementCount,
+          `expected node ${actualString} to have the same children as node ` +
+          `${expectedString}`);
+      for (var i = 0; i < expected.childElementCount; i++) {
+        assertNodesEqual(actual.children[i], expected.children[i]);
+      }
+    }
+
+    suite('Undo Delete', function() {
+      setup(function() {
+        Blockly.defineBlocksWithJsonArray([
+          {
+            "type": "stack_block",
+            "message0": "",
+            "previousStatement": null,
+            "nextStatement": null
+          },
+          {
+            "type": "row_block",
+            "message0": "%1",
+            "args0": [
+              {
+                "type": "input_value",
+                "name": "INPUT"
+              }
+            ],
+            "output": null
+          },
+          {
+            "type": "statement_block",
+            "message0": "%1",
+            "args0": [
+              {
+                "type": "input_statement",
+                "name": "STATEMENT"
+              }
+            ],
+            "previousStatement": null,
+            "nextStatement": null
+          }]);
+      });
+
+      teardown(function() {
+        delete Blockly.Blocks['stack_block'];
+        delete Blockly.Blocks['row_block'];
+        delete Blockly.Blocks['statement_block'];
+      });
+
+      function testUndoDelete(xmlText) {
+        var xml = Blockly.Xml.textToDom(xmlText);
+        Blockly.Xml.domToBlock(xml, this.workspace);
+        this.workspace.getTopBlocks()[0].dispose(false);
+        this.workspace.undo();
+        var newXml = Blockly.Xml.workspaceToDom(this.workspace);
+        assertNodesEqual(newXml.firstChild, xml);
+      }
+
+      test('Stack', function() {
+        testUndoDelete.call(this, '<block type="stack_block" id="1"/>');
+      });
+
+      test('Row', function() {
+        testUndoDelete.call(this, '<block type="row_block" id="1"/>');
+      });
+
+      test('Statement', function() {
+        testUndoDelete.call(this, '<block type="statement_block" id="1"/>');
+      });
+
+      test('Stack w/ child', function() {
+        testUndoDelete.call(this,
+            '<block type="stack_block" id="1">' +
+            '  <next>' +
+            '    <block type="stack_block" id="2"></block>' +
+            '  </next>' +
+            '</block>'
+        );
+      });
+
+      test('Row w/ child', function() {
+        testUndoDelete.call(this,
+            '<block type="row_block" id="1">' +
+            '  <value name="INPUT">' +
+            '    <block type="row_block" id="2"></block>' +
+            '  </value>' +
+            '</block>'
+        );
+      });
+
+      test('Statement w/ child', function() {
+        testUndoDelete.call(this,
+            '<block type="statement_block" id="1">' +
+            '  <statement name="STATEMENT">' +
+            '    <block type="stack_block" id="2"></block>' +
+            '  </statement>' +
+            '</block>'
+        );
+      });
+
+      test('Stack w/ shadow', function() {
+        testUndoDelete.call(this,
+            '<block type="stack_block" id="1">' +
+            '  <next>' +
+            '    <shadow type="stack_block" id="2"></shadow>' +
+            '  </next>' +
+            '</block>'
+        );
+      });
+
+      test('Row w/ shadow', function() {
+        testUndoDelete.call(this,
+            '<block type="row_block" id="1">' +
+            '  <value name="INPUT">' +
+            '    <shadow type="row_block" id="2"></shadow>' +
+            '  </value>' +
+            '</block>'
+        );
+      });
+
+      test('Statement w/ shadow', function() {
+        testUndoDelete.call(this,
+            '<block type="statement_block" id="1">' +
+            '  <statement name="STATEMENT">' +
+            '    <shadow type="stack_block" id="2"></shadow>' +
+            '  </statement>' +
+            '</block>'
+        );
+      });
+    });
+
+    suite('Undo Connect', function() {
+
+      setup(function() {
+        Blockly.defineBlocksWithJsonArray([
+          {
+            "type": "stack_block",
+            "message0": "",
+            "previousStatement": null,
+            "nextStatement": null
+          },
+          {
+            "type": "row_block",
+            "message0": "%1",
+            "args0": [
+              {
+                "type": "input_value",
+                "name": "INPUT"
+              }
+            ],
+            "output": null
+          },
+          {
+            "type": "statement_block",
+            "message0": "%1",
+            "args0": [
+              {
+                "type": "input_statement",
+                "name": "STATEMENT"
+              }
+            ],
+            "previousStatement": null,
+            "nextStatement": null
+          }]);
+      });
+
+      teardown(function() {
+        delete Blockly.Blocks['stack_block'];
+        delete Blockly.Blocks['row_block'];
+        delete Blockly.Blocks['statement_block'];
+      });
+
+      function testUndoConnect(xmlText, parentId, childId, func) {
+        var xml = Blockly.Xml.textToDom(xmlText);
+        Blockly.Xml.domToWorkspace(xml, this.workspace);
+
+        var parent = this.workspace.getBlockById(parentId);
+        var child = this.workspace.getBlockById(childId);
+        func.call(this, parent, child);
+        this.workspace.undo();
+
+        var newXml = Blockly.Xml.workspaceToDom(this.workspace);
+        assertNodesEqual(newXml, xml);
+      }
+
+      test('Stack', function() {
+        var xml =
+            '<xml>' +
+            '  <block type="stack_block" id="1"></block>' +
+            '  <block type="stack_block" id="2"></block>' +
+            '</xml>';
+
+        testUndoConnect.call(this, xml, 1, 2, (parent, child) => {
+          parent.nextConnection.connect(child.previousConnection);
+        });
+      });
+
+      test('Row', function() {
+        var xml =
+            '<xml>' +
+            '  <block type="row_block" id="1"></block>' +
+            '  <block type="row_block" id="2"></block>' +
+            '</xml>';
+
+        testUndoConnect.call(this, xml, 1, 2, (parent, child) => {
+          parent.getInput('INPUT').connection.connect(child.outputConnection);
+        });
+      });
+
+      test('Statement', function() {
+        var xml =
+            '<xml>' +
+            '  <block type="statement_block" id="1"></block>' +
+            '  <block type="stack_block" id="2"></block>' +
+            '</xml>';
+
+        testUndoConnect.call(this, xml, 1, 2, (parent, child) => {
+          parent.getInput('STATEMENT').connection
+              .connect(child.previousConnection);
+        });
+      });
+
+      test('Stack w/ child', function() {
+        var xml =
+            '<xml>' +
+            '  <block type="stack_block" id="1">' +
+            '    <next>' +
+            '      <block type="stack_block" id="3"></block>' +
+            '    </next>' +
+            '  </block>' +
+            '  <block type="stack_block" id="2"></block>' +
+            '</xml>';
+
+        testUndoConnect.call(this, xml, 1, 2, (parent, child) => {
+          parent.nextConnection.connect(child.previousConnection);
+        });
+      });
+
+      test('Row w/ child', function() {
+        var xml =
+            '<xml>' +
+            '  <block type="row_block" id="1">' +
+            '    <value name="INPUT">' +
+            '      <block type="row_block" id="3"></block>' +
+            '    </value>' +
+            '  </block>' +
+            '  <block type="row_block" id="2"></block>' +
+            '</xml>';
+
+        testUndoConnect.call(this, xml, 1, 2, (parent, child) => {
+          parent.getInput('INPUT').connection.connect(child.outputConnection);
+        });
+      });
+
+      test('Statement w/ child', function() {
+        var xml =
+            '<xml>' +
+            '  <block type="statement_block" id="1">' +
+            '    <statement name="STATEMENT">' +
+            '      <block type="stack_block" id="3"></block>' +
+            '    </statement>' +
+            '  </block>' +
+            '  <block type="stack_block" id="2"></block>' +
+            '</xml>';
+
+        testUndoConnect.call(this, xml, 1, 2, (parent, child) => {
+          parent.getInput('STATEMENT').connection
+              .connect(child.previousConnection);
+        });
+      });
+
+      test('Stack w/ shadow', function() {
+        var xml =
+            '<xml>' +
+            '  <block type="stack_block" id="1">' +
+            '    <next>' +
+            '      <shadow type="stack_block" id="3"></shadow>' +
+            '    </next>' +
+            '  </block>' +
+            '  <block type="stack_block" id="2"></block>' +
+            '</xml>';
+
+        testUndoConnect.call(this, xml, 1, 2, (parent, child) => {
+          parent.nextConnection.connect(child.previousConnection);
+        });
+      });
+
+      test('Row w/ shadow', function() {
+        var xml =
+            '<xml>' +
+            '  <block type="row_block" id="1">' +
+            '    <value name="INPUT">' +
+            '      <shadow type="row_block" id="3"></shadow>' +
+            '    </value>' +
+            '  </block>' +
+            '  <block type="row_block" id="2"></block>' +
+            '</xml>';
+
+        testUndoConnect.call(this, xml, 1, 2, (parent, child) => {
+          parent.getInput('INPUT').connection.connect(child.outputConnection);
+        });
+      });
+
+      test('Statement w/ shadow', function() {
+        var xml =
+            '<xml>' +
+            '  <block type="statement_block" id="1">' +
+            '    <statement name="STATEMENT">' +
+            '      <shadow type="stack_block" id="3"></shadow>' +
+            '    </statement>' +
+            '  </block>' +
+            '  <block type="stack_block" id="2"></block>' +
+            '</xml>';
+
+        testUndoConnect.call(this, xml, 1, 2, (parent, child) => {
+          parent.getInput('STATEMENT').connection
+              .connect(child.previousConnection);
+        });
+      });
+    });
+
+    suite('Undo Disconnect', function() {
+
+      setup(function() {
+        Blockly.defineBlocksWithJsonArray([
+          {
+            "type": "stack_block",
+            "message0": "",
+            "previousStatement": null,
+            "nextStatement": null
+          },
+          {
+            "type": "row_block",
+            "message0": "%1",
+            "args0": [
+              {
+                "type": "input_value",
+                "name": "INPUT"
+              }
+            ],
+            "output": null
+          },
+          {
+            "type": "statement_block",
+            "message0": "%1",
+            "args0": [
+              {
+                "type": "input_statement",
+                "name": "STATEMENT"
+              }
+            ],
+            "previousStatement": null,
+            "nextStatement": null
+          }]);
+      });
+
+      teardown(function() {
+        delete Blockly.Blocks['stack_block'];
+        delete Blockly.Blocks['row_block'];
+        delete Blockly.Blocks['statement_block'];
+      });
+
+      function testUndoDisconnect(xmlText, childId) {
+        var xml = Blockly.Xml.textToDom(xmlText);
+        Blockly.Xml.domToWorkspace(xml, this.workspace);
+
+        var child = this.workspace.getBlockById(childId);
+        if (child.outputConnection) {
+          child.outputConnection.disconnect();
+        } else {
+          child.previousConnection.disconnect();
+        }
+        this.workspace.undo();
+
+        var newXml = Blockly.Xml.workspaceToDom(this.workspace);
+        assertNodesEqual(newXml, xml);
+      }
+
+      test('Stack', function() {
+        var xml =
+            '<xml>' +
+            '  <block type="stack_block" id="1">' +
+            '    <next>' +
+            '      <block type="stack_block" id="2"></block>' +
+            '    </next>' +
+            '  </block>' +
+            '</xml>';
+        testUndoDisconnect.call(this, xml, 2);
+      });
+
+      test('Row', function() {
+        var xml =
+            '<xml>' +
+            '  <block type="row_block" id="1">' +
+            '    <value name="INPUT">' +
+            '      <block type="row_block" id="2"></block>' +
+            '    </value>' +
+            '  </block>' +
+            '</xml>';
+        testUndoDisconnect.call(this, xml, 2);
+      });
+
+      test('Statement', function() {
+        var xml =
+            '<xml>' +
+            '  <block type="statement_block" id="1">' +
+            '    <statement name="STATEMENT">' +
+            '      <block type="stack_block" id="2"></block>' +
+            '    </statement>' +
+            '  </block>' +
+            '</xml>';
+        testUndoDisconnect.call(this, xml, 2);
+      });
+
+      test('Stack w/ child', function() {
+        var xml =
+            '<xml>' +
+            '  <block type="stack_block" id="1">' +
+            '    <next>' +
+            '      <block type="stack_block" id="2">' +
+            '        <next>' +
+            '          <block type="stack_block" id="3"></block>' +
+            '        </next>' +
+            '      </block>' +
+            '    </next>' +
+            '  </block>' +
+            '</xml>';
+        testUndoDisconnect.call(this, xml, 2);
+      });
+
+      test('Row w/ child', function() {
+        var xml =
+            '<xml>' +
+            '  <block type="row_block" id="1">' +
+            '    <value name="INPUT">' +
+            '      <block type="row_block" id="2">' +
+            '        <value name="INPUT">' +
+            '          <block type="row_block" id="3"></block>' +
+            '        </value>' +
+            '      </block>' +
+            '    </value>' +
+            '  </block>' +
+            '</xml>';
+        testUndoDisconnect.call(this, xml, 2);
+      });
+
+      test('Statement w/ child', function() {
+        var xml =
+            '<xml>' +
+            '  <block type="statement_block" id="1">' +
+            '    <statement name="STATEMENT">' +
+            '      <block type="statement_block" id="2">' +
+            '        <statement name="STATEMENT">' +
+            '          <block type="stack_block" id="3"></block>' +
+            '        </statement>' +
+            '      </block>' +
+            '    </statement>' +
+            '  </block>' +
+            '</xml>';
+        testUndoDisconnect.call(this, xml, 2);
+      });
+
+      test('Stack w/ shadow', function() {
+        // TODO: For some reason on next connections shadows are
+        //   serialized second.
+        var xml =
+            '<xml>' +
+            '  <block type="stack_block" id="1">' +
+            '    <next>' +
+            '      <block type="stack_block" id="2"></block>' +
+            '      <shadow type="stack_block" id="3"></shadow>' +
+            '    </next>' +
+            '  </block>' +
+            '</xml>';
+        testUndoDisconnect.call(this, xml, 2);
+        chai.assert.equal(this.workspace.getAllBlocks().length, 2,
+            'expected there to only be 2 blocks on the workspace ' +
+            '(check for shadows)');
+      });
+
+      test('Row w/ shadow', function() {
+        var xml =
+            '<xml>' +
+            '  <block type="row_block" id="1">' +
+            '    <value name="INPUT">' +
+            '      <shadow type="row_block" id="3"></shadow>' +
+            '      <block type="row_block" id="2"></block>' +
+            '    </value>' +
+            '  </block>' +
+            '</xml>';
+        testUndoDisconnect.call(this, xml, 2);
+        chai.assert.equal(this.workspace.getAllBlocks().length, 2,
+            'expected there to only be 2 blocks on the workspace ' +
+            '(check for shadows)');
+      });
+
+      test('Statement w/ shadow', function() {
+        var xml =
+            '<xml>' +
+            '  <block type="statement_block" id="1">' +
+            '    <statement name="STATEMENT">' +
+            '      <shadow type="stack_block" id="3"></shadow>' +
+            '      <block type="stack_block" id="2"></block>' +
+            '    </statement>' +
+            '  </block>' +
+            '</xml>';
+        testUndoDisconnect.call(this, xml, 2);
+      });
+    });
+
+    suite('Variables', function() {
+      function createTwoVarsDifferentTypes(workspace) {
+        workspace.createVariable('name1', 'type1', 'id1');
+        workspace.createVariable('name2', 'type2', 'id2');
+      }
+
+      suite('createVariable', function() {
+        test('Undo only', function() {
+          createTwoVarsDifferentTypes(this.workspace);
+
+          this.workspace.undo();
+          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+          chai.assert.isNull(this.workspace.getVariableById('id2'));
+
+          this.workspace.undo();
+          chai.assert.isNull(this.workspace.getVariableById('id1'));
+          chai.assert.isNull(this.workspace.getVariableById('id2'));
+        });
+
+        test('Undo and redo', function() {
+          createTwoVarsDifferentTypes(this.workspace);
+
+          this.workspace.undo();
+          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+          chai.assert.isNull(this.workspace.getVariableById('id2'));
+
+          this.workspace.undo(true);
+
+          // Expect that variable 'id2' is recreated
+          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+
+          this.workspace.undo();
+          this.workspace.undo();
+          chai.assert.isNull(this.workspace.getVariableById('id1'));
+          chai.assert.isNull(this.workspace.getVariableById('id2'));
+          this.workspace.undo(true);
+
+          // Expect that variable 'id1' is recreated
+          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+          chai.assert.isNull(this.workspace.getVariableById('id2'));
+        });
+      });
+
+      suite('deleteVariableById', function() {
+        test('Undo only no usages', function() {
+          createTwoVarsDifferentTypes(this.workspace);
+          this.workspace.deleteVariableById('id1');
+          this.workspace.deleteVariableById('id2');
+
+          this.workspace.undo();
+          chai.assert.isNull(this.workspace.getVariableById('id1'));
+          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+
+          this.workspace.undo();
+          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+        });
+
+        test('Undo only with usages', function() {
+          createTwoVarsDifferentTypes(this.workspace);
+          // Create blocks to refer to both of them.
+          createVarBlocksNoEvents(this.workspace, ['id1', 'id2']);
+          this.workspace.deleteVariableById('id1');
+          this.workspace.deleteVariableById('id2');
+
+          this.workspace.undo();
+          assertBlockVarModelName(this.workspace, 0, 'name2');
+          chai.assert.isNull(this.workspace.getVariableById('id1'));
+          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+
+          this.workspace.undo();
+          assertBlockVarModelName(this.workspace, 0, 'name2');
+          assertBlockVarModelName(this.workspace, 1, 'name1');
+          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+        });
+
+        test('Reference exists no usages', function() {
+          createTwoVarsDifferentTypes(this.workspace);
+          this.workspace.deleteVariableById('id1');
+          this.workspace.deleteVariableById('id2');
+
+          this.workspace.undo();
+          chai.assert.isNull(this.workspace.getVariableById('id1'));
+          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+
+          this.workspace.undo(true);
+          // Expect that both variables are deleted
+          chai.assert.isNull(this.workspace.getVariableById('id1'));
+          chai.assert.isNull(this.workspace.getVariableById('id2'));
+
+          this.workspace.undo();
+          this.workspace.undo();
+          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+
+          this.workspace.undo(true);
+          // Expect that variable 'id2' is recreated
+          chai.assert.isNull(this.workspace.getVariableById('id1'));
+          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+        });
+
+        test('Reference exists with usages', function() {
+          createTwoVarsDifferentTypes(this.workspace);
+          // Create blocks to refer to both of them.
+          createVarBlocksNoEvents(this.workspace, ['id1', 'id2']);
+          this.workspace.deleteVariableById('id1');
+          this.workspace.deleteVariableById('id2');
+
+          this.workspace.undo();
+          assertBlockVarModelName(this.workspace, 0, 'name2');
+          chai.assert.isNull(this.workspace.getVariableById('id1'));
+          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+
+          this.workspace.undo(true);
+          // Expect that both variables are deleted
+          chai.assert.equal(this.workspace.topBlocks_.length, 0);
+          chai.assert.isNull(this.workspace.getVariableById('id1'));
+          chai.assert.isNull(this.workspace.getVariableById('id2'));
+
+          this.workspace.undo();
+          this.workspace.undo();
+          assertBlockVarModelName(this.workspace, 0, 'name2');
+          assertBlockVarModelName(this.workspace, 1, 'name1');
+          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+
+          this.workspace.undo(true);
+          // Expect that variable 'id2' is recreated
+          assertBlockVarModelName(this.workspace, 0, 'name2');
+          chai.assert.isNull(this.workspace.getVariableById('id1'));
+          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+        });
+
+        test('Delete same variable twice no usages', function() {
+          this.workspace.createVariable('name1', 'type1', 'id1');
+          this.workspace.deleteVariableById('id1');
+          var workspace = this.workspace;
+          var warnings = testHelpers.captureWarnings(function() {
+            workspace.deleteVariableById('id1');
+          });
+          chai.assert.equal(warnings.length, 1,
+              'Expected 1 warning for second deleteVariableById call.');
+
+          // Check the undoStack only recorded one delete event.
+          var undoStack = this.workspace.undoStack_;
+          chai.assert.equal(undoStack[undoStack.length - 1].type, 'var_delete');
+          chai.assert.notEqual(undoStack[undoStack.length - 2].type, 'var_delete');
+
+          // Undo delete
+          this.workspace.undo();
+          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+
+          // Redo delete
+          this.workspace.undo(true);
+          chai.assert.isNull(this.workspace.getVariableById('id1'));
+
+          // Redo delete, nothing should happen
+          this.workspace.undo(true);
+          chai.assert.isNull(this.workspace.getVariableById('id1'));
+        });
+
+        test('Delete same variable twice with usages', function() {
+          this.workspace.createVariable('name1', 'type1', 'id1');
+          createVarBlocksNoEvents(this.workspace, ['id1']);
+          this.workspace.deleteVariableById('id1');
+          var workspace = this.workspace;
+          var warnings = testHelpers.captureWarnings(function() {
+            workspace.deleteVariableById('id1');
+          });
+          chai.assert.equal(warnings.length, 1,
+              'Expected 1 warning for second deleteVariableById call.');
+
+          // Check the undoStack only recorded one delete event.
+          var undoStack = this.workspace.undoStack_;
+          chai.assert.equal(undoStack[undoStack.length - 1].type, 'var_delete');
+          chai.assert.equal(undoStack[undoStack.length - 2].type, 'delete');
+          chai.assert.notEqual(undoStack[undoStack.length - 3].type, 'var_delete');
+
+          // Undo delete
+          this.workspace.undo();
+          assertBlockVarModelName(this.workspace, 0, 'name1');
+          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+
+          // Redo delete
+          this.workspace.undo(true);
+          chai.assert.equal(this.workspace.topBlocks_.length, 0);
+          chai.assert.isNull(this.workspace.getVariableById('id1'));
+
+          // Redo delete, nothing should happen
+          this.workspace.undo(true);
+          chai.assert.equal(this.workspace.topBlocks_.length, 0);
+          chai.assert.isNull(this.workspace.getVariableById('id1'));
+        });
+      });
+
+      suite('renameVariableById', function() {
+        setup(function() {
+          this.workspace.createVariable('name1', 'type1', 'id1');
+        });
+
+        test('Reference exists no usages rename to name2', function() {
+          this.workspace.renameVariableById('id1', 'name2');
+
+          this.workspace.undo();
+          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+
+          this.workspace.undo(true);
+          assertVariableValues(this.workspace, 'name2', 'type1', 'id1');
+
+        });
+
+        test('Reference exists with usages rename to name2', function() {
+          createVarBlocksNoEvents(this.workspace, ['id1']);
+          this.workspace.renameVariableById('id1', 'name2');
+
+          this.workspace.undo();
+          assertBlockVarModelName(this.workspace, 0, 'name1');
+          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+
+          this.workspace.undo(true);
+          assertBlockVarModelName(this.workspace, 0, 'name2');
+          assertVariableValues(this.workspace, 'name2', 'type1', 'id1');
+        });
+
+        test('Reference exists different capitalization no usages rename to Name1', function() {
+          this.workspace.renameVariableById('id1', 'Name1');
+
+          this.workspace.undo();
+          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+
+          this.workspace.undo(true);
+          assertVariableValues(this.workspace, 'Name1', 'type1', 'id1');
+        });
+
+        test('Reference exists different capitalization with usages rename to Name1', function() {
+          createVarBlocksNoEvents(this.workspace, ['id1']);
+          this.workspace.renameVariableById('id1', 'Name1');
+
+          this.workspace.undo();
+          assertBlockVarModelName(this.workspace, 0, 'name1');
+          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+
+          this.workspace.undo(true);
+          assertBlockVarModelName(this.workspace, 0, 'Name1');
+          assertVariableValues(this.workspace, 'Name1', 'type1', 'id1');
+        });
+
+        suite('Two variables rename overlap', function() {
+          test('Same type no usages rename variable with id1 to name2', function() {
+            this.workspace.createVariable('name2', 'type1', 'id2');
+            this.workspace.renameVariableById('id1', 'name2');
+
+            this.workspace.undo();
+            assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+            assertVariableValues(this.workspace, 'name2', 'type1', 'id2');
+
+            this.workspace.undo(true);
+            assertVariableValues(this.workspace, 'name2', 'type1', 'id2');
+            chai.assert.isNull(this.workspace.getVariableById('id1'));
+          });
+
+          test('Same type with usages rename variable with id1 to name2', function() {
+            this.workspace.createVariable('name2', 'type1', 'id2');
+            createVarBlocksNoEvents(this.workspace, ['id1', 'id2']);
+            this.workspace.renameVariableById('id1', 'name2');
+
+            this.workspace.undo();
+            assertBlockVarModelName(this.workspace, 0, 'name1');
+            assertBlockVarModelName(this.workspace, 1, 'name2');
+            assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+            assertVariableValues(this.workspace, 'name2', 'type1', 'id2');
+
+            this.workspace.undo(true);
+            assertVariableValues(this.workspace, 'name2', 'type1', 'id2');
+            chai.assert.isNull(this.workspace.getVariableById('id1'));
+          });
+
+          test('Same type different capitalization no usages rename variable with id1 to Name2', function() {
+            this.workspace.createVariable('name2', 'type1', 'id2');
+            this.workspace.renameVariableById('id1', 'Name2');
+
+            this.workspace.undo();
+            assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+            assertVariableValues(this.workspace, 'name2', 'type1', 'id2');
+
+            this.workspace.undo(true);
+            assertVariableValues(this.workspace, 'Name2', 'type1', 'id2');
+            chai.assert.isNull(this.workspace.getVariable('name1'));
+          });
+
+          test('Same type different capitalization with usages rename variable with id1 to Name2', function() {
+            this.workspace.createVariable('name2', 'type1', 'id2');
+            createVarBlocksNoEvents(this.workspace, ['id1', 'id2']);
+            this.workspace.renameVariableById('id1', 'Name2');
+
+            this.workspace.undo();
+            assertBlockVarModelName(this.workspace, 0, 'name1');
+            assertBlockVarModelName(this.workspace, 1, 'name2');
+            assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+            assertVariableValues(this.workspace, 'name2', 'type1', 'id2');
+
+            this.workspace.undo(true);
+            assertVariableValues(this.workspace, 'Name2', 'type1', 'id2');
+            chai.assert.isNull(this.workspace.getVariableById('id1'));
+            assertBlockVarModelName(this.workspace, 0, 'Name2');
+            assertBlockVarModelName(this.workspace, 1, 'Name2');
+          });
+
+          test('Different type no usages rename variable with id1 to name2', function() {
+            this.workspace.createVariable('name2', 'type2', 'id2');
+            this.workspace.renameVariableById('id1', 'name2');
+
+            this.workspace.undo();
+            assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+            assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+
+            this.workspace.undo(true);
+            assertVariableValues(this.workspace, 'name2', 'type1', 'id1');
+            assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+          });
+
+          test('Different type with usages rename variable with id1 to name2', function() {
+            this.workspace.createVariable('name2', 'type2', 'id2');
+            createVarBlocksNoEvents(this.workspace, ['id1', 'id2']);
+            this.workspace.renameVariableById('id1', 'name2');
+
+            this.workspace.undo();
+            assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+            assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+            assertBlockVarModelName(this.workspace, 0, 'name1');
+            assertBlockVarModelName(this.workspace, 1, 'name2');
+
+            this.workspace.undo(true);
+            assertVariableValues(this.workspace, 'name2', 'type1', 'id1');
+            assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+            assertBlockVarModelName(this.workspace, 0, 'name2');
+            assertBlockVarModelName(this.workspace, 1, 'name2');
+          });
+
+          test('Different type different capitalization no usages rename variable with id1 to Name2', function() {
+            this.workspace.createVariable('name2', 'type2', 'id2');
+            this.workspace.renameVariableById('id1', 'Name2');
+
+            this.workspace.undo();
+            assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+            assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+
+            this.workspace.undo(true);
+            assertVariableValues(this.workspace, 'Name2', 'type1', 'id1');
+            assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+          });
+
+          test('Different type different capitalization with usages rename variable with id1 to Name2', function() {
+            this.workspace.createVariable('name2', 'type2', 'id2');
+            createVarBlocksNoEvents(this.workspace, ['id1', 'id2']);
+            this.workspace.renameVariableById('id1', 'Name2');
+
+            this.workspace.undo();
+            assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
+            assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+            assertBlockVarModelName(this.workspace, 0, 'name1');
+            assertBlockVarModelName(this.workspace, 1, 'name2');
+
+            this.workspace.undo(true);
+            assertVariableValues(this.workspace, 'Name2', 'type1', 'id1');
+            assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
+            assertBlockVarModelName(this.workspace, 0, 'Name2');
+            assertBlockVarModelName(this.workspace, 1, 'name2');
+          });
+        });
+      });
+    });
+  });
+}
+exports.testAWorkspace = testAWorkspace;
diff --git a/tests/mocha/workspace_svg_test.js b/tests/mocha/workspace_svg_test.js
index d79707d08..418ab015a 100644
--- a/tests/mocha/workspace_svg_test.js
+++ b/tests/mocha/workspace_svg_test.js
@@ -4,6 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.workspaceSvg');
+
+const {assertEventFired, assertEventNotFired, assertVariableValues, createFireChangeListenerSpy, defineStackBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+const {testAWorkspace} = goog.require('Blockly.test.workspaceHelpers');
+
+
 suite('WorkspaceSvg', function() {
   setup(function() {
     sharedTestSetup.call(this);
@@ -334,7 +340,6 @@ suite('WorkspaceSvg', function() {
       });
     });
   });
-
   suite('Workspace Base class', function() {
     testAWorkspace();
   });
diff --git a/tests/mocha/workspace_test.js b/tests/mocha/workspace_test.js
index f75b8eda3..b221f6310 100644
--- a/tests/mocha/workspace_test.js
+++ b/tests/mocha/workspace_test.js
@@ -4,6 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.workspace');
+
+const {assertVariableValues, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+const {testAWorkspace} = goog.require('Blockly.test.workspaceHelpers');
+
+
 suite('Workspace', function() {
   setup(function() {
     sharedTestSetup.call(this);
@@ -17,1526 +23,3 @@ suite('Workspace', function() {
   // eslint-disable-next-line no-use-before-define
   testAWorkspace();
 });
-
-function testAWorkspace() {
-  setup(function() {
-    Blockly.defineBlocksWithJsonArray([{
-      "type": "get_var_block",
-      "message0": "%1",
-      "args0": [
-        {
-          "type": "field_variable",
-          "name": "VAR",
-          "variableTypes": ["", "type1", "type2"]
-        }
-      ]
-    }]);
-  });
-
-  teardown(function() {
-    // Clear Blockly.Event state.
-    Blockly.Events.setGroup(false);
-    Blockly.Events.disabled_ = 0;
-    sinon.restore();
-  });
-
-  function assertBlockVarModelName(workspace, blockIndex, name) {
-    var block = workspace.topBlocks_[blockIndex];
-    chai.assert.exists(block, 'Block at topBlocks_[' + blockIndex + ']');
-    var varModel = block.getVarModels()[0];
-    chai.assert.exists(varModel,
-        'VariableModel for block at topBlocks_[' + blockIndex + ']');
-    var blockVarName = varModel.name;
-    chai.assert.equal(blockVarName, name,
-        'VariableModel name for block at topBlocks_[' + blockIndex + ']');
-  }
-
-  function createVarBlocksNoEvents(workspace, ids) {
-    var blocks = [];
-    // Turn off events to avoid testing XML at the same time.
-    Blockly.Events.disable();
-    for (var i = 0, id; (id = ids[i]); i++) {
-      var block = new Blockly.Block(workspace, 'get_var_block');
-      block.inputList[0].fieldRow[0].setValue(id);
-      blocks.push(block);
-    }
-    Blockly.Events.enable();
-    return blocks;
-  }
-
-  suite('clear', function() {
-    test('Trivial', function() {
-      sinon.stub(Blockly.Events, "setGroup").returns(null);
-      this.workspace.createVariable('name1', 'type1', 'id1');
-      this.workspace.createVariable('name2', 'type2', 'id2');
-      this.workspace.newBlock('');
-
-      this.workspace.clear();
-      chai.assert.equal(this.workspace.topBlocks_.length, 0);
-      var varMapLength =
-          Object.keys(this.workspace.variableMap_.variableMap_).length;
-      chai.assert.equal(varMapLength, 0);
-    });
-
-    test('No variables', function() {
-      sinon.stub(Blockly.Events, "setGroup").returns(null);
-      this.workspace.newBlock('');
-
-      this.workspace.clear();
-      chai.assert.equal(this.workspace.topBlocks_.length, 0);
-      var varMapLength =
-          Object.keys(this.workspace.variableMap_.variableMap_).length;
-      chai.assert.equal(varMapLength, 0);
-    });
-  });
-
-  suite('deleteVariable', function() {
-    setup(function() {
-      // Create two variables of different types.
-      this.var1 = this.workspace.createVariable('name1', 'type1', 'id1');
-      this.var2 = this.workspace.createVariable('name2', 'type2', 'id2');
-      // Create blocks to refer to both of them.
-      createVarBlocksNoEvents(this.workspace, ['id1', 'id1', 'id2']);
-    });
-
-    test('deleteVariableById(id2) one usage', function() {
-      // Deleting variable one usage should not trigger confirm dialog.
-      var stub =
-          sinon.stub(Blockly, "confirm").callsArgWith(1, true);
-      this.workspace.deleteVariableById('id2');
-
-      sinon.assert.notCalled(stub);
-      var variable = this.workspace.getVariableById('id2');
-      chai.assert.isNull(variable);
-      assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-      assertBlockVarModelName(this.workspace, 0, 'name1');
-    });
-
-    test('deleteVariableById(id1) multiple usages confirm', function() {
-      // Deleting variable with multiple usages triggers confirm dialog.
-      var stub =
-          sinon.stub(Blockly.dialog, "confirm").callsArgWith(1, true);
-      this.workspace.deleteVariableById('id1');
-
-      sinon.assert.calledOnce(stub);
-      var variable = this.workspace.getVariableById('id1');
-      chai.assert.isNull(variable);
-      assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-      assertBlockVarModelName(this.workspace, 0, 'name2');
-    });
-
-    test('deleteVariableById(id1) multiple usages cancel', function() {
-      // Deleting variable with multiple usages triggers confirm dialog.
-      var stub =
-          sinon.stub(Blockly.dialog, "confirm").callsArgWith(1, false);
-      this.workspace.deleteVariableById('id1');
-
-      sinon.assert.calledOnce(stub);
-      assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-      assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-      assertBlockVarModelName(this.workspace, 0, 'name1');
-      assertBlockVarModelName(this.workspace, 1, 'name1');
-      assertBlockVarModelName(this.workspace, 2, 'name2');
-    });
-  });
-
-  suite('renameVariableById', function() {
-    setup(function() {
-      this.workspace.createVariable('name1', 'type1', 'id1');
-    });
-
-    test('No references rename to name2', function() {
-      this.workspace.renameVariableById('id1', 'name2');
-      assertVariableValues(this.workspace, 'name2', 'type1', 'id1');
-      // Renaming should not have created a new variable.
-      chai.assert.equal(this.workspace.getAllVariables().length, 1);
-    });
-
-    test('Reference exists rename to name2', function() {
-      createVarBlocksNoEvents(this.workspace, ['id1']);
-
-      this.workspace.renameVariableById('id1', 'name2');
-      assertVariableValues(this.workspace, 'name2', 'type1', 'id1');
-      // Renaming should not have created a new variable.
-      chai.assert.equal(this.workspace.getAllVariables().length, 1);
-      assertBlockVarModelName(this.workspace, 0, 'name2');
-    });
-
-    test('Reference exists different capitalization rename to Name1', function() {
-      createVarBlocksNoEvents(this.workspace, ['id1']);
-
-      this.workspace.renameVariableById('id1', 'Name1');
-      assertVariableValues(this.workspace, 'Name1', 'type1', 'id1');
-      // Renaming should not have created a new variable.
-      chai.assert.equal(this.workspace.getAllVariables().length, 1);
-      assertBlockVarModelName(this.workspace, 0, 'Name1');
-    });
-
-    suite('Two variables rename overlap', function() {
-      test('Same type rename variable with id1 to name2', function() {
-        this.workspace.createVariable('name2', 'type1', 'id2');
-        createVarBlocksNoEvents(this.workspace, ['id1', 'id2']);
-
-        this.workspace.renameVariableById('id1', 'name2');
-
-        // The second variable should remain unchanged.
-        assertVariableValues(this.workspace, 'name2', 'type1', 'id2');
-        // The first variable should have been deleted.
-        var variable = this.workspace.getVariableById('id1');
-        chai.assert.isNull(variable);
-        // There should only be one variable left.
-        chai.assert.equal(this.workspace.getAllVariables().length, 1);
-
-        // Both blocks should now reference variable with name2.
-        assertBlockVarModelName(this.workspace, 0, 'name2');
-        assertBlockVarModelName(this.workspace, 1, 'name2');
-      });
-
-      test('Different type rename variable with id1 to name2', function() {
-        this.workspace.createVariable('name2', 'type2', 'id2');
-        createVarBlocksNoEvents(this.workspace, ['id1', 'id2']);
-
-        this.workspace.renameVariableById('id1', 'name2');
-
-        // Variables with different type are allowed to have the same name.
-        assertVariableValues(this.workspace, 'name2', 'type1', 'id1');
-        assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-
-        // Both blocks should now reference variable with name2.
-        assertBlockVarModelName(this.workspace, 0, 'name2');
-        assertBlockVarModelName(this.workspace, 1, 'name2');
-      });
-
-      test('Same type different capitalization rename variable with id1 to Name2', function() {
-        this.workspace.createVariable('name2', 'type1', 'id2');
-        createVarBlocksNoEvents(this.workspace, ['id1', 'id2']);
-
-        this.workspace.renameVariableById('id1', 'Name2');
-
-        // The second variable should be updated.
-        assertVariableValues(this.workspace, 'Name2', 'type1', 'id2');
-        // The first variable should have been deleted.
-        var variable = this.workspace.getVariableById('id1');
-        chai.assert.isNull(variable);
-        // There should only be one variable left.
-        chai.assert.equal(this.workspace.getAllVariables().length, 1);
-
-        // Both blocks should now reference variable with Name2.
-        assertBlockVarModelName(this.workspace, 0, 'Name2');
-        assertBlockVarModelName(this.workspace, 1, 'Name2');
-      });
-
-      test('Different type different capitalization rename variable with id1 to Name2', function() {
-        this.workspace.createVariable('name2', 'type2', 'id2');
-        createVarBlocksNoEvents(this.workspace, ['id1', 'id2']);
-
-        this.workspace.renameVariableById('id1', 'Name2');
-
-        // Variables with different type are allowed to have the same name.
-        assertVariableValues(this.workspace, 'Name2', 'type1', 'id1');
-        // Second variable should remain unchanged.
-        assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-
-        // Only first block should use new capitalization.
-        assertBlockVarModelName(this.workspace, 0, 'Name2');
-        assertBlockVarModelName(this.workspace, 1, 'name2');
-      });
-    });
-  });
-
-  suite('getTopBlocks(ordered=true)', function() {
-    test('Empty workspace', function() {
-      chai.assert.equal(this.workspace.getTopBlocks(true).length, 0);
-    });
-
-    test('Flat workspace one block', function() {
-      this.workspace.newBlock('');
-      chai.assert.equal(this.workspace.getTopBlocks(true).length, 1);
-    });
-
-    test('Flat workspace one block after dispose', function() {
-      var blockA = this.workspace.newBlock('');
-      this.workspace.newBlock('');
-      blockA.dispose();
-      chai.assert.equal(this.workspace.getTopBlocks(true).length, 1);
-    });
-
-    test('Flat workspace two blocks', function() {
-      this.workspace.newBlock('');
-      this.workspace.newBlock('');
-      chai.assert.equal(this.workspace.getTopBlocks(true).length, 2);
-    });
-
-    test('Clear', function() {
-      this.workspace.clear();
-      chai.assert.equal(this.workspace.getTopBlocks(true).length, 0,
-          'Clear empty workspace');
-      this.workspace.newBlock('');
-      this.workspace.newBlock('');
-      this.workspace.clear();
-      chai.assert.equal(this.workspace.getTopBlocks(true).length, 0);
-    });
-  });
-
-  suite('getTopBlocks(ordered=false)', function() {
-    test('Empty workspace', function() {
-      chai.assert.equal(this.workspace.getTopBlocks(false).length, 0);
-    });
-
-    test('Flat workspace one block', function() {
-      this.workspace.newBlock('');
-      chai.assert.equal(this.workspace.getTopBlocks(false).length, 1);
-    });
-
-    test('Flat workspace one block after dispose', function() {
-      var blockA = this.workspace.newBlock('');
-      this.workspace.newBlock('');
-      blockA.dispose();
-      chai.assert.equal(this.workspace.getTopBlocks(false).length, 1);
-    });
-
-    test('Flat workspace two blocks', function() {
-      this.workspace.newBlock('');
-      this.workspace.newBlock('');
-      chai.assert.equal(this.workspace.getTopBlocks(false).length, 2);
-    });
-
-    test('Clear empty workspace', function() {
-      this.workspace.clear();
-      chai.assert.equal(this.workspace.getTopBlocks(false).length, 0);
-    });
-
-    test('Clear non-empty workspace', function() {
-      this.workspace.newBlock('');
-      this.workspace.newBlock('');
-      this.workspace.clear();
-      chai.assert.equal(this.workspace.getTopBlocks(false).length, 0);
-    });
-  });
-
-  suite('getAllBlocks', function() {
-    test('Empty workspace', function() {
-      chai.assert.equal(this.workspace.getAllBlocks(true).length, 0);
-    });
-
-    test('Flat workspace one block', function() {
-      this.workspace.newBlock('');
-      chai.assert.equal(this.workspace.getAllBlocks(true).length, 1);
-    });
-
-    test('Flat workspace one block after dispose', function() {
-      var blockA = this.workspace.newBlock('');
-      this.workspace.newBlock('');
-      blockA.dispose();
-      chai.assert.equal(this.workspace.getAllBlocks(true).length, 1);
-    });
-
-    test('Flat workspace two blocks', function() {
-      this.workspace.newBlock('');
-      this.workspace.newBlock('');
-      chai.assert.equal(this.workspace.getAllBlocks(true).length, 2);
-    });
-
-    test('Clear', function() {
-      this.workspace.clear();
-      chai.assert.equal(this.workspace.getAllBlocks(true).length, 0,
-          'Clear empty workspace');
-      this.workspace.newBlock('');
-      this.workspace.newBlock('');
-      this.workspace.clear();
-      chai.assert.equal(this.workspace.getAllBlocks(true).length, 0);
-    });
-  });
-
-  suite('remainingCapacity', function() {
-    setup(function() {
-      this.workspace.newBlock('');
-      this.workspace.newBlock('');
-    });
-
-    test('No block limit', function() {
-      chai.assert.equal(this.workspace.remainingCapacity(), Infinity);
-    });
-
-    test('Under block limit', function() {
-      this.workspace.options.maxBlocks = 3;
-      chai.assert.equal(this.workspace.remainingCapacity(), 1);
-      this.workspace.options.maxBlocks = 4;
-      chai.assert.equal(this.workspace.remainingCapacity(), 2);
-    });
-
-    test('At block limit', function() {
-      this.workspace.options.maxBlocks = 2;
-      chai.assert.equal(this.workspace.remainingCapacity(), 0);
-    });
-
-    test('At block limit of 0 after clear', function() {
-      this.workspace.options.maxBlocks = 0;
-      this.workspace.clear();
-      chai.assert.equal(this.workspace.remainingCapacity(), 0);
-    });
-
-    test('Over block limit', function() {
-      this.workspace.options.maxBlocks = 1;
-      chai.assert.equal(this.workspace.remainingCapacity(), -1);
-    });
-
-    test('Over block limit of 0', function() {
-      this.workspace.options.maxBlocks = 0;
-      chai.assert.equal(this.workspace.remainingCapacity(), -2);
-    });
-  });
-
-  suite('remainingCapacityOfType', function() {
-    setup(function() {
-      this.workspace.newBlock('get_var_block');
-      this.workspace.newBlock('get_var_block');
-      this.workspace.options.maxInstances = {};
-    });
-
-    test('No instance limit', function() {
-      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
-          Infinity);
-    });
-
-    test('Under instance limit', function() {
-      this.workspace.options.maxInstances['get_var_block'] = 3;
-      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
-          1, 'With maxInstances limit 3');
-      this.workspace.options.maxInstances['get_var_block'] = 4;
-      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
-          2, 'With maxInstances limit 4');
-    });
-
-    test('Under instance limit with multiple block types', function() {
-      this.workspace.newBlock('');
-      this.workspace.newBlock('');
-      this.workspace.newBlock('');
-      this.workspace.options.maxInstances['get_var_block'] = 3;
-      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
-          1, 'With maxInstances limit 3');
-      this.workspace.options.maxInstances['get_var_block'] = 4;
-      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
-          2, 'With maxInstances limit 4');
-    });
-
-    test('At instance limit', function() {
-      this.workspace.options.maxInstances['get_var_block'] = 2;
-      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
-          0, 'With maxInstances limit 2');
-    });
-
-    test('At instance limit of 0 after clear', function() {
-      this.workspace.clear();
-      this.workspace.options.maxInstances['get_var_block'] = 0;
-      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
-          0);
-    });
-
-    test('At instance limit with multiple block types', function() {
-      this.workspace.newBlock('');
-      this.workspace.newBlock('');
-      this.workspace.newBlock('');
-      this.workspace.options.maxInstances['get_var_block'] = 2;
-      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
-          0, 'With maxInstances limit 2');
-    });
-
-    test('At instance limit of 0 with multiple block types', function() {
-      this.workspace.newBlock('');
-      this.workspace.newBlock('');
-      this.workspace.newBlock('');
-      this.workspace.options.maxInstances['get_var_block'] = 0;
-      this.workspace.clear();
-      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
-          0);
-    });
-
-    test('Over instance limit', function() {
-      this.workspace.options.maxInstances['get_var_block'] = 1;
-      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
-          -1, 'With maxInstances limit 1');
-    });
-
-    test('Over instance limit of 0', function() {
-      this.workspace.options.maxInstances['get_var_block'] = 0;
-      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
-          -2, 'With maxInstances limit 0');
-    });
-
-    test('Over instance limit with multiple block types', function() {
-      this.workspace.newBlock('');
-      this.workspace.newBlock('');
-      this.workspace.newBlock('');
-      this.workspace.options.maxInstances['get_var_block'] = 1;
-      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
-          -1, 'With maxInstances limit 1');
-    });
-
-    test('Over instance limit of 0 with multiple block types', function() {
-      this.workspace.newBlock('');
-      this.workspace.newBlock('');
-      this.workspace.newBlock('');
-      this.workspace.options.maxInstances['get_var_block'] = 0;
-      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
-          -2, 'With maxInstances limit 0');
-    });
-  });
-
-  suite('isCapacityAvailable', function() {
-    setup(function() {
-      this.workspace.newBlock('get_var_block');
-      this.workspace.newBlock('get_var_block');
-      this.workspace.options.maxInstances = {};
-    });
-
-    test('Under block limit and no instance limit', function() {
-      this.workspace.options.maxBlocks = 3;
-      var typeCountsMap = {'get_var_block': 1};
-      chai.assert.isTrue(this.workspace.isCapacityAvailable(typeCountsMap));
-    });
-
-    test('At block limit and no instance limit', function() {
-      this.workspace.options.maxBlocks = 2;
-      var typeCountsMap = {'get_var_block': 1};
-      chai.assert.isFalse(this.workspace.isCapacityAvailable(typeCountsMap));
-    });
-
-    test('Over block limit of 0 and no instance limit', function() {
-      this.workspace.options.maxBlocks = 0;
-      var typeCountsMap = {'get_var_block': 1};
-      chai.assert.isFalse(this.workspace.isCapacityAvailable(typeCountsMap));
-    });
-
-    test('Over block limit but under instance limit', function() {
-      this.workspace.options.maxBlocks = 1;
-      this.workspace.options.maxInstances['get_var_block'] = 3;
-      var typeCountsMap = {'get_var_block': 1};
-      chai.assert.isFalse(this.workspace.isCapacityAvailable(typeCountsMap),
-          'With maxBlocks limit 1 and maxInstances limit 3');
-    });
-
-    test('Over block limit of 0 but under instance limit', function() {
-      this.workspace.options.maxBlocks = 0;
-      this.workspace.options.maxInstances['get_var_block'] = 3;
-      var typeCountsMap = {'get_var_block': 1};
-      chai.assert.isFalse(this.workspace.isCapacityAvailable(typeCountsMap),
-          'With maxBlocks limit 0 and maxInstances limit 3');
-    });
-
-    test('Over block limit but at instance limit', function() {
-      this.workspace.options.maxBlocks = 1;
-      this.workspace.options.maxInstances['get_var_block'] = 2;
-      var typeCountsMap = {'get_var_block': 1};
-      chai.assert.isFalse(this.workspace.isCapacityAvailable(typeCountsMap),
-          'With maxBlocks limit 1 and maxInstances limit 2');
-    });
-
-    test('Over block limit and over instance limit', function() {
-      this.workspace.options.maxBlocks = 1;
-      this.workspace.options.maxInstances['get_var_block'] = 1;
-      var typeCountsMap = {'get_var_block': 1};
-      chai.assert.isFalse(this.workspace.isCapacityAvailable(typeCountsMap),
-          'With maxBlocks limit 1 and maxInstances limit 1');
-    });
-
-    test('Over block limit of 0 and over instance limit', function() {
-      this.workspace.options.maxBlocks = 0;
-      this.workspace.options.maxInstances['get_var_block'] = 1;
-      var typeCountsMap = {'get_var_block': 1};
-      chai.assert.isFalse(this.workspace.isCapacityAvailable(typeCountsMap),
-          'With maxBlocks limit 0 and maxInstances limit 1');
-    });
-
-    test('Over block limit and over instance limit of 0', function() {
-      this.workspace.options.maxBlocks = 1;
-      this.workspace.options.maxInstances['get_var_block'] = 0;
-      var typeCountsMap = {'get_var_block': 1};
-      chai.assert.isFalse(this.workspace.isCapacityAvailable(typeCountsMap),
-          'With maxBlocks limit 1 and maxInstances limit 0');
-    });
-
-    test('Over block limit of 0 and over instance limit of 0', function() {
-      this.workspace.options.maxBlocks = 0;
-      this.workspace.options.maxInstances['get_var_block'] = 0;
-      var typeCountsMap = {'get_var_block': 1};
-      chai.assert.isFalse(this.workspace.isCapacityAvailable(typeCountsMap));
-    });
-  });
-
-  suite('getById', function() {
-    setup(function() {
-      this.workspaceB = this.workspace.rendered ?
-          new Blockly.WorkspaceSvg(new Blockly.Options({})) :
-          new Blockly.Workspace();
-    });
-
-    teardown(function() {
-      workspaceTeardown.call(this, this.workspaceB);
-    });
-
-    test('Trivial', function() {
-      chai.assert.equal(Blockly.Workspace.getById(
-          this.workspace.id), this.workspace, 'Find workspace');
-      chai.assert.equal(Blockly.Workspace.getById(
-          this.workspaceB.id), this.workspaceB, 'Find workspaceB');
-    });
-
-    test('Null id', function() {
-      chai.assert.isNull(Blockly.Workspace.getById(null));
-    });
-
-    test('Non-existent id', function() {
-      chai.assert.isNull(Blockly.Workspace.getById('badId'));
-    });
-
-    test('After dispose', function() {
-      this.workspaceB.dispose();
-      chai.assert.isNull(Blockly.Workspace.getById(this.workspaceB.id));
-    });
-  });
-
-  suite('getBlockById', function() {
-    setup(function() {
-      this.blockA = this.workspace.newBlock('');
-      this.blockB = this.workspace.newBlock('');
-      this.workspaceB = this.workspace.rendered ?
-          new Blockly.WorkspaceSvg(new Blockly.Options({})) :
-          new Blockly.Workspace();
-    });
-
-    teardown(function() {
-      workspaceTeardown.call(this, this.workspaceB);
-    });
-
-    test('Trivial', function() {
-      chai.assert.equal(
-          this.workspace.getBlockById(this.blockA.id), this.blockA);
-      chai.assert.equal(
-          this.workspace.getBlockById(this.blockB.id), this.blockB);
-    });
-
-    test('Null id', function() {
-      chai.assert.isNull(this.workspace.getBlockById(null));
-    });
-
-    test('Non-existent id', function() {
-      chai.assert.isNull(this.workspace.getBlockById('badId'));
-    });
-
-    test('After dispose', function() {
-      this.blockA.dispose();
-      chai.assert.isNull(this.workspace.getBlockById(this.blockA.id));
-      chai.assert.equal(
-          this.workspace.getBlockById(this.blockB.id), this.blockB);
-    });
-
-    test('After clear', function() {
-      this.workspace.clear();
-      chai.assert.isNull(this.workspace.getBlockById(this.blockA.id));
-      chai.assert.isNull(this.workspace.getBlockById(this.blockB.id));
-    });
-  });
-
-  suite('Undo/Redo', function() {
-
-    /**
-     * Assert that two nodes are equal.
-     * @param {!Element} actual the actual node.
-     * @param {!Element} expected the expected node.
-     */
-    function assertNodesEqual(actual, expected) {
-      var actualString = '\n' + Blockly.Xml.domToPrettyText(actual) + '\n';
-      var expectedString = '\n' + Blockly.Xml.domToPrettyText(expected) + '\n';
-
-      chai.assert.equal(actual.tagName, expected.tagName);
-      for (var i = 0, attr; (attr = expected.attributes[i]); i++) {
-        chai.assert.equal(actual.getAttribute(attr.name), attr.value,
-            `expected attribute ${attr.name} on ${actualString} to match ` +
-            `${expectedString}`);
-      }
-      chai.assert.equal(actual.childElementCount, expected.childElementCount,
-          `expected node ${actualString} to have the same children as node ` +
-          `${expectedString}`);
-      for (var i = 0; i < expected.childElementCount; i++) {
-        assertNodesEqual(actual.children[i], expected.children[i]);
-      }
-    }
-
-    suite('Undo Delete', function() {
-      setup(function() {
-        Blockly.defineBlocksWithJsonArray([
-          {
-            "type": "stack_block",
-            "message0": "",
-            "previousStatement": null,
-            "nextStatement": null
-          },
-          {
-            "type": "row_block",
-            "message0": "%1",
-            "args0": [
-              {
-                "type": "input_value",
-                "name": "INPUT"
-              }
-            ],
-            "output": null
-          },
-          {
-            "type": "statement_block",
-            "message0": "%1",
-            "args0": [
-              {
-                "type": "input_statement",
-                "name": "STATEMENT"
-              }
-            ],
-            "previousStatement": null,
-            "nextStatement": null
-          }]);
-      });
-
-      teardown(function() {
-        delete Blockly.Blocks['stack_block'];
-        delete Blockly.Blocks['row_block'];
-        delete Blockly.Blocks['statement_block'];
-      });
-
-      function testUndoDelete(xmlText) {
-        var xml = Blockly.Xml.textToDom(xmlText);
-        Blockly.Xml.domToBlock(xml, this.workspace);
-        this.workspace.getTopBlocks()[0].dispose(false);
-        this.workspace.undo();
-        var newXml = Blockly.Xml.workspaceToDom(this.workspace);
-        assertNodesEqual(newXml.firstChild, xml);
-      }
-
-      test('Stack', function() {
-        testUndoDelete.call(this, '<block type="stack_block" id="1"/>');
-      });
-
-      test('Row', function() {
-        testUndoDelete.call(this, '<block type="row_block" id="1"/>');
-      });
-
-      test('Statement', function() {
-        testUndoDelete.call(this, '<block type="statement_block" id="1"/>');
-      });
-
-      test('Stack w/ child', function() {
-        testUndoDelete.call(this,
-            '<block type="stack_block" id="1">' +
-            '  <next>' +
-            '    <block type="stack_block" id="2"></block>' +
-            '  </next>' +
-            '</block>'
-        );
-      });
-
-      test('Row w/ child', function() {
-        testUndoDelete.call(this,
-            '<block type="row_block" id="1">' +
-            '  <value name="INPUT">' +
-            '    <block type="row_block" id="2"></block>' +
-            '  </value>' +
-            '</block>'
-        );
-      });
-
-      test('Statement w/ child', function() {
-        testUndoDelete.call(this,
-            '<block type="statement_block" id="1">' +
-            '  <statement name="STATEMENT">' +
-            '    <block type="stack_block" id="2"></block>' +
-            '  </statement>' +
-            '</block>'
-        );
-      });
-
-      test('Stack w/ shadow', function() {
-        testUndoDelete.call(this,
-            '<block type="stack_block" id="1">' +
-            '  <next>' +
-            '    <shadow type="stack_block" id="2"></shadow>' +
-            '  </next>' +
-            '</block>'
-        );
-      });
-
-      test('Row w/ shadow', function() {
-        testUndoDelete.call(this,
-            '<block type="row_block" id="1">' +
-            '  <value name="INPUT">' +
-            '    <shadow type="row_block" id="2"></shadow>' +
-            '  </value>' +
-            '</block>'
-        );
-      });
-
-      test('Statement w/ shadow', function() {
-        testUndoDelete.call(this,
-            '<block type="statement_block" id="1">' +
-            '  <statement name="STATEMENT">' +
-            '    <shadow type="stack_block" id="2"></shadow>' +
-            '  </statement>' +
-            '</block>'
-        );
-      });
-    });
-
-    suite('Undo Connect', function() {
-
-      setup(function() {
-        Blockly.defineBlocksWithJsonArray([
-          {
-            "type": "stack_block",
-            "message0": "",
-            "previousStatement": null,
-            "nextStatement": null
-          },
-          {
-            "type": "row_block",
-            "message0": "%1",
-            "args0": [
-              {
-                "type": "input_value",
-                "name": "INPUT"
-              }
-            ],
-            "output": null
-          },
-          {
-            "type": "statement_block",
-            "message0": "%1",
-            "args0": [
-              {
-                "type": "input_statement",
-                "name": "STATEMENT"
-              }
-            ],
-            "previousStatement": null,
-            "nextStatement": null
-          }]);
-      });
-
-      teardown(function() {
-        delete Blockly.Blocks['stack_block'];
-        delete Blockly.Blocks['row_block'];
-        delete Blockly.Blocks['statement_block'];
-      });
-
-      function testUndoConnect(xmlText, parentId, childId, func) {
-        var xml = Blockly.Xml.textToDom(xmlText);
-        Blockly.Xml.domToWorkspace(xml, this.workspace);
-
-        var parent = this.workspace.getBlockById(parentId);
-        var child = this.workspace.getBlockById(childId);
-        func.call(this, parent, child);
-        this.workspace.undo();
-
-        var newXml = Blockly.Xml.workspaceToDom(this.workspace);
-        assertNodesEqual(newXml, xml);
-      }
-
-      test('Stack', function() {
-        var xml =
-            '<xml>' +
-            '  <block type="stack_block" id="1"></block>' +
-            '  <block type="stack_block" id="2"></block>' +
-            '</xml>';
-
-        testUndoConnect.call(this, xml, 1, 2, (parent, child) => {
-          parent.nextConnection.connect(child.previousConnection);
-        });
-      });
-
-      test('Row', function() {
-        var xml =
-            '<xml>' +
-            '  <block type="row_block" id="1"></block>' +
-            '  <block type="row_block" id="2"></block>' +
-            '</xml>';
-
-        testUndoConnect.call(this, xml, 1, 2, (parent, child) => {
-          parent.getInput('INPUT').connection.connect(child.outputConnection);
-        });
-      });
-
-      test('Statement', function() {
-        var xml =
-            '<xml>' +
-            '  <block type="statement_block" id="1"></block>' +
-            '  <block type="stack_block" id="2"></block>' +
-            '</xml>';
-
-        testUndoConnect.call(this, xml, 1, 2, (parent, child) => {
-          parent.getInput('STATEMENT').connection
-              .connect(child.previousConnection);
-        });
-      });
-
-      test('Stack w/ child', function() {
-        var xml =
-            '<xml>' +
-            '  <block type="stack_block" id="1">' +
-            '    <next>' +
-            '      <block type="stack_block" id="3"></block>' +
-            '    </next>' +
-            '  </block>' +
-            '  <block type="stack_block" id="2"></block>' +
-            '</xml>';
-
-        testUndoConnect.call(this, xml, 1, 2, (parent, child) => {
-          parent.nextConnection.connect(child.previousConnection);
-        });
-      });
-
-      test('Row w/ child', function() {
-        var xml =
-            '<xml>' +
-            '  <block type="row_block" id="1">' +
-            '    <value name="INPUT">' +
-            '      <block type="row_block" id="3"></block>' +
-            '    </value>' +
-            '  </block>' +
-            '  <block type="row_block" id="2"></block>' +
-            '</xml>';
-
-        testUndoConnect.call(this, xml, 1, 2, (parent, child) => {
-          parent.getInput('INPUT').connection.connect(child.outputConnection);
-        });
-      });
-
-      test('Statement w/ child', function() {
-        var xml =
-            '<xml>' +
-            '  <block type="statement_block" id="1">' +
-            '    <statement name="STATEMENT">' +
-            '      <block type="stack_block" id="3"></block>' +
-            '    </statement>' +
-            '  </block>' +
-            '  <block type="stack_block" id="2"></block>' +
-            '</xml>';
-
-        testUndoConnect.call(this, xml, 1, 2, (parent, child) => {
-          parent.getInput('STATEMENT').connection
-              .connect(child.previousConnection);
-        });
-      });
-
-      test('Stack w/ shadow', function() {
-        var xml =
-            '<xml>' +
-            '  <block type="stack_block" id="1">' +
-            '    <next>' +
-            '      <shadow type="stack_block" id="3"></shadow>' +
-            '    </next>' +
-            '  </block>' +
-            '  <block type="stack_block" id="2"></block>' +
-            '</xml>';
-
-        testUndoConnect.call(this, xml, 1, 2, (parent, child) => {
-          parent.nextConnection.connect(child.previousConnection);
-        });
-      });
-
-      test('Row w/ shadow', function() {
-        var xml =
-            '<xml>' +
-            '  <block type="row_block" id="1">' +
-            '    <value name="INPUT">' +
-            '      <shadow type="row_block" id="3"></shadow>' +
-            '    </value>' +
-            '  </block>' +
-            '  <block type="row_block" id="2"></block>' +
-            '</xml>';
-
-        testUndoConnect.call(this, xml, 1, 2, (parent, child) => {
-          parent.getInput('INPUT').connection.connect(child.outputConnection);
-        });
-      });
-
-      test('Statement w/ shadow', function() {
-        var xml =
-            '<xml>' +
-            '  <block type="statement_block" id="1">' +
-            '    <statement name="STATEMENT">' +
-            '      <shadow type="stack_block" id="3"></shadow>' +
-            '    </statement>' +
-            '  </block>' +
-            '  <block type="stack_block" id="2"></block>' +
-            '</xml>';
-
-        testUndoConnect.call(this, xml, 1, 2, (parent, child) => {
-          parent.getInput('STATEMENT').connection
-              .connect(child.previousConnection);
-        });
-      });
-    });
-
-    suite('Undo Disconnect', function() {
-
-      setup(function() {
-        Blockly.defineBlocksWithJsonArray([
-          {
-            "type": "stack_block",
-            "message0": "",
-            "previousStatement": null,
-            "nextStatement": null
-          },
-          {
-            "type": "row_block",
-            "message0": "%1",
-            "args0": [
-              {
-                "type": "input_value",
-                "name": "INPUT"
-              }
-            ],
-            "output": null
-          },
-          {
-            "type": "statement_block",
-            "message0": "%1",
-            "args0": [
-              {
-                "type": "input_statement",
-                "name": "STATEMENT"
-              }
-            ],
-            "previousStatement": null,
-            "nextStatement": null
-          }]);
-      });
-
-      teardown(function() {
-        delete Blockly.Blocks['stack_block'];
-        delete Blockly.Blocks['row_block'];
-        delete Blockly.Blocks['statement_block'];
-      });
-
-      function testUndoDisconnect(xmlText, childId) {
-        var xml = Blockly.Xml.textToDom(xmlText);
-        Blockly.Xml.domToWorkspace(xml, this.workspace);
-
-        var child = this.workspace.getBlockById(childId);
-        if (child.outputConnection) {
-          child.outputConnection.disconnect();
-        } else {
-          child.previousConnection.disconnect();
-        }
-        this.workspace.undo();
-
-        var newXml = Blockly.Xml.workspaceToDom(this.workspace);
-        assertNodesEqual(newXml, xml);
-      }
-
-      test('Stack', function() {
-        var xml =
-            '<xml>' +
-            '  <block type="stack_block" id="1">' +
-            '    <next>' +
-            '      <block type="stack_block" id="2"></block>' +
-            '    </next>' +
-            '  </block>' +
-            '</xml>';
-        testUndoDisconnect.call(this, xml, 2);
-      });
-
-      test('Row', function() {
-        var xml =
-            '<xml>' +
-            '  <block type="row_block" id="1">' +
-            '    <value name="INPUT">' +
-            '      <block type="row_block" id="2"></block>' +
-            '    </value>' +
-            '  </block>' +
-            '</xml>';
-        testUndoDisconnect.call(this, xml, 2);
-      });
-
-      test('Statement', function() {
-        var xml =
-            '<xml>' +
-            '  <block type="statement_block" id="1">' +
-            '    <statement name="STATEMENT">' +
-            '      <block type="stack_block" id="2"></block>' +
-            '    </statement>' +
-            '  </block>' +
-            '</xml>';
-        testUndoDisconnect.call(this, xml, 2);
-      });
-
-      test('Stack w/ child', function() {
-        var xml =
-            '<xml>' +
-            '  <block type="stack_block" id="1">' +
-            '    <next>' +
-            '      <block type="stack_block" id="2">' +
-            '        <next>' +
-            '          <block type="stack_block" id="3"></block>' +
-            '        </next>' +
-            '      </block>' +
-            '    </next>' +
-            '  </block>' +
-            '</xml>';
-        testUndoDisconnect.call(this, xml, 2);
-      });
-
-      test('Row w/ child', function() {
-        var xml =
-            '<xml>' +
-            '  <block type="row_block" id="1">' +
-            '    <value name="INPUT">' +
-            '      <block type="row_block" id="2">' +
-            '        <value name="INPUT">' +
-            '          <block type="row_block" id="3"></block>' +
-            '        </value>' +
-            '      </block>' +
-            '    </value>' +
-            '  </block>' +
-            '</xml>';
-        testUndoDisconnect.call(this, xml, 2);
-      });
-
-      test('Statement w/ child', function() {
-        var xml =
-            '<xml>' +
-            '  <block type="statement_block" id="1">' +
-            '    <statement name="STATEMENT">' +
-            '      <block type="statement_block" id="2">' +
-            '        <statement name="STATEMENT">' +
-            '          <block type="stack_block" id="3"></block>' +
-            '        </statement>' +
-            '      </block>' +
-            '    </statement>' +
-            '  </block>' +
-            '</xml>';
-        testUndoDisconnect.call(this, xml, 2);
-      });
-
-      test('Stack w/ shadow', function() {
-        // TODO: For some reason on next connections shadows are
-        //   serialized second.
-        var xml =
-            '<xml>' +
-            '  <block type="stack_block" id="1">' +
-            '    <next>' +
-            '      <block type="stack_block" id="2"></block>' +
-            '      <shadow type="stack_block" id="3"></shadow>' +
-            '    </next>' +
-            '  </block>' +
-            '</xml>';
-        testUndoDisconnect.call(this, xml, 2);
-        chai.assert.equal(this.workspace.getAllBlocks().length, 2,
-            'expected there to only be 2 blocks on the workspace ' +
-            '(check for shadows)');
-      });
-
-      test('Row w/ shadow', function() {
-        var xml =
-            '<xml>' +
-            '  <block type="row_block" id="1">' +
-            '    <value name="INPUT">' +
-            '      <shadow type="row_block" id="3"></shadow>' +
-            '      <block type="row_block" id="2"></block>' +
-            '    </value>' +
-            '  </block>' +
-            '</xml>';
-        testUndoDisconnect.call(this, xml, 2);
-        chai.assert.equal(this.workspace.getAllBlocks().length, 2,
-            'expected there to only be 2 blocks on the workspace ' +
-            '(check for shadows)');
-      });
-
-      test('Statement w/ shadow', function() {
-        var xml =
-            '<xml>' +
-            '  <block type="statement_block" id="1">' +
-            '    <statement name="STATEMENT">' +
-            '      <shadow type="stack_block" id="3"></shadow>' +
-            '      <block type="stack_block" id="2"></block>' +
-            '    </statement>' +
-            '  </block>' +
-            '</xml>';
-        testUndoDisconnect.call(this, xml, 2);
-      });
-    });
-
-    suite('Variables', function() {
-      function createTwoVarsDifferentTypes(workspace) {
-        workspace.createVariable('name1', 'type1', 'id1');
-        workspace.createVariable('name2', 'type2', 'id2');
-      }
-
-      suite('createVariable', function() {
-        test('Undo only', function() {
-          createTwoVarsDifferentTypes(this.workspace);
-
-          this.workspace.undo();
-          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-          chai.assert.isNull(this.workspace.getVariableById('id2'));
-
-          this.workspace.undo();
-          chai.assert.isNull(this.workspace.getVariableById('id1'));
-          chai.assert.isNull(this.workspace.getVariableById('id2'));
-        });
-
-        test('Undo and redo', function() {
-          createTwoVarsDifferentTypes(this.workspace);
-
-          this.workspace.undo();
-          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-          chai.assert.isNull(this.workspace.getVariableById('id2'));
-
-          this.workspace.undo(true);
-
-          // Expect that variable 'id2' is recreated
-          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-
-          this.workspace.undo();
-          this.workspace.undo();
-          chai.assert.isNull(this.workspace.getVariableById('id1'));
-          chai.assert.isNull(this.workspace.getVariableById('id2'));
-          this.workspace.undo(true);
-
-          // Expect that variable 'id1' is recreated
-          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-          chai.assert.isNull(this.workspace.getVariableById('id2'));
-        });
-      });
-
-      suite('deleteVariableById', function() {
-        test('Undo only no usages', function() {
-          createTwoVarsDifferentTypes(this.workspace);
-          this.workspace.deleteVariableById('id1');
-          this.workspace.deleteVariableById('id2');
-
-          this.workspace.undo();
-          chai.assert.isNull(this.workspace.getVariableById('id1'));
-          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-
-          this.workspace.undo();
-          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-        });
-
-        test('Undo only with usages', function() {
-          createTwoVarsDifferentTypes(this.workspace);
-          // Create blocks to refer to both of them.
-          createVarBlocksNoEvents(this.workspace, ['id1', 'id2']);
-          this.workspace.deleteVariableById('id1');
-          this.workspace.deleteVariableById('id2');
-
-          this.workspace.undo();
-          assertBlockVarModelName(this.workspace, 0, 'name2');
-          chai.assert.isNull(this.workspace.getVariableById('id1'));
-          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-
-          this.workspace.undo();
-          assertBlockVarModelName(this.workspace, 0, 'name2');
-          assertBlockVarModelName(this.workspace, 1, 'name1');
-          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-        });
-
-        test('Reference exists no usages', function() {
-          createTwoVarsDifferentTypes(this.workspace);
-          this.workspace.deleteVariableById('id1');
-          this.workspace.deleteVariableById('id2');
-
-          this.workspace.undo();
-          chai.assert.isNull(this.workspace.getVariableById('id1'));
-          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-
-          this.workspace.undo(true);
-          // Expect that both variables are deleted
-          chai.assert.isNull(this.workspace.getVariableById('id1'));
-          chai.assert.isNull(this.workspace.getVariableById('id2'));
-
-          this.workspace.undo();
-          this.workspace.undo();
-          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-
-          this.workspace.undo(true);
-          // Expect that variable 'id2' is recreated
-          chai.assert.isNull(this.workspace.getVariableById('id1'));
-          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-        });
-
-        test('Reference exists with usages', function() {
-          createTwoVarsDifferentTypes(this.workspace);
-          // Create blocks to refer to both of them.
-          createVarBlocksNoEvents(this.workspace, ['id1', 'id2']);
-          this.workspace.deleteVariableById('id1');
-          this.workspace.deleteVariableById('id2');
-
-          this.workspace.undo();
-          assertBlockVarModelName(this.workspace, 0, 'name2');
-          chai.assert.isNull(this.workspace.getVariableById('id1'));
-          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-
-          this.workspace.undo(true);
-          // Expect that both variables are deleted
-          chai.assert.equal(this.workspace.topBlocks_.length, 0);
-          chai.assert.isNull(this.workspace.getVariableById('id1'));
-          chai.assert.isNull(this.workspace.getVariableById('id2'));
-
-          this.workspace.undo();
-          this.workspace.undo();
-          assertBlockVarModelName(this.workspace, 0, 'name2');
-          assertBlockVarModelName(this.workspace, 1, 'name1');
-          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-
-          this.workspace.undo(true);
-          // Expect that variable 'id2' is recreated
-          assertBlockVarModelName(this.workspace, 0, 'name2');
-          chai.assert.isNull(this.workspace.getVariableById('id1'));
-          assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-        });
-
-        test('Delete same variable twice no usages', function() {
-          this.workspace.createVariable('name1', 'type1', 'id1');
-          this.workspace.deleteVariableById('id1');
-          var workspace = this.workspace;
-          var warnings = testHelpers.captureWarnings(function() {
-            workspace.deleteVariableById('id1');
-          });
-          chai.assert.equal(warnings.length, 1,
-              'Expected 1 warning for second deleteVariableById call.');
-
-          // Check the undoStack only recorded one delete event.
-          var undoStack = this.workspace.undoStack_;
-          chai.assert.equal(undoStack[undoStack.length - 1].type, 'var_delete');
-          chai.assert.notEqual(undoStack[undoStack.length - 2].type, 'var_delete');
-
-          // Undo delete
-          this.workspace.undo();
-          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-
-          // Redo delete
-          this.workspace.undo(true);
-          chai.assert.isNull(this.workspace.getVariableById('id1'));
-
-          // Redo delete, nothing should happen
-          this.workspace.undo(true);
-          chai.assert.isNull(this.workspace.getVariableById('id1'));
-        });
-
-        test('Delete same variable twice with usages', function() {
-          this.workspace.createVariable('name1', 'type1', 'id1');
-          createVarBlocksNoEvents(this.workspace, ['id1']);
-          this.workspace.deleteVariableById('id1');
-          var workspace = this.workspace;
-          var warnings = testHelpers.captureWarnings(function() {
-            workspace.deleteVariableById('id1');
-          });
-          chai.assert.equal(warnings.length, 1,
-              'Expected 1 warning for second deleteVariableById call.');
-
-          // Check the undoStack only recorded one delete event.
-          var undoStack = this.workspace.undoStack_;
-          chai.assert.equal(undoStack[undoStack.length - 1].type, 'var_delete');
-          chai.assert.equal(undoStack[undoStack.length - 2].type, 'delete');
-          chai.assert.notEqual(undoStack[undoStack.length - 3].type, 'var_delete');
-
-          // Undo delete
-          this.workspace.undo();
-          assertBlockVarModelName(this.workspace, 0, 'name1');
-          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-
-          // Redo delete
-          this.workspace.undo(true);
-          chai.assert.equal(this.workspace.topBlocks_.length, 0);
-          chai.assert.isNull(this.workspace.getVariableById('id1'));
-
-          // Redo delete, nothing should happen
-          this.workspace.undo(true);
-          chai.assert.equal(this.workspace.topBlocks_.length, 0);
-          chai.assert.isNull(this.workspace.getVariableById('id1'));
-        });
-      });
-
-      suite('renameVariableById', function() {
-        setup(function() {
-          this.workspace.createVariable('name1', 'type1', 'id1');
-        });
-
-        test('Reference exists no usages rename to name2', function() {
-          this.workspace.renameVariableById('id1', 'name2');
-
-          this.workspace.undo();
-          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-
-          this.workspace.undo(true);
-          assertVariableValues(this.workspace, 'name2', 'type1', 'id1');
-
-        });
-
-        test('Reference exists with usages rename to name2', function() {
-          createVarBlocksNoEvents(this.workspace, ['id1']);
-          this.workspace.renameVariableById('id1', 'name2');
-
-          this.workspace.undo();
-          assertBlockVarModelName(this.workspace, 0, 'name1');
-          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-
-          this.workspace.undo(true);
-          assertBlockVarModelName(this.workspace, 0, 'name2');
-          assertVariableValues(this.workspace, 'name2', 'type1', 'id1');
-        });
-
-        test('Reference exists different capitalization no usages rename to Name1', function() {
-          this.workspace.renameVariableById('id1', 'Name1');
-
-          this.workspace.undo();
-          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-
-          this.workspace.undo(true);
-          assertVariableValues(this.workspace, 'Name1', 'type1', 'id1');
-        });
-
-        test('Reference exists different capitalization with usages rename to Name1', function() {
-          createVarBlocksNoEvents(this.workspace, ['id1']);
-          this.workspace.renameVariableById('id1', 'Name1');
-
-          this.workspace.undo();
-          assertBlockVarModelName(this.workspace, 0, 'name1');
-          assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-
-          this.workspace.undo(true);
-          assertBlockVarModelName(this.workspace, 0, 'Name1');
-          assertVariableValues(this.workspace, 'Name1', 'type1', 'id1');
-        });
-
-        suite('Two variables rename overlap', function() {
-          test('Same type no usages rename variable with id1 to name2', function() {
-            this.workspace.createVariable('name2', 'type1', 'id2');
-            this.workspace.renameVariableById('id1', 'name2');
-
-            this.workspace.undo();
-            assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-            assertVariableValues(this.workspace, 'name2', 'type1', 'id2');
-
-            this.workspace.undo(true);
-            assertVariableValues(this.workspace, 'name2', 'type1', 'id2');
-            chai.assert.isNull(this.workspace.getVariableById('id1'));
-          });
-
-          test('Same type with usages rename variable with id1 to name2', function() {
-            this.workspace.createVariable('name2', 'type1', 'id2');
-            createVarBlocksNoEvents(this.workspace, ['id1', 'id2']);
-            this.workspace.renameVariableById('id1', 'name2');
-
-            this.workspace.undo();
-            assertBlockVarModelName(this.workspace, 0, 'name1');
-            assertBlockVarModelName(this.workspace, 1, 'name2');
-            assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-            assertVariableValues(this.workspace, 'name2', 'type1', 'id2');
-
-            this.workspace.undo(true);
-            assertVariableValues(this.workspace, 'name2', 'type1', 'id2');
-            chai.assert.isNull(this.workspace.getVariableById('id1'));
-          });
-
-          test('Same type different capitalization no usages rename variable with id1 to Name2', function() {
-            this.workspace.createVariable('name2', 'type1', 'id2');
-            this.workspace.renameVariableById('id1', 'Name2');
-
-            this.workspace.undo();
-            assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-            assertVariableValues(this.workspace, 'name2', 'type1', 'id2');
-
-            this.workspace.undo(true);
-            assertVariableValues(this.workspace, 'Name2', 'type1', 'id2');
-            chai.assert.isNull(this.workspace.getVariable('name1'));
-          });
-
-          test('Same type different capitalization with usages rename variable with id1 to Name2', function() {
-            this.workspace.createVariable('name2', 'type1', 'id2');
-            createVarBlocksNoEvents(this.workspace, ['id1', 'id2']);
-            this.workspace.renameVariableById('id1', 'Name2');
-
-            this.workspace.undo();
-            assertBlockVarModelName(this.workspace, 0, 'name1');
-            assertBlockVarModelName(this.workspace, 1, 'name2');
-            assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-            assertVariableValues(this.workspace, 'name2', 'type1', 'id2');
-
-            this.workspace.undo(true);
-            assertVariableValues(this.workspace, 'Name2', 'type1', 'id2');
-            chai.assert.isNull(this.workspace.getVariableById('id1'));
-            assertBlockVarModelName(this.workspace, 0, 'Name2');
-            assertBlockVarModelName(this.workspace, 1, 'Name2');
-          });
-
-          test('Different type no usages rename variable with id1 to name2', function() {
-            this.workspace.createVariable('name2', 'type2', 'id2');
-            this.workspace.renameVariableById('id1', 'name2');
-
-            this.workspace.undo();
-            assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-            assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-
-            this.workspace.undo(true);
-            assertVariableValues(this.workspace, 'name2', 'type1', 'id1');
-            assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-          });
-
-          test('Different type with usages rename variable with id1 to name2', function() {
-            this.workspace.createVariable('name2', 'type2', 'id2');
-            createVarBlocksNoEvents(this.workspace, ['id1', 'id2']);
-            this.workspace.renameVariableById('id1', 'name2');
-
-            this.workspace.undo();
-            assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-            assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-            assertBlockVarModelName(this.workspace, 0, 'name1');
-            assertBlockVarModelName(this.workspace, 1, 'name2');
-
-            this.workspace.undo(true);
-            assertVariableValues(this.workspace, 'name2', 'type1', 'id1');
-            assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-            assertBlockVarModelName(this.workspace, 0, 'name2');
-            assertBlockVarModelName(this.workspace, 1, 'name2');
-          });
-
-          test('Different type different capitalization no usages rename variable with id1 to Name2', function() {
-            this.workspace.createVariable('name2', 'type2', 'id2');
-            this.workspace.renameVariableById('id1', 'Name2');
-
-            this.workspace.undo();
-            assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-            assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-
-            this.workspace.undo(true);
-            assertVariableValues(this.workspace, 'Name2', 'type1', 'id1');
-            assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-          });
-
-          test('Different type different capitalization with usages rename variable with id1 to Name2', function() {
-            this.workspace.createVariable('name2', 'type2', 'id2');
-            createVarBlocksNoEvents(this.workspace, ['id1', 'id2']);
-            this.workspace.renameVariableById('id1', 'Name2');
-
-            this.workspace.undo();
-            assertVariableValues(this.workspace, 'name1', 'type1', 'id1');
-            assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-            assertBlockVarModelName(this.workspace, 0, 'name1');
-            assertBlockVarModelName(this.workspace, 1, 'name2');
-
-            this.workspace.undo(true);
-            assertVariableValues(this.workspace, 'Name2', 'type1', 'id1');
-            assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
-            assertBlockVarModelName(this.workspace, 0, 'Name2');
-            assertBlockVarModelName(this.workspace, 1, 'name2');
-          });
-        });
-      });
-    });
-  });
-}
diff --git a/tests/mocha/xml_test.js b/tests/mocha/xml_test.js
index f85ca1b5a..9826e2cc4 100644
--- a/tests/mocha/xml_test.js
+++ b/tests/mocha/xml_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.xml');
+
+const {addBlockTypeToCleanup, assertVariableValues, createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+
+
 suite('XML', function() {
   var assertSimpleFieldDom = function(fieldDom, name, text) {
     chai.assert.equal(text, fieldDom.textContent);
diff --git a/tests/mocha/zoom_controls_test.js b/tests/mocha/zoom_controls_test.js
index e8180bb9c..e17bccddb 100644
--- a/tests/mocha/zoom_controls_test.js
+++ b/tests/mocha/zoom_controls_test.js
@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.module('Blockly.test.zoomControls');
+
+const {assertEventFired, assertEventNotFired, sharedTestSetup, sharedTestTeardown, simulateClick} = goog.require('Blockly.test.helpers');
+
+
 suite("Zoom Controls", function() {
   setup(function() {
     sharedTestSetup.call(this);

From 42a3920ece14a9df909e76ced32d18cb9053e33e Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 16 Sep 2021 13:06:21 -0700
Subject: [PATCH 750/833] Note Blockly.alert/confirm/prompt/hueToHex/hideChaff
 migrations in renamings.js (#5475)

---
 scripts/migration/renamings.js | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/scripts/migration/renamings.js b/scripts/migration/renamings.js
index 087964eae..311ec631d 100644
--- a/scripts/migration/renamings.js
+++ b/scripts/migration/renamings.js
@@ -64,7 +64,26 @@ const renamings = {
         },
         setParentContainer: {module: 'Blockly.common'},
         draggingConnections: {module: 'Blockly.common'},
-
+        // Dialogs.  See PR #5457.
+        alert: {
+          module: 'Blockly.dialog',
+          export: 'alert',
+          set: 'setAlert',
+        },
+        confirm: {
+          module: 'Blockly.dialog',
+          export: 'confirm',
+          set: 'setConfirm',
+        },
+        prompt: {
+          module: 'Blockly.dialog',
+          export: 'prompt',
+          set: 'setPrompt',
+        },
+        // hueToHex.  See PR #5462.
+        hueToHex: {module: 'Blockly.utils.colour'},
+        // Blockly.hideChaff() became
+        // Blockly.common.getMainWorkspace().hideChaff().  See PR #5460.
       },
     },
     'Blockly.utils': {

From 1334bd3f1b5b026a50bbc230463bb629092b4c8a Mon Sep 17 00:00:00 2001
From: Maribeth Bottorff <maribethb@google.com>
Date: Thu, 16 Sep 2021 14:48:03 -0700
Subject: [PATCH 751/833] refactor: Migrate Blockly.onKeyDown out of blockly.js
 (#5476)

* refactor: move Blockly.onKeyDown to inject.js

* fix the tests
---
 core/blockly.js                       | 25 -----------
 core/inject.js                        | 26 ++++++++++-
 tests/deps.js                         |  4 +-
 tests/deps.mocha.js                   | 16 +++----
 tests/mocha/keydown_test.js           | 63 ++++++++++++++-------------
 tests/mocha/shortcut_registry_test.js | 24 +++++-----
 tests/mocha/test_helpers.js           | 25 ++---------
 7 files changed, 83 insertions(+), 100 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index 5d109460e..b22431128 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -39,7 +39,6 @@ goog.require('Blockly.inputTypes');
 goog.require('Blockly.internalConstants');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Procedures');
-goog.require('Blockly.ShortcutRegistry');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
@@ -148,30 +147,6 @@ Blockly.svgResize = function(workspace) {
   mainWorkspace.resize();
 };
 
-/**
- * Handle a key-down on SVG drawing surface. Does nothing if the main workspace
- * is not visible.
- * @param {!KeyboardEvent} e Key down event.
- * @package
- */
-// TODO (https://github.com/google/blockly/issues/1998) handle cases where there
-// are multiple workspaces and non-main workspaces are able to accept input.
-Blockly.onKeyDown = function(e) {
-  var mainWorkspace = Blockly.common.getMainWorkspace();
-  if (!mainWorkspace) {
-    return;
-  }
-
-  if (Blockly.utils.isTargetInput(e) ||
-      (mainWorkspace.rendered && !mainWorkspace.isVisible())) {
-    // When focused on an HTML text input widget, don't trap any keys.
-    // Ignore keypresses on rendered workspaces that have been explicitly
-    // hidden.
-    return;
-  }
-  Blockly.ShortcutRegistry.registry.onKeyDown(mainWorkspace, e);
-};
-
 /**
  * Delete the given block.
  * @param {!Blockly.BlockSvg} selected The block to delete.
diff --git a/core/inject.js b/core/inject.js
index be10e7c08..5b041f5cd 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -24,6 +24,7 @@ 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');
@@ -263,6 +264,29 @@ const init = function(mainWorkspace) {
   }
 };
 
+/**
+ * Handle a key-down on SVG drawing surface. Does nothing if the main workspace
+ * is not visible.
+ * @param {!KeyboardEvent} e Key down event.
+ */
+// TODO (https://github.com/google/blockly/issues/1998) handle cases where there
+// are multiple workspaces and non-main workspaces are able to accept input.
+const onKeyDown = function(e) {
+  const mainWorkspace = common.getMainWorkspace();
+  if (!mainWorkspace) {
+    return;
+  }
+
+  if (utils.isTargetInput(e) ||
+      (mainWorkspace.rendered && !mainWorkspace.isVisible())) {
+    // When focused on an HTML text input widget, don't trap any keys.
+    // Ignore keypresses on rendered workspaces that have been explicitly
+    // hidden.
+    return;
+  }
+  ShortcutRegistry.registry.onKeyDown(mainWorkspace, e);
+};
+
 /**
  * Whether event handlers have been bound. Document event handlers will only
  * be bound once, even if Blockly is destroyed and reinjected.
@@ -290,7 +314,7 @@ const bindDocumentEvents = function() {
         }
       }
     });
-    browserEvents.conditionalBind(document, 'keydown', null, Blockly.onKeyDown);
+    browserEvents.conditionalBind(document, 'keydown', null, onKeyDown);
     // longStop needs to run to stop the context menu from showing up.  It
     // should run regardless of what other touch event handlers have run.
     browserEvents.bind(document, 'touchend', null, Touch.longStop);
diff --git a/tests/deps.js b/tests/deps.js
index 86160bb66..db9e921fa 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.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', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', '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', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.Events', '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', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 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'});
@@ -87,7 +87,7 @@ goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.c
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 4c5f41305..bc7f0e9d3 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -12,13 +12,13 @@ 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.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.Events', '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', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 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'});
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/bump_objects.js', ['Blockly.bumpObjects'], ['Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/bump_objects.js', ['Blockly.bumpObjects'], ['Blockly.Events', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
@@ -78,7 +78,7 @@ goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Bloc
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -87,7 +87,7 @@ goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.c
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
@@ -202,16 +202,16 @@ goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry'
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly', 'Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], ['Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
@@ -244,7 +244,7 @@ goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.Tooltip', 'Blockly.TouchGesture', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../generators/dart.js', ['Blockly.Dart'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.string']);
diff --git a/tests/mocha/keydown_test.js b/tests/mocha/keydown_test.js
index f96b37cfb..37cc479b1 100644
--- a/tests/mocha/keydown_test.js
+++ b/tests/mocha/keydown_test.js
@@ -36,30 +36,31 @@ suite('Key Down', function() {
     var name = opt_name ? opt_name : 'Not called when readOnly is true';
     test(name, function() {
       this.workspace.options.readOnly = true;
-      Blockly.onKeyDown(keyEvent);
+      document.dispatchEvent(keyEvent);
       sinon.assert.notCalled(this.hideChaffSpy);
     });
   }
 
   suite('Escape', function() {
     setup(function() {
-      this.event = createKeyDownEvent(Blockly.utils.KeyCodes.ESC, 'NotAField');
+      this.event = createKeyDownEvent(Blockly.utils.KeyCodes.ESC);
       this.hideChaffSpy = sinon.spy(
         Blockly.WorkspaceSvg.prototype, 'hideChaff');
     });
     test('Simple', function() {
-      Blockly.onKeyDown(this.event);
+      document.dispatchEvent(this.event);
       sinon.assert.calledOnce(this.hideChaffSpy);
     });
-    runReadOnlyTest(createKeyDownEvent(Blockly.utils.KeyCodes.ESC, 'NotAField'));
+    runReadOnlyTest(createKeyDownEvent(Blockly.utils.KeyCodes.ESC));
     test('Not called when focus is on an HTML input', function() {
-      var event = createKeyDownEvent(this.event, 'textarea');
-      Blockly.onKeyDown(event);
+      var event = createKeyDownEvent(Blockly.utils.KeyCodes.ESC);
+      const input = document.createElement('textarea');
+      input.dispatchEvent(event);
       sinon.assert.notCalled(this.hideChaffSpy);
     });
     test('Not called on hidden workspaces', function() {
       this.workspace.isVisible_ = false;
-      Blockly.onKeyDown(this.event);
+      document.dispatchEvent(this.event);
       sinon.assert.notCalled(this.hideChaffSpy);
     });
   });
@@ -72,8 +73,8 @@ suite('Key Down', function() {
       this.deleteSpy = sinon.spy(Blockly.selected, 'dispose');
     });
     var testCases = [
-      ['Delete', createKeyDownEvent(Blockly.utils.KeyCodes.DELETE, 'NotAField')],
-      ['Backspace', createKeyDownEvent(Blockly.utils.KeyCodes.BACKSPACE, 'NotAField')]
+      ['Delete', createKeyDownEvent(Blockly.utils.KeyCodes.DELETE)],
+      ['Backspace', createKeyDownEvent(Blockly.utils.KeyCodes.BACKSPACE)]
     ];
     // Delete a block.
     suite('Simple', function() {
@@ -81,7 +82,7 @@ suite('Key Down', function() {
         var testCaseName = testCase[0];
         var keyEvent = testCase[1];
         test(testCaseName, function() {
-          Blockly.onKeyDown(keyEvent);
+          document.dispatchEvent(keyEvent);
           sinon.assert.calledOnce(this.hideChaffSpy);
           sinon.assert.calledOnce(this.deleteSpy);
         });
@@ -105,9 +106,9 @@ suite('Key Down', function() {
         Blockly.WorkspaceSvg.prototype, 'hideChaff');
     });
     var testCases = [
-      ['Control C', createKeyDownEvent(Blockly.utils.KeyCodes.C, 'NotAField', [Blockly.utils.KeyCodes.CTRL])],
-      ['Meta C', createKeyDownEvent(Blockly.utils.KeyCodes.C, 'NotAField', [Blockly.utils.KeyCodes.META])],
-      ['Alt C', createKeyDownEvent(Blockly.utils.KeyCodes.C, 'NotAField', [Blockly.utils.KeyCodes.ALT])]
+      ['Control C', createKeyDownEvent(Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.CTRL])],
+      ['Meta C', createKeyDownEvent(Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.META])],
+      ['Alt C', createKeyDownEvent(Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.ALT])]
     ];
     // Copy a block.
     suite('Simple', function() {
@@ -115,7 +116,7 @@ suite('Key Down', function() {
         var testCaseName = testCase[0];
         var keyEvent = testCase[1];
         test(testCaseName, function() {
-          Blockly.onKeyDown(keyEvent);
+          document.dispatchEvent(keyEvent);
           sinon.assert.calledOnce(this.copySpy);
           sinon.assert.calledOnce(this.hideChaffSpy);
         });
@@ -136,7 +137,7 @@ suite('Key Down', function() {
         var keyEvent = testCase[1];
         test(testCaseName, function() {
           sinon.stub(Blockly.Gesture, 'inProgress').returns(true);
-          Blockly.onKeyDown(keyEvent);
+          document.dispatchEvent(keyEvent);
           sinon.assert.notCalled(this.copySpy);
           sinon.assert.notCalled(this.hideChaffSpy);
         });
@@ -149,7 +150,7 @@ suite('Key Down', function() {
         var keyEvent = testCase[1];
         test(testCaseName, function() {
           sinon.stub(Blockly.selected, 'isDeletable').returns(false);
-          Blockly.onKeyDown(keyEvent);
+          document.dispatchEvent(keyEvent);
           sinon.assert.notCalled(this.copySpy);
           sinon.assert.notCalled(this.hideChaffSpy);
         });
@@ -162,7 +163,7 @@ suite('Key Down', function() {
         var keyEvent = testCase[1];
         test(testCaseName, function() {
           sinon.stub(Blockly.selected, 'isMovable').returns(false);
-          Blockly.onKeyDown(keyEvent);
+          document.dispatchEvent(keyEvent);
           sinon.assert.notCalled(this.copySpy);
           sinon.assert.notCalled(this.hideChaffSpy);
         });
@@ -177,9 +178,9 @@ suite('Key Down', function() {
         Blockly.WorkspaceSvg.prototype, 'hideChaff');
     });
     var testCases = [
-      ['Control Z', createKeyDownEvent(Blockly.utils.KeyCodes.Z, 'NotAField', [Blockly.utils.KeyCodes.CTRL])],
-      ['Meta Z', createKeyDownEvent(Blockly.utils.KeyCodes.Z, 'NotAField', [Blockly.utils.KeyCodes.META])],
-      ['Alt Z', createKeyDownEvent(Blockly.utils.KeyCodes.Z, 'NotAField', [Blockly.utils.KeyCodes.ALT])]
+      ['Control Z', createKeyDownEvent(Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.CTRL])],
+      ['Meta Z', createKeyDownEvent(Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.META])],
+      ['Alt Z', createKeyDownEvent(Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.ALT])]
     ];
     // Undo.
     suite('Simple', function() {
@@ -187,7 +188,7 @@ suite('Key Down', function() {
         var testCaseName = testCase[0];
         var keyEvent = testCase[1];
         test(testCaseName, function() {
-          Blockly.onKeyDown(keyEvent);
+          document.dispatchEvent(keyEvent);
           sinon.assert.calledOnce(this.undoSpy);
           sinon.assert.calledWith(this.undoSpy, false);
           sinon.assert.calledOnce(this.hideChaffSpy);
@@ -201,7 +202,7 @@ suite('Key Down', function() {
         var keyEvent = testCase[1];
         test(testCaseName, function() {
           sinon.stub(Blockly.Gesture, 'inProgress').returns(true);
-          Blockly.onKeyDown(keyEvent);
+          document.dispatchEvent(keyEvent);
           sinon.assert.notCalled(this.undoSpy);
           sinon.assert.notCalled(this.hideChaffSpy);
         });
@@ -224,9 +225,9 @@ suite('Key Down', function() {
         Blockly.WorkspaceSvg.prototype, 'hideChaff');
     });
     var testCases = [
-      ['Control Shift Z', createKeyDownEvent(Blockly.utils.KeyCodes.Z, 'NotAField', [Blockly.utils.KeyCodes.CTRL, Blockly.utils.KeyCodes.SHIFT])],
-      ['Meta Shift Z', createKeyDownEvent(Blockly.utils.KeyCodes.Z, 'NotAField', [Blockly.utils.KeyCodes.META, Blockly.utils.KeyCodes.SHIFT])],
-      ['Alt Shift Z', createKeyDownEvent(Blockly.utils.KeyCodes.Z, 'NotAField', [Blockly.utils.KeyCodes.ALT, Blockly.utils.KeyCodes.SHIFT])]
+      ['Control Shift Z', createKeyDownEvent(Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.CTRL, Blockly.utils.KeyCodes.SHIFT])],
+      ['Meta Shift Z', createKeyDownEvent(Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.META, Blockly.utils.KeyCodes.SHIFT])],
+      ['Alt Shift Z', createKeyDownEvent(Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.ALT, Blockly.utils.KeyCodes.SHIFT])]
     ];
     // Undo.
     suite('Simple', function() {
@@ -234,7 +235,7 @@ suite('Key Down', function() {
         var testCaseName = testCase[0];
         var keyEvent = testCase[1];
         test(testCaseName, function() {
-          Blockly.onKeyDown(keyEvent);
+          document.dispatchEvent(keyEvent);
           sinon.assert.calledOnce(this.redoSpy);
           sinon.assert.calledWith(this.redoSpy, true);
           sinon.assert.calledOnce(this.hideChaffSpy);
@@ -248,7 +249,7 @@ suite('Key Down', function() {
         var keyEvent = testCase[1];
         test(testCaseName, function() {
           sinon.stub(Blockly.Gesture, 'inProgress').returns(true);
-          Blockly.onKeyDown(keyEvent);
+          document.dispatchEvent(keyEvent);
           sinon.assert.notCalled(this.redoSpy);
           sinon.assert.notCalled(this.hideChaffSpy);
         });
@@ -266,23 +267,23 @@ suite('Key Down', function() {
 
   suite('UndoWindows', function() {
     setup(function() {
-      this.ctrlYEvent = createKeyDownEvent(Blockly.utils.KeyCodes.Y, 'NotAField', [Blockly.utils.KeyCodes.CTRL]);
+      this.ctrlYEvent = createKeyDownEvent(Blockly.utils.KeyCodes.Y, [Blockly.utils.KeyCodes.CTRL]);
       this.undoSpy = sinon.spy(this.workspace, 'undo');
       this.hideChaffSpy = sinon.spy(
         Blockly.WorkspaceSvg.prototype, 'hideChaff');
     });
     test('Simple', function() {
-      Blockly.onKeyDown(this.ctrlYEvent);
+      document.dispatchEvent(this.ctrlYEvent);
       sinon.assert.calledOnce(this.undoSpy);
       sinon.assert.calledWith(this.undoSpy, true);
       sinon.assert.calledOnce(this.hideChaffSpy);
     });
     test('Not called when a gesture is in progress', function() {
       sinon.stub(Blockly.Gesture, 'inProgress').returns(true);
-      Blockly.onKeyDown(this.ctrlYEvent);
+      document.dispatchEvent(this.ctrlYEvent);
       sinon.assert.notCalled(this.undoSpy);
       sinon.assert.notCalled(this.hideChaffSpy);
     });
-    runReadOnlyTest(createKeyDownEvent(Blockly.utils.KeyCodes.Y, 'NotAField', [Blockly.utils.KeyCodes.CTRL]));
+    runReadOnlyTest(createKeyDownEvent(Blockly.utils.KeyCodes.Y, [Blockly.utils.KeyCodes.CTRL]));
   });
 });
diff --git a/tests/mocha/shortcut_registry_test.js b/tests/mocha/shortcut_registry_test.js
index 1f01a1acd..b010d76d7 100644
--- a/tests/mocha/shortcut_registry_test.js
+++ b/tests/mocha/shortcut_registry_test.js
@@ -238,25 +238,25 @@ suite('Keyboard Shortcut Registry Test', function() {
         }
       };
       this.callBackStub =
-          addShortcut(this.registry, this.testShortcut, 'keyCode', true);
+          addShortcut(this.registry, this.testShortcut, Blockly.utils.KeyCodes.C, true);
     });
     test('Execute a shortcut from event', function() {
-      var event = createKeyDownEvent('keyCode', '');
+      var event = createKeyDownEvent(Blockly.utils.KeyCodes.C);
       chai.assert.isTrue(this.registry.onKeyDown(this.workspace, event));
       sinon.assert.calledOnce(this.callBackStub);
     });
     test('No shortcut executed from event', function() {
-      var event = createKeyDownEvent('nonExistentKeyCode', '');
+      var event = createKeyDownEvent(Blockly.utils.KeyCodes.D);
       chai.assert.isFalse(this.registry.onKeyDown(this.workspace, event));
     });
     test('No precondition available - execute callback', function() {
       delete this.testShortcut['precondition'];
-      var event = createKeyDownEvent('keyCode', '');
+      var event = createKeyDownEvent(Blockly.utils.KeyCodes.C);
       chai.assert.isTrue(this.registry.onKeyDown(this.workspace, event));
       sinon.assert.calledOnce(this.callBackStub);
     });
     test('Execute all shortcuts in list', function() {
-      var event = createKeyDownEvent('keyCode', '');
+      var event = createKeyDownEvent(Blockly.utils.KeyCodes.C);
       var testShortcut2 = {
         'name': 'test_shortcut_2',
         'callback': function() {
@@ -267,13 +267,13 @@ suite('Keyboard Shortcut Registry Test', function() {
         }
       };
       var testShortcut2Stub =
-          addShortcut(this.registry, testShortcut2, 'keyCode', false);
+          addShortcut(this.registry, testShortcut2, Blockly.utils.KeyCodes.C, false);
       chai.assert.isTrue(this.registry.onKeyDown(this.workspace, event));
       sinon.assert.calledOnce(testShortcut2Stub);
       sinon.assert.calledOnce(this.callBackStub);
     });
     test('Stop executing shortcut when event is handled', function() {
-      var event = createKeyDownEvent('keyCode', '');
+      var event = createKeyDownEvent(Blockly.utils.KeyCodes.C);
       var testShortcut2 = {
         'name': 'test_shortcut_2',
         'callback': function() {
@@ -284,7 +284,7 @@ suite('Keyboard Shortcut Registry Test', function() {
         }
       };
       var testShortcut2Stub =
-          addShortcut(this.registry, testShortcut2, 'keyCode', true);
+          addShortcut(this.registry, testShortcut2, Blockly.utils.KeyCodes.C, true);
       chai.assert.isTrue(this.registry.onKeyDown(this.workspace, event));
       sinon.assert.calledOnce(testShortcut2Stub);
       sinon.assert.notCalled(this.callBackStub);
@@ -325,25 +325,25 @@ suite('Keyboard Shortcut Registry Test', function() {
 
   suite('serializeKeyEvent', function() {
     test('Serialize key', function() {
-      var mockEvent = createKeyDownEvent(Blockly.utils.KeyCodes.A, '');
+      var mockEvent = createKeyDownEvent(Blockly.utils.KeyCodes.A);
       var serializedKey = this.registry.serializeKeyEvent_(mockEvent);
       chai.assert.equal(serializedKey, '65');
     });
     test('Serialize key code and modifier', function() {
       var mockEvent = createKeyDownEvent(
-          Blockly.utils.KeyCodes.A, '', [Blockly.utils.KeyCodes.CTRL]);
+          Blockly.utils.KeyCodes.A, [Blockly.utils.KeyCodes.CTRL]);
       var serializedKey = this.registry.serializeKeyEvent_(mockEvent);
       chai.assert.equal(serializedKey, 'Control+65');
     });
     test('Serialize only a modifier', function() {
       var mockEvent =
-          createKeyDownEvent(null, '', [Blockly.utils.KeyCodes.CTRL]);
+          createKeyDownEvent(null, [Blockly.utils.KeyCodes.CTRL]);
       var serializedKey = this.registry.serializeKeyEvent_(mockEvent);
       chai.assert.equal(serializedKey, 'Control');
     });
     test('Serialize multiple modifiers', function() {
       var mockEvent = createKeyDownEvent(
-          null, '',
+          null,
           [Blockly.utils.KeyCodes.CTRL, Blockly.utils.KeyCodes.SHIFT]);
       var serializedKey = this.registry.serializeKeyEvent_(mockEvent);
       chai.assert.equal(serializedKey, 'Shift+Control');
diff --git a/tests/mocha/test_helpers.js b/tests/mocha/test_helpers.js
index c97ed8253..62e9252b5 100644
--- a/tests/mocha/test_helpers.js
+++ b/tests/mocha/test_helpers.js
@@ -591,29 +591,12 @@ exports.dispatchPointerEvent = dispatchPointerEvent;
 /**
  * Creates a key down event used for testing.
  * @param {number} keyCode The keycode for the event. Use Blockly.utils.KeyCodes enum.
- * @param {string} type The type of the target. This only matters for the
- *     Blockly.utils.isTargetInput method.
- * @param {Array<number>} modifiers A list of modifiers. Use Blockly.utils.KeyCodes enum.
- * @return {{keyCode: *, getModifierState: (function(): boolean),
- *     preventDefault: preventDefault, target: {type: *}}} The mocked keydown event.
+ * @param {!Array<number>=} modifiers A list of modifiers. Use Blockly.utils.KeyCodes enum.
+ * @return {!KeyboardEvent} The mocked keydown event.
  */
-function createKeyDownEvent(keyCode, type, modifiers) {
+function createKeyDownEvent(keyCode, modifiers) {
   var event = {
     keyCode: keyCode,
-    target: {type: type},
-    getModifierState: function(name) {
-      if (name == 'Shift' && this.shiftKey) {
-        return true;
-      } else if (name == 'Control' && this.ctrlKey) {
-        return true;
-      } else if (name == 'Meta' && this.metaKey) {
-        return true;
-      } else if (name == 'Alt' && this.altKey) {
-        return true;
-      }
-      return false;
-    },
-    preventDefault: function() {}
   };
   if (modifiers && modifiers.length > 0) {
     event.altKey = modifiers.indexOf(KeyCodes.ALT) > -1;
@@ -621,7 +604,7 @@ function createKeyDownEvent(keyCode, type, modifiers) {
     event.metaKey = modifiers.indexOf(KeyCodes.META) > -1;
     event.shiftKey = modifiers.indexOf(KeyCodes.SHIFT) > -1;
   }
-  return event;
+  return new KeyboardEvent('keydown', event);
 }
 exports.createKeyDownEvent = createKeyDownEvent;
 

From c5acc1de72e8e3821ecf97506b666e53a8a72a65 Mon Sep 17 00:00:00 2001
From: Maribeth Bottorff <maribethb@google.com>
Date: Thu, 16 Sep 2021 15:01:12 -0700
Subject: [PATCH 752/833] refactor: remove unused Blockly.onContextMenu_
 (#5480)

---
 core/blockly.js     | 13 -------------
 tests/deps.js       |  2 +-
 tests/deps.mocha.js |  2 +-
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index b22431128..51957b336 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -41,7 +41,6 @@ goog.require('Blockly.internalConstants');
 goog.require('Blockly.Procedures');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Touch');
-goog.require('Blockly.utils');
 goog.require('Blockly.utils.colour');
 goog.require('Blockly.utils.deprecation');
 goog.require('Blockly.utils.Size');
@@ -189,18 +188,6 @@ Blockly.paste = Blockly.clipboard.paste;
  */
 Blockly.duplicate = Blockly.clipboard.duplicate;
 
-/**
- * Cancel the native context menu, unless the focus is on an HTML input widget.
- * @param {!Event} e Mouse down event.
- * @private
- */
-Blockly.onContextMenu_ = function(e) {
-  if (!Blockly.utils.isTargetInput(e)) {
-    // When focused on an HTML text input widget, don't cancel the context menu.
-    e.preventDefault();
-  }
-};
-
 /**
  * Close tooltips, context menus, dropdown selections, etc.
  * @deprecated Use Blockly.common.getMainWorkspace().hideChaff()
diff --git a/tests/deps.js b/tests/deps.js
index db9e921fa..741897b4e 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.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', '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', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.Events', '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_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'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index bc7f0e9d3..26f7069a2 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.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', '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', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.Events', '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_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'});

From 3bac582edb647eabd1cbb0390f384a6dc7f98bf8 Mon Sep 17 00:00:00 2001
From: Maribeth Bottorff <maribethb@google.com>
Date: Thu, 16 Sep 2021 15:13:59 -0700
Subject: [PATCH 753/833] refactor: move Blockly.deleteBlock out of blockly.js
 (#5483)

---
 core/block_svg.js         | 24 ++++++++++++++++++++++++
 core/blockly.js           | 22 ----------------------
 core/contextmenu_items.js |  5 +----
 core/shortcut_items.js    | 10 +++++++---
 tests/deps.js             |  4 ++--
 tests/deps.mocha.js       |  4 ++--
 6 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/core/block_svg.js b/core/block_svg.js
index 4c2545eb1..e0fd393c7 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -962,6 +962,30 @@ BlockSvg.prototype.dispose = function(healStack, animate) {
   dom.stopTextWidthCache();
 };
 
+/**
+ * Delete a block and hide chaff when doing so. The block will not be deleted if
+ * it's in a flyout. This is called from the context menu and keyboard shortcuts
+ * as the full delete action. If you are disposing of a block from the workspace
+ * and don't need to perform flyout checks, handle event grouping, or hide
+ * chaff, then use `block.dispose()` directly.
+ * @package
+ */
+BlockSvg.prototype.checkAndDelete = function() {
+  if (this.workspace.isFlyout) {
+    return;
+  }
+  Blockly.Events.setGroup(true);
+  this.workspace.hideChaff();
+  if (this.outputConnection) {
+    // Do not attempt to heal rows
+    // (https://github.com/google/blockly/issues/4832)
+    this.dispose(false, true);
+  } else {
+    this.dispose(/* heal */ true, true);
+  }
+  Blockly.Events.setGroup(false);
+};
+
 /**
  * Encode a block for copying.
  * @return {?ICopyable.CopyData} Copy metadata, or null if the block is
diff --git a/core/blockly.js b/core/blockly.js
index 51957b336..e8a8d382a 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -22,7 +22,6 @@ goog.require('Blockly.common');
 goog.require('Blockly.connectionTypes');
 goog.require('Blockly.constants');
 goog.require('Blockly.dialog');
-goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
 /** @suppress {extraRequire} */
@@ -51,7 +50,6 @@ goog.require('Blockly.WorkspaceSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Xml');
 
-goog.requireType('Blockly.BlockSvg');
 goog.requireType('Blockly.ICopyable');
 goog.requireType('Blockly.Workspace');
 
@@ -146,26 +144,6 @@ Blockly.svgResize = function(workspace) {
   mainWorkspace.resize();
 };
 
-/**
- * Delete the given block.
- * @param {!Blockly.BlockSvg} selected The block to delete.
- * @package
- */
-Blockly.deleteBlock = function(selected) {
-  if (!selected.workspace.isFlyout) {
-    Blockly.Events.setGroup(true);
-    Blockly.common.getMainWorkspace().hideChaff();
-    if (selected.outputConnection) {
-      // Do not attempt to heal rows
-      // (https://github.com/google/blockly/issues/4832)
-      selected.dispose(false, true);
-    } else {
-      selected.dispose(/* heal */ true, true);
-    }
-    Blockly.Events.setGroup(false);
-  }
-};
-
 /**
  * Copy a block or workspace comment onto the local clipboard.
  * @param {!Blockly.ICopyable} toCopy Block or Workspace Comment to be copied.
diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js
index e98289251..0e38129dc 100644
--- a/core/contextmenu_items.js
+++ b/core/contextmenu_items.js
@@ -13,7 +13,6 @@
 goog.module('Blockly.ContextMenuItems');
 goog.module.declareLegacyNamespace();
 
-const Blockly = goog.require('Blockly');
 /* eslint-disable-next-line no-unused-vars */
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const ContextMenuRegistry = goog.require('Blockly.ContextMenuRegistry');
@@ -530,11 +529,9 @@ const registerDelete = function() {
     },
     callback: function(/** @type {!ContextMenuRegistry.Scope} */
                        scope) {
-      Events.setGroup(true);
       if (scope.block) {
-        Blockly.deleteBlock(scope.block);
+        scope.block.checkAndDelete();
       }
-      Events.setGroup(false);
     },
     scopeType: ContextMenuRegistry.ScopeType.BLOCK,
     id: 'blockDelete',
diff --git a/core/shortcut_items.js b/core/shortcut_items.js
index 73ef30c65..a8933a4b7 100644
--- a/core/shortcut_items.js
+++ b/core/shortcut_items.js
@@ -76,7 +76,7 @@ const registerDelete = function() {
       if (Gesture.inProgress()) {
         return false;
       }
-      Blockly.deleteBlock(/** @type {!BlockSvg} */ (Blockly.selected));
+      (/** @type {!BlockSvg} */ (Blockly.selected)).checkAndDelete();
       return true;
     }
   };
@@ -133,8 +133,12 @@ const registerCut = function() {
           Blockly.selected.isMovable() && !Blockly.selected.workspace.isFlyout;
     },
     callback: function() {
-      clipboard.copy(/** @type {!ICopyable} */ (Blockly.selected));
-      Blockly.deleteBlock(/** @type {!BlockSvg} */ (Blockly.selected));
+      if (!Blockly.selected) {
+        // Shouldn't happen but appeases the type system
+        return false;
+      }
+      clipboard.copy(Blockly.selected);
+      (/** @type {!BlockSvg} */ (Blockly.selected)).checkAndDelete();
       return true;
     }
   };
diff --git a/tests/deps.js b/tests/deps.js
index 741897b4e..715065cfb 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.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', '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.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_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'});
@@ -29,7 +29,7 @@ goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Bl
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.dialog', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.dialog', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 26f7069a2..a3e1be2b1 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.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', '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.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_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'});
@@ -29,7 +29,7 @@ goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Bl
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.dialog', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.dialog', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 6dbc534dccf28dc0d3016944a03b3d643851e2d6 Mon Sep 17 00:00:00 2001
From: Maribeth Bottorff <maribethb@google.com>
Date: Thu, 16 Sep 2021 15:53:33 -0700
Subject: [PATCH 754/833] refactor: Move Blockly.svgResize to Blockly.common
 (#5485)

* refactor: Move Blockly.svgResize to Blockly.common

* fix formatting and deps
---
 core/blockly.js         | 38 +++++---------------------------------
 core/common.js          | 34 ++++++++++++++++++++++++++++++++++
 core/inject.js          | 10 +++++-----
 core/toolbox/toolbox.js |  3 +--
 tests/deps.js           |  2 +-
 tests/deps.mocha.js     |  2 +-
 6 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index e8a8d382a..1fadc8005 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -111,39 +111,6 @@ Blockly.resizeSvgContents = function(workspace) {
   workspace.resizeContents();
 };
 
-/**
- * Size the SVG image to completely fill its container. Call this when the view
- * actually changes sizes (e.g. on a window resize/device orientation change).
- * See Blockly.resizeSvgContents to resize the workspace when the contents
- * change (e.g. when a block is added or removed).
- * Record the height/width of the SVG image.
- * @param {!Blockly.WorkspaceSvg} workspace Any workspace in the SVG.
- */
-Blockly.svgResize = function(workspace) {
-  var mainWorkspace = workspace;
-  while (mainWorkspace.options.parentWorkspace) {
-    mainWorkspace = mainWorkspace.options.parentWorkspace;
-  }
-  var svg = mainWorkspace.getParentSvg();
-  var cachedSize = mainWorkspace.getCachedParentSvgSize();
-  var div = svg.parentNode;
-  if (!div) {
-    // Workspace deleted, or something.
-    return;
-  }
-  var width = div.offsetWidth;
-  var height = div.offsetHeight;
-  if (cachedSize.width != width) {
-    svg.setAttribute('width', width + 'px');
-    mainWorkspace.setCachedParentSvgSize(width, null);
-  }
-  if (cachedSize.height != height) {
-    svg.setAttribute('height', height + 'px');
-    mainWorkspace.setCachedParentSvgSize(null, height);
-  }
-  mainWorkspace.resize();
-};
-
 /**
  * Copy a block or workspace comment onto the local clipboard.
  * @param {!Blockly.ICopyable} toCopy Block or Workspace Comment to be copied.
@@ -334,6 +301,11 @@ Blockly.ALIGN_CENTRE = Blockly.constants.ALIGN.CENTRE;
  */
 Blockly.ALIGN_RIGHT = Blockly.constants.ALIGN.RIGHT;
 
+/**
+ * @see Blockly.common.svgResize
+ */
+Blockly.svgResize = Blockly.common.svgResize;
+
 
 /**
  * Aliases for constants used for connection and input types.
diff --git a/core/common.js b/core/common.js
index b6d7ad369..e9b6c53c7 100644
--- a/core/common.js
+++ b/core/common.js
@@ -75,6 +75,40 @@ const setParentContainer = function(newParent) {
 };
 exports.setParentContainer = setParentContainer;
 
+/**
+ * Size the SVG image to completely fill its container. Call this when the view
+ * actually changes sizes (e.g. on a window resize/device orientation change).
+ * See Blockly.resizeSvgContents to resize the workspace when the contents
+ * change (e.g. when a block is added or removed).
+ * Record the height/width of the SVG image.
+ * @param {!Blockly.WorkspaceSvg} workspace Any workspace in the SVG.
+ */
+ const svgResize = function(workspace) {
+  let mainWorkspace = workspace;
+  while (mainWorkspace.options.parentWorkspace) {
+    mainWorkspace = mainWorkspace.options.parentWorkspace;
+  }
+  const svg = mainWorkspace.getParentSvg();
+  const cachedSize = mainWorkspace.getCachedParentSvgSize();
+  const div = svg.parentNode;
+  if (!div) {
+    // Workspace deleted, or something.
+    return;
+  }
+  const width = div.offsetWidth;
+  const height = div.offsetHeight;
+  if (cachedSize.width != width) {
+    svg.setAttribute('width', width + 'px');
+    mainWorkspace.setCachedParentSvgSize(width, null);
+  }
+  if (cachedSize.height != height) {
+    svg.setAttribute('height', height + 'px');
+    mainWorkspace.setCachedParentSvgSize(null, height);
+  }
+  mainWorkspace.resize();
+};
+exports.svgResize = svgResize;
+
 /**
  * All of the connections on blocks that are currently being dragged.
  * @type {!Array<!Connection>}
diff --git a/core/inject.js b/core/inject.js
index 5b041f5cd..6e1177a82 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -80,7 +80,7 @@ const inject = function(container, opt_options) {
   // correct.
   common.setMainWorkspace(workspace);
 
-  Blockly.svgResize(workspace);
+  common.svgResize(workspace);
 
   subContainer.addEventListener('focusin', function() {
     common.setMainWorkspace(workspace);
@@ -188,7 +188,7 @@ const createMainWorkspace = function(
       bumpObjects.bumpIntoBoundsHandler(mainWorkspace));
 
   // The SVG is now fully assembled.
-  Blockly.svgResize(mainWorkspace);
+  common.svgResize(mainWorkspace);
   WidgetDiv.createDom();
   DropDownDiv.createDom();
   Tooltip.createDom();
@@ -215,7 +215,7 @@ const init = function(mainWorkspace) {
   const workspaceResizeHandler =
       browserEvents.conditionalBind(window, 'resize', null, function() {
         mainWorkspace.hideChaff(true);
-        Blockly.svgResize(mainWorkspace);
+        common.svgResize(mainWorkspace);
         goog.module.get('Blockly.bumpObjects')
             .bumpTopObjectsIntoBounds(mainWorkspace);
       });
@@ -324,8 +324,8 @@ const bindDocumentEvents = function() {
       browserEvents.conditionalBind(
           window, 'orientationchange', document, function() {
             // TODO (#397): Fix for multiple Blockly workspaces.
-            Blockly.svgResize(/** @type {!WorkspaceSvg} */
-                              (common.getMainWorkspace()));
+            common.svgResize(/** @type {!WorkspaceSvg} */
+                             (common.getMainWorkspace()));
           });
     }
   }
diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index 3b44eb0c2..5f39d11f5 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -13,7 +13,6 @@
 goog.module('Blockly.Toolbox');
 goog.module.declareLegacyNamespace();
 
-const Blockly = goog.require('Blockly');
 /* eslint-disable-next-line no-unused-vars */
 const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
 const BlockSvg = goog.require('Blockly.BlockSvg');
@@ -793,7 +792,7 @@ Toolbox.prototype.handleToolboxItemResize = function() {
 
   // Even though the div hasn't changed size, the visible workspace
   // surface of the workspace has, so we may need to reposition everything.
-  Blockly.svgResize(workspace);
+  common.svgResize(workspace);
 };
 
 /**
diff --git a/tests/deps.js b/tests/deps.js
index 715065cfb..c8d5d7073 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -205,7 +205,7 @@ goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Bl
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index a3e1be2b1..19133a5e9 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -205,7 +205,7 @@ goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Bl
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});

From 28fadf8c15f1b1e35a18cf31fa51cdbb208e781e Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Fri, 17 Sep 2021 11:15:20 -0700
Subject: [PATCH 755/833] Sets flag to true (#5454)

---
 scripts/gulpfiles/build_tasks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/gulpfiles/build_tasks.js b/scripts/gulpfiles/build_tasks.js
index 0449e5ae0..42fa62d21 100644
--- a/scripts/gulpfiles/build_tasks.js
+++ b/scripts/gulpfiles/build_tasks.js
@@ -119,7 +119,7 @@ function compile(compilerOptions, opt_verbose, opt_warnings_as_error,
   options.warning_level = opt_verbose ? 'VERBOSE' : 'DEFAULT';
   options.language_in = 'ECMASCRIPT6_STRICT',
   options.language_out = 'ECMASCRIPT5_STRICT';
-  options.rewrite_polyfills = false;
+  options.rewrite_polyfills = true;
   options.hide_warnings_for = 'node_modules';
   if (opt_warnings_as_error || opt_strict_typechecker) {
     options.jscomp_error = JSCOMP_ERROR;

From dbf10cf167d65a005fbb9f966dff740a8ffcd58d Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Fri, 17 Sep 2021 19:30:21 +0100
Subject: [PATCH 756/833] Clean up get/set accessor definitions (#5488)

* Use Object.defineProperties instead of .defineProperty when
  installing get and set accessors for previously-mutable exports.

* Add entries to renamings.js where feasible (i.e., for static rather
  than instance properties).

(Don't do blockly.js yet, to avoid merge conflicts.)
---
 core/contextmenu.js            | 19 ++++++++++++---
 core/generator.js              | 42 ++++++++++++++++++----------------
 scripts/migration/renamings.js | 21 +++++++++++++++++
 tests/deps.js                  |  2 +-
 tests/deps.mocha.js            |  2 +-
 5 files changed, 61 insertions(+), 25 deletions(-)

diff --git a/core/contextmenu.js b/core/contextmenu.js
index cc91ebcb1..d2b55c162 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -29,6 +29,7 @@ const WidgetDiv = goog.require('Blockly.WidgetDiv');
 const Xml = goog.require('Blockly.Xml');
 const aria = goog.require('Blockly.utils.aria');
 const browserEvents = goog.require('Blockly.browserEvents');
+const deprecation = goog.require('Blockly.utils.deprecation');
 const dom = goog.require('Blockly.utils.dom');
 const internalConstants = goog.require('Blockly.internalConstants');
 const userAgent = goog.require('Blockly.utils.userAgent');
@@ -64,9 +65,21 @@ const setCurrentBlock = function(block) {
 exports.setCurrentBlock = setCurrentBlock;
 
 // Ad JS accessors for backwards compatibility.
-Object.defineProperty(exports, 'currentBlock', {
-  get: getCurrentBlock,
-  set: setCurrentBlock,
+Object.defineProperties(exports, {
+  currentBlock: {
+    get: function() {
+      deprecation.warn(
+        'Blockly.ContextMenu.currentBlock', 'September 2021', 'September 2022',
+        'Blockly.Tooltip.getCurrentBlock()');
+      return getCurrentBlock();
+    },
+    set: function(block) {
+      deprecation.warn(
+        'Blockly.ContextMenu.currentBlock', 'September 2021', 'September 2022',
+        'Blockly.Tooltip.setCurrentBlock(block)');
+      setCurrentBlock(block);
+    },
+  },
 });
 
 /**
diff --git a/core/generator.js b/core/generator.js
index 9984f186f..7ebb000d2 100644
--- a/core/generator.js
+++ b/core/generator.js
@@ -411,27 +411,29 @@ Generator.prototype.functionNames_;
  */
 Generator.prototype.nameDB_;
 
-Object.defineProperty(Generator.prototype, 'variableDB_', {
-  /**
-   * Getter.
-   * @deprecated 'variableDB_' was renamed to 'nameDB_' (May 2021).
-   * @this {Generator}
-   * @return {!Names|undefined} Name database.
-   */
-  get: function() {
-    deprecation.warn('variableDB_', 'May 2021', 'May 2026', 'nameDB_');
-    return this.nameDB_;
+Object.defineProperties(Generator.prototype, {
+  variableDB_: {
+    /**
+     * Getter.
+     * @deprecated 'variableDB_' was renamed to 'nameDB_' (May 2021).
+     * @this {Generator}
+     * @return {!Names|undefined} Name database.
+     */
+    get: function() {
+      deprecation.warn('variableDB_', 'May 2021', 'May 2026', 'nameDB_');
+      return this.nameDB_;
+    },
+    /**
+     * Setter.
+     * @deprecated 'variableDB_' was renamed to 'nameDB_' (May 2021).
+     * @this {Generator}
+     * @param {!Names|undefined} nameDb New name database.
+     */
+    set: function(nameDb) {
+      deprecation.warn('variableDB_', 'May 2021', 'May 2026', 'nameDB_');
+      this.nameDB_ = nameDb;
+    },
   },
-  /**
-   * Setter.
-   * @deprecated 'variableDB_' was renamed to 'nameDB_' (May 2021).
-   * @this {Generator}
-   * @param {!Names|undefined} nameDb New name database.
-   */
-  set: function(nameDb) {
-    deprecation.warn('variableDB_', 'May 2021', 'May 2026', 'nameDB_');
-    this.nameDB_ = nameDb;
-  }
 });
 
 /**
diff --git a/scripts/migration/renamings.js b/scripts/migration/renamings.js
index 311ec631d..5de3a85b2 100644
--- a/scripts/migration/renamings.js
+++ b/scripts/migration/renamings.js
@@ -86,6 +86,27 @@ const renamings = {
         // Blockly.common.getMainWorkspace().hideChaff().  See PR #5460.
       },
     },
+    'Blockly.ContextMenu': {
+      exports: {
+        currentBlock: {get: 'getCurrentBlock', set: 'setCurrentBlock'},
+      },
+    },
+    'Blockly.Events': {
+      exports: {
+        recordUndo: {get: 'getRecordUndo', set: 'setRecordUndo'},
+      },
+    },
+    'Blockly.Tooltip': {
+      exports: {
+        DIV: {get: 'getDiv', set: 'setDiv'},
+        visible: {get: 'isVisible'},
+      },
+    },
+    'Blockly.WidgetDiv': {
+      exports: {
+        DIV: {get: 'getDiv'},
+      },
+    },
     'Blockly.utils': {
       exports: {
         genUid: {module: 'Blockly.utils.idGenerator'},
diff --git a/tests/deps.js b/tests/deps.js
index c8d5d7073..50046a84a 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -28,7 +28,7 @@ goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionCheck
 goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.dialog', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 19133a5e9..85722ea11 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -28,7 +28,7 @@ goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionCheck
 goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.dialog', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});

From 7aab18409f5ddadb4d320a719ebfa5a43e6a9aeb Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 17 Sep 2021 11:42:43 -0700
Subject: [PATCH 757/833] Migrate selected from Blockly to Blockly.common
 (#5489)

* Add getSelected/setSelected to core/common.js

* Migrate core to use Blockly.common.getSelected/setSelected instead of Blockly.selected

* Migrate demos to use Blockly.common.getSelected/setSelected instead of Blockly.selected

* Remove Blockly.selected

* Use variable instead of calling common.getSelected() multiple times

* Add accessor for selected on Blockly

* Add renaming record for Blockly.selected -> Blockly.common.getSelected/setSelected
---
 core/block.js                                 |  5 ++--
 core/block_svg.js                             | 16 ++++++------
 core/blockly.js                               | 20 ++++++++++----
 core/common.js                                | 24 +++++++++++++++++
 core/gesture.js                               |  5 ++--
 core/insertion_marker_manager.js              |  3 ++-
 core/rendered_connection.js                   |  3 ++-
 core/shortcut_items.js                        | 26 ++++++++++---------
 core/workspace_comment_svg.js                 | 18 ++++++-------
 core/workspace_dragger.js                     |  5 ++--
 .../workspacefactory/wfactory_controller.js   | 14 +++++-----
 .../workspacefactory/wfactory_init.js         |  4 +--
 scripts/migration/renamings.js                |  7 +++++
 tests/deps.js                                 | 14 +++++-----
 tests/deps.mocha.js                           | 14 +++++-----
 tests/mocha/keydown_test.js                   |  8 +++---
 tests/mocha/run_mocha_tests_in_browser.js     |  1 -
 17 files changed, 117 insertions(+), 70 deletions(-)

diff --git a/core/block.js b/core/block.js
index b32a724f8..6d524f670 100644
--- a/core/block.js
+++ b/core/block.js
@@ -38,6 +38,7 @@ const Tooltip = goog.require('Blockly.Tooltip');
 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 connectionTypes = goog.require('Blockly.connectionTypes');
 const constants = goog.require('Blockly.constants');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
@@ -396,8 +397,8 @@ Block.prototype.dispose = function(healStack) {
     // well as corruption of the connection database.  Therefore we must
     // methodically step through the blocks and carefully disassemble them.
 
-    if (Blockly.selected == this) {
-      Blockly.selected = null;
+    if (common.getSelected() == this) {
+      common.setSelected(null);
     }
 
     // First, dispose of all my children.
diff --git a/core/block_svg.js b/core/block_svg.js
index e0fd393c7..17bb2ba02 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -313,16 +313,16 @@ BlockSvg.prototype.select = function() {
     this.getParent().select();
     return;
   }
-  if (Blockly.selected == this) {
+  if (common.getSelected() == this) {
     return;
   }
   let oldId = null;
-  if (Blockly.selected) {
-    oldId = Blockly.selected.id;
+  if (common.getSelected()) {
+    oldId = common.getSelected().id;
     // Unselect any previously selected block.
     Events.disable();
     try {
-      Blockly.selected.unselect();
+      common.getSelected().unselect();
     } finally {
       Events.enable();
     }
@@ -330,7 +330,7 @@ BlockSvg.prototype.select = function() {
   const event =
       new (Events.get(Events.SELECTED))(oldId, this.id, this.workspace.id);
   Events.fire(event);
-  Blockly.selected = this;
+  common.setSelected(this);
   this.addSelect();
 };
 
@@ -339,14 +339,14 @@ BlockSvg.prototype.select = function() {
  * if the block is currently selected.
  */
 BlockSvg.prototype.unselect = function() {
-  if (Blockly.selected != this) {
+  if (common.getSelected() != this) {
     return;
   }
   const event =
       new (Events.get(Events.SELECTED))(this.id, null, this.workspace.id);
   event.workspaceId = this.workspace.id;
   Events.fire(event);
-  Blockly.selected = null;
+  common.setSelected(null);
   this.removeSelect();
 };
 
@@ -925,7 +925,7 @@ BlockSvg.prototype.dispose = function(healStack, animate) {
   // contents once the block is disposed.
   const blockWorkspace = this.workspace;
   // If this block is being dragged, unlink the mouse events.
-  if (Blockly.selected == this) {
+  if (common.getSelected() == this) {
     this.unselect();
     this.workspace.cancelCurrentGesture();
   }
diff --git a/core/blockly.js b/core/blockly.js
index 1fadc8005..dfb27bbde 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -80,11 +80,21 @@ Object.defineProperty(Blockly, 'mainWorkspace', {
   }
 });
 
-/**
- * Currently selected block.
- * @type {?Blockly.ICopyable}
- */
-Blockly.selected = null;
+// 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();
+  },
+  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.
diff --git a/core/common.js b/core/common.js
index e9b6c53c7..8efbcba6d 100644
--- a/core/common.js
+++ b/core/common.js
@@ -47,6 +47,30 @@ const setMainWorkspace = function(workspace) {
 };
 exports.setMainWorkspace = setMainWorkspace;
 
+/**
+ * Currently selected block.
+ * @type {?Blockly.ICopyable}
+ */
+let selected = null;
+
+/**
+ * Returns the currently selected block.
+ * @return {?Blockly.ICopyable} The currently selected block.
+ */
+const getSelected = function() {
+  return selected;
+};
+exports.getSelected = getSelected;
+
+/**
+ * Sets the currently selected block.
+ * @param {?Blockly.ICopyable} newSelection The newly selected block.
+ */
+const setSelected = function(newSelection) {
+  selected = newSelection;
+};
+exports.setSelected = setSelected;
+
 /**
  * Container element in which to render the WidgetDiv, DropDownDiv and Tooltip.
  * @type {?Element}
diff --git a/core/gesture.js b/core/gesture.js
index 679b4b69e..c3908d5f2 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -35,6 +35,7 @@ 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');
 const internalConstants = goog.require('Blockly.internalConstants');
 const registry = goog.require('Blockly.registry');
 const utils = goog.require('Blockly.utils');
@@ -770,8 +771,8 @@ Gesture.prototype.doBlockClick_ = function() {
  */
 Gesture.prototype.doWorkspaceClick_ = function(_e) {
   const ws = this.creatorWorkspace_;
-  if (Blockly.selected) {
-    Blockly.selected.unselect();
+  if (common.getSelected()) {
+    common.getSelected().unselect();
   }
   this.fireWorkspaceClick_(this.startWorkspace_ || ws);
 };
diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js
index 41be57fff..b44097416 100644
--- a/core/insertion_marker_manager.js
+++ b/core/insertion_marker_manager.js
@@ -30,6 +30,7 @@ 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 connectionTypes = goog.require('Blockly.connectionTypes');
 const constants = goog.require('Blockly.constants');
 const internalConstants = goog.require('Blockly.internalConstants');
@@ -43,7 +44,7 @@ const internalConstants = goog.require('Blockly.internalConstants');
  * @constructor
  */
 const InsertionMarkerManager = function(block) {
-  Blockly.selected = block;
+  common.setSelected(block);
 
   /**
    * The top block in the stack being dragged.
diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index 9a92cd354..2e172e6b9 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -23,6 +23,7 @@ const ConnectionDB = goog.requireType('Blockly.ConnectionDB');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Events = goog.require('Blockly.Events');
 const Svg = goog.require('Blockly.utils.Svg');
+const common = goog.require('Blockly.common');
 const connectionTypes = goog.require('Blockly.connectionTypes');
 const deprecation = goog.require('Blockly.utils.deprecation');
 const dom = goog.require('Blockly.utils.dom');
@@ -175,7 +176,7 @@ RenderedConnection.prototype.bumpAwayFrom = function(staticConnection) {
     reverse = true;
   }
   // Raise it to the top for extra visibility.
-  const selected = Blockly.selected == rootBlock;
+  const selected = common.getSelected() == rootBlock;
   selected || rootBlock.addSelect();
   let dx = (staticConnection.x + internalConstants.SNAP_RADIUS +
             Math.floor(Math.random() * internalConstants.BUMP_RANDOMNESS)) -
diff --git a/core/shortcut_items.js b/core/shortcut_items.js
index a8933a4b7..ca8a06441 100644
--- a/core/shortcut_items.js
+++ b/core/shortcut_items.js
@@ -13,7 +13,6 @@
 goog.module('Blockly.ShortcutItems');
 goog.module.declareLegacyNamespace();
 
-const Blockly = goog.require('Blockly');
 /* eslint-disable-next-line no-unused-vars */
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const Gesture = goog.require('Blockly.Gesture');
@@ -22,6 +21,7 @@ const ICopyable = goog.requireType('Blockly.ICopyable');
 const KeyCodes = goog.require('Blockly.utils.KeyCodes');
 const ShortcutRegistry = goog.require('Blockly.ShortcutRegistry');
 const clipboard = goog.require('Blockly.clipboard');
+const common = goog.require('Blockly.common');
 
 
 /**
@@ -63,8 +63,8 @@ const registerDelete = function() {
   const deleteShortcut = {
     name: names.DELETE,
     preconditionFn: function(workspace) {
-      return !workspace.options.readOnly && Blockly.selected &&
-          Blockly.selected.isDeletable();
+      const selected = common.getSelected();
+      return !workspace.options.readOnly && selected && selected.isDeletable();
     },
     callback: function(workspace, e) {
       // Delete or backspace.
@@ -76,7 +76,7 @@ const registerDelete = function() {
       if (Gesture.inProgress()) {
         return false;
       }
-      (/** @type {!BlockSvg} */ (Blockly.selected)).checkAndDelete();
+      (/** @type {!BlockSvg} */ (common.getSelected())).checkAndDelete();
       return true;
     }
   };
@@ -93,16 +93,16 @@ const registerCopy = function() {
   const copyShortcut = {
     name: names.COPY,
     preconditionFn: function(workspace) {
+      const selected = common.getSelected();
       return !workspace.options.readOnly && !Gesture.inProgress() &&
-          Blockly.selected && Blockly.selected.isDeletable() &&
-          Blockly.selected.isMovable();
+          selected && selected.isDeletable() && selected.isMovable();
     },
     callback: function(workspace, e) {
       // Prevent the default copy behavior, which may beep or otherwise indicate
       // an error due to the lack of a selection.
       e.preventDefault();
       workspace.hideChaff();
-      clipboard.copy(/** @type {!ICopyable} */ (Blockly.selected));
+      clipboard.copy(/** @type {!ICopyable} */ (common.getSelected()));
       return true;
     }
   };
@@ -128,17 +128,19 @@ const registerCut = function() {
   const cutShortcut = {
     name: names.CUT,
     preconditionFn: function(workspace) {
+      const selected = common.getSelected();
       return !workspace.options.readOnly && !Gesture.inProgress() &&
-          Blockly.selected && Blockly.selected.isDeletable() &&
-          Blockly.selected.isMovable() && !Blockly.selected.workspace.isFlyout;
+          selected && selected.isDeletable() && selected.isMovable() &&
+          !selected.workspace.isFlyout;
     },
     callback: function() {
-      if (!Blockly.selected) {
+      const selected = common.getSelected();
+      if (!selected) {
         // Shouldn't happen but appeases the type system
         return false;
       }
-      clipboard.copy(Blockly.selected);
-      (/** @type {!BlockSvg} */ (Blockly.selected)).checkAndDelete();
+      clipboard.copy(selected);
+      (/** @type {!BlockSvg} */ (selected)).checkAndDelete();
       return true;
     }
   };
diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 1d009af0f..c93114800 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -15,7 +15,6 @@ goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const BlockDragSurfaceSvg = goog.requireType('Blockly.BlockDragSurfaceSvg');
-const Blockly = goog.require('Blockly');
 const ContextMenu = goog.require('Blockly.ContextMenu');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Css = goog.require('Blockly.Css');
@@ -33,6 +32,7 @@ const Touch = goog.require('Blockly.Touch');
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const WorkspaceComment = goog.require('Blockly.WorkspaceComment');
 const browserEvents = goog.require('Blockly.browserEvents');
+const common = goog.require('Blockly.common');
 const dom = goog.require('Blockly.utils.dom');
 const object = goog.require('Blockly.utils.object');
 const utils = goog.require('Blockly.utils');
@@ -167,7 +167,7 @@ WorkspaceCommentSvg.prototype.dispose = function() {
     return;
   }
   // If this comment is being dragged, unlink the mouse events.
-  if (Blockly.selected == this) {
+  if (common.getSelected() == this) {
     this.unselect();
     this.workspace.cancelCurrentGesture();
   }
@@ -254,16 +254,16 @@ WorkspaceCommentSvg.prototype.showContextMenu = function(e) {
  * @package
  */
 WorkspaceCommentSvg.prototype.select = function() {
-  if (Blockly.selected == this) {
+  if (common.getSelected() == this) {
     return;
   }
   let oldId = null;
-  if (Blockly.selected) {
-    oldId = Blockly.selected.id;
+  if (common.getSelected()) {
+    oldId = common.getSelected().id;
     // Unselect any previously selected block.
     Events.disable();
     try {
-      Blockly.selected.unselect();
+      common.getSelected().unselect();
     } finally {
       Events.enable();
     }
@@ -271,7 +271,7 @@ WorkspaceCommentSvg.prototype.select = function() {
   const event =
       new (Events.get(Events.SELECTED))(oldId, this.id, this.workspace.id);
   Events.fire(event);
-  Blockly.selected = this;
+  common.setSelected(this);
   this.addSelect();
 };
 
@@ -280,13 +280,13 @@ WorkspaceCommentSvg.prototype.select = function() {
  * @package
  */
 WorkspaceCommentSvg.prototype.unselect = function() {
-  if (Blockly.selected != this) {
+  if (common.getSelected() != this) {
     return;
   }
   const event =
       new (Events.get(Events.SELECTED))(this.id, null, this.workspace.id);
   Events.fire(event);
-  Blockly.selected = null;
+  common.setSelected(null);
   this.removeSelect();
   this.blurFocus();
 };
diff --git a/core/workspace_dragger.js b/core/workspace_dragger.js
index 0b056a3f3..edce50701 100644
--- a/core/workspace_dragger.js
+++ b/core/workspace_dragger.js
@@ -18,6 +18,7 @@ goog.module.declareLegacyNamespace();
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const common = goog.require('Blockly.common');
 
 
 /**
@@ -73,8 +74,8 @@ WorkspaceDragger.prototype.dispose = function() {
  * @package
  */
 WorkspaceDragger.prototype.startDrag = function() {
-  if (Blockly.selected) {
-    Blockly.selected.unselect();
+  if (common.getSelected()) {
+    common.getSelected().unselect();
   }
   this.workspace_.setupDragSurface();
 };
diff --git a/demos/blockfactory/workspacefactory/wfactory_controller.js b/demos/blockfactory/workspacefactory/wfactory_controller.js
index a52ab93d3..471a007e1 100644
--- a/demos/blockfactory/workspacefactory/wfactory_controller.js
+++ b/demos/blockfactory/workspacefactory/wfactory_controller.js
@@ -912,14 +912,14 @@ WorkspaceFactoryController.prototype.clearAll = function() {
  */
 WorkspaceFactoryController.prototype.addShadow = function() {
   // No block selected to make a shadow block.
-  if (!Blockly.selected) {
+  if (!Blockly.common.getSelected()) {
     return;
   }
   // Clear any previous warnings on the block (would only have warnings on
   // a non-shadow block if it was nested inside another shadow block).
-  Blockly.selected.setWarningText(null);
+  Blockly.common.getSelected().setWarningText(null);
   // Set selected block and all children as shadow blocks.
-  this.addShadowForBlockAndChildren_(Blockly.selected);
+  this.addShadowForBlockAndChildren_(Blockly.common.getSelected());
 
   // Save and update the preview.
   this.saveStateFromWorkspace();
@@ -957,14 +957,14 @@ WorkspaceFactoryController.prototype.addShadowForBlockAndChildren_ =
  */
 WorkspaceFactoryController.prototype.removeShadow = function() {
   // No block selected to modify.
-  if (!Blockly.selected) {
+  if (!Blockly.common.getSelected()) {
     return;
   }
-  this.model.removeShadowBlock(Blockly.selected.id);
-  this.view.unmarkShadowBlock(Blockly.selected);
+  this.model.removeShadowBlock(Blockly.common.getSelected().id);
+  this.view.unmarkShadowBlock(Blockly.common.getSelected());
 
   // If turning invalid shadow block back to normal block, remove warning.
-  Blockly.selected.setWarningText(null);
+  Blockly.common.getSelected().setWarningText(null);
 
   this.saveStateFromWorkspace();
   this.updatePreview();
diff --git a/demos/blockfactory/workspacefactory/wfactory_init.js b/demos/blockfactory/workspacefactory/wfactory_init.js
index b6b19b1d9..4c2fd6536 100644
--- a/demos/blockfactory/workspacefactory/wfactory_init.js
+++ b/demos/blockfactory/workspacefactory/wfactory_init.js
@@ -274,7 +274,7 @@ WorkspaceFactoryInit.assignWorkspaceFactoryClickHandlers_ =
 
         // Disable shadow editing button if turning invalid shadow block back
         // to normal block.
-        if (!Blockly.selected.getSurroundParent()) {
+        if (!Blockly.common.getSelected().getSurroundParent()) {
           document.getElementById('button_addShadow').disabled = true;
         }
       });
@@ -347,7 +347,7 @@ WorkspaceFactoryInit.addWorkspaceFactoryEventListeners_ = function(controller) {
     // are not nested in parents cannot be shadow blocks).
     if (e.type == Blockly.Events.BLOCK_MOVE ||
         e.type == Blockly.Events.SELECTED) {
-      var selected = Blockly.selected;
+      var selected = Blockly.common.getSelected();
 
       // Show shadow button if a block is selected. Show "Add Shadow" if
       // a block is not a shadow block, show "Remove Shadow" if it is a
diff --git a/scripts/migration/renamings.js b/scripts/migration/renamings.js
index 5de3a85b2..295d15a1f 100644
--- a/scripts/migration/renamings.js
+++ b/scripts/migration/renamings.js
@@ -84,6 +84,13 @@ const renamings = {
         hueToHex: {module: 'Blockly.utils.colour'},
         // Blockly.hideChaff() became
         // Blockly.common.getMainWorkspace().hideChaff().  See PR #5460.
+
+        // selected.  See PR #5489.
+        selected: {
+          module: 'Blockly.common',
+          get: 'getSelected',
+          set: 'setSelected',
+        },
       },
     },
     'Blockly.ContextMenu': {
diff --git a/tests/deps.js b/tests/deps.js
index 50046a84a..269a8f333 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -7,7 +7,7 @@ goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'],
 goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator']);
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
-goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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'});
@@ -84,13 +84,13 @@ goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout
 goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.common', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], [], {'lang': 'es6', 'module': 'goog'});
@@ -136,7 +136,7 @@ goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
@@ -196,7 +196,7 @@ goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Ren
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly', 'Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
@@ -241,9 +241,9 @@ goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.c
 goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.idGenerator', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils.Coordinate', 'Blockly.utils.idGenerator', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.common', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.Tooltip', 'Blockly.TouchGesture', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 85722ea11..a78e56836 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -7,7 +7,7 @@ goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'],
 goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator']);
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
-goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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'});
@@ -84,13 +84,13 @@ goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout
 goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.common', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], [], {'lang': 'es6', 'module': 'goog'});
@@ -136,7 +136,7 @@ goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
@@ -196,7 +196,7 @@ goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Ren
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly', 'Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
@@ -241,9 +241,9 @@ goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.c
 goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.idGenerator', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils.Coordinate', 'Blockly.utils.idGenerator', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.common', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.Tooltip', 'Blockly.TouchGesture', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/keydown_test.js b/tests/mocha/keydown_test.js
index 37cc479b1..be0a1b3cd 100644
--- a/tests/mocha/keydown_test.js
+++ b/tests/mocha/keydown_test.js
@@ -24,7 +24,7 @@ suite('Key Down', function() {
    */
   function setSelectedBlock(workspace) {
     defineStackBlock();
-    Blockly.selected = workspace.newBlock('stack_block');
+    Blockly.common.setSelected(workspace.newBlock('stack_block'));
   }
 
   /**
@@ -70,7 +70,7 @@ suite('Key Down', function() {
       this.hideChaffSpy = sinon.spy(
         Blockly.WorkspaceSvg.prototype, 'hideChaff');
       setSelectedBlock(this.workspace);
-      this.deleteSpy = sinon.spy(Blockly.selected, 'dispose');
+      this.deleteSpy = sinon.spy(Blockly.common.getSelected(), 'dispose');
     });
     var testCases = [
       ['Delete', createKeyDownEvent(Blockly.utils.KeyCodes.DELETE)],
@@ -149,7 +149,7 @@ suite('Key Down', function() {
         var testCaseName = testCase[0];
         var keyEvent = testCase[1];
         test(testCaseName, function() {
-          sinon.stub(Blockly.selected, 'isDeletable').returns(false);
+          sinon.stub(Blockly.common.getSelected(), 'isDeletable').returns(false);
           document.dispatchEvent(keyEvent);
           sinon.assert.notCalled(this.copySpy);
           sinon.assert.notCalled(this.hideChaffSpy);
@@ -162,7 +162,7 @@ suite('Key Down', function() {
         var testCaseName = testCase[0];
         var keyEvent = testCase[1];
         test(testCaseName, function() {
-          sinon.stub(Blockly.selected, 'isMovable').returns(false);
+          sinon.stub(Blockly.common.getSelected(), 'isMovable').returns(false);
           document.dispatchEvent(keyEvent);
           sinon.assert.notCalled(this.copySpy);
           sinon.assert.notCalled(this.hideChaffSpy);
diff --git a/tests/mocha/run_mocha_tests_in_browser.js b/tests/mocha/run_mocha_tests_in_browser.js
index 7107f2cfe..d4dc83fbe 100644
--- a/tests/mocha/run_mocha_tests_in_browser.js
+++ b/tests/mocha/run_mocha_tests_in_browser.js
@@ -66,7 +66,6 @@ async function runMochaTestsInBrowser() {
   console.log(numOfFailure + ' tests failed');
   console.log('============Blockly Mocha Test Summary=================');
   if (parseInt(numOfFailure) !== 0) {
-    await browser.deleteSession();
     return 1;
   }
   await browser.deleteSession();

From 511ce5df2b9eb58b6118dc67e938fafdf99c5643 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 17 Sep 2021 14:30:23 -0700
Subject: [PATCH 758/833] 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                       | 372 +++++++++++++-------------
 tests/deps.js                         |   2 +-
 tests/deps.mocha.js                   |   2 +-
 tests/mocha/contextmenu_items_test.js |   2 +-
 tests/mocha/field_textinput_test.js   |   2 +-
 tests/mocha/workspace_helpers.js      |   2 +-
 6 files changed, 187 insertions(+), 195 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index dfb27bbde..e878f293c 100644
--- a/core/blockly.js
+++ b/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;
diff --git a/tests/deps.js b/tests/deps.js
index 269a8f333..57929d32d 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.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'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index a78e56836..167219784 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.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'});
diff --git a/tests/mocha/contextmenu_items_test.js b/tests/mocha/contextmenu_items_test.js
index e9fd4efed..fd4a39d90 100644
--- a/tests/mocha/contextmenu_items_test.js
+++ b/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();
diff --git a/tests/mocha/field_textinput_test.js b/tests/mocha/field_textinput_test.js
index daf56d971..bbb4dd88f 100644
--- a/tests/mocha/field_textinput_test.js
+++ b/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_');
         };
diff --git a/tests/mocha/workspace_helpers.js b/tests/mocha/workspace_helpers.js
index f513e5eb0..f656dd48d 100644
--- a/tests/mocha/workspace_helpers.js
+++ b/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);

From f77526e558601f7dcf0a5202ab0e33c92d1b9f45 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Fri, 17 Sep 2021 21:49:01 +0000
Subject: [PATCH 759/833] Move browser event utils from utils.js to
 browser_events.js (#5464)

* fix: move browser event utils to browserEvents

* fix: mark browser event utils in utils as deprecated

* fix: move uses of browser event funcs to browserEvents

* fix: remove browserEvents definition of noEvent

* fix: add renames for browser event utils

* docs: add suggested alternatives for browser event utils

* fix: change deprecations to stubs

* fix: PR comments
---
 core/browser_events.js         | 77 ++++++++++++++++++++++++++++++++++
 core/bubble.js                 |  3 +-
 core/contextmenu.js            | 16 ++++++-
 core/flyout_horizontal.js      |  4 +-
 core/flyout_vertical.js        |  4 +-
 core/gesture.js                |  5 +--
 core/icon.js                   |  2 +-
 core/inject.js                 |  2 +-
 core/scrollbar.js              |  6 +--
 core/toolbox/toolbox.js        |  3 +-
 core/touch_gesture.js          |  3 +-
 core/utils.js                  | 69 +++++++++++++-----------------
 core/workspace_comment_svg.js  |  2 +-
 core/workspace_svg.js          | 14 +++----
 scripts/migration/renamings.js |  4 ++
 tests/deps.js                  | 16 +++----
 tests/deps.mocha.js            | 16 +++----
 17 files changed, 162 insertions(+), 84 deletions(-)

diff --git a/core/browser_events.js b/core/browser_events.js
index fc03c6028..6bad8bcc9 100644
--- a/core/browser_events.js
+++ b/core/browser_events.js
@@ -15,6 +15,8 @@ goog.module.declareLegacyNamespace();
 
 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');
 
 
 /**
@@ -178,3 +180,78 @@ const unbind = function(bindData) {
   return func;
 };
 exports.unbind = unbind;
+
+/**
+ * Returns true if this event is targeting a text input widget?
+ * @param {!Event} e An event.
+ * @return {boolean} True if text input.
+ */
+const isTargetInput = function(e) {
+  return e.target.type == 'textarea' || e.target.type == 'text' ||
+      e.target.type == 'number' || e.target.type == 'email' ||
+      e.target.type == 'password' || e.target.type == 'search' ||
+      e.target.type == 'tel' || e.target.type == 'url' ||
+      e.target.isContentEditable ||
+      (e.target.dataset && e.target.dataset.isTextInput == 'true');
+};
+exports.isTargetInput = isTargetInput;
+
+/**
+ * Returns true this event is a right-click.
+ * @param {!Event} e Mouse event.
+ * @return {boolean} True if right-click.
+ */
+const isRightButton = function(e) {
+  if (e.ctrlKey && userAgent.MAC) {
+    // Control-clicking on Mac OS X is treated as a right-click.
+    // WebKit on Mac OS X fails to change button to 2 (but Gecko does).
+    return true;
+  }
+  return e.button == 2;
+};
+exports.isRightButton = isRightButton;
+
+/**
+ * Returns the converted coordinates of the given mouse event.
+ * The origin (0,0) is the top-left corner of the Blockly SVG.
+ * @param {!Event} e Mouse event.
+ * @param {!Element} svg SVG element.
+ * @param {?SVGMatrix} matrix Inverted screen CTM to use.
+ * @return {!SVGPoint} Object with .x and .y properties.
+ */
+const mouseToSvg = function(e, svg, matrix) {
+  const svgPoint = svg.createSVGPoint();
+  svgPoint.x = e.clientX;
+  svgPoint.y = e.clientY;
+
+  if (!matrix) {
+    matrix = svg.getScreenCTM().inverse();
+  }
+  return svgPoint.matrixTransform(matrix);
+};
+exports.mouseToSvg = mouseToSvg;
+
+/**
+ * Returns the scroll delta of a mouse event in pixel units.
+ * @param {!Event} e Mouse event.
+ * @return {{x: number, y: number}} Scroll delta object with .x and .y
+ *    properties.
+ */
+const getScrollDeltaPixels = function(e) {
+  switch (e.deltaMode) {
+    case 0x00:  // Pixel mode.
+    default:
+      return {x: e.deltaX, y: e.deltaY};
+    case 0x01:  // Line mode.
+      return {
+        x: e.deltaX * internalConstants.LINE_MODE_MULTIPLIER,
+        y: e.deltaY * internalConstants.LINE_MODE_MULTIPLIER
+      };
+    case 0x02:  // Page mode.
+      return {
+        x: e.deltaX * internalConstants.PAGE_MODE_MULTIPLIER,
+        y: e.deltaY * internalConstants.PAGE_MODE_MULTIPLIER
+      };
+  }
+};
+exports.getScrollDeltaPixels = getScrollDeltaPixels;
diff --git a/core/bubble.js b/core/bubble.js
index 3abfc61ad..6f0b93a03 100644
--- a/core/bubble.js
+++ b/core/bubble.js
@@ -32,7 +32,6 @@ const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
 const math = goog.require('Blockly.utils.math');
 const userAgent = goog.require('Blockly.utils.userAgent');
-const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Workspace');
 
@@ -379,7 +378,7 @@ Bubble.prototype.setDeleteStyle = function(_enable) {
 Bubble.prototype.resizeMouseDown_ = function(e) {
   this.promote();
   Bubble.unbindDragEvents_();
-  if (utils.isRightButton(e)) {
+  if (browserEvents.isRightButton(e)) {
     // No right-click.
     e.stopPropagation();
     return;
diff --git a/core/contextmenu.js b/core/contextmenu.js
index d2b55c162..f6eb99d66 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -197,12 +197,24 @@ const createWidget_ = function(menu) {
       /** @type {!Element} */ (menuDom), 'blocklyContextMenu');
   // Prevent system context menu when right-clicking a Blockly context menu.
   browserEvents.conditionalBind(
-      /** @type {!EventTarget} */ (menuDom), 'contextmenu', null,
-      utils.noEvent);
+      /** @type {!EventTarget} */ (menuDom),
+      'contextmenu',
+      null,
+      haltPropagation);
   // Focus only after the initial render to avoid issue #1329.
   menu.focus();
 };
 
+/**
+ * Halts the propagation of the event without doing anything else.
+ * @param {!Event} e An event.
+ */
+const haltPropagation = function(e) {
+  // This event has been handled.  No need to bubble up to the document.
+  e.preventDefault();
+  e.stopPropagation();
+};
+
 /**
  * Hide the context menu.
  */
diff --git a/core/flyout_horizontal.js b/core/flyout_horizontal.js
index b1c611215..f7c4e9e74 100644
--- a/core/flyout_horizontal.js
+++ b/core/flyout_horizontal.js
@@ -22,10 +22,10 @@ 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');
-const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -210,7 +210,7 @@ HorizontalFlyout.prototype.scrollToStart = function() {
  * @protected
  */
 HorizontalFlyout.prototype.wheel_ = function(e) {
-  const scrollDelta = utils.getScrollDeltaPixels(e);
+  const scrollDelta = browserEvents.getScrollDeltaPixels(e);
   const delta = scrollDelta.x || scrollDelta.y;
 
   if (delta) {
diff --git a/core/flyout_vertical.js b/core/flyout_vertical.js
index 5b396c061..edd8541f0 100644
--- a/core/flyout_vertical.js
+++ b/core/flyout_vertical.js
@@ -22,10 +22,10 @@ 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');
-const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Block');
 /** @suppress {extraRequire} */
@@ -201,7 +201,7 @@ VerticalFlyout.prototype.scrollToStart = function() {
  * @protected
  */
 VerticalFlyout.prototype.wheel_ = function(e) {
-  const scrollDelta = utils.getScrollDeltaPixels(e);
+  const scrollDelta = browserEvents.getScrollDeltaPixels(e);
 
   if (scrollDelta.y) {
     const metricsManager = this.workspace_.getMetricsManager();
diff --git a/core/gesture.js b/core/gesture.js
index c3908d5f2..9267c2998 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -38,7 +38,6 @@ const browserEvents = goog.require('Blockly.browserEvents');
 const common = goog.require('Blockly.common');
 const internalConstants = goog.require('Blockly.internalConstants');
 const registry = goog.require('Blockly.registry');
-const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.BlockDragger');
 /** @suppress {extraRequire} */
@@ -475,7 +474,7 @@ Gesture.prototype.startDraggingBubble_ = function() {
  * @package
  */
 Gesture.prototype.doStart = function(e) {
-  if (utils.isTargetInput(e)) {
+  if (browserEvents.isTargetInput(e)) {
     this.cancel();
     return;
   }
@@ -502,7 +501,7 @@ Gesture.prototype.doStart = function(e) {
     this.targetBlock_.select();
   }
 
-  if (utils.isRightButton(e)) {
+  if (browserEvents.isRightButton(e)) {
     this.handleRightClick(e);
     return;
   }
diff --git a/core/icon.js b/core/icon.js
index cae1d8b6c..ba470e6bc 100644
--- a/core/icon.js
+++ b/core/icon.js
@@ -135,7 +135,7 @@ Icon.prototype.iconClick_ = function(e) {
     // Drag operation is concluding.  Don't open the editor.
     return;
   }
-  if (!this.block_.isInFlyout && !utils.isRightButton(e)) {
+  if (!this.block_.isInFlyout && !browserEvents.isRightButton(e)) {
     this.setVisible(!this.isVisible());
   }
 };
diff --git a/core/inject.js b/core/inject.js
index 6e1177a82..1e50d1914 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -207,7 +207,7 @@ const init = function(mainWorkspace) {
   browserEvents.conditionalBind(
       /** @type {!Element} */ (svg.parentNode), 'contextmenu', null,
       function(e) {
-        if (!utils.isTargetInput(e)) {
+        if (!browserEvents.isTargetInput(e)) {
           e.preventDefault();
         }
       });
diff --git a/core/scrollbar.js b/core/scrollbar.js
index 980a16f45..4de7ecbff 100644
--- a/core/scrollbar.js
+++ b/core/scrollbar.js
@@ -680,13 +680,13 @@ Scrollbar.prototype.onMouseDownBar_ = function(e) {
   this.workspace_.markFocused();
   Touch.clearTouchIdentifier();  // This is really a click.
   this.cleanUp_();
-  if (utils.isRightButton(e)) {
+  if (browserEvents.isRightButton(e)) {
     // Right-click.
     // Scrollbars have no context menu.
     e.stopPropagation();
     return;
   }
-  const mouseXY = utils.mouseToSvg(
+  const mouseXY = browserEvents.mouseToSvg(
       e, this.workspace_.getParentSvg(), this.workspace_.getInverseScreenCTM());
   const mouseLocation = this.horizontal_ ? mouseXY.x : mouseXY.y;
 
@@ -719,7 +719,7 @@ Scrollbar.prototype.onMouseDownBar_ = function(e) {
 Scrollbar.prototype.onMouseDownHandle_ = function(e) {
   this.workspace_.markFocused();
   this.cleanUp_();
-  if (utils.isRightButton(e)) {
+  if (browserEvents.isRightButton(e)) {
     // Right-click.
     // Scrollbars have no context menu.
     e.stopPropagation();
diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index 5f39d11f5..564f06aa5 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -53,7 +53,6 @@ const common = goog.require('Blockly.common');
 const keyCodes = goog.require('Blockly.utils.KeyCodes');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
-const utils = goog.require('Blockly.utils');
 const toolbox = goog.require('Blockly.utils.toolbox');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.ToolboxItemSelect');
@@ -313,7 +312,7 @@ Toolbox.prototype.attachEvents_ = function(container, contentsContainer) {
  * @protected
  */
 Toolbox.prototype.onClick_ = function(e) {
-  if (utils.isRightButton(e) || e.target == this.HtmlDiv) {
+  if (browserEvents.isRightButton(e) || e.target == this.HtmlDiv) {
     // Close flyout.
     common.getMainWorkspace().hideChaff(false);
   } else {
diff --git a/core/touch_gesture.js b/core/touch_gesture.js
index 85c3e1cf3..131ce725c 100644
--- a/core/touch_gesture.js
+++ b/core/touch_gesture.js
@@ -21,7 +21,6 @@ const Touch = goog.require('Blockly.Touch');
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const browserEvents = goog.require('Blockly.browserEvents');
 const object = goog.require('Blockly.utils.object');
-const utils = goog.require('Blockly.utils');
 
 
 /*
@@ -284,7 +283,7 @@ TouchGesture.prototype.handlePinch_ = function(e) {
         gestureScale * TouchGesture.ZOOM_IN_MULTIPLIER :
         gestureScale * TouchGesture.ZOOM_OUT_MULTIPLIER;
     const workspace = this.startWorkspace_;
-    const position = utils.mouseToSvg(
+    const position = browserEvents.mouseToSvg(
         e, workspace.getParentSvg(), workspace.getInverseScreenCTM());
     workspace.zoom(position.x, position.y, delta);
   }
diff --git a/core/utils.js b/core/utils.js
index f09526afe..5b5e74f8a 100644
--- a/core/utils.js
+++ b/core/utils.js
@@ -31,6 +31,7 @@ const Svg = goog.require('Blockly.utils.Svg');
 /* 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 colourUtils = goog.require('Blockly.utils.colour');
 const deprecation = goog.require('Blockly.utils.deprecation');
 const dom = goog.require('Blockly.utils.dom');
@@ -69,10 +70,13 @@ exports.userAgent = userAgent;
 exports.xml = xmlUtils;
 
 /**
- * Don't do anything for this event, just halt propagation.
+ * Halts the propagation of the event without doing anything else.
  * @param {!Event} e An event.
+ * @deprecated
  */
 const noEvent = function(e) {
+  deprecation.warn(
+    'Blockly.utils.noEvent', 'September 2021', 'September 2022');
   // This event has been handled.  No need to bubble up to the document.
   e.preventDefault();
   e.stopPropagation();
@@ -80,17 +84,16 @@ const noEvent = function(e) {
 exports.noEvent = noEvent;
 
 /**
- * Is this event targeting a text input widget?
+ * Returns true if this event is targeting a text input widget?
  * @param {!Event} e An event.
  * @return {boolean} True if text input.
+ * @deprecated Use Blockly.browserEvents.isTargetInput instead.
  */
 const isTargetInput = function(e) {
-  return e.target.type == 'textarea' || e.target.type == 'text' ||
-      e.target.type == 'number' || e.target.type == 'email' ||
-      e.target.type == 'password' || e.target.type == 'search' ||
-      e.target.type == 'tel' || e.target.type == 'url' ||
-      e.target.isContentEditable ||
-      (e.target.dataset && e.target.dataset.isTextInput == 'true');
+  deprecation.warn(
+    'Blockly.utils.isTargetInput', 'September 2021', 'September 2022',
+    'Blockly.browserEvents.isTargetInput');
+  return browserEvents.isTargetInput(e);
 };
 exports.isTargetInput = isTargetInput;
 
@@ -183,62 +186,48 @@ getRelativeXY.XY_STYLE_REGEX_ =
     /transform:\s*translate(?:3d)?\(\s*([-+\d.e]+)\s*px([ ,]\s*([-+\d.e]+)\s*px)?/;
 
 /**
- * Is this event a right-click?
+ * Returns true this event is a right-click.
  * @param {!Event} e Mouse event.
  * @return {boolean} True if right-click.
+ * @deprecated Use Blockly.browserEvents.isRightButton instead.
  */
 const isRightButton = function(e) {
-  if (e.ctrlKey && userAgent.MAC) {
-    // Control-clicking on Mac OS X is treated as a right-click.
-    // WebKit on Mac OS X fails to change button to 2 (but Gecko does).
-    return true;
-  }
-  return e.button == 2;
+  deprecation.warn(
+    'Blockly.utils.isRightButton', 'September 2021', 'September 2022',
+    'Blockly.browserEvents.isRightButton');
+  return browserEvents.isRightButton(e);
 };
 exports.isRightButton = isRightButton;
 
 /**
- * Return the converted coordinates of the given mouse event.
+ * Returns the converted coordinates of the given mouse event.
  * The origin (0,0) is the top-left corner of the Blockly SVG.
  * @param {!Event} e Mouse event.
  * @param {!Element} svg SVG element.
  * @param {?SVGMatrix} matrix Inverted screen CTM to use.
  * @return {!SVGPoint} Object with .x and .y properties.
+ * @deprecated Use Blockly.browserEvents.mouseToSvg instead;
  */
 const mouseToSvg = function(e, svg, matrix) {
-  const svgPoint = svg.createSVGPoint();
-  svgPoint.x = e.clientX;
-  svgPoint.y = e.clientY;
-
-  if (!matrix) {
-    matrix = svg.getScreenCTM().inverse();
-  }
-  return svgPoint.matrixTransform(matrix);
+  deprecation.warn(
+    'Blockly.utils.mouseToSvg', 'September 2021', 'September 2022',
+    'Blockly.browserEvents.mouseToSvg');
+  return browserEvents.mouseToSvg(e, svg, matrix);
 };
 exports.mouseToSvg = mouseToSvg;
 
 /**
- * Get the scroll delta of a mouse event in pixel units.
+ * Returns the scroll delta of a mouse event in pixel units.
  * @param {!Event} e Mouse event.
  * @return {{x: number, y: number}} Scroll delta object with .x and .y
  *    properties.
+ * @deprecated Use Blockly.browserEvents.getScrollDeltaPixels instead.
  */
 const getScrollDeltaPixels = function(e) {
-  switch (e.deltaMode) {
-    case 0x00:  // Pixel mode.
-    default:
-      return {x: e.deltaX, y: e.deltaY};
-    case 0x01:  // Line mode.
-      return {
-        x: e.deltaX * internalConstants.LINE_MODE_MULTIPLIER,
-        y: e.deltaY * internalConstants.LINE_MODE_MULTIPLIER
-      };
-    case 0x02:  // Page mode.
-      return {
-        x: e.deltaX * internalConstants.PAGE_MODE_MULTIPLIER,
-        y: e.deltaY * internalConstants.PAGE_MODE_MULTIPLIER
-      };
-  }
+  deprecation.warn(
+    'Blockly.utils.getScrollDeltaPixels', 'September 2021', 'September 2022',
+    'Blockly.browserEvents.getScrollDeltaPixels');
+  return browserEvents.getScrollDeltaPixels(e);
 };
 exports.getScrollDeltaPixels = getScrollDeltaPixels;
 
diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index c93114800..974f159ae 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -853,7 +853,7 @@ WorkspaceCommentSvg.prototype.addDeleteDom_ = function() {
  */
 WorkspaceCommentSvg.prototype.resizeMouseDown_ = function(e) {
   this.unbindDragEvents_();
-  if (utils.isRightButton(e)) {
+  if (browserEvents.isRightButton(e)) {
     // No right-click.
     e.stopPropagation();
     return;
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index d00289904..2da56275f 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -1741,8 +1741,8 @@ WorkspaceSvg.prototype.onMouseDown_ = function(e) {
  */
 WorkspaceSvg.prototype.startDrag = function(e, xy) {
   // Record the starting offset between the bubble's location and the mouse.
-  const point =
-      utils.mouseToSvg(e, this.getParentSvg(), this.getInverseScreenCTM());
+  const point = browserEvents.mouseToSvg(
+      e, this.getParentSvg(), this.getInverseScreenCTM());
   // Fix scale of mouse event.
   point.x /= this.scale;
   point.y /= this.scale;
@@ -1755,8 +1755,8 @@ WorkspaceSvg.prototype.startDrag = function(e, xy) {
  * @return {!Coordinate} New location of object.
  */
 WorkspaceSvg.prototype.moveDrag = function(e) {
-  const point =
-      utils.mouseToSvg(e, this.getParentSvg(), this.getInverseScreenCTM());
+  const point = browserEvents.mouseToSvg(
+      e, this.getParentSvg(), this.getInverseScreenCTM());
   // Fix scale of mouse event.
   point.x /= this.scale;
   point.y /= this.scale;
@@ -1842,15 +1842,15 @@ WorkspaceSvg.prototype.onMouseWheel_ = function(e) {
     return;
   }
 
-  const scrollDelta = utils.getScrollDeltaPixels(e);
+  const scrollDelta = browserEvents.getScrollDeltaPixels(e);
   if (canWheelZoom && (e.ctrlKey || !canWheelMove)) {
     // Zoom.
     // The vertical scroll distance that corresponds to a click of a zoom
     // button.
     const PIXELS_PER_ZOOM_STEP = 50;
     const delta = -scrollDelta.y / PIXELS_PER_ZOOM_STEP;
-    const position =
-        utils.mouseToSvg(e, this.getParentSvg(), this.getInverseScreenCTM());
+    const position = browserEvents.mouseToSvg(
+        e, this.getParentSvg(), this.getInverseScreenCTM());
     this.zoom(position.x, position.y, delta);
   } else {
     // Scroll.
diff --git a/scripts/migration/renamings.js b/scripts/migration/renamings.js
index 295d15a1f..4520d54fa 100644
--- a/scripts/migration/renamings.js
+++ b/scripts/migration/renamings.js
@@ -117,6 +117,10 @@ const renamings = {
     'Blockly.utils': {
       exports: {
         genUid: {module: 'Blockly.utils.idGenerator'},
+        getScrollDelta: {module: 'Blockly.utils.browserEvents'},
+        isTargetInput: {module: 'Blockly.utils.browserEvents'},
+        isRightButton: {module: 'Blockly.utils.browserEvents'},
+        mouseToSvg: {module: 'Blockly.utils.browserEvents'},
       },
     },
     'Blockly.utils.global': {
diff --git a/tests/deps.js b/tests/deps.js
index 57929d32d..64284f839 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -15,8 +15,8 @@ goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.AS
 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'});
-goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'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'});
+goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bump_objects.js', ['Blockly.bumpObjects'], ['Blockly.Events', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
@@ -80,11 +80,11 @@ goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'],
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.common', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
@@ -205,13 +205,13 @@ goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Bl
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], ['Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 167219784..27e032d61 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -15,8 +15,8 @@ goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.AS
 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'});
-goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'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'});
+goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bump_objects.js', ['Blockly.bumpObjects'], ['Blockly.Events', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
@@ -80,11 +80,11 @@ goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'],
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.common', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
@@ -205,13 +205,13 @@ goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Bl
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], ['Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});

From 7b3a3aa74379465690dfed9c6c9f766809cf95c6 Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Fri, 17 Sep 2021 23:31:00 +0100
Subject: [PATCH 760/833] Prevent request of (non-existent)
 closure/goog/deps.js (#5499)

Since the only part of the Closure Library we have is base.js,
prevent it from trying to load deps.js from the same directory.

(We already load our own dependency graph from tests/deps.js.)
---
 blockly_uncompressed.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/blockly_uncompressed.js b/blockly_uncompressed.js
index 47e9b7e9b..ff0971da3 100644
--- a/blockly_uncompressed.js
+++ b/blockly_uncompressed.js
@@ -16,7 +16,7 @@
  * loads closure/goog/base.js and tests/deps.js, then (in any case)
  * requires Blockly.requires.
  */
-(function(_global) {
+(function(globalThis) {
   /* eslint-disable no-undef */
   var IS_NODE_JS = !!(typeof module !== 'undefined' && module.exports);
 
@@ -40,6 +40,8 @@
     if (!BLOCKLY_DIR) {
       alert('Could not detect Blockly\'s directory name.');
     }
+    // Disable loading of closure/goog/deps.js (which doesn't exist).
+    globalThis.CLOSURE_NO_DEPS = true;
     // Load Closure Library base.js (the only part of the libary we use,
     // mainly for goog.require / goog.provide / goog.module).
     document.write(

From 319423959b86c604b98ef14e8982d9e1d5d28477 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Fri, 16 Jul 2021 13:33:45 -0700
Subject: [PATCH 761/833] Adds a serializer test suite - project cereal (#5034)

* Setup basic architecture for tests

* Attribute tests

* Easy field tests added

* Work on tests

* Work on tests

* Work on tests

* Add mutation tests

* Fixup ID tests

* Add more mutator tests

* Fixup lint and typos

* Uncomment tests

* Use test helpers

* Small PR comments

* Use test helpers for setup and teardown

* Add TODOs and fixup types

* Fix types

* Actually fix types
---
 tests/deps.mocha.js            |    1 +
 tests/mocha/index.html         |    3 +
 tests/mocha/serializer_test.js | 1764 ++++++++++++++++++++++++++++++++
 3 files changed, 1768 insertions(+)
 create mode 100644 tests/mocha/serializer_test.js

diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 27e032d61..85a06ac1a 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -337,6 +337,7 @@ goog.addDependency('../../tests/mocha/procedures_test.js', ['Blockly.test.proced
 goog.addDependency('../../tests/mocha/procedures_test_helpers.js', ['Blockly.test.procedureHelpers'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/registry_test.js', ['Blockly.test.registry'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/run_mocha_tests_in_browser.js', [], [], {'lang': 'es8'});
+goog.addDependency('../../tests/mocha/serializer_test.js', ['Blockly.test.serialization'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/shortcut_registry_test.js', ['Blockly.test.shortcutRegistry'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/test_helpers.js', ['Blockly.test.helpers'], ['Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/theme_test.js', ['Blockly.test.theme'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/index.html b/tests/mocha/index.html
index ff4661314..81ba4476e 100644
--- a/tests/mocha/index.html
+++ b/tests/mocha/index.html
@@ -26,6 +26,8 @@
     <script src="../../blocks/math.js"></script>
     <script src="../../blocks/procedures.js"></script>
     <script src="../../blocks/text.js"></script>
+    <script src="../../blocks/variables.js"></script>
+    <script src="../../blocks/variables_dynamic.js"></script>
   </head>
   <style>
     #blocklyDiv {
@@ -87,6 +89,7 @@
       goog.require('Blockly.test.names');
       goog.require('Blockly.test.procedures');
       goog.require('Blockly.test.registry');
+      goog.require('Blockly.test.serialization');
       goog.require('Blockly.test.shortcutRegistry');
       goog.require('Blockly.test.theme');
       goog.require('Blockly.test.toolbox');
diff --git a/tests/mocha/serializer_test.js b/tests/mocha/serializer_test.js
new file mode 100644
index 000000000..d1109a26b
--- /dev/null
+++ b/tests/mocha/serializer_test.js
@@ -0,0 +1,1764 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+goog.module('Blockly.test.serialization');
+
+const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+
+
+// TODO: Move this into samples as part of the dev-tools package.
+// TODO: Fix up typing of SerializerTestCase & SerializerTestSuite to match
+//     decision in google/blockly-samples#819.
+/**
+ * Constructs a serializer test.
+ * @param {string} title The title of this testcase.
+ * @param {string} xml The XML to use for the round-trip test.
+ * @constructor
+ * @implements {TestCase}
+ */
+function SerializerTestCase(title, xml) {
+  this.title = title;
+  this.xml = xml;
+}
+SerializerTestCase.prototype = new testHelpers.TestCase();
+
+/**
+ * The XML we want to ensure round-trips through the serializer.
+ */
+SerializerTestCase.prototype.xml = '';
+
+
+/**
+ * Constructs a serializer test suite.
+ * @param {string} title The title of this test suite.
+ * @extends {TestSuite<SerializerTestCase, SerializerTestSuite>}
+ */
+function SerializerTestSuite(title) {
+  this.title = title;
+}
+SerializerTestSuite.prototype = new testHelpers.TestSuite();
+
+var Serializer = new SerializerTestSuite('Serializer');
+
+// TODO: Make sure all of these properties are documented ad exported properly.
+Serializer.Empty = new SerializerTestCase('Empty',
+    '<xml xmlns="https://developers.google.com/blockly/xml"></xml>'
+);
+Serializer.Data = new SerializerTestCase('Data',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" editable="false" x="42" y="42">' +
+    '<data>test data</data>' +
+    '</block>' +
+    '</xml>');
+Serializer.testCases = [
+  Serializer.Empty,
+  Serializer.Data,
+];
+
+Serializer.Attributes = new SerializerTestSuite('Attributes');
+Serializer.Attributes.Basic = new SerializerTestCase('Basic',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42"></block>' +
+    '</xml>');
+Serializer.Attributes.Collapsed = new SerializerTestCase('Collapsed',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" collapsed="true" x="42" y="42"></block>' +
+    '</xml>');
+Serializer.Attributes.Disabled = new SerializerTestCase('Disabled',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" disabled="true" x="42" y="42"></block>' +
+    '</xml>');
+Serializer.Attributes.Deletable = new SerializerTestCase('Deletable',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" deletable="false" x="42" y="42"></block>' +
+    '</xml>');
+Serializer.Attributes.Movable = new SerializerTestCase('Movable',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" movable="false" x="42" y="42"></block>' +
+    '</xml>');
+Serializer.Attributes.Editable = new SerializerTestCase('Editable',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" editable="false" x="42" y="42"></block>' +
+    '</xml>');
+Serializer.Attributes.testCases = [
+  Serializer.Attributes.Basic,
+  Serializer.Attributes.Collapsed,
+  Serializer.Attributes.Disabled,
+  Serializer.Attributes.Deletable,
+  Serializer.Attributes.Movable,
+  Serializer.Attributes.Editable,
+];
+
+Serializer.Attributes.Inline = new SerializerTestSuite('Inline');
+Serializer.Attributes.Inline.True = new SerializerTestCase('True',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" inline="true" x="42" y="42"></block>' +
+    '</xml>');
+Serializer.Attributes.Inline.False = new SerializerTestCase('False',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" inline="false" x="42" y="42"></block>' +
+    '</xml>');
+Serializer.Attributes.Inline.testCases = [
+  Serializer.Attributes.Inline.True,
+  Serializer.Attributes.Inline.False,
+];
+
+Serializer.Attributes.Coordinates = new SerializerTestSuite('Coordinates');
+Serializer.Attributes.Coordinates.Simple = new SerializerTestCase('Simple',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42"></block>' +
+    '</xml>');
+Serializer.Attributes.Coordinates.Negative = new SerializerTestCase('Negative',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="-42" y="-42"></block>' +
+    '</xml>');
+Serializer.Attributes.Coordinates.Zero = new SerializerTestCase('Zero',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="0" y="0"></block>' +
+    '</xml>');
+Serializer.Attributes.Coordinates.testCases = [
+  Serializer.Attributes.Coordinates.Simple,
+  Serializer.Attributes.Coordinates.Negative,
+  Serializer.Attributes.Coordinates.Zero,
+];
+
+Serializer.Attributes.Id = new SerializerTestSuite('Ids');
+
+Serializer.Attributes.Id.Length = new SerializerTestSuite('Length');
+Serializer.Attributes.Id.Length.Short = new SerializerTestCase('Short',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42"></block>' +
+    '</xml>');
+Serializer.Attributes.Id.Length.Long = new SerializerTestCase('Long',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id***********************" x="42" y="42">' +
+    '</block>' +
+    '</xml>');
+Serializer.Attributes.Id.Length.testCases = [
+  Serializer.Attributes.Id.Length.Short,
+  Serializer.Attributes.Id.Length.Long,
+];
+
+Serializer.Attributes.Id.Chars = new SerializerTestSuite('Chars');
+Serializer.Attributes.Id.Chars.Symbols = new SerializerTestCase('Symbols',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="!#$%()*+,-./:;=?@[]^" x="42" y="42"></block>' +
+    '<block type="logic_negate" id="_`{|}~!!!!!!!!!!!!!!" x="42" y="42"></block>' +
+    '</xml>');
+Serializer.Attributes.Id.Chars.Uppercase = new SerializerTestCase('Uppercase',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="ABCDEFGHIJKLMNOPQRST" x="42" y="42"></block>' +
+    '<block type="logic_negate" id="TUVWXYZAAAAAAAAAAAAA" x="42" y="42"></block>' +
+    '</xml>');
+Serializer.Attributes.Id.Chars.Lowercase = new SerializerTestCase('Lowercase',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="abcdefghijklmnopqrst" x="42" y="42"></block>' +
+    '<block type="logic_negate" id="tuvwxyzaaaaaaaaaaaaa" x="42" y="42"></block>' +
+    '</xml>');
+Serializer.Attributes.Id.Chars.Numbers = new SerializerTestCase('Numbers',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="01234567890000000000" x="42" y="42"></block>' +
+    '</xml>');
+Serializer.Attributes.Id.Chars.testCases = [
+  Serializer.Attributes.Id.Chars.Symbols,
+  Serializer.Attributes.Id.Chars.Uppercase,
+  Serializer.Attributes.Id.Chars.Lowercase,
+  Serializer.Attributes.Id.Chars.Numbers,
+];
+
+Serializer.Attributes.Id.testSuites = [
+  Serializer.Attributes.Id.Length,
+  Serializer.Attributes.Id.Chars,
+];
+
+Serializer.Attributes.testSuites = [
+  Serializer.Attributes.Inline,
+  Serializer.Attributes.Coordinates,
+  Serializer.Attributes.Id,
+];
+
+Serializer.Fields = new SerializerTestSuite('Fields');
+
+Serializer.Fields.Angle = new SerializerTestSuite('Angle');
+Serializer.Fields.Angle.Simple = new SerializerTestCase('Simple',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_angle" id="id******************" x="42" y="42">' +
+    '<field name="FIELDNAME">90</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Angle.Negative = new SerializerTestCase(
+    'Negative',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_angles_wrap" id="id******************" x="42" y="42">' +
+    '<field name="FIELDNAME">-90</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Angle.Decimals = new SerializerTestCase('Decimals',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_angle" id="id******************" x="42" y="42">' +
+    '<field name="FIELDNAME">1.5</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Angle.MaxPrecision = new SerializerTestCase(
+    'MaxPrecision',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_angle" id="id******************" x="42" y="42">' +
+    '<field name="FIELDNAME">1.000000000000001</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Angle.SmallestNumber = new SerializerTestCase(
+    'SmallestNumber',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_angle" id="id******************" x="42" y="42">' +
+    '<field name="FIELDNAME">5e-324</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Angle.testCases = [
+  Serializer.Fields.Angle.Simple,
+  Serializer.Fields.Angle.Negative,
+  Serializer.Fields.Angle.Decimals,
+  Serializer.Fields.Angle.MaxPrecision,
+  Serializer.Fields.Angle.SmallestNumber,
+];
+
+Serializer.Fields.Checkbox = new SerializerTestSuite('Checkbox');
+Serializer.Fields.Checkbox.True = new SerializerTestCase('True',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_checkbox" id="id******************" x="42" y="42">' +
+    '<field name="CHECKBOX">TRUE</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Checkbox.False = new SerializerTestCase('False',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_checkbox" id="id******************" x="42" y="42">' +
+    '<field name="CHECKBOX">FALSE</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Checkbox.testCases = [
+  Serializer.Fields.Checkbox.True,
+  Serializer.Fields.Checkbox.False,
+];
+
+Serializer.Fields.Colour = new SerializerTestSuite('Colour');
+Serializer.Fields.Colour.ThreeChar = new SerializerTestCase('ThreeChar',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_colour" id="id******************" x="42" y="42">' +
+    '<field name="COLOUR">#ffcc00</field>' +  // Could use a 3 char code.
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Colour.SixChar = new SerializerTestCase('SixChar',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_colour" id="id******************" x="42" y="42">' +
+    '<field name="COLOUR">#f1c101</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Colour.Black = new SerializerTestCase('Black',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_colour" id="id******************" x="42" y="42">' +
+    '<field name="COLOUR">#000000</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Colour.testCases = [
+  Serializer.Fields.Colour.ThreeChar,
+  Serializer.Fields.Colour.SixChar,
+  Serializer.Fields.Colour.Black,
+];
+
+Serializer.Fields.Dropdown = new SerializerTestSuite('Dropdown');
+Serializer.Fields.Dropdown.Default = new SerializerTestCase('Default',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_dropdowns_long" id="id******************" x="42" y="42">' +
+    '<field name="FIELDNAME">ITEM1</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Dropdown.NotDefault = new SerializerTestCase('NotDefault',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_dropdowns_long" id="id******************" x="42" y="42">' +
+    '<field name="FIELDNAME">ITEM32</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Dropdown.testCases = [
+  Serializer.Fields.Dropdown.Default,
+  Serializer.Fields.Dropdown.NotDefault,
+];
+
+
+Serializer.Fields.LabelSerializable = new SerializerTestSuite(
+    'LabelSerializable');
+Serializer.Fields.LabelSerializable.Simple = new SerializerTestCase('Simple',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_label_serializable" id="id******************" x="42" y="42">' +
+    '<field name="LABEL">test</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.LabelSerializable.Symbols = new SerializerTestCase('Symbols',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_label_serializable" id="id******************" x="42" y="42">' +
+    '<field name="LABEL">~`!@#$%^*()_+-={[}]|\\:;,.?/</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.LabelSerializable.EscapedSymbols = new SerializerTestCase(
+    'EscapedSymbols',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_label_serializable" id="id******************" x="42" y="42">' +
+    '<field name="LABEL">&amp;&lt;&gt;</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.LabelSerializable.SingleQuotes = new SerializerTestCase(
+    'SingleQuotes',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_label_serializable" id="id******************" x="42" y="42">' +
+    '<field name="LABEL">\'test\'</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.LabelSerializable.DoubleQuotes = new SerializerTestCase(
+    'DoubleQuotes',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_label_serializable" id="id******************" x="42" y="42">' +
+    '<field name="LABEL">"test"</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.LabelSerializable.Numbers = new SerializerTestCase(
+    'Numbers',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_label_serializable" id="id******************" x="42" y="42">' +
+    '<field name="LABEL">1234567890a123a123a</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.LabelSerializable.Emoji = new SerializerTestCase(
+    'Emoji',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_label_serializable" id="id******************" x="42" y="42">' +
+    '<field name="LABEL">😀👋🏿👋🏾👋🏽👋🏼👋🏻😀❤❤❤</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.LabelSerializable.Russian = new SerializerTestCase(
+    'Russian',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_label_serializable" id="id******************" x="42" y="42">' +
+    '<field name="LABEL">ты любопытный кот</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.LabelSerializable.Japanese = new SerializerTestCase(
+    'Japanese',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_label_serializable" id="id******************" x="42" y="42">' +
+    '<field name="LABEL">あなたは好奇心旺盛な猫です</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.LabelSerializable.Zalgo = new SerializerTestCase(
+    'Zalgo',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_label_serializable" id="id******************" x="42" y="42">' +
+    '<field name="LABEL">z̴̪͈̲̜͕̽̈̀͒͂̓̋̉̍a̸̧̧̜̻̘̤̫̱̲͎̞̻͆̋ļ̸̛̖̜̳͚̖͔̟̈́͂̉̀͑̑͑̎ǵ̸̫̳̽̐̃̑̚̕o̶͇̫͔̮̼̭͕̹̘̬͋̀͆̂̇̋͊̒̽</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.LabelSerializable.ControlChars = new SerializerTestCase(
+    'ControlChars',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_label_serializable" id="id******************" x="42" y="42">' +
+    '<field name="LABEL">&#x01;&#xa1;</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.LabelSerializable.testCases = [
+  Serializer.Fields.LabelSerializable.Simple,
+  Serializer.Fields.LabelSerializable.Symbols,
+  Serializer.Fields.LabelSerializable.EscapedSymbols,
+  Serializer.Fields.LabelSerializable.SingleQuotes,
+  Serializer.Fields.LabelSerializable.DoubleQuotes,
+  Serializer.Fields.LabelSerializable.Numbers,
+  Serializer.Fields.LabelSerializable.Emoji,
+  Serializer.Fields.LabelSerializable.Russian,
+  Serializer.Fields.LabelSerializable.Japanese,
+  Serializer.Fields.LabelSerializable.Zalgo,
+  // TODO: Uncoment once #4945 is merged.
+  // Serializer.Fields.LabelSerializable.ControlChars,
+];
+
+Serializer.Fields.MultilineInput = new SerializerTestSuite('MultilineInput');
+Serializer.Fields.MultilineInput.SingleLine = new SerializerTestCase(
+    'SingleLine',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_multilinetext" id="id******************" x="42" y="42">' +
+    '<field name="CODE">test</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.MultilineInput.MultipleLines = new SerializerTestCase(
+    'MultipleLines',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_multilinetext" id="id******************" x="42" y="42">' +
+    '<field name="CODE">line1&amp;#10;line2&amp;#10;line3</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.MultilineInput.Indentation = new SerializerTestCase(
+    'Indentation',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_multilinetext" id="id******************" x="42" y="42">' +
+    '<field name="CODE">line1&amp;#10;  line2&amp;#10;  line3</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.MultilineInput.Tabs = new SerializerTestCase(
+    'Tabs',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_multilinetext" id="id******************" x="42" y="42">' +
+    '<field name="CODE">' +
+    'line1&amp;#10;	line2&amp;#10;	line3' +
+    '</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.MultilineInput.Symbols = new SerializerTestCase('Symbols',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_multilinetext" id="id******************" x="42" y="42">' +
+    '<field name="CODE">~`!@#$%^*()_+-={[}]|\\:;,.?/</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.MultilineInput.EscapedSymbols = new SerializerTestCase(
+    'EscapedSymbols',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_multilinetext" id="id******************" x="42" y="42">' +
+    '<field name="CODE">&amp;&lt;&gt;</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.MultilineInput.SingleQuotes = new SerializerTestCase(
+    'SingleQuotes',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_multilinetext" id="id******************" x="42" y="42">' +
+    '<field name="CODE">\'test\'</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.MultilineInput.DoubleQuotes = new SerializerTestCase(
+    'DoubleQuotes',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_multilinetext" id="id******************" x="42" y="42">' +
+    '<field name="CODE">"test"</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.MultilineInput.Numbers = new SerializerTestCase(
+    'Numbers',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_multilinetext" id="id******************" x="42" y="42">' +
+    '<field name="CODE">1234567890a123a123a</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.MultilineInput.Emoji = new SerializerTestCase(
+    'Emoji',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_multilinetext" id="id******************" x="42" y="42">' +
+    '<field name="CODE">😀👋🏿👋🏾👋🏽👋🏼👋🏻😀❤❤❤</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.MultilineInput.Russian = new SerializerTestCase(
+    'Russian',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_multilinetext" id="id******************" x="42" y="42">' +
+    '<field name="CODE">ты любопытный кот</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.MultilineInput.Japanese = new SerializerTestCase(
+    'Japanese',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_multilinetext" id="id******************" x="42" y="42">' +
+    '<field name="CODE">あなたは好奇心旺盛な猫です</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.MultilineInput.Zalgo = new SerializerTestCase(
+    'Zalgo',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_multilinetext" id="id******************" x="42" y="42">' +
+    '<field name="CODE">z̴̪͈̲̜͕̽̈̀͒͂̓̋̉̍a̸̧̧̜̻̘̤̫̱̲͎̞̻͆̋ļ̸̛̖̜̳͚̖͔̟̈́͂̉̀͑̑͑̎ǵ̸̫̳̽̐̃̑̚̕o̶͇̫͔̮̼̭͕̹̘̬͋̀͆̂̇̋͊̒̽</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.MultilineInput.ControlChars = new SerializerTestCase(
+    'ControlChars',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_multilinetext" id="id******************" x="42" y="42">' +
+    '<field name="CODE">&#x01;&#xa1;</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.MultilineInput.testCases = [
+  Serializer.Fields.MultilineInput.SingleLine,
+  Serializer.Fields.MultilineInput.MultipleLines,
+  Serializer.Fields.MultilineInput.Indentation,
+  Serializer.Fields.MultilineInput.Tabs,
+  Serializer.Fields.MultilineInput.Symbols,
+  Serializer.Fields.MultilineInput.EscapedSymbols,
+  Serializer.Fields.MultilineInput.SingleQuotes,
+  Serializer.Fields.MultilineInput.DoubleQuotes,
+  Serializer.Fields.MultilineInput.Numbers,
+  Serializer.Fields.MultilineInput.Emoji,
+  Serializer.Fields.MultilineInput.Russian,
+  Serializer.Fields.MultilineInput.Japanese,
+  Serializer.Fields.MultilineInput.Zalgo,
+  // TODO: Uncoment once #4945 is merged.
+  // Serializer.Fields.MultilineInput.ControlChars,
+];
+
+Serializer.Fields.Number = new SerializerTestSuite('Number');
+Serializer.Fields.Number.Simple = new SerializerTestCase('Simple',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_numbers_float" id="id******************" x="42" y="42">' +
+    '<field name="NUM">123</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Number.Negative = new SerializerTestCase('Negative',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_numbers_float" id="id******************" x="42" y="42">' +
+    '<field name="NUM">-123</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Number.PosInfinity = new SerializerTestCase('PosInfinity',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_numbers_float" id="id******************" x="42" y="42">' +
+    '<field name="NUM">Infinity</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Number.NegInfinity = new SerializerTestCase('NegInfinity',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_numbers_float" id="id******************" x="42" y="42">' +
+    '<field name="NUM">-Infinity</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Number.Decimals = new SerializerTestCase('Decimals',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_numbers_float" id="id******************" x="42" y="42">' +
+    '<field name="NUM">1.5</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Number.Smallest = new SerializerTestCase('Smallest',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_numbers_float" id="id******************" x="42" y="42">' +
+    '<field name="NUM">5e-324</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Number.Largest = new SerializerTestCase('Largest',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_numbers_float" id="id******************" x="42" y="42">' +
+    '<field name="NUM">1.7976931348623157e+308</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Number.MaxPrecisionSmall = new SerializerTestCase(
+    'MaxPrecisionSmall',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_numbers_float" id="id******************" x="42" y="42">' +
+    '<field name="NUM">1.000000000000001</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Number.MaxPrecisionLarge = new SerializerTestCase(
+    'MaxPrecisionLarge',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_numbers_float" id="id******************" x="42" y="42">' +
+    '<field name="NUM">1000000000000001</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Number.testCases = [
+  Serializer.Fields.Number.Simple,
+  Serializer.Fields.Number.Negative,
+  Serializer.Fields.Number.PosInfinity,
+  Serializer.Fields.Number.NegInfinity,
+  Serializer.Fields.Number.Decimals,
+  Serializer.Fields.Number.Smallest,
+  Serializer.Fields.Number.Largest,
+  Serializer.Fields.Number.MaxPrecisionSmall,
+  Serializer.Fields.Number.MaxPrecisionLarge,
+];
+
+Serializer.Fields.TextInput = new SerializerTestSuite('TextInput');
+Serializer.Fields.TextInput.Simple = new SerializerTestCase('Simple',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_text_input" id="id******************" x="42" y="42">' +
+    '<field name="TEXT_INPUT">test</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.TextInput.Tabs = new SerializerTestCase('Tabs',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_text_input" id="id******************" x="42" y="42">' +
+    '<field name="TEXT_INPUT">line1	line2	line3</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.TextInput.Symbols = new SerializerTestCase('Symbols',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_text_input" id="id******************" x="42" y="42">' +
+    '<field name="TEXT_INPUT">~`!@#$%^*()_+-={[}]|\\:;,.?/</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.TextInput.EscapedSymbols = new SerializerTestCase(
+    'EscapedSymbols',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_text_input" id="id******************" x="42" y="42">' +
+    '<field name="TEXT_INPUT">&amp;&lt;&gt;</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.TextInput.SingleQuotes = new SerializerTestCase(
+    'SingleQuotes',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_text_input" id="id******************" x="42" y="42">' +
+    '<field name="TEXT_INPUT">\'test\'</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.TextInput.DoubleQuotes = new SerializerTestCase(
+    'DoubleQuotes',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_text_input" id="id******************" x="42" y="42">' +
+    '<field name="TEXT_INPUT">"test"</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.TextInput.Numbers = new SerializerTestCase(
+    'Numbers',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_text_input" id="id******************" x="42" y="42">' +
+    '<field name="TEXT_INPUT">1234567890a123a123a</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.TextInput.Emoji = new SerializerTestCase(
+    'Emoji',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_text_input" id="id******************" x="42" y="42">' +
+    '<field name="TEXT_INPUT">😀👋🏿👋🏾👋🏽👋🏼👋🏻😀❤❤❤</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.TextInput.Russian = new SerializerTestCase(
+    'Russian',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_text_input" id="id******************" x="42" y="42">' +
+    '<field name="TEXT_INPUT">ты любопытный кот</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.TextInput.Japanese = new SerializerTestCase(
+    'Japanese',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_text_input" id="id******************" x="42" y="42">' +
+    '<field name="TEXT_INPUT">あなたは好奇心旺盛な猫です</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.TextInput.Zalgo = new SerializerTestCase(
+    'Zalgo',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_text_input" id="id******************" x="42" y="42">' +
+    '<field name="TEXT_INPUT">z̴̪͈̲̜͕̽̈̀͒͂̓̋̉̍a̸̧̧̜̻̘̤̫̱̲͎̞̻͆̋ļ̸̛̖̜̳͚̖͔̟̈́͂̉̀͑̑͑̎ǵ̸̫̳̽̐̃̑̚̕o̶͇̫͔̮̼̭͕̹̘̬͋̀͆̂̇̋͊̒̽</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.TextInput.ControlChars = new SerializerTestCase(
+    'ControlChars',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_fields_text_input" id="id******************" x="42" y="42">' +
+    '<field name="TEXT_INPUT">&#x01;&#xa1;</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.TextInput.testCases = [
+  Serializer.Fields.TextInput.Simple,
+  Serializer.Fields.TextInput.Tabs,
+  Serializer.Fields.TextInput.Symbols,
+  Serializer.Fields.TextInput.EscapedSymbols,
+  Serializer.Fields.TextInput.SingleQuotes,
+  Serializer.Fields.TextInput.DoubleQuotes,
+  Serializer.Fields.TextInput.Numbers,
+  Serializer.Fields.TextInput.Emoji,
+  Serializer.Fields.TextInput.Russian,
+  Serializer.Fields.TextInput.Japanese,
+  Serializer.Fields.TextInput.Zalgo,
+  // TODO: Uncoment once #4945 is merged.
+  // Serializer.Fields.TextInput.ControlChars,
+];
+
+Serializer.Fields.Variable = new SerializerTestSuite('Variable');
+Serializer.Fields.Variable.Simple = new SerializerTestCase('Simple',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="aaaaaaaaaaaaaaaaaaaa">test</variable>' +
+    '</variables>' +
+    '<block type="variables_get" id="id******************" x="42" y="42">' +
+    '<field name="VAR" id="aaaaaaaaaaaaaaaaaaaa">test</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Variable.Types = new SerializerTestCase('Types',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable type="String" id="aaaaaaaaaaaaaaaaaaaa">test</variable>' +
+    '<variable type="Number" id="bbbbbbbbbbbbbbbbbbbb">test2</variable>' +
+    '<variable type="Colour" id="cccccccccccccccccccc">test3</variable>' +
+    '</variables>' +
+    '<block type="variables_get_dynamic" id="id******************" x="42" y="42">' +
+    '<field name="VAR" id="aaaaaaaaaaaaaaaaaaaa" variabletype="String">test</field>' +
+    '</block>' +
+    '<block type="variables_get_dynamic" id="id2*****************" x="42" y="84">' +
+    '<field name="VAR" id="bbbbbbbbbbbbbbbbbbbb" variabletype="Number">test2</field>' +
+    '</block>' +
+    '<block type="variables_get_dynamic" id="id3*****************" x="42" y="106">' +
+    '<field name="VAR" id="cccccccccccccccccccc" variabletype="Colour">test3</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Variable.Tabs = new SerializerTestCase('Tabs',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="aaaaaaaaaaaaaaaaaaaa">line1	line2	line3</variable>' +
+    '</variables>' +
+    '<block type="variables_get" id="id******************" x="42" y="42">' +
+    '<field name="VAR" id="aaaaaaaaaaaaaaaaaaaa">line1	line2	line3</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Variable.Symbols = new SerializerTestCase('Symbols',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="aaaaaaaaaaaaaaaaaaaa">~`!@#$%^*()_+-={[}]|\\:;,.?/</variable>' +
+    '</variables>' +
+    '<block type="variables_get" id="id******************" x="42" y="42">' +
+    '<field name="VAR" id="aaaaaaaaaaaaaaaaaaaa">~`!@#$%^*()_+-={[}]|\\:;,.?/</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Variable.EscapedSymbols = new SerializerTestCase(
+    'EscapedSymbols',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="aaaaaaaaaaaaaaaaaaaa">&amp;&lt;&gt;</variable>' +
+    '</variables>' +
+    '<block type="variables_get" id="id******************" x="42" y="42">' +
+    '<field name="VAR" id="aaaaaaaaaaaaaaaaaaaa">&amp;&lt;&gt;</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Variable.SingleQuotes = new SerializerTestCase(
+    'SingleQuotes',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="aaaaaaaaaaaaaaaaaaaa">\'test\'</variable>' +
+    '</variables>' +
+    '<block type="variables_get" id="id******************" x="42" y="42">' +
+    '<field name="VAR" id="aaaaaaaaaaaaaaaaaaaa">\'test\'</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Variable.DoubleQuotes = new SerializerTestCase(
+    'DoubleQuotes',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="aaaaaaaaaaaaaaaaaaaa">"test"</variable>' +
+    '</variables>' +
+    '<block type="variables_get" id="id******************" x="42" y="42">' +
+    '<field name="VAR" id="aaaaaaaaaaaaaaaaaaaa">"test"</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Variable.Numbers = new SerializerTestCase(
+    'Numbers',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="aaaaaaaaaaaaaaaaaaaa">1234567890a123a123a</variable>' +
+    '</variables>' +
+    '<block type="variables_get" id="id******************" x="42" y="42">' +
+    '<field name="VAR" id="aaaaaaaaaaaaaaaaaaaa">1234567890a123a123a</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Variable.Emoji = new SerializerTestCase(
+    'Emoji',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="aaaaaaaaaaaaaaaaaaaa">😀👋🏿👋🏾👋🏽👋🏼👋🏻😀❤❤❤</variable>' +
+    '</variables>' +
+    '<block type="variables_get" id="id******************" x="42" y="42">' +
+    '<field name="VAR" id="aaaaaaaaaaaaaaaaaaaa">😀👋🏿👋🏾👋🏽👋🏼👋🏻😀❤❤❤</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Variable.Russian = new SerializerTestCase(
+    'Russian',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="aaaaaaaaaaaaaaaaaaaa">ты любопытный кот</variable>' +
+    '</variables>' +
+    '<block type="variables_get" id="id******************" x="42" y="42">' +
+    '<field name="VAR" id="aaaaaaaaaaaaaaaaaaaa">ты любопытный кот</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Variable.Japanese = new SerializerTestCase(
+    'Japanese',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="aaaaaaaaaaaaaaaaaaaa">あなたは好奇心旺盛な猫です</variable>' +
+    '</variables>' +
+    '<block type="variables_get" id="id******************" x="42" y="42">' +
+    '<field name="VAR" id="aaaaaaaaaaaaaaaaaaaa">あなたは好奇心旺盛な猫です</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Variable.Zalgo = new SerializerTestCase(
+    'Zalgo',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="aaaaaaaaaaaaaaaaaaaa">z̴̪͈̲̜͕̽̈̀͒͂̓̋̉̍a̸̧̧̜̻̘̤̫̱̲͎̞̻͆̋ļ̸̛̖̜̳͚̖͔̟̈́͂̉̀͑̑͑̎ǵ̸̫̳̽̐̃̑̚̕o̶͇̫͔̮̼̭͕̹̘̬͋̀͆̂̇̋͊̒̽</variable>' +
+    '</variables>' +
+    '<block type="variables_get" id="id******************" x="42" y="42">' +
+    '<field name="VAR" id="aaaaaaaaaaaaaaaaaaaa">z̴̪͈̲̜͕̽̈̀͒͂̓̋̉̍a̸̧̧̜̻̘̤̫̱̲͎̞̻͆̋ļ̸̛̖̜̳͚̖͔̟̈́͂̉̀͑̑͑̎ǵ̸̫̳̽̐̃̑̚̕o̶͇̫͔̮̼̭͕̹̘̬͋̀͆̂̇̋͊̒̽</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Variable.ControlChars = new SerializerTestCase(
+    'ControlChars',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="aaaaaaaaaaaaaaaaaaaa">&#x01;&#xa1;</variable>' +
+    '</variables>' +
+    '<block type="variables_get" id="id******************" x="42" y="42">' +
+    '<field name="VAR" id="aaaaaaaaaaaaaaaaaaaa">&#x01;&#xa1;</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Variable.testCases = [
+  Serializer.Fields.Variable.Simple,
+  Serializer.Fields.Variable.Types,
+  Serializer.Fields.Variable.Tabs,
+  Serializer.Fields.Variable.Symbols,
+  Serializer.Fields.Variable.EscapedSymbols,
+  Serializer.Fields.Variable.SingleQuotes,
+  Serializer.Fields.Variable.DoubleQuotes,
+  Serializer.Fields.Variable.Numbers,
+  Serializer.Fields.Variable.Emoji,
+  Serializer.Fields.Variable.Russian,
+  Serializer.Fields.Variable.Japanese,
+  Serializer.Fields.Variable.Zalgo,
+  // TODO: Uncoment once #4945 is merged.
+  // Serializer.Fields.Variable.ControlChars,
+];
+
+Serializer.Fields.Variable.Id = new SerializerTestSuite('Id');
+
+Serializer.Fields.Variable.Id.Length = new SerializerTestSuite('Length');
+Serializer.Fields.Variable.Id.Length.Short = new SerializerTestCase('Short',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="id">test</variable>' +
+    '</variables>' +
+    '<block type="variables_get" id="id******************" x="42" y="42">' +
+    '<field name="VAR" id="id">test</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Variable.Id.Length.Long = new SerializerTestCase('Long',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="id***********************">test</variable>' +
+    '</variables>' +
+    '<block type="variables_get" id="id******************" x="42" y="42">' +
+    '<field name="VAR" id="id***********************">test</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Variable.Id.Length.testCases = [
+  Serializer.Fields.Variable.Id.Length.Short,
+  Serializer.Fields.Variable.Id.Length.Long,
+];
+
+Serializer.Fields.Variable.Id.Chars = new SerializerTestSuite('Chars');
+Serializer.Fields.Variable.Id.Chars.Symbols = new SerializerTestCase('Symbols',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="!#$%()*+,-./:;=?@[]^">test</variable>' +
+    '<variable id="_`{|}~!!!!!!!!!!!!!!">test2</variable>' +
+    '</variables>' +
+    '<block type="variables_get" id="id******************" x="42" y="42">' +
+    '<field name="VAR" id="!#$%()*+,-./:;=?@[]^">test</field>' +
+    '</block>' +
+    '<block type="variables_get" id="id1*****************" x="42" y="42">' +
+    '<field name="VAR" id="_`{|}~!!!!!!!!!!!!!!">test2</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Variable.Id.Chars.Uppercase = new SerializerTestCase('Uppercase',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="ABCDEFGHIJKLMNOPQRST">test</variable>' +
+    '<variable id="TUVWXYZAAAAAAAAAAAAA">test2</variable>' +
+    '</variables>' +
+    '<block type="variables_get" id="id******************" x="42" y="42">' +
+    '<field name="VAR" id="ABCDEFGHIJKLMNOPQRST">test</field>' +
+    '</block>' +
+    '<block type="variables_get" id="id1*****************" x="42" y="42">' +
+    '<field name="VAR" id="TUVWXYZAAAAAAAAAAAAA">test2</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Variable.Id.Chars.Lowercase = new SerializerTestCase('Lowercase',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="abcdefghijklmnopqrst">test</variable>' +
+    '<variable id="tuvwxyzaaaaaaaaaaaaa">test2</variable>' +
+    '</variables>' +
+    '<block type="variables_get" id="id******************" x="42" y="42">' +
+    '<field name="VAR" id="abcdefghijklmnopqrst">test</field>' +
+    '</block>' +
+    '<block type="variables_get" id="id1*****************" x="42" y="42">' +
+    '<field name="VAR" id="tuvwxyzaaaaaaaaaaaaa">test2</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Variable.Id.Chars.Numbers = new SerializerTestCase('Numbers',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="01234567890000000000">test</variable>' +
+    '</variables>' +
+    '<block type="variables_get" id="id******************" x="42" y="42">' +
+    '<field name="VAR" id="01234567890000000000">test</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Fields.Variable.Id.Chars.testCases = [
+  Serializer.Fields.Variable.Id.Chars.Symbols,
+  Serializer.Fields.Variable.Id.Chars.Uppercase,
+  Serializer.Fields.Variable.Id.Chars.Lowercase,
+  Serializer.Fields.Variable.Id.Chars.Numbers,
+];
+
+Serializer.Fields.Variable.Id.testSuites = [
+  Serializer.Fields.Variable.Id.Length,
+  Serializer.Fields.Variable.Id.Chars,
+];
+
+Serializer.Fields.Variable.testSuites = [
+  Serializer.Fields.Variable.Id,
+];
+
+Serializer.Fields.testSuites = [
+  Serializer.Fields.Angle,
+  Serializer.Fields.Checkbox,
+  Serializer.Fields.Colour,
+  Serializer.Fields.Dropdown,
+  Serializer.Fields.LabelSerializable,
+  Serializer.Fields.MultilineInput,
+  Serializer.Fields.Number,
+  Serializer.Fields.TextInput,
+  Serializer.Fields.Variable,
+];
+
+Serializer.Icons = new SerializerTestSuite('Icons');
+
+Serializer.Icons.Comment = new SerializerTestSuite('Comment');
+Serializer.Icons.Comment.Basic = new SerializerTestCase('Basic',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
+    '<comment pinned="false" h="80" w="160">test</comment>' +
+    '</block>' +
+    '</xml>');
+
+Serializer.Icons.Comment.Size = new SerializerTestSuite('Size');
+Serializer.Icons.Comment.Size.Different = new SerializerTestCase('Different',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
+    '<comment pinned="false" h="160" w="80">test</comment>' +
+    '</block>' +
+    '</xml>');
+Serializer.Icons.Comment.Size.Large = new SerializerTestCase('Large',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
+    '<comment pinned="false" h="10000" w="10000">test</comment>' +
+    '</block>' +
+    '</xml>');
+Serializer.Icons.Comment.Size.testCases = [
+  Serializer.Icons.Comment.Size.Different,
+  Serializer.Icons.Comment.Size.Large,
+];
+
+Serializer.Icons.Comment.Pinned = new SerializerTestSuite('Pinned');
+Serializer.Icons.Comment.Pinned.True = new SerializerTestCase('True',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
+    '<comment pinned="true" h="80" w="160">test</comment>' +
+    '</block>' +
+    '</xml>');
+Serializer.Icons.Comment.Pinned.False = new SerializerTestCase('False',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
+    '<comment pinned="false" h="80" w="160">test</comment>' +
+    '</block>' +
+    '</xml>');
+Serializer.Icons.Comment.Pinned.testCases = [
+  Serializer.Icons.Comment.Pinned.True,
+  Serializer.Icons.Comment.Pinned.False,
+];
+
+Serializer.Icons.Comment.Text = new SerializerTestSuite('Text');
+Serializer.Icons.Comment.Text.Symbols = new SerializerTestCase('Symbols',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
+    '<comment pinned="false" h="80" w="160">~`!@#$%^*()_+-={[}]|\\:;,.?/</comment>' +
+    '</block>' +
+    '</xml>');
+Serializer.Icons.Comment.Text.EscapedSymbols = new SerializerTestCase(
+    'EscapedSymbols',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
+    '<comment pinned="false" h="80" w="160">&amp;&lt;&gt;</comment>' +
+    '</block>' +
+    '</xml>');
+Serializer.Icons.Comment.Text.SingleQuotes = new SerializerTestCase(
+    'SingleQuotes',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
+    '<comment pinned="false" h="80" w="160">\'test\'</comment>' +
+    '</block>' +
+    '</xml>');
+Serializer.Icons.Comment.Text.DoubleQuotes = new SerializerTestCase(
+    'DoubleQuotes',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
+    '<comment pinned="false" h="80" w="160">"test"</comment>' +
+    '</block>' +
+    '</xml>');
+Serializer.Icons.Comment.Text.Numbers = new SerializerTestCase(
+    'Numbers',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
+    '<comment pinned="false" h="80" w="160">1234567890a123a123a</comment>' +
+    '</block>' +
+    '</xml>');
+Serializer.Icons.Comment.Text.Emoji = new SerializerTestCase(
+    'Emoji',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
+    '<comment pinned="false" h="80" w="160">😀👋🏿👋🏾👋🏽👋🏼👋🏻😀❤❤❤</comment>' +
+    '</block>' +
+    '</xml>');
+Serializer.Icons.Comment.Text.Russian = new SerializerTestCase(
+    'Russian',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
+    '<comment pinned="false" h="80" w="160">ты любопытный кот</comment>' +
+    '</block>' +
+    '</xml>');
+Serializer.Icons.Comment.Text.Japanese = new SerializerTestCase(
+    'Japanese',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
+    '<comment pinned="false" h="80" w="160">あなたは好奇心旺盛な猫です</comment>' +
+    '</block>' +
+    '</xml>');
+Serializer.Icons.Comment.Text.Zalgo = new SerializerTestCase(
+    'Zalgo',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
+    '<comment pinned="false" h="80" w="160">z̴̪͈̲̜͕̽̈̀͒͂̓̋̉̍a̸̧̧̜̻̘̤̫̱̲͎̞̻͆̋ļ̸̛̖̜̳͚̖͔̟̈́͂̉̀͑̑͑̎ǵ̸̫̳̽̐̃̑̚̕o̶͇̫͔̮̼̭͕̹̘̬͋̀͆̂̇̋͊̒̽</comment>' +
+    '</block>' +
+    '</xml>');
+Serializer.Icons.Comment.Text.ControlChars = new SerializerTestCase(
+    'ControlChars',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
+    '<comment pinned="false" h="80" w="160">&#x01;&#xa1;</comment>' +
+    '</block>' +
+    '</xml>');
+Serializer.Icons.Comment.Text.testCases = [
+  Serializer.Icons.Comment.Text.Symbols,
+  Serializer.Icons.Comment.Text.EscapedSymbols,
+  Serializer.Icons.Comment.Text.SingleQuotes,
+  Serializer.Icons.Comment.Text.DoubleQuotes,
+  Serializer.Icons.Comment.Text.Numbers,
+  Serializer.Icons.Comment.Text.Emoji,
+  Serializer.Icons.Comment.Text.Russian,
+  Serializer.Icons.Comment.Text.Japanese,
+  Serializer.Icons.Comment.Text.Zalgo,
+  // TODO: Uncoment once #4945 is merged.
+  // Serializer.Icons.Comment.Text.ControlChars,
+];
+
+Serializer.Icons.Comment.testSuites = [
+  Serializer.Icons.Comment.Size,
+  Serializer.Icons.Comment.Pinned,
+  Serializer.Icons.Comment.Text,
+];
+
+Serializer.Icons.Comment.testCases = [
+  Serializer.Icons.Comment.Basic,
+];
+
+Serializer.Icons.testSuites = [Serializer.Icons.Comment];
+
+Serializer.Connections = new SerializerTestSuite('Connections');
+
+Serializer.Connections.Child = new SerializerTestSuite('Child');
+Serializer.Connections.Child.Value = new SerializerTestCase('Value',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
+    '<value name="BOOL">' +
+    '<block type="logic_boolean" id="id2*****************">' +
+    '<field name="BOOL">TRUE</field>' +
+    '</block>' +
+    '</value>' +
+    '</block>' +
+    '</xml>');
+Serializer.Connections.Child.Statement = new SerializerTestCase('Statement',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="controls_repeat_ext" id="id******************" x="42" y="42">' +
+    '<statement name="DO">' +
+    '<block type="text_print" id="id2*****************"></block>' +
+    '</statement>' +
+    '</block>' +
+    '</xml>');
+Serializer.Connections.Child.Next = new SerializerTestCase('Next',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="text_print" id="id******************" x="42" y="42">' +
+    '<next>' +
+    '<block type="text_print" id="id2*****************"></block>' +
+    '</next>' +
+    '</block>' +
+    '</xml>');
+Serializer.Connections.Child.Row = new SerializerTestCase('Row',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
+    '<value name="BOOL">' +
+    '<block type="logic_negate" id="id2*****************">' +
+    '<value name="BOOL">' +
+    '<block type="logic_boolean" id="id3*****************">' +
+    '<field name="BOOL">TRUE</field>' +
+    '</block>' +
+    '</value>' +
+    '</block>' +
+    '</value>' +
+    '</block>' +
+    '</xml>');
+Serializer.Connections.Child.Nested = new SerializerTestCase('Nested',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="controls_repeat_ext" id="id******************" x="42" y="42">' +
+    '<statement name="DO">' +
+    '<block type="controls_repeat_ext" id="id2*****************">' +
+    '<statement name="DO">' +
+    '<block type="text_print" id="id3*****************"></block>' +
+    '</statement>' +
+    '</block>' +
+    '</statement>' +
+    '</block>' +
+    '</xml>');
+Serializer.Connections.Child.Stack = new SerializerTestCase('Stack',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="text_print" id="id******************" x="42" y="42">' +
+    '<next>' +
+    '<block type="text_print" id="id2*****************">' +
+    '<next>' +
+    '<block type="text_print" id="id3*****************"></block>' +
+    '</next>' +
+    '</block>' +
+    '</next>' +
+    '</block>' +
+    '</xml>');
+Serializer.Connections.Child.testCases = [
+  Serializer.Connections.Child.Value,
+  Serializer.Connections.Child.Statement,
+  Serializer.Connections.Child.Next,
+  Serializer.Connections.Child.Row,
+  Serializer.Connections.Child.Nested,
+  Serializer.Connections.Child.Stack,
+];
+
+Serializer.Connections.Shadow = new SerializerTestSuite('Shadow');
+Serializer.Connections.Shadow.Value = new SerializerTestCase('Value',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
+    '<value name="BOOL">' +
+    '<shadow type="logic_boolean" id="id2*****************">' +
+    '<field name="BOOL">TRUE</field>' +
+    '</shadow>' +
+    '</value>' +
+    '</block>' +
+    '</xml>');
+Serializer.Connections.Shadow.Statement = new SerializerTestCase('Statement',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="controls_repeat_ext" id="id******************" x="42" y="42">' +
+    '<statement name="DO">' +
+    '<shadow type="text_print" id="id2*****************"></shadow>' +
+    '</statement>' +
+    '</block>' +
+    '</xml>');
+Serializer.Connections.Shadow.Next = new SerializerTestCase('Next',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="text_print" id="id******************" x="42" y="42">' +
+    '<next>' +
+    '<shadow type="text_print" id="id2*****************"></shadow>' +
+    '</next>' +
+    '</block>' +
+    '</xml>');
+Serializer.Connections.Shadow.Row = new SerializerTestCase('Row',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
+    '<value name="BOOL">' +
+    '<shadow type="logic_negate" id="id2*****************">' +
+    '<value name="BOOL">' +
+    '<shadow type="logic_boolean" id="id3*****************">' +
+    '<field name="BOOL">TRUE</field>' +
+    '</shadow>' +
+    '</value>' +
+    '</shadow>' +
+    '</value>' +
+    '</block>' +
+    '</xml>');
+Serializer.Connections.Shadow.Nested = new SerializerTestCase('Nested',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="controls_repeat_ext" id="id******************" x="42" y="42">' +
+    '<statement name="DO">' +
+    '<shadow type="controls_repeat_ext" id="id2*****************">' +
+    '<statement name="DO">' +
+    '<shadow type="text_print" id="id3*****************"></shadow>' +
+    '</statement>' +
+    '</shadow>' +
+    '</statement>' +
+    '</block>' +
+    '</xml>');
+Serializer.Connections.Shadow.Stack = new SerializerTestCase('Stack',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="text_print" id="id******************" x="42" y="42">' +
+    '<next>' +
+    '<shadow type="text_print" id="id2*****************">' +
+    '<next>' +
+    '<shadow type="text_print" id="id3*****************"></shadow>' +
+    '</next>' +
+    '</shadow>' +
+    '</next>' +
+    '</block>' +
+    '</xml>');
+Serializer.Connections.Shadow.testCases = [
+  Serializer.Connections.Shadow.Value,
+  Serializer.Connections.Shadow.Statement,
+  Serializer.Connections.Shadow.Next,
+  Serializer.Connections.Shadow.Row,
+  Serializer.Connections.Shadow.Nested,
+  Serializer.Connections.Shadow.Stack,
+];
+
+Serializer.Connections.OverwrittenShadow =
+    new SerializerTestSuite('OverwrittenShadow');
+Serializer.Connections.OverwrittenShadow.Value = new SerializerTestCase(
+    'Value',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
+    '<value name="BOOL">' +
+    '<shadow type="logic_boolean" id="id2*****************">' +
+    '<field name="BOOL">TRUE</field>' +
+    '</shadow>' +
+    '<block type="logic_boolean" id="id3*****************">' +
+    '<field name="BOOL">TRUE</field>' +
+    '</block>' +
+    '</value>' +
+    '</block>' +
+    '</xml>');
+Serializer.Connections.OverwrittenShadow.Statement = new SerializerTestCase(
+    'Statement',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="controls_repeat_ext" id="id******************" x="42" y="42">' +
+    '<statement name="DO">' +
+    '<shadow type="text_print" id="id2*****************"></shadow>' +
+    '<block type="text_print" id="id3*****************"></block>' +
+    '</statement>' +
+    '</block>' +
+    '</xml>');
+Serializer.Connections.OverwrittenShadow.Next = new SerializerTestCase('Next',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="text_print" id="id******************" x="42" y="42">' +
+    '<next>' +
+    '<block type="text_print" id="id2*****************"></block>' +
+    '<shadow type="text_print" id="id3*****************"></shadow>' +
+    '</next>' +
+    '</block>' +
+    '</xml>');
+Serializer.Connections.OverwrittenShadow.Row = new SerializerTestCase('Row',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
+    '<value name="BOOL">' +
+    '<shadow type="logic_negate" id="id2*****************">' +
+    '<value name="BOOL">' +
+    '<shadow type="logic_boolean" id="id3*****************">' +
+    '<field name="BOOL">TRUE</field>' +
+    '</shadow>' +
+    '</value>' +
+    '</shadow>' +
+    '<block type="logic_boolean" id="id3*****************">' +
+    '<field name="BOOL">TRUE</field>' +
+    '</block>' +
+    '</value>' +
+    '</block>' +
+    '</xml>');
+Serializer.Connections.OverwrittenShadow.Nested = new SerializerTestCase(
+    'Nested',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="controls_repeat_ext" id="id******************" x="42" y="42">' +
+    '<statement name="DO">' +
+    '<shadow type="controls_repeat_ext" id="id2*****************">' +
+    '<statement name="DO">' +
+    '<shadow type="text_print" id="id3*****************"></shadow>' +
+    '</statement>' +
+    '</shadow>' +
+    '<block type="text_print" id="id3*****************"></block>' +
+    '</statement>' +
+    '</block>' +
+    '</xml>');
+Serializer.Connections.OverwrittenShadow.Stack = new SerializerTestCase('Stack',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="text_print" id="id******************" x="42" y="42">' +
+    '<next>' +
+    '<block type="text_print" id="id3*****************"></block>' +
+    '<shadow type="text_print" id="id2*****************">' +
+    '<next>' +
+    '<shadow type="text_print" id="id3*****************"></shadow>' +
+    '</next>' +
+    '</shadow>' +
+    '</next>' +
+    '</block>' +
+    '</xml>');
+Serializer.Connections.OverwrittenShadow.testCases = [
+  Serializer.Connections.OverwrittenShadow.Value,
+  Serializer.Connections.OverwrittenShadow.Statement,
+  Serializer.Connections.OverwrittenShadow.Next,
+  Serializer.Connections.OverwrittenShadow.Row,
+  Serializer.Connections.OverwrittenShadow.Nested,
+  Serializer.Connections.OverwrittenShadow.Stack,
+];
+
+Serializer.Connections.testSuites = [
+  Serializer.Connections.Child,
+  Serializer.Connections.Shadow,
+  Serializer.Connections.OverwrittenShadow,
+];
+
+Serializer.Mutations = new SerializerTestSuite('Mutations');
+Serializer.Mutations.MathNumberProperty = new SerializerTestCase(
+    'MathNumberProperty',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="math_number_property" id="id" x="42" y="42">' +
+    '<mutation divisor_input="true"></mutation>' +
+    '<field name="PROPERTY">DIVISIBLE_BY</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.MathOnList = new SerializerTestCase(
+    'MathOnList',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="math_on_list" id="id" x="42" y="42">' +
+    '<mutation op="MODE"></mutation>' +
+    '<field name="OP">MODE</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.TextJoin = new SerializerTestCase(
+    'TextJoin',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="text_join" id="id" x="42" y="42">' +
+    '<mutation items="10"></mutation>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.TextCharAt = new SerializerTestCase(
+    'TextCharAt',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="text_charAt" id="id" x="42" y="42">' +
+    '<mutation at="false"></mutation>' +
+    '<field name="WHERE">FIRST</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.TextGetSubstring = new SerializerTestCase(
+    'TextGetSubstring',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="text_getSubstring" id="id" x="42" y="42">' +
+    '<mutation at1="true" at2="false"></mutation>' +
+    '<field name="WHERE1">FROM_START</field>' +
+    '<field name="WHERE2">LAST</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.TextPromptExt = new SerializerTestCase(
+    'TextPromptExt',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="text_prompt_ext" id="id" x="42" y="42">' +
+    '<mutation type="NUMBER"></mutation>' +
+    '<field name="TYPE">NUMBER</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.TextPrompt = new SerializerTestCase(
+    'TextPrompt',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="text_prompt" id="id" x="42" y="42">' +
+    '<mutation type="NUMBER"></mutation>' +
+    '<field name="TYPE">NUMBER</field>' +
+    '<field name="TEXT"></field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.testCases = [
+  Serializer.Mutations.MathNumberProperty,
+  Serializer.Mutations.MathOnList,
+  Serializer.Mutations.TextJoin,
+  Serializer.Mutations.TextCharAt,
+  Serializer.Mutations.TextGetSubstring,
+  Serializer.Mutations.TextPromptExt,
+  Serializer.Mutations.TextPrompt,
+];
+
+Serializer.Mutations.ControlsIf = new SerializerTestSuite('ControlsIf');
+Serializer.Mutations.ControlsIf.NoMutation = new SerializerTestCase(
+    'NoMutation',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="controls_if" id="id******************" x="42" y="42"></block>' +
+    '</xml>');
+Serializer.Mutations.ControlsIf.ElseIfAndElse = new SerializerTestCase(
+    'ElseIfAndElse',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="controls_if" id="id******************" x="42" y="42">' +
+    '<mutation elseif="1" else="1"></mutation>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.ControlsIf.MultipleElseIfs = new SerializerTestCase(
+    'MultipleElseIfs',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="controls_if" id="id******************" x="42" y="42">' +
+    '<mutation elseif="3"></mutation>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.ControlsIf.MutlipleElseIfsAndElse = new SerializerTestCase(
+    'MutlipleElseIfsAndElse',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="controls_if" id="id******************" x="42" y="42">' +
+    '<mutation elseif="3" else="1"></mutation>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.ControlsIf.testCases = [
+  Serializer.Mutations.ControlsIf.NoMutation,
+  Serializer.Mutations.ControlsIf.ElseIfAndElse,
+  Serializer.Mutations.ControlsIf.MultipleElseIfs,
+  Serializer.Mutations.ControlsIf.MutlipleElseIfsAndElse,
+];
+
+Serializer.Mutations.ControlsIf.ElseIf = new SerializerTestSuite('ElseIf');
+Serializer.Mutations.ControlsIf.ElseIf.NoChild = new SerializerTestCase(
+    'NoChild',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="controls_if" id="id******************" x="42" y="42">' +
+    '<mutation elseif="1"></mutation>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.ControlsIf.ElseIf.Child = new SerializerTestCase(
+    'Child',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="controls_if" id="id******************" x="42" y="42">' +
+    '<mutation elseif="1"></mutation>' +
+    '<statement name="DO1">' +
+    '<block type="text_print" id="id2*****************"></block>' +
+    '</statement>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.ControlsIf.ElseIf.Shadow = new SerializerTestCase(
+    'Shadow',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="controls_if" id="id******************" x="42" y="42">' +
+    '<mutation elseif="1"></mutation>' +
+    '<statement name="DO1">' +
+    '<shadow type="text_print" id="id2*****************"></shadow>' +
+    '</statement>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.ControlsIf.ElseIf.OverwrittenShadow = new SerializerTestCase(
+    'OverwrittenShadow',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="controls_if" id="id******************" x="42" y="42">' +
+    '<mutation elseif="1"></mutation>' +
+    '<statement name="DO1">' +
+    '<shadow type="text_print" id="id2*****************"></shadow>' +
+    '<block type="text_print" id="id3*****************"></block>' +
+    '</statement>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.ControlsIf.ElseIf.testCases = [
+  Serializer.Mutations.ControlsIf.ElseIf.NoChild,
+  Serializer.Mutations.ControlsIf.ElseIf.Child,
+  Serializer.Mutations.ControlsIf.ElseIf.Shadow,
+  Serializer.Mutations.ControlsIf.ElseIf.OverwrittenShadow,
+];
+
+Serializer.Mutations.ControlsIf.Else = new SerializerTestSuite('Else');
+Serializer.Mutations.ControlsIf.Else.NoChild = new SerializerTestCase(
+    'NoChild',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="controls_if" id="id******************" x="42" y="42">' +
+    '<mutation else="1"></mutation>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.ControlsIf.Else.Child = new SerializerTestCase(
+    'Child',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="controls_if" id="id******************" x="42" y="42">' +
+    '<mutation else="1"></mutation>' +
+    '<statement name="ELSE">' +
+    '<block type="text_print" id="id2*****************"></block>' +
+    '</statement>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.ControlsIf.Else.Shadow = new SerializerTestCase(
+    'Shadow',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="controls_if" id="id******************" x="42" y="42">' +
+    '<mutation else="1"></mutation>' +
+    '<statement name="ELSE">' +
+    '<shadow type="text_print" id="id2*****************"></shadow>' +
+    '</statement>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.ControlsIf.Else.OverwrittenShadow = new SerializerTestCase(
+    'OverwrittenShadow',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="controls_if" id="id******************" x="42" y="42">' +
+    '<mutation else="1"></mutation>' +
+    '<statement name="ELSE">' +
+    '<shadow type="text_print" id="id2*****************"></shadow>' +
+    '<block type="text_print" id="id3*****************"></block>' +
+    '</statement>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.ControlsIf.Else.testCases = [
+  Serializer.Mutations.ControlsIf.Else.NoChild,
+  Serializer.Mutations.ControlsIf.Else.Child,
+  Serializer.Mutations.ControlsIf.Else.Shadow,
+  Serializer.Mutations.ControlsIf.Else.OverwrittenShadow,
+];
+
+Serializer.Mutations.ControlsIf.testSuites = [
+  Serializer.Mutations.ControlsIf.ElseIf,
+  Serializer.Mutations.ControlsIf.Else,
+];
+
+Serializer.Mutations.ListCreate = new SerializerTestSuite('ListCreate');
+Serializer.Mutations.ListCreate.Default = new SerializerTestCase(
+    'Default',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="lists_create_with" id="id******************" x="42" y="42">' +
+    '<mutation items="3"></mutation>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.ListCreate.ZeroInputs = new SerializerTestCase(
+    'ZeroInputs',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="lists_create_with" id="id******************" x="42" y="42">' +
+    '<mutation items="0"></mutation>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.ListCreate.MultipleInputs = new SerializerTestCase(
+    'MultipleInputs',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="lists_create_with" id="id******************" x="42" y="42">' +
+    '<mutation items="10"></mutation>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.ListCreate.testCases = [
+  Serializer.Mutations.ListCreate.Default,
+  Serializer.Mutations.ListCreate.ZeroInputs,
+  Serializer.Mutations.ListCreate.MultipleInputs,
+];
+
+Serializer.Mutations.ListCreate.OneInput = new SerializerTestSuite('OneIput');
+Serializer.Mutations.ListCreate.OneInput.NoChild = new SerializerTestCase(
+    'NoChild',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="lists_create_with" id="id******************" x="42" y="42">' +
+    '<mutation items="1"></mutation>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.ListCreate.OneInput.Child = new SerializerTestCase(
+    'Child',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="lists_create_with" id="id******************" x="42" y="42">' +
+    '<mutation items="1"></mutation>' +
+    '<value name="ADD0">' +
+    '<block type="math_random_float" id="id2*****************"></block>' +
+    '</value>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.ListCreate.OneInput.Shadow = new SerializerTestCase(
+    'Shadow',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="lists_create_with" id="id******************" x="42" y="42">' +
+    '<mutation items="1"></mutation>' +
+    '<value name="ADD0">' +
+    '<shadow type="math_random_float" id="id2*****************"></shadow>' +
+    '</value>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.ListCreate.OneInput.OverwrittenShadow =
+    new SerializerTestCase(
+        'OverwrittenShadow',
+        '<xml xmlns="https://developers.google.com/blockly/xml">' +
+        '<block type="lists_create_with" id="id******************" x="42" y="42">' +
+        '<mutation items="1"></mutation>' +
+        '<value name="ADD0">' +
+        '<shadow type="math_random_float" id="id2*****************"></shadow>' +
+        '<block type="math_random_float" id="id3*****************"></block>' +
+        '</value>' +
+        '</block>' +
+        '</xml>');
+Serializer.Mutations.ListCreate.OneInput.testCases = [
+  Serializer.Mutations.ListCreate.OneInput.NoChild,
+  Serializer.Mutations.ListCreate.OneInput.Child,
+  Serializer.Mutations.ListCreate.OneInput.Shadow,
+  Serializer.Mutations.ListCreate.OneInput.OverwrittenShadow,
+];
+
+Serializer.Mutations.ListCreate.testSuites = [
+  Serializer.Mutations.ListCreate.OneInput
+];
+
+Serializer.Mutations.Procedure = new SerializerTestSuite('Procedure');
+Serializer.Mutations.Procedure.NoMutation = new SerializerTestCase('NoMutation',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="procedures_defreturn" id="id******************" x="42" y="42">' +
+    '<field name="NAME">do something</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.Procedure.Variables = new SerializerTestCase('Variables',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="aaaaaaaaaaaaaaaaaaaa">x</variable>' +
+    '<variable id="bbbbbbbbbbbbbbbbbbbb">y</variable>' +
+    '<variable id="cccccccccccccccccccc">z</variable>' +
+    '</variables>' +
+    '<block type="procedures_defreturn" id="id******************" x="42" y="42">' +
+    '<mutation>' +
+    '<arg name="x" varid="aaaaaaaaaaaaaaaaaaaa"></arg>' +
+    '<arg name="y" varid="bbbbbbbbbbbbbbbbbbbb"></arg>' +
+    '<arg name="z" varid="cccccccccccccccccccc"></arg>' +
+    '</mutation>' +
+    '<field name="NAME">do something</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.Procedure.NoStatements = new SerializerTestCase(
+    'NoStatements',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="procedures_defreturn" id="id******************" x="42" y="42">' +
+    '<mutation statements="false"></mutation>' +
+    '<field name="NAME">do something</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.Procedure.testCases = [
+  Serializer.Mutations.Procedure.NoMutation,
+  Serializer.Mutations.Procedure.Variables,
+  Serializer.Mutations.Procedure.NoStatements,
+];
+
+Serializer.Mutations.Procedure.Names = new SerializerTestSuite('Names');
+Serializer.Mutations.Procedure.Names.Symbols = new SerializerTestCase('Symbols',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="procedures_defreturn" id="id******************" x="42" y="42">' +
+    '<field name="NAME">~`!@#$%^*()_+-={[}]|\\:;,.?/</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.Procedure.Names.EscapedSymbols = new SerializerTestCase(
+    'EscapedSymbols',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="procedures_defreturn" id="id******************" x="42" y="42">' +
+    '<field name="NAME">&amp;&lt;&gt;</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.Procedure.Names.SingleQuotes = new SerializerTestCase(
+    'SingleQuotes',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="procedures_defreturn" id="id******************" x="42" y="42">' +
+    '<field name="NAME">\'test\'</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.Procedure.Names.DoubleQuotes = new SerializerTestCase(
+    'DoubleQuotes',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="procedures_defreturn" id="id******************" x="42" y="42">' +
+    '<field name="NAME">"test"</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.Procedure.Names.Numbers = new SerializerTestCase(
+    'Numbers',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="procedures_defreturn" id="id******************" x="42" y="42">' +
+    '<field name="NAME">1234567890a123a123a</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.Procedure.Names.Emoji = new SerializerTestCase(
+    'Emoji',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="procedures_defreturn" id="id******************" x="42" y="42">' +
+    '<field name="NAME">😀👋🏿👋🏾👋🏽👋🏼👋🏻😀❤❤❤</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.Procedure.Names.Russian = new SerializerTestCase(
+    'Russian',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="procedures_defreturn" id="id******************" x="42" y="42">' +
+    '<field name="NAME">ты любопытный кот</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.Procedure.Names.Japanese = new SerializerTestCase(
+    'Japanese',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="procedures_defreturn" id="id******************" x="42" y="42">' +
+    '<field name="NAME">あなたは好奇心旺盛な猫です</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.Procedure.Names.Zalgo = new SerializerTestCase(
+    'Zalgo',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="procedures_defreturn" id="id******************" x="42" y="42">' +
+    '<field name="NAME">z̴̪͈̲̜͕̽̈̀͒͂̓̋̉̍a̸̧̧̜̻̘̤̫̱̲͎̞̻͆̋ļ̸̛̖̜̳͚̖͔̟̈́͂̉̀͑̑͑̎ǵ̸̫̳̽̐̃̑̚̕o̶͇̫͔̮̼̭͕̹̘̬͋̀͆̂̇̋͊̒̽</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.Procedure.Names.ControlChars = new SerializerTestCase(
+    'ControlChars',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="procedures_defreturn" id="id******************" x="42" y="42">' +
+    '<field name="NAME">&#x01;&#xa1;</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.Procedure.Names.testCases = [
+  Serializer.Mutations.Procedure.Names.Symbols,
+  Serializer.Mutations.Procedure.Names.EscapedSymbols,
+  Serializer.Mutations.Procedure.Names.SingleQuotes,
+  Serializer.Mutations.Procedure.Names.DoubleQuotes,
+  Serializer.Mutations.Procedure.Names.Numbers,
+  Serializer.Mutations.Procedure.Names.Emoji,
+  Serializer.Mutations.Procedure.Names.Russian,
+  Serializer.Mutations.Procedure.Names.Japanese,
+  Serializer.Mutations.Procedure.Names.Zalgo,
+  // TODO: Uncoment once #4945 is merged.
+  // Serializer.Mutations.Procedure.Names.ControlChars,
+];
+
+Serializer.Mutations.Procedure.testSuites = [
+  Serializer.Mutations.Procedure.Names,
+];
+
+Serializer.Mutations.testSuites = [
+  Serializer.Mutations.ControlsIf,
+  Serializer.Mutations.ListCreate,
+  Serializer.Mutations.Procedure,
+];
+
+Serializer.testSuites = [
+  Serializer.Attributes,
+  Serializer.Fields,
+  Serializer.Icons,
+  Serializer.Connections,
+  Serializer.Mutations,
+];
+
+var runSerializerTestSuite = (serializer, deserializer, testSuite) => {
+
+  const createTestFunction = function(test) {
+    return function() {
+      Blockly.Xml.domToWorkspace(
+          Blockly.Xml.textToDom(test.xml), this.workspace);
+      if (serializer && deserializer) {
+        // TODO: Add support for custom serializeers and deserializers.
+        //    Will be added once we have the JSO format working.
+      }
+      var newXml = Blockly.Xml.workspaceToDom(this.workspace);
+      chai.assert.equal(Blockly.Xml.domToText(newXml), test.xml);
+    };
+  };
+
+  // This takes in a suite, but we don't care.
+  const createTestCaseFunction = function(_) {
+    return createTestFunction;
+  };
+
+  let suiteCall = (testSuite.skip ? suite.skip : suite);
+  suiteCall = (testSuite.only ? suite.only : suiteCall);
+
+  suiteCall(testSuite.title, function() {
+    setup(function() {
+      sharedTestSetup.call(this);
+      this.workspace = new Blockly.Workspace();
+    });
+
+    teardown(function() {
+      workspaceTeardown.call(this, this.workspace);
+      sharedTestTeardown.call(this);
+    });
+
+    testHelpers.runTestSuites(
+        testSuite.testSuites, createTestCaseFunction);
+    testHelpers.runTestCases(testSuite.testCases, createTestFunction);
+  });
+};
+
+runSerializerTestSuite(null, null, Serializer);

From 2fa0e9801ab5a6b91afa6427938a87398a9ba26e Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Tue, 20 Jul 2021 13:28:30 -0700
Subject: [PATCH 762/833] Add JSO hooks for blocks and fields. (#5052)

* Add JSON serialiation hooks for fields

* Add checking for JSON hooks

* Fix other checks and move checks to function

* Remove error for both serialization hooks being defined

* Fixup comments and errors

* Add tests

* Add json hooks to block properties

* Cleanup

* Rip out fragile backwards compatibility
---
 core/block.js                  |  20 ++++-
 core/extensions.js             | 150 +++++++++++++++++++--------------
 core/field.js                  |  20 +++++
 tests/mocha/extensions_test.js |  51 +++++++++++
 4 files changed, 174 insertions(+), 67 deletions(-)

diff --git a/core/block.js b/core/block.js
index 6d524f670..d0d066ad9 100644
--- a/core/block.js
+++ b/core/block.js
@@ -332,18 +332,34 @@ Block.prototype.onchange;
 
 /**
  * An optional serialization method for defining how to serialize the
- * mutation state. This must be coupled with defining `domToMutation`.
+ * mutation state to XML. This must be coupled with defining `domToMutation`.
  * @type {?function(...):!Element}
  */
 Block.prototype.mutationToDom;
 
 /**
  * An optional deserialization method for defining how to deserialize the
- * mutation state. This must be coupled with defining `mutationToDom`.
+ * mutation state from XML. This must be coupled with defining `mutationToDom`.
  * @type {?function(!Element)}
  */
 Block.prototype.domToMutation;
 
+/**
+ * An optional serialization method for defining how to serialize the block's
+ * extra state (eg mutation state) to something JSON compatible. This must be
+ * coupled with defining `loadExtraState`.
+ * @type {?function(): *}
+ */
+Block.prototype.saveExtraState;
+
+/**
+ * An optional serialization method for defining how to deserialize the block's
+ * extra state (eg mutation state) from something JSON compatible. This must be
+ * coupled with defining `saveExtraState`.
+ * @type {?function(*)}
+ */
+Block.prototype.loadExtraState;
+
 /**
  * An optional property for suppressing adding STATEMENT_PREFIX and
  * STATEMENT_SUFFIX to generated code.
diff --git a/core/extensions.js b/core/extensions.js
index 42dc9d9f6..7c828135d 100644
--- a/core/extensions.js
+++ b/core/extensions.js
@@ -90,14 +90,11 @@ exports.registerMixin = registerMixin;
 const registerMutator = function(name, mixinObj, opt_helperFn, opt_blockList) {
   const errorPrefix = 'Error when registering mutator "' + name + '": ';
 
-  // Sanity check the mixin object before registering it.
-  checkHasFunction(errorPrefix, mixinObj.domToMutation, 'domToMutation');
-  checkHasFunction(errorPrefix, mixinObj.mutationToDom, 'mutationToDom');
-
-  const hasMutatorDialog = checkMutatorDialog(mixinObj, errorPrefix);
+  checkHasMutatorProperties(errorPrefix, mixinObj);
+  var hasMutatorDialog = checkMutatorDialog(mixinObj, errorPrefix);
 
   if (opt_helperFn && (typeof opt_helperFn != 'function')) {
-    throw Error('Extension "' + name + '" is not a function');
+    throw Error(errorPrefix + 'Extension "' + name + '" is not a function');
   }
 
   // Sanity checks passed.
@@ -159,7 +156,7 @@ const apply = function(name, block, isMutator) {
 
   if (isMutator) {
     const errorPrefix = 'Error after applying mutator "' + name + '": ';
-    checkBlockHasMutatorProperties(errorPrefix, block);
+    checkHasMutatorProperties(errorPrefix, block);
   } else {
     if (!mutatorPropertiesMatch(
             /** @type {!Array<Object>} */ (mutatorProperties), block)) {
@@ -171,25 +168,6 @@ const apply = function(name, block, isMutator) {
 };
 exports.apply = apply;
 
-/**
- * Check that the given value is a function.
- * @param {string} errorPrefix The string to prepend to any error message.
- * @param {*} func Function to check.
- * @param {string} propertyName Which property to check.
- * @throws {Error} if the property does not exist or is not a function.
- * @private
- */
-const checkHasFunction = function(errorPrefix, func, propertyName) {
-  if (!func) {
-    throw Error(
-        errorPrefix + 'missing required property "' + propertyName + '"');
-  } else if (typeof func != 'function') {
-    throw Error(
-        errorPrefix + '" required property "' + propertyName +
-        '" must be a function');
-  }
-};
-
 /**
  * Check that the given block does not have any of the four mutator properties
  * defined on it.  This function should be called before applying a mutator
@@ -198,7 +176,6 @@ const checkHasFunction = function(errorPrefix, func, propertyName) {
  *     messages.
  * @param {!Block} block The block to check.
  * @throws {Error} if any of the properties already exist on the block.
- * @private
  */
 const checkNoMutatorProperties = function(mutationName, block) {
   const properties = getMutatorProperties(block);
@@ -211,53 +188,94 @@ const checkNoMutatorProperties = function(mutationName, block) {
 };
 
 /**
- * Check that the given object has both or neither of the functions required
- * to have a mutator dialog.
- * These functions are 'compose' and 'decompose'.  If a block has one, it must
- * have both.
+ * Checks if the given object has both the 'mutationToDom' and 'domToMutation'
+ * functions.
  * @param {!Object} object The object to check.
  * @param {string} errorPrefix The string to prepend to any error message.
  * @return {boolean} True if the object has both functions.  False if it has
  *     neither function.
- * @throws {Error} if the object has only one of the functions.
- * @private
+ * @throws {Error} if the object has only one of the functions, or either is
+ *     not actually a function.
  */
-const checkMutatorDialog = function(object, errorPrefix) {
-  const hasCompose = object.compose !== undefined;
-  const hasDecompose = object.decompose !== undefined;
-
-  if (hasCompose && hasDecompose) {
-    if (typeof object.compose != 'function') {
-      throw Error(errorPrefix + 'compose must be a function.');
-    } else if (typeof object.decompose != 'function') {
-      throw Error(errorPrefix + 'decompose must be a function.');
-    }
-    return true;
-  } else if (!hasCompose && !hasDecompose) {
-    return false;
-  }
-  throw Error(
-      errorPrefix + 'Must have both or neither of "compose" and "decompose"');
+const checkXmlHooks = function(object, errorPrefix) {
+  return checkHasFunctionPair(
+      object, 'mutationToDom', 'domToMutation', errorPrefix);
 };
 
 /**
- * Check that a block has required mutator properties.  This should be called
- * after applying a mutation extension.
+ * Checks if the given object has both the 'saveExtraState' and 'loadExtraState'
+ * functions.
+ * @param {!Object} object The object to check.
  * @param {string} errorPrefix The string to prepend to any error message.
- * @param {!Block} block The block to inspect.
- * @private
+ * @return {boolean} True if the object has both functions.  False if it has
+ *     neither function.
+ * @throws {Error} if the object has only one of the functions, or either is
+ *     not actually a function.
  */
-const checkBlockHasMutatorProperties = function(errorPrefix, block) {
-  if (typeof block.domToMutation != 'function') {
-    throw Error(errorPrefix + 'Applying a mutator didn\'t add "domToMutation"');
-  }
-  if (typeof block.mutationToDom != 'function') {
-    throw Error(errorPrefix + 'Applying a mutator didn\'t add "mutationToDom"');
-  }
+const checkJsonHooks = function(object, errorPrefix) {
+  return checkHasFunctionPair(
+      object, 'saveExtraState', 'loadExtraState', errorPrefix);
+};
 
+/**
+ * Checks if the given object has both the 'compose' and 'decompose' functions.
+ * @param {!Object} object The object to check.
+ * @param {string} errorPrefix The string to prepend to any error message.
+ * @return {boolean} True if the object has both functions.  False if it has
+ *     neither function.
+ * @throws {Error} if the object has only one of the functions, or either is
+ *     not actually a function.
+ */
+const checkMutatorDialog = function(object, errorPrefix) {
+  return checkHasFunctionPair(object, 'compose', 'decompose', errorPrefix);
+};
+
+/**
+ * Checks that the given object has both or neither of the given functions, and
+ * that they are indeed functions.
+ * @param {!Object} object The object to check.
+ * @param {string} name1 The name of the first function in the pair.
+ * @param {string} name2 The name of the second function in the pair.
+ * @param {string} errorPrefix The string to prepend to any error message.
+ * @return {boolean} True if the object has both functions. False if it has
+ *     neither function.
+ * @throws {Error} If the object has only one of the functions, or either is
+ *     not actually a function.
+ */
+const checkHasFunctionPair =
+  function(object, name1, name2, errorPrefix) {
+    var has1 = object[name1] !== undefined;
+    var has2 = object[name2] !== undefined;
+  
+    if (has1 && has2) {
+      if (typeof object[name1] != 'function') {
+        throw Error(errorPrefix + name1 + ' must be a function.');
+      } else if (typeof object[name2] != 'function') {
+        throw Error(errorPrefix + name2 + ' must be a function.');
+      }
+      return true;
+    } else if (!has1 && !has2) {
+      return false;
+    }
+    throw Error(errorPrefix +
+      'Must have both or neither of "' + name1 + '" and "' + name2 + '"');
+  };
+
+/**
+ * Checks that the given object required mutator properties.
+ * @param {string} errorPrefix The string to prepend to any error message.
+ * @param {!Object} object The object to inspect.
+ */
+const checkHasMutatorProperties = function(errorPrefix, object) {
+  var hasXmlHooks = checkXmlHooks(object, errorPrefix);
+  var hasJsonHooks = checkJsonHooks(object, errorPrefix);
+  if (!hasXmlHooks && !hasJsonHooks) {
+    throw Error(errorPrefix +
+        'Mutations must contain either XML hooks, or JSON hooks, or both');
+  }
   // A block with a mutator isn't required to have a mutation dialog, but
   // it should still have both or neither of compose and decompose.
-  checkMutatorDialog(block, errorPrefix);
+  checkMutatorDialog(object, errorPrefix);
 };
 
 /**
@@ -265,7 +283,6 @@ const checkBlockHasMutatorProperties = function(errorPrefix, block) {
  * @param {!Block} block The block to inspect.
  * @return {!Array<Object>} A list with all of the defined properties, which
  *     should be functions, but may be anything other than undefined.
- * @private
  */
 const getMutatorProperties = function(block) {
   const result = [];
@@ -277,6 +294,12 @@ const getMutatorProperties = function(block) {
   if (block.mutationToDom !== undefined) {
     result.push(block.mutationToDom);
   }
+  if (block.saveExtraState !== undefined) {
+    result.push(block.saveExtraState);
+  }
+  if (block.loadExtraState !== undefined) {
+    result.push(block.loadExtraState);
+  }
   if (block.compose !== undefined) {
     result.push(block.compose);
   }
@@ -293,7 +316,6 @@ const getMutatorProperties = function(block) {
  * @param {!Array<Object>} oldProperties The old values to compare to.
  * @param {!Block} block The block to inspect for new values.
  * @return {boolean} True if the property lists match.
- * @private
  */
 const mutatorPropertiesMatch = function(oldProperties, block) {
   const newProperties = getMutatorProperties(block);
@@ -383,7 +405,6 @@ exports.buildTooltipForDropdown = buildTooltipForDropdown;
  * @param {!Block} block The block containing the dropdown
  * @param {string} dropdownName The name of the dropdown
  * @param {!Object<string, string>} lookupTable The string lookup table
- * @private
  */
 const checkDropdownOptionsInTable = function(block, dropdownName, lookupTable) {
   // Validate all dropdown options have values.
@@ -443,7 +464,6 @@ exports.buildTooltipWithFieldText = buildTooltipWithFieldText;
  * advantage of the fact that all other values from JSON are initialized before
  * extensions.
  * @this {Block}
- * @private
  */
 const extensionParentTooltip = function() {
   this.tooltipWhenNotConnected = this.tooltip;
diff --git a/core/field.js b/core/field.js
index 79496526e..041975150 100644
--- a/core/field.js
+++ b/core/field.js
@@ -432,6 +432,26 @@ Field.prototype.toXml = function(fieldElement) {
   return fieldElement;
 };
 
+/**
+ * Saves this fields value as something which can be serialized to JSON. Should
+ * only be called by the serialization system.
+ * @return {*} JSON serializable state.
+ * @package
+ */
+Field.prototype.saveState = function() {
+  return this.getValue();
+};
+
+/**
+ * Sets the field's state based on the given state value. Should only be called
+ * by the serialization system.
+ * @param {*} state The state we want to apply to the field.
+ * @package
+ */
+Field.prototype.loadState = function(state) {
+  this.setValue(state);
+};
+
 /**
  * Dispose of all DOM objects and events belonging to this editable field.
  * @package
diff --git a/tests/mocha/extensions_test.js b/tests/mocha/extensions_test.js
index 1e0645b2e..c8d789b97 100644
--- a/tests/mocha/extensions_test.js
+++ b/tests/mocha/extensions_test.js
@@ -453,6 +453,57 @@ suite('Extensions', function() {
         }, /mutationToDom/);
       });
 
+      test('No saveExtraState', function() {
+        this.extensionsCleanup_.push('mutator_test');
+        chai.assert.throws(function() {
+          Blockly.Extensions.registerMutator('mutator_test',
+              {
+                loadExtraState: function() {
+                  return 'loadExtraState';
+                },
+                compose: function() {
+                  return 'composeFn';
+                },
+                decompose: function() {
+                  return 'decomposeFn';
+                }
+              });
+        }, /saveExtraState/);
+      });
+
+      test('No loadExtraState', function() {
+        this.extensionsCleanup_.push('mutator_test');
+        chai.assert.throws(function() {
+          Blockly.Extensions.registerMutator('mutator_test',
+              {
+                saveExtraState: function() {
+                  return 'saveExtraState';
+                },
+                compose: function() {
+                  return 'composeFn';
+                },
+                decompose: function() {
+                  return 'decomposeFn';
+                }
+              });
+        }, /loadExtraState/);
+      });
+
+      test('No serialization hooks', function() {
+        this.extensionsCleanup_.push('mutator_test');
+        chai.assert.throws(function() {
+          Blockly.Extensions.registerMutator('mutator_test',
+              {
+                compose: function() {
+                  return 'composeFn';
+                },
+                decompose: function() {
+                  return 'decomposeFn';
+                }
+              });
+        }, 'Mutations must contain either XML hooks, or JSON hooks, or both');
+      });
+
       test('Has decompose but no compose', function() {
         this.extensionsCleanup_.push('mutator_test');
         chai.assert.throws(function() {

From ceeda333dc98828d89e0a0b054e3ffad494e419f Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Fri, 23 Jul 2021 15:03:11 -0700
Subject: [PATCH 763/833] Add serialization of basic block attributes to JSOs
 (#5053)

* Add basic attribute tests

* Add basic block serialization

* Add more attribute tests

* Change save to use options dictionary

* Add obeying save options

* Add test for data attribute

* Add saving data tag

* Move to ES6 syntax

* Fixup move to es6 syntax

* Declare module

* Format and lint

* Add docs

* Add returning null on insertion markers

* Fixup for move to module

* Switch to other function declarations

* Cleanup for finalized style

* Fix lint and types

* Export State def

* Switch disabled=true to enabled=false
---
 core/requires.js                      |   2 +
 core/serialization/blocks.js          | 114 ++++++++++++
 core/serialization/serialization.js   |  18 ++
 tests/deps.js                         |   4 +-
 tests/deps.mocha.js                   |   5 +-
 tests/mocha/index.html                |   1 +
 tests/mocha/jso_serialization_test.js | 241 ++++++++++++++++++++++++++
 7 files changed, 383 insertions(+), 2 deletions(-)
 create mode 100644 core/serialization/blocks.js
 create mode 100644 core/serialization/serialization.js
 create mode 100644 tests/mocha/jso_serialization_test.js

diff --git a/core/requires.js b/core/requires.js
index cc67f564a..fc6575fd5 100644
--- a/core/requires.js
+++ b/core/requires.js
@@ -81,3 +81,5 @@ goog.require('Blockly.zelos.Renderer');
 // Blockly Themes.
 // Classic is the default theme.
 goog.require('Blockly.Themes.Classic');
+
+goog.require('Blockly.serialization.blocks');
diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
new file mode 100644
index 000000000..cefdb3317
--- /dev/null
+++ b/core/serialization/blocks.js
@@ -0,0 +1,114 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Handles serializing blocks to plain JavaScript objects only
+ *     containing state.
+ */
+'use strict';
+
+goog.module('Blockly.serialization.blocks');
+goog.module.declareLegacyNamespace();
+
+
+// TODO: Remove this once lint is fixed.
+/* eslint-disable no-use-before-define */
+
+/**
+ * Represents the state of a given block.
+ * @typedef {{
+ *     type: string,
+ *     id: string,
+ *     x: (number|undefined),
+ *     y: (number|undefined),
+ *     collapsed: (boolean|undefined),
+ *     disabled: (boolean|undefined),
+ *     editable: (boolean|undefined),
+ *     deletable: (boolean|undefined),
+ *     movable: (boolean|undefined),
+ *     inline: (boolean|undefined),
+ *     data: (string|undefined),
+ * }}
+ */
+var State;
+exports.State = State;
+
+/**
+ * Returns the state of the given block as a plain JavaScript object.
+ * @param {!Blockly.Block} block The block to serialize.
+ * @param {{addCoordinates: (boolean|undefined)}=} param1
+ *     addCoordinates: If true the coordinates of the block are added to the
+ *       serialized state. False by default.
+ * @return {?State} The serialized state of the
+ *     block, or null if the block could not be serialied (eg it was an
+ *     insertion marker).
+ */
+const save = function(block, {addCoordinates = false} = {}) {
+  if (block.isInsertionMarker()) {
+    return null;
+  }
+
+  const state = {
+    'type': block.type,
+    'id': block.id
+  };
+
+  if (addCoordinates) {
+    addCoords(block, state);
+  }
+  addAttributes(block, state);
+
+  return state;
+};
+exports.save = save;
+
+/**
+ * Adds attributes to the given state object based on the state of the block.
+ * Eg collapsed, disabled, editable, etc.
+ * @param {!Blockly.Block} block The block to base the attributes on.
+ * @param {!State} state The state object to append
+ *     to.
+ */
+const addAttributes = function(block, state) {
+  if (block.isCollapsed()) {
+    state['collapsed'] = true;
+  }
+  if (!block.isEnabled()) {
+    state['enabled'] = false;
+  }
+  if (!block.isEditable()) {
+    state['editable'] = false;
+  }
+  if (!block.isDeletable() && !block.isShadow()) {
+    state['deletable'] = false;
+  }
+  if (!block.isMovable() && !block.isShadow()) {
+    state['movable'] = false;
+  }
+
+  if (block.inputsInline !== undefined &&
+      block.inputsInline !== block.inputsInlineDefault) {
+    state['inline'] = block.inputsInline;
+  }
+
+  // Data is a nullable string, so we don't need to worry about falsy values.
+  if (block.data) {
+    state['data'] = block.data;
+  }
+};
+
+/**
+ * Adds the coordinates of the given block to the given state object.
+ * @param {!Blockly.Block} block The block to base the coordinates on
+ * @param {!State} state The state object to append
+ *     to
+ */
+const addCoords = function(block, state) {
+  const workspace = block.workspace;
+  const xy = block.getRelativeToSurfaceXY();
+  state['x'] = Math.round(workspace.RTL ? workspace.getWidth() - xy.x : xy.x);
+  state['y'] = Math.round(xy.y);
+};
diff --git a/core/serialization/serialization.js b/core/serialization/serialization.js
new file mode 100644
index 000000000..c53a2eb64
--- /dev/null
+++ b/core/serialization/serialization.js
@@ -0,0 +1,18 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Contains top-level functions for serialization of the workspace
+ *     to JavaScript objects.
+ */
+'use strict';
+
+/**
+ * The top level namespace for JavaScript Object serialization.
+ * @namespace Blockly.serialization
+ */
+goog.module('Blockly.serialization');
+goog.module.declareLegacyNamespace();
diff --git a/tests/deps.js b/tests/deps.js
index 64284f839..bf85399f8 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -193,9 +193,11 @@ goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['B
 goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
+goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/serialization.js', ['Blockly.serialization'], [], {'module': 'goog'});
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 85a06ac1a..d0b49e0a5 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -193,9 +193,11 @@ goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['B
 goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
+goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/serialization.js', ['Blockly.serialization'], [], {'module': 'goog'});
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -328,6 +330,7 @@ goog.addDependency('../../tests/mocha/generator_test.js', ['Blockly.test.generat
 goog.addDependency('../../tests/mocha/gesture_test.js', ['Blockly.test.gesture'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/input_test.js', ['Blockly.test.input'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/insertion_marker_test.js', ['Blockly.test.insertionMarker'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/jso_serialization_test.js', ['Blockly.test.jsoSerialization'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/json_test.js', ['Blockly.test.json'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/keydown_test.js', ['Blockly.test.keydown'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/logic_ternary_test.js', ['Blockly.test.logicTernary'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/index.html b/tests/mocha/index.html
index 81ba4476e..ab34e2c8e 100644
--- a/tests/mocha/index.html
+++ b/tests/mocha/index.html
@@ -82,6 +82,7 @@
       goog.require('Blockly.test.gesture');
       goog.require('Blockly.test.input');
       goog.require('Blockly.test.insertionMarker');
+      goog.require('Blockly.test.jsoSerialization');
       goog.require('Blockly.test.json');
       goog.require('Blockly.test.keydown');
       goog.require('Blockly.test.logicTernary');
diff --git a/tests/mocha/jso_serialization_test.js b/tests/mocha/jso_serialization_test.js
new file mode 100644
index 000000000..2b24d170c
--- /dev/null
+++ b/tests/mocha/jso_serialization_test.js
@@ -0,0 +1,241 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+goog.module('Blockly.test.jsoSerialization');
+
+const {defineStackBlock, defineRowBlock, defineStatementBlock, createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+
+
+suite('JSO', function() {
+  setup(function() {
+    sharedTestSetup.call(this);
+    this.workspace = new Blockly.Workspace();
+
+    defineStackBlock();
+    defineRowBlock();
+    defineStatementBlock();
+
+    createGenUidStubWithReturns(new Array(10).fill().map((_, i) => 'id' + i));
+  });
+
+  teardown(function() {
+    workspaceTeardown.call(this, this.workspace);
+    sharedTestTeardown.call(this);
+  });
+
+  suite('Blocks', function() {
+    test('Null on insertionMarkers', function() {
+      const block = this.workspace.newBlock('row_block');
+      block.setInsertionMarker(true);
+      const jso = Blockly.serialization.blocks.save(block);
+      chai.assert.isNull(jso);
+    });
+
+    suite('Save Single Block', function() {
+
+      function assertProperty(obj, property, value) {
+        chai.assert.equal(obj[property], value);
+      }
+
+      function assertNoProperty(obj, property) {
+        assertProperty(obj, property, undefined);
+      }
+
+      test('Basic', function() {
+        const block = this.workspace.newBlock('row_block');
+        const jso = Blockly.serialization.blocks.save(block);
+        assertProperty(jso, 'type', 'row_block');
+        assertProperty(jso, 'id', 'id0');
+      });
+
+      suite('Attributes', function() {
+        suite('Collapsed', function() {
+          test('True', function() {
+            const block = this.workspace.newBlock('row_block');
+            block.setCollapsed(true);
+            const jso = Blockly.serialization.blocks.save(block);
+            assertProperty(jso, 'collapsed', true);
+          });
+
+          test('False', function() {
+            const block = this.workspace.newBlock('row_block');
+            block.setCollapsed(false);
+            const jso = Blockly.serialization.blocks.save(block);
+            assertNoProperty(jso, 'collapsed');
+          });
+        });
+
+        suite('Enabled', function() {
+          test('False', function() {
+            const block = this.workspace.newBlock('row_block');
+            block.setEnabled(false);
+            const jso = Blockly.serialization.blocks.save(block);
+            assertProperty(jso, 'enabled', false);
+          });
+  
+          test('True', function() {
+            const block = this.workspace.newBlock('row_block');
+            block.setEnabled(true);
+            const jso = Blockly.serialization.blocks.save(block);
+            assertNoProperty(jso, 'enabled');
+          });
+        });
+
+        suite('Deletable', function() {
+          test('False', function() {
+            const block = this.workspace.newBlock('row_block');
+            block.setDeletable(false);
+            const jso = Blockly.serialization.blocks.save(block);
+            assertProperty(jso, 'deletable', false);
+          });
+
+          test('True', function() {
+            const block = this.workspace.newBlock('row_block');
+            block.setDeletable(true);
+            const jso = Blockly.serialization.blocks.save(block);
+            assertNoProperty(jso, 'deletable');
+          });
+
+          test('False and Shadow', function() {
+            const block = this.workspace.newBlock('row_block');
+            block.setDeletable(false);
+            block.setShadow(true);
+            const jso = Blockly.serialization.blocks.save(block);
+            assertNoProperty(jso, 'deletable');
+          });
+        });
+
+        suite('Movable', function() {
+          test('False', function() {
+            const block = this.workspace.newBlock('row_block');
+            block.setMovable(false);
+            const jso = Blockly.serialization.blocks.save(block);
+            assertProperty(jso, 'movable', false);
+          });
+
+          test('True', function() {
+            const block = this.workspace.newBlock('row_block');
+            block.setMovable(true);
+            const jso = Blockly.serialization.blocks.save(block);
+            assertNoProperty(jso, 'movable');
+          });
+
+          test('False and Shadow', function() {
+            const block = this.workspace.newBlock('row_block');
+            block.setMovable(false);
+            block.setShadow(true);
+            const jso = Blockly.serialization.blocks.save(block);
+            assertNoProperty(jso, 'movable');
+          });
+        });
+
+        suite('Editable', function() {
+          test('False', function() {
+            const block = this.workspace.newBlock('row_block');
+            block.setEditable(false);
+            const jso = Blockly.serialization.blocks.save(block);
+            assertProperty(jso, 'editable', false);
+          });
+  
+          test('True', function() {
+            const block = this.workspace.newBlock('row_block');
+            block.setEditable(true);
+            const jso = Blockly.serialization.blocks.save(block);
+            assertNoProperty(jso, 'editable');
+          });
+        });
+
+        suite('Inline', function() {
+          test('True', function() {
+            const block = this.workspace.newBlock('statement_block');
+            block.setInputsInline(true);
+            const jso = Blockly.serialization.blocks.save(block);
+            assertProperty(jso, 'inline', true);
+          });
+
+          test('False', function() {
+            const block = this.workspace.newBlock('statement_block');
+            block.setInputsInline(false);
+            const jso = Blockly.serialization.blocks.save(block);
+            assertProperty(jso, 'inline', false);
+          });
+
+          test('undefined', function() {
+            const block = this.workspace.newBlock('statement_block');
+            const jso = Blockly.serialization.blocks.save(block);
+            assertNoProperty(jso, 'inline');
+          });
+
+          test('True, matching default', function() {
+            const block = this.workspace.newBlock('statement_block');
+            block.setInputsInline(true);
+            block.inputsInlineDefault = true;
+            const jso = Blockly.serialization.blocks.save(block);
+            assertNoProperty(jso, 'inline');
+          });
+
+          test('False, matching default', function() {
+            const block = this.workspace.newBlock('statement_block');
+            block.setInputsInline(false);
+            block.inputsInlineDefault = false;
+            const jso = Blockly.serialization.blocks.save(block);
+            assertNoProperty(jso, 'inline');
+          });
+        });
+
+        suite('Data', function() {
+          test('No data', function() {
+            const block = this.workspace.newBlock('row_block');
+            const jso = Blockly.serialization.blocks.save(block);
+            assertNoProperty(jso, 'data');
+          });
+
+          test('With data', function() {
+            const block = this.workspace.newBlock('row_block');
+            block.data = 'some data';
+            const jso = Blockly.serialization.blocks.save(block);
+            assertProperty(jso, 'data', 'some data');
+          });
+        });
+      });
+
+      suite('Coords', function() {
+        test('No coordinates', function() {
+          const block = this.workspace.newBlock('row_block');
+          const jso = Blockly.serialization.blocks.save(block);
+          assertNoProperty(jso, 'x');
+          assertNoProperty(jso, 'y');
+        });
+
+        test('Simple', function() {
+          const block = this.workspace.newBlock('row_block');
+          block.moveBy(42, 42);
+          const jso =
+              Blockly.serialization.blocks.save(block, {addCoordinates: true});
+          assertProperty(jso, 'x', 42);
+          assertProperty(jso, 'y', 42);
+        });
+
+        test('Negative', function() {
+          const block = this.workspace.newBlock('row_block');
+          block.moveBy(-42, -42);
+          const jso =
+              Blockly.serialization.blocks.save(block, {addCoordinates: true});
+          assertProperty(jso, 'x', -42);
+          assertProperty(jso, 'y', -42);
+        });
+
+        test('Zero', function() {
+          const block = this.workspace.newBlock('row_block');
+          const jso =
+              Blockly.serialization.blocks.save(block, {addCoordinates: true});
+          assertProperty(jso, 'x', 0);
+          assertProperty(jso, 'y', 0);
+        });
+      });
+    });
+  });
+});

From 780b6162ce002633276d222037d6ecee3c591a70 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Fri, 30 Jul 2021 08:06:38 -0700
Subject: [PATCH 764/833] Add serialization of mutators (#5054)

* Add tests for saving extra state

* Add serializing extra state

* Fix backwards compatibility

* Switch to other function declarations

* Handle null returns from hooks

* Remove backwards compatibility

* Remove XML require, and fix type

* Fix JSDoc formatting
---
 core/serialization/blocks.js          | 22 ++++++++++++---
 tests/mocha/jso_serialization_test.js | 40 ++++++++++++++++++++++++++-
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index cefdb3317..feb17cfef 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -31,6 +31,7 @@ goog.module.declareLegacyNamespace();
  *     movable: (boolean|undefined),
  *     inline: (boolean|undefined),
  *     data: (string|undefined),
+ *     extra-state: *
  * }}
  */
 var State;
@@ -60,6 +61,7 @@ const save = function(block, {addCoordinates = false} = {}) {
     addCoords(block, state);
   }
   addAttributes(block, state);
+  addExtraState(block, state);
 
   return state;
 };
@@ -69,8 +71,7 @@ exports.save = save;
  * Adds attributes to the given state object based on the state of the block.
  * Eg collapsed, disabled, editable, etc.
  * @param {!Blockly.Block} block The block to base the attributes on.
- * @param {!State} state The state object to append
- *     to.
+ * @param {!State} state The state object to append to.
  */
 const addAttributes = function(block, state) {
   if (block.isCollapsed()) {
@@ -103,8 +104,7 @@ const addAttributes = function(block, state) {
 /**
  * Adds the coordinates of the given block to the given state object.
  * @param {!Blockly.Block} block The block to base the coordinates on
- * @param {!State} state The state object to append
- *     to
+ * @param {!State} state The state object to append to
  */
 const addCoords = function(block, state) {
   const workspace = block.workspace;
@@ -112,3 +112,17 @@ const addCoords = function(block, state) {
   state['x'] = Math.round(workspace.RTL ? workspace.getWidth() - xy.x : xy.x);
   state['y'] = Math.round(xy.y);
 };
+
+/**
+ * Adds any extra state the block may provide to the given state object.
+ * @param {!Blockly.Block} block The block to serialize the extra state of.
+ * @param {!State} state The state object to append to.
+ */
+const addExtraState = function(block, state) {
+  if (block.saveExtraState) {
+    const extraState = block.saveExtraState();
+    if (extraState !== null) {
+      state['extraState'] = extraState;
+    }
+  }
+};
diff --git a/tests/mocha/jso_serialization_test.js b/tests/mocha/jso_serialization_test.js
index 2b24d170c..cb91c24f6 100644
--- a/tests/mocha/jso_serialization_test.js
+++ b/tests/mocha/jso_serialization_test.js
@@ -37,7 +37,7 @@ suite('JSO', function() {
     suite('Save Single Block', function() {
 
       function assertProperty(obj, property, value) {
-        chai.assert.equal(obj[property], value);
+        chai.assert.deepEqual(obj[property], value);
       }
 
       function assertNoProperty(obj, property) {
@@ -236,6 +236,44 @@ suite('JSO', function() {
           assertProperty(jso, 'y', 0);
         });
       });
+
+      // Mutators.
+      suite('Extra state', function() {
+        test('Simple value', function() {
+          const block = this.workspace.newBlock('row_block');
+          block.saveExtraState = function() {
+            return 'some extra state';
+          };
+          const jso = Blockly.serialization.blocks.save(block);
+          assertProperty(jso, 'extraState', 'some extra state');
+        });
+
+        test('Object', function() {
+          const block = this.workspace.newBlock('row_block');
+          block.saveExtraState = function() {
+            return {
+              'extra1': 'state1',
+              'extra2': 42,
+              'extra3': true,
+            };
+          };
+          const jso = Blockly.serialization.blocks.save(block);
+          assertProperty(jso, 'extraState', {
+            'extra1': 'state1',
+            'extra2': 42,
+            'extra3': true,
+          });
+        });
+
+        test('Array', function() {
+          const block = this.workspace.newBlock('row_block');
+          block.saveExtraState = function() {
+            return ['state1', 42, true];
+          };
+          const jso = Blockly.serialization.blocks.save(block);
+          assertProperty(jso, 'extraState', ['state1', 42, true]);
+        });
+      });
     });
   });
 });

From cc559cc55f8c3a9c6f975201e056a8345da95fbb Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Fri, 30 Jul 2021 08:38:00 -0700
Subject: [PATCH 765/833] Add serialization of field values (#5072)

* Add tests for field serialization

* Add field serialization

* Fixup types and tests
---
 core/serialization/blocks.js          |  38 +-
 tests/mocha/jso_serialization_test.js | 512 +++++++++++++++-----------
 2 files changed, 323 insertions(+), 227 deletions(-)

diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index feb17cfef..1ad9b57b4 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -13,6 +13,9 @@
 goog.module('Blockly.serialization.blocks');
 goog.module.declareLegacyNamespace();
 
+// eslint-disable-next-line no-unused-vars
+const Block = goog.requireType('Blockly.Block');
+
 
 // TODO: Remove this once lint is fixed.
 /* eslint-disable no-use-before-define */
@@ -31,7 +34,8 @@ goog.module.declareLegacyNamespace();
  *     movable: (boolean|undefined),
  *     inline: (boolean|undefined),
  *     data: (string|undefined),
- *     extra-state: *
+ *     extra-state: *,
+ *     fields: (Object<string, *>|undefined),
  * }}
  */
 var State;
@@ -39,7 +43,7 @@ exports.State = State;
 
 /**
  * Returns the state of the given block as a plain JavaScript object.
- * @param {!Blockly.Block} block The block to serialize.
+ * @param {!Block} block The block to serialize.
  * @param {{addCoordinates: (boolean|undefined)}=} param1
  *     addCoordinates: If true the coordinates of the block are added to the
  *       serialized state. False by default.
@@ -62,6 +66,7 @@ const save = function(block, {addCoordinates = false} = {}) {
   }
   addAttributes(block, state);
   addExtraState(block, state);
+  addFields(block, state);
 
   return state;
 };
@@ -70,7 +75,7 @@ exports.save = save;
 /**
  * Adds attributes to the given state object based on the state of the block.
  * Eg collapsed, disabled, editable, etc.
- * @param {!Blockly.Block} block The block to base the attributes on.
+ * @param {!Block} block The block to base the attributes on.
  * @param {!State} state The state object to append to.
  */
 const addAttributes = function(block, state) {
@@ -103,7 +108,7 @@ const addAttributes = function(block, state) {
 
 /**
  * Adds the coordinates of the given block to the given state object.
- * @param {!Blockly.Block} block The block to base the coordinates on
+ * @param {!Block} block The block to base the coordinates on
  * @param {!State} state The state object to append to
  */
 const addCoords = function(block, state) {
@@ -115,7 +120,7 @@ const addCoords = function(block, state) {
 
 /**
  * Adds any extra state the block may provide to the given state object.
- * @param {!Blockly.Block} block The block to serialize the extra state of.
+ * @param {!Block} block The block to serialize the extra state of.
  * @param {!State} state The state object to append to.
  */
 const addExtraState = function(block, state) {
@@ -126,3 +131,26 @@ const addExtraState = function(block, state) {
     }
   }
 };
+
+/**
+ * Adds the state of all of the fields on the block to the given state object.
+ * @param {!Block} block The block to serialize the field state of.
+ * @param {!State} state The state object to append to.
+ */
+const addFields = function(block, state) {
+  let hasFieldState = false;
+  let fields = Object.create(null);
+  for (let i = 0; i < block.inputList.length; i++) {
+    const input = block.inputList[i];
+    for (let j = 0; j < input.fieldRow.length; j++) {
+      const field = input.fieldRow[j];
+      if (field.isSerializable()) {
+        hasFieldState = true;
+        fields[field.name] = field.saveState();
+      }
+    }
+  }
+  if (hasFieldState) {
+    state['fields'] = fields;
+  }
+};
diff --git a/tests/mocha/jso_serialization_test.js b/tests/mocha/jso_serialization_test.js
index cb91c24f6..3b4635547 100644
--- a/tests/mocha/jso_serialization_test.js
+++ b/tests/mocha/jso_serialization_test.js
@@ -27,6 +27,14 @@ suite('JSO', function() {
   });
 
   suite('Blocks', function() {
+    function assertProperty(obj, property, value) {
+      chai.assert.deepEqual(obj[property], value);
+    }
+
+    function assertNoProperty(obj, property) {
+      assertProperty(obj, property, undefined);
+    }
+
     test('Null on insertionMarkers', function() {
       const block = this.workspace.newBlock('row_block');
       block.setInsertionMarker(true);
@@ -34,246 +42,306 @@ suite('JSO', function() {
       chai.assert.isNull(jso);
     });
 
-    suite('Save Single Block', function() {
+    test('Basic', function() {
+      const block = this.workspace.newBlock('row_block');
+      const jso = Blockly.serialization.blocks.save(block);
+      assertProperty(jso, 'type', 'row_block');
+      assertProperty(jso, 'id', 'id0');
+    });
 
-      function assertProperty(obj, property, value) {
-        chai.assert.deepEqual(obj[property], value);
-      }
+    suite('Attributes', function() {
+      suite('Collapsed', function() {
+        test('True', function() {
+          const block = this.workspace.newBlock('row_block');
+          block.setCollapsed(true);
+          const jso = Blockly.serialization.blocks.save(block);
+          assertProperty(jso, 'collapsed', true);
+        });
 
-      function assertNoProperty(obj, property) {
-        assertProperty(obj, property, undefined);
-      }
+        test('False', function() {
+          const block = this.workspace.newBlock('row_block');
+          block.setCollapsed(false);
+          const jso = Blockly.serialization.blocks.save(block);
+          assertNoProperty(jso, 'collapsed');
+        });
+      });
 
-      test('Basic', function() {
+      suite('Enabled', function() {
+        test('False', function() {
+          const block = this.workspace.newBlock('row_block');
+          block.setEnabled(false);
+          const jso = Blockly.serialization.blocks.save(block);
+          assertProperty(jso, 'enabled', false);
+        });
+
+        test('True', function() {
+          const block = this.workspace.newBlock('row_block');
+          block.setEnabled(true);
+          const jso = Blockly.serialization.blocks.save(block);
+          assertNoProperty(jso, 'enabled');
+        });
+      });
+
+      suite('Deletable', function() {
+        test('False', function() {
+          const block = this.workspace.newBlock('row_block');
+          block.setDeletable(false);
+          const jso = Blockly.serialization.blocks.save(block);
+          assertProperty(jso, 'deletable', false);
+        });
+
+        test('True', function() {
+          const block = this.workspace.newBlock('row_block');
+          block.setDeletable(true);
+          const jso = Blockly.serialization.blocks.save(block);
+          assertNoProperty(jso, 'deletable');
+        });
+
+        test('False and Shadow', function() {
+          const block = this.workspace.newBlock('row_block');
+          block.setDeletable(false);
+          block.setShadow(true);
+          const jso = Blockly.serialization.blocks.save(block);
+          assertNoProperty(jso, 'deletable');
+        });
+      });
+
+      suite('Movable', function() {
+        test('False', function() {
+          const block = this.workspace.newBlock('row_block');
+          block.setMovable(false);
+          const jso = Blockly.serialization.blocks.save(block);
+          assertProperty(jso, 'movable', false);
+        });
+
+        test('True', function() {
+          const block = this.workspace.newBlock('row_block');
+          block.setMovable(true);
+          const jso = Blockly.serialization.blocks.save(block);
+          assertNoProperty(jso, 'movable');
+        });
+
+        test('False and Shadow', function() {
+          const block = this.workspace.newBlock('row_block');
+          block.setMovable(false);
+          block.setShadow(true);
+          const jso = Blockly.serialization.blocks.save(block);
+          assertNoProperty(jso, 'movable');
+        });
+      });
+
+      suite('Editable', function() {
+        test('False', function() {
+          const block = this.workspace.newBlock('row_block');
+          block.setEditable(false);
+          const jso = Blockly.serialization.blocks.save(block);
+          assertProperty(jso, 'editable', false);
+        });
+
+        test('True', function() {
+          const block = this.workspace.newBlock('row_block');
+          block.setEditable(true);
+          const jso = Blockly.serialization.blocks.save(block);
+          assertNoProperty(jso, 'editable');
+        });
+      });
+
+      suite('Inline', function() {
+        test('True', function() {
+          const block = this.workspace.newBlock('statement_block');
+          block.setInputsInline(true);
+          const jso = Blockly.serialization.blocks.save(block);
+          assertProperty(jso, 'inline', true);
+        });
+
+        test('False', function() {
+          const block = this.workspace.newBlock('statement_block');
+          block.setInputsInline(false);
+          const jso = Blockly.serialization.blocks.save(block);
+          assertProperty(jso, 'inline', false);
+        });
+
+        test('undefined', function() {
+          const block = this.workspace.newBlock('statement_block');
+          const jso = Blockly.serialization.blocks.save(block);
+          assertNoProperty(jso, 'inline');
+        });
+
+        test('True, matching default', function() {
+          const block = this.workspace.newBlock('statement_block');
+          block.setInputsInline(true);
+          block.inputsInlineDefault = true;
+          const jso = Blockly.serialization.blocks.save(block);
+          assertNoProperty(jso, 'inline');
+        });
+
+        test('False, matching default', function() {
+          const block = this.workspace.newBlock('statement_block');
+          block.setInputsInline(false);
+          block.inputsInlineDefault = false;
+          const jso = Blockly.serialization.blocks.save(block);
+          assertNoProperty(jso, 'inline');
+        });
+      });
+
+      suite('Data', function() {
+        test('No data', function() {
+          const block = this.workspace.newBlock('row_block');
+          const jso = Blockly.serialization.blocks.save(block);
+          assertNoProperty(jso, 'data');
+        });
+
+        test('With data', function() {
+          const block = this.workspace.newBlock('row_block');
+          block.data = 'some data';
+          const jso = Blockly.serialization.blocks.save(block);
+          assertProperty(jso, 'data', 'some data');
+        });
+      });
+    });
+
+    suite('Coords', function() {
+      test('No coordinates', function() {
         const block = this.workspace.newBlock('row_block');
         const jso = Blockly.serialization.blocks.save(block);
-        assertProperty(jso, 'type', 'row_block');
-        assertProperty(jso, 'id', 'id0');
+        assertNoProperty(jso, 'x');
+        assertNoProperty(jso, 'y');
       });
 
-      suite('Attributes', function() {
-        suite('Collapsed', function() {
-          test('True', function() {
-            const block = this.workspace.newBlock('row_block');
-            block.setCollapsed(true);
-            const jso = Blockly.serialization.blocks.save(block);
-            assertProperty(jso, 'collapsed', true);
-          });
-
-          test('False', function() {
-            const block = this.workspace.newBlock('row_block');
-            block.setCollapsed(false);
-            const jso = Blockly.serialization.blocks.save(block);
-            assertNoProperty(jso, 'collapsed');
-          });
-        });
-
-        suite('Enabled', function() {
-          test('False', function() {
-            const block = this.workspace.newBlock('row_block');
-            block.setEnabled(false);
-            const jso = Blockly.serialization.blocks.save(block);
-            assertProperty(jso, 'enabled', false);
-          });
-  
-          test('True', function() {
-            const block = this.workspace.newBlock('row_block');
-            block.setEnabled(true);
-            const jso = Blockly.serialization.blocks.save(block);
-            assertNoProperty(jso, 'enabled');
-          });
-        });
-
-        suite('Deletable', function() {
-          test('False', function() {
-            const block = this.workspace.newBlock('row_block');
-            block.setDeletable(false);
-            const jso = Blockly.serialization.blocks.save(block);
-            assertProperty(jso, 'deletable', false);
-          });
-
-          test('True', function() {
-            const block = this.workspace.newBlock('row_block');
-            block.setDeletable(true);
-            const jso = Blockly.serialization.blocks.save(block);
-            assertNoProperty(jso, 'deletable');
-          });
-
-          test('False and Shadow', function() {
-            const block = this.workspace.newBlock('row_block');
-            block.setDeletable(false);
-            block.setShadow(true);
-            const jso = Blockly.serialization.blocks.save(block);
-            assertNoProperty(jso, 'deletable');
-          });
-        });
-
-        suite('Movable', function() {
-          test('False', function() {
-            const block = this.workspace.newBlock('row_block');
-            block.setMovable(false);
-            const jso = Blockly.serialization.blocks.save(block);
-            assertProperty(jso, 'movable', false);
-          });
-
-          test('True', function() {
-            const block = this.workspace.newBlock('row_block');
-            block.setMovable(true);
-            const jso = Blockly.serialization.blocks.save(block);
-            assertNoProperty(jso, 'movable');
-          });
-
-          test('False and Shadow', function() {
-            const block = this.workspace.newBlock('row_block');
-            block.setMovable(false);
-            block.setShadow(true);
-            const jso = Blockly.serialization.blocks.save(block);
-            assertNoProperty(jso, 'movable');
-          });
-        });
-
-        suite('Editable', function() {
-          test('False', function() {
-            const block = this.workspace.newBlock('row_block');
-            block.setEditable(false);
-            const jso = Blockly.serialization.blocks.save(block);
-            assertProperty(jso, 'editable', false);
-          });
-  
-          test('True', function() {
-            const block = this.workspace.newBlock('row_block');
-            block.setEditable(true);
-            const jso = Blockly.serialization.blocks.save(block);
-            assertNoProperty(jso, 'editable');
-          });
-        });
-
-        suite('Inline', function() {
-          test('True', function() {
-            const block = this.workspace.newBlock('statement_block');
-            block.setInputsInline(true);
-            const jso = Blockly.serialization.blocks.save(block);
-            assertProperty(jso, 'inline', true);
-          });
-
-          test('False', function() {
-            const block = this.workspace.newBlock('statement_block');
-            block.setInputsInline(false);
-            const jso = Blockly.serialization.blocks.save(block);
-            assertProperty(jso, 'inline', false);
-          });
-
-          test('undefined', function() {
-            const block = this.workspace.newBlock('statement_block');
-            const jso = Blockly.serialization.blocks.save(block);
-            assertNoProperty(jso, 'inline');
-          });
-
-          test('True, matching default', function() {
-            const block = this.workspace.newBlock('statement_block');
-            block.setInputsInline(true);
-            block.inputsInlineDefault = true;
-            const jso = Blockly.serialization.blocks.save(block);
-            assertNoProperty(jso, 'inline');
-          });
-
-          test('False, matching default', function() {
-            const block = this.workspace.newBlock('statement_block');
-            block.setInputsInline(false);
-            block.inputsInlineDefault = false;
-            const jso = Blockly.serialization.blocks.save(block);
-            assertNoProperty(jso, 'inline');
-          });
-        });
-
-        suite('Data', function() {
-          test('No data', function() {
-            const block = this.workspace.newBlock('row_block');
-            const jso = Blockly.serialization.blocks.save(block);
-            assertNoProperty(jso, 'data');
-          });
-
-          test('With data', function() {
-            const block = this.workspace.newBlock('row_block');
-            block.data = 'some data';
-            const jso = Blockly.serialization.blocks.save(block);
-            assertProperty(jso, 'data', 'some data');
-          });
-        });
+      test('Simple', function() {
+        const block = this.workspace.newBlock('row_block');
+        block.moveBy(42, 42);
+        const jso =
+            Blockly.serialization.blocks.save(block, {addCoordinates: true});
+        assertProperty(jso, 'x', 42);
+        assertProperty(jso, 'y', 42);
       });
 
-      suite('Coords', function() {
-        test('No coordinates', function() {
-          const block = this.workspace.newBlock('row_block');
-          const jso = Blockly.serialization.blocks.save(block);
-          assertNoProperty(jso, 'x');
-          assertNoProperty(jso, 'y');
-        });
-
-        test('Simple', function() {
-          const block = this.workspace.newBlock('row_block');
-          block.moveBy(42, 42);
-          const jso =
-              Blockly.serialization.blocks.save(block, {addCoordinates: true});
-          assertProperty(jso, 'x', 42);
-          assertProperty(jso, 'y', 42);
-        });
-
-        test('Negative', function() {
-          const block = this.workspace.newBlock('row_block');
-          block.moveBy(-42, -42);
-          const jso =
-              Blockly.serialization.blocks.save(block, {addCoordinates: true});
-          assertProperty(jso, 'x', -42);
-          assertProperty(jso, 'y', -42);
-        });
-
-        test('Zero', function() {
-          const block = this.workspace.newBlock('row_block');
-          const jso =
-              Blockly.serialization.blocks.save(block, {addCoordinates: true});
-          assertProperty(jso, 'x', 0);
-          assertProperty(jso, 'y', 0);
-        });
+      test('Negative', function() {
+        const block = this.workspace.newBlock('row_block');
+        block.moveBy(-42, -42);
+        const jso =
+            Blockly.serialization.blocks.save(block, {addCoordinates: true});
+        assertProperty(jso, 'x', -42);
+        assertProperty(jso, 'y', -42);
       });
 
-      // Mutators.
-      suite('Extra state', function() {
-        test('Simple value', function() {
-          const block = this.workspace.newBlock('row_block');
-          block.saveExtraState = function() {
-            return 'some extra state';
-          };
-          const jso = Blockly.serialization.blocks.save(block);
-          assertProperty(jso, 'extraState', 'some extra state');
-        });
+      test('Zero', function() {
+        const block = this.workspace.newBlock('row_block');
+        const jso =
+            Blockly.serialization.blocks.save(block, {addCoordinates: true});
+        assertProperty(jso, 'x', 0);
+        assertProperty(jso, 'y', 0);
+      });
+    });
 
-        test('Object', function() {
-          const block = this.workspace.newBlock('row_block');
-          block.saveExtraState = function() {
-            return {
-              'extra1': 'state1',
-              'extra2': 42,
-              'extra3': true,
-            };
-          };
-          const jso = Blockly.serialization.blocks.save(block);
-          assertProperty(jso, 'extraState', {
+    // Mutators.
+    suite('Extra state', function() {
+      test('Simple value', function() {
+        const block = this.workspace.newBlock('row_block');
+        block.saveExtraState = function() {
+          return 'some extra state';
+        };
+        const jso = Blockly.serialization.blocks.save(block);
+        assertProperty(jso, 'extraState', 'some extra state');
+      });
+
+      test('Object', function() {
+        const block = this.workspace.newBlock('row_block');
+        block.saveExtraState = function() {
+          return {
             'extra1': 'state1',
             'extra2': 42,
             'extra3': true,
-          });
-        });
-
-        test('Array', function() {
-          const block = this.workspace.newBlock('row_block');
-          block.saveExtraState = function() {
-            return ['state1', 42, true];
           };
-          const jso = Blockly.serialization.blocks.save(block);
-          assertProperty(jso, 'extraState', ['state1', 42, true]);
+        };
+        const jso = Blockly.serialization.blocks.save(block);
+        assertProperty(jso, 'extraState', {
+          'extra1': 'state1',
+          'extra2': 42,
+          'extra3': true,
         });
       });
+
+      test('Array', function() {
+        const block = this.workspace.newBlock('row_block');
+        block.saveExtraState = function() {
+          return ['state1', 42, true];
+        };
+        const jso = Blockly.serialization.blocks.save(block);
+        assertProperty(jso, 'extraState', ['state1', 42, true]);
+      });
+    });
+
+    suite('Fields', function() {
+      class StringStateField extends Blockly.Field {
+        constructor(value, validator = undefined, config = undefined) {
+          super(value, validator, config);
+          this.SERIALIZABLE = true;
+        }
+
+        saveState() {
+          return 'some state';
+        }
+      }
+
+      class ObjectStateField extends Blockly.Field {
+        constructor(value, validator = undefined, config = undefined) {
+          super(value, validator, config);
+          this.SERIALIZABLE = true;
+        }
+
+        saveState() {
+          return {
+            'prop1': 'state1',
+            'prop2': 42,
+            'prop3': true,
+          };
+        }
+      }
+
+      class ArrayStateField extends Blockly.Field {
+        constructor(value, validator = undefined, config = undefined) {
+          super(value, validator, config);
+          this.SERIALIZABLE = true;
+        }
+
+        saveState() {
+          return ['state1', 42, true];
+        }
+      }
+
+      class XmlStateField extends Blockly.Field {
+        constructor(value, validator = undefined, config = undefined) {
+          super(value, validator, config);
+          this.SERIALIZABLE = true;
+        }
+      }
+
+      test('Simple value', function() {
+        const block = this.workspace.newBlock('row_block');
+        block.getInput('INPUT').appendField(new StringStateField(''), 'FIELD');
+        const jso = Blockly.serialization.blocks.save(block);
+        assertProperty(jso, 'fields', {'FIELD': 'some state'});
+      });
+
+      test('Object', function() {
+        const block = this.workspace.newBlock('row_block');
+        block.getInput('INPUT').appendField(new ObjectStateField(''), 'FIELD');
+        const jso = Blockly.serialization.blocks.save(block);
+        assertProperty(jso, 'fields', {'FIELD': {
+          'prop1': 'state1',
+          'prop2': 42,
+          'prop3': true,
+        }});
+      });
+
+      test('Array', function() {
+        const block = this.workspace.newBlock('row_block');
+        block.getInput('INPUT').appendField(new ArrayStateField(''), 'FIELD');
+        const jso = Blockly.serialization.blocks.save(block);
+        assertProperty(jso, 'fields', {'FIELD': ['state1', 42, true]});
+      });
     });
   });
 });

From 8faa360b74b69fab23a0a421b407c6e50ebfffad Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Fri, 6 Aug 2021 06:54:54 -0700
Subject: [PATCH 766/833] feat: upgrade fields to use new JSO hooks (#5077)

* Upgrade field angle to use new serialization

* Upgrade field checkbox to use new serialization

* Upgrade field colour to use new serialization

* Upgrade field dropdown to use new serialization

* Upgrade serializable label field to use new serialization

* Upgrade field multiline input to use new serialization

* Upgrade field number to use new serialization

* Upgrade field text input to use new serialization

* Upgrade variable field to use new serialization

* Fix type casts

* Feedback from PR

* Switch to use getValue()
---
 core/field_angle.js                          | 22 ++++++++++-
 core/field_checkbox.js                       | 20 ++++++++++
 core/field_colour.js                         | 20 ++++++++++
 core/field_dropdown.js                       | 23 +++++++++++
 core/field_label_serializable.js             | 20 ++++++++++
 core/field_multilineinput.js                 | 20 ++++++++++
 core/field_number.js                         | 20 ++++++++++
 core/field_textinput.js                      | 20 ++++++++++
 core/field_variable.js                       | 22 +++++++++++
 tests/mocha/field_angle_test.js              | 33 +++++++++++++++-
 tests/mocha/field_checkbox_test.js           | 29 +++++++++++++-
 tests/mocha/field_colour_test.js             | 29 +++++++++++++-
 tests/mocha/field_dropdown_test.js           | 34 +++++++++++++++-
 tests/mocha/field_label_serializable_test.js | 25 +++++++++++-
 tests/mocha/field_multilineinput_test.js     | 29 +++++++++++++-
 tests/mocha/field_number_test.js             | 41 +++++++++++++++++++-
 tests/mocha/field_textinput_test.js          | 25 +++++++++++-
 tests/mocha/field_variable_test.js           | 31 ++++++++++++++-
 tests/mocha/serializer_test.js               |  8 ++++
 19 files changed, 460 insertions(+), 11 deletions(-)

diff --git a/core/field_angle.js b/core/field_angle.js
index 778ebe066..c4c292799 100644
--- a/core/field_angle.js
+++ b/core/field_angle.js
@@ -241,8 +241,6 @@ Blockly.FieldAngle.prototype.configure_ = function(config) {
   }
 };
 
-
-
 /**
  * Create the block UI for this field.
  * @package
@@ -256,6 +254,26 @@ Blockly.FieldAngle.prototype.initView = function() {
   this.textElement_.appendChild(this.symbol_);
 };
 
+/**
+ * Saves this field's value.
+ * @return {number} The angle value held by this field.
+ * @override
+ * @package
+ */
+Blockly.FieldAngle.prototype.saveState = function() {
+  return /** @type {number} */ (this.getValue());
+};
+
+/**
+ * Sets the field's value based on the given state.
+ * @param {*} state The state to apply to the angle field.
+ * @override
+ * @package
+ */
+Blockly.FieldAngle.prototype.loadState = function(state) {
+  this.setValue(state);
+};
+
 /**
  * Updates the graph when the field rerenders.
  * @protected
diff --git a/core/field_checkbox.js b/core/field_checkbox.js
index 67362fd63..274123995 100644
--- a/core/field_checkbox.js
+++ b/core/field_checkbox.js
@@ -102,6 +102,26 @@ FieldCheckbox.prototype.configure_ = function(config) {
   }
 };
 
+/**
+ * Saves this field's value.
+ * @return {boolean} The boolean value held by this field.
+ * @override
+ * @package
+ */
+FieldCheckbox.prototype.saveState = function() {
+  return /** @type {boolean} */ (this.getValueBoolean());
+};
+
+/**
+ * Sets the field's value based on the given state.
+ * @param {*} state The state to apply to the checkbox field.
+ * @override
+ * @package
+ */
+FieldCheckbox.prototype.loadState = function(state) {
+  this.setValue(state);
+};
+
 /**
  * Create the block UI for this checkbox.
  * @package
diff --git a/core/field_colour.js b/core/field_colour.js
index b05290460..a8ac41e8f 100644
--- a/core/field_colour.js
+++ b/core/field_colour.js
@@ -188,6 +188,26 @@ FieldColour.prototype.initView = function() {
   }
 };
 
+/**
+ * Saves this field's value.
+ * @return {string} The colour value held by this field.
+ * @override
+ * @package
+ */
+FieldColour.prototype.saveState = function() {
+  return /** @type {string} */ (this.getValue());
+};
+
+/**
+ * Sets the field's value based on the given state.
+ * @param {*} state The state to apply to the colour field.
+ * @override
+ * @package
+ */
+FieldColour.prototype.loadState = function(state) {
+  this.setValue(state);
+};
+
 /**
  * @override
  */
diff --git a/core/field_dropdown.js b/core/field_dropdown.js
index effd6a31d..0a1a1013a 100644
--- a/core/field_dropdown.js
+++ b/core/field_dropdown.js
@@ -170,6 +170,29 @@ FieldDropdown.prototype.fromXml = function(fieldElement) {
   this.setValue(fieldElement.textContent);
 };
 
+/**
+ * Saves this field's value.
+ * @return {string} The dropdown value held by this field.
+ * @override
+ * @package
+ */
+FieldDropdown.prototype.saveState = function() {
+  return /** @type {string} */ (this.getValue());
+};
+
+/**
+ * Sets the field's value based on the given state.
+ * @param {*} state The state to apply to the dropdown field.
+ * @override
+ * @package
+ */
+FieldDropdown.prototype.loadState = function(state) {
+  if (this.isOptionListDynamic()) {
+    this.getOptions(false);
+  }
+  this.setValue(state);
+};
+
 /**
  * Serializable fields are saved by the XML renderer, non-serializable fields
  * are not. Editable fields should also be serializable.
diff --git a/core/field_label_serializable.js b/core/field_label_serializable.js
index dee9da1ef..df2119c15 100644
--- a/core/field_label_serializable.js
+++ b/core/field_label_serializable.js
@@ -68,6 +68,26 @@ FieldLabelSerializable.prototype.EDITABLE = false;
  */
 FieldLabelSerializable.prototype.SERIALIZABLE = true;
 
+/**
+ * Saves this field's value.
+ * @return {string} The text value held by this field.
+ * @override
+ * @package
+ */
+FieldLabelSerializable.prototype.saveState = function() {
+  return /** @type {string} */ (this.getValue());
+};
+
+/**
+ * Sets the field's value based on the given state.
+ * @param {*} state The state to apply to the label field.
+ * @override
+ * @package
+ */
+FieldLabelSerializable.prototype.loadState = function(state) {
+  this.setValue(state);
+};
+
 fieldRegistry.register('field_label_serializable', FieldLabelSerializable);
 
 exports = FieldLabelSerializable;
diff --git a/core/field_multilineinput.js b/core/field_multilineinput.js
index 31df9a6fc..c72f9983d 100644
--- a/core/field_multilineinput.js
+++ b/core/field_multilineinput.js
@@ -122,6 +122,26 @@ FieldMultilineInput.prototype.fromXml = function(fieldElement) {
   this.setValue(fieldElement.textContent.replace(/&#10;/g, '\n'));
 };
 
+/**
+ * Saves this field's value.
+ * @return {string} The text value held by this field.
+ * @override
+ * @package
+ */
+FieldMultilineInput.prototype.saveState = function() {
+  return /** @type {string} */ (this.getValue());
+};
+
+/**
+ * Sets the field's value based on the given state.
+ * @param {*} state The state to apply to the multiline input field.
+ * @override
+ * @package
+ */
+FieldMultilineInput.prototype.loadState = function(state) {
+  this.setValue(state);
+};
+
 /**
  * Create the block UI for this field.
  * @package
diff --git a/core/field_number.js b/core/field_number.js
index 4ed5ac5aa..50cbc7fe7 100644
--- a/core/field_number.js
+++ b/core/field_number.js
@@ -118,6 +118,26 @@ FieldNumber.prototype.configure_ = function(config) {
   this.setPrecisionInternal_(config['precision']);
 };
 
+/**
+ * Saves this field's value.
+ * @return {number} The number value held by this field.
+ * @override
+ * @package
+ */
+FieldNumber.prototype.saveState = function() {
+  return /** @type {number} */ (this.getValue());
+};
+
+/**
+ * Sets the field's value based on the given state.
+ * @param {*} state The state to apply to the nuber field.
+ * @override
+ * @package
+ */
+FieldNumber.prototype.loadState = function(state) {
+  this.setValue(state);
+};
+
 /**
  * Set the maximum, minimum and precision constraints on this field.
  * Any of these properties may be undefined or NaN to be disabled.
diff --git a/core/field_textinput.js b/core/field_textinput.js
index 789bc0a96..e07ac22e4 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -182,6 +182,26 @@ FieldTextInput.prototype.initView = function() {
   this.createTextElement_();
 };
 
+/**
+ * Saves this field's value.
+ * @return {*} The text value held by this field.
+ * @override
+ * @package
+ */
+FieldTextInput.prototype.saveState = function() {
+  return this.getValue();
+};
+
+/**
+ * Sets the field's value based on the given state.
+ * @param {*} state The state to apply to the text input field.
+ * @override
+ * @package
+ */
+FieldTextInput.prototype.loadState = function(state) {
+  this.setValue(state);
+};
+
 /**
  * Ensure that the input value casts to a valid string.
  * @param {*=} opt_newValue The input value.
diff --git a/core/field_variable.js b/core/field_variable.js
index e98db6f86..eb67b0bf9 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -197,6 +197,28 @@ FieldVariable.prototype.toXml = function(fieldElement) {
   return fieldElement;
 };
 
+/**
+ * Saves this field's value.
+ * @return {string} The id of the variable referenced by this field.
+ * @override
+ * @package
+ */
+FieldVariable.prototype.saveState = function() {
+  // Make sure the variable is initialized.
+  this.initModel();
+  return this.variable_.getId();
+};
+
+/**
+ * Sets the field's value based on the given state.
+ * @param {*} id The id of the variable to assign to this variable field.
+ * @override
+ * @package
+ */
+FieldVariable.prototype.loadState = function(id) {
+  this.setValue(id);
+};
+
 /**
  * Attach this field to a block.
  * @param {!Block} block The block containing this field.
diff --git a/tests/mocha/field_angle_test.js b/tests/mocha/field_angle_test.js
index 0ff4c4d15..7ec50fade 100644
--- a/tests/mocha/field_angle_test.js
+++ b/tests/mocha/field_angle_test.js
@@ -6,7 +6,7 @@
 
 goog.module('Blockly.test.fieldAngle');
 
-const {createTestBlock, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+const {createTestBlock, defineRowBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
 
 
 suite('Angle Fields', function() {
@@ -315,4 +315,35 @@ suite('Angle Fields', function() {
       });
     });
   });
+
+  suite('Serialization', function() {
+    setup(function() {
+      this.workspace = new Blockly.Workspace();
+      defineRowBlock();
+      
+      this.assertValue = (value) => {
+        const block = this.workspace.newBlock('row_block');
+        const field = new Blockly.FieldAngle(value);
+        block.getInput('INPUT').appendField(field, 'ANGLE');
+        const jso = Blockly.serialization.blocks.save(block);
+        chai.assert.deepEqual(jso['fields'], {'ANGLE': value});
+      };
+    });
+
+    teardown(function() {
+      workspaceTeardown.call(this, this.workspace);
+    });
+
+    test('Simple', function() {
+      this.assertValue(90);
+    });
+
+    test('Max precision', function() {
+      this.assertValue(1.000000000000001);
+    });
+
+    test('Smallest number', function() {
+      this.assertValue(5e-324);
+    });
+  });
 });
diff --git a/tests/mocha/field_checkbox_test.js b/tests/mocha/field_checkbox_test.js
index e8478fac3..379c9e389 100644
--- a/tests/mocha/field_checkbox_test.js
+++ b/tests/mocha/field_checkbox_test.js
@@ -6,7 +6,7 @@
 
 goog.module('Blockly.test.fieldCheckbox');
 
-const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+const {defineRowBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
 
 
 suite('Checkbox Fields', function() {
@@ -209,4 +209,31 @@ suite('Checkbox Fields', function() {
       });
     });
   });
+
+  suite('Serialization', function() {
+    setup(function() {
+      this.workspace = new Blockly.Workspace();
+      defineRowBlock();
+      
+      this.assertValue = (value) => {
+        const block = this.workspace.newBlock('row_block');
+        const field = new Blockly.FieldCheckbox(value);
+        block.getInput('INPUT').appendField(field, 'CHECK');
+        const jso = Blockly.serialization.blocks.save(block);
+        chai.assert.deepEqual(jso['fields'], {'CHECK': value});
+      };
+    });
+
+    teardown(function() {
+      workspaceTeardown.call(this, this.workspace);
+    });
+
+    test('True', function() {
+      this.assertValue(true);
+    });
+
+    test('False', function() {
+      this.assertValue(false);
+    });
+  });
 });
diff --git a/tests/mocha/field_colour_test.js b/tests/mocha/field_colour_test.js
index 883e7d388..016d96185 100644
--- a/tests/mocha/field_colour_test.js
+++ b/tests/mocha/field_colour_test.js
@@ -6,7 +6,7 @@
 
 goog.module('Blockly.test.fieldColour');
 
-const {createTestBlock, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+const {createTestBlock, defineRowBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
 
 
 suite('Colour Fields', function() {
@@ -282,4 +282,31 @@ suite('Colour Fields', function() {
       });
     });
   });
+
+  suite('Serialization', function() {
+    setup(function() {
+      this.workspace = new Blockly.Workspace();
+      defineRowBlock();
+      
+      this.assertValue = (value) => {
+        const block = this.workspace.newBlock('row_block');
+        const field = new Blockly.FieldColour(value);
+        block.getInput('INPUT').appendField(field, 'COLOUR');
+        const jso = Blockly.serialization.blocks.save(block);
+        chai.assert.deepEqual(jso['fields'], {'COLOUR': value});
+      };
+    });
+
+    teardown(function() {
+      workspaceTeardown.call(this, this.workspace);
+    });
+
+    test('Three char', function() {
+      this.assertValue('#001122');
+    });
+
+    test('Six char', function() {
+      this.assertValue('#012345');
+    });
+  });
 });
diff --git a/tests/mocha/field_dropdown_test.js b/tests/mocha/field_dropdown_test.js
index 2923e8830..2f3e782bb 100644
--- a/tests/mocha/field_dropdown_test.js
+++ b/tests/mocha/field_dropdown_test.js
@@ -6,7 +6,7 @@
 
 goog.module('Blockly.test.fieldDropdown');
 
-const {createTestBlock, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+const {createTestBlock, defineRowBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
 
 
 suite('Dropdown Fields', function() {
@@ -157,4 +157,36 @@ suite('Dropdown Fields', function() {
       });
     });
   });
+
+  suite('Serialization', function() {
+    setup(function() {
+      this.workspace = new Blockly.Workspace();
+      defineRowBlock();
+
+      
+      this.assertValue = (value, field) => {
+        const block = this.workspace.newBlock('row_block');
+        field.setValue(value);
+        block.getInput('INPUT').appendField(field, 'DROPDOWN');
+        const jso = Blockly.serialization.blocks.save(block);
+        chai.assert.deepEqual(jso['fields'], {'DROPDOWN': value});
+      };
+    });
+
+    teardown(function() {
+      workspaceTeardown.call(this, this.workspace);
+    });
+
+    test('Simple', function() {
+      const field = new Blockly.FieldDropdown(
+          [['apple', 'A'], ['ball', 'B'], ['carrot', 'C']]);
+      this.assertValue('C', field);
+    });
+
+    test('Dynamic', function() {
+      const field = new Blockly.FieldDropdown(
+          () => [['apple', 'A'], ['ball', 'B'], ['carrot', 'C']]);
+      this.assertValue('C', field);
+    });
+  });
 });
diff --git a/tests/mocha/field_label_serializable_test.js b/tests/mocha/field_label_serializable_test.js
index 99631a38d..0dc769f41 100644
--- a/tests/mocha/field_label_serializable_test.js
+++ b/tests/mocha/field_label_serializable_test.js
@@ -6,7 +6,7 @@
 
 goog.module('Blockly.test.fieldLabelSerialization');
 
-const {createTestBlock, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+const {createTestBlock, defineRowBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
 
 
 suite('Label Serializable Fields', function() {
@@ -186,4 +186,27 @@ suite('Label Serializable Fields', function() {
       });
     });
   });
+
+  suite('Serialization', function() {
+    setup(function() {
+      this.workspace = new Blockly.Workspace();
+      defineRowBlock();
+      
+      this.assertValue = (value) => {
+        const block = this.workspace.newBlock('row_block');
+        const field = new Blockly.FieldLabelSerializable(value);
+        block.getInput('INPUT').appendField(field, 'LABEL');
+        const jso = Blockly.serialization.blocks.save(block);
+        chai.assert.deepEqual(jso['fields'], {'LABEL': value});
+      };
+    });
+
+    teardown(function() {
+      workspaceTeardown.call(this, this.workspace);
+    });
+
+    test('Simple', function() {
+      this.assertValue('test label');
+    });
+  });
 });
diff --git a/tests/mocha/field_multilineinput_test.js b/tests/mocha/field_multilineinput_test.js
index 7180b493b..51426c694 100644
--- a/tests/mocha/field_multilineinput_test.js
+++ b/tests/mocha/field_multilineinput_test.js
@@ -6,7 +6,7 @@
 
 goog.module('Blockly.test.fieldMultiline');
 
-const {createTestBlock, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+const {createTestBlock, defineRowBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
 
 
 suite('Multiline Input Fields', function() {
@@ -158,4 +158,31 @@ suite('Multiline Input Fields', function() {
     ];
     testHelpers.runCodeGenerationTestSuites(testSuites);
   });
+
+  suite('Serialization', function() {
+    setup(function() {
+      this.workspace = new Blockly.Workspace();
+      defineRowBlock();
+      
+      this.assertValue = (value) => {
+        const block = this.workspace.newBlock('row_block');
+        const field = new Blockly.FieldMultilineInput(value);
+        block.getInput('INPUT').appendField(field, 'MULTILINE');
+        const jso = Blockly.serialization.blocks.save(block);
+        chai.assert.deepEqual(jso['fields'], {'MULTILINE': value});
+      };
+    });
+
+    teardown(function() {
+      workspaceTeardown.call(this, this.workspace);
+    });
+
+    test('Single line', function() {
+      this.assertValue('this is a single line');
+    });
+
+    test('Multiple lines', function() {
+      this.assertValue('this\nis\n  multiple\n    lines');
+    });
+  });
 });
diff --git a/tests/mocha/field_number_test.js b/tests/mocha/field_number_test.js
index 2cb5e62d1..598e482ca 100644
--- a/tests/mocha/field_number_test.js
+++ b/tests/mocha/field_number_test.js
@@ -6,7 +6,7 @@
 
 goog.module('Blockly.test.fieldNumber');
 
-const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+const {defineRowBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
 
 
 suite('Number Fields', function() {
@@ -337,4 +337,43 @@ suite('Number Fields', function() {
       });
     });
   });
+
+  suite('Serialization', function() {
+    setup(function() {
+      this.workspace = new Blockly.Workspace();
+      defineRowBlock();
+      
+      this.assertValue = (value) => {
+        const block = this.workspace.newBlock('row_block');
+        const field = new Blockly.FieldNumber(value);
+        block.getInput('INPUT').appendField(field, 'NUMBER');
+        const jso = Blockly.serialization.blocks.save(block);
+        chai.assert.deepEqual(jso['fields'], {'NUMBER': value});
+      };
+    });
+
+    teardown(function() {
+      workspaceTeardown.call(this, this.workspace);
+    });
+
+    test('Simple', function() {
+      this.assertValue(10);
+    });
+
+    test('Max precision small', function() {
+      this.assertValue(1.000000000000001);
+    });
+
+    test('Max precision large', function() {
+      this.assertValue(1000000000000001);
+    });
+
+    test('Smallest', function() {
+      this.assertValue(5e-324);
+    });
+
+    test('Largest', function() {
+      this.assertValue(1.7976931348623157e+308);
+    });
+  });
 });
diff --git a/tests/mocha/field_textinput_test.js b/tests/mocha/field_textinput_test.js
index bbb4dd88f..496f1ce6f 100644
--- a/tests/mocha/field_textinput_test.js
+++ b/tests/mocha/field_textinput_test.js
@@ -6,7 +6,7 @@
 
 goog.module('Blockly.test.fieldTextInput');
 
-const {createTestBlock, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+const {createTestBlock, defineRowBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
 
 
 suite('Text Input Fields', function() {
@@ -220,4 +220,27 @@ suite('Text Input Fields', function() {
       });
     });
   });
+
+  suite('Serialization', function() {
+    setup(function() {
+      this.workspace = new Blockly.Workspace();
+      defineRowBlock();
+      
+      this.assertValue = (value) => {
+        const block = this.workspace.newBlock('row_block');
+        const field = new Blockly.FieldTextInput(value);
+        block.getInput('INPUT').appendField(field, 'TEXT');
+        const jso = Blockly.serialization.blocks.save(block);
+        chai.assert.deepEqual(jso['fields'], {'TEXT': value});
+      };
+    });
+
+    teardown(function() {
+      workspaceTeardown.call(this, this.workspace);
+    });
+
+    test('Simple', function() {
+      this.assertValue('test text');
+    });
+  });
 });
diff --git a/tests/mocha/field_variable_test.js b/tests/mocha/field_variable_test.js
index 06a0912c2..d12188f9a 100644
--- a/tests/mocha/field_variable_test.js
+++ b/tests/mocha/field_variable_test.js
@@ -6,7 +6,7 @@
 
 goog.module('Blockly.test.fieldVariable');
 
-const {createGenUidStubWithReturns, createTestBlock, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+const {createGenUidStubWithReturns, createTestBlock, defineRowBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
 
 
 suite('Variable Fields', function() {
@@ -382,4 +382,33 @@ suite('Variable Fields', function() {
       chai.assert.equal(this.variableField.getValue(), 'id2');
     });
   });
+
+  suite('Serialization', function() {
+    setup(function() {
+      this.workspace = new Blockly.Workspace();
+      defineRowBlock();
+      createGenUidStubWithReturns(new Array(10).fill().map((_, i) => 'id' + i));
+    });
+
+    teardown(function() {
+      workspaceTeardown.call(this, this.workspace);
+    });
+
+    test('Untyped', function() {
+      const block = this.workspace.newBlock('row_block');
+      const field = new Blockly.FieldVariable('x');
+      block.getInput('INPUT').appendField(field, 'VAR');
+      const jso = Blockly.serialization.blocks.save(block);
+      chai.assert.deepEqual(jso['fields'], {'VAR': 'id2'});
+    });
+
+    test('Typed', function() {
+      const block = this.workspace.newBlock('row_block');
+      const field =
+          new Blockly.FieldVariable('x', undefined, undefined, ['String']);
+      block.getInput('INPUT').appendField(field, 'VAR');
+      const jso = Blockly.serialization.blocks.save(block);
+      chai.assert.deepEqual(jso['fields'], {'VAR': 'id2'});
+    });
+  });
 });
diff --git a/tests/mocha/serializer_test.js b/tests/mocha/serializer_test.js
index d1109a26b..0a5c77bbd 100644
--- a/tests/mocha/serializer_test.js
+++ b/tests/mocha/serializer_test.js
@@ -280,9 +280,17 @@ Serializer.Fields.Dropdown.NotDefault = new SerializerTestCase('NotDefault',
     '<field name="FIELDNAME">ITEM32</field>' +
     '</block>' +
     '</xml>');
+Serializer.Fields.Dropdown.Dynamic = new SerializerTestCase(
+    'Dynamic',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="test_dropdowns_dynamic_random" id="id******************" x="42" y="42">' +
+    '<field name="OPTIONS">0</field>' +
+    '</block>' +
+    '</xml>');
 Serializer.Fields.Dropdown.testCases = [
   Serializer.Fields.Dropdown.Default,
   Serializer.Fields.Dropdown.NotDefault,
+  Serializer.Fields.Dropdown.Dynamic,
 ];
 
 

From 56d3cb6c8fed45af7b08e4512fe870158e7f2eb7 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Fri, 6 Aug 2021 07:55:04 -0700
Subject: [PATCH 767/833] feat: add serialization of child blocks (#5120)

* Add tests for serializing connected blocks

* Add serialization of child blocks

* Add tests for not serializing children

* Add options for not serializing children

* Fix types

* Change addNextBlocks to default to true

* Cleanup

* Fix types
---
 core/serialization/blocks.js          | 125 +++++++++--
 tests/deps.js                         |   2 +-
 tests/mocha/jso_serialization_test.js | 290 ++++++++++++++++++++++++++
 3 files changed, 404 insertions(+), 13 deletions(-)

diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index 1ad9b57b4..4ab79a3a4 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -15,11 +15,25 @@ goog.module.declareLegacyNamespace();
 
 // eslint-disable-next-line no-unused-vars
 const Block = goog.requireType('Blockly.Block');
+// eslint-disable-next-line no-unused-vars
+const Connection = goog.requireType('Blockly.Connection');
+const Xml = goog.require('Blockly.Xml');
+const inputTypes = goog.require('Blockly.inputTypes');
 
 
 // TODO: Remove this once lint is fixed.
 /* eslint-disable no-use-before-define */
 
+/**
+ * Represents the state of a connection.
+ * @typedef {{
+ *   shadow: (!State|undefined),
+ *   block: (!State|undefined)
+ * }}
+ */
+var ConnectionState;
+exports.ConnectionState = ConnectionState;
+
 /**
  * Represents the state of a given block.
  * @typedef {{
@@ -35,7 +49,9 @@ const Block = goog.requireType('Blockly.Block');
  *     inline: (boolean|undefined),
  *     data: (string|undefined),
  *     extra-state: *,
- *     fields: (Object<string, *>|undefined),
+ *     fields: (!Object<string, *>|undefined),
+ *     inputs: (!Object<string, !ConnectionState>|undefined),
+ *     next: (!ConnectionState|undefined)
  * }}
  */
 var State;
@@ -44,14 +60,27 @@ exports.State = State;
 /**
  * Returns the state of the given block as a plain JavaScript object.
  * @param {!Block} block The block to serialize.
- * @param {{addCoordinates: (boolean|undefined)}=} param1
- *     addCoordinates: If true the coordinates of the block are added to the
+ * @param {{addCoordinates: (boolean|undefined), addInputBlocks:
+ *     (boolean|undefined), addNextBlocks: (boolean|undefined)}=} param1
+ *     addCoordinates: If true, the coordinates of the block are added to the
  *       serialized state. False by default.
+ *     addinputBlocks: If true, children of the block which are connected to
+ *       inputs will be serialized. True by default.
+ *     addNextBlocks: If true, children of the block which are connected to the
+ *       block's next connection (if it exists) will be serialized.
+ *       True by default.
  * @return {?State} The serialized state of the
  *     block, or null if the block could not be serialied (eg it was an
  *     insertion marker).
  */
-const save = function(block, {addCoordinates = false} = {}) {
+const save = function(
+    block,
+    {
+      addCoordinates = false,
+      addInputBlocks = true,
+      addNextBlocks = true
+    } = {}
+) {
   if (block.isInsertionMarker()) {
     return null;
   }
@@ -62,11 +91,17 @@ const save = function(block, {addCoordinates = false} = {}) {
   };
 
   if (addCoordinates) {
-    addCoords(block, state);
+    saveCoords(block, state);
+  }
+  saveAttributes(block, state);
+  saveExtraState(block, state);
+  saveFields(block, state);
+  if (addInputBlocks) {
+    saveInputBlocks(block, state);
+  }
+  if (addNextBlocks) {
+    saveNextBlocks(block, state);
   }
-  addAttributes(block, state);
-  addExtraState(block, state);
-  addFields(block, state);
 
   return state;
 };
@@ -78,7 +113,7 @@ exports.save = save;
  * @param {!Block} block The block to base the attributes on.
  * @param {!State} state The state object to append to.
  */
-const addAttributes = function(block, state) {
+const saveAttributes = function(block, state) {
   if (block.isCollapsed()) {
     state['collapsed'] = true;
   }
@@ -111,7 +146,7 @@ const addAttributes = function(block, state) {
  * @param {!Block} block The block to base the coordinates on
  * @param {!State} state The state object to append to
  */
-const addCoords = function(block, state) {
+const saveCoords = function(block, state) {
   const workspace = block.workspace;
   const xy = block.getRelativeToSurfaceXY();
   state['x'] = Math.round(workspace.RTL ? workspace.getWidth() - xy.x : xy.x);
@@ -123,7 +158,7 @@ const addCoords = function(block, state) {
  * @param {!Block} block The block to serialize the extra state of.
  * @param {!State} state The state object to append to.
  */
-const addExtraState = function(block, state) {
+const saveExtraState = function(block, state) {
   if (block.saveExtraState) {
     const extraState = block.saveExtraState();
     if (extraState !== null) {
@@ -137,7 +172,7 @@ const addExtraState = function(block, state) {
  * @param {!Block} block The block to serialize the field state of.
  * @param {!State} state The state object to append to.
  */
-const addFields = function(block, state) {
+const saveFields = function(block, state) {
   let hasFieldState = false;
   let fields = Object.create(null);
   for (let i = 0; i < block.inputList.length; i++) {
@@ -154,3 +189,69 @@ const addFields = function(block, state) {
     state['fields'] = fields;
   }
 };
+
+/**
+ * Adds the state of all of the child blocks of the given block (which are
+ * connected to inputs) to the given state object.
+ * @param {!Block} block The block to serialize the input blocks of.
+ * @param {!State} state The state object to append to.
+ */
+const saveInputBlocks = function(block, state) {
+  const inputs = Object.create(null);
+  for (let i = 0; i < block.inputList.length; i++) {
+    const input = block.inputList[i];
+    if (input.type === inputTypes.DUMMY) {
+      continue;
+    }
+    const connectionState =
+        saveConnection(/** @type {!Connection} */ (input.connection));
+    if (connectionState) {
+      inputs[input.name] = connectionState;
+    }
+  }
+
+  if (Object.keys(inputs).length) {
+    state['inputs'] = inputs;
+  }
+};
+
+/**
+ * Adds the state of all of the next blocks of the given block to the given
+ * state object.
+ * @param {!Block} block The block to serialize the next blocks of.
+ * @param {!State} state The state object to append to.
+ */
+const saveNextBlocks = function(block, state) {
+  if (!block.nextConnection) {
+    return;
+  }
+  const connectionState = saveConnection(block.nextConnection);
+  if (connectionState) {
+    state['next'] = connectionState;
+  }
+};
+
+/**
+ * Returns the state of the given connection (ie the state of any connected
+ * shadow or real blocks).
+ * @param {!Connection} connection The connection to serialize the connected
+ *     blocks of.
+ * @return {?ConnectionState} An object containing the state of any connected
+ *     shadow block, or any connected real block.
+ */
+const saveConnection = function(connection) {
+  const shadow = connection.getShadowDom();
+  const child = connection.targetBlock();
+  if (!shadow && !child) {
+    return null;
+  }
+  var state = Object.create(null);
+  if (shadow) {
+    state['shadow'] = Xml.domToText(shadow)
+        .replace('xmlns="https://developers.google.com/blockly/xml"', '');
+  }
+  if (child) {
+    state['block'] = save(child);
+  }
+  return state;
+};
diff --git a/tests/deps.js b/tests/deps.js
index bf85399f8..43cdc5eb4 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -196,7 +196,7 @@ goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Ren
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Xml', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/serialization.js', ['Blockly.serialization'], [], {'module': 'goog'});
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/jso_serialization_test.js b/tests/mocha/jso_serialization_test.js
index 3b4635547..c6fe39525 100644
--- a/tests/mocha/jso_serialization_test.js
+++ b/tests/mocha/jso_serialization_test.js
@@ -343,5 +343,295 @@ suite('JSO', function() {
         assertProperty(jso, 'fields', {'FIELD': ['state1', 42, true]});
       });
     });
+
+    suite('Connected blocks', function() {
+      setup(function() {
+        this.assertInput = function(jso, name, value) {
+          chai.assert.deepInclude(jso['inputs'][name], value);
+        };
+
+        this.createBlockWithChild = function(blockType, inputName) {
+          const block = this.workspace.newBlock(blockType);
+          const childBlock = this.workspace.newBlock(blockType);
+          block.getInput(inputName).connection.connect(
+              childBlock.outputConnection || childBlock.previousConnection);
+          return block;
+        };
+
+        this.createBlockWithShadow = function(blockType, inputName) {
+          const block = this.workspace.newBlock(blockType);
+          block.getInput(inputName).connection.setShadowDom(
+              Blockly.Xml.textToDom(
+                  '<block type="' + blockType + '" id="test"></block>'));
+          return block;
+        };
+
+        this.createBlockWithShadowAndChild = function(blockType, inputName) {
+          const block = this.workspace.newBlock(blockType);
+          const childBlock = this.workspace.newBlock(blockType);
+          block.getInput(inputName).connection.connect(
+              childBlock.outputConnection || childBlock.previousConnection);
+          block.getInput(inputName).connection.setShadowDom(
+              Blockly.Xml.textToDom(
+                  '<block type="' + blockType + '" id="test"></block>'));
+          return block;
+        };
+  
+        this.assertChild = function(blockType, inputName) {
+          const block = this.createBlockWithChild(blockType, inputName);
+          const jso = Blockly.serialization.blocks.save(block);
+          this.assertInput(
+              jso, inputName, {'block': { 'type': blockType, 'id': 'id2'}});
+        };
+  
+        this.assertShadow = function(blockType, inputName) {
+          const block = this.createBlockWithShadow(blockType, inputName);
+          const jso = Blockly.serialization.blocks.save(block);
+          this.assertInput(
+              jso, inputName, {'shadow': { 'type': blockType, 'id': 'test'}});
+        };
+  
+        this.assertOverwrittenShadow = function(blockType, inputName) {
+          const block =
+              this.createBlockWithShadowAndChild(blockType, inputName);
+          const jso = Blockly.serialization.blocks.save(block);
+          this.assertInput(
+              jso,
+              inputName,
+              {
+                'block': {
+                  'type': blockType,
+                  'id': 'id2'
+                },
+                'shadow': {
+                  'type': blockType,
+                  'id': 'test'
+                }
+              });
+        };
+
+        this.assertNoChild = function(blockType, inputName) {
+          const block = this.createBlockWithChild(blockType, inputName);
+          const jso =
+              Blockly.serialization.blocks.save(block, {addInputBlocks: false});
+          chai.assert.isUndefined(jso['inputs']);
+        };
+  
+        this.assertNoShadow = function(blockType, inputName) {
+          const block = this.createBlockWithShadow(blockType, inputName);
+          const jso =
+              Blockly.serialization.blocks.save(block, {addInputBlocks: false});
+          chai.assert.isUndefined(jso['inputs']);
+        };
+  
+        this.assertNoOverwrittenShadow = function(blockType, inputName) {
+          const block =
+              this.createBlockWithShadowAndChild(blockType, inputName);
+          const jso =
+              Blockly.serialization.blocks.save(block, {addInputBlocks: false});
+          chai.assert.isUndefined(jso['inputs']);
+        };
+      });
+
+      suite('Value', function() {
+        suite('With serialization', function() {
+          test('Child', function() {
+            this.assertChild('row_block', 'INPUT');
+          });
+  
+          test.skip('Shadow', function() {
+            this.assertShadow('row_block', 'INPUT');
+          });
+  
+          test.skip('Overwritten shadow', function() {
+            this.assertOverwrittenShadow('row_block', 'INPUT');
+          });
+        });
+
+        suite('Without serialization', function() {
+          test('Child', function() {
+            this.assertNoChild('row_block', 'INPUT');
+          });
+  
+          test('Shadow', function() {
+            this.assertNoShadow('row_block', 'INPUT');
+          });
+  
+          test('Overwritten shadow', function() {
+            this.assertNoOverwrittenShadow('row_block', 'INPUT');
+          });
+        });
+      });
+
+      suite('Statement', function() {
+        suite('With serialization', function() {
+          test('Child', function() {
+            this.assertChild('statement_block', 'NAME');
+          });
+  
+          test.skip('Shadow', function() {
+            this.assertShadow('statement_block', 'NAME');
+          });
+  
+          test.skip('Overwritten shadow', function() {
+            this.assertOverwrittenShadow('statement_block', 'NAME');
+          });
+
+          test('Child with next blocks', function() {
+            const block = this.workspace.newBlock('statement_block');
+            const childBlock = this.workspace.newBlock('stack_block');
+            const grandChildBlock = this.workspace.newBlock('stack_block');
+            block.getInput('NAME').connection
+                .connect(childBlock.previousConnection);
+            childBlock.nextConnection
+                .connect(grandChildBlock.previousConnection);
+            const jso = Blockly.serialization.blocks.save(block);
+            this.assertInput(
+                jso,
+                'NAME',
+                {
+                  'block': {
+                    'type': 'stack_block',
+                    'id': 'id2',
+                    'next': {
+                      'block': {
+                        'type': 'stack_block',
+                        'id': 'id4'
+                      }
+                    }
+                  }
+                }
+            );
+          });
+        });
+
+        suite('Without serialization', function() {
+          test('Child', function() {
+            this.assertNoChild('statement_block', 'NAME');
+          });
+  
+          test('Shadow', function() {
+            this.assertNoShadow('statement_block', 'NAME');
+          });
+  
+          test('Overwritten shadow', function() {
+            this.assertNoOverwrittenShadow('statement_block', 'NAME');
+          });
+        });
+      });
+
+      suite('Next', function() {
+        setup(function() {
+          this.createNextWithChild = function() {
+            const block = this.workspace.newBlock('stack_block');
+            const childBlock = this.workspace.newBlock('stack_block');
+            block.nextConnection.connect(childBlock.previousConnection);
+            return block;
+          };
+
+          this.createNextWithShadow = function() {
+            const block = this.workspace.newBlock('stack_block');
+            block.nextConnection.setShadowDom(
+                Blockly.Xml.textToDom(
+                    '<block type="stack_block" id="test"></block>'));
+            return block;
+          };
+
+          this.createNextWithShadowAndChild = function() {
+            const block = this.workspace.newBlock('stack_block');
+            const childBlock = this.workspace.newBlock('stack_block');
+            block.nextConnection.connect(childBlock.previousConnection);
+            block.nextConnection.setShadowDom(
+                Blockly.Xml.textToDom(
+                    '<block type="stack_block" id="test"></block>'));
+            return block;
+          };
+        });
+
+        suite('With serialization', function() {
+          test('Child', function() {
+            const block = this.createNextWithChild();
+            const jso =
+                Blockly.serialization.blocks.save(block);
+            chai.assert.deepInclude(
+                jso['next'], {'block': { 'type': 'stack_block', 'id': 'id2'}});
+          });
+  
+          test.skip('Shadow', function() {
+            const block = this.createNextWithShadow();
+            const jso = Blockly.serialization.blocks.save(block);
+            chai.assert.deepInclude(
+                jso['next'], {'shadow': { 'type': 'stack_block', 'id': 'test'}});
+          });
+  
+          test.skip('Overwritten shadow', function() {
+            const block = this.createNextWithShadowAndChild();
+            const jso = Blockly.serialization.blocks.save(block);
+            chai.assert.deepInclude(
+                jso['next'],
+                {
+                  'block': {
+                    'type': 'stack_block',
+                    'id': 'id2'
+                  },
+                  'shadow': {
+                    'type': 'stack_block',
+                    'id': 'test'
+                  }
+                });
+          });
+
+          test('Next block with inputs', function() {
+            const block = this.workspace.newBlock('stack_block');
+            const childBlock = this.workspace.newBlock('statement_block');
+            const grandChildBlock = this.workspace.newBlock('stack_block');
+            block.nextConnection.connect(childBlock.previousConnection);
+            childBlock.getInput('NAME').connection
+                .connect(grandChildBlock.previousConnection);
+            const jso = Blockly.serialization.blocks.save(block);
+            chai.assert.deepInclude(
+                jso['next'],
+                {
+                  'block': {
+                    'type': 'statement_block',
+                    'id': 'id2',
+                    'inputs': {
+                      'NAME': {
+                        'block': {
+                          'type': 'stack_block',
+                          'id': 'id4'
+                        }
+                      }
+                    }
+                  }
+                }
+            );
+          });
+        });
+
+        suite('Without serialization', function() {
+          test('Child', function() {
+            const block = this.createNextWithChild();
+            const jso = Blockly.serialization.blocks.save(
+                block, {addNextBlocks: false});
+            chai.assert.isUndefined(jso['next']);
+          });
+  
+          test('Shadow', function() {
+            const block = this.createNextWithShadow();
+            const jso = Blockly.serialization.blocks.save(
+                block, {addNextBlocks: false});
+            chai.assert.isUndefined(jso['next']);
+          });
+
+          test('Overwritten shadow', function() {
+            const block = this.createNextWithShadowAndChild();
+            const jso = Blockly.serialization.blocks.save(
+                block, {addNextBlocks: false});
+            chai.assert.isUndefined(jso['next']);
+          });
+        });
+      });
+    });
   });
 });

From 28ff2c84c6dea0314e90513f20af42dd34ae116a Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Fri, 6 Aug 2021 08:45:47 -0700
Subject: [PATCH 768/833] feat: add JSO serialization and deserialization of
 variables (#5131)

* Add variable serialization tests

* Fix requires for new file

* Add serialization and deserialization of variables

* Remove only in tests

* Cleanup
---
 core/requires.js                      |  1 +
 core/serialization/variables.js       | 62 +++++++++++++++++++++++++++
 tests/deps.js                         |  3 +-
 tests/deps.mocha.js                   |  5 ++-
 tests/mocha/jso_serialization_test.js | 36 ++++++++++++----
 5 files changed, 96 insertions(+), 11 deletions(-)
 create mode 100644 core/serialization/variables.js

diff --git a/core/requires.js b/core/requires.js
index fc6575fd5..574e3b77c 100644
--- a/core/requires.js
+++ b/core/requires.js
@@ -83,3 +83,4 @@ goog.require('Blockly.zelos.Renderer');
 goog.require('Blockly.Themes.Classic');
 
 goog.require('Blockly.serialization.blocks');
+goog.require('Blockly.serialization.variables');
diff --git a/core/serialization/variables.js b/core/serialization/variables.js
new file mode 100644
index 000000000..8bcb7b408
--- /dev/null
+++ b/core/serialization/variables.js
@@ -0,0 +1,62 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Handles serializing variables to plain JavaScript objects, only
+ *     containing state.
+ */
+'use strict';
+
+goog.module('Blockly.serialization.variables');
+goog.module.declareLegacyNamespace();
+
+// 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');
+
+
+/**
+ * Represents the state of a given variable.
+ * @typedef {{
+ *   name: string,
+ *   id: string,
+ *   type: (string|undefined),
+ * }}
+ */
+var State;
+exports.State = State;
+
+/**
+ * Returns the state of the variable as a plain JavaScript object.
+ * @param {!VariableModel} variableModel The variable to serialize.
+ * @return {!State} The serialized state of the variable.
+ */
+const save = function(variableModel) {
+  const state = {
+    'name': variableModel.name,
+    'id': variableModel.getId()
+  };
+  if (variableModel.type) {
+    state['type'] = variableModel.type;
+  }
+  return state;
+};
+/** @package */
+exports.save = save;
+
+/**
+ * Loads the variable represented by the given state into the given workspace.
+ * Do not call this directly, use workspace.createVariable instead.
+ * @param {!State} state The state of a variable to deserialize into the
+ *     workspace.
+ * @param {!Workspace} workspace The workspace to add the variable to.
+ */
+const load = function(state, workspace) {
+  workspace.createVariable(state['name'], state['type'], state['id']);
+};
+/** @package */
+exports.load = load;
diff --git a/tests/deps.js b/tests/deps.js
index 43cdc5eb4..91402c086 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -193,11 +193,12 @@ goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['B
 goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
+goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.variables', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Xml', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/serialization.js', ['Blockly.serialization'], [], {'module': 'goog'});
+goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index d0b49e0a5..1fbd231ad 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -193,11 +193,12 @@ goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['B
 goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
+goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.variables', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Xml', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/serialization.js', ['Blockly.serialization'], [], {'module': 'goog'});
+goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/jso_serialization_test.js b/tests/mocha/jso_serialization_test.js
index c6fe39525..835316210 100644
--- a/tests/mocha/jso_serialization_test.js
+++ b/tests/mocha/jso_serialization_test.js
@@ -26,15 +26,16 @@ suite('JSO', function() {
     sharedTestTeardown.call(this);
   });
 
+  function assertProperty(obj, property, value) {
+    chai.assert.deepEqual(obj[property], value);
+  }
+
+  function assertNoProperty(obj, property) {
+    assertProperty(obj, property, undefined);
+  }
+
+
   suite('Blocks', function() {
-    function assertProperty(obj, property, value) {
-      chai.assert.deepEqual(obj[property], value);
-    }
-
-    function assertNoProperty(obj, property) {
-      assertProperty(obj, property, undefined);
-    }
-
     test('Null on insertionMarkers', function() {
       const block = this.workspace.newBlock('row_block');
       block.setInsertionMarker(true);
@@ -634,4 +635,23 @@ suite('JSO', function() {
       });
     });
   });
+
+  suite('Variables', function() {
+    test('Without type', function() {
+      const variable = this.workspace.createVariable('testVar', '', 'testId');
+      const jso = Blockly.serialization.variables.save(variable);
+      assertProperty(jso, 'name', 'testVar');
+      assertProperty(jso, 'id', 'testId');
+      assertNoProperty(jso, 'type');
+    });
+
+    test('With type', function() {
+      const variable = this.workspace
+          .createVariable('testVar', 'testType', 'testId');
+      const jso = Blockly.serialization.variables.save(variable);
+      assertProperty(jso, 'name', 'testVar');
+      assertProperty(jso, 'id', 'testId');
+      assertProperty(jso, 'type', 'testType');
+    });
+  });
 });

From d3a9e517b2b9c794a9e6d80c4b8e30a2a49e7654 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Fri, 6 Aug 2021 09:19:23 -0700
Subject: [PATCH 769/833] feat: add top level `save` and `load` functions for
 JSO serialization (#5132)

* Add top-level serialization API

* Add using JSO system in serializer tests

* Make compiler happy
---
 core/requires.js                    |  3 +-
 core/serialization/blocks.js        | 13 +++++
 core/serialization/serialization.js | 18 -------
 core/serialization/workspaces.js    | 80 +++++++++++++++++++++++++++++
 tests/deps.js                       |  4 +-
 tests/deps.mocha.js                 |  4 +-
 tests/mocha/serializer_test.js      |  8 ++-
 7 files changed, 104 insertions(+), 26 deletions(-)
 delete mode 100644 core/serialization/serialization.js
 create mode 100644 core/serialization/workspaces.js

diff --git a/core/requires.js b/core/requires.js
index 574e3b77c..8e91f2f8b 100644
--- a/core/requires.js
+++ b/core/requires.js
@@ -82,5 +82,4 @@ goog.require('Blockly.zelos.Renderer');
 // Classic is the default theme.
 goog.require('Blockly.Themes.Classic');
 
-goog.require('Blockly.serialization.blocks');
-goog.require('Blockly.serialization.variables');
+goog.require('Blockly.serialization.workspaces');
diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index 4ab79a3a4..86a1bc333 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -17,6 +17,8 @@ goog.module.declareLegacyNamespace();
 const Block = goog.requireType('Blockly.Block');
 // eslint-disable-next-line no-unused-vars
 const Connection = goog.requireType('Blockly.Connection');
+// eslint-disable-next-line no-unused-vars
+const Workspace = goog.requireType('Blockly.Workspace');
 const Xml = goog.require('Blockly.Xml');
 const inputTypes = goog.require('Blockly.inputTypes');
 
@@ -255,3 +257,14 @@ const saveConnection = function(connection) {
   }
   return state;
 };
+
+/**
+ * Loads the block represented by the given state into the given workspace.
+ * @param {!State} state The state of a block to deserialize into the workspace.
+ * @param {!Workspace} workspace The workspace to add the block to.
+ */
+// eslint-disable-next-line no-unused-vars
+const load = function(state, workspace) {
+  // Temporarily NOP while connecting things together.
+};
+exports.load = load;
diff --git a/core/serialization/serialization.js b/core/serialization/serialization.js
deleted file mode 100644
index c53a2eb64..000000000
--- a/core/serialization/serialization.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Contains top-level functions for serialization of the workspace
- *     to JavaScript objects.
- */
-'use strict';
-
-/**
- * The top level namespace for JavaScript Object serialization.
- * @namespace Blockly.serialization
- */
-goog.module('Blockly.serialization');
-goog.module.declareLegacyNamespace();
diff --git a/core/serialization/workspaces.js b/core/serialization/workspaces.js
new file mode 100644
index 000000000..b4600f987
--- /dev/null
+++ b/core/serialization/workspaces.js
@@ -0,0 +1,80 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Contains top-level functions for serializing workspaces to
+ *     plain JavaScript objects.
+ */
+'use strict';
+
+goog.module('Blockly.serialization.workspaces');
+goog.module.declareLegacyNamespace();
+ 
+// eslint-disable-next-line no-unused-vars
+const Workspace = goog.require('Blockly.Workspace');
+const blocks = goog.require('Blockly.serialization.blocks');
+const variables = goog.require('Blockly.serialization.variables');
+ 
+
+/**
+ * Returns the state of the workspace as a plain JavaScript object.
+ * @param {!Workspace} workspace The workspace to serialize.
+ * @return {!Object<string, *>} The serialized state of the workspace.
+ */
+const save = function(workspace) {
+  const state = Object.create(null);
+
+  // TODO: Switch this to use plugin serialization system (once it is built).
+  const variableState = [];
+  const vars = workspace.getAllVariables();
+  for (let i = 0; i < vars.length; i++) {
+    variableState.push(variables.save(vars[i]));
+  }
+  if (variableState.length) {
+    state['variables'] = variableState;
+  }
+
+  const blockState = [];
+  for (let block of workspace.getTopBlocks(false)) {
+    blockState.push(
+        blocks.save(block, {addCoordinates: true}));
+  }
+  if (blockState.length) {
+    // This is an object to support adding language version later.
+    state['blocks'] = {
+      'blocks': blockState
+    };
+  }
+
+  return state;
+};
+exports.save = save;
+ 
+/**
+ * Loads the variable represented by the given state into the given workspace.
+ * @param {!Object<string, *>} state The state of the workspace to deserialize
+ *     into the workspace.
+ * @param {!Workspace} workspace The workspace to add the new state to.
+ */
+const load = function(state, workspace) {
+  // TODO: Switch this to use plugin serialization system (once it is built).
+  // TODO: Add something for clearing the state before deserializing.
+
+  if (state['variables']) {
+    const variableStates = state['variables'];
+    for (let i = 0; i < variableStates.length; i++) {
+      variables.load(variableStates[i], workspace);
+    }
+  }
+
+  if (state['blocks']) {
+    const blockStates = state['blocks']['blocks'];
+    for (let i = 0; i < blockStates.length; i++) {
+      blocks.load(blockStates[i], workspace);
+    }
+  }
+};
+exports.load = load;
diff --git a/tests/deps.js b/tests/deps.js
index 91402c086..e3f562820 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -193,12 +193,12 @@ goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['B
 goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.variables', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
+goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Xml', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/serialization.js', ['Blockly.serialization'], [], {'module': 'goog'});
 goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Workspace', 'Blockly.serialization.blocks', 'Blockly.serialization.variables'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 1fbd231ad..32d309ed9 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -193,12 +193,12 @@ goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['B
 goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.variables', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
+goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Xml', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/serialization.js', ['Blockly.serialization'], [], {'module': 'goog'});
 goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Workspace', 'Blockly.serialization.blocks', 'Blockly.serialization.variables'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/serializer_test.js b/tests/mocha/serializer_test.js
index 0a5c77bbd..1f8f36545 100644
--- a/tests/mocha/serializer_test.js
+++ b/tests/mocha/serializer_test.js
@@ -1730,14 +1730,16 @@ Serializer.testSuites = [
 ];
 
 var runSerializerTestSuite = (serializer, deserializer, testSuite) => {
+  const workspaces = Blockly.serialization.workspaces;
 
   const createTestFunction = function(test) {
     return function() {
       Blockly.Xml.domToWorkspace(
           Blockly.Xml.textToDom(test.xml), this.workspace);
       if (serializer && deserializer) {
-        // TODO: Add support for custom serializeers and deserializers.
-        //    Will be added once we have the JSO format working.
+        const save = serializer(workspaces.save(this.workspace));
+        this.workspace.clear();
+        workspaces.load(deserializer(save), this.workspace);
       }
       var newXml = Blockly.Xml.workspaceToDom(this.workspace);
       chai.assert.equal(Blockly.Xml.domToText(newXml), test.xml);
@@ -1770,3 +1772,5 @@ var runSerializerTestSuite = (serializer, deserializer, testSuite) => {
 };
 
 runSerializerTestSuite(null, null, Serializer);
+Serializer.skip = true;
+runSerializerTestSuite(state => state, state => state, Serializer);

From 38cddd6ac70b69b7e4043fe34d7444d6622a1e98 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Fri, 6 Aug 2021 11:39:39 -0700
Subject: [PATCH 770/833] feat: add deserialization of JSO block state (#5137)

* Fixup tests

* Add deserialization of blocks

* Cleanup

* PR commnts
---
 core/serialization/blocks.js   | 163 ++++++++++++++++++++++++++++++++-
 tests/mocha/serializer_test.js |  13 +--
 2 files changed, 167 insertions(+), 9 deletions(-)

diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index 86a1bc333..d509936bc 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -252,7 +252,7 @@ const saveConnection = function(connection) {
     state['shadow'] = Xml.domToText(shadow)
         .replace('xmlns="https://developers.google.com/blockly/xml"', '');
   }
-  if (child) {
+  if (child && !child.isShadow()) {
     state['block'] = save(child);
   }
   return state;
@@ -263,8 +263,165 @@ const saveConnection = function(connection) {
  * @param {!State} state The state of a block to deserialize into the workspace.
  * @param {!Workspace} workspace The workspace to add the block to.
  */
-// eslint-disable-next-line no-unused-vars
 const load = function(state, workspace) {
-  // Temporarily NOP while connecting things together.
+  loadInternal(state, workspace);
+};
+
+/**
+ * Loads the block represented by the given state into the given workspace.
+ * This is defined internally so that the extra optional parameter doesn't
+ * clutter our external API.
+ * @param {!State} state The state of a block to deserialize into the workspace.
+ * @param {!Workspace} workspace The workspace to add the block to.
+ * @param {!Connection} parentConnection The optional parent connection to
+ *     attach the block to.
+ */
+const loadInternal = function(state, workspace, parentConnection = undefined) {
+  const block = workspace.newBlock(state['type'], state['id']);
+  loadCoords(block, state);
+  loadAttributes(block, state);
+  loadExtraState(block, state);
+  if (parentConnection &&
+      (block.outputConnection || block.previousConnection)) {
+    parentConnection.connect(
+        /** @type {!Connection} */
+        (block.outputConnection || block.previousConnection));
+  }
+  // loadIcons(block, state);
+  loadFields(block, state);
+  loadInputBlocks(block, state);
+  loadNextBlocks(block, state);
+};
+
+/**
+ * Applies any coordinate information available on the state object to the
+ * block.
+ * @param {!Block} block The block to set the position of.
+ * @param {!State} state The state object to reference.
+ */
+const loadCoords = function(block, state) {
+  const x = state['x'] === undefined ? 10 : state['x'];
+  const y = state['y'] === undefined ? 10 : state['y'];
+  block.moveBy(x, y);
+};
+
+/**
+ * Applies any attribute information available on the state object to the block.
+ * @param {!Block} block The block to set the attributes of.
+ * @param {!State} state The state object to reference.
+ */
+const loadAttributes = function(block, state) {
+  if (state['collapsed']) {
+    block.setCollapsed(true);
+  }
+  if (state['enabled'] === false) {
+    block.setEnabled(false);
+  }
+  if (state['editable'] === false) {
+    block.setEditable(false);
+  }
+  if (state['deletable'] === false) {
+    block.setDeletable(false);
+  }
+  if (state['movable'] === false) {
+    block.setMovable(false);
+  }
+  if (state['inline'] !== undefined) {
+    block.setInputsInline(state['inline']);
+  }
+  if (state['data'] !== undefined) {
+    block.data = state['data'];
+  }
+};
+
+/**
+ * Applies any extra state information available on the state object to the
+ * block.
+ * @param {!Block} block The block to set the extra state of.
+ * @param {!State} state The state object to reference.
+ */
+const loadExtraState = function(block, state) {
+  if (!state['extraState']) {
+    return;
+  }
+  block.loadExtraState(state['extraState']);
+};
+
+/**
+ * Applies any field information available on the state object to the block.
+ * @param {!Block} block The block to set the field state of.
+ * @param {!State} state The state object to reference.
+ */
+const loadFields = function(block, state) {
+  if (!state['fields']) {
+    return;
+  }
+  const keys = Object.keys(state['fields']);
+  for (let i = 0; i < keys.length; i++) {
+    const fieldName = keys[i];
+    const fieldState = state['fields'][fieldName];
+    const field = block.getField(fieldName);
+    if (!field) {
+      console.warn(
+          `Ignoring non-existant field ${fieldName} in block ${block.type}`);
+      continue;
+    }
+    field.loadState(fieldState);
+  }
+};
+
+/**
+ * Creates any child blocks (attached to inputs) defined by the given state
+ * and attaches them to the given block.
+ * @param {!Block} block The block to attach input blocks to.
+ * @param {!State} state The state object to reference.
+ */
+const loadInputBlocks = function(block, state) {
+  if (!state['inputs']) {
+    return;
+  }
+  const keys = Object.keys(state['inputs']);
+  for (let i = 0; i < keys.length; i++) {
+    const inputName = keys[i];
+    const input = block.getInput(inputName);
+    if (input && input.connection) {
+      loadConnection(input.connection, state['inputs'][inputName]);
+    }
+  }
+};
+
+/**
+ * Creates any next blocks defined by the given state and attaches them to the
+ * given block.
+ * @param {!Block} block The block to attach next blocks to.
+ * @param {!State} state The state object to reference.
+ */
+const loadNextBlocks = function(block, state) {
+  if (!state['next']) {
+    return;
+  }
+  if (block.nextConnection) {
+    loadConnection(block.nextConnection, state['next']);
+  }
+};
+
+/**
+ * Applies the state defined by connectionState to the given connection, ie
+ * assigns shadows and attaches child blocks.
+ * @param {!Connection} connection The connection to serialize the
+ *     connected blocks of.
+ * @param {!ConnectionState} connectionState The object containing the state of
+ *     any connected shadow block, or any connected real block.
+ */
+const loadConnection = function(connection, connectionState) {
+  if (connectionState['shadow']) {
+    connection.setShadowDom(Blockly.Xml.textToDom(connectionState['shadow']));
+  }
+  if (connectionState['block']) {
+    loadInternal(
+        connectionState['block'],
+        connection.getSourceBlock().workspace,
+        connection);
+  }
 };
 exports.load = load;
diff --git a/tests/mocha/serializer_test.js b/tests/mocha/serializer_test.js
index 1f8f36545..3da2ff500 100644
--- a/tests/mocha/serializer_test.js
+++ b/tests/mocha/serializer_test.js
@@ -1264,7 +1264,7 @@ Serializer.Connections.OverwrittenShadow.Row = new SerializerTestCase('Row',
     '</shadow>' +
     '</value>' +
     '</shadow>' +
-    '<block type="logic_boolean" id="id3*****************">' +
+    '<block type="logic_boolean" id="id4*****************">' +
     '<field name="BOOL">TRUE</field>' +
     '</block>' +
     '</value>' +
@@ -1280,7 +1280,7 @@ Serializer.Connections.OverwrittenShadow.Nested = new SerializerTestCase(
     '<shadow type="text_print" id="id3*****************"></shadow>' +
     '</statement>' +
     '</shadow>' +
-    '<block type="text_print" id="id3*****************"></block>' +
+    '<block type="text_print" id="id4*****************"></block>' +
     '</statement>' +
     '</block>' +
     '</xml>');
@@ -1288,10 +1288,10 @@ Serializer.Connections.OverwrittenShadow.Stack = new SerializerTestCase('Stack',
     '<xml xmlns="https://developers.google.com/blockly/xml">' +
     '<block type="text_print" id="id******************" x="42" y="42">' +
     '<next>' +
-    '<block type="text_print" id="id3*****************"></block>' +
-    '<shadow type="text_print" id="id2*****************">' +
+    '<block type="text_print" id="id2*****************"></block>' +
+    '<shadow type="text_print" id="id3*****************">' +
     '<next>' +
-    '<shadow type="text_print" id="id3*****************"></shadow>' +
+    '<shadow type="text_print" id="id4*****************"></shadow>' +
     '</next>' +
     '</shadow>' +
     '</next>' +
@@ -1772,5 +1772,6 @@ var runSerializerTestSuite = (serializer, deserializer, testSuite) => {
 };
 
 runSerializerTestSuite(null, null, Serializer);
-Serializer.skip = true;
+Serializer.Icons.skip = true;
+Serializer.Mutations.skip = true;
 runSerializerTestSuite(state => state, state => state, Serializer);

From 9138bca93ce8dec9c67e0c833e68a69b2f329dc3 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Tue, 10 Aug 2021 20:14:37 +0000
Subject: [PATCH 771/833] feat: add initialization of blocks and event firing
 (#5166)

* Change playground to use JSO system

* Add tests for initialization and events

* Add initialization of blocks

* PR Comments
---
 core/serialization/blocks.js            |  48 ++++++-
 tests/deps.mocha.js                     |   1 +
 tests/mocha/index.html                  |   1 +
 tests/mocha/jso_deserialization_test.js | 162 ++++++++++++++++++++++++
 tests/mocha/jso_serialization_test.js   |   2 +-
 tests/playground.html                   |  59 ++++++---
 6 files changed, 252 insertions(+), 21 deletions(-)
 create mode 100644 tests/mocha/jso_deserialization_test.js

diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index d509936bc..40d2a1309 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -262,10 +262,31 @@ const saveConnection = function(connection) {
  * Loads the block represented by the given state into the given workspace.
  * @param {!State} state The state of a block to deserialize into the workspace.
  * @param {!Workspace} workspace The workspace to add the block to.
+ * @return {!Block} The block that was just loaded.
  */
 const load = function(state, workspace) {
-  loadInternal(state, workspace);
+  // We only want to fire an event for the top block.
+  Blockly.Events.disable();
+
+  const block = loadInternal(state, workspace);
+
+  Blockly.Events.enable();
+  Blockly.Events.fire(
+      new (Blockly.Events.get(Blockly.Events.BLOCK_CREATE))(block));
+  
+  // Adding connections to the connection db is expensive. This defers that
+  // operation to decrease load time.
+  if (block instanceof Blockly.BlockSvg) {
+    setTimeout(() => {
+      if (!block.disposed) {
+        block.setConnectionTracking(true);
+      }
+    }, 1);
+  }
+
+  return block;
 };
+exports.load = load;
 
 /**
  * Loads the block represented by the given state into the given workspace.
@@ -273,8 +294,9 @@ const load = function(state, workspace) {
  * clutter our external API.
  * @param {!State} state The state of a block to deserialize into the workspace.
  * @param {!Workspace} workspace The workspace to add the block to.
- * @param {!Connection} parentConnection The optional parent connection to
+ * @param {!Connection=} parentConnection The optional parent connection to
  *     attach the block to.
+ * @return {!Block} The block that was just loaded.
  */
 const loadInternal = function(state, workspace, parentConnection = undefined) {
   const block = workspace.newBlock(state['type'], state['id']);
@@ -291,6 +313,8 @@ const loadInternal = function(state, workspace, parentConnection = undefined) {
   loadFields(block, state);
   loadInputBlocks(block, state);
   loadNextBlocks(block, state);
+  initBlock(block);
+  return block;
 };
 
 /**
@@ -424,4 +448,22 @@ const loadConnection = function(connection, connectionState) {
         connection);
   }
 };
-exports.load = load;
+
+// TODO(#5146): Remove this from the serialization system.
+/**
+ * Initializes the give block, eg init the model, inits the svg, renders, etc.
+ * @param {!Block} block The block to initialize.
+ */
+const initBlock = function(block) {
+  if (block instanceof Blockly.BlockSvg) {
+    // Adding connections to the connection db is expensive. This defers that
+    // operation to decrease load time.
+    block.setConnectionTracking(false);
+
+    block.initSvg();
+    block.render(false);
+    block.updateDisabled();
+  } else {
+    block.initModel();
+  }
+};
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 32d309ed9..cd7ff0cda 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -331,6 +331,7 @@ goog.addDependency('../../tests/mocha/generator_test.js', ['Blockly.test.generat
 goog.addDependency('../../tests/mocha/gesture_test.js', ['Blockly.test.gesture'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/input_test.js', ['Blockly.test.input'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/insertion_marker_test.js', ['Blockly.test.insertionMarker'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/jso_deserialization_test.js', ['Blockly.test.jsoDeserialization'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/jso_serialization_test.js', ['Blockly.test.jsoSerialization'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/json_test.js', ['Blockly.test.json'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/keydown_test.js', ['Blockly.test.keydown'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/index.html b/tests/mocha/index.html
index ab34e2c8e..9b28c2422 100644
--- a/tests/mocha/index.html
+++ b/tests/mocha/index.html
@@ -82,6 +82,7 @@
       goog.require('Blockly.test.gesture');
       goog.require('Blockly.test.input');
       goog.require('Blockly.test.insertionMarker');
+      goog.require('Blockly.test.jsoDeserialization');
       goog.require('Blockly.test.jsoSerialization');
       goog.require('Blockly.test.json');
       goog.require('Blockly.test.keydown');
diff --git a/tests/mocha/jso_deserialization_test.js b/tests/mocha/jso_deserialization_test.js
new file mode 100644
index 000000000..9d97059c3
--- /dev/null
+++ b/tests/mocha/jso_deserialization_test.js
@@ -0,0 +1,162 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+goog.module('Blockly.test.jsoDeserialization');
+
+const {assertEventFired, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+
+
+suite('JSO Deserialization', function() {
+  setup(function() {
+    sharedTestSetup.call(this);
+    this.workspace = new Blockly.Workspace();
+  });
+
+  teardown(function() {
+    workspaceTeardown.call(this, this.workspace);
+    sharedTestTeardown.call(this);
+  });
+
+  suite('Events', function() {
+    test.skip('Finished loading', function() {
+      const state = {
+        'blocks': {
+          'blocks': [
+            {
+              'type': 'controls_if',
+              'id': 'testId',
+              'x': 42,
+              'y': 42
+            },
+          ]
+        }
+      };
+      Blockly.serialization.workspaces.load(state, this.workspace);
+      assertEventFired(
+          this.eventsFireStub,
+          Blockly.Events.FinishedLoading,
+          {},
+          this.workspace.id);
+    });
+
+    suite('Var create', function() {
+      test('Just var', function() {
+        const state = {
+          'variables': [
+            {
+              'name': 'test',
+              'id': 'testId',
+            }
+          ]
+        };
+        Blockly.serialization.workspaces.load(state, this.workspace);
+        assertEventFired(
+            this.eventsFireStub,
+            Blockly.Events.VarCreate,
+            {'varName': 'test', 'varId': 'testId', 'varType': ''},
+            this.workspace.id);
+      });
+
+      test('Only fire one event with var and var on block', function() {
+        const state = {
+          'variables': [
+            {
+              'name': 'test',
+              'id': 'testId',
+            }
+          ],
+          'blocks': {
+            'blocks': [
+              {
+                'type': 'variables_get',
+                'id': 'blockId',
+                'x': 42,
+                'y': 42,
+                'fields': {
+                  'VAR': 'testId'
+                }
+              },
+            ]
+          }
+        };
+        Blockly.serialization.workspaces.load(state, this.workspace);
+        const calls = this.eventsFireStub.getCalls();
+        const count = calls.reduce((acc, call) => {
+          if (call.args[0] instanceof Blockly.Events.VarCreate) {
+            return acc + 1;
+          }
+          return acc;
+        }, 0);
+        chai.assert.equal(count, 1);
+        assertEventFired(
+            this.eventsFireStub,
+            Blockly.Events.VarCreate,
+            {'varName': 'test', 'varId': 'testId', 'varType': ''},
+            this.workspace.id);
+      });
+    });
+
+    suite('Block create', function() {
+      test('Simple', function() {
+        const state = {
+          'blocks': {
+            'blocks': [
+              {
+                'type': 'controls_if',
+                'id': 'testId',
+                'x': 42,
+                'y': 42
+              },
+            ]
+          }
+        };
+        Blockly.serialization.workspaces.load(state, this.workspace);
+        assertEventFired(
+            this.eventsFireStub,
+            Blockly.Events.BlockCreate,
+            {},
+            this.workspace.id,
+            'testId');
+      });
+
+      test('Only fire event for top block', function() {
+        const state = {
+          'blocks': {
+            'blocks': [
+              {
+                'type': 'controls_if',
+                'id': 'id1',
+                'x': 42,
+                'y': 42,
+                'inputs': {
+                  'DO0': {
+                    'block': {
+                      'type': 'controls_if',
+                      'id': 'id2'
+                    }
+                  }
+                },
+                'next': {
+                  'block': {
+                    'type': 'controls_if',
+                    'id': 'id3'
+                  }
+                }
+              },
+            ]
+          }
+        };
+        Blockly.serialization.workspaces.load(state, this.workspace);
+        assertEventFired(
+            this.eventsFireStub,
+            Blockly.Events.BlockCreate,
+            {},
+            this.workspace.id,
+            'id1');
+      });
+    });
+  });
+});
diff --git a/tests/mocha/jso_serialization_test.js b/tests/mocha/jso_serialization_test.js
index 835316210..83647f5e7 100644
--- a/tests/mocha/jso_serialization_test.js
+++ b/tests/mocha/jso_serialization_test.js
@@ -9,7 +9,7 @@ goog.module('Blockly.test.jsoSerialization');
 const {defineStackBlock, defineRowBlock, defineStatementBlock, createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
 
 
-suite('JSO', function() {
+suite('JSO Serialization', function() {
   setup(function() {
     sharedTestSetup.call(this);
     this.workspace = new Blockly.Workspace();
diff --git a/tests/playground.html b/tests/playground.html
index b53e76ea8..58d768431 100644
--- a/tests/playground.html
+++ b/tests/playground.html
@@ -145,7 +145,7 @@ function start() {
   }
   taChange();
   if (autoimport) {
-    fromXml();
+    load();
   }
 }
 
@@ -203,7 +203,7 @@ function initToolbox(workspace) {
   }
 }
 
-function toXml() {
+function saveXml() {
   var output = document.getElementById('importExport');
   var xml = Blockly.Xml.workspaceToDom(workspace);
   output.value = Blockly.Xml.domToPrettyText(xml);
@@ -212,13 +212,28 @@ function toXml() {
   taChange();
 }
 
-function fromXml() {
+function saveJson() {
+  var output = document.getElementById('importExport');
+  var state = Blockly.serialization.workspaces.save(workspace);
+  output.value = JSON.stringify(state, null, 2);
+  output.focus();
+  output.select();
+  taChange();
+}
+
+function load() {
   var input = document.getElementById('importExport');
   if (!input.value) {
     return;
   }
-  var xml = Blockly.Xml.textToDom(input.value);
-  Blockly.Xml.domToWorkspace(xml, workspace);
+  var valid = saveIsValid(input.value);
+  if (valid.json) {
+    var state = JSON.parse(input.value);
+    Blockly.serialization.workspaces.load(state, workspace);
+  } else if (valid.xml) {
+    var xml = Blockly.Xml.textToDom(input.value);
+    Blockly.Xml.domToWorkspace(xml, workspace);
+  }
   taChange();
 }
 
@@ -228,20 +243,34 @@ function toCode(lang) {
   taChange();
 }
 
-// Disable the "Import from XML" button if the XML is invalid.
+// Disable the "Load" button if the save state is invalid.
 // Preserve text between page reloads.
 function taChange() {
   var textarea = document.getElementById('importExport');
   if (sessionStorage) {
     sessionStorage.setItem('textarea', textarea.value);
   }
-  var valid = true;
+  var valid = saveIsValid(textarea.value);
+  document.getElementById('import').disabled = !valid.json && !valid.xml;
+}
+
+function saveIsValid(save) {
+  var validJson = true;
   try {
-    Blockly.Xml.textToDom(textarea.value);
+    JSON.parse(save);
   } catch (e) {
-    valid = false;
+    validJson = false;
+  }
+  var validXml = true
+  try {
+    Blockly.Xml.textToDom(save);
+  } catch (e) {
+    validXml = false;
+  }
+  return {
+    json: validJson,
+    xml: validXml
   }
-  document.getElementById('import').disabled = !valid;
 }
 
 function logEvents(state) {
@@ -422,18 +451,14 @@ var spaghettiXml = [
     </select>
   </form>
   <p>
-    <input type="button" value="Export to XML" onclick="toXml()">
-    &nbsp;
-    <input type="button" value="Import from XML" onclick="fromXml()" id="import">
+    <input type="button" value="Save JSON" onclick="saveJson()">
+    <input type="button" value="Save XML" onclick="saveXml()">
+    <input type="button" value="Load" onclick="load()" id="import">
     <br>
     <input type="button" value="To JavaScript" onclick="toCode('JavaScript')">
-    &nbsp;
     <input type="button" value="To Python" onclick="toCode('Python')">
-    &nbsp;
     <input type="button" value="To PHP" onclick="toCode('PHP')">
-    &nbsp;
     <input type="button" value="To Lua" onclick="toCode('Lua')">
-    &nbsp;
     <input type="button" value="To Dart" onclick="toCode('Dart')">
     <br>
     <textarea id="importExport" style="width: 26%; height: 12em"

From bd77b4ad3d97f74e977d0c49dbf63c61bc36e150 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Wed, 11 Aug 2021 15:01:24 +0000
Subject: [PATCH 772/833] fix: touch up some deserialization behavior (#5181)

* Add parameter for recording undo.

This sets up the most common default behavior, but also makes it clear
to people that it is happening, because it might not be expected.

* Add grouping of events

* Add text width caching

* Add disabling workspace resizing

* Add performance optimizations

* Respect nulls from blocks.save

* Cleanup from rebase

* PR Comments

* Cleanup from rebase
---
 core/serialization/blocks.js            |  38 +-
 core/serialization/variables.js         |  16 +-
 core/serialization/workspaces.js        |  54 ++-
 tests/deps.js                           |   6 +-
 tests/deps.mocha.js                     |   6 +-
 tests/mocha/jso_deserialization_test.js | 491 +++++++++++++++++++-----
 tests/playground.html                   |  69 ++++
 7 files changed, 555 insertions(+), 125 deletions(-)

diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index 40d2a1309..9f55c4091 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -17,6 +17,7 @@ goog.module.declareLegacyNamespace();
 const Block = goog.requireType('Blockly.Block');
 // eslint-disable-next-line no-unused-vars
 const Connection = goog.requireType('Blockly.Connection');
+const Events = goog.require('Blockly.Events');
 // eslint-disable-next-line no-unused-vars
 const Workspace = goog.requireType('Blockly.Workspace');
 const Xml = goog.require('Blockly.Xml');
@@ -71,9 +72,8 @@ exports.State = State;
  *     addNextBlocks: If true, children of the block which are connected to the
  *       block's next connection (if it exists) will be serialized.
  *       True by default.
- * @return {?State} The serialized state of the
- *     block, or null if the block could not be serialied (eg it was an
- *     insertion marker).
+ * @return {?State} The serialized state of the block, or null if the block
+ *     could not be serialied (eg it was an insertion marker).
  */
 const save = function(
     block,
@@ -262,21 +262,33 @@ const saveConnection = function(connection) {
  * Loads the block represented by the given state into the given workspace.
  * @param {!State} state The state of a block to deserialize into the workspace.
  * @param {!Workspace} workspace The workspace to add the block to.
+ * @param {{recordUndo: (boolean|undefined)}=} param1
+ *     recordUndo: If true, events triggered by this function will be undo-able
+ *       by the user. False by default.
  * @return {!Block} The block that was just loaded.
  */
-const load = function(state, workspace) {
+const load = function(state, workspace, {recordUndo = false} = {}) {
+  const prevRecordUndo = Events.getRecordUndo();
+  Events.setRecordUndo(recordUndo);
+  const existingGroup = Events.getGroup();
+  if (!existingGroup) {
+    Events.setGroup(true);
+  }
+
   // We only want to fire an event for the top block.
-  Blockly.Events.disable();
+  Events.disable();
 
   const block = loadInternal(state, workspace);
 
-  Blockly.Events.enable();
-  Blockly.Events.fire(
-      new (Blockly.Events.get(Blockly.Events.BLOCK_CREATE))(block));
+  Events.enable();
+  Events.fire(new (Events.get(Events.BLOCK_CREATE))(block));
+
+  Events.setGroup(existingGroup);
+  Events.setRecordUndo(prevRecordUndo);
   
   // Adding connections to the connection db is expensive. This defers that
   // operation to decrease load time.
-  if (block instanceof Blockly.BlockSvg) {
+  if (workspace.rendered) {
     setTimeout(() => {
       if (!block.disposed) {
         block.setConnectionTracking(true);
@@ -313,7 +325,7 @@ const loadInternal = function(state, workspace, parentConnection = undefined) {
   loadFields(block, state);
   loadInputBlocks(block, state);
   loadNextBlocks(block, state);
-  initBlock(block);
+  initBlock(block, workspace.rendered);
   return block;
 };
 
@@ -453,16 +465,16 @@ const loadConnection = function(connection, connectionState) {
 /**
  * Initializes the give block, eg init the model, inits the svg, renders, etc.
  * @param {!Block} block The block to initialize.
+ * @param {boolean} rendered Whether the block is a rendered or headless block.
  */
-const initBlock = function(block) {
-  if (block instanceof Blockly.BlockSvg) {
+const initBlock = function(block, rendered) {
+  if (rendered) {
     // Adding connections to the connection db is expensive. This defers that
     // operation to decrease load time.
     block.setConnectionTracking(false);
 
     block.initSvg();
     block.render(false);
-    block.updateDisabled();
   } else {
     block.initModel();
   }
diff --git a/core/serialization/variables.js b/core/serialization/variables.js
index 8bcb7b408..e071b9f3e 100644
--- a/core/serialization/variables.js
+++ b/core/serialization/variables.js
@@ -13,6 +13,7 @@
 goog.module('Blockly.serialization.variables');
 goog.module.declareLegacyNamespace();
 
+const Events = goog.require('Blockly.Events');
 // eslint-disable-next-line no-unused-vars
 const VariableModel = goog.requireType('Blockly.VariableModel');
 // eslint-disable-next-line no-unused-vars
@@ -54,9 +55,22 @@ exports.save = save;
  * @param {!State} state The state of a variable to deserialize into the
  *     workspace.
  * @param {!Workspace} workspace The workspace to add the variable to.
+ * @param {{recordUndo: (boolean|undefined)}=} param1
+ *     recordUndo: If true, events triggered by this function will be undo-able
+ *       by the user. False by default.
  */
-const load = function(state, workspace) {
+const load = function(state, workspace, {recordUndo = false} = {}) {
+  const prevRecordUndo = Events.getRecordUndo();
+  Events.setRecordUndo(recordUndo);
+  const existingGroup = Events.getGroup();
+  if (!existingGroup) {
+    Events.setGroup(true);
+  }
+
   workspace.createVariable(state['name'], state['type'], state['id']);
+
+  Events.setGroup(existingGroup);
+  Events.setRecordUndo(prevRecordUndo);
 };
 /** @package */
 exports.load = load;
diff --git a/core/serialization/workspaces.js b/core/serialization/workspaces.js
index b4600f987..4b82ef7ca 100644
--- a/core/serialization/workspaces.js
+++ b/core/serialization/workspaces.js
@@ -13,9 +13,11 @@
 goog.module('Blockly.serialization.workspaces');
 goog.module.declareLegacyNamespace();
  
+const Events = goog.require('Blockly.Events');
 // eslint-disable-next-line no-unused-vars
 const Workspace = goog.require('Blockly.Workspace');
 const blocks = goog.require('Blockly.serialization.blocks');
+const dom = goog.require('Blockly.utils.dom');
 const variables = goog.require('Blockly.serialization.variables');
  
 
@@ -28,24 +30,27 @@ const save = function(workspace) {
   const state = Object.create(null);
 
   // TODO: Switch this to use plugin serialization system (once it is built).
-  const variableState = [];
+  const variableStates = [];
   const vars = workspace.getAllVariables();
   for (let i = 0; i < vars.length; i++) {
-    variableState.push(variables.save(vars[i]));
+    variableStates.push(variables.save(vars[i]));
   }
-  if (variableState.length) {
-    state['variables'] = variableState;
+  if (variableStates.length) {
+    state['variables'] = variableStates;
   }
 
-  const blockState = [];
+  const blockStates = [];
   for (let block of workspace.getTopBlocks(false)) {
-    blockState.push(
-        blocks.save(block, {addCoordinates: true}));
+    const blockState =
+      blocks.save(block, {addCoordinates: true});
+    if (blockState) {
+      blockStates.push(blockState);
+    }
   }
-  if (blockState.length) {
+  if (blockStates.length) {
     // This is an object to support adding language version later.
     state['blocks'] = {
-      'blocks': blockState
+      'blocks': blockStates
     };
   }
 
@@ -58,23 +63,48 @@ exports.save = save;
  * @param {!Object<string, *>} state The state of the workspace to deserialize
  *     into the workspace.
  * @param {!Workspace} workspace The workspace to add the new state to.
+ * @param {{recordUndo: (boolean|undefined)}=} param1
+ *     recordUndo: If true, events triggered by this function will be undo-able
+ *       by the user. False by default.
  */
-const load = function(state, workspace) {
+const load = function(state, workspace, {recordUndo = false} = {}) {
   // TODO: Switch this to use plugin serialization system (once it is built).
   // TODO: Add something for clearing the state before deserializing.
 
+  const prevRecordUndo = Events.getRecordUndo();
+  Events.setRecordUndo(recordUndo);
+  const existingGroup = Events.getGroup();
+  if (!existingGroup) {
+    Events.setGroup(true);
+  }
+
+  dom.startTextWidthCache();
+  if (workspace.setResizesEnabled) {
+    workspace.setResizesEnabled(false);
+  }
+
   if (state['variables']) {
     const variableStates = state['variables'];
     for (let i = 0; i < variableStates.length; i++) {
-      variables.load(variableStates[i], workspace);
+      variables.load(variableStates[i], workspace, {recordUndo});
     }
   }
 
   if (state['blocks']) {
     const blockStates = state['blocks']['blocks'];
     for (let i = 0; i < blockStates.length; i++) {
-      blocks.load(blockStates[i], workspace);
+      blocks.load(blockStates[i], workspace, {recordUndo});
     }
   }
+
+  if (workspace.setResizesEnabled) {
+    workspace.setResizesEnabled(true);
+  }
+  dom.stopTextWidthCache();
+
+  Events.fire(new (Events.get(Events.FINISHED_LOADING))(workspace));
+
+  Events.setGroup(existingGroup);
+  Events.setRecordUndo(prevRecordUndo);
 };
 exports.load = load;
diff --git a/tests/deps.js b/tests/deps.js
index e3f562820..adcd3e2a9 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -196,9 +196,9 @@ goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Ren
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Xml', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Workspace', 'Blockly.serialization.blocks', 'Blockly.serialization.variables'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Events', 'Blockly.Workspace', 'Blockly.serialization.blocks', 'Blockly.serialization.variables', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index cd7ff0cda..f9300ac27 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -196,9 +196,9 @@ goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Ren
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Xml', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Workspace', 'Blockly.serialization.blocks', 'Blockly.serialization.variables'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Events', 'Blockly.Workspace', 'Blockly.serialization.blocks', 'Blockly.serialization.variables', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/jso_deserialization_test.js b/tests/mocha/jso_deserialization_test.js
index 9d97059c3..56670f849 100644
--- a/tests/mocha/jso_deserialization_test.js
+++ b/tests/mocha/jso_deserialization_test.js
@@ -21,46 +21,51 @@ suite('JSO Deserialization', function() {
   });
 
   suite('Events', function() {
-    test.skip('Finished loading', function() {
-      const state = {
-        'blocks': {
-          'blocks': [
-            {
-              'type': 'controls_if',
-              'id': 'testId',
-              'x': 42,
-              'y': 42
-            },
-          ]
-        }
-      };
-      Blockly.serialization.workspaces.load(state, this.workspace);
-      assertEventFired(
-          this.eventsFireStub,
-          Blockly.Events.FinishedLoading,
-          {},
-          this.workspace.id);
-    });
-
-    suite('Var create', function() {
+    suite('Finished loading', function() {
       test('Just var', function() {
         const state = {
-          'variables': [
-            {
-              'name': 'test',
-              'id': 'testId',
-            }
-          ]
+          'blocks': {
+            'blocks': [
+              {
+                'type': 'controls_if',
+                'id': 'testId',
+                'x': 42,
+                'y': 42
+              },
+            ]
+          }
         };
         Blockly.serialization.workspaces.load(state, this.workspace);
         assertEventFired(
             this.eventsFireStub,
-            Blockly.Events.VarCreate,
-            {'varName': 'test', 'varId': 'testId', 'varType': ''},
+            Blockly.Events.FinishedLoading,
+            {},
             this.workspace.id);
       });
 
-      test('Only fire one event with var and var on block', function() {
+      test('Explicit group', function() {
+        const state = {
+          'blocks': {
+            'blocks': [
+              {
+                'type': 'controls_if',
+                'id': 'testId',
+                'x': 42,
+                'y': 42
+              },
+            ]
+          }
+        };
+        Blockly.Events.setGroup('my group');
+        Blockly.serialization.workspaces.load(state, this.workspace);
+        assertEventFired(
+            this.eventsFireStub,
+            Blockly.Events.FinishedLoading,
+            {'group': 'my group'},
+            this.workspace.id);
+      });
+
+      test('Automatic group', function() {
         const state = {
           'variables': [
             {
@@ -84,78 +89,378 @@ suite('JSO Deserialization', function() {
         };
         Blockly.serialization.workspaces.load(state, this.workspace);
         const calls = this.eventsFireStub.getCalls();
-        const count = calls.reduce((acc, call) => {
-          if (call.args[0] instanceof Blockly.Events.VarCreate) {
-            return acc + 1;
-          }
-          return acc;
-        }, 0);
-        chai.assert.equal(count, 1);
-        assertEventFired(
-            this.eventsFireStub,
-            Blockly.Events.VarCreate,
-            {'varName': 'test', 'varId': 'testId', 'varType': ''},
-            this.workspace.id);
+        const group = calls[0].args[0].group;
+        chai.assert.isTrue(calls.every(call => call.args[0].group == group));
+      });
+    });
+
+    suite('Var create', function() {
+      suite('Top-level call', function() {
+        test('Just var', function() {
+          const state = {
+            'variables': [
+              {
+                'name': 'test',
+                'id': 'testId',
+              }
+            ]
+          };
+          Blockly.serialization.workspaces.load(state, this.workspace);
+          assertEventFired(
+              this.eventsFireStub,
+              Blockly.Events.VarCreate,
+              {
+                'varName': 'test',
+                'varId': 'testId',
+                'varType': '',
+                'recordUndo': false
+              },
+              this.workspace.id);
+        });
+
+        test('Record undo', function() {
+          const state = {
+            'variables': [
+              {
+                'name': 'test',
+                'id': 'testId',
+              }
+            ]
+          };
+          Blockly.serialization.workspaces.load(state, this.workspace, {recordUndo: true});
+          assertEventFired(
+              this.eventsFireStub,
+              Blockly.Events.VarCreate,
+              {
+                'varName': 'test',
+                'varId': 'testId',
+                'varType': '',
+                'recordUndo': true
+              },
+              this.workspace.id);
+        });
+
+        test('Grouping', function() {
+          const state = {
+            'variables': [
+              {
+                'name': 'test',
+                'id': 'testId',
+              }
+            ]
+          };
+          Blockly.Events.setGroup('my group');
+          Blockly.serialization.workspaces.load(state, this.workspace);
+          assertEventFired(
+              this.eventsFireStub,
+              Blockly.Events.VarCreate,
+              {
+                'varName': 'test',
+                'varId': 'testId',
+                'varType': '',
+                'group': 'my group'
+              },
+              this.workspace.id);
+        });
+
+        test('Multiple vars grouped', function() {
+          const state = {
+            'variables': [
+              {
+                'name': 'test',
+                'id': 'testId',
+              },
+              {
+                'name': 'test2',
+                'id': 'testId2',
+              }
+            ]
+          };
+          Blockly.serialization.workspaces.load(state, this.workspace);
+          const calls = this.eventsFireStub.getCalls();
+          const group = calls[0].args[0].group;
+          chai.assert.isTrue(calls.every(call => call.args[0].group == group));
+        });
+
+        test('Var with block', function() {
+          const state = {
+            'variables': [
+              {
+                'name': 'test',
+                'id': 'testId',
+              }
+            ],
+            'blocks': {
+              'blocks': [
+                {
+                  'type': 'variables_get',
+                  'id': 'blockId',
+                  'x': 42,
+                  'y': 42,
+                  'fields': {
+                    'VAR': 'testId'
+                  }
+                },
+              ]
+            }
+          };
+          Blockly.serialization.workspaces.load(state, this.workspace);
+          const calls = this.eventsFireStub.getCalls();
+          const count = calls.reduce((acc, call) => {
+            if (call.args[0] instanceof Blockly.Events.VarCreate) {
+              return acc + 1;
+            }
+            return acc;
+          }, 0);
+          chai.assert.equal(count, 1);
+          assertEventFired(
+              this.eventsFireStub,
+              Blockly.Events.VarCreate,
+              {'varName': 'test', 'varId': 'testId', 'varType': ''},
+              this.workspace.id);
+        });
+      });
+
+      suite('Direct call', function() {
+        test('Just var', function() {
+          const state = {
+            'name': 'test',
+            'id': 'testId',
+          };
+          Blockly.serialization.variables.load(state, this.workspace);
+          assertEventFired(
+              this.eventsFireStub,
+              Blockly.Events.VarCreate,
+              {
+                'varName': 'test',
+                'varId': 'testId',
+                'varType': '',
+                'recordUndo': false
+              },
+              this.workspace.id);
+        });
+
+        test('Record undo', function() {
+          const state = {
+            'name': 'test',
+            'id': 'testId',
+          };
+          Blockly.serialization.variables
+              .load(state, this.workspace, {recordUndo: true});
+          assertEventFired(
+              this.eventsFireStub,
+              Blockly.Events.VarCreate,
+              {
+                'varName': 'test',
+                'varId': 'testId',
+                'varType': '',
+                'recordUndo': true
+              },
+              this.workspace.id);
+        });
+
+        test('Grouping', function() {
+          const state = {
+            'name': 'test',
+            'id': 'testId',
+          };
+          Blockly.Events.setGroup('my group');
+          Blockly.serialization.variables.load(state, this.workspace);
+          assertEventFired(
+              this.eventsFireStub,
+              Blockly.Events.VarCreate,
+              {
+                'varName': 'test',
+                'varId': 'testId',
+                'varType': '',
+                'group': 'my group'
+              },
+              this.workspace.id);
+        });
       });
     });
 
     suite('Block create', function() {
-      test('Simple', function() {
-        const state = {
-          'blocks': {
-            'blocks': [
-              {
-                'type': 'controls_if',
-                'id': 'testId',
-                'x': 42,
-                'y': 42
-              },
-            ]
-          }
-        };
-        Blockly.serialization.workspaces.load(state, this.workspace);
-        assertEventFired(
-            this.eventsFireStub,
-            Blockly.Events.BlockCreate,
-            {},
-            this.workspace.id,
-            'testId');
-      });
+      suite('Top-level call', function() {
+        test('No children', function() {
+          const state = {
+            'blocks': {
+              'blocks': [
+                {
+                  'type': 'controls_if',
+                  'id': 'testId',
+                  'x': 42,
+                  'y': 42
+                },
+              ]
+            }
+          };
+          Blockly.serialization.workspaces.load(state, this.workspace);
+          assertEventFired(
+              this.eventsFireStub,
+              Blockly.Events.BlockCreate,
+              {'recordUndo': false},
+              this.workspace.id,
+              'testId');
+        });
 
-      test('Only fire event for top block', function() {
-        const state = {
-          'blocks': {
-            'blocks': [
-              {
-                'type': 'controls_if',
-                'id': 'id1',
-                'x': 42,
-                'y': 42,
-                'inputs': {
-                  'DO0': {
+        test('Record undo', function() {
+          const state = {
+            'blocks': {
+              'blocks': [
+                {
+                  'type': 'controls_if',
+                  'id': 'testId',
+                  'x': 42,
+                  'y': 42
+                },
+              ]
+            }
+          };
+          Blockly.serialization.workspaces.load(state, this.workspace, {'recordUndo': true});
+          assertEventFired(
+              this.eventsFireStub,
+              Blockly.Events.BlockCreate,
+              {'recordUndo': true},
+              this.workspace.id,
+              'testId');
+        });
+
+        test('Grouping', function() {
+          const state = {
+            'blocks': {
+              'blocks': [
+                {
+                  'type': 'controls_if',
+                  'id': 'testId',
+                  'x': 42,
+                  'y': 42
+                },
+              ]
+            }
+          };
+          Blockly.Events.setGroup('my group');
+          Blockly.serialization.workspaces.load(state, this.workspace);
+          assertEventFired(
+              this.eventsFireStub,
+              Blockly.Events.BlockCreate,
+              {'group': 'my group'},
+              this.workspace.id,
+              'testId');
+        });
+
+        test('Multiple blocks grouped', function() {
+          const state = {
+            'blocks': {
+              'blocks': [
+                {
+                  'type': 'controls_if',
+                  'id': 'testId',
+                  'x': 42,
+                  'y': 42
+                },
+                {
+                  'type': 'controls_if',
+                  'id': 'testId',
+                  'x': 84,
+                  'y': 84
+                },
+              ]
+            }
+          };
+          Blockly.serialization.workspaces.load(state, this.workspace);
+          const calls = this.eventsFireStub.getCalls();
+          const group = calls[0].args[0].group;
+          chai.assert.isTrue(calls.every(call => call.args[0].group == group));
+        });
+
+        test('With children', function() {
+          const state = {
+            'blocks': {
+              'blocks': [
+                {
+                  'type': 'controls_if',
+                  'id': 'id1',
+                  'x': 42,
+                  'y': 42,
+                  'inputs': {
+                    'DO0': {
+                      'block': {
+                        'type': 'controls_if',
+                        'id': 'id2'
+                      }
+                    }
+                  },
+                  'next': {
                     'block': {
                       'type': 'controls_if',
-                      'id': 'id2'
+                      'id': 'id3'
                     }
                   }
                 },
-                'next': {
-                  'block': {
-                    'type': 'controls_if',
-                    'id': 'id3'
-                  }
-                }
-              },
-            ]
-          }
-        };
-        Blockly.serialization.workspaces.load(state, this.workspace);
-        assertEventFired(
-            this.eventsFireStub,
-            Blockly.Events.BlockCreate,
-            {},
-            this.workspace.id,
-            'id1');
+              ]
+            }
+          };
+          Blockly.serialization.workspaces.load(state, this.workspace);
+          assertEventFired(
+              this.eventsFireStub,
+              Blockly.Events.BlockCreate,
+              {},
+              this.workspace.id,
+              'id1');
+        });
+      });
+
+      suite('Direct call', function() {
+        test('No children', function() {
+          const state = {
+            'type': 'controls_if',
+            'id': 'testId',
+            'x': 42,
+            'y': 42
+          };
+          Blockly.serialization.blocks.load(state, this.workspace);
+          assertEventFired(
+              this.eventsFireStub,
+              Blockly.Events.BlockCreate,
+              {'recordUndo': false},
+              this.workspace.id,
+              'testId');
+        });
+
+        test('Record undo', function() {
+          const state = {
+            'type': 'controls_if',
+            'id': 'testId',
+            'x': 42,
+            'y': 42
+          };
+          Blockly.serialization.blocks
+              .load(state, this.workspace, {'recordUndo': true});
+          assertEventFired(
+              this.eventsFireStub,
+              Blockly.Events.BlockCreate,
+              {'recordUndo': true},
+              this.workspace.id,
+              'testId');
+        });
+
+        test('Grouping', function() {
+          const state = {
+            'type': 'controls_if',
+            'id': 'testId',
+            'x': 42,
+            'y': 42
+          };
+          Blockly.Events.setGroup('my group');
+          Blockly.serialization.blocks.load(state, this.workspace);
+          assertEventFired(
+              this.eventsFireStub,
+              Blockly.Events.BlockCreate,
+              {'group': 'my group'},
+              this.workspace.id,
+              'testId');
+        });
       });
     });
   });
diff --git a/tests/playground.html b/tests/playground.html
index 58d768431..c94c05c2f 100644
--- a/tests/playground.html
+++ b/tests/playground.html
@@ -379,6 +379,74 @@ var spaghettiXml = [
   '    <next></next>',
   '  </block>'].join('\n');
 
+  function jsoSpaghetti(n) {
+    var str = spaghettiJs;
+    for (var i = 0; i < n; i++) {
+      str = str.replace(/{}/g, `{"block":${spaghettiJs}}`);
+    }
+    var obj = {
+      'blocks': {
+        'blocks': [
+          JSON.parse(str)
+        ]
+      }
+    };
+    console.time('Spaghetti serialization');
+    Blockly.serialization.load(obj, workspace);
+    console.timeEnd('Spaghetti serialization');
+  }
+  var spaghettiJs = JSON.stringify({
+    'type': 'controls_if',
+    'inputs': {
+      'IF0': {
+        'block': {
+          'type': 'logic_compare',
+          'fields': {
+            'OP': 'EQ',
+          },
+          'inputs': {
+            'A': {
+              'block': {
+                'type': 'math_arithmetic',
+                'fields': {
+                  'OP': 'MULTIPLY',
+                },
+                'inputs': {
+                  'A': {
+                    'block': {
+                      'type': 'math_number',
+                      'fields': {
+                        'NUM': 6
+                      }
+                    }
+                  },
+                  'B': {
+                    'block': {
+                      'type': 'math_number',
+                      'fields': {
+                        'NUM': 7
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            'B': {
+              'block': {
+                'type': 'math_number',
+                'fields': {
+                  'NUM': 42
+                }
+              }
+            }
+          }
+        }
+      },
+      'DO0': { }
+    },
+    'next': { }
+  });
+
 </script>
 
 <style>
@@ -469,6 +537,7 @@ var spaghettiXml = [
     Stress test: &nbsp;
     <input type="button" value="Airstrike!" onclick="airstrike(100)">
     <input type="button" value="Spaghetti!" onclick="spaghetti(8)">
+    <input type="button" value="JS Spaghetti!" onclick="jsoSpaghetti(8)">
   </p>
   <ul class="playgroundToggleOptions">
     <li>

From ee78b419875572f3a3182d3c8ba97c2f6526d069 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Thu, 12 Aug 2021 15:53:28 +0000
Subject: [PATCH 773/833] feat: upgrade block defs to have JSO serialization
 hooks (#5329)

* Respect nulls from blocks.save

* Upgrade list blocks to use JSO serialization

* Upgrade logic blocks to use JSO serialization

* Upgrade math blocks to use JSO serialization

* Upgrade text blocks to use JSO serialization

* Upgrade procedure blocks to use JSO serialization

* Add more mutator tests

* Fix firing enabled events

* PR Comments
---
 blocks/lists.js                  | 44 ++++++++++++++-
 blocks/logic.js                  | 30 +++++++++++
 blocks/math.js                   | 17 +++++-
 blocks/procedures.js             | 92 +++++++++++++++++++++++++++++++-
 blocks/text.js                   | 44 ++++++++++++++-
 core/block.js                    |  5 +-
 core/serialization/workspaces.js |  3 +-
 tests/deps.js                    |  8 +--
 tests/mocha/serializer_test.js   | 63 +++++++++++++++++++++-
 9 files changed, 293 insertions(+), 13 deletions(-)

diff --git a/blocks/lists.js b/blocks/lists.js
index 7d1cc9be2..00dedd555 100644
--- a/blocks/lists.js
+++ b/blocks/lists.js
@@ -131,6 +131,7 @@ Blockly.Blocks['lists_create_with'] = {
   },
   /**
    * Create XML to represent list inputs.
+   * Backwards compatible serialization implementation.
    * @return {!Element} XML storage element.
    * @this {Blockly.Block}
    */
@@ -141,6 +142,7 @@ Blockly.Blocks['lists_create_with'] = {
   },
   /**
    * Parse XML to restore the list inputs.
+   * Backwards compatible serialization implementation.
    * @param {!Element} xmlElement XML storage element.
    * @this {Blockly.Block}
    */
@@ -148,6 +150,23 @@ Blockly.Blocks['lists_create_with'] = {
     this.itemCount_ = parseInt(xmlElement.getAttribute('items'), 10);
     this.updateShape_();
   },
+  /**
+   * Returns the state of this block as a JSON serializable object.
+   * @return {{itemCount: number}} The state of this block, ie the item count.
+   */
+  saveExtraState: function() {
+    return {
+      'itemCount': this.itemCount_,
+    };
+  },
+  /**
+   * Applies the given state to this block.
+   * @param {*} state The state to apply to this block, ie the item count.
+   */
+  loadExtraState: function(state) {
+    this.itemCount_ = state['itemCount'];
+    this.updateShape_();
+  },
   /**
    * Populate the mutator's dialog with this block's components.
    * @param {!Blockly.Workspace} workspace Mutator's workspace.
@@ -424,6 +443,12 @@ Blockly.Blocks['lists_getIndex'] = {
     var isAt = (xmlElement.getAttribute('at') != 'false');
     this.updateAt_(isAt);
   },
+  
+  // This block does not need JSO serialization hooks (saveExtraState and
+  // loadExtraState) because the state of this object is already encoded in the
+  // dropdown values.
+  // XML hooks are kept for backwards compatibility.
+
   /**
    * Switch between a value block and a statement block.
    * @param {boolean} newStatement True if the block should be a statement.
@@ -584,6 +609,12 @@ Blockly.Blocks['lists_setIndex'] = {
     var isAt = (xmlElement.getAttribute('at') != 'false');
     this.updateAt_(isAt);
   },
+  
+  // This block does not need JSO serialization hooks (saveExtraState and
+  // loadExtraState) because the state of this object is already encoded in the
+  // dropdown values.
+  // XML hooks are kept for backwards compatibility.
+
   /**
    * Create or delete an input for the numeric index.
    * @param {boolean} isAt True if the input should exist.
@@ -684,6 +715,12 @@ Blockly.Blocks['lists_getSublist'] = {
     this.updateAt_(1, isAt1);
     this.updateAt_(2, isAt2);
   },
+  
+  // This block does not need JSO serialization hooks (saveExtraState and
+  // loadExtraState) because the state of this object is already encoded in the
+  // dropdown values.
+  // XML hooks are kept for backwards compatibility.
+
   /**
    * Create or delete an input for a numeric index.
    * This block has two such inputs, independent of each other.
@@ -857,5 +894,10 @@ Blockly.Blocks['lists_split'] = {
    */
   domToMutation: function(xmlElement) {
     this.updateType_(xmlElement.getAttribute('mode'));
-  }
+  },
+  
+  // This block does not need JSO serialization hooks (saveExtraState and
+  // loadExtraState) because the state of this object is already encoded in the
+  // dropdown values.
+  // XML hooks are kept for backwards compatibility.
 };
diff --git a/blocks/logic.js b/blocks/logic.js
index c7b6acf0c..6779ffa0b 100644
--- a/blocks/logic.js
+++ b/blocks/logic.js
@@ -303,6 +303,7 @@ Blockly.Constants.Logic.CONTROLS_IF_MUTATOR_MIXIN = {
 
   /**
    * Create XML to represent the number of else-if and else inputs.
+   * Backwards compatible serialization implementation.
    * @return {Element} XML storage element.
    * @this {Blockly.Block}
    */
@@ -321,6 +322,7 @@ Blockly.Constants.Logic.CONTROLS_IF_MUTATOR_MIXIN = {
   },
   /**
    * Parse XML to restore the else-if and else inputs.
+   * Backwards compatible serialization implementation.
    * @param {!Element} xmlElement XML storage element.
    * @this {Blockly.Block}
    */
@@ -329,6 +331,34 @@ Blockly.Constants.Logic.CONTROLS_IF_MUTATOR_MIXIN = {
     this.elseCount_ = parseInt(xmlElement.getAttribute('else'), 10) || 0;
     this.rebuildShape_();
   },
+  /**
+   * Returns the state of this block as a JSON serializable object.
+   * @return {?{elseIfCount: (number|undefined), haseElse: (boolean|undefined)}}
+   *     The state of this block, ie the else if count and else state.
+   */
+  saveExtraState: function() {
+    if (!this.elseifCount_ && !this.elseCount_) {
+      return null;
+    }
+    var state = Object.create(null);
+    if (this.elseifCount_) {
+      state['elseIfCount'] = this.elseifCount_;
+    }
+    if (this.elseCount_) {
+      state['hasElse'] = true;
+    }
+    return state;
+  },
+  /**
+   * Applies the given state to this block.
+   * @param {*} state The state to apply to this block, ie the else if count and
+   *     else state.
+   */
+  loadExtraState: function(state) {
+    this.elseifCount_ = state['elseIfCount'] || 0;
+    this.elseCount_ = state['hasElse'] ? 1 : 0;
+    this.updateShape_();
+  },
   /**
    * Populate the mutator's dialog with this block's components.
    * @param {!Blockly.Workspace} workspace Mutator's workspace.
diff --git a/blocks/math.js b/blocks/math.js
index b6827c5b1..d86da5d5d 100644
--- a/blocks/math.js
+++ b/blocks/math.js
@@ -446,6 +446,7 @@ Blockly.Extensions.register('math_op_tooltip',
 Blockly.Constants.Math.IS_DIVISIBLEBY_MUTATOR_MIXIN = {
   /**
    * Create XML to represent whether the 'divisorInput' should be present.
+   * Backwards compatible serialization implementation.
    * @return {!Element} XML storage element.
    * @this {Blockly.Block}
    */
@@ -457,6 +458,7 @@ Blockly.Constants.Math.IS_DIVISIBLEBY_MUTATOR_MIXIN = {
   },
   /**
    * Parse XML to restore the 'divisorInput'.
+   * Backwards compatible serialization implementation.
    * @param {!Element} xmlElement XML storage element.
    * @this {Blockly.Block}
    */
@@ -464,6 +466,12 @@ Blockly.Constants.Math.IS_DIVISIBLEBY_MUTATOR_MIXIN = {
     var divisorInput = (xmlElement.getAttribute('divisor_input') == 'true');
     this.updateShape_(divisorInput);
   },
+  
+  // This block does not need JSO serialization hooks (saveExtraState and
+  // loadExtraState) because the state of this object is already encoded in the
+  // dropdown values.
+  // XML hooks are kept for backwards compatibility.
+
   /**
    * Modify this block to have (or not have) an input for 'is divisible by'.
    * @param {boolean} divisorInput True if this block has a divisor input.
@@ -531,6 +539,7 @@ Blockly.Constants.Math.LIST_MODES_MUTATOR_MIXIN = {
   },
   /**
    * Create XML to represent the output type.
+   * Backwards compatible serialization implementation.
    * @return {!Element} XML storage element.
    * @this {Blockly.Block}
    */
@@ -541,12 +550,18 @@ Blockly.Constants.Math.LIST_MODES_MUTATOR_MIXIN = {
   },
   /**
    * Parse XML to restore the output type.
+   * Backwards compatible serialization implementation.
    * @param {!Element} xmlElement XML storage element.
    * @this {Blockly.Block}
    */
   domToMutation: function(xmlElement) {
     this.updateType_(xmlElement.getAttribute('op'));
-  }
+  },
+  
+  // This block does not need JSO serialization hooks (saveExtraState and
+  // loadExtraState) because the state of this object is already encoded in the
+  // dropdown values.
+  // XML hooks are kept for backwards compatibility.
 };
 
 /**
diff --git a/blocks/procedures.js b/blocks/procedures.js
index 644d7a751..4e3327d62 100644
--- a/blocks/procedures.js
+++ b/blocks/procedures.js
@@ -95,6 +95,7 @@ Blockly.Blocks['procedures_defnoreturn'] = {
   },
   /**
    * Create XML to represent the argument inputs.
+   * Backwards compatible serialization implementation.
    * @param {boolean=} opt_paramIds If true include the IDs of the parameter
    *     quarks.  Used by Blockly.Procedures.mutateCallers for reconnection.
    * @return {!Element} XML storage element.
@@ -124,6 +125,7 @@ Blockly.Blocks['procedures_defnoreturn'] = {
   },
   /**
    * Parse XML to restore the argument inputs.
+   * Backwards compatible serialization implementation.
    * @param {!Element} xmlElement XML storage element.
    * @this {Blockly.Block}
    */
@@ -150,6 +152,54 @@ Blockly.Blocks['procedures_defnoreturn'] = {
     // Show or hide the statement input.
     this.setStatements_(xmlElement.getAttribute('statements') !== 'false');
   },
+  /**
+   * Returns the state of this block as a JSON serializable object.
+   * @return {?{params: (!Array<{name: string, id: string}>|undefined),
+   *     hasStatements: (boolean|undefined)}} The state of this block, eg the
+   *     parameters and statements.
+   */
+  saveExtraState: function() {
+    if (!this.argumentVarModels_.length && this.hasStatements_) {
+      return null;
+    }
+    var state = Object.create(null);
+    if (this.argumentVarModels_.length) {
+      state['params'] = [];
+      for (var i = 0; i < this.argumentVarModels_.length; i++) {
+        state['params'].push({
+          // We don't need to serialize the name, but just in case we decide
+          // to separate params from variables.
+          'name': this.argumentVarModels_[i].name,
+          'id': this.argumentVarModels_[i].getId()
+        });
+      }
+    }
+    if (!this.hasStatements_) {
+      state['hasStatements'] = false;
+    }
+    return state;
+  },
+  /**
+   * Applies the given state to this block.
+   * @param {*} state The state to apply to this block, eg the parameters and
+   *     statements.
+   */
+  loadExtraState: function(state) {
+    this.arguments_ = [];
+    this.argumentVarModels_ = [];
+    if (state['params']) {
+      for (var i = 0; i < state['params'].length; i++) {
+        var param = state['params'][i];
+        var variable = Blockly.Variables.getOrCreateVariablePackage(
+            this.workspace, param['id'], param['name'], '');
+        this.arguments_.push(variable.name);
+        this.argumentVarModels_.push(variable);
+      }
+    }
+    this.updateParams_();
+    Blockly.Procedures.mutateCallers(this);
+    this.setStatements_(state['hasStatements'] === false ? false : true);
+  },
   /**
    * Populate the mutator's dialog with this block's components.
    * @param {!Blockly.Workspace} workspace Mutator's workspace.
@@ -436,6 +486,8 @@ Blockly.Blocks['procedures_defreturn'] = {
   updateParams_: Blockly.Blocks['procedures_defnoreturn'].updateParams_,
   mutationToDom: Blockly.Blocks['procedures_defnoreturn'].mutationToDom,
   domToMutation: Blockly.Blocks['procedures_defnoreturn'].domToMutation,
+  saveExtraState: Blockly.Blocks['procedures_defnoreturn'].saveExtraState,
+  loadExtraState: Blockly.Blocks['procedures_defnoreturn'].loadExtraState,
   decompose: Blockly.Blocks['procedures_defnoreturn'].decompose,
   compose: Blockly.Blocks['procedures_defnoreturn'].compose,
   /**
@@ -776,6 +828,7 @@ Blockly.Blocks['procedures_callnoreturn'] = {
   },
   /**
    * Create XML to represent the (non-editable) name and arguments.
+   * Backwards compatible serialization implementation.
    * @return {!Element} XML storage element.
    * @this {Blockly.Block}
    */
@@ -791,6 +844,7 @@ Blockly.Blocks['procedures_callnoreturn'] = {
   },
   /**
    * Parse XML to restore the (non-editable) name and parameters.
+   * Backwards compatible serialization implementation.
    * @param {!Element} xmlElement XML storage element.
    * @this {Blockly.Block}
    */
@@ -807,6 +861,34 @@ Blockly.Blocks['procedures_callnoreturn'] = {
     }
     this.setProcedureParameters_(args, paramIds);
   },
+  /**
+   * Returns the state of this block as a JSON serializable object.
+   * @return {{name: string, params:(!Array<string>|undefined)}} The state of
+   *     this block, ie the params and procedure name.
+   */
+  saveExtraState: function() {
+    var state = Object.create(null);
+    state['name'] = this.getProcedureCall();
+    if (this.arguments_.length) {
+      state['params'] = this.arguments_;
+    }
+    return state;
+  },
+  /**
+   * Applies the given state to this block.
+   * @param {*} state The state to apply to this block, ie the params and
+   *     procedure name.
+   */
+  loadExtraState: function(state) {
+    this.renameProcedure(this.getProcedureCall(), state['name']);
+    const params = state['params'];
+    if (params) {
+      const ids = [];
+      ids.length = params.length;
+      ids.fill(null);
+      this.setProcedureParameters_(params, ids);
+    }
+  },
   /**
    * Return all variables referenced by this block.
    * @return {!Array<string>} List of variable names.
@@ -975,6 +1057,8 @@ Blockly.Blocks['procedures_callreturn'] = {
   updateShape_: Blockly.Blocks['procedures_callnoreturn'].updateShape_,
   mutationToDom: Blockly.Blocks['procedures_callnoreturn'].mutationToDom,
   domToMutation: Blockly.Blocks['procedures_callnoreturn'].domToMutation,
+  saveExtraState: Blockly.Blocks['procedures_callnoreturn'].saveExtraState,
+  loadExtraState: Blockly.Blocks['procedures_callnoreturn'].loadExtraState,
   getVars: Blockly.Blocks['procedures_callnoreturn'].getVars,
   getVarModels: Blockly.Blocks['procedures_callnoreturn'].getVarModels,
   onchange: Blockly.Blocks['procedures_callnoreturn'].onchange,
@@ -1026,6 +1110,12 @@ Blockly.Blocks['procedures_ifreturn'] = {
           .appendField(Blockly.Msg['PROCEDURES_DEFRETURN_RETURN']);
     }
   },
+
+  // This block does not need JSO serialization hooks (saveExtraState and
+  // loadExtraState) because the state of this block is already encoded in the
+  // block's position in the workspace.
+  // XML hooks are kept for backwards compatibility.
+
   /**
    * Called whenever anything on the workspace changes.
    * Add warning if this flow block is not nested inside a loop.
@@ -1033,7 +1123,7 @@ Blockly.Blocks['procedures_ifreturn'] = {
    * @this {Blockly.Block}
    */
   onchange: function(_e) {
-    if (!this.workspace.isDragging || this.workspace.isDragging()) {
+    if (this.workspace.isDragging && this.workspace.isDragging()) {
       return;  // Don't change state at the start of a drag.
     }
     var legal = false;
diff --git a/blocks/text.js b/blocks/text.js
index 9e806be92..2738c047f 100644
--- a/blocks/text.js
+++ b/blocks/text.js
@@ -261,6 +261,7 @@ Blockly.Blocks['text_getSubstring'] = {
   },
   /**
    * Create XML to represent whether there are 'AT' inputs.
+   * Backwards compatible serialization implementation.
    * @return {!Element} XML storage element.
    * @this {Blockly.Block}
    */
@@ -274,6 +275,7 @@ Blockly.Blocks['text_getSubstring'] = {
   },
   /**
    * Parse XML to restore the 'AT' inputs.
+   * Backwards compatible serialization implementation.
    * @param {!Element} xmlElement XML storage element.
    * @this {Blockly.Block}
    */
@@ -283,6 +285,12 @@ Blockly.Blocks['text_getSubstring'] = {
     this.updateAt_(1, isAt1);
     this.updateAt_(2, isAt2);
   },
+  
+  // This block does not need JSO serialization hooks (saveExtraState and
+  // loadExtraState) because the state of this object is already encoded in the
+  // dropdown values.
+  // XML hooks are kept for backwards compatibility.
+
   /**
    * Create or delete an input for a numeric index.
    * This block has two such inputs, independent of each other.
@@ -441,6 +449,7 @@ Blockly.Blocks['text_prompt_ext'] = {
   },
   /**
    * Create XML to represent the output type.
+   * Backwards compatible serialization implementation.
    * @return {!Element} XML storage element.
    * @this {Blockly.Block}
    */
@@ -451,12 +460,18 @@ Blockly.Blocks['text_prompt_ext'] = {
   },
   /**
    * Parse XML to restore the output type.
+   * Backwards compatible serialization implementation.
    * @param {!Element} xmlElement XML storage element.
    * @this {Blockly.Block}
    */
   domToMutation: function(xmlElement) {
     this.updateType_(xmlElement.getAttribute('type'));
-  }
+  },
+  
+  // This block does not need JSO serialization hooks (saveExtraState and
+  // loadExtraState) because the state of this object is already encoded in the
+  // dropdown values.
+  // XML hooks are kept for backwards compatibility.
 };
 
 Blockly.Blocks['text_prompt'] = {
@@ -678,6 +693,7 @@ Blockly.Constants.Text.TEXT_QUOTES_EXTENSION = function() {
 Blockly.Constants.Text.TEXT_JOIN_MUTATOR_MIXIN = {
   /**
    * Create XML to represent number of text inputs.
+   * Backwards compatible serialization implementation.
    * @return {!Element} XML storage element.
    * @this {Blockly.Block}
    */
@@ -688,6 +704,7 @@ Blockly.Constants.Text.TEXT_JOIN_MUTATOR_MIXIN = {
   },
   /**
    * Parse XML to restore the text inputs.
+   * Backwards compatible serialization implementation.
    * @param {!Element} xmlElement XML storage element.
    * @this {Blockly.Block}
    */
@@ -695,6 +712,23 @@ Blockly.Constants.Text.TEXT_JOIN_MUTATOR_MIXIN = {
     this.itemCount_ = parseInt(xmlElement.getAttribute('items'), 10);
     this.updateShape_();
   },
+  /**
+   * Returns the state of this block as a JSON serializable object.
+   * @return {{itemCount: number}} The state of this block, ie the item count.
+   */
+  saveExtraState: function() {
+    return {
+      'itemCount': this.itemCount_,
+    };
+  },
+  /**
+   * Applies the given state to this block.
+   * @param {*} state The state to apply to this block, ie the item count.
+   */
+  loadExtraState: function(state) {
+    this.itemCount_ = state['itemCount'];
+    this.updateShape_();
+  },
   /**
    * Populate the mutator's dialog with this block's components.
    * @param {!Blockly.Workspace} workspace Mutator's workspace.
@@ -829,6 +863,7 @@ Blockly.Constants.Text.TEXT_INDEXOF_TOOLTIP_EXTENSION = function() {
 Blockly.Constants.Text.TEXT_CHARAT_MUTATOR_MIXIN = {
   /**
    * Create XML to represent whether there is an 'AT' input.
+   * Backwards compatible serialization implementation.
    * @return {!Element} XML storage element.
    * @this {Blockly.Block}
    */
@@ -839,6 +874,7 @@ Blockly.Constants.Text.TEXT_CHARAT_MUTATOR_MIXIN = {
   },
   /**
    * Parse XML to restore the 'AT' input.
+   * Backwards compatible serialization implementation.
    * @param {!Element} xmlElement XML storage element.
    * @this {Blockly.Block}
    */
@@ -848,6 +884,12 @@ Blockly.Constants.Text.TEXT_CHARAT_MUTATOR_MIXIN = {
     var isAt = (xmlElement.getAttribute('at') != 'false');
     this.updateAt_(isAt);
   },
+  
+  // This block does not need JSO serialization hooks (saveExtraState and
+  // loadExtraState) because the state of this object is already encoded in the
+  // dropdown values.
+  // XML hooks are kept for backwards compatibility.
+
   /**
    * Create or delete an input for the numeric index.
    * @param {boolean} isAt True if the input should exist.
diff --git a/core/block.js b/core/block.js
index d0d066ad9..eb072da34 100644
--- a/core/block.js
+++ b/core/block.js
@@ -1335,9 +1335,10 @@ Block.prototype.isEnabled = function() {
  */
 Block.prototype.setEnabled = function(enabled) {
   if (this.isEnabled() != enabled) {
-    Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
-        this, 'disabled', null, this.disabled, !enabled));
+    const oldValue = this.disabled;
     this.disabled = !enabled;
+    Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
+        this, 'disabled', null, oldValue, !enabled));
   }
 };
 
diff --git a/core/serialization/workspaces.js b/core/serialization/workspaces.js
index 4b82ef7ca..581ca867a 100644
--- a/core/serialization/workspaces.js
+++ b/core/serialization/workspaces.js
@@ -41,8 +41,7 @@ const save = function(workspace) {
 
   const blockStates = [];
   for (let block of workspace.getTopBlocks(false)) {
-    const blockState =
-      blocks.save(block, {addCoordinates: true});
+    const blockState = blocks.save(block, {addCoordinates: true});
     if (blockState) {
       blockStates.push(blockState);
     }
diff --git a/tests/deps.js b/tests/deps.js
index adcd3e2a9..8fe9efacb 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -1,10 +1,10 @@
 goog.addDependency('../../blocks/colour.js', ['Blockly.Blocks.colour', 'Blockly.Constants.Colour'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldColour', 'Blockly.FieldLabel']);
-goog.addDependency('../../blocks/lists.js', ['Blockly.Constants.Lists'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator']);
+goog.addDependency('../../blocks/lists.js', ['Blockly.Constants.Lists'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator'], {'lang': 'es5'});
 goog.addDependency('../../blocks/logic.js', ['Blockly.Blocks.logic', 'Blockly.Constants.Logic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator']);
 goog.addDependency('../../blocks/loops.js', ['Blockly.Blocks.loops', 'Blockly.Constants.Loops'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable', 'Blockly.Warning']);
-goog.addDependency('../../blocks/math.js', ['Blockly.Blocks.math', 'Blockly.Constants.Math'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable']);
-goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'], ['Blockly', 'Blockly.Blocks', 'Blockly.Comment', 'Blockly.FieldCheckbox', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.Mutator', 'Blockly.Warning'], {'lang': 'es5'});
-goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator']);
+goog.addDependency('../../blocks/math.js', ['Blockly.Blocks.math', 'Blockly.Constants.Math'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable'], {'lang': 'es5'});
+goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'], ['Blockly', 'Blockly.Blocks', 'Blockly.Comment', 'Blockly.FieldCheckbox', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.Mutator', 'Blockly.Warning'], {'lang': 'es6'});
+goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator'], {'lang': 'es5'});
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/serializer_test.js b/tests/mocha/serializer_test.js
index 3da2ff500..466c16859 100644
--- a/tests/mocha/serializer_test.js
+++ b/tests/mocha/serializer_test.js
@@ -1313,6 +1313,30 @@ Serializer.Connections.testSuites = [
 ];
 
 Serializer.Mutations = new SerializerTestSuite('Mutations');
+Serializer.Mutations.ListGetIndex = new SerializerTestCase('ListGetIndex',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="lists_getIndex" id="id" x="42" y="42">' +
+    '<mutation statement="true" at="false"></mutation>' +
+    '<field name="MODE">REMOVE</field>' +
+    '<field name="WHERE">LAST</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.ListSetIndex = new SerializerTestCase('ListSetIndex',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="lists_setIndex" id="id" x="42" y="42">' +
+    '<mutation at="false"></mutation>' +
+    '<field name="MODE">SET</field>' +
+    '<field name="WHERE">LAST</field>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.ListGetSublist = new SerializerTestCase('ListGetSublist',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="lists_getSublist" id="id" x="42" y="42">' +
+    '<mutation at1="false" at2="false"></mutation>' +
+    '<field name="WHERE1">FIRST</field>' +
+    '<field name="WHERE2">LAST</field>' +
+    '</block>' +
+    '</xml>');
 Serializer.Mutations.MathNumberProperty = new SerializerTestCase(
     'MathNumberProperty',
     '<xml xmlns="https://developers.google.com/blockly/xml">' +
@@ -1371,6 +1395,9 @@ Serializer.Mutations.TextPrompt = new SerializerTestCase(
     '</block>' +
     '</xml>');
 Serializer.Mutations.testCases = [
+  Serializer.Mutations.ListGetIndex,
+  Serializer.Mutations.ListSetIndex,
+  Serializer.Mutations.ListGetSublist,
   Serializer.Mutations.MathNumberProperty,
   Serializer.Mutations.MathOnList,
   Serializer.Mutations.TextJoin,
@@ -1621,10 +1648,45 @@ Serializer.Mutations.Procedure.NoStatements = new SerializerTestCase(
     '<field name="NAME">do something</field>' +
     '</block>' +
     '</xml>');
+Serializer.Mutations.Procedure.IfReturn = new SerializerTestCase(
+    'IfReturn',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<block type="procedures_defnoreturn" id="id" x="42" y="42">' +
+    '<field name="NAME">do something</field>' +
+    '<statement name="STACK">' +
+    '<block type="procedures_ifreturn" id="id2">' +
+    '<mutation value="0"></mutation>' +
+    '</block>' +
+    '</statement>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.Procedure.Caller = new SerializerTestCase(
+    'Caller',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="aaaaaaaaaaaaaaaaaaaa">x</variable>' +
+    '<variable id="bbbbbbbbbbbbbbbbbbbb">y</variable>' +
+    '</variables>' +
+    '<block type="procedures_defreturn" id="id2*****************" x="42" y="42">' +
+    '<mutation>' +
+    '<arg name="x" varid="aaaaaaaaaaaaaaaaaaaa"></arg>' +
+    '<arg name="y" varid="bbbbbbbbbbbbbbbbbbbb"></arg>' +
+    '</mutation>' +
+    '<field name="NAME">do something</field>' +
+    '</block>' +
+    '<block type="procedures_callreturn" id="id******************" x="52" y="52">' +
+    '<mutation name="do something">' +
+    '<arg name="x"></arg>' +
+    '<arg name="y"></arg>' +
+    '</mutation>' +
+    '</block>' +
+    '</xml>');
 Serializer.Mutations.Procedure.testCases = [
   Serializer.Mutations.Procedure.NoMutation,
   Serializer.Mutations.Procedure.Variables,
   Serializer.Mutations.Procedure.NoStatements,
+  Serializer.Mutations.Procedure.IfReturn,
+  Serializer.Mutations.Procedure.Caller,
 ];
 
 Serializer.Mutations.Procedure.Names = new SerializerTestSuite('Names');
@@ -1773,5 +1835,4 @@ var runSerializerTestSuite = (serializer, deserializer, testSuite) => {
 
 runSerializerTestSuite(null, null, Serializer);
 Serializer.Icons.skip = true;
-Serializer.Mutations.skip = true;
 runSerializerTestSuite(state => state, state => state, Serializer);

From 91922aa571e615e4fb6e143a58964937166d9507 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Tue, 17 Aug 2021 13:55:25 +0000
Subject: [PATCH 774/833] Add throwing exceptions during deserialization
 (#5200)

* Add exception definitions

* Add tests for throwing errors during deserialization

* Add actually throwing exceptions

* Cleanup

* Cleanup

* Fix tests

* fix: PR Comments
---
 core/connection.js                      |   5 +-
 core/serialization/blocks.js            |  66 +++++--
 core/serialization/exceptions.js        | 128 ++++++++++++++
 tests/deps.js                           |   3 +-
 tests/mocha/block_test.js               |   4 +-
 tests/mocha/jso_deserialization_test.js | 219 +++++++++++++++++++++++-
 tests/mocha/test_helpers.js             |   1 +
 7 files changed, 411 insertions(+), 15 deletions(-)
 create mode 100644 core/serialization/exceptions.js

diff --git a/core/connection.js b/core/connection.js
index ae7ad8051..f2f8c3fd8 100644
--- a/core/connection.js
+++ b/core/connection.js
@@ -280,11 +280,12 @@ Connection.prototype.onFailedConnect = function(_otherConnection) {
 /**
  * Connect this connection to another connection.
  * @param {!Connection} otherConnection Connection to connect to.
+ * @return {boolean} Whether the the blocks are now connected or not.
  */
 Connection.prototype.connect = function(otherConnection) {
   if (this.targetConnection == otherConnection) {
     // Already connected together.  NOP.
-    return;
+    return true;
   }
 
   const checker = this.getConnectionChecker();
@@ -305,6 +306,8 @@ Connection.prototype.connect = function(otherConnection) {
       Events.setGroup(false);
     }
   }
+
+  return this.isConnected();
 };
 
 /**
diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index 9f55c4091..4267c295f 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -18,6 +18,8 @@ const Block = goog.requireType('Blockly.Block');
 // eslint-disable-next-line no-unused-vars
 const Connection = goog.requireType('Blockly.Connection');
 const Events = goog.require('Blockly.Events');
+const {MissingBlockType, MissingConnection, BadConnectionCheck} =
+    goog.require('Blockly.serialization.exceptions');
 // eslint-disable-next-line no-unused-vars
 const Workspace = goog.requireType('Blockly.Workspace');
 const Xml = goog.require('Blockly.Xml');
@@ -311,16 +313,15 @@ exports.load = load;
  * @return {!Block} The block that was just loaded.
  */
 const loadInternal = function(state, workspace, parentConnection = undefined) {
+  if (!state['type']) {
+    throw new MissingBlockType(state);
+  }
+
   const block = workspace.newBlock(state['type'], state['id']);
   loadCoords(block, state);
   loadAttributes(block, state);
   loadExtraState(block, state);
-  if (parentConnection &&
-      (block.outputConnection || block.previousConnection)) {
-    parentConnection.connect(
-        /** @type {!Connection} */
-        (block.outputConnection || block.previousConnection));
-  }
+  tryToConnectParent(parentConnection, block, state);
   // loadIcons(block, state);
   loadFields(block, state);
   loadInputBlocks(block, state);
@@ -383,6 +384,49 @@ const loadExtraState = function(block, state) {
   block.loadExtraState(state['extraState']);
 };
 
+/**
+ * Attempts to connect the block to the parent connection, if it exists.
+ * @param {(!Connection|undefined)} parentConnection The parent connnection to
+ *     try to connect the block to.
+ * @param {!Block} child The block to try to conecnt to the parent.
+ * @param {!State} state The state which defines the given block
+ */
+const tryToConnectParent = function(parentConnection, child, state) {
+  if (!parentConnection) {
+    return;
+  }
+  
+  let connected = false;
+  let childConnection;
+  if (parentConnection.type == inputTypes.VALUE) {
+    childConnection = child.outputConnection;
+    if (!childConnection) {
+      throw new MissingConnection('output', child, state);
+    }
+    connected = parentConnection.connect(childConnection);
+  } else { // Statement type.
+    childConnection = child.previousConnection;
+    if (!childConnection) {
+      throw new MissingConnection('previous', child, state);
+    }
+    connected = parentConnection.connect(childConnection);
+  }
+
+  if (!connected) {
+    const checker = child.workspace.connectionChecker;
+    throw new BadConnectionCheck(
+        checker.getErrorMessage(
+            checker.canConnectWithReason(
+                childConnection, parentConnection, false),
+            childConnection,
+            parentConnection),
+        parentConnection.type == inputTypes.VALUE ?
+            'output connection' : 'previous connection',
+        child,
+        state);
+  }
+};
+
 /**
  * Applies any field information available on the state object to the block.
  * @param {!Block} block The block to set the field state of.
@@ -420,9 +464,10 @@ const loadInputBlocks = function(block, state) {
   for (let i = 0; i < keys.length; i++) {
     const inputName = keys[i];
     const input = block.getInput(inputName);
-    if (input && input.connection) {
-      loadConnection(input.connection, state['inputs'][inputName]);
+    if (!input || !input.connection) {
+      throw new MissingConnection(inputName, block, state);
     }
+    loadConnection(input.connection, state['inputs'][inputName]);
   }
 };
 
@@ -436,9 +481,10 @@ const loadNextBlocks = function(block, state) {
   if (!state['next']) {
     return;
   }
-  if (block.nextConnection) {
-    loadConnection(block.nextConnection, state['next']);
+  if (!block.nextConnection) {
+    throw new MissingConnection('next', block, state);
   }
+  loadConnection(block.nextConnection, state['next']);
 };
 
 /**
diff --git a/core/serialization/exceptions.js b/core/serialization/exceptions.js
new file mode 100644
index 000000000..0ddb021a2
--- /dev/null
+++ b/core/serialization/exceptions.js
@@ -0,0 +1,128 @@
+
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Contains custom errors thrown by the serialization system.
+ */
+'use strict';
+
+goog.module('Blockly.serialization.exceptions');
+goog.module.declareLegacyNamespace();
+
+
+// eslint-disable-next-line no-unused-vars
+const {State} = goog.requireType('Blockly.serialization.blocks');
+
+class DeserializationError extends Error { }
+exports.DeserializationError = DeserializationError;
+
+/**
+ * Represents an error where the serialized state is expected to provide a
+ * block type, but it is not provided.
+ */
+class MissingBlockType extends DeserializationError {
+  /**
+   * @param {!State} state The state object which is missing the block type.
+   */
+  constructor(state) {
+    super(`Expected to find a 'type' property, defining the block type`);
+
+    /**
+     * The state object containing the bad name.
+     * @type {!State}
+     */
+    this.state = state;
+  }
+}
+exports.MissingBlockType = MissingBlockType;
+
+/**
+ * Represents an error where deserialization encountered a block that did
+ * not have a connection that was defined in the serialized state.
+ */
+class MissingConnection extends DeserializationError {
+  /**
+   * @param {string} connection The name of the connection that is missing. E.g.
+   *     'IF0', or 'next'.
+   * @param {!Blockly.Block} block The block missing the connection.
+   * @param {!State} state The state object containing the bad connection.
+   */
+  constructor(connection, block, state) {
+    super(`The block ${block.toDevString()} is missing a(n) ${connection}
+connection`);
+
+    /**
+     * The block missing the connection.
+     * @type {!Blockly.Block}
+     */
+    this.block = block;
+
+    /**
+     * The state object containing the bad name.
+     * @type {!State}
+     */
+    this.state = state;
+  }
+}
+exports.MissingConnection = MissingConnection;
+
+/**
+ * Represents an error where deserialization tried to connect two connections
+ * that were not compatible.
+ */
+class BadConnectionCheck extends DeserializationError {
+  /**
+   * @param {string} reason The reason the connections were not compatible.
+   * @param {string} childConnection The name of the incompatible child
+   *     connection. E.g. 'output' or 'previous'.
+   * @param {!Blockly.Block} childBlock The child block that could not connect
+   *     to its parent.
+   * @param {!State} childState The state object representing the child block.
+   */
+  constructor(reason, childConnection, childBlock, childState) {
+    super(`The block ${childBlock.toDevString()} could not connect its
+${childConnection} to its parent, because: ${reason}`);
+
+    /**
+     * The block that could not connect to its parent.
+     * @type {!Blockly.Block}
+     */
+    this.childBlock = childBlock;
+
+    /**
+     * The state object representing the block that could not connect to its
+     * parent.
+     * @type {!State}
+     */
+    this.childState = childState;
+  }
+}
+exports.BadConnectionCheck = BadConnectionCheck;
+
+/**
+ * Represents an error where deserialization encountered a real block as it
+ * was deserializing children of a shadow.
+ * This is an error because it is an invariant of Blockly that shadow blocks
+ * do not have real children.
+ */
+class RealChildOfShadow extends DeserializationError {
+  /**
+   * @param {!State} state The state object representing the real block.
+   */
+  constructor(state) {
+    super(`Encountered a real block which is defined as a child of a shadow
+block. It is an invariant of Blockly that shadow blocks only have shadow
+children`);
+
+    /**
+     * The state object representing the real block.
+     * @type {!State}
+     */
+    this.state = state;
+  }
+}
+exports.RealChildOfShadow = RealChildOfShadow;
diff --git a/tests/deps.js b/tests/deps.js
index 8fe9efacb..a96fa877c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -196,7 +196,8 @@ goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Ren
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes', 'Blockly.serialization.exceptions'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/exceptions.js', ['Blockly.serialization.exceptions'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Events', 'Blockly.Workspace', 'Blockly.serialization.blocks', 'Blockly.serialization.variables', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/block_test.js b/tests/mocha/block_test.js
index 19d2f750b..5d07b0d88 100644
--- a/tests/mocha/block_test.js
+++ b/tests/mocha/block_test.js
@@ -1990,7 +1990,7 @@ suite('Blocks', function() {
       var recordUndoDuringInit;
       Blockly.Blocks['init_test_block'].init = function() {
         initCalled = true;
-        recordUndoDuringInit = Blockly.Events.recordUndo;
+        recordUndoDuringInit = Blockly.Events.getRecordUndo();
         throw new Error();
       };
       chai.assert.throws(function() {
@@ -1998,7 +1998,7 @@ suite('Blocks', function() {
       }.bind(this));
       chai.assert.isFalse(recordUndoDuringInit,
           'recordUndo should be false during block init function');
-      chai.assert.isTrue(Blockly.Events.recordUndo,
+      chai.assert.isTrue(Blockly.Events.getRecordUndo(),
           'recordUndo should be reset to true after init');
       chai.assert.isTrue(initCalled, 'expected init function to be called');
     });
diff --git a/tests/mocha/jso_deserialization_test.js b/tests/mocha/jso_deserialization_test.js
index 56670f849..f248dca3f 100644
--- a/tests/mocha/jso_deserialization_test.js
+++ b/tests/mocha/jso_deserialization_test.js
@@ -16,7 +16,6 @@ suite('JSO Deserialization', function() {
   });
 
   teardown(function() {
-    workspaceTeardown.call(this, this.workspace);
     sharedTestTeardown.call(this);
   });
 
@@ -464,4 +463,222 @@ suite('JSO Deserialization', function() {
       });
     });
   });
+
+  suite('Exceptions', function() {
+    setup(function() {
+      this.assertThrows = function(state, error) {
+        chai.assert.throws(() => {
+          Blockly.serialization.workspaces.load(state, this.workspace);
+        }, error);
+      };
+    });
+
+    suite('Undefined block type', function() {
+      test('Name', function() {
+        const state = {
+          'blocks': {
+            'blocks': [
+              {
+                'type': 'not_a_real_block',
+              }
+            ]
+          }
+        };
+        this.assertThrows(state, TypeError);
+      });
+
+      test('Casing', function() {
+        const state = {
+          'blocks': {
+            'blocks': [
+              {
+                'type': 'MATH_NUMBER',
+              }
+            ]
+          }
+        };
+        this.assertThrows(state, TypeError);
+      });
+    });
+
+    suite('Missing connection', function() {
+      test('Input name', function() {
+        const state = {
+          'blocks': {
+            'blocks': [
+              {
+                'type': 'logic_compare',
+                'inputs': {
+                  'not_an_input': {
+                    'block': {
+                      'type': 'logic_boolean'
+                    }
+                  }
+                }
+              }
+            ]
+          }
+        };
+        this.assertThrows(
+            state, Blockly.serialization.exceptions.MissingConnection);
+      });
+
+      test('Input casing', function() {
+        const state = {
+          'blocks': {
+            'blocks': [
+              {
+                'type': 'logic_compare',
+                'inputs': {
+                  'a': {
+                    'block': {
+                      'type': 'logic_boolean'
+                    }
+                  }
+                }
+              }
+            ]
+          }
+        };
+        this.assertThrows(
+            state, Blockly.serialization.exceptions.MissingConnection);
+      });
+
+      test('Next', function() {
+        const state = {
+          'blocks': {
+            'blocks': [
+              {
+                'type': 'logic_compare',
+                'next': {
+                  'block': {
+                    'type': 'text_print',
+                  }
+                }
+              }
+            ]
+          }
+        };
+        this.assertThrows(
+            state, Blockly.serialization.exceptions.MissingConnection);
+      });
+
+      test('Previous', function() {
+        const state = {
+          'blocks': {
+            'blocks': [
+              {
+                'type': 'text_print',
+                'next': {
+                  'block': {
+                    'type': 'logic_compare',
+                  }
+                }
+              }
+            ]
+          }
+        };
+        this.assertThrows(
+            state, Blockly.serialization.exceptions.MissingConnection);
+      });
+
+      test('Output', function() {
+        const state = {
+          'blocks': {
+            'blocks': [
+              {
+                'type': 'logic_compare',
+                'inputs': {
+                  'A': {
+                    'block': {
+                      'type': 'text_print'
+                    }
+                  }
+                }
+              }
+            ]
+          }
+        };
+        this.assertThrows(
+            state, Blockly.serialization.exceptions.MissingConnection);
+      });
+    });
+
+    suite('Bad connection check', function() {
+      test('Bad checks', function() {
+        const state = {
+          'blocks': {
+            'blocks': [
+              {
+                'type': 'logic_operation',
+                'inputs': {
+                  'A': {
+                    'block': {
+                      'type': 'math_number'
+                    }
+                  }
+                }
+              }
+            ]
+          }
+        };
+        this.assertThrows(
+            state, Blockly.serialization.exceptions.BadConnectionCheck);
+      });
+    });
+
+    suite.skip('Real child of shadow', function() {
+      test('Input', function() {
+        const state = {
+          'blocks': {
+            'blocks': [
+              {
+                'type': 'logic_compare',
+                'inputs': {
+                  'A': {
+                    'shadow': {
+                      'type': 'logic_compare',
+                      'inputs': {
+                        'A': {
+                          'block': {
+                            'type': 'logic_boolean',
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            ]
+          }
+        };
+        this.assertThrows(
+            state, Blockly.serialization.exceptions.RealChildOfShadow);
+      });
+
+      test('Next', function() {
+        const state = {
+          'blocks': {
+            'blocks': [
+              {
+                'type': 'text_print',
+                'next': {
+                  'shadow': {
+                    'type': 'text_input',
+                    'next': {
+                      'block': {
+                        'type': 'text_input',
+                      }
+                    }
+                  }
+                }
+              }
+            ]
+          }
+        };
+        this.assertThrows(
+            state, Blockly.serialization.exceptions.RealChildOfShadow);
+      });
+    });
+  });
 });
diff --git a/tests/mocha/test_helpers.js b/tests/mocha/test_helpers.js
index 62e9252b5..66b3ffb75 100644
--- a/tests/mocha/test_helpers.js
+++ b/tests/mocha/test_helpers.js
@@ -233,6 +233,7 @@ function sharedTestTeardown() {
     // Clear Blockly.Event state.
     Blockly.Events.setGroup(false);
     Blockly.Events.disabled_ = 0;
+    Blockly.Events.setRecordUndo(true);
     if (Blockly.Events.FIRE_QUEUE_.length) {
       // If this happens, it may mean that some previous test is missing cleanup
       // (i.e. a previous test added an event to the queue on a timeout that

From 1b47953c582c328f9d95dc6c6a8a73586147d810 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Wed, 18 Aug 2021 13:51:34 +0000
Subject: [PATCH 775/833] feat: add serialization and deserialization of
 comments (#5216)

* Add tests for (de)seralizing icons

* Add logic for (de)serializing icons

* fix: add docs for saveIcons

* fix: add timeout for setting comment visible
---
 core/serialization/blocks.js          | 49 ++++++++++++++++++++-
 tests/deps.js                         |  2 +-
 tests/mocha/jso_serialization_test.js | 61 +++++++++++++++++++++++++++
 tests/mocha/serializer_test.js        |  1 -
 4 files changed, 109 insertions(+), 4 deletions(-)

diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index 4267c295f..60a54021a 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -20,6 +20,7 @@ const Connection = goog.requireType('Blockly.Connection');
 const Events = goog.require('Blockly.Events');
 const {MissingBlockType, MissingConnection, BadConnectionCheck} =
     goog.require('Blockly.serialization.exceptions');
+const Size = goog.require('Blockly.utils.Size');
 // eslint-disable-next-line no-unused-vars
 const Workspace = goog.requireType('Blockly.Workspace');
 const Xml = goog.require('Blockly.Xml');
@@ -54,6 +55,7 @@ exports.ConnectionState = ConnectionState;
  *     inline: (boolean|undefined),
  *     data: (string|undefined),
  *     extra-state: *,
+ *     icons: (!Object<string, *>|undefined),
  *     fields: (!Object<string, *>|undefined),
  *     inputs: (!Object<string, !ConnectionState>|undefined),
  *     next: (!ConnectionState|undefined)
@@ -99,6 +101,7 @@ const save = function(
   }
   saveAttributes(block, state);
   saveExtraState(block, state);
+  saveIcons(block, state);
   saveFields(block, state);
   if (addInputBlocks) {
     saveInputBlocks(block, state);
@@ -171,6 +174,25 @@ const saveExtraState = function(block, state) {
   }
 };
 
+/**
+ * Adds the state of all of the icons on the block to the given state object.
+ * @param {!Block} block The block to serialize the icon state of.
+ * @param {!State} state The state object to append to.
+ */
+const saveIcons = function(block, state) {
+  // TODO(#2105): Remove this logic and put it in the icon.
+  if (block.getCommentText()) {
+    state['icons'] = {
+      'comment': {
+        'text': block.getCommentText(),
+        'pinned': block.commentModel.pinned,
+        'height': Math.round(block.commentModel.size.height),
+        'width': Math.round(block.commentModel.size.width),
+      }
+    };
+  }
+};
+
 /**
  * Adds the state of all of the fields on the block to the given state object.
  * @param {!Block} block The block to serialize the field state of.
@@ -178,7 +200,7 @@ const saveExtraState = function(block, state) {
  */
 const saveFields = function(block, state) {
   let hasFieldState = false;
-  let fields = Object.create(null);
+  const fields = Object.create(null);
   for (let i = 0; i < block.inputList.length; i++) {
     const input = block.inputList[i];
     for (let j = 0; j < input.fieldRow.length; j++) {
@@ -322,7 +344,7 @@ const loadInternal = function(state, workspace, parentConnection = undefined) {
   loadAttributes(block, state);
   loadExtraState(block, state);
   tryToConnectParent(parentConnection, block, state);
-  // loadIcons(block, state);
+  loadIcons(block, state);
   loadFields(block, state);
   loadInputBlocks(block, state);
   loadNextBlocks(block, state);
@@ -427,6 +449,29 @@ const tryToConnectParent = function(parentConnection, child, state) {
   }
 };
 
+/**
+ * Applies icon state to the icons on the block, based on the given state
+ * object.
+ * @param {!Block} block The block to set the icon state of.
+ * @param {!State} state The state object to reference.
+ */
+const loadIcons = function(block, state) {
+  if (!state['icons']) {
+    return;
+  }
+  // TODO(#2105): Remove this logic and put it in the icon.
+  const comment = state['icons']['comment'];
+  if (comment) {
+    block.setCommentText(comment['text']);
+    block.commentModel.pinned = comment['pinned'];
+    block.commentModel.size = new Size(comment['width'], comment['height']);
+    if (comment['pinned'] && block.getCommentIcon && !block.isInFlyout) {
+      // Give the block a chance to be positioned and rendered before showing.
+      setTimeout(() => block.getCommentIcon().setVisible(true), 1);
+    }
+  }
+};
+
 /**
  * Applies any field information available on the state object to the block.
  * @param {!Block} block The block to set the field state of.
diff --git a/tests/deps.js b/tests/deps.js
index a96fa877c..13a8463ad 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -196,7 +196,7 @@ goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Ren
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes', 'Blockly.serialization.exceptions'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes', 'Blockly.serialization.exceptions', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/exceptions.js', ['Blockly.serialization.exceptions'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Events', 'Blockly.Workspace', 'Blockly.serialization.blocks', 'Blockly.serialization.variables', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/jso_serialization_test.js b/tests/mocha/jso_serialization_test.js
index 83647f5e7..51dfe3c27 100644
--- a/tests/mocha/jso_serialization_test.js
+++ b/tests/mocha/jso_serialization_test.js
@@ -274,6 +274,67 @@ suite('JSO Serialization', function() {
       });
     });
 
+    suite('Icons', function() {
+      suite('Comment', function() {
+        test('Basic', function() {
+          const block = this.workspace.newBlock('row_block');
+          block.setCommentText('test');
+          const jso = Blockly.serialization.blocks.save(block);
+          assertProperty(
+              jso,
+              'icons',
+              {
+                'comment': {
+                  'text': 'test',
+                  'pinned': false,
+                  'height': 80,
+                  'width': 160,
+                }
+              },
+          );
+        });
+
+        test('Pinned', function() {
+          const block = this.workspace.newBlock('row_block');
+          block.setCommentText('test');
+          block.commentModel.pinned = true;
+          const jso = Blockly.serialization.blocks.save(block);
+          assertProperty(
+              jso,
+              'icons',
+              {
+                'comment': {
+                  'text': 'test',
+                  'pinned': true,
+                  'height': 80,
+                  'width': 160,
+                }
+              },
+          );
+        });
+
+        test('Size', function() {
+          const block = this.workspace.newBlock('row_block');
+          block.setCommentText('test');
+          block.commentModel.size.height = 40;
+          block.commentModel.size.width = 320;
+          const jso = Blockly.serialization.blocks.save(block);
+          assertProperty(
+              jso,
+              'icons',
+              {
+                'comment': {
+                  'text': 'test',
+                  'pinned': false,
+                  'height': 40,
+                  'width': 320,
+                }
+              },
+          );
+        });
+      });
+    });
+
     suite('Fields', function() {
       class StringStateField extends Blockly.Field {
         constructor(value, validator = undefined, config = undefined) {
diff --git a/tests/mocha/serializer_test.js b/tests/mocha/serializer_test.js
index 466c16859..4fd20f901 100644
--- a/tests/mocha/serializer_test.js
+++ b/tests/mocha/serializer_test.js
@@ -1834,5 +1834,4 @@ var runSerializerTestSuite = (serializer, deserializer, testSuite) => {
 };
 
 runSerializerTestSuite(null, null, Serializer);
-Serializer.Icons.skip = true;
 runSerializerTestSuite(state => state, state => state, Serializer);

From 1d4cbd1ab6df6380de6b51eb3fe9852c6c8ef23a Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Thu, 19 Aug 2021 13:50:48 +0000
Subject: [PATCH 776/833] Add serializing shadows as JSOs for the JSO system
 (#5246)

* Move existing tests into new suite

* Add tests for setShadowState

* Add assertions for serialization

* Unskip serialization tests

* Add logic to handle shadows in both systems

* Uncomment tests

* fix: add access modifiers to new comment funcs

* fix: fixup types

* fix: remove addNextBlocks = true

* feat: add real child of shadow errors

* fix: types
---
 core/connection.js                      |  183 +-
 core/rendered_connection.js             |    1 -
 core/serialization/blocks.js            |   23 +-
 tests/deps.js                           |    4 +-
 tests/deps.mocha.js                     |   15 +-
 tests/mocha/connection_test.js          | 3100 ++++++++++++++++++-----
 tests/mocha/jso_deserialization_test.js |    6 +-
 tests/mocha/jso_serialization_test.js   |   20 +-
 8 files changed, 2610 insertions(+), 742 deletions(-)

diff --git a/core/connection.js b/core/connection.js
index f2f8c3fd8..510ed90a2 100644
--- a/core/connection.js
+++ b/core/connection.js
@@ -23,6 +23,7 @@ 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 connectionTypes = goog.require('Blockly.connectionTypes');
 const deprecation = goog.require('Blockly.utils.deprecation');
 /** @suppress {extraRequire} */
@@ -121,16 +122,15 @@ Connection.prototype.connect_ = function(childConnection) {
   // Make sure the parentConnection is available.
   let orphan;
   if (parentConnection.isConnected()) {
-    const shadowDom = parentConnection.getShadowDom(true);
-    parentConnection.shadowDom_ = null;  // Set to null so it doesn't respawn.
-    const target = parentConnection.targetBlock();
+    let shadowState = parentConnection.stashShadowState_();
+    var target = parentConnection.targetBlock();
     if (target.isShadow()) {
       target.dispose(false);
     } else {
       parentConnection.disconnect();
       orphan = target;
     }
-    parentConnection.shadowDom_ = shadowDom;
+    parentConnection.applyShadowState_(shadowState);
   }
 
   // Connect the new connection to the parent.
@@ -169,7 +169,7 @@ Connection.prototype.dispose = function() {
   // isConnected returns true for shadows and non-shadows.
   if (this.isConnected()) {
     // Destroy the attached shadow block & its children (if it exists).
-    this.setShadowDom(null);
+    this.setShadowStateInternal_();
 
     const targetBlock = this.targetBlock();
     if (targetBlock) {
@@ -464,18 +464,8 @@ Connection.prototype.disconnectInternal_ = function(parentBlock, childBlock) {
  * @protected
  */
 Connection.prototype.respawnShadow_ = function() {
-  const parentBlock = this.getSourceBlock();
-  const shadow = this.getShadowDom();
-  if (parentBlock.workspace && shadow) {
-    const blockShadow = Xml.domToBlock(shadow, parentBlock.workspace);
-    if (blockShadow.outputConnection) {
-      this.connect(blockShadow.outputConnection);
-    } else if (blockShadow.previousConnection) {
-      this.connect(blockShadow.previousConnection);
-    } else {
-      throw Error('Child block does not have output or previous statement.');
-    }
-  }
+  // Have to keep respawnShadow_ for backwards compatibility.
+  this.createShadowBlock_(true);
 };
 
 /**
@@ -569,18 +559,10 @@ Connection.prototype.getCheck = function() {
 
 /**
  * Changes the connection's shadow block.
- * @param {?Element} shadow DOM representation of a block or null.
+ * @param {?Element} shadowDom DOM representation of a block or null.
  */
-Connection.prototype.setShadowDom = function(shadow) {
-  this.shadowDom_ = shadow;
-  const target = this.targetBlock();
-  if (!target) {
-    this.respawnShadow_();
-  } else if (target.isShadow()) {
-    // The disconnect from dispose will automatically generate the new shadow.
-    target.dispose(false);
-    this.respawnShadow_();
-  }
+Connection.prototype.setShadowDom = function(shadowDom) {
+  this.setShadowStateInternal_({shadowDom: shadowDom});
 };
 
 /**
@@ -598,6 +580,32 @@ Connection.prototype.getShadowDom = function(returnCurrent) {
       this.shadowDom_;
 };
 
+/**
+ * Changes the connection's shadow block.
+ * @param {?blocks.State} shadowState An state represetation of the block or
+ *     null.
+ */
+Connection.prototype.setShadowState = function(shadowState) {
+  this.setShadowStateInternal_({shadowState: shadowState});
+};
+
+/**
+ * Returns the serialized object representation of the connection's shadow
+ * block.
+ * @param {boolean=} returnCurrent If true, and the shadow block is currently
+ *     attached to this connection, this serializes the state of that block
+ *     and returns it (so that field values are correct). Otherwise the saved
+ *     state is just returned.
+ * @return {?blocks.State} Serialized object representation of the block, or
+ *     null.
+ */
+Connection.prototype.getShadowState = function(returnCurrent) {
+  if (returnCurrent && this.targetBlock() && this.targetBlock().isShadow()) {
+    return blocks.save(/** @type {!Block} */ (this.targetBlock()));
+  }
+  return this.shadowState_;
+};
+
 /**
  * Find all nearby compatible connections to this connection.
  * Type checking does not apply, since this function is used for bumping.
@@ -667,4 +675,123 @@ Connection.prototype.toString = function() {
   return msg + block.toDevString();
 };
 
+/**
+ * Returns the state of the shadowDom_ and shadowState_ properties, then
+ * temporarily sets those properties to null so no shadow respawns.
+ * @return {{shadowDom: ?Element, shadowState: ?blocks.State}} The state of both
+ *     the shadowDom_ and shadowState_ properties.
+ * @private
+ */
+Connection.prototype.stashShadowState_ = function() {
+  const shadowDom = this.getShadowDom(true);
+  const shadowState = this.getShadowState(true);
+  // Set to null so it doesn't respawn.
+  this.shadowDom_ = null;
+  this.shadowState_ = null;
+  return {shadowDom, shadowState};
+};
+
+/**
+ * Reapplies the stashed state of the shadowDom_ and shadowState_ properties.
+ * @param {{shadowDom: ?Element, shadowState: ?blocks.State}} param0 The state
+ *     to reapply to the shadowDom_ and shadowState_ properties.
+ * @private
+ */
+Connection.prototype.applyShadowState_ =
+    function({shadowDom, shadowState}) {
+      this.shadowDom_ = shadowDom;
+      this.shadowState_ = shadowState;
+    };
+
+/**
+ * Sets the state of the shadow of this connection.
+ * @param {{shadowDom: (?Element|undefined), shadowState:
+ *     (?blocks.State|undefined)}=} param0 The state to set the shadow of this
+ *     connection to.
+ * @private
+ */
+Connection.prototype.setShadowStateInternal_ =
+    function({shadowDom = null, shadowState = null} = {}) {
+      // One or both of these should always be null.
+      // If neither is null, the shadowState will get priority.
+      this.shadowDom_ = shadowDom;
+      this.shadowState_ = shadowState;
+
+      var target = this.targetBlock();
+      if (!target) {
+        this.respawnShadow_();
+        if (this.targetBlock() && this.targetBlock().isShadow()) {
+          this.serializeShadow_(this.targetBlock());
+        }
+      } else if (target.isShadow()) {
+        target.dispose(false);
+        this.respawnShadow_();
+        if (this.targetBlock() && this.targetBlock().isShadow()) {
+          this.serializeShadow_(this.targetBlock());
+        }
+      } else {
+        var shadow = this.createShadowBlock_(false);
+        this.serializeShadow_(shadow);
+        if (shadow) {
+          shadow.dispose(false);
+        }
+      }
+    };
+
+/**
+ * Creates a shadow block based on the current shadowState_ or shadowDom_.
+ * shadowState_ gets priority.
+ * @param {boolean} attemptToConnect Whether to try to connect the shadow block
+ *     to this connection or not.
+ * @return {?Block} The shadow block that was created, or null if both the
+ *     shadowState_ and shadowDom_ are null.
+ * @private
+ */
+Connection.prototype.createShadowBlock_ = function(attemptToConnect) {
+  var parentBlock = this.getSourceBlock();
+  var shadowState = this.getShadowState();
+  var shadowDom = this.getShadowDom();
+  if (!parentBlock.workspace || (!shadowState && !shadowDom)) {
+    return null;
+  }
+
+  if (shadowState) {
+    var blockShadow = blocks.loadInternal(
+        shadowState,
+        parentBlock.workspace,
+        attemptToConnect ? this : undefined,
+        true);
+    return blockShadow;
+  }
+  
+  if (shadowDom) {
+    blockShadow = Xml.domToBlock(shadowDom, parentBlock.workspace);
+    if (attemptToConnect) {
+      if (blockShadow.outputConnection) {
+        this.connect(blockShadow.outputConnection);
+      } else if (blockShadow.previousConnection) {
+        this.connect(blockShadow.previousConnection);
+      } else {
+        throw Error('Shadow block does not have output or previous statement.');
+      }
+    }
+    return blockShadow;
+  }
+  return null;
+};
+
+/**
+ * Saves the given shadow block to both the shadowDom_ and shadowState_
+ * properties, in their respective serialized forms.
+ * @param {?Block} shadow The shadow to serialize, or null.
+ * @private
+ */
+Connection.prototype.serializeShadow_ = function(shadow) {
+  if (!shadow) {
+    return;
+  }
+  this.shadowDom_ = /** @type {!Element} */ (Xml.blockToDom(shadow));
+  this.shadowState_ = blocks.save(shadow);
+};
+
 exports = Connection;
diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index 2e172e6b9..a4958c0f9 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -506,7 +506,6 @@ RenderedConnection.prototype.respawnShadow_ = function() {
   RenderedConnection.superClass_.respawnShadow_.call(this);
   const blockShadow = this.targetBlock();
   if (!blockShadow) {
-    // This connection must not have a shadowDom_.
     return;
   }
   blockShadow.initSvg();
diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index 60a54021a..531b7cb77 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -13,17 +13,15 @@
 goog.module('Blockly.serialization.blocks');
 goog.module.declareLegacyNamespace();
 
+const {BadConnectionCheck, MissingBlockType, MissingConnection, RealChildOfShadow} = goog.require('Blockly.serialization.exceptions');
 // eslint-disable-next-line no-unused-vars
 const Block = goog.requireType('Blockly.Block');
 // eslint-disable-next-line no-unused-vars
 const Connection = goog.requireType('Blockly.Connection');
 const Events = goog.require('Blockly.Events');
-const {MissingBlockType, MissingConnection, BadConnectionCheck} =
-    goog.require('Blockly.serialization.exceptions');
 const Size = goog.require('Blockly.utils.Size');
 // eslint-disable-next-line no-unused-vars
 const Workspace = goog.requireType('Blockly.Workspace');
-const Xml = goog.require('Blockly.Xml');
 const inputTypes = goog.require('Blockly.inputTypes');
 
 
@@ -266,15 +264,14 @@ const saveNextBlocks = function(block, state) {
  *     shadow block, or any connected real block.
  */
 const saveConnection = function(connection) {
-  const shadow = connection.getShadowDom();
+  const shadow = connection.getShadowState();
   const child = connection.targetBlock();
   if (!shadow && !child) {
     return null;
   }
   var state = Object.create(null);
   if (shadow) {
-    state['shadow'] = Xml.domToText(shadow)
-        .replace('xmlns="https://developers.google.com/blockly/xml"', '');
+    state['shadow'] = shadow;
   }
   if (child && !child.isShadow()) {
     state['block'] = save(child);
@@ -332,14 +329,18 @@ exports.load = load;
  * @param {!Workspace} workspace The workspace to add the block to.
  * @param {!Connection=} parentConnection The optional parent connection to
  *     attach the block to.
+ * @param {boolean} isShadow Whether the block we are loading is a shadow block
+ *     or not.
  * @return {!Block} The block that was just loaded.
  */
-const loadInternal = function(state, workspace, parentConnection = undefined) {
+const loadInternal = function(
+    state, workspace, parentConnection = undefined, isShadow = false) {
   if (!state['type']) {
     throw new MissingBlockType(state);
   }
 
   const block = workspace.newBlock(state['type'], state['id']);
+  block.setShadow(isShadow);
   loadCoords(block, state);
   loadAttributes(block, state);
   loadExtraState(block, state);
@@ -351,6 +352,8 @@ const loadInternal = function(state, workspace, parentConnection = undefined) {
   initBlock(block, workspace.rendered);
   return block;
 };
+/** @package */
+exports.loadInternal = loadInternal;
 
 /**
  * Applies any coordinate information available on the state object to the
@@ -417,6 +420,10 @@ const tryToConnectParent = function(parentConnection, child, state) {
   if (!parentConnection) {
     return;
   }
+
+  if (parentConnection.getSourceBlock().isShadow() && !child.isShadow()) {
+    throw new RealChildOfShadow(state);
+  }
   
   let connected = false;
   let childConnection;
@@ -542,7 +549,7 @@ const loadNextBlocks = function(block, state) {
  */
 const loadConnection = function(connection, connectionState) {
   if (connectionState['shadow']) {
-    connection.setShadowDom(Blockly.Xml.textToDom(connectionState['shadow']));
+    connection.setShadowState(connectionState['shadow']);
   }
   if (connectionState['block']) {
     loadInternal(
diff --git a/tests/deps.js b/tests/deps.js
index 13a8463ad..32bf81b39 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -23,7 +23,7 @@ goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.E
 goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.serialization.blocks', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
@@ -196,7 +196,7 @@ goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Ren
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes', 'Blockly.serialization.exceptions', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.serialization.exceptions', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/exceptions.js', ['Blockly.serialization.exceptions'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Events', 'Blockly.Workspace', 'Blockly.serialization.blocks', 'Blockly.serialization.variables', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index f9300ac27..85364266c 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -1,10 +1,10 @@
 goog.addDependency('../../blocks/colour.js', ['Blockly.Blocks.colour', 'Blockly.Constants.Colour'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldColour', 'Blockly.FieldLabel']);
-goog.addDependency('../../blocks/lists.js', ['Blockly.Constants.Lists'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator']);
+goog.addDependency('../../blocks/lists.js', ['Blockly.Constants.Lists'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator'], {'lang': 'es5'});
 goog.addDependency('../../blocks/logic.js', ['Blockly.Blocks.logic', 'Blockly.Constants.Logic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator']);
 goog.addDependency('../../blocks/loops.js', ['Blockly.Blocks.loops', 'Blockly.Constants.Loops'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable', 'Blockly.Warning']);
-goog.addDependency('../../blocks/math.js', ['Blockly.Blocks.math', 'Blockly.Constants.Math'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable']);
-goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'], ['Blockly', 'Blockly.Blocks', 'Blockly.Comment', 'Blockly.FieldCheckbox', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.Mutator', 'Blockly.Warning'], {'lang': 'es5'});
-goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator']);
+goog.addDependency('../../blocks/math.js', ['Blockly.Blocks.math', 'Blockly.Constants.Math'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable'], {'lang': 'es5'});
+goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'], ['Blockly', 'Blockly.Blocks', 'Blockly.Comment', 'Blockly.FieldCheckbox', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.Mutator', 'Blockly.Warning'], {'lang': 'es6'});
+goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator'], {'lang': 'es5'});
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -23,7 +23,7 @@ goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.E
 goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.serialization.blocks', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
@@ -196,7 +196,8 @@ goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Ren
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.serialization.exceptions', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/exceptions.js', ['Blockly.serialization.exceptions'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Events', 'Blockly.Workspace', 'Blockly.serialization.blocks', 'Blockly.serialization.variables', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
@@ -332,7 +333,7 @@ goog.addDependency('../../tests/mocha/gesture_test.js', ['Blockly.test.gesture']
 goog.addDependency('../../tests/mocha/input_test.js', ['Blockly.test.input'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/insertion_marker_test.js', ['Blockly.test.insertionMarker'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/jso_deserialization_test.js', ['Blockly.test.jsoDeserialization'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/jso_serialization_test.js', ['Blockly.test.jsoSerialization'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/jso_serialization_test.js', ['Blockly.test.jsoSerialization'], ['Blockly.test.helpers'], {'lang': 'es8', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/json_test.js', ['Blockly.test.json'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/keydown_test.js', ['Blockly.test.keydown'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/logic_ternary_test.js', ['Blockly.test.logicTernary'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/connection_test.js b/tests/mocha/connection_test.js
index eaaa07876..a9788a29f 100644
--- a/tests/mocha/connection_test.js
+++ b/tests/mocha/connection_test.js
@@ -6,7 +6,7 @@
 
 goog.module('Blockly.test.connection');
 
-const {assertSingleDeprecationWarningCall, createDeprecationWarningStub, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
+const {assertSingleDeprecationWarningCall, createDeprecationWarningStub, createGenUidStubWithReturns, defineRowBlock, defineStatementBlock, defineStackBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
 
 
 suite('Connection', function() {
@@ -30,8 +30,8 @@ suite('Connection', function() {
 
   test('Deprecated - canConnectWithReason passes', function() {
     var deprecateWarnSpy = createDeprecationWarningStub();
-    var conn1 = this.createConnection(Blockly.PREVIOUS_STATEMENT);
-    var conn2 = this.createConnection(Blockly.NEXT_STATEMENT);
+    var conn1 = this.createConnection(Blockly.PREVIOUS_NAME);
+    var conn2 = this.createConnection(Blockly.NEXT_NAME);
     chai.assert.equal(conn1.canConnectWithReason(conn2),
         Blockly.Connection.CAN_CONNECT);
     assertSingleDeprecationWarningCall(deprecateWarnSpy,
@@ -40,7 +40,7 @@ suite('Connection', function() {
 
   test('Deprecated - canConnectWithReason fails', function() {
     var deprecateWarnSpy = createDeprecationWarningStub();
-    var conn1 = this.createConnection(Blockly.PREVIOUS_STATEMENT);
+    var conn1 = this.createConnection(Blockly.PREVIOUS_NAME);
     var conn2 = this.createConnection(Blockly.OUTPUT_VALUE);
     chai.assert.equal(conn1.canConnectWithReason(conn2),
         Blockly.Connection.REASON_WRONG_TYPE);
@@ -50,8 +50,8 @@ suite('Connection', function() {
 
   test('Deprecated - checkConnection passes', function() {
     var deprecateWarnSpy = createDeprecationWarningStub();
-    var conn1 = this.createConnection(Blockly.PREVIOUS_STATEMENT);
-    var conn2 = this.createConnection(Blockly.NEXT_STATEMENT);
+    var conn1 = this.createConnection(Blockly.PREVIOUS_NAME);
+    var conn2 = this.createConnection(Blockly.NEXT_NAME);
     chai.assert.doesNotThrow(function() {
       conn1.checkConnection(conn2);
     });
@@ -61,7 +61,7 @@ suite('Connection', function() {
 
   test('Deprecated - checkConnection fails', function() {
     var deprecateWarnSpy = createDeprecationWarningStub();
-    var conn1 = this.createConnection(Blockly.PREVIOUS_STATEMENT);
+    var conn1 = this.createConnection(Blockly.PREVIOUS_NAME);
     var conn2 = this.createConnection(Blockly.OUTPUT_VALUE);
     chai.assert.throws(function() {
       conn1.checkConnection(conn2);
@@ -70,7 +70,7 @@ suite('Connection', function() {
         'Connection.prototype.checkConnection');
   });
 
-  suite('Set Shadow Dom', function() {
+  suite('Set Shadow', function() {
 
     function assertBlockMatches(block, isShadow, opt_id) {
       chai.assert.equal(block.isShadow(), isShadow,
@@ -105,6 +105,14 @@ suite('Connection', function() {
       chai.assert.notExists(block,
           `expected block ${block && block.id} to not be attached to next connection`);
     }
+    
+    function assertSerialization(block, jso, xmlText) {
+      const actualJso = Blockly.serialization.blocks
+          .save(block, {addNextBlocks: true});
+      const actualXml = Blockly.Xml.domToText(Blockly.Xml.blockToDom(block));
+      chai.assert.deepEqual(actualJso, jso);
+      chai.assert.equal(actualXml, xmlText);
+    }
 
     var testSuites = [
       {
@@ -127,660 +135,2386 @@ suite('Connection', function() {
         setup(function() {
           this.workspace = testSuite.createWorkspace();
 
-          Blockly.defineBlocksWithJsonArray([
-            {
-              "type": "stack_block",
-              "message0": "",
-              "previousStatement": null,
-              "nextStatement": null
-            },
-            {
-              "type": "row_block",
-              "message0": "%1",
-              "args0": [
-                {
-                  "type": "input_value",
-                  "name": "INPUT"
-                }
-              ],
-              "output": null
-            },
-            {
-              "type": "statement_block",
-              "message0": "%1",
-              "args0": [
-                {
-                  "type": "input_statement",
-                  "name": "STATEMENT"
-                }
-              ],
-              "previousStatement": null,
-              "nextStatement": null
-            }]);
+          defineRowBlock();
+          defineStatementBlock();
+          defineStackBlock();
+
+          createGenUidStubWithReturns(
+              new Array(30).fill().map((_, i) => 'id' + i));
         });
 
         teardown(function() {
           workspaceTeardown.call(this, this.workspace);
         });
 
-        suite('Add - No Block Connected', function() {
-          // These are defined separately in each suite.
-          function createRowBlock(workspace) {
-            var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
-                '<block type="row_block"/>'
-            ), workspace);
-            return block;
-          }
-
-          function createStatementBlock(workspace) {
-            var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
-                '<block type="statement_block"/>'
-            ), workspace);
-            return block;
-          }
-
-          function createStackBlock(workspace) {
-            var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
-                '<block type="stack_block"/>'
-            ), workspace);
-            return block;
-          }
-
-          test('Value', function() {
-            var parent = createRowBlock(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="row_block"/>'
-            );
-            parent.getInput('INPUT').connection.setShadowDom(xml);
-            assertInputHasBlock(parent, 'INPUT', true);
+        suite('setShadowDom', function() {
+          suite('Add - No Block Connected', function() {
+            // These are defined separately in each suite.
+            function createRowBlock(workspace) {
+              var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
+                  '<block type="row_block" id="id0"/>'
+              ), workspace);
+              return block;
+            }
+  
+            function createStatementBlock(workspace) {
+              var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
+                  '<block type="statement_block" id="id0"/>'
+              ), workspace);
+              return block;
+            }
+  
+            function createStackBlock(workspace) {
+              var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
+                  '<block type="stack_block" id="id0"/>'
+              ), workspace);
+              return block;
+            }
+  
+            test('Value', function() {
+              var parent = createRowBlock(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="row_block" id="id1"/>'
+              );
+              parent.getInput('INPUT').connection.setShadowDom(xml);
+              assertInputHasBlock(parent, 'INPUT', true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'row_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'INPUT': {
+                        'shadow': {
+                          'type': 'row_block',
+                          'id': 'id1',
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="row_block" id="id0">' +
+                  '<value name="INPUT">' +
+                  '<shadow type="row_block" id="id1"></shadow>' +
+                  '</value>' +
+                  '</block>'
+              );
+            });
+  
+            test('Multiple Value', function() {
+              var parent = createRowBlock(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="row_block" id="id1">' +
+                  '  <value name="INPUT">' +
+                  '    <shadow type="row_block" id="id2"/>' +
+                  '  </value>' +
+                  '</shadow>'
+              );
+              parent.getInput('INPUT').connection.setShadowDom(xml);
+              assertInputHasBlock(parent, 'INPUT', true);
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('INPUT'), 'INPUT', true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'row_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'INPUT': {
+                        'shadow': {
+                          'type': 'row_block',
+                          'id': 'id1',
+                          'inputs': {
+                            'INPUT': {
+                              'shadow': {
+                                'type': 'row_block',
+                                'id': 'id2',
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="row_block" id="id0">' +
+                  '<value name="INPUT">' +
+                  '<shadow type="row_block" id="id1">' +
+                  '<value name="INPUT">' +
+                  '<shadow type="row_block" id="id2"></shadow>' +
+                  '</value>' +
+                  '</shadow>' +
+                  '</value>' +
+                  '</block>'
+              );
+            });
+  
+            test('Statement', function() {
+              var parent = createStatementBlock(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="statement_block" id="id1"/>'
+              );
+              parent.getInput('NAME').connection.setShadowDom(xml);
+              assertInputHasBlock(parent, 'NAME', true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'statement_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'NAME': {
+                        'shadow': {
+                          'type': 'statement_block',
+                          'id': 'id1',
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="statement_block" id="id0">' +
+                  '<statement name="NAME">' +
+                  '<shadow type="statement_block" id="id1"></shadow>' +
+                  '</statement>' +
+                  '</block>'
+              );
+            });
+  
+            test('Multiple Statement', function() {
+              var parent = createStatementBlock(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="statement_block" id="id1">' +
+                  '  <statement name="NAME">' +
+                  '    <shadow type="statement_block" id="id2"/>' +
+                  '  </statement>' +
+                  '</shadow>'
+              );
+              parent.getInput('NAME').connection.setShadowDom(xml);
+              assertInputHasBlock(parent, 'NAME', true);
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('NAME'), 'NAME', true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'statement_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'NAME': {
+                        'shadow': {
+                          'type': 'statement_block',
+                          'id': 'id1',
+                          'inputs': {
+                            'NAME': {
+                              'shadow': {
+                                'type': 'statement_block',
+                                'id': 'id2',
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="statement_block" id="id0">' +
+                  '<statement name="NAME">' +
+                  '<shadow type="statement_block" id="id1">' +
+                  '<statement name="NAME">' +
+                  '<shadow type="statement_block" id="id2"></shadow>' +
+                  '</statement>' +
+                  '</shadow>' +
+                  '</statement>' +
+                  '</block>'
+              );
+            });
+  
+            test('Next', function() {
+              var parent = createStackBlock(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="stack_block" id="id1"/>'
+              );
+              parent.nextConnection.setShadowDom(xml);
+              assertNextHasBlock(parent, true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'stack_block',
+                    'id': 'id0',
+                    'next': {
+                      'shadow': {
+                        'type': 'stack_block',
+                        'id': 'id1',
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="stack_block" id="id0">' +
+                  '<next>' +
+                  '<shadow type="stack_block" id="id1"></shadow>' +
+                  '</next>' +
+                  '</block>'
+              );
+            });
+  
+            test('Multiple Next', function() {
+              var parent = createStackBlock(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="stack_block" id="id1">' +
+                  '  <next>' +
+                  '    <shadow type="stack_block" id="id2"/>' +
+                  '  </next>' +
+                  '</shadow>'
+              );
+              parent.nextConnection.setShadowDom(xml);
+              assertNextHasBlock(parent, true);
+              assertNextHasBlock(parent.getNextBlock(), true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'stack_block',
+                    'id': 'id0',
+                    'next': {
+                      'shadow': {
+                        'type': 'stack_block',
+                        'id': 'id1',
+                        'next': {
+                          'shadow': {
+                            'type': 'stack_block',
+                            'id': 'id2',
+                          }
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="stack_block" id="id0">' +
+                  '<next>' +
+                  '<shadow type="stack_block" id="id1">' +
+                  '<next>' +
+                  '<shadow type="stack_block" id="id2"></shadow>' +
+                  '</next>' +
+                  '</shadow>' +
+                  '</next>' +
+                  '</block>'
+              );
+            });
           });
-
-          test('Multiple Value', function() {
-            var parent = createRowBlock(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="row_block">' +
-                '  <value name="INPUT">' +
-                '    <shadow type="row_block"/>' +
-                '  </value>' +
-                '</shadow>'
-            );
-            parent.getInput('INPUT').connection.setShadowDom(xml);
-            assertInputHasBlock(parent, 'INPUT', true);
-            assertInputHasBlock(
-                parent.getInputTargetBlock('INPUT'), 'INPUT', true);
+  
+          suite('Add - With Block Connected', function() {
+            // These are defined separately in each suite.
+            function createRowBlocks(workspace) {
+              var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
+                  '<block type="row_block" id="id0">' +
+                  '  <value name="INPUT">' +
+                  '    <block type="row_block" id="idA"/>' +
+                  '  </value>' +
+                  '</block>'
+              ), workspace);
+              return block;
+            }
+  
+            function createStatementBlocks(workspace) {
+              var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
+                  '<block type="statement_block" id="id0">' +
+                  '  <statement name="NAME">' +
+                  '    <block type="statement_block" id="idA"/>' +
+                  '  </statement>' +
+                  '</block>'
+              ), workspace);
+              return block;
+            }
+  
+            function createStackBlocks(workspace) {
+              var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
+                  '<block type="stack_block" id="id0">' +
+                  '  <next>' +
+                  '    <block type="stack_block" id="idA"/>' +
+                  '  </next>' +
+                  '</block>'
+              ), workspace);
+              return block;
+            }
+  
+            test('Value', function() {
+              var parent = createRowBlocks(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="row_block" id="id1"/>'
+              );
+              parent.getInput('INPUT').connection.setShadowDom(xml);
+              assertInputHasBlock(parent, 'INPUT', false);
+              parent.getInput('INPUT').connection.disconnect();
+              assertInputHasBlock(parent, 'INPUT', true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'row_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'INPUT': {
+                        'shadow': {
+                          'type': 'row_block',
+                          'id': 'id1',
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="row_block" id="id0">' +
+                  '<value name="INPUT">' +
+                  '<shadow type="row_block" id="id1"></shadow>' +
+                  '</value>' +
+                  '</block>'
+              );
+            });
+  
+            test('Multiple Value', function() {
+              var parent = createRowBlocks(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="row_block" id="id1">' +
+                  '  <value name="INPUT">' +
+                  '    <shadow type="row_block" id="id2"/>' +
+                  '  </value>' +
+                  '</shadow>'
+              );
+              parent.getInput('INPUT').connection.setShadowDom(xml);
+              assertInputHasBlock(parent, 'INPUT', false);
+              assertInputNotHasBlock(parent.getInputTargetBlock('INPUT'), 'INPUT');
+              parent.getInput('INPUT').connection.disconnect();
+              assertInputHasBlock(parent, 'INPUT', true);
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('INPUT'), 'INPUT', true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'row_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'INPUT': {
+                        'shadow': {
+                          'type': 'row_block',
+                          'id': 'id1',
+                          'inputs': {
+                            'INPUT': {
+                              'shadow': {
+                                'type': 'row_block',
+                                'id': 'id2',
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="row_block" id="id0">' +
+                  '<value name="INPUT">' +
+                  '<shadow type="row_block" id="id1">' +
+                  '<value name="INPUT">' +
+                  '<shadow type="row_block" id="id2"></shadow>' +
+                  '</value>' +
+                  '</shadow>' +
+                  '</value>' +
+                  '</block>'
+              );
+            });
+  
+            test('Statement', function() {
+              var parent = createStatementBlocks(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="statement_block" id="id1"/>'
+              );
+              parent.getInput('NAME').connection.setShadowDom(xml);
+              assertInputHasBlock(parent, 'NAME', false);
+              parent.getInput('NAME').connection.disconnect();
+              assertInputHasBlock(parent, 'NAME', true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'statement_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'NAME': {
+                        'shadow': {
+                          'type': 'statement_block',
+                          'id': 'id1',
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="statement_block" id="id0">' +
+                  '<statement name="NAME">' +
+                  '<shadow type="statement_block" id="id1"></shadow>' +
+                  '</statement>' +
+                  '</block>'
+              );
+            });
+  
+            test('Multiple Statement', function() {
+              var parent = createStatementBlocks(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="statement_block" id="id1">' +
+                  '  <statement name="NAME">' +
+                  '    <shadow type="statement_block" id="id2"/>' +
+                  '  </statement>' +
+                  '</shadow>'
+              );
+              parent.getInput('NAME').connection.setShadowDom(xml);
+              assertInputHasBlock(parent, 'NAME', false);
+              assertInputNotHasBlock(
+                  parent.getInputTargetBlock('NAME'), 'NAME');
+              parent.getInput('NAME').connection.disconnect();
+              assertInputHasBlock(parent, 'NAME', true);
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('NAME'), 'NAME', true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'statement_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'NAME': {
+                        'shadow': {
+                          'type': 'statement_block',
+                          'id': 'id1',
+                          'inputs': {
+                            'NAME': {
+                              'shadow': {
+                                'type': 'statement_block',
+                                'id': 'id2',
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="statement_block" id="id0">' +
+                  '<statement name="NAME">' +
+                  '<shadow type="statement_block" id="id1">' +
+                  '<statement name="NAME">' +
+                  '<shadow type="statement_block" id="id2"></shadow>' +
+                  '</statement>' +
+                  '</shadow>' +
+                  '</statement>' +
+                  '</block>'
+              );
+            });
+  
+            test('Next', function() {
+              var parent = createStackBlocks(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="stack_block" id="id1"/>'
+              );
+              parent.nextConnection.setShadowDom(xml);
+              assertNextHasBlock(parent, false);
+              parent.nextConnection.disconnect();
+              assertNextHasBlock(parent, true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'stack_block',
+                    'id': 'id0',
+                    'next': {
+                      'shadow': {
+                        'type': 'stack_block',
+                        'id': 'id1',
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="stack_block" id="id0">' +
+                  '<next>' +
+                  '<shadow type="stack_block" id="id1"></shadow>' +
+                  '</next>' +
+                  '</block>'
+              );
+            });
+  
+            test('Multiple Next', function() {
+              var parent = createStackBlocks(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="stack_block" id="id1">' +
+                  '  <next>' +
+                  '    <shadow type="stack_block" id="id2"/>' +
+                  '  </next>' +
+                  '</shadow>'
+              );
+              parent.nextConnection.setShadowDom(xml);
+              assertNextHasBlock(parent, false);
+              assertNextNotHasBlock(parent.getNextBlock());
+              parent.nextConnection.disconnect();
+              assertNextHasBlock(parent, true);
+              assertNextHasBlock(parent.getNextBlock(), true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'stack_block',
+                    'id': 'id0',
+                    'next': {
+                      'shadow': {
+                        'type': 'stack_block',
+                        'id': 'id1',
+                        'next': {
+                          'shadow': {
+                            'type': 'stack_block',
+                            'id': 'id2',
+                          }
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="stack_block" id="id0">' +
+                  '<next>' +
+                  '<shadow type="stack_block" id="id1">' +
+                  '<next>' +
+                  '<shadow type="stack_block" id="id2"></shadow>' +
+                  '</next>' +
+                  '</shadow>' +
+                  '</next>' +
+                  '</block>'
+              );
+            });
           });
-
-          test('Statement', function() {
-            var parent = createStatementBlock(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="statement_block"/>'
-            );
-            parent.getInput('STATEMENT').connection.setShadowDom(xml);
-            assertInputHasBlock(parent, 'STATEMENT', true);
+  
+          suite('Add - With Shadow Connected', function() {
+            // These are defined separately in each suite.
+            function createRowBlock(workspace) {
+              var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
+                  '<block type="row_block" id="id0"/>'
+              ), workspace);
+              return block;
+            }
+  
+            function createStatementBlock(workspace) {
+              var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
+                  '<block type="statement_block" id="id0"/>'
+              ), workspace);
+              return block;
+            }
+  
+            function createStackBlock(workspace) {
+              var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
+                  '<block type="stack_block" id="id0"/>'
+              ), workspace);
+              return block;
+            }
+  
+            test('Value', function() {
+              var parent = createRowBlock(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="row_block" id="1"/>'
+              );
+              parent.getInput('INPUT').connection.setShadowDom(xml);
+              assertInputHasBlock(parent, 'INPUT', true, '1');
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="row_block" id="2"/>'
+              );
+              parent.getInput('INPUT').connection.setShadowDom(xml);
+              assertInputHasBlock(parent, 'INPUT', true, '2');
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'row_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'INPUT': {
+                        'shadow': {
+                          'type': 'row_block',
+                          'id': '2',
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="row_block" id="id0">' +
+                  '<value name="INPUT">' +
+                  '<shadow type="row_block" id="2"></shadow>' +
+                  '</value>' +
+                  '</block>'
+              );
+            });
+  
+            test('Multiple Value', function() {
+              var parent = createRowBlock(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="row_block" id="1">' +
+                  '  <value name="INPUT">' +
+                  '    <shadow type="row_block" id="a"/>' +
+                  '  </value>' +
+                  '</shadow>'
+              );
+              parent.getInput('INPUT').connection.setShadowDom(xml);
+              assertInputHasBlock(parent, 'INPUT', true, '1');
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('INPUT'), 'INPUT', true, 'a');
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="row_block" id="2">' +
+                  '  <value name="INPUT">' +
+                  '    <shadow type="row_block" id="b"/>' +
+                  '  </value>' +
+                  '</shadow>'
+              );
+              parent.getInput('INPUT').connection.setShadowDom(xml);
+              assertInputHasBlock(parent, 'INPUT', true, '2');
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('INPUT'), 'INPUT', true, 'b');
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'row_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'INPUT': {
+                        'shadow': {
+                          'type': 'row_block',
+                          'id': '2',
+                          'inputs': {
+                            'INPUT': {
+                              'shadow': {
+                                'type': 'row_block',
+                                'id': 'b',
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="row_block" id="id0">' +
+                  '<value name="INPUT">' +
+                  '<shadow type="row_block" id="2">' +
+                  '<value name="INPUT">' +
+                  '<shadow type="row_block" id="b"></shadow>' +
+                  '</value>' +
+                  '</shadow>' +
+                  '</value>' +
+                  '</block>'
+              );
+            });
+  
+            test('Statement', function() {
+              var parent = createStatementBlock(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="statement_block" id="1"/>'
+              );
+              parent.getInput('NAME').connection.setShadowDom(xml);
+              assertInputHasBlock(parent, 'NAME', true, '1');
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="statement_block" id="2"/>'
+              );
+              parent.getInput('NAME').connection.setShadowDom(xml);
+              assertInputHasBlock(parent, 'NAME', true, '2');
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'statement_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'NAME': {
+                        'shadow': {
+                          'type': 'statement_block',
+                          'id': '2',
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="statement_block" id="id0">' +
+                  '<statement name="NAME">' +
+                  '<shadow type="statement_block" id="2"></shadow>' +
+                  '</statement>' +
+                  '</block>'
+              );
+            });
+  
+            test('Multiple Statement', function() {
+              var parent = createStatementBlock(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="statement_block" id="1">' +
+                  '  <statement name="NAME">' +
+                  '    <shadow type="statement_block" id="a"/>' +
+                  '  </statement>' +
+                  '</shadow>'
+              );
+              parent.getInput('NAME').connection.setShadowDom(xml);
+              assertInputHasBlock(parent, 'NAME', true, '1');
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('NAME'), 'NAME', true, 'a');
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="statement_block" id="2">' +
+                  '  <statement name="NAME">' +
+                  '    <shadow type="statement_block" id="b"/>' +
+                  '  </statement>' +
+                  '</shadow>'
+              );
+              parent.getInput('NAME').connection.setShadowDom(xml);
+              assertInputHasBlock(parent, 'NAME', true, '2');
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('NAME'), 'NAME', true, 'b');
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'statement_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'NAME': {
+                        'shadow': {
+                          'type': 'statement_block',
+                          'id': '2',
+                          'inputs': {
+                            'NAME': {
+                              'shadow': {
+                                'type': 'statement_block',
+                                'id': 'b',
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="statement_block" id="id0">' +
+                  '<statement name="NAME">' +
+                  '<shadow type="statement_block" id="2">' +
+                  '<statement name="NAME">' +
+                  '<shadow type="statement_block" id="b"></shadow>' +
+                  '</statement>' +
+                  '</shadow>' +
+                  '</statement>' +
+                  '</block>'
+              );
+            });
+  
+            test('Next', function() {
+              var parent = createStackBlock(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="stack_block" id="1"/>'
+              );
+              parent.nextConnection.setShadowDom(xml);
+              assertNextHasBlock(parent, true, '1');
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="stack_block" id="2"/>'
+              );
+              parent.nextConnection.setShadowDom(xml);
+              assertNextHasBlock(parent, true, '2');
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'stack_block',
+                    'id': 'id0',
+                    'next': {
+                      'shadow': {
+                        'type': 'stack_block',
+                        'id': '2',
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="stack_block" id="id0">' +
+                  '<next>' +
+                  '<shadow type="stack_block" id="2"></shadow>' +
+                  '</next>' +
+                  '</block>'
+              );
+            });
+  
+            test('Multiple Next', function() {
+              var parent = createStackBlock(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="stack_block" id="1">' +
+                  '  <next>' +
+                  '    <shadow type="stack_block" id="a"/>' +
+                  '  </next>' +
+                  '</shadow>'
+              );
+              parent.nextConnection.setShadowDom(xml);
+              assertNextHasBlock(parent, true, '1');
+              assertNextHasBlock(parent.getNextBlock(), true, 'a');
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="stack_block" id="2">' +
+                  '  <next>' +
+                  '    <shadow type="stack_block" id="b"/>' +
+                  '  </next>' +
+                  '</shadow>'
+              );
+              parent.nextConnection.setShadowDom(xml);
+              assertNextHasBlock(parent, true, '2');
+              assertNextHasBlock(parent.getNextBlock(), true, 'b');
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'stack_block',
+                    'id': 'id0',
+                    'next': {
+                      'shadow': {
+                        'type': 'stack_block',
+                        'id': '2',
+                        'next': {
+                          'shadow': {
+                            'type': 'stack_block',
+                            'id': 'b',
+                          }
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="stack_block" id="id0">' +
+                  '<next>' +
+                  '<shadow type="stack_block" id="2">' +
+                  '<next>' +
+                  '<shadow type="stack_block" id="b"></shadow>' +
+                  '</next>' +
+                  '</shadow>' +
+                  '</next>' +
+                  '</block>'
+              );
+            });
           });
-
-          test('Multiple Statement', function() {
-            var parent = createStatementBlock(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="statement_block">' +
-                '  <statement name="STATEMENT">' +
-                '    <shadow type="statement_block"/>' +
-                '  </statement>' +
-                '</shadow>'
-            );
-            parent.getInput('STATEMENT').connection.setShadowDom(xml);
-            assertInputHasBlock(parent, 'STATEMENT', true);
-            assertInputHasBlock(
-                parent.getInputTargetBlock('STATEMENT'), 'STATEMENT', true);
+  
+          suite('Remove - No Block Connected', function() {
+            // These are defined separately in each suite.
+            function createRowBlock(workspace) {
+              var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
+                  '<block type="row_block" id="id0">' +
+                  '  <value name="INPUT">' +
+                  '    <shadow type="row_block" id="idA"/>' +
+                  '  </value>' +
+                  '</block>'
+              ), workspace);
+              return block;
+            }
+  
+            function createStatementBlock(workspace) {
+              var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
+                  '<block type="statement_block" id="id0">' +
+                  '  <statement name="NAME">' +
+                  '    <shadow type="statement_block" id="idA"/>' +
+                  '  </statement>' +
+                  '</block>'
+              ), workspace);
+              return block;
+            }
+  
+            function createStackBlock(workspace) {
+              var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
+                  '<block type="stack_block" id="id0">' +
+                  '  <next>' +
+                  '    <shadow type="stack_block" id="idA"/>' +
+                  '  </next>' +
+                  '</block>'
+              ), workspace);
+              return block;
+            }
+  
+            test('Value', function() {
+              var parent = createRowBlock(this.workspace);
+              parent.getInput('INPUT').connection.setShadowDom(null);
+              assertInputNotHasBlock(parent, 'INPUT');
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'row_block',
+                    'id': 'id0',
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="row_block" id="id0">' +
+                  '</block>'
+              );
+            });
+  
+            test('Statement', function() {
+              var parent = createStatementBlock(this.workspace);
+              parent.getInput('NAME').connection.setShadowDom(null);
+              assertInputNotHasBlock(parent, 'STATEMENT');
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'statement_block',
+                    'id': 'id0',
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="statement_block" id="id0">' +
+                  '</block>'
+              );
+            });
+  
+            test('Next', function() {
+              var parent = createStackBlock(this.workspace);
+              parent.nextConnection.setShadowDom(null);
+              assertNextNotHasBlock(parent);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'stack_block',
+                    'id': 'id0',
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="stack_block" id="id0">' +
+                  '</block>'
+              );
+            });
           });
-
-          test('Next', function() {
-            var parent = createStackBlock(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="stack_block"/>'
-            );
-            parent.nextConnection.setShadowDom(xml);
-            assertNextHasBlock(parent, true);
+  
+          suite('Remove - Block Connected', function() {
+            // These are defined separately in each suite.
+            function createRowBlock(workspace) {
+              var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
+                  '<block type="row_block" id="id0">' +
+                  '  <value name="INPUT">' +
+                  '    <shadow type="row_block" id="idA"/>' +
+                  '    <block type="row_block" id="idB"/>' +
+                  '  </value>' +
+                  '</block>'
+              ), workspace);
+              return block;
+            }
+  
+            function createStatementBlock(workspace) {
+              var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
+                  '<block type="statement_block" id="id0">' +
+                  '  <statement name="NAME">' +
+                  '    <shadow type="statement_block" id="idA"/>' +
+                  '    <block type="statement_block" id="idB"/>' +
+                  '  </statement>' +
+                  '</block>'
+              ), workspace);
+              return block;
+            }
+  
+            function createStackBlock(workspace) {
+              var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
+                  '<block type="stack_block" id="id0">' +
+                  '  <next>' +
+                  '    <shadow type="stack_block" id="idA"/>' +
+                  '    <block type="stack_block" id="idB"/>' +
+                  '  </next>' +
+                  '</block>'
+              ), workspace);
+              return block;
+            }
+  
+            test('Value', function() {
+              var parent = createRowBlock(this.workspace);
+              parent.getInput('INPUT').connection.setShadowDom(null);
+              assertInputHasBlock(parent, 'INPUT', false);
+              parent.getInput('INPUT').connection.disconnect();
+              assertInputNotHasBlock(parent, 'INPUT');
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'row_block',
+                    'id': 'id0',
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="row_block" id="id0">' +
+                  '</block>'
+              );
+            });
+  
+            test('Statement', function() {
+              var parent = createStatementBlock(this.workspace);
+              parent.getInput('NAME').connection.setShadowDom(null);
+              assertInputHasBlock(parent, 'NAME', false);
+              parent.getInput('NAME').connection.disconnect();
+              assertInputNotHasBlock(parent, 'NAME');
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'statement_block',
+                    'id': 'id0',
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="statement_block" id="id0">' +
+                  '</block>'
+              );
+            });
+  
+            test('Next', function() {
+              var parent = createStackBlock(this.workspace);
+              parent.nextConnection.setShadowDom(null);
+              assertNextHasBlock(parent, false);
+              parent.nextConnection.disconnect();
+              assertNextNotHasBlock(parent);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'stack_block',
+                    'id': 'id0',
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="stack_block" id="id0">' +
+                  '</block>'
+              );
+            });
           });
-
-          test('Multiple Next', function() {
-            var parent = createStackBlock(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="stack_block">' +
-                '  <next>' +
-                '    <shadow type="stack_block"/>' +
-                '  </next>' +
-                '</shadow>'
-            );
-            parent.nextConnection.setShadowDom(xml);
-            assertNextHasBlock(parent, true);
-            assertNextHasBlock(parent.getNextBlock(), true);
+  
+          suite('Add - Connect & Disconnect - Remove', function() {
+            // These are defined separately in each suite.
+            function createRowBlock(workspace) {
+              var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
+                  '<block type="row_block"/>'
+              ), workspace);
+              return block;
+            }
+  
+            function createStatementBlock(workspace) {
+              var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
+                  '<block type="statement_block"/>'
+              ), workspace);
+              return block;
+            }
+  
+            function createStackBlock(workspace) {
+              var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
+                  '<block type="stack_block"/>'
+              ), workspace);
+              return block;
+            }
+  
+            test('Value', function() {
+              var parent = createRowBlock(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="row_block"/>'
+              );
+              parent.getInput('INPUT').connection.setShadowDom(xml);
+              assertInputHasBlock(parent, 'INPUT', true);
+              var child = createRowBlock(this.workspace);
+              parent.getInput('INPUT').connection.connect(child.outputConnection);
+              assertInputHasBlock(parent, 'INPUT', false);
+              parent.getInput('INPUT').connection.disconnect();
+              assertInputHasBlock(parent, 'INPUT', true);
+              parent.getInput('INPUT').connection.setShadowDom(null);
+              assertInputNotHasBlock(parent, 'INPUT');
+            });
+  
+            test('Multiple Value', function() {
+              var parent = createRowBlock(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="row_block">' +
+                  '  <value name="INPUT">' +
+                  '    <shadow type="row_block"/>' +
+                  '  </value>' +
+                  '</shadow>'
+              );
+              parent.getInput('INPUT').connection.setShadowDom(xml);
+              assertInputHasBlock(parent, 'INPUT', true);
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('INPUT'), 'INPUT', true);
+              var child = createRowBlock(this.workspace);
+              parent.getInput('INPUT').connection.connect(child.outputConnection);
+              assertInputHasBlock(parent, 'INPUT', false);
+              parent.getInput('INPUT').connection.disconnect();
+              assertInputHasBlock(parent, 'INPUT', true);
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('INPUT'), 'INPUT', true);
+              parent.getInput('INPUT').connection.setShadowDom(null);
+              assertInputNotHasBlock(parent, 'INPUT');
+            });
+  
+            test('Statement', function() {
+              var parent = createStatementBlock(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="statement_block"/>'
+              );
+              parent.getInput('NAME').connection.setShadowDom(xml);
+              assertInputHasBlock(parent, 'NAME', true);
+              var child = createStatementBlock(this.workspace);
+              parent.getInput('NAME').connection
+                  .connect(child.previousConnection);
+              assertInputHasBlock(parent, 'NAME', false);
+              parent.getInput('NAME').connection.disconnect();
+              assertInputHasBlock(parent, 'NAME', true);
+              parent.getInput('NAME').connection.setShadowDom(null);
+              assertInputNotHasBlock(parent, 'NAME');
+            });
+  
+            test('Multiple Statement', function() {
+              var parent = createStatementBlock(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="statement_block">' +
+                  '  <statement name="NAME">' +
+                  '    <shadow type="statement_block"/>' +
+                  '  </statement>' +
+                  '</shadow>'
+              );
+              parent.getInput('NAME').connection.setShadowDom(xml);
+              assertInputHasBlock(parent, 'NAME', true);
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('NAME'), 'NAME', true);
+              var child = createStatementBlock(this.workspace);
+              parent.getInput('NAME').connection
+                  .connect(child.previousConnection);
+              assertInputHasBlock(parent, 'NAME', false);
+              parent.getInput('NAME').connection.disconnect();
+              assertInputHasBlock(parent, 'NAME', true);
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('NAME'), 'NAME', true);
+              parent.getInput('NAME').connection.setShadowDom(null);
+              assertInputNotHasBlock(parent, 'NAME');
+            });
+  
+            test('Next', function() {
+              var parent = createStackBlock(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="stack_block"/>'
+              );
+              parent.nextConnection.setShadowDom(xml);
+              assertNextHasBlock(parent, true);
+              var child = createStatementBlock(this.workspace);
+              parent.nextConnection.connect(child.previousConnection);
+              assertNextHasBlock(parent, false);
+              parent.nextConnection.disconnect();
+              assertNextHasBlock(parent, true);
+              parent.nextConnection.setShadowDom(null);
+              assertNextNotHasBlock(parent);
+            });
+  
+            test('Multiple Next', function() {
+              var parent = createStackBlock(this.workspace);
+              var xml = Blockly.Xml.textToDom(
+                  '<shadow type="stack_block" id="parent">' +
+                  '  <next>' +
+                  '    <shadow type="stack_block" id="child"/>' +
+                  '  </next>' +
+                  '</shadow>'
+              );
+              parent.nextConnection.setShadowDom(xml);
+              assertNextHasBlock(parent, true);
+              assertNextHasBlock(parent.getNextBlock(), true);
+              var child = createStatementBlock(this.workspace);
+              parent.nextConnection.connect(child.previousConnection);
+              assertNextHasBlock(parent, false);
+              parent.nextConnection.disconnect();
+              assertNextHasBlock(parent, true);
+              assertNextHasBlock(parent.getNextBlock(), true);
+              parent.nextConnection.setShadowDom(null);
+              assertNextNotHasBlock(parent);
+            });
           });
         });
 
-        suite('Add - With Block Connected', function() {
-          // These are defined separately in each suite.
-          function createRowBlocks(workspace) {
-            var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
-                '<block type="row_block">' +
-                '  <value name="INPUT">' +
-                '    <block type="row_block"/>' +
-                '  </value>' +
-                '</block>'
-            ), workspace);
-            return block;
-          }
+        suite('setShadowState', function() {
+          suite('Add - No Block Connected', function() {
+            // These are defined separately in each suite.
+            function createRowBlock(workspace) {
+              return Blockly.serialization.blocks
+                  .load({'type': 'row_block', 'id': 'id0'}, workspace);
+            }
+  
+            function createStatementBlock(workspace) {
+              return Blockly.serialization.blocks
+                  .load({'type': 'statement_block', 'id': 'id0'}, workspace);
+            }
+  
+            function createStackBlock(workspace) {
+              return Blockly.serialization.blocks
+                  .load({'type': 'stack_block', 'id': 'id0'}, workspace);
+            }
 
-          function createStatementBlocks(workspace) {
-            var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
-                '<block type="statement_block">' +
-                '  <statement name="STATEMENT">' +
-                '    <block type="statement_block"/>' +
-                '  </statement>' +
-                '</block>'
-            ), workspace);
-            return block;
-          }
+            test('Value', function() {
+              var parent = createRowBlock(this.workspace);
+              parent.getInput('INPUT').connection
+                  .setShadowState({'type': 'row_block', 'id': 'id1'});
+              assertInputHasBlock(parent, 'INPUT', true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'row_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'INPUT': {
+                        'shadow': {
+                          'type': 'row_block',
+                          'id': 'id1',
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="row_block" id="id0">' +
+                  '<value name="INPUT">' +
+                  '<shadow type="row_block" id="id1"></shadow>' +
+                  '</value>' +
+                  '</block>'
+              );
+            });
 
-          function createStackBlocks(workspace) {
-            var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
-                '<block type="stack_block">' +
-                '  <next>' +
-                '    <block type="stack_block"/>' +
-                '  </next>' +
-                '</block>'
-            ), workspace);
-            return block;
-          }
+            test('Multiple Value', function() {
+              var parent = createRowBlock(this.workspace);
+              parent.getInput('INPUT').connection.setShadowState({
+                'type': 'row_block',
+                'id': 'id1',
+                'inputs': {
+                  'INPUT': {
+                    'shadow': {
+                      'type': 'row_block',
+                      'id': 'id2'
+                    }
+                  }
+                }
+              });
+              assertInputHasBlock(parent, 'INPUT', true);
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('INPUT'), 'INPUT', true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'row_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'INPUT': {
+                        'shadow': {
+                          'type': 'row_block',
+                          'id': 'id1',
+                          'inputs': {
+                            'INPUT': {
+                              'shadow': {
+                                'type': 'row_block',
+                                'id': 'id2',
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="row_block" id="id0">' +
+                  '<value name="INPUT">' +
+                  '<shadow type="row_block" id="id1">' +
+                  '<value name="INPUT">' +
+                  '<shadow type="row_block" id="id2"></shadow>' +
+                  '</value>' +
+                  '</shadow>' +
+                  '</value>' +
+                  '</block>'
+              );
+            });
 
-          test('Value', function() {
-            var parent = createRowBlocks(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="row_block"/>'
-            );
-            parent.getInput('INPUT').connection.setShadowDom(xml);
-            assertInputHasBlock(parent, 'INPUT', false);
-            parent.getInput('INPUT').connection.disconnect();
-            assertInputHasBlock(parent, 'INPUT', true);
+            test('Statement', function() {
+              var parent = createStatementBlock(this.workspace);
+              parent.getInput('NAME').connection
+                  .setShadowState({'type': 'statement_block', 'id': 'id1'});
+              assertInputHasBlock(parent, 'NAME', true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'statement_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'NAME': {
+                        'shadow': {
+                          'type': 'statement_block',
+                          'id': 'id1',
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="statement_block" id="id0">' +
+                  '<statement name="NAME">' +
+                  '<shadow type="statement_block" id="id1"></shadow>' +
+                  '</statement>' +
+                  '</block>'
+              );
+            });
+
+            test('Multiple Statment', function() {
+              var parent = createStatementBlock(this.workspace);
+              parent.getInput('NAME').connection.setShadowState({
+                'type': 'statement_block',
+                'id': 'id1',
+                'inputs': {
+                  'NAME': {
+                    'shadow': {
+                      'type': 'statement_block',
+                      'id': 'id2',
+                    }
+                  }
+                }
+              });
+              assertInputHasBlock(parent, 'NAME', true);
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('NAME'), 'NAME', true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'statement_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'NAME': {
+                        'shadow': {
+                          'type': 'statement_block',
+                          'id': 'id1',
+                          'inputs': {
+                            'NAME': {
+                              'shadow': {
+                                'type': 'statement_block',
+                                'id': 'id2',
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="statement_block" id="id0">' +
+                  '<statement name="NAME">' +
+                  '<shadow type="statement_block" id="id1">' +
+                  '<statement name="NAME">' +
+                  '<shadow type="statement_block" id="id2"></shadow>' +
+                  '</statement>' +
+                  '</shadow>' +
+                  '</statement>' +
+                  '</block>'
+              );
+            });
+
+            test('Next', function() {
+              var parent = createStackBlock(this.workspace);
+              parent.nextConnection
+                  .setShadowState({'type': 'stack_block', 'id': 'id1'});
+              assertNextHasBlock(parent, true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'stack_block',
+                    'id': 'id0',
+                    'next': {
+                      'shadow': {
+                        'type': 'stack_block',
+                        'id': 'id1',
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="stack_block" id="id0">' +
+                  '<next>' +
+                  '<shadow type="stack_block" id="id1"></shadow>' +
+                  '</next>' +
+                  '</block>'
+              );
+            });
+
+            test('Multiple Next', function() {
+              var parent = createStackBlock(this.workspace);
+              parent.nextConnection.setShadowState({
+                'type': 'stack_block',
+                'id': 'id1',
+                'next': {
+                  'shadow': {
+                    'type': 'stack_block',
+                    'id': 'id2',
+                  }
+                }
+              });
+              assertNextHasBlock(parent, true);
+              assertNextHasBlock(parent.getNextBlock(), true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'stack_block',
+                    'id': 'id0',
+                    'next': {
+                      'shadow': {
+                        'type': 'stack_block',
+                        'id': 'id1',
+                        'next': {
+                          'shadow': {
+                            'type': 'stack_block',
+                            'id': 'id2',
+                          }
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="stack_block" id="id0">' +
+                  '<next>' +
+                  '<shadow type="stack_block" id="id1">' +
+                  '<next>' +
+                  '<shadow type="stack_block" id="id2"></shadow>' +
+                  '</next>' +
+                  '</shadow>' +
+                  '</next>' +
+                  '</block>'
+              );
+            });
           });
 
-          test('Multiple Value', function() {
-            var parent = createRowBlocks(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="row_block">' +
-                '  <value name="INPUT">' +
-                '    <shadow type="row_block"/>' +
-                '  </value>' +
-                '</shadow>'
-            );
-            parent.getInput('INPUT').connection.setShadowDom(xml);
-            assertInputHasBlock(parent, 'INPUT', false);
-            assertInputNotHasBlock(parent.getInputTargetBlock('INPUT'), 'INPUT');
-            parent.getInput('INPUT').connection.disconnect();
-            assertInputHasBlock(parent, 'INPUT', true);
-            assertInputHasBlock(
-                parent.getInputTargetBlock('INPUT'), 'INPUT', true);
+          suite('Add - With Block Connected', function() {
+            // These are defined separately in each suite.
+            function createRowBlocks(workspace) {
+              return Blockly.serialization.blocks.load(
+                  {
+                    'type': 'row_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'INPUT': {
+                        'block': {
+                          'type': 'row_block',
+                          'id': 'idA'
+                        }
+                      }
+                    }
+                  },
+                  workspace);
+            }
+  
+            function createStatementBlocks(workspace) {
+              return Blockly.serialization.blocks.load(
+                  {
+                    'type': 'statement_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'NAME': {
+                        'block': {
+                          'type': 'statement_block',
+                          'id': 'idA'
+                        }
+                      }
+                    }
+                  },
+                  workspace);
+            }
+  
+            function createStackBlocks(workspace) {
+              return Blockly.serialization.blocks.load(
+                  {
+                    'type': 'stack_block',
+                    'id': 'id0',
+                    'next': {
+                      'block': {
+                        'type': 'stack_block',
+                        'id': 'idA'
+                      }
+                    }
+                  },
+                  workspace);
+            }
+  
+            test('Value', function() {
+              var parent = createRowBlocks(this.workspace);
+              parent.getInput('INPUT').connection
+                  .setShadowState({'type': 'row_block', 'id': 'id1'});
+              assertInputHasBlock(parent, 'INPUT', false);
+              parent.getInput('INPUT').connection.disconnect();
+              assertInputHasBlock(parent, 'INPUT', true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'row_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'INPUT': {
+                        'shadow': {
+                          'type': 'row_block',
+                          'id': 'id1',
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="row_block" id="id0">' +
+                  '<value name="INPUT">' +
+                  '<shadow type="row_block" id="id1"></shadow>' +
+                  '</value>' +
+                  '</block>'
+              );
+            });
+  
+            test('Multiple Value', function() {
+              var parent = createRowBlocks(this.workspace);
+              parent.getInput('INPUT').connection.setShadowState(
+                  {
+                    'type': 'row_block',
+                    'id': 'id1',
+                    'inputs': {
+                      'INPUT': {
+                        'shadow': {
+                          'type': 'row_block',
+                          'id': 'id2',
+                        }
+                      }
+                    }
+                  }
+              );
+              assertInputHasBlock(parent, 'INPUT', false);
+              assertInputNotHasBlock(parent.getInputTargetBlock('INPUT'), 'INPUT');
+              parent.getInput('INPUT').connection.disconnect();
+              assertInputHasBlock(parent, 'INPUT', true);
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('INPUT'), 'INPUT', true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'row_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'INPUT': {
+                        'shadow': {
+                          'type': 'row_block',
+                          'id': 'id1',
+                          'inputs': {
+                            'INPUT': {
+                              'shadow': {
+                                'type': 'row_block',
+                                'id': 'id2',
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="row_block" id="id0">' +
+                  '<value name="INPUT">' +
+                  '<shadow type="row_block" id="id1">' +
+                  '<value name="INPUT">' +
+                  '<shadow type="row_block" id="id2"></shadow>' +
+                  '</value>' +
+                  '</shadow>' +
+                  '</value>' +
+                  '</block>'
+              );
+            });
+  
+            test('Statement', function() {
+              var parent = createStatementBlocks(this.workspace);
+              parent.getInput('NAME').connection
+                  .setShadowState({'type': 'statement_block', 'id': 'id1'});
+              assertInputHasBlock(parent, 'NAME', false);
+              parent.getInput('NAME').connection.disconnect();
+              assertInputHasBlock(parent, 'NAME', true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'statement_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'NAME': {
+                        'shadow': {
+                          'type': 'statement_block',
+                          'id': 'id1',
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="statement_block" id="id0">' +
+                  '<statement name="NAME">' +
+                  '<shadow type="statement_block" id="id1"></shadow>' +
+                  '</statement>' +
+                  '</block>'
+              );
+            });
+  
+            test('Multiple Statement', function() {
+              var parent = createStatementBlocks(this.workspace);
+              parent.getInput('NAME').connection.setShadowState(
+                  {
+                    'type': 'statement_block',
+                    'id': 'id1',
+                    'inputs': {
+                      'NAME': {
+                        'shadow': {
+                          'type': 'statement_block',
+                          'id': 'id2',
+                        }
+                      }
+                    }
+                  }
+              );
+              assertInputHasBlock(parent, 'NAME', false);
+              assertInputNotHasBlock(
+                  parent.getInputTargetBlock('NAME'), 'NAME');
+              parent.getInput('NAME').connection.disconnect();
+              assertInputHasBlock(parent, 'NAME', true);
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('NAME'), 'NAME', true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'statement_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'NAME': {
+                        'shadow': {
+                          'type': 'statement_block',
+                          'id': 'id1',
+                          'inputs': {
+                            'NAME': {
+                              'shadow': {
+                                'type': 'statement_block',
+                                'id': 'id2',
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="statement_block" id="id0">' +
+                  '<statement name="NAME">' +
+                  '<shadow type="statement_block" id="id1">' +
+                  '<statement name="NAME">' +
+                  '<shadow type="statement_block" id="id2"></shadow>' +
+                  '</statement>' +
+                  '</shadow>' +
+                  '</statement>' +
+                  '</block>'
+              );
+            });
+  
+            test('Next', function() {
+              var parent = createStackBlocks(this.workspace);
+              parent.nextConnection
+                  .setShadowState({'type': 'stack_block', 'id': 'id1'});
+              assertNextHasBlock(parent, false);
+              parent.nextConnection.disconnect();
+              assertNextHasBlock(parent, true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'stack_block',
+                    'id': 'id0',
+                    'next': {
+                      'shadow': {
+                        'type': 'stack_block',
+                        'id': 'id1',
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="stack_block" id="id0">' +
+                  '<next>' +
+                  '<shadow type="stack_block" id="id1"></shadow>' +
+                  '</next>' +
+                  '</block>'
+              );
+            });
+  
+            test('Multiple Next', function() {
+              var parent = createStackBlocks(this.workspace);
+              parent.nextConnection.setShadowState(
+                  {
+                    'type': 'stack_block',
+                    'id': 'id1',
+                    'next': {
+                      'shadow': {
+                        'type': 'stack_block',
+                        'id': 'id2',
+                      }
+                    }
+                  }
+              );
+              assertNextHasBlock(parent, false);
+              assertNextNotHasBlock(parent.getNextBlock());
+              parent.nextConnection.disconnect();
+              assertNextHasBlock(parent, true);
+              assertNextHasBlock(parent.getNextBlock(), true);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'stack_block',
+                    'id': 'id0',
+                    'next': {
+                      'shadow': {
+                        'type': 'stack_block',
+                        'id': 'id1',
+                        'next': {
+                          'shadow': {
+                            'type': 'stack_block',
+                            'id': 'id2',
+                          }
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="stack_block" id="id0">' +
+                  '<next>' +
+                  '<shadow type="stack_block" id="id1">' +
+                  '<next>' +
+                  '<shadow type="stack_block" id="id2"></shadow>' +
+                  '</next>' +
+                  '</shadow>' +
+                  '</next>' +
+                  '</block>'
+              );
+            });
           });
-
-          test('Statement', function() {
-            var parent = createStatementBlocks(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="statement_block"/>'
-            );
-            parent.getInput('STATEMENT').connection.setShadowDom(xml);
-            assertInputHasBlock(parent, 'STATEMENT', false);
-            parent.getInput('STATEMENT').connection.disconnect();
-            assertInputHasBlock(parent, 'STATEMENT', true);
+  
+          suite('Add - With Shadow Connected', function() {
+            // These are defined separately in each suite.
+            function createRowBlock(workspace) {
+              return Blockly.serialization.blocks
+                  .load({'type': 'row_block', 'id': 'id0'}, workspace);
+            }
+  
+            function createStatementBlock(workspace) {
+              return Blockly.serialization.blocks
+                  .load({'type': 'statement_block', 'id': 'id0'}, workspace);
+            }
+  
+            function createStackBlock(workspace) {
+              return Blockly.serialization.blocks
+                  .load({'type': 'stack_block', 'id': 'id0'}, workspace);
+            }
+  
+            test('Value', function() {
+              var parent = createRowBlock(this.workspace);
+              parent.getInput('INPUT').connection
+                  .setShadowState({'type': 'row_block', 'id': '1'});
+              assertInputHasBlock(parent, 'INPUT', true, '1');
+              parent.getInput('INPUT').connection
+                  .setShadowState({'type': 'row_block', 'id': '2'});
+              assertInputHasBlock(parent, 'INPUT', true, '2');
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'row_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'INPUT': {
+                        'shadow': {
+                          'type': 'row_block',
+                          'id': '2',
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="row_block" id="id0">' +
+                  '<value name="INPUT">' +
+                  '<shadow type="row_block" id="2"></shadow>' +
+                  '</value>' +
+                  '</block>'
+              );
+            });
+  
+            test('Multiple Value', function() {
+              var parent = createRowBlock(this.workspace);
+              parent.getInput('INPUT').connection.setShadowState(
+                  {
+                    'type': 'row_block',
+                    'id': '1',
+                    'inputs': {
+                      'INPUT': {
+                        'shadow': {
+                          'type': 'row_block',
+                          'id': 'a',
+                        }
+                      }
+                    }
+                  }
+              );
+              assertInputHasBlock(parent, 'INPUT', true, '1');
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('INPUT'), 'INPUT', true, 'a');
+              parent.getInput('INPUT').connection.setShadowState(
+                  {
+                    'type': 'row_block',
+                    'id': '2',
+                    'inputs': {
+                      'INPUT': {
+                        'shadow': {
+                          'type': 'row_block',
+                          'id': 'b',
+                        }
+                      }
+                    }
+                  }
+              );
+              assertInputHasBlock(parent, 'INPUT', true, '2');
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('INPUT'), 'INPUT', true, 'b');
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'row_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'INPUT': {
+                        'shadow': {
+                          'type': 'row_block',
+                          'id': '2',
+                          'inputs': {
+                            'INPUT': {
+                              'shadow': {
+                                'type': 'row_block',
+                                'id': 'b',
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="row_block" id="id0">' +
+                  '<value name="INPUT">' +
+                  '<shadow type="row_block" id="2">' +
+                  '<value name="INPUT">' +
+                  '<shadow type="row_block" id="b"></shadow>' +
+                  '</value>' +
+                  '</shadow>' +
+                  '</value>' +
+                  '</block>'
+              );
+            });
+  
+            test('Statement', function() {
+              var parent = createStatementBlock(this.workspace);
+              parent.getInput('NAME').connection
+                  .setShadowState({'type': 'statement_block', 'id': '1'});
+              assertInputHasBlock(parent, 'NAME', true, '1');
+              parent.getInput('NAME').connection
+                  .setShadowState({'type': 'statement_block', 'id': '2'});
+              assertInputHasBlock(parent, 'NAME', true, '2');
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'statement_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'NAME': {
+                        'shadow': {
+                          'type': 'statement_block',
+                          'id': '2',
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="statement_block" id="id0">' +
+                  '<statement name="NAME">' +
+                  '<shadow type="statement_block" id="2"></shadow>' +
+                  '</statement>' +
+                  '</block>'
+              );
+            });
+  
+            test('Multiple Statement', function() {
+              var parent = createStatementBlock(this.workspace);
+              parent.getInput('NAME').connection.setShadowState(
+                  {
+                    'type': 'statement_block',
+                    'id': '1',
+                    'inputs': {
+                      'NAME': {
+                        'shadow': {
+                          'type': 'statement_block',
+                          'id': 'a',
+                        }
+                      }
+                    }
+                  }
+              );
+              assertInputHasBlock(parent, 'NAME', true, '1');
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('NAME'), 'NAME', true, 'a');
+              parent.getInput('NAME').connection.setShadowState(
+                  {
+                    'type': 'statement_block',
+                    'id': '2',
+                    'inputs': {
+                      'NAME': {
+                        'shadow': {
+                          'type': 'statement_block',
+                          'id': 'b',
+                        }
+                      }
+                    }
+                  }
+              );
+              assertInputHasBlock(parent, 'NAME', true, '2');
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('NAME'), 'NAME', true, 'b');
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'statement_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'NAME': {
+                        'shadow': {
+                          'type': 'statement_block',
+                          'id': '2',
+                          'inputs': {
+                            'NAME': {
+                              'shadow': {
+                                'type': 'statement_block',
+                                'id': 'b',
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="statement_block" id="id0">' +
+                  '<statement name="NAME">' +
+                  '<shadow type="statement_block" id="2">' +
+                  '<statement name="NAME">' +
+                  '<shadow type="statement_block" id="b"></shadow>' +
+                  '</statement>' +
+                  '</shadow>' +
+                  '</statement>' +
+                  '</block>'
+              );
+            });
+  
+            test('Next', function() {
+              var parent = createStackBlock(this.workspace);
+              parent.nextConnection
+                  .setShadowState({'type': 'stack_block', 'id': '1'});
+              assertNextHasBlock(parent, true, '1');
+              parent.nextConnection
+                  .setShadowState({'type': 'stack_block', 'id': '2'});
+              assertNextHasBlock(parent, true, '2');
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'stack_block',
+                    'id': 'id0',
+                    'next': {
+                      'shadow': {
+                        'type': 'stack_block',
+                        'id': '2',
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="stack_block" id="id0">' +
+                  '<next>' +
+                  '<shadow type="stack_block" id="2"></shadow>' +
+                  '</next>' +
+                  '</block>'
+              );
+            });
+  
+            test('Multiple Next', function() {
+              var parent = createStackBlock(this.workspace);
+              parent.nextConnection.setShadowState(
+                  {
+                    'type': 'stack_block',
+                    'id': '1',
+                    'next': {
+                      'shadow': {
+                        'type': 'stack_block',
+                        'id': 'a',
+                      }
+                    }
+                  }
+              );
+              assertNextHasBlock(parent, true, '1');
+              assertNextHasBlock(parent.getNextBlock(), true, 'a');
+              parent.nextConnection.setShadowState(
+                  {
+                    'type': 'stack_block',
+                    'id': '2',
+                    'next': {
+                      'shadow': {
+                        'type': 'stack_block',
+                        'id': 'b',
+                      }
+                    }
+                  }
+              );
+              assertNextHasBlock(parent, true, '2');
+              assertNextHasBlock(parent.getNextBlock(), true, 'b');
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'stack_block',
+                    'id': 'id0',
+                    'next': {
+                      'shadow': {
+                        'type': 'stack_block',
+                        'id': '2',
+                        'next': {
+                          'shadow': {
+                            'type': 'stack_block',
+                            'id': 'b',
+                          }
+                        }
+                      }
+                    }
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="stack_block" id="id0">' +
+                  '<next>' +
+                  '<shadow type="stack_block" id="2">' +
+                  '<next>' +
+                  '<shadow type="stack_block" id="b"></shadow>' +
+                  '</next>' +
+                  '</shadow>' +
+                  '</next>' +
+                  '</block>'
+              );
+            });
           });
-
-          test('Multiple Statement', function() {
-            var parent = createStatementBlocks(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="statement_block">' +
-                '  <statement name="STATEMENT">' +
-                '    <shadow type="statement_block"/>' +
-                '  </statement>' +
-                '</shadow>'
-            );
-            parent.getInput('STATEMENT').connection.setShadowDom(xml);
-            assertInputHasBlock(parent, 'STATEMENT', false);
-            assertInputNotHasBlock(
-                parent.getInputTargetBlock('STATEMENT'), 'STATEMENT');
-            parent.getInput('STATEMENT').connection.disconnect();
-            assertInputHasBlock(parent, 'STATEMENT', true);
-            assertInputHasBlock(
-                parent.getInputTargetBlock('STATEMENT'), 'STATEMENT', true);
+  
+          suite('Remove - No Block Connected', function() {
+            // These are defined separately in each suite.
+            function createRowBlocks(workspace) {
+              return Blockly.serialization.blocks.load(
+                  {
+                    'type': 'row_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'INPUT': {
+                        'shadow': {
+                          'type': 'row_block',
+                          'id': 'id1',
+                        }
+                      }
+                    }
+                  },
+                  workspace);
+            }
+  
+            function createStatementBlocks(workspace) {
+              return Blockly.serialization.blocks.load(
+                  {
+                    'type': 'statement_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'NAME': {
+                        'shadow': {
+                          'type': 'statement_block',
+                          'id': 'id1',
+                        }
+                      }
+                    }
+                  },
+                  workspace);
+            }
+  
+            function createStackBlocks(workspace) {
+              return Blockly.serialization.blocks.load(
+                  {
+                    'type': 'stack_block',
+                    'id': 'id0',
+                    'next': {
+                      'shadow': {
+                        'type': 'stack_block',
+                        'id': 'id1',
+                      }
+                    }
+                  },
+                  workspace);
+            }
+  
+            test('Value', function() {
+              var parent = createRowBlocks(this.workspace);
+              parent.getInput('INPUT').connection.setShadowState(null);
+              assertInputNotHasBlock(parent, 'INPUT');
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'row_block',
+                    'id': 'id0',
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="row_block" id="id0">' +
+                  '</block>'
+              );
+            });
+  
+            test('Statement', function() {
+              var parent = createStatementBlocks(this.workspace);
+              parent.getInput('NAME').connection.setShadowState(null);
+              assertInputNotHasBlock(parent, 'NAME');
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'statement_block',
+                    'id': 'id0',
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="statement_block" id="id0">' +
+                  '</block>'
+              );
+            });
+  
+            test('Next', function() {
+              var parent = createStackBlocks(this.workspace);
+              parent.nextConnection.setShadowState(null);
+              assertNextNotHasBlock(parent);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'stack_block',
+                    'id': 'id0',
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="stack_block" id="id0">' +
+                  '</block>'
+              );
+            });
           });
-
-          test('Next', function() {
-            var parent = createStackBlocks(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="stack_block"/>'
-            );
-            parent.nextConnection.setShadowDom(xml);
-            assertNextHasBlock(parent, false);
-            parent.nextConnection.disconnect();
-            assertNextHasBlock(parent, true);
+  
+          suite('Remove - Block Connected', function() {
+            // These are defined separately in each suite.
+            function createRowBlocks(workspace) {
+              return Blockly.serialization.blocks.load(
+                  {
+                    'type': 'row_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'INPUT': {
+                        'shadow': {
+                          'type': 'row_block',
+                          'id': 'id1',
+                        },
+                        'block': {
+                          'type': 'row_block',
+                          'id': 'id2',
+                        }
+                      }
+                    }
+                  },
+                  workspace);
+            }
+  
+            function createStatementBlocks(workspace) {
+              return Blockly.serialization.blocks.load(
+                  {
+                    'type': 'statement_block',
+                    'id': 'id0',
+                    'inputs': {
+                      'NAME': {
+                        'shadow': {
+                          'type': 'statement_block',
+                          'id': 'id1',
+                        },
+                        'block': {
+                          'type': 'statement_block',
+                          'id': 'id2',
+                        }
+                      }
+                    }
+                  },
+                  workspace);
+            }
+  
+            function createStackBlocks(workspace) {
+              return Blockly.serialization.blocks.load(
+                  {
+                    'type': 'stack_block',
+                    'id': 'id0',
+                    'next': {
+                      'shadow': {
+                        'type': 'stack_block',
+                        'id': 'id1',
+                      },
+                      'block': {
+                        'type': 'stack_block',
+                        'id': 'id2',
+                      }
+                    }
+                  },
+                  workspace);
+            }
+  
+            test('Value', function() {
+              var parent = createRowBlocks(this.workspace);
+              parent.getInput('INPUT').connection.setShadowState(null);
+              assertInputHasBlock(parent, 'INPUT', false);
+              parent.getInput('INPUT').connection.disconnect();
+              assertInputNotHasBlock(parent, 'INPUT');
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'row_block',
+                    'id': 'id0',
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="row_block" id="id0">' +
+                  '</block>'
+              );
+            });
+  
+            test('Statement', function() {
+              var parent = createStatementBlocks(this.workspace);
+              parent.getInput('NAME').connection.setShadowState(null);
+              assertInputHasBlock(parent, 'NAME', false);
+              parent.getInput('NAME').connection.disconnect();
+              assertInputNotHasBlock(parent, 'NAME');
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'statement_block',
+                    'id': 'id0',
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="statement_block" id="id0">' +
+                  '</block>'
+              );
+            });
+  
+            test('Next', function() {
+              var parent = createStackBlocks(this.workspace);
+              parent.nextConnection.setShadowState(null);
+              assertNextHasBlock(parent, false);
+              parent.nextConnection.disconnect();
+              assertNextNotHasBlock(parent);
+              assertSerialization(
+                  parent,
+                  {
+                    'type': 'stack_block',
+                    'id': 'id0',
+                  },
+                  '<block xmlns="https://developers.google.com/blockly/xml" ' +
+                  'type="stack_block" id="id0">' +
+                  '</block>'
+              );
+            });
           });
-
-          test('Multiple Next', function() {
-            var parent = createStackBlocks(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="stack_block">' +
-                '  <next>' +
-                '    <shadow type="stack_block"/>' +
-                '  </next>' +
-                '</shadow>'
-            );
-            parent.nextConnection.setShadowDom(xml);
-            assertNextHasBlock(parent, false);
-            assertNextNotHasBlock(parent.getNextBlock());
-            parent.nextConnection.disconnect();
-            assertNextHasBlock(parent, true);
-            assertNextHasBlock(parent.getNextBlock(), true);
-          });
-        });
-
-        suite('Add - With Shadow Connected', function() {
-          // These are defined separately in each suite.
-          function createRowBlock(workspace) {
-            var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
-                '<block type="row_block"/>'
-            ), workspace);
-            return block;
-          }
-
-          function createStatementBlock(workspace) {
-            var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
-                '<block type="statement_block"/>'
-            ), workspace);
-            return block;
-          }
-
-          function createStackBlock(workspace) {
-            var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
-                '<block type="stack_block"/>'
-            ), workspace);
-            return block;
-          }
-
-          test('Value', function() {
-            var parent = createRowBlock(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="row_block" id="1"/>'
-            );
-            parent.getInput('INPUT').connection.setShadowDom(xml);
-            assertInputHasBlock(parent, 'INPUT', true, '1');
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="row_block" id="2"/>'
-            );
-            parent.getInput('INPUT').connection.setShadowDom(xml);
-            assertInputHasBlock(parent, 'INPUT', true, '2');
-          });
-
-          test('Multiple Value', function() {
-            var parent = createRowBlock(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="row_block" id="1">' +
-                '  <value name="INPUT">' +
-                '    <shadow type="row_block" id="a"/>' +
-                '  </value>' +
-                '</shadow>'
-            );
-            parent.getInput('INPUT').connection.setShadowDom(xml);
-            assertInputHasBlock(parent, 'INPUT', true, '1');
-            assertInputHasBlock(
-                parent.getInputTargetBlock('INPUT'), 'INPUT', true, 'a');
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="row_block" id="2">' +
-                '  <value name="INPUT">' +
-                '    <shadow type="row_block" id="b"/>' +
-                '  </value>' +
-                '</shadow>'
-            );
-            parent.getInput('INPUT').connection.setShadowDom(xml);
-            assertInputHasBlock(parent, 'INPUT', true, '2');
-            assertInputHasBlock(
-                parent.getInputTargetBlock('INPUT'), 'INPUT', true, 'b');
-          });
-
-          test('Statement', function() {
-            var parent = createStatementBlock(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="statement_block" id="1"/>'
-            );
-            parent.getInput('STATEMENT').connection.setShadowDom(xml);
-            assertInputHasBlock(parent, 'STATEMENT', true, '1');
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="statement_block" id="2"/>'
-            );
-            parent.getInput('STATEMENT').connection.setShadowDom(xml);
-            assertInputHasBlock(parent, 'STATEMENT', true, '2');
-          });
-
-          test('Multiple Statement', function() {
-            var parent = createStatementBlock(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="statement_block" id="1">' +
-                '  <statement name="STATEMENT">' +
-                '    <shadow type="statement_block" id="a"/>' +
-                '  </statement>' +
-                '</shadow>'
-            );
-            parent.getInput('STATEMENT').connection.setShadowDom(xml);
-            assertInputHasBlock(parent, 'STATEMENT', true, '1');
-            assertInputHasBlock(
-                parent.getInputTargetBlock('STATEMENT'), 'STATEMENT', true, 'a');
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="statement_block" id="2">' +
-                '  <statement name="STATEMENT">' +
-                '    <shadow type="statement_block" id="b"/>' +
-                '  </statement>' +
-                '</shadow>'
-            );
-            parent.getInput('STATEMENT').connection.setShadowDom(xml);
-            assertInputHasBlock(parent, 'STATEMENT', true, '2');
-            assertInputHasBlock(
-                parent.getInputTargetBlock('STATEMENT'), 'STATEMENT', true, 'b');
-          });
-
-          test('Next', function() {
-            var parent = createStackBlock(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="stack_block" id="1"/>'
-            );
-            parent.nextConnection.setShadowDom(xml);
-            assertNextHasBlock(parent, true, '1');
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="stack_block" id="2"/>'
-            );
-            parent.nextConnection.setShadowDom(xml);
-            assertNextHasBlock(parent, true, '2');
-          });
-
-          test('Multiple Next', function() {
-            var parent = createStackBlock(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="stack_block" id="1">' +
-                '  <next>' +
-                '    <shadow type="stack_block" id="a"/>' +
-                '  </next>' +
-                '</shadow>'
-            );
-            parent.nextConnection.setShadowDom(xml);
-            assertNextHasBlock(parent, true, '1');
-            assertNextHasBlock(parent.getNextBlock(), true, 'a');
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="stack_block" id="2">' +
-                '  <next>' +
-                '    <shadow type="stack_block" id="b"/>' +
-                '  </next>' +
-                '</shadow>'
-            );
-            parent.nextConnection.setShadowDom(xml);
-            assertNextHasBlock(parent, true, '2');
-            assertNextHasBlock(parent.getNextBlock(), true, 'b');
-          });
-        });
-
-        suite('Remove - No Block Connected', function() {
-          // These are defined separately in each suite.
-          function createRowBlock(workspace) {
-            var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
-                '<block type="row_block">' +
-                '  <value name="INPUT">' +
-                '    <shadow type="row_block"/>' +
-                '  </value>' +
-                '</block>'
-            ), workspace);
-            return block;
-          }
-
-          function createStatementBlock(workspace) {
-            var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
-                '<block type="statement_block">' +
-                '  <statement name="STATEMENT">' +
-                '    <shadow type="statement_block"/>' +
-                '  </statement>' +
-                '</block>'
-            ), workspace);
-            return block;
-          }
-
-          function createStackBlock(workspace) {
-            var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
-                '<block type="stack_block">' +
-                '  <next>' +
-                '    <shadow type="stack_block"/>' +
-                '  </next>' +
-                '</block>'
-            ), workspace);
-            return block;
-          }
-
-          test('Value', function() {
-            var parent = createRowBlock(this.workspace);
-            parent.getInput('INPUT').connection.setShadowDom(null);
-            assertInputNotHasBlock(parent, 'INPUT');
-          });
-
-          test('Statement', function() {
-            var parent = createStatementBlock(this.workspace);
-            parent.getInput('STATEMENT').connection.setShadowDom(null);
-            assertInputNotHasBlock(parent, 'STATMENT');
-          });
-
-          test('Next', function() {
-            var parent = createStackBlock(this.workspace);
-            parent.nextConnection.setShadowDom(null);
-            assertNextNotHasBlock(parent);
-          });
-        });
-
-        suite('Remove - Block Connected', function() {
-          // These are defined separately in each suite.
-          function createRowBlock(workspace) {
-            var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
-                '<block type="row_block">' +
-                '  <value name="INPUT">' +
-                '    <shadow type="row_block"/>' +
-                '    <block type="row_block"/>' +
-                '  </value>' +
-                '</block>'
-            ), workspace);
-            return block;
-          }
-
-          function createStatementBlock(workspace) {
-            var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
-                '<block type="statement_block">' +
-                '  <statement name="STATEMENT">' +
-                '    <shadow type="statement_block"/>' +
-                '    <block type="statement_block"/>' +
-                '  </statement>' +
-                '</block>'
-            ), workspace);
-            return block;
-          }
-
-          function createStackBlock(workspace) {
-            var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
-                '<block type="stack_block">' +
-                '  <next>' +
-                '    <shadow type="stack_block"/>' +
-                '    <block type="stack_block"/>' +
-                '  </next>' +
-                '</block>'
-            ), workspace);
-            return block;
-          }
-
-          test('Value', function() {
-            var parent = createRowBlock(this.workspace);
-            parent.getInput('INPUT').connection.setShadowDom(null);
-            assertInputHasBlock(parent, 'INPUT', false);
-            parent.getInput('INPUT').connection.disconnect();
-            assertInputNotHasBlock(parent, 'INPUT');
-          });
-
-          test('Statement', function() {
-            var parent = createStatementBlock(this.workspace);
-            parent.getInput('STATEMENT').connection.setShadowDom(null);
-            assertInputHasBlock(parent, 'STATEMENT', false);
-            parent.getInput('STATEMENT').connection.disconnect();
-            assertInputNotHasBlock(parent, 'STATEMENT');
-          });
-
-          test('Next', function() {
-            var parent = createStackBlock(this.workspace);
-            parent.nextConnection.setShadowDom(null);
-            assertNextHasBlock(parent, false);
-            parent.nextConnection.disconnect();
-            assertNextNotHasBlock(parent);
-          });
-        });
-
-        suite('Add - Connect & Disconnect - Remove', function() {
-          // These are defined separately in each suite.
-          function createRowBlock(workspace) {
-            var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
-                '<block type="row_block"/>'
-            ), workspace);
-            return block;
-          }
-
-          function createStatementBlock(workspace) {
-            var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
-                '<block type="statement_block"/>'
-            ), workspace);
-            return block;
-          }
-
-          function createStackBlock(workspace) {
-            var block = Blockly.Xml.domToBlock(Blockly.Xml.textToDom(
-                '<block type="stack_block"/>'
-            ), workspace);
-            return block;
-          }
-
-          test('Value', function() {
-            var parent = createRowBlock(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="row_block"/>'
-            );
-            parent.getInput('INPUT').connection.setShadowDom(xml);
-            assertInputHasBlock(parent, 'INPUT', true);
-            var child = createRowBlock(this.workspace);
-            parent.getInput('INPUT').connection.connect(child.outputConnection);
-            assertInputHasBlock(parent, 'INPUT', false);
-            parent.getInput('INPUT').connection.disconnect();
-            assertInputHasBlock(parent, 'INPUT', true);
-            parent.getInput('INPUT').connection.setShadowDom(null);
-            assertInputNotHasBlock(parent, 'INPUT');
-          });
-
-          test('Multiple Value', function() {
-            var parent = createRowBlock(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="row_block">' +
-                '  <value name="INPUT">' +
-                '    <shadow type="row_block"/>' +
-                '  </value>' +
-                '</shadow>'
-            );
-            parent.getInput('INPUT').connection.setShadowDom(xml);
-            assertInputHasBlock(parent, 'INPUT', true);
-            assertInputHasBlock(
-                parent.getInputTargetBlock('INPUT'), 'INPUT', true);
-            var child = createRowBlock(this.workspace);
-            parent.getInput('INPUT').connection.connect(child.outputConnection);
-            assertInputHasBlock(parent, 'INPUT', false);
-            parent.getInput('INPUT').connection.disconnect();
-            assertInputHasBlock(parent, 'INPUT', true);
-            assertInputHasBlock(
-                parent.getInputTargetBlock('INPUT'), 'INPUT', true);
-            parent.getInput('INPUT').connection.setShadowDom(null);
-            assertInputNotHasBlock(parent, 'INPUT');
-          });
-
-          test('Statement', function() {
-            var parent = createStatementBlock(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="statement_block"/>'
-            );
-            parent.getInput('STATEMENT').connection.setShadowDom(xml);
-            assertInputHasBlock(parent, 'STATEMENT', true);
-            var child = createStatementBlock(this.workspace);
-            parent.getInput('STATEMENT').connection
-                .connect(child.previousConnection);
-            assertInputHasBlock(parent, 'STATEMENT', false);
-            parent.getInput('STATEMENT').connection.disconnect();
-            assertInputHasBlock(parent, 'STATEMENT', true);
-            parent.getInput('STATEMENT').connection.setShadowDom(null);
-            assertInputNotHasBlock(parent, 'STATEMENT');
-          });
-
-          test('Multiple Statement', function() {
-            var parent = createStatementBlock(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="statement_block">' +
-                '  <statement name="STATEMENT">' +
-                '    <shadow type="statement_block"/>' +
-                '  </statement>' +
-                '</shadow>'
-            );
-            parent.getInput('STATEMENT').connection.setShadowDom(xml);
-            assertInputHasBlock(parent, 'STATEMENT', true);
-            assertInputHasBlock(
-                parent.getInputTargetBlock('STATEMENT'), 'STATEMENT', true);
-            var child = createStatementBlock(this.workspace);
-            parent.getInput('STATEMENT').connection
-                .connect(child.previousConnection);
-            assertInputHasBlock(parent, 'STATEMENT', false);
-            parent.getInput('STATEMENT').connection.disconnect();
-            assertInputHasBlock(parent, 'STATEMENT', true);
-            assertInputHasBlock(
-                parent.getInputTargetBlock('STATEMENT'), 'STATEMENT', true);
-            parent.getInput('STATEMENT').connection.setShadowDom(null);
-            assertInputNotHasBlock(parent, 'STATEMENT');
-          });
-
-          test('Next', function() {
-            var parent = createStackBlock(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="stack_block"/>'
-            );
-            parent.nextConnection.setShadowDom(xml);
-            assertNextHasBlock(parent, true);
-            var child = createStatementBlock(this.workspace);
-            parent.nextConnection.connect(child.previousConnection);
-            assertNextHasBlock(parent, false);
-            parent.nextConnection.disconnect();
-            assertNextHasBlock(parent, true);
-            parent.nextConnection.setShadowDom(null);
-            assertNextNotHasBlock(parent);
-          });
-
-          test('Multiple Next', function() {
-            var parent = createStackBlock(this.workspace);
-            var xml = Blockly.Xml.textToDom(
-                '<shadow type="stack_block">' +
-                '  <next>' +
-                '    <shadow type="stack_block"/>' +
-                '  </next>' +
-                '</shadow>'
-            );
-            parent.nextConnection.setShadowDom(xml);
-            assertNextHasBlock(parent, true);
-            assertNextHasBlock(parent.getNextBlock(), true);
-            var child = createStatementBlock(this.workspace);
-            parent.nextConnection.connect(child.previousConnection);
-            assertNextHasBlock(parent, false);
-            parent.nextConnection.disconnect();
-            assertNextHasBlock(parent, true);
-            assertNextHasBlock(parent.getNextBlock(), true);
-            parent.nextConnection.setShadowDom(null);
-            assertNextNotHasBlock(parent);
+  
+          suite('Add - Connect & Disconnect - Remove', function() {
+            // These are defined separately in each suite.
+            function createRowBlock(workspace) {
+              return Blockly.serialization.blocks
+                  .load({'type': 'row_block'}, workspace);
+            }
+  
+            function createStatementBlock(workspace) {
+              return Blockly.serialization.blocks
+                  .load({'type': 'statement_block'}, workspace);
+            }
+  
+            function createStackBlock(workspace) {
+              return Blockly.serialization.blocks
+                  .load({'type': 'stack_block'}, workspace);
+            }
+  
+            test('Value', function() {
+              var parent = createRowBlock(this.workspace);
+              parent.getInput('INPUT').connection
+                  .setShadowState({'type': 'row_block'});
+              assertInputHasBlock(parent, 'INPUT', true);
+              var child = createRowBlock(this.workspace);
+              parent.getInput('INPUT').connection.connect(child.outputConnection);
+              assertInputHasBlock(parent, 'INPUT', false);
+              parent.getInput('INPUT').connection.disconnect();
+              assertInputHasBlock(parent, 'INPUT', true);
+              parent.getInput('INPUT').connection.setShadowState(null);
+              assertInputNotHasBlock(parent, 'INPUT');
+            });
+  
+            test('Multiple Value', function() {
+              var parent = createRowBlock(this.workspace);
+              parent.getInput('INPUT').connection.setShadowState({
+                'type': 'row_block',
+                'inputs': {
+                  'INPUT': {
+                    'shadow': {
+                      'type': 'row_block',
+                    }
+                  }
+                }
+              });
+              assertInputHasBlock(parent, 'INPUT', true);
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('INPUT'), 'INPUT', true);
+              var child = createRowBlock(this.workspace);
+              parent.getInput('INPUT').connection.connect(child.outputConnection);
+              assertInputHasBlock(parent, 'INPUT', false);
+              parent.getInput('INPUT').connection.disconnect();
+              assertInputHasBlock(parent, 'INPUT', true);
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('INPUT'), 'INPUT', true);
+              parent.getInput('INPUT').connection.setShadowState(null);
+              assertInputNotHasBlock(parent, 'INPUT');
+            });
+  
+            test('Statement', function() {
+              var parent = createStatementBlock(this.workspace);
+              parent.getInput('NAME').connection
+                  .setShadowState({'type': 'statement_block'});
+              assertInputHasBlock(parent, 'NAME', true);
+              var child = createStatementBlock(this.workspace);
+              parent.getInput('NAME').connection
+                  .connect(child.previousConnection);
+              assertInputHasBlock(parent, 'NAME', false);
+              parent.getInput('NAME').connection.disconnect();
+              assertInputHasBlock(parent, 'NAME', true);
+              parent.getInput('NAME').connection.setShadowState(null);
+              assertInputNotHasBlock(parent, 'NAME');
+            });
+  
+            test('Multiple Statement', function() {
+              var parent = createStatementBlock(this.workspace);
+              parent.getInput('NAME').connection.setShadowState({
+                'type': 'statement_block',
+                'inputs': {
+                  'NAME': {
+                    'shadow': {
+                      'type': 'statement_block',
+                    }
+                  }
+                }
+              });
+              assertInputHasBlock(parent, 'NAME', true);
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('NAME'), 'NAME', true);
+              var child = createStatementBlock(this.workspace);
+              parent.getInput('NAME').connection
+                  .connect(child.previousConnection);
+              assertInputHasBlock(parent, 'NAME', false);
+              parent.getInput('NAME').connection.disconnect();
+              assertInputHasBlock(parent, 'NAME', true);
+              assertInputHasBlock(
+                  parent.getInputTargetBlock('NAME'), 'NAME', true);
+              parent.getInput('NAME').connection.setShadowState(null);
+              assertInputNotHasBlock(parent, 'NAME');
+            });
+  
+            test('Next', function() {
+              var parent = createStackBlock(this.workspace);
+              parent.nextConnection.setShadowState({'type': 'stack_block'});
+              var child = createStatementBlock(this.workspace);
+              parent.nextConnection.connect(child.previousConnection);
+              assertNextHasBlock(parent, false);
+              parent.nextConnection.disconnect();
+              assertNextHasBlock(parent, true);
+              parent.nextConnection.setShadowState(null);
+              assertNextNotHasBlock(parent);
+            });
+  
+            test('Multiple Next', function() {
+              var parent = createStackBlock(this.workspace);
+              parent.nextConnection.setShadowState({
+                'type': 'stack_block',
+                'next': {
+                  'shadow': {
+                    'type': 'stack_block'
+                  }
+                }
+              });
+              assertNextHasBlock(parent, true);
+              assertNextHasBlock(parent.getNextBlock(), true);
+              var child = createStatementBlock(this.workspace);
+              parent.nextConnection.connect(child.previousConnection);
+              assertNextHasBlock(parent, false);
+              parent.nextConnection.disconnect();
+              assertNextHasBlock(parent, true);
+              assertNextHasBlock(parent.getNextBlock(), true);
+              parent.nextConnection.setShadowState(null);
+              assertNextNotHasBlock(parent);
+            });
           });
         });
       });
@@ -912,7 +2646,7 @@ suite('Connection', function() {
             },
             {
               "type": "input_statement",
-              "name": "STATEMENT",
+              "name": "NAME",
               "check": 'check1'
             }
           ],
@@ -925,7 +2659,7 @@ suite('Connection', function() {
           "args0": [
             {
               "type": "input_statement",
-              "name": "STATEMENT",
+              "name": "NAME",
               "check": 'check1'
             }
           ],
@@ -938,7 +2672,7 @@ suite('Connection', function() {
           "args0": [
             {
               "type": "input_statement",
-              "name": "STATEMENT",
+              "name": "NAME",
               "check": 'check2'
             }
           ],
@@ -951,7 +2685,7 @@ suite('Connection', function() {
           "args0": [
             {
               "type": "input_statement",
-              "name": "STATEMENT",
+              "name": "NAME",
               "check": 'check1'
             }
           ],
@@ -984,13 +2718,13 @@ suite('Connection', function() {
         var newParent = this.workspace.newBlock('statement_block');
         var child = this.workspace.newBlock('stack_block');
 
-        oldParent.getInput('STATEMENT').connection
+        oldParent.getInput('NAME').connection
             .connect(child.previousConnection);
-        newParent.getInput('STATEMENT').connection
+        newParent.getInput('NAME').connection
             .connect(child.previousConnection);
 
         chai.assert.isFalse(
-            oldParent.getInput('STATEMENT').connection.isConnected());
+            oldParent.getInput('NAME').connection.isConnected());
         this.assertBlockCount(3);
       });
 
@@ -1029,15 +2763,15 @@ suite('Connection', function() {
         var xml = Blockly.Xml.textToDom(
             '<shadow type="stack_block"/>'
         );
-        newParent.getInput('STATEMENT').connection.setShadowDom(xml);
+        newParent.getInput('NAME').connection.setShadowDom(xml);
         chai.assert.isTrue(
-            newParent.getInputTargetBlock('STATEMENT').isShadow());
+            newParent.getInputTargetBlock('NAME').isShadow());
 
-        newParent.getInput('STATEMENT').connection
+        newParent.getInput('NAME').connection
             .connect(child.previousConnection);
 
         chai.assert.isFalse(
-            newParent.getInputTargetBlock('STATEMENT').isShadow());
+            newParent.getInputTargetBlock('NAME').isShadow());
         this.assertBlockCount(2);
       });
 
@@ -1082,15 +2816,15 @@ suite('Connection', function() {
         var xml = Blockly.Xml.textToDom(
             '<shadow type="stack_block"/>'
         );
-        newParent.getInput('STATEMENT').connection.setShadowDom(xml);
-        newParent.getInputTargetBlock('STATEMENT')
+        newParent.getInput('NAME').connection.setShadowDom(xml);
+        newParent.getInputTargetBlock('NAME')
             .setFieldValue('new', 'FIELD');
 
-        newParent.getInput('STATEMENT').connection
+        newParent.getInput('NAME').connection
             .connect(child.previousConnection);
-        newParent.getInput('STATEMENT').connection.disconnect();
+        newParent.getInput('NAME').connection.disconnect();
 
-        const target = newParent.getInputTargetBlock('STATEMENT');
+        const target = newParent.getInputTargetBlock('NAME');
         chai.assert.isTrue(target.isShadow());
         chai.assert.equal(target.getFieldValue('FIELD'), 'new');
         this.assertBlockCount(3);
@@ -1408,16 +3142,16 @@ suite('Connection', function() {
             var parent = this.workspace.newBlock('statement_block');
             var oldChild = this.workspace.newBlock('stack_block');
             var newChild = this.workspace.newBlock('stack_block');
-            parent.getInput('STATEMENT').connection
+            parent.getInput('NAME').connection
                 .connect(oldChild.previousConnection);
 
-            parent.getInput('STATEMENT').connection
+            parent.getInput('NAME').connection
                 .connect(newChild.previousConnection);
 
             chai.assert.isTrue(
-                parent.getInput('STATEMENT').connection.isConnected());
+                parent.getInput('NAME').connection.isConnected());
             chai.assert.equal(
-                parent.getInputTargetBlock('STATEMENT'), newChild);
+                parent.getInputTargetBlock('NAME'), newChild);
             chai.assert.isTrue(newChild.nextConnection.isConnected());
             chai.assert.equal(newChild.getNextBlock(), oldChild);
             this.assertBlockCount(3);
@@ -1428,17 +3162,17 @@ suite('Connection', function() {
             var oldChild = this.workspace.newBlock('stack_block');
             var newChild1 = this.workspace.newBlock('stack_block_1to2');
             var newChild2 = this.workspace.newBlock('stack_block_2to1');
-            parent.getInput('STATEMENT').connection
+            parent.getInput('NAME').connection
                 .connect(oldChild.previousConnection);
             newChild1.nextConnection.connect(newChild2.previousConnection);
 
-            parent.getInput('STATEMENT').connection
+            parent.getInput('NAME').connection
                 .connect(newChild1.previousConnection);
 
             chai.assert.isTrue(
-                parent.getInput('STATEMENT').connection.isConnected());
+                parent.getInput('NAME').connection.isConnected());
             chai.assert.equal(
-                parent.getInputTargetBlock('STATEMENT'), newChild1);
+                parent.getInputTargetBlock('NAME'), newChild1);
             chai.assert.isTrue(newChild2.nextConnection.isConnected());
             chai.assert.equal(newChild2.getNextBlock(), oldChild);
             this.assertBlockCount(4);
@@ -1448,17 +3182,17 @@ suite('Connection', function() {
             var parent = this.workspace.newBlock('statement_block');
             var oldChild = this.workspace.newBlock('stack_block');
             var newChild = this.workspace.newBlock('stack_block_1to2');
-            parent.getInput('STATEMENT').connection
+            parent.getInput('NAME').connection
                 .connect(oldChild.previousConnection);
             var spy = sinon.spy(oldChild.previousConnection, 'onFailedConnect');
 
-            parent.getInput('STATEMENT').connection
+            parent.getInput('NAME').connection
                 .connect(newChild.previousConnection);
 
             chai.assert.isTrue(
-                parent.getInput('STATEMENT').connection.isConnected());
+                parent.getInput('NAME').connection.isConnected());
             chai.assert.equal(
-                parent.getInputTargetBlock('STATEMENT'), newChild);
+                parent.getInputTargetBlock('NAME'), newChild);
             chai.assert.isFalse(newChild.nextConnection.isConnected());
             chai.assert.isTrue(spy.calledOnce);
             this.assertBlockCount(3);
@@ -1468,17 +3202,17 @@ suite('Connection', function() {
             var parent = this.workspace.newBlock('statement_block');
             var oldChild = this.workspace.newBlock('stack_block');
             var newChild = this.workspace.newBlock('stack_block_noend');
-            parent.getInput('STATEMENT').connection
+            parent.getInput('NAME').connection
                 .connect(oldChild.previousConnection);
             var spy = sinon.spy(oldChild.previousConnection, 'onFailedConnect');
 
-            parent.getInput('STATEMENT').connection
+            parent.getInput('NAME').connection
                 .connect(newChild.previousConnection);
 
             chai.assert.isTrue(
-                parent.getInput('STATEMENT').connection.isConnected());
+                parent.getInput('NAME').connection.isConnected());
             chai.assert.equal(
-                parent.getInputTargetBlock('STATEMENT'), newChild);
+                parent.getInputTargetBlock('NAME'), newChild);
             chai.assert.isTrue(spy.calledOnce);
             this.assertBlockCount(3);
           });
@@ -1489,20 +3223,20 @@ suite('Connection', function() {
             var parent = this.workspace.newBlock('statement_block');
             var oldChild = this.workspace.newBlock('stack_block');
             var newChild = this.workspace.newBlock('stack_block');
-            parent.getInput('STATEMENT').connection
+            parent.getInput('NAME').connection
                 .connect(oldChild.previousConnection);
             var xml = Blockly.Xml.textToDom(
                 '<shadow type="stack_block"/>'
             );
             newChild.nextConnection.setShadowDom(xml);
 
-            parent.getInput('STATEMENT').connection
+            parent.getInput('NAME').connection
                 .connect(newChild.previousConnection);
 
             chai.assert.isTrue(
-                parent.getInput('STATEMENT').connection.isConnected());
+                parent.getInput('NAME').connection.isConnected());
             chai.assert.equal(
-                parent.getInputTargetBlock('STATEMENT'), newChild);
+                parent.getInputTargetBlock('NAME'), newChild);
             chai.assert.isTrue(newChild.nextConnection.isConnected());
             chai.assert.equal(newChild.getNextBlock(), oldChild);
             this.assertBlockCount(3);
@@ -1513,7 +3247,7 @@ suite('Connection', function() {
             var oldChild = this.workspace.newBlock('stack_block');
             var newChild1 = this.workspace.newBlock('stack_block_1to2');
             var newChild2 = this.workspace.newBlock('stack_block_2to1');
-            parent.getInput('STATEMENT').connection
+            parent.getInput('NAME').connection
                 .connect(oldChild.previousConnection);
             newChild1.nextConnection.connect(newChild2.previousConnection);
             var xml = Blockly.Xml.textToDom(
@@ -1521,13 +3255,13 @@ suite('Connection', function() {
             );
             newChild2.nextConnection.setShadowDom(xml);
 
-            parent.getInput('STATEMENT').connection
+            parent.getInput('NAME').connection
                 .connect(newChild1.previousConnection);
 
             chai.assert.isTrue(
-                parent.getInput('STATEMENT').connection.isConnected());
+                parent.getInput('NAME').connection.isConnected());
             chai.assert.equal(
-                parent.getInputTargetBlock('STATEMENT'), newChild1);
+                parent.getInputTargetBlock('NAME'), newChild1);
             chai.assert.isTrue(newChild2.nextConnection.isConnected());
             chai.assert.equal(newChild2.getNextBlock(), oldChild);
             this.assertBlockCount(4);
@@ -1537,7 +3271,7 @@ suite('Connection', function() {
             var parent = this.workspace.newBlock('statement_block');
             var oldChild = this.workspace.newBlock('stack_block');
             var newChild = this.workspace.newBlock('stack_block_1to2');
-            parent.getInput('STATEMENT').connection
+            parent.getInput('NAME').connection
                 .connect(oldChild.previousConnection);
             var xml = Blockly.Xml.textToDom(
                 '<shadow type="stack_block_2to1"/>'
@@ -1545,13 +3279,13 @@ suite('Connection', function() {
             newChild.nextConnection.setShadowDom(xml);
             var spy = sinon.spy(oldChild.previousConnection, 'onFailedConnect');
 
-            parent.getInput('STATEMENT').connection
+            parent.getInput('NAME').connection
                 .connect(newChild.previousConnection);
 
             chai.assert.isTrue(
-                parent.getInput('STATEMENT').connection.isConnected());
+                parent.getInput('NAME').connection.isConnected());
             chai.assert.equal(
-                parent.getInputTargetBlock('STATEMENT'), newChild);
+                parent.getInputTargetBlock('NAME'), newChild);
             chai.assert.isTrue(newChild.nextConnection.isConnected());
             chai.assert.isTrue(newChild.getNextBlock().isShadow());
             chai.assert.isTrue(spy.calledOnce);
diff --git a/tests/mocha/jso_deserialization_test.js b/tests/mocha/jso_deserialization_test.js
index f248dca3f..2f9cf59f2 100644
--- a/tests/mocha/jso_deserialization_test.js
+++ b/tests/mocha/jso_deserialization_test.js
@@ -627,7 +627,7 @@ suite('JSO Deserialization', function() {
       });
     });
 
-    suite.skip('Real child of shadow', function() {
+    suite('Real child of shadow', function() {
       test('Input', function() {
         const state = {
           'blocks': {
@@ -664,10 +664,10 @@ suite('JSO Deserialization', function() {
                 'type': 'text_print',
                 'next': {
                   'shadow': {
-                    'type': 'text_input',
+                    'type': 'text_print',
                     'next': {
                       'block': {
-                        'type': 'text_input',
+                        'type': 'text_print',
                       }
                     }
                   }
diff --git a/tests/mocha/jso_serialization_test.js b/tests/mocha/jso_serialization_test.js
index 51dfe3c27..0d4aeb5ce 100644
--- a/tests/mocha/jso_serialization_test.js
+++ b/tests/mocha/jso_serialization_test.js
@@ -424,7 +424,7 @@ suite('JSO Serialization', function() {
           const block = this.workspace.newBlock(blockType);
           block.getInput(inputName).connection.setShadowDom(
               Blockly.Xml.textToDom(
-                  '<block type="' + blockType + '" id="test"></block>'));
+                  '<shadow type="' + blockType + '" id="test"></shadow>'));
           return block;
         };
 
@@ -435,7 +435,7 @@ suite('JSO Serialization', function() {
               childBlock.outputConnection || childBlock.previousConnection);
           block.getInput(inputName).connection.setShadowDom(
               Blockly.Xml.textToDom(
-                  '<block type="' + blockType + '" id="test"></block>'));
+                  '<shadow type="' + blockType + '" id="test"></shadow>'));
           return block;
         };
   
@@ -501,11 +501,11 @@ suite('JSO Serialization', function() {
             this.assertChild('row_block', 'INPUT');
           });
   
-          test.skip('Shadow', function() {
+          test('Shadow', function() {
             this.assertShadow('row_block', 'INPUT');
           });
   
-          test.skip('Overwritten shadow', function() {
+          test('Overwritten shadow', function() {
             this.assertOverwrittenShadow('row_block', 'INPUT');
           });
         });
@@ -531,11 +531,11 @@ suite('JSO Serialization', function() {
             this.assertChild('statement_block', 'NAME');
           });
   
-          test.skip('Shadow', function() {
+          test('Shadow', function() {
             this.assertShadow('statement_block', 'NAME');
           });
   
-          test.skip('Overwritten shadow', function() {
+          test('Overwritten shadow', function() {
             this.assertOverwrittenShadow('statement_block', 'NAME');
           });
 
@@ -595,7 +595,7 @@ suite('JSO Serialization', function() {
             const block = this.workspace.newBlock('stack_block');
             block.nextConnection.setShadowDom(
                 Blockly.Xml.textToDom(
-                    '<block type="stack_block" id="test"></block>'));
+                    '<shadow type="stack_block" id="test"></shadow>'));
             return block;
           };
 
@@ -605,7 +605,7 @@ suite('JSO Serialization', function() {
             block.nextConnection.connect(childBlock.previousConnection);
             block.nextConnection.setShadowDom(
                 Blockly.Xml.textToDom(
-                    '<block type="stack_block" id="test"></block>'));
+                    '<shadow type="stack_block" id="test"></shadow>'));
             return block;
           };
         });
@@ -619,14 +619,14 @@ suite('JSO Serialization', function() {
                 jso['next'], {'block': { 'type': 'stack_block', 'id': 'id2'}});
           });
   
-          test.skip('Shadow', function() {
+          test('Shadow', function() {
             const block = this.createNextWithShadow();
             const jso = Blockly.serialization.blocks.save(block);
             chai.assert.deepInclude(
                 jso['next'], {'shadow': { 'type': 'stack_block', 'id': 'test'}});
           });
   
-          test.skip('Overwritten shadow', function() {
+          test('Overwritten shadow', function() {
             const block = this.createNextWithShadowAndChild();
             const jso = Blockly.serialization.blocks.save(block);
             chai.assert.deepInclude(

From 486123e4ff3d70dc3434b315e50b2fcccda17d02 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Thu, 19 Aug 2021 20:17:54 +0000
Subject: [PATCH 777/833] fix: insertion markers and change events to work with
 JSO hooks (#5378)

* fix: add tests for fixing change events

* fix: change events and insertion markers

* fix: build:

* fix: remove duplicate code

* fix: requires
---
 core/events/events_block_change.js     | 40 ++++++++---
 core/field.js                          |  2 +-
 core/insertion_marker_manager.js       |  7 +-
 core/mutator.js                        | 13 ++--
 tests/deps.js                          |  2 +-
 tests/deps.mocha.js                    |  4 +-
 tests/mocha/block_change_event_test.js | 74 ++++++++++++++++++++
 tests/mocha/index.html                 |  2 +
 tests/mocha/mutator_test.js            | 71 +++++++++++++++++++
 tests/mocha/test_helpers.js            | 94 ++++++++++++++++++++++++++
 10 files changed, 287 insertions(+), 22 deletions(-)
 create mode 100644 tests/mocha/block_change_event_test.js
 create mode 100644 tests/mocha/mutator_test.js

diff --git a/core/events/events_block_change.js b/core/events/events_block_change.js
index 3814a0d27..96afcd862 100644
--- a/core/events/events_block_change.js
+++ b/core/events/events_block_change.js
@@ -15,6 +15,8 @@ goog.module.declareLegacyNamespace();
 
 /* 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 Events = goog.require('Blockly.Events');
 const Xml = goog.require('Blockly.Xml');
 const object = goog.require('Blockly.utils.object');
@@ -125,17 +127,15 @@ BlockChange.prototype.run = function(forward) {
       block.setInputsInline(!!value);
       break;
     case 'mutation': {
-      let oldMutation = '';
-      if (block.mutationToDom) {
-        const oldMutationDom = block.mutationToDom();
-        oldMutation = oldMutationDom && Xml.domToText(oldMutationDom);
+      const oldState = BlockChange.getExtraBlockState_(
+          /** @type {!BlockSvg} */ (block));
+      if (block.loadExtraState) {
+        block.loadExtraState(JSON.parse(/** @type {string} */ (value) || '{}'));
+      } else if (block.domToMutation) {
+        block.domToMutation(
+            Xml.textToDom(/** @type {string} */ (value) || '<mutation/>'));
       }
-      if (block.domToMutation) {
-        const dom = Xml.textToDom(/** @type {string} */
-                                  (value) || '<mutation/>');
-        block.domToMutation(dom);
-      }
-      Events.fire(new BlockChange(block, 'mutation', null, oldMutation, value));
+      Events.fire(new BlockChange(block, 'mutation', null, oldState, value));
       break;
     }
     default:
@@ -143,6 +143,26 @@ BlockChange.prototype.run = function(forward) {
   }
 };
 
+// TODO (#5397): Encapsulate this in the BlocklyMutationChange event when
+//    refactoring change events.
+/**
+ * Returns the extra state of the given block (either as XML or a JSO, depending
+ * on the block's definition).
+ * @param {!BlockSvg} block The block to get the extra state of.
+ * @return {string} A stringified version of the extra state of the given block.
+ * @package
+ */
+BlockChange.getExtraBlockState_ = function(block) {
+  if (block.saveExtraState) {
+    const state = block.saveExtraState();
+    return state ? JSON.stringify(state) : '';
+  } else if (block.mutationToDom) {
+    const state = block.mutationToDom();
+    return state ? Xml.domToText(state) : '';
+  }
+  return '';
+};
+
 registry.register(registry.Type.EVENT, Events.CHANGE, BlockChange);
 
 exports = BlockChange;
diff --git a/core/field.js b/core/field.js
index 041975150..fbc4ff341 100644
--- a/core/field.js
+++ b/core/field.js
@@ -897,11 +897,11 @@ Field.prototype.setValue = function(newValue) {
     return;
   }
 
+  this.doValueUpdate_(newValue);
   if (source && Events.isEnabled()) {
     Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
         source, 'field', this.name || null, oldValue, newValue));
   }
-  this.doValueUpdate_(newValue);
   if (this.isDirty_) {
     this.forceRerender();
   }
diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js
index b44097416..004ac569e 100644
--- a/core/insertion_marker_manager.js
+++ b/core/insertion_marker_manager.js
@@ -289,7 +289,12 @@ InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlock) {
   try {
     result = this.workspace_.newBlock(imType);
     result.setInsertionMarker(true);
-    if (sourceBlock.mutationToDom) {
+    if (sourceBlock.saveExtraState) {
+      const state = sourceBlock.saveExtraState();
+      if (state) {
+        result.loadExtraState(state);
+      }
+    } else if (sourceBlock.mutationToDom) {
       const oldMutationDom = sourceBlock.mutationToDom();
       if (oldMutationDom) {
         result.domToMutation(oldMutationDom);
diff --git a/core/mutator.js b/core/mutator.js
index 5f7189fcd..e3b5fd9d8 100644
--- a/core/mutator.js
+++ b/core/mutator.js
@@ -34,7 +34,6 @@ const Svg = goog.require('Blockly.utils.Svg');
 /* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
 const WorkspaceSvg = goog.require('Blockly.WorkspaceSvg');
-const Xml = goog.require('Blockly.Xml');
 const dom = goog.require('Blockly.utils.dom');
 const internalConstants = goog.require('Blockly.internalConstants');
 const object = goog.require('Blockly.utils.object');
@@ -408,9 +407,8 @@ Mutator.prototype.workspaceChanged_ = function(e) {
   // When the mutator's workspace changes, update the source block.
   if (this.rootBlock_.workspace == this.workspace_) {
     Events.setGroup(true);
-    const block = this.block_;
-    const oldMutationDom = block.mutationToDom();
-    const oldMutation = oldMutationDom && Xml.domToText(oldMutationDom);
+    const block = /** @type {!BlockSvg} */ (this.block_);
+    const oldExtraState = Events.BlockChange.getExtraBlockState_(block);
 
     // Switch off rendering while the source block is rebuilt.
     const savedRendered = block.rendered;
@@ -428,11 +426,10 @@ Mutator.prototype.workspaceChanged_ = function(e) {
       block.render();
     }
 
-    const newMutationDom = block.mutationToDom();
-    const newMutation = newMutationDom && Xml.domToText(newMutationDom);
-    if (oldMutation != newMutation) {
+    const newExtraState = Events.BlockChange.getExtraBlockState_(block);
+    if (oldExtraState != newExtraState) {
       Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
-          block, 'mutation', null, oldMutation, newMutation));
+          block, 'mutation', null, oldExtraState, newExtraState));
       // Ensure that any bump is part of this mutation's event group.
       const group = Events.getGroup();
       setTimeout(function() {
diff --git a/tests/deps.js b/tests/deps.js
index 32bf81b39..8850112c2 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -130,7 +130,7 @@ goog.addDependency('../../core/menu.js', ['Blockly.Menu'], ['Blockly.browserEven
 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.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/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', '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', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.deprecation', 'Blockly.utils.idGenerator', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 85364266c..c89219406 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -130,7 +130,7 @@ goog.addDependency('../../core/menu.js', ['Blockly.Menu'], ['Blockly.browserEven
 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.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/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', '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', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.deprecation', 'Blockly.utils.idGenerator', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
@@ -303,6 +303,7 @@ goog.addDependency('../../generators/python/variables.js', ['Blockly.Python.vari
 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/block_change_event_test.js', ['Blockly.test.blockChangeEvent'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/block_json_test.js', ['Blockly.test.blockJson'], [], {'lang': 'es5', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/block_test.js', ['Blockly.test.blocks'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/comment_test.js', ['Blockly.test.comments'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
@@ -338,6 +339,7 @@ goog.addDependency('../../tests/mocha/json_test.js', ['Blockly.test.json'], ['Bl
 goog.addDependency('../../tests/mocha/keydown_test.js', ['Blockly.test.keydown'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/logic_ternary_test.js', ['Blockly.test.logicTernary'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/metrics_test.js', ['Blockly.test.metrics'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/mutator_test.js', ['Blockly.test.mutator'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/names_test.js', ['Blockly.test.names'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/procedures_test.js', ['Blockly.test.procedures'], ['Blockly.Blocks.procedures', 'Blockly.Msg', 'Blockly.test.helpers', 'Blockly.test.procedureHelpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/procedures_test_helpers.js', ['Blockly.test.procedureHelpers'], [], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/block_change_event_test.js b/tests/mocha/block_change_event_test.js
new file mode 100644
index 000000000..d29e01daa
--- /dev/null
+++ b/tests/mocha/block_change_event_test.js
@@ -0,0 +1,74 @@
+
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+goog.module('Blockly.test.blockChangeEvent');
+
+const {defineMutatorBlocks, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
+suite('Block Change Event', function() {
+  setup(function() {
+    sharedTestSetup.call(this);
+    this.workspace = new Blockly.Workspace();
+  });
+
+  teardown(function() {
+    sharedTestTeardown.call(this);
+  });
+
+  suite('Undo and Redo', function() {
+    suite('Mutation', function() {
+      setup(function() {
+        defineMutatorBlocks();
+      });
+  
+      teardown(function() {
+        Blockly.Extensions.unregister('xml_mutator');
+        Blockly.Extensions.unregister('jso_mutator');
+      });
+      
+      suite('XML', function() {
+        test('Undo', function() {
+          const block = this.workspace.newBlock('xml_block', 'block_id');
+          block.domToMutation(
+              Blockly.Xml.textToDom('<mutation hasInput="true"/>'));
+          const blockChange = new Blockly.Events.BlockChange(
+              block, 'mutation', null, '', '<mutation hasInput="true"/>');
+          blockChange.run(false);
+          chai.assert.isFalse(block.hasInput);
+        });
+
+        test('Redo', function() {
+          const block = this.workspace.newBlock('xml_block', 'block_id');
+          const blockChange = new Blockly.Events.BlockChange(
+              block, 'mutation', null, '', '<mutation hasInput="true"/>');
+          blockChange.run(true);
+          chai.assert.isTrue(block.hasInput);
+        });
+      });
+
+      suite('JSO', function() {
+        test('Undo', function() {
+          const block = this.workspace.newBlock('jso_block', 'block_id');
+          block.loadExtraState({hasInput: true});
+          const blockChange = new Blockly.Events.BlockChange(
+              block, 'mutation', null, '', '{"hasInput":true}');
+          blockChange.run(false);
+          chai.assert.isFalse(block.hasInput);
+        });
+
+        test('Redo', function() {
+          const block = this.workspace.newBlock('jso_block', 'block_id');
+          const blockChange = new Blockly.Events.BlockChange(
+              block, 'mutation', null, '', '{"hasInput":true}');
+          blockChange.run(true);
+          chai.assert.isTrue(block.hasInput);
+        });
+      });
+    });
+  });
+});
diff --git a/tests/mocha/index.html b/tests/mocha/index.html
index 9b28c2422..0500b3581 100644
--- a/tests/mocha/index.html
+++ b/tests/mocha/index.html
@@ -53,6 +53,7 @@
 
     <script>
       goog.require('Blockly.test.astNode');
+      goog.require('Blockly.test.blockChangeEvent');
       goog.require('Blockly.test.blockJson');
       goog.require('Blockly.test.blocks');
       goog.require('Blockly.test.comments');
@@ -88,6 +89,7 @@
       goog.require('Blockly.test.keydown');
       goog.require('Blockly.test.logicTernary');
       goog.require('Blockly.test.metrics');
+      goog.require('Blockly.test.mutator');
       goog.require('Blockly.test.names');
       goog.require('Blockly.test.procedures');
       goog.require('Blockly.test.registry');
diff --git a/tests/mocha/mutator_test.js b/tests/mocha/mutator_test.js
new file mode 100644
index 000000000..e4a942466
--- /dev/null
+++ b/tests/mocha/mutator_test.js
@@ -0,0 +1,71 @@
+
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+goog.module('Blockly.test.mutator');
+
+const {createRenderedBlock, defineMutatorBlocks, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
+suite('Mutator', function() {
+  setup(function() {
+    sharedTestSetup.call(this);
+  });
+
+  suite('Firing change event', function() {
+    setup(function() {
+      this.workspace = Blockly.inject('blocklyDiv', {});
+      defineMutatorBlocks();
+    });
+
+    teardown(function() {
+      Blockly.Extensions.unregister('xml_mutator');
+      Blockly.Extensions.unregister('jso_mutator');
+      sharedTestTeardown.call(this);
+    });
+
+    test('No change', function() {
+      var block = createRenderedBlock(this.workspace, 'xml_block');
+      block.mutator.setVisible(true);
+      var mutatorWorkspace = block.mutator.getWorkspace();
+      // Trigger mutator change listener.
+      createRenderedBlock(mutatorWorkspace, 'checkbox_block');
+      chai.assert.isTrue(
+          this.eventsFireStub.getCalls().every(
+              ({args}) =>
+                args[0].type !== Blockly.Events.BLOCK_CHANGE ||
+                args[0].element !== 'mutation'));
+    });
+
+    test('XML', function() {
+      var block = createRenderedBlock(this.workspace, 'xml_block');
+      block.mutator.setVisible(true);
+      var mutatorWorkspace = block.mutator.getWorkspace();
+      mutatorWorkspace.getBlockById('check_block')
+          .setFieldValue('TRUE', 'CHECK');
+      chai.assert.isTrue(
+          this.eventsFireStub.getCalls().some(
+              ({args}) =>
+                args[0].type === Blockly.Events.BLOCK_CHANGE &&
+                args[0].element === 'mutation' &&
+                /<mutation.*><\/mutation>/.test(args[0].newValue)));
+    });
+
+    test('JSO', function() {
+      var block = createRenderedBlock(this.workspace, 'jso_block');
+      block.mutator.setVisible(true);
+      var mutatorWorkspace = block.mutator.getWorkspace();
+      mutatorWorkspace.getBlockById('check_block')
+          .setFieldValue('TRUE', 'CHECK');
+      chai.assert.isTrue(
+          this.eventsFireStub.getCalls().some(
+              ({args}) =>
+                args[0].type === Blockly.Events.BLOCK_CHANGE &&
+                args[0].element === 'mutation' &&
+                args[0].newValue === '{"hasInput":true}'));
+    });
+  });
+});
diff --git a/tests/mocha/test_helpers.js b/tests/mocha/test_helpers.js
index 66b3ffb75..b93ccd368 100644
--- a/tests/mocha/test_helpers.js
+++ b/tests/mocha/test_helpers.js
@@ -540,6 +540,100 @@ function defineBasicBlockWithField() {
 }
 exports.defineBasicBlockWithField = defineBasicBlockWithField;
 
+function defineMutatorBlocks() {
+  Blockly.defineBlocksWithJsonArray([
+    {
+      'type': 'xml_block',
+      'mutator': 'xml_mutator'
+    },
+    {
+      'type': 'jso_block',
+      'mutator': 'jso_mutator'
+    },
+    {
+      'type': 'checkbox_block',
+      'message0': '%1',
+      'args0': [
+        {
+          'type': 'field_checkbox',
+          'name': 'CHECK'
+        }
+      ]
+    }
+  ]);
+
+  const xmlMutator = {
+    hasInput: false,
+
+    mutationToDom: function() {
+      var mutation = Blockly.utils.xml.createElement('mutation');
+      mutation.setAttribute('hasInput', this.hasInput);
+      return mutation;
+    },
+
+    domToMutation: function(mutation) {
+      this.hasInput = mutation.getAttribute('hasInput') == 'true';
+      this.updateShape();
+    },
+
+    decompose: function(workspace) {
+      var topBlock = workspace.newBlock('checkbox_block', 'check_block');
+      topBlock.initSvg();
+      topBlock.render();
+      return topBlock;
+    },
+
+    compose: function(topBlock) {
+      this.hasInput = topBlock.getFieldValue('CHECK') == 'TRUE';
+      this.updateShape();
+    },
+
+    updateShape: function() {
+      if (this.hasInput && !this.getInput('INPUT')) {
+        this.appendValueInput('INPUT');
+      } else if (!this.hasInput && this.getInput('INPUT')) {
+        this.removeInput('INPUT');
+      }
+    }
+  };
+  Blockly.Extensions.registerMutator('xml_mutator', xmlMutator);
+
+  const jsoMutator = {
+    hasInput: false,
+
+    saveExtraState: function() {
+      return {hasInput: this.hasInput};
+    },
+
+    loadExtraState: function(state) {
+      this.hasInput = state.hasInput || false;
+      this.updateShape();
+    },
+
+    decompose: function(workspace) {
+      var topBlock = workspace.newBlock('checkbox_block', 'check_block');
+      topBlock.initSvg();
+      topBlock.render();
+      return topBlock;
+    },
+
+    compose: function(topBlock) {
+      this.hasInput = topBlock.getFieldValue('CHECK') == 'TRUE';
+      this.updateShape();
+    },
+
+    updateShape: function() {
+      if (this.hasInput && !this.getInput('INPUT')) {
+        this.appendValueInput('INPUT');
+      } else if (!this.hasInput && this.getInput('INPUT')) {
+        this.removeInput('INPUT');
+      }
+    }
+  };
+  Blockly.Extensions.registerMutator('jso_mutator', jsoMutator);
+}
+exports.defineMutatorBlocks = defineMutatorBlocks;
+
 function createTestBlock() {
   return {
     id: 'test',

From 07057d087c4165622ced6747e398253ff1569d04 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Fri, 20 Aug 2021 19:49:35 +0000
Subject: [PATCH 778/833] feat: adds hooks for serializing plugins (#5276)

* Reformat registry tests

* Add tests for plugin hooks

* Add plugin hooks for serialization

* Switch PluginSerializer to IPluginSerializer

* fix: types

* fix: PR comments

* fix: tests

* cleanup: formatting

* fix: types

* feat: add respecting case in registry

* feat: add separate registry for serializers

* fix: rename serialiation registry alias

* fix: move serializer interface into interface dir
---
 core/interfaces/i_serializer.js         |  71 +++++
 core/registry.js                        |  70 ++++-
 core/requires.js                        |   3 +
 core/serialization/blocks.js            |  72 +++++
 core/serialization/priorities.js        |  34 +++
 core/serialization/registry.js          |  40 +++
 core/serialization/variables.js         |  64 ++++-
 core/serialization/workspaces.js        |  62 ++---
 tests/deps.js                           |  11 +-
 tests/deps.mocha.js                     |  11 +-
 tests/mocha/jso_deserialization_test.js | 346 ++++++++++++------------
 tests/mocha/jso_serialization_test.js   |  23 +-
 tests/mocha/registry_test.js            | 177 +++++++++++-
 13 files changed, 733 insertions(+), 251 deletions(-)
 create mode 100644 core/interfaces/i_serializer.js
 create mode 100644 core/serialization/priorities.js
 create mode 100644 core/serialization/registry.js

diff --git a/core/interfaces/i_serializer.js b/core/interfaces/i_serializer.js
new file mode 100644
index 000000000..e7b75b9e4
--- /dev/null
+++ b/core/interfaces/i_serializer.js
@@ -0,0 +1,71 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview The record type for an object containing functions for
+ *     serializing part of the workspace.
+ */
+
+'use strict';
+
+goog.module('Blockly.serialization.ISerializer');
+goog.module.declareLegacyNamespace();
+
+// eslint-disable-next-line no-unused-vars
+const Workspace = goog.requireType('Blockly.Workspace');
+
+
+/**
+ * Serializes and deserializes a plugin.
+ * @interface
+ */
+class ISerializer {
+  constructor() {
+    /**
+     * A priority value used to determine the order of deserializing plugins.
+     * More positive priorities are deserialized before less positive
+     * priorities. Eg if you have priorities (0, -10, 10, 100) the order of
+     * deserialiation will be (100, 10, 0, -10).
+     * If two plugins have the same priority, they are deserialized in an
+     * arbitrary order relative to each other.
+     * @type {number}
+     */
+    this.priority;
+  }
+
+  /* eslint-disable no-unused-vars, valid-jsdoc */
+
+  /**
+   * Saves the state of the plugin.
+   * @param {!Workspace} workspace The workspace the plugin to serialize is
+   *     associated with.
+   * @return {?} A JS object containing the plugin's state, or null if
+   *     there is no state to record.
+   */
+  save(workspace) {}
+
+  /* eslint-enable valid-jsdoc */
+
+  /**
+   * Loads the state of the plugin.
+   * @param {?} state The state of the plugin to deserialize. This will always
+   *     be non-null.
+   * @param {!Workspace} workspace The workspace the plugin to deserialize is
+   *     associated with.
+   */
+  load(state, workspace) {}
+
+  /**
+   * Clears the state of the plugin.
+   * @param {!Workspace} workspace The workspace the plugin to clear the state
+   *     of is associated with.
+   */
+  clear(workspace) {}
+
+  /* eslint-enable no-unused-vars */
+}
+
+exports.ISerializer = ISerializer;
diff --git a/core/registry.js b/core/registry.js
index 5752702ae..671daa631 100644
--- a/core/registry.js
+++ b/core/registry.js
@@ -38,6 +38,8 @@ const Renderer = goog.requireType('Blockly.blockRendering.Renderer');
 const Theme = goog.requireType('Blockly.Theme');
 /* eslint-disable-next-line no-unused-vars */
 const ToolboxItem = goog.requireType('Blockly.ToolboxItem');
+/* eslint-disable-next-line no-unused-vars */
+const ISerializer = goog.requireType('Blockly.serialization.ISerializer');
 
 
 /**
@@ -45,12 +47,20 @@ const ToolboxItem = goog.requireType('Blockly.ToolboxItem');
  * registering and the value being the constructor function.
  * e.g. {'field': {'field_angle': Blockly.FieldAngle}}
  *
- * @type {Object<string, Object<string, function(new:?)>>}
+ * @type {!Object<string, !Object<string, (function(new:?)|!Object)>>}
  */
 const typeMap = Object.create(null);
 /** @private */
 exports.typeMap_ = typeMap;
 
+/**
+ * A map of maps. With the keys being the type and caseless name of the class we
+ * are registring, and the value being the most recent cased name for that
+ * registration.
+ * @type {!Object<string, !Object<string, string>>}
+ */
+const nameMap = Object.create(null);
+
 /**
  * The string used to register the default class for a type of plugin.
  * @type {string}
@@ -118,6 +128,12 @@ Type.METRICS_MANAGER = new Type('metricsManager');
 /** @type {!Type<IBlockDragger>} */
 Type.BLOCK_DRAGGER = new Type('blockDragger');
 
+/**
+ * @type {!Type<ISerializer>}
+ * @package
+ */
+Type.SERIALIZER = new Type('serializer');
+
 /**
  * Registers a class based on a type and name.
  * @param {string|!Type<T>} type The type of the plugin.
@@ -129,7 +145,7 @@ Type.BLOCK_DRAGGER = new Type('blockDragger');
  *     an already registered item.
  * @throws {Error} if the type or name is empty, a name with the given type has
  *     already been registered, or if the given class or object is not valid for
- * it's type.
+ *     it's type.
  * @template T
  */
 const register = function(type, name, registryItem, opt_allowOverrides) {
@@ -146,25 +162,29 @@ const register = function(type, name, registryItem, opt_allowOverrides) {
         'Invalid name "' + name + '". The name must be a' +
         ' non-empty string.');
   }
-  name = name.toLowerCase();
+  const caselessName = name.toLowerCase();
   if (!registryItem) {
     throw Error('Can not register a null value');
   }
   let typeRegistry = typeMap[type];
+  let nameRegistry = nameMap[type];
   // If the type registry has not been created, create it.
   if (!typeRegistry) {
     typeRegistry = typeMap[type] = Object.create(null);
+    nameRegistry = nameMap[type] = Object.create(null);
   }
 
   // Validate that the given class has all the required properties.
   validate(type, registryItem);
 
   // Don't throw an error if opt_allowOverrides is true.
-  if (!opt_allowOverrides && typeRegistry[name]) {
+  if (!opt_allowOverrides && typeRegistry[caselessName]) {
     throw Error(
-        'Name "' + name + '" with type "' + type + '" already registered.');
+        'Name "' + caselessName + '" with type "' + type +
+        '" already registered.');
   }
-  typeRegistry[name] = registryItem;
+  typeRegistry[caselessName] = registryItem;
+  nameRegistry[caselessName] = name;
 };
 exports.register = register;
 
@@ -203,6 +223,7 @@ const unregister = function(type, name) {
     return;
   }
   delete typeMap[type][name];
+  delete nameMap[type][name];
 };
 exports.unregister = unregister;
 
@@ -288,6 +309,43 @@ const getObject = function(type, name, opt_throwIfMissing) {
 };
 exports.getObject = getObject;
 
+/**
+ * Returns a map of items registered with the given type.
+ * @param {string|!Type<T>} type The type of the plugin. (e.g. Category)
+ * @param {boolean} opt_cased Whether or not to return a map with cased keys
+ *     (rather than caseless keys). False by default.
+ * @param {boolean=} opt_throwIfMissing Whether or not to throw an error if we
+ *     are unable to find the object. False by default.
+ * @return {?Object<string, ?T|?function(new:T, ...?)>} A map of objects with
+ *     the given type, or null if none exists.
+ * @template T
+ */
+const getAllItems = function(type, opt_cased, opt_throwIfMissing) {
+  type = String(type).toLowerCase();
+  const typeRegistry = typeMap[type];
+  if (!typeRegistry) {
+    const msg = `Unable to find [${type}] in the registry.`;
+    if (opt_throwIfMissing) {
+      throw new Error(`${msg} You must require or register a ${type} plugin.`);
+    } else {
+      console.warn(msg);
+    }
+    return null;
+  }
+  if (!opt_cased) {
+    return typeRegistry;
+  }
+  const nameRegistry = nameMap[type];
+  const casedRegistry = Object.create(null);
+  const keys = Object.keys(typeRegistry);
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i];
+    casedRegistry[nameRegistry[key]] = typeRegistry[key];
+  }
+  return casedRegistry;
+};
+exports.getAllItems = getAllItems;
+
 /**
  * Gets the class from Blockly options for the given type.
  * This is used for plugins that override a built in feature. (e.g. Toolbox)
diff --git a/core/requires.js b/core/requires.js
index 8e91f2f8b..bb96f0359 100644
--- a/core/requires.js
+++ b/core/requires.js
@@ -82,4 +82,7 @@ goog.require('Blockly.zelos.Renderer');
 // Classic is the default theme.
 goog.require('Blockly.Themes.Classic');
 
+goog.require('Blockly.serialization.blocks');
+goog.require('Blockly.serialization.registry');
+goog.require('Blockly.serialization.variables');
 goog.require('Blockly.serialization.workspaces');
diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index 531b7cb77..04f175bc1 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -19,10 +19,14 @@ const Block = goog.requireType('Blockly.Block');
 // eslint-disable-next-line no-unused-vars
 const Connection = goog.requireType('Blockly.Connection');
 const Events = goog.require('Blockly.Events');
+// eslint-disable-next-line no-unused-vars
+const {ISerializer} = goog.requireType('Blockly.serialization.ISerializer');
 const Size = goog.require('Blockly.utils.Size');
 // eslint-disable-next-line no-unused-vars
 const Workspace = goog.requireType('Blockly.Workspace');
 const inputTypes = goog.require('Blockly.inputTypes');
+const priorities = goog.require('Blockly.serialization.priorities');
+const serializationRegistry = goog.require('Blockly.serialization.registry');
 
 
 // TODO: Remove this once lint is fixed.
@@ -577,3 +581,71 @@ const initBlock = function(block, rendered) {
     block.initModel();
   }
 };
+
+// Aliases to disambiguate saving/loading within the serializer.
+const saveBlock = save;
+const loadBlock = load;
+
+/**
+ * Serializer for saving and loading block state.
+ * @implements {ISerializer}
+ */
+class BlockSerializer {
+  constructor() {
+    /**
+     * The priority for deserializing blocks.
+     * @type {number}
+     */
+    this.priority = priorities.BLOCKS;
+  }
+
+  /**
+   * Serializes the blocks of the given workspace.
+   * @param {!Workspace} workspace The workspace to save the blocks of.
+   * @return {?{languageVersion: number, blocks:!Array<!State>}} The state of
+   *     the workspace's blocks, or null if there are no blocks.
+   */
+  save(workspace) {
+    const blockState = [];
+    for (const block of workspace.getTopBlocks(false)) {
+      const state = saveBlock(block, {addCoordinates: true});
+      if (state) {
+        blockState.push(state);
+      }
+    }
+    if (blockState.length) {
+      return {
+        'languageVersion': 0, // Currently unused.
+        'blocks': blockState
+      };
+    }
+    return null;
+  }
+
+  /**
+   * Deserializes the blocks defined by the given state into the given
+   * workspace.
+   * @param {{languageVersion: number, blocks:!Array<!State>}} state The state
+   *     of the blocks to deserialize.
+   * @param {!Workspace} workspace The workspace to deserialize into.
+   */
+  load(state, workspace) {
+    const blockStates = state['blocks'];
+    for (const state of blockStates) {
+      loadBlock(state, workspace, {recordUndo: Events.getRecordUndo()});
+    }
+  }
+
+  /**
+   * Disposes of any blocks that exist on the workspace.
+   * @param {!Workspace} workspace The workspace to clear the blocks of.
+   */
+  clear(workspace) {
+    // Cannot use workspace.clear() because that also removes variables.
+    for (const block of workspace.getTopBlocks(false)) {
+      block.dispose(false);
+    }
+  }
+}
+
+serializationRegistry.register('blocks', new BlockSerializer());
diff --git a/core/serialization/priorities.js b/core/serialization/priorities.js
new file mode 100644
index 000000000..3535d5185
--- /dev/null
+++ b/core/serialization/priorities.js
@@ -0,0 +1,34 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Includes constants for the priorities of different plugin
+ *     serializers. Higher priorities are deserialized first.
+ */
+
+'use strict';
+
+/**
+ * The top level namespace for priorities of plugin serializers.
+ * @namespace Blockly.serialization.priorities
+ */
+goog.module('Blockly.serialization.priorities');
+goog.module.declareLegacyNamespace();
+
+
+/**
+ * The priority for deserializing variables.
+ * @type {number}
+ * @const
+ */
+exports.VARIABLES = 100;
+
+/**
+ * The priority for deserializing blocks.
+ * @type {number}
+ * @const
+ */
+exports.BLOCKS = 50;
diff --git a/core/serialization/registry.js b/core/serialization/registry.js
new file mode 100644
index 000000000..7806db29f
--- /dev/null
+++ b/core/serialization/registry.js
@@ -0,0 +1,40 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Contains functions registering serializers (eg blocks,
+ *     variables, plugins, etc).
+ */
+'use strict';
+
+goog.module('Blockly.serialization.registry');
+goog.module.declareLegacyNamespace();
+
+
+// eslint-disable-next-line no-unused-vars
+const {ISerializer} = goog.requireType('Blockly.serialization.ISerializer');
+const registry = goog.require('Blockly.registry');
+
+
+/**
+ * Registers the given serializer so that it can be used for serialization and
+ * deserialization.
+ * @param {string} name The name of the serializer to register.
+ * @param {ISerializer} serializer The serializer to register.
+ */
+const register = function(name, serializer) {
+  registry.register(registry.Type.SERIALIZER, name, serializer);
+};
+exports.register = register;
+
+/**
+ * Unregisters the serializer associated with the given name.
+ * @param {string} name The name of the serializer to unregister.
+ */
+const unregister = function(name) {
+  registry.unregister(registry.Type.SERIALIZER, name);
+};
+exports.unregister = unregister;
diff --git a/core/serialization/variables.js b/core/serialization/variables.js
index e071b9f3e..9606f32d2 100644
--- a/core/serialization/variables.js
+++ b/core/serialization/variables.js
@@ -15,9 +15,13 @@ goog.module.declareLegacyNamespace();
 
 const Events = goog.require('Blockly.Events');
 // eslint-disable-next-line no-unused-vars
+const {ISerializer} = goog.requireType('Blockly.serialization.ISerializer');
+// 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 priorities = goog.require('Blockly.serialization.priorities');
+const serializationRegistry = goog.require('Blockly.serialization.registry');
 
 
 /**
@@ -36,7 +40,7 @@ exports.State = State;
  * @param {!VariableModel} variableModel The variable to serialize.
  * @return {!State} The serialized state of the variable.
  */
-const save = function(variableModel) {
+const saveVariable = function(variableModel) {
   const state = {
     'name': variableModel.name,
     'id': variableModel.getId()
@@ -46,12 +50,9 @@ const save = function(variableModel) {
   }
   return state;
 };
-/** @package */
-exports.save = save;
 
 /**
  * Loads the variable represented by the given state into the given workspace.
- * Do not call this directly, use workspace.createVariable instead.
  * @param {!State} state The state of a variable to deserialize into the
  *     workspace.
  * @param {!Workspace} workspace The workspace to add the variable to.
@@ -59,7 +60,7 @@ exports.save = save;
  *     recordUndo: If true, events triggered by this function will be undo-able
  *       by the user. False by default.
  */
-const load = function(state, workspace, {recordUndo = false} = {}) {
+const loadVariable = function(state, workspace, {recordUndo = false} = {}) {
   const prevRecordUndo = Events.getRecordUndo();
   Events.setRecordUndo(recordUndo);
   const existingGroup = Events.getGroup();
@@ -72,5 +73,54 @@ const load = function(state, workspace, {recordUndo = false} = {}) {
   Events.setGroup(existingGroup);
   Events.setRecordUndo(prevRecordUndo);
 };
-/** @package */
-exports.load = load;
+
+/**
+ * Serializer for saving and loading variable state.
+ * @implements {ISerializer}
+ */
+class VariableSerializer {
+  constructor() {
+    /**
+     * The priority for deserializing variables.
+     * @type {number}
+     */
+    this.priority = priorities.VARIABLES;
+  }
+
+  /**
+   * Serializes the variables of the given workspace.
+   * @param {!Workspace} workspace The workspace to save the variables of.
+   * @return {?Array<!State>} The state of the workspace's variables, or null
+   *     if there are no variables.
+   */
+  save(workspace) {
+    const variableStates = [];
+    for (const variable of workspace.getAllVariables()) {
+      variableStates.push(saveVariable(variable));
+    }
+    return variableStates.length ? variableStates : null;
+  }
+
+  /**
+   * Deserializes the variable defined by the given state into the given
+   * workspace.
+   * @param {!Array<!State>} state The state of the variables to deserialize.
+   * @param {!Workspace} workspace The workspace to deserialize into.
+   */
+  load(state, workspace) {
+    for (const varState of state) {
+      loadVariable(varState, workspace, {recordUndo: Events.getRecordUndo()});
+    }
+  }
+
+  /**
+   * Disposes of any variables or potential variables that exist on the
+   * workspace.
+   * @param {!Workspace} workspace The workspace to clear the variables of.
+   */
+  clear(workspace) {
+    workspace.getVariableMap().clear();
+  }
+}
+
+serializationRegistry.register('variables', new VariableSerializer());
diff --git a/core/serialization/workspaces.js b/core/serialization/workspaces.js
index 581ca867a..2c180099b 100644
--- a/core/serialization/workspaces.js
+++ b/core/serialization/workspaces.js
@@ -16,9 +16,8 @@ goog.module.declareLegacyNamespace();
 const Events = goog.require('Blockly.Events');
 // eslint-disable-next-line no-unused-vars
 const Workspace = goog.require('Blockly.Workspace');
-const blocks = goog.require('Blockly.serialization.blocks');
 const dom = goog.require('Blockly.utils.dom');
-const variables = goog.require('Blockly.serialization.variables');
+const registry = goog.require('Blockly.registry');
  
 
 /**
@@ -28,31 +27,13 @@ const variables = goog.require('Blockly.serialization.variables');
  */
 const save = function(workspace) {
   const state = Object.create(null);
-
-  // TODO: Switch this to use plugin serialization system (once it is built).
-  const variableStates = [];
-  const vars = workspace.getAllVariables();
-  for (let i = 0; i < vars.length; i++) {
-    variableStates.push(variables.save(vars[i]));
-  }
-  if (variableStates.length) {
-    state['variables'] = variableStates;
-  }
-
-  const blockStates = [];
-  for (let block of workspace.getTopBlocks(false)) {
-    const blockState = blocks.save(block, {addCoordinates: true});
-    if (blockState) {
-      blockStates.push(blockState);
+  const serializerMap = registry.getAllItems(registry.Type.SERIALIZER, true);
+  for (const key in serializerMap) {
+    const save = serializerMap[key].save(workspace);
+    if (save) {
+      state[key] = save;
     }
   }
-  if (blockStates.length) {
-    // This is an object to support adding language version later.
-    state['blocks'] = {
-      'blocks': blockStates
-    };
-  }
-
   return state;
 };
 exports.save = save;
@@ -67,8 +48,14 @@ exports.save = save;
  *       by the user. False by default.
  */
 const load = function(state, workspace, {recordUndo = false} = {}) {
-  // TODO: Switch this to use plugin serialization system (once it is built).
-  // TODO: Add something for clearing the state before deserializing.
+  const serializerMap = registry.getAllItems(registry.Type.SERIALIZER, true);
+  if (!serializerMap) {
+    return;
+  }
+
+  const deserializers = Object.entries(serializerMap)
+      .sort(([, {priority: priorityA}], [, {priority: priorityB}]) =>
+        priorityB - priorityA);
 
   const prevRecordUndo = Events.getRecordUndo();
   Events.setRecordUndo(recordUndo);
@@ -81,18 +68,19 @@ const load = function(state, workspace, {recordUndo = false} = {}) {
   if (workspace.setResizesEnabled) {
     workspace.setResizesEnabled(false);
   }
-
-  if (state['variables']) {
-    const variableStates = state['variables'];
-    for (let i = 0; i < variableStates.length; i++) {
-      variables.load(variableStates[i], workspace, {recordUndo});
-    }
+  
+  // We want to trigger clearing in reverse priority order so plugins don't end
+  // up missing dependencies.
+  for (const [, deserializer] of deserializers.reverse()) {
+    deserializer.clear(workspace);
   }
 
-  if (state['blocks']) {
-    const blockStates = state['blocks']['blocks'];
-    for (let i = 0; i < blockStates.length; i++) {
-      blocks.load(blockStates[i], workspace, {recordUndo});
+  // reverse() is destructive, so we have to re-reverse to correct the order.
+  for (let [name, deserializer] of deserializers.reverse()) {
+    name = /** @type {string} */ (name);
+    const pluginState = state[name];
+    if (pluginState) {
+      deserializer.load(state[name], workspace);
     }
   }
 
diff --git a/tests/deps.js b/tests/deps.js
index 8850112c2..9e2eab19c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -116,6 +116,7 @@ goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistra
 goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_selectable_toolbox_item.js', ['Blockly.ISelectableToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_serializer.js', ['Blockly.serialization.ISerializer'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.IToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
@@ -193,13 +194,15 @@ goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['B
 goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
+goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.registry', 'Blockly.serialization.variables', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.serialization.exceptions', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.serialization.exceptions', 'Blockly.serialization.priorities', 'Blockly.serialization.registry', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/exceptions.js', ['Blockly.serialization.exceptions'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Events', 'Blockly.Workspace', 'Blockly.serialization.blocks', 'Blockly.serialization.variables', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/priorities.js', ['Blockly.serialization.priorities'], [], {'module': 'goog'});
+goog.addDependency('../../core/serialization/registry.js', ['Blockly.serialization.registry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.Events', 'Blockly.serialization.priorities', 'Blockly.serialization.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Events', 'Blockly.Workspace', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index c89219406..06a879fa1 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -116,6 +116,7 @@ goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistra
 goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_selectable_toolbox_item.js', ['Blockly.ISelectableToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_serializer.js', ['Blockly.serialization.ISerializer'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.IToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
@@ -193,13 +194,15 @@ goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['B
 goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
+goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.registry', 'Blockly.serialization.variables', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.serialization.exceptions', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.serialization.exceptions', 'Blockly.serialization.priorities', 'Blockly.serialization.registry', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/exceptions.js', ['Blockly.serialization.exceptions'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Events', 'Blockly.Workspace', 'Blockly.serialization.blocks', 'Blockly.serialization.variables', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/priorities.js', ['Blockly.serialization.priorities'], [], {'module': 'goog'});
+goog.addDependency('../../core/serialization/registry.js', ['Blockly.serialization.registry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.Events', 'Blockly.serialization.priorities', 'Blockly.serialization.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Events', 'Blockly.Workspace', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/jso_deserialization_test.js b/tests/mocha/jso_deserialization_test.js
index 2f9cf59f2..24d74fbf3 100644
--- a/tests/mocha/jso_deserialization_test.js
+++ b/tests/mocha/jso_deserialization_test.js
@@ -94,188 +94,128 @@ suite('JSO Deserialization', function() {
     });
 
     suite('Var create', function() {
-      suite('Top-level call', function() {
-        test('Just var', function() {
-          const state = {
-            'variables': [
-              {
-                'name': 'test',
-                'id': 'testId',
-              }
-            ]
-          };
-          Blockly.serialization.workspaces.load(state, this.workspace);
-          assertEventFired(
-              this.eventsFireStub,
-              Blockly.Events.VarCreate,
-              {
-                'varName': 'test',
-                'varId': 'testId',
-                'varType': '',
-                'recordUndo': false
-              },
-              this.workspace.id);
-        });
-
-        test('Record undo', function() {
-          const state = {
-            'variables': [
-              {
-                'name': 'test',
-                'id': 'testId',
-              }
-            ]
-          };
-          Blockly.serialization.workspaces.load(state, this.workspace, {recordUndo: true});
-          assertEventFired(
-              this.eventsFireStub,
-              Blockly.Events.VarCreate,
-              {
-                'varName': 'test',
-                'varId': 'testId',
-                'varType': '',
-                'recordUndo': true
-              },
-              this.workspace.id);
-        });
-
-        test('Grouping', function() {
-          const state = {
-            'variables': [
-              {
-                'name': 'test',
-                'id': 'testId',
-              }
-            ]
-          };
-          Blockly.Events.setGroup('my group');
-          Blockly.serialization.workspaces.load(state, this.workspace);
-          assertEventFired(
-              this.eventsFireStub,
-              Blockly.Events.VarCreate,
-              {
-                'varName': 'test',
-                'varId': 'testId',
-                'varType': '',
-                'group': 'my group'
-              },
-              this.workspace.id);
-        });
-
-        test('Multiple vars grouped', function() {
-          const state = {
-            'variables': [
-              {
-                'name': 'test',
-                'id': 'testId',
-              },
-              {
-                'name': 'test2',
-                'id': 'testId2',
-              }
-            ]
-          };
-          Blockly.serialization.workspaces.load(state, this.workspace);
-          const calls = this.eventsFireStub.getCalls();
-          const group = calls[0].args[0].group;
-          chai.assert.isTrue(calls.every(call => call.args[0].group == group));
-        });
-
-        test('Var with block', function() {
-          const state = {
-            'variables': [
-              {
-                'name': 'test',
-                'id': 'testId',
-              }
-            ],
-            'blocks': {
-              'blocks': [
-                {
-                  'type': 'variables_get',
-                  'id': 'blockId',
-                  'x': 42,
-                  'y': 42,
-                  'fields': {
-                    'VAR': 'testId'
-                  }
-                },
-              ]
+      test('Just var', function() {
+        const state = {
+          'variables': [
+            {
+              'name': 'test',
+              'id': 'testId',
             }
-          };
-          Blockly.serialization.workspaces.load(state, this.workspace);
-          const calls = this.eventsFireStub.getCalls();
-          const count = calls.reduce((acc, call) => {
-            if (call.args[0] instanceof Blockly.Events.VarCreate) {
-              return acc + 1;
-            }
-            return acc;
-          }, 0);
-          chai.assert.equal(count, 1);
-          assertEventFired(
-              this.eventsFireStub,
-              Blockly.Events.VarCreate,
-              {'varName': 'test', 'varId': 'testId', 'varType': ''},
-              this.workspace.id);
-        });
+          ]
+        };
+        Blockly.serialization.workspaces.load(state, this.workspace);
+        assertEventFired(
+            this.eventsFireStub,
+            Blockly.Events.VarCreate,
+            {
+              'varName': 'test',
+              'varId': 'testId',
+              'varType': '',
+              'recordUndo': false
+            },
+            this.workspace.id);
       });
 
-      suite('Direct call', function() {
-        test('Just var', function() {
-          const state = {
-            'name': 'test',
-            'id': 'testId',
-          };
-          Blockly.serialization.variables.load(state, this.workspace);
-          assertEventFired(
-              this.eventsFireStub,
-              Blockly.Events.VarCreate,
-              {
-                'varName': 'test',
-                'varId': 'testId',
-                'varType': '',
-                'recordUndo': false
-              },
-              this.workspace.id);
-        });
+      test('Record undo', function() {
+        const state = {
+          'variables': [
+            {
+              'name': 'test',
+              'id': 'testId',
+            }
+          ]
+        };
+        Blockly.serialization.workspaces.load(state, this.workspace, {recordUndo: true});
+        assertEventFired(
+            this.eventsFireStub,
+            Blockly.Events.VarCreate,
+            {
+              'varName': 'test',
+              'varId': 'testId',
+              'varType': '',
+              'recordUndo': true
+            },
+            this.workspace.id);
+      });
 
-        test('Record undo', function() {
-          const state = {
-            'name': 'test',
-            'id': 'testId',
-          };
-          Blockly.serialization.variables
-              .load(state, this.workspace, {recordUndo: true});
-          assertEventFired(
-              this.eventsFireStub,
-              Blockly.Events.VarCreate,
-              {
-                'varName': 'test',
-                'varId': 'testId',
-                'varType': '',
-                'recordUndo': true
-              },
-              this.workspace.id);
-        });
+      test('Grouping', function() {
+        const state = {
+          'variables': [
+            {
+              'name': 'test',
+              'id': 'testId',
+            }
+          ]
+        };
+        Blockly.Events.setGroup('my group');
+        Blockly.serialization.workspaces.load(state, this.workspace);
+        assertEventFired(
+            this.eventsFireStub,
+            Blockly.Events.VarCreate,
+            {
+              'varName': 'test',
+              'varId': 'testId',
+              'varType': '',
+              'group': 'my group'
+            },
+            this.workspace.id);
+      });
 
-        test('Grouping', function() {
-          const state = {
-            'name': 'test',
-            'id': 'testId',
-          };
-          Blockly.Events.setGroup('my group');
-          Blockly.serialization.variables.load(state, this.workspace);
-          assertEventFired(
-              this.eventsFireStub,
-              Blockly.Events.VarCreate,
+      test('Multiple vars grouped', function() {
+        const state = {
+          'variables': [
+            {
+              'name': 'test',
+              'id': 'testId',
+            },
+            {
+              'name': 'test2',
+              'id': 'testId2',
+            }
+          ]
+        };
+        Blockly.serialization.workspaces.load(state, this.workspace);
+        const calls = this.eventsFireStub.getCalls();
+        const group = calls[0].args[0].group;
+        chai.assert.isTrue(calls.every(call => call.args[0].group == group));
+      });
+
+      test('Var with block', function() {
+        const state = {
+          'variables': [
+            {
+              'name': 'test',
+              'id': 'testId',
+            }
+          ],
+          'blocks': {
+            'blocks': [
               {
-                'varName': 'test',
-                'varId': 'testId',
-                'varType': '',
-                'group': 'my group'
+                'type': 'variables_get',
+                'id': 'blockId',
+                'x': 42,
+                'y': 42,
+                'fields': {
+                  'VAR': 'testId'
+                }
               },
-              this.workspace.id);
-        });
+            ]
+          }
+        };
+        Blockly.serialization.workspaces.load(state, this.workspace);
+        const calls = this.eventsFireStub.getCalls();
+        const count = calls.reduce((acc, call) => {
+          if (call.args[0] instanceof Blockly.Events.VarCreate) {
+            return acc + 1;
+          }
+          return acc;
+        }, 0);
+        chai.assert.equal(count, 1);
+        assertEventFired(
+            this.eventsFireStub,
+            Blockly.Events.VarCreate,
+            {'varName': 'test', 'varId': 'testId', 'varType': ''},
+            this.workspace.id);
       });
     });
 
@@ -681,4 +621,60 @@ suite('JSO Deserialization', function() {
       });
     });
   });
+
+  test('Priority', function() {
+    const blocksSerializer = Blockly.registry.getClass(
+        Blockly.registry.Type.SERIALIZER, 'blocks');
+    const variablesSerializer = Blockly.registry.getClass(
+        Blockly.registry.Type.SERIALIZER, 'variables');
+
+    Blockly.serialization.registry.unregister('blocks');
+    Blockly.serialization.registry.unregister('variables');
+
+    const calls = [];
+
+    const first = {
+      priority: 100,
+      save: () => null,
+      load: () => calls.push('first-load'),
+      clear: () => calls.push('first-clear'),
+    };
+    const second = {
+      priority: 0,
+      save: () => null,
+      load: () => calls.push('second-load'),
+      clear: () => calls.push('second-clear'),
+    };
+    const third = {
+      priority: -10,
+      save: () => null,
+      load: () => calls.push('third-load'),
+      clear: () => calls.push('third-clear'),
+    };
+
+    Blockly.serialization.registry.register('third', third);
+    Blockly.serialization.registry.register('first', first);
+    Blockly.serialization.registry.register('second', second);
+
+    Blockly.serialization.workspaces.load(
+        {'first': {}, 'third': {}, 'second': {}}, this.workspace);
+    
+    Blockly.serialization.registry.unregister('first');
+    Blockly.serialization.registry.unregister('second');
+    Blockly.serialization.registry.unregister('third');
+
+    Blockly.serialization.registry.register('blocks', blocksSerializer);
+    Blockly.serialization.registry.register('variables', variablesSerializer);
+
+    chai.assert.deepEqual(
+        calls,
+        [
+          'third-clear',
+          'second-clear',
+          'first-clear',
+          'first-load',
+          'second-load',
+          'third-load'
+        ]);
+  });
 });
diff --git a/tests/mocha/jso_serialization_test.js b/tests/mocha/jso_serialization_test.js
index 0d4aeb5ce..836089320 100644
--- a/tests/mocha/jso_serialization_test.js
+++ b/tests/mocha/jso_serialization_test.js
@@ -699,20 +699,21 @@ suite('JSO Serialization', function() {
 
   suite('Variables', function() {
     test('Without type', function() {
-      const variable = this.workspace.createVariable('testVar', '', 'testId');
-      const jso = Blockly.serialization.variables.save(variable);
-      assertProperty(jso, 'name', 'testVar');
-      assertProperty(jso, 'id', 'testId');
-      assertNoProperty(jso, 'type');
+      this.workspace.createVariable('testVar', '', 'testId');
+      const jso = Blockly.serialization.workspaces.save(this.workspace);
+      const variable = jso['variables'][0];
+      assertProperty(variable, 'name', 'testVar');
+      assertProperty(variable, 'id', 'testId');
+      assertNoProperty(variable, 'type');
     });
 
     test('With type', function() {
-      const variable = this.workspace
-          .createVariable('testVar', 'testType', 'testId');
-      const jso = Blockly.serialization.variables.save(variable);
-      assertProperty(jso, 'name', 'testVar');
-      assertProperty(jso, 'id', 'testId');
-      assertProperty(jso, 'type', 'testType');
+      this.workspace.createVariable('testVar', 'testType', 'testId');
+      const jso = Blockly.serialization.workspaces.save(this.workspace);
+      const variable = jso['variables'][0];
+      assertProperty(variable, 'name', 'testVar');
+      assertProperty(variable, 'id', 'testId');
+      assertProperty(variable, 'type', 'testType');
     });
   });
 });
diff --git a/tests/mocha/registry_test.js b/tests/mocha/registry_test.js
index 10f01d958..fef243d86 100644
--- a/tests/mocha/registry_test.js
+++ b/tests/mocha/registry_test.js
@@ -9,6 +9,7 @@ goog.module('Blockly.test.registry');
 const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
 
 
+
 suite('Registry', function() {
   var TestClass = function() {};
   TestClass.prototype.testMethod = function() {
@@ -18,39 +19,195 @@ suite('Registry', function() {
   setup(function() {
     sharedTestSetup.call(this);
   });
+
   teardown(function() {
     sharedTestTeardown.call(this);
-    if (Blockly.registry.typeMap_['test'] &&
-        Blockly.registry.typeMap_['test']['test_name']) {
-      delete Blockly.registry.typeMap_['test']['test_name'];
+    if (Blockly.registry.hasItem('test', 'test_name')) {
+      Blockly.registry.unregister('test', 'test_name');
     }
   });
+  
   suite('Registration', function() {
     test('Simple', function() {
       Blockly.registry.register('test', 'test_name', TestClass);
     });
+
     test('Empty String Key', function() {
       chai.assert.throws(function() {
         Blockly.registry.register('test', '', TestClass);
       }, 'Invalid name');
     });
+
     test('Class as Key', function() {
       chai.assert.throws(function() {
         Blockly.registry.register('test', TestClass, '');
       }, 'Invalid name');
     });
+
     test('Overwrite a Key', function() {
       Blockly.registry.register('test', 'test_name', TestClass);
       chai.assert.throws(function() {
         Blockly.registry.register('test', 'test_name', TestClass);
       }, 'already registered');
     });
+
     test('Null Value', function() {
       chai.assert.throws(function() {
         Blockly.registry.register('test', 'field_custom_test', null);
       }, 'Can not register a null value');
     });
   });
+
+  suite('hasItem', function() {
+    setup(function() {
+      Blockly.registry.register('test', 'test_name', TestClass);
+    });
+
+    test('Has', function() {
+      chai.assert.isTrue(Blockly.registry.hasItem('test', 'test_name'));
+    });
+
+    suite('Does not have', function() {
+      test('Type', function() {
+        chai.assert.isFalse(Blockly.registry.hasItem('bad_type', 'test_name'));
+      });
+
+      test('Name', function() {
+        chai.assert.isFalse(Blockly.registry.hasItem('test', 'bad_name'));
+      });
+    });
+
+    suite('Case', function() {
+      test('Caseless type', function() {
+        chai.assert.isTrue(Blockly.registry.hasItem('TEST', 'test_name'));
+      });
+
+      test('Caseless name', function() {
+        chai.assert.isTrue(Blockly.registry.hasItem('test', 'TEST_NAME'));
+      });
+    });
+  });
+
+  suite('getClass', function() {
+    setup(function() {
+      Blockly.registry.register('test', 'test_name', TestClass);
+    });
+
+    test('Has', function() {
+      chai.assert.isNotNull(Blockly.registry.getClass('test', 'test_name'));
+    });
+
+    suite('Does not have', function() {
+      test('Type', function() {
+        chai.assert.isNull(Blockly.registry.getClass('bad_type', 'test_name'));
+      });
+
+      test('Name', function() {
+        chai.assert.isNull(Blockly.registry.getClass('test', 'bad_name'));
+      });
+
+      test('Throw if missing', function() {
+        chai.assert.throws(function() {
+          Blockly.registry.getClass('test', 'bad_name', true);
+        });
+      });
+    });
+
+    suite('Case', function() {
+      test('Caseless type', function() {
+        chai.assert.isNotNull(Blockly.registry.getClass('TEST', 'test_name'));
+      });
+
+      test('Caseless name', function() {
+        chai.assert.isNotNull(Blockly.registry.getClass('test', 'TEST_NAME'));
+      });
+    });
+  });
+
+  suite('getObject', function() {
+    setup(function() {
+      Blockly.registry.register('test', 'test_name', {});
+    });
+
+    test('Has', function() {
+      chai.assert.isNotNull(Blockly.registry.getObject('test', 'test_name'));
+    });
+
+    suite('Does not have', function() {
+      test('Type', function() {
+        chai.assert.isNull(Blockly.registry.getObject('bad_type', 'test_name'));
+      });
+
+      test('Name', function() {
+        chai.assert.isNull(Blockly.registry.getObject('test', 'bad_name'));
+      });
+
+      test('Throw if missing', function() {
+        chai.assert.throws(function() {
+          Blockly.registry.getObject('test', 'bad_name', true);
+        });
+      });
+    });
+
+    suite('Case', function() {
+      test('Caseless type', function() {
+        chai.assert.isNotNull(Blockly.registry.getObject('TEST', 'test_name'));
+      });
+
+      test('Caseless name', function() {
+        chai.assert.isNotNull(Blockly.registry.getObject('test', 'TEST_NAME'));
+      });
+    });
+  });
+
+  suite('getAllItems', function() {
+    setup(function() {
+      Blockly.registry.register('test', 'test_name', {});
+      Blockly.registry.register('test', 'casedNAME', {});
+    });
+
+    teardown(function() {
+      Blockly.registry.unregister('test', 'casedname');
+    });
+
+    test('Has', function() {
+      chai.assert.isNotNull(Blockly.registry.getAllItems('test'));
+    });
+
+    test('Does not have', function() {
+      chai.assert.isNull(Blockly.registry.getAllItems('bad_type'));
+    });
+
+    test('Throw if missing', function() {
+      chai.assert.throws(function() {
+        Blockly.registry.getAllItems('bad_type', false, true);
+      });
+    });
+
+    test('Ignore type case', function() {
+      chai.assert.isNotNull(Blockly.registry.getAllItems('TEST'));
+    });
+
+    test('Respect name case', function() {
+      chai.assert.deepEqual(
+          Blockly.registry.getAllItems('test', true),
+          {
+            'test_name': {},
+            'casedNAME': {}
+          });
+    });
+
+    test('Respect overwriting name case', function() {
+      Blockly.registry.register('test', 'CASEDname', {}, true);
+      chai.assert.deepEqual(
+          Blockly.registry.getAllItems('test', true),
+          {
+            'test_name': {},
+            'CASEDname': {}
+          });
+    });
+  });
+
   suite('getClassFromOptions', function() {
     setup(function() {
       this.defaultClass = function() {};
@@ -62,25 +219,31 @@ suite('Registry', function() {
           'test' : 'test_name'
         }
       };
-      Blockly.registry.typeMap_['test'] = {
-        'test_name': TestClass,
-        'default': this.defaultClass
-      };
+      Blockly.registry.register('test', 'test_name', TestClass);
+      Blockly.registry.register('test', 'default', this.defaultClass);
     });
+
+    teardown(function() {
+      Blockly.registry.unregister('test', 'default');
+    });
+
     test('Simple - Plugin name given', function() {
       var testClass = Blockly.registry.getClassFromOptions('test', this.options);
       chai.assert.instanceOf(new testClass(), TestClass);
     });
+
     test('Simple - Plugin class given', function() {
       this.options.plugins['test'] = TestClass;
       var testClass = Blockly.registry.getClassFromOptions('test', this.options);
       chai.assert.instanceOf(new testClass(), TestClass);
     });
+
     test('No Plugin Name Given', function() {
       delete this.options['plugins']['test'];
       var testClass = Blockly.registry.getClassFromOptions('test', this.options);
       chai.assert.instanceOf(new testClass(), this.defaultClass);
     });
+
     test('Incorrect Plugin Name', function() {
       this.options['plugins']['test'] = 'random';
       var testClass;

From 9aecac3339bd56410754b5fceed341072828e14a Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Mon, 23 Aug 2021 17:32:27 +0000
Subject: [PATCH 779/833] fix: remove some attributes from the JSO system
 (#5356)

* fix: remove some attributes from the JSO system

Remove the deletable, movable, and editable attributes.
Normally this would be a breaking change, but because this isn't
released yet it's just a patch.

* fixup: serializer tests
---
 core/serialization/blocks.js          | 25 +----------
 tests/mocha/jso_serialization_test.js | 64 ---------------------------
 tests/mocha/serializer_test.js        | 17 +------
 3 files changed, 2 insertions(+), 104 deletions(-)

diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index 04f175bc1..49dcde835 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -51,9 +51,6 @@ exports.ConnectionState = ConnectionState;
  *     y: (number|undefined),
  *     collapsed: (boolean|undefined),
  *     disabled: (boolean|undefined),
- *     editable: (boolean|undefined),
- *     deletable: (boolean|undefined),
- *     movable: (boolean|undefined),
  *     inline: (boolean|undefined),
  *     data: (string|undefined),
  *     extra-state: *,
@@ -118,7 +115,7 @@ exports.save = save;
 
 /**
  * Adds attributes to the given state object based on the state of the block.
- * Eg collapsed, disabled, editable, etc.
+ * Eg collapsed, disabled, inline, etc.
  * @param {!Block} block The block to base the attributes on.
  * @param {!State} state The state object to append to.
  */
@@ -129,21 +126,10 @@ const saveAttributes = function(block, state) {
   if (!block.isEnabled()) {
     state['enabled'] = false;
   }
-  if (!block.isEditable()) {
-    state['editable'] = false;
-  }
-  if (!block.isDeletable() && !block.isShadow()) {
-    state['deletable'] = false;
-  }
-  if (!block.isMovable() && !block.isShadow()) {
-    state['movable'] = false;
-  }
-
   if (block.inputsInline !== undefined &&
       block.inputsInline !== block.inputsInlineDefault) {
     state['inline'] = block.inputsInline;
   }
-
   // Data is a nullable string, so we don't need to worry about falsy values.
   if (block.data) {
     state['data'] = block.data;
@@ -383,15 +369,6 @@ const loadAttributes = function(block, state) {
   if (state['enabled'] === false) {
     block.setEnabled(false);
   }
-  if (state['editable'] === false) {
-    block.setEditable(false);
-  }
-  if (state['deletable'] === false) {
-    block.setDeletable(false);
-  }
-  if (state['movable'] === false) {
-    block.setMovable(false);
-  }
   if (state['inline'] !== undefined) {
     block.setInputsInline(state['inline']);
   }
diff --git a/tests/mocha/jso_serialization_test.js b/tests/mocha/jso_serialization_test.js
index 836089320..9e05482c1 100644
--- a/tests/mocha/jso_serialization_test.js
+++ b/tests/mocha/jso_serialization_test.js
@@ -83,70 +83,6 @@ suite('JSO Serialization', function() {
         });
       });
 
-      suite('Deletable', function() {
-        test('False', function() {
-          const block = this.workspace.newBlock('row_block');
-          block.setDeletable(false);
-          const jso = Blockly.serialization.blocks.save(block);
-          assertProperty(jso, 'deletable', false);
-        });
-
-        test('True', function() {
-          const block = this.workspace.newBlock('row_block');
-          block.setDeletable(true);
-          const jso = Blockly.serialization.blocks.save(block);
-          assertNoProperty(jso, 'deletable');
-        });
-
-        test('False and Shadow', function() {
-          const block = this.workspace.newBlock('row_block');
-          block.setDeletable(false);
-          block.setShadow(true);
-          const jso = Blockly.serialization.blocks.save(block);
-          assertNoProperty(jso, 'deletable');
-        });
-      });
-
-      suite('Movable', function() {
-        test('False', function() {
-          const block = this.workspace.newBlock('row_block');
-          block.setMovable(false);
-          const jso = Blockly.serialization.blocks.save(block);
-          assertProperty(jso, 'movable', false);
-        });
-
-        test('True', function() {
-          const block = this.workspace.newBlock('row_block');
-          block.setMovable(true);
-          const jso = Blockly.serialization.blocks.save(block);
-          assertNoProperty(jso, 'movable');
-        });
-
-        test('False and Shadow', function() {
-          const block = this.workspace.newBlock('row_block');
-          block.setMovable(false);
-          block.setShadow(true);
-          const jso = Blockly.serialization.blocks.save(block);
-          assertNoProperty(jso, 'movable');
-        });
-      });
-
-      suite('Editable', function() {
-        test('False', function() {
-          const block = this.workspace.newBlock('row_block');
-          block.setEditable(false);
-          const jso = Blockly.serialization.blocks.save(block);
-          assertProperty(jso, 'editable', false);
-        });
-
-        test('True', function() {
-          const block = this.workspace.newBlock('row_block');
-          block.setEditable(true);
-          const jso = Blockly.serialization.blocks.save(block);
-          assertNoProperty(jso, 'editable');
-        });
-      });
-
       suite('Inline', function() {
         test('True', function() {
           const block = this.workspace.newBlock('statement_block');
diff --git a/tests/mocha/serializer_test.js b/tests/mocha/serializer_test.js
index 4fd20f901..bc8980697 100644
--- a/tests/mocha/serializer_test.js
+++ b/tests/mocha/serializer_test.js
@@ -49,7 +49,7 @@ Serializer.Empty = new SerializerTestCase('Empty',
 );
 Serializer.Data = new SerializerTestCase('Data',
     '<xml xmlns="https://developers.google.com/blockly/xml">' +
-    '<block type="logic_negate" id="id******************" editable="false" x="42" y="42">' +
+    '<block type="logic_negate" id="id******************" x="42" y="42">' +
     '<data>test data</data>' +
     '</block>' +
     '</xml>');
@@ -71,25 +71,10 @@ Serializer.Attributes.Disabled = new SerializerTestCase('Disabled',
     '<xml xmlns="https://developers.google.com/blockly/xml">' +
     '<block type="logic_negate" id="id******************" disabled="true" x="42" y="42"></block>' +
     '</xml>');
-Serializer.Attributes.Deletable = new SerializerTestCase('Deletable',
-    '<xml xmlns="https://developers.google.com/blockly/xml">' +
-    '<block type="logic_negate" id="id******************" deletable="false" x="42" y="42"></block>' +
-    '</xml>');
-Serializer.Attributes.Movable = new SerializerTestCase('Movable',
-    '<xml xmlns="https://developers.google.com/blockly/xml">' +
-    '<block type="logic_negate" id="id******************" movable="false" x="42" y="42"></block>' +
-    '</xml>');
-Serializer.Attributes.Editable = new SerializerTestCase('Editable',
-    '<xml xmlns="https://developers.google.com/blockly/xml">' +
-    '<block type="logic_negate" id="id******************" editable="false" x="42" y="42"></block>' +
-    '</xml>');
 Serializer.Attributes.testCases = [
   Serializer.Attributes.Basic,
   Serializer.Attributes.Collapsed,
   Serializer.Attributes.Disabled,
-  Serializer.Attributes.Deletable,
-  Serializer.Attributes.Movable,
-  Serializer.Attributes.Editable,
 ];
 
 Serializer.Attributes.Inline = new SerializerTestSuite('Inline');

From fd12dcf1e7feb23ec54327b1bb7930538a1c5286 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Mon, 23 Aug 2021 17:33:20 +0000
Subject: [PATCH 780/833] feat: add throwing errors for bad shadows (#5330)

* fix: add throwing errors for bad shadows

* tests: add tests for setShadowDom
---
 core/connection.js             | 38 ++++++++-----
 tests/mocha/connection_test.js | 97 ++++++++++++++++++++++++++++++++++
 2 files changed, 122 insertions(+), 13 deletions(-)

diff --git a/core/connection.js b/core/connection.js
index 510ed90a2..15644c8eb 100644
--- a/core/connection.js
+++ b/core/connection.js
@@ -122,8 +122,8 @@ Connection.prototype.connect_ = function(childConnection) {
   // Make sure the parentConnection is available.
   let orphan;
   if (parentConnection.isConnected()) {
-    let shadowState = parentConnection.stashShadowState_();
-    var target = parentConnection.targetBlock();
+    const shadowState = parentConnection.stashShadowState_();
+    const target = parentConnection.targetBlock();
     if (target.isShadow()) {
       target.dispose(false);
     } else {
@@ -717,7 +717,7 @@ Connection.prototype.setShadowStateInternal_ =
       this.shadowDom_ = shadowDom;
       this.shadowState_ = shadowState;
 
-      var target = this.targetBlock();
+      const target = this.targetBlock();
       if (!target) {
         this.respawnShadow_();
         if (this.targetBlock() && this.targetBlock().isShadow()) {
@@ -730,7 +730,7 @@ Connection.prototype.setShadowStateInternal_ =
           this.serializeShadow_(this.targetBlock());
         }
       } else {
-        var shadow = this.createShadowBlock_(false);
+        const shadow = this.createShadowBlock_(false);
         this.serializeShadow_(shadow);
         if (shadow) {
           shadow.dispose(false);
@@ -748,15 +748,16 @@ Connection.prototype.setShadowStateInternal_ =
  * @private
  */
 Connection.prototype.createShadowBlock_ = function(attemptToConnect) {
-  var parentBlock = this.getSourceBlock();
-  var shadowState = this.getShadowState();
-  var shadowDom = this.getShadowDom();
+  const parentBlock = this.getSourceBlock();
+  const shadowState = this.getShadowState();
+  const shadowDom = this.getShadowDom();
   if (!parentBlock.workspace || (!shadowState && !shadowDom)) {
     return null;
   }
 
+  let blockShadow;
   if (shadowState) {
-    var blockShadow = blocks.loadInternal(
+    blockShadow = blocks.loadInternal(
         shadowState,
         parentBlock.workspace,
         attemptToConnect ? this : undefined,
@@ -767,12 +768,23 @@ Connection.prototype.createShadowBlock_ = function(attemptToConnect) {
   if (shadowDom) {
     blockShadow = Xml.domToBlock(shadowDom, parentBlock.workspace);
     if (attemptToConnect) {
-      if (blockShadow.outputConnection) {
-        this.connect(blockShadow.outputConnection);
-      } else if (blockShadow.previousConnection) {
-        this.connect(blockShadow.previousConnection);
+      if (this.type == Blockly.connectionTypes.INPUT_VALUE) {
+        if (!blockShadow.outputConnection) {
+          throw new Error('Shadow block is missing an output connection');
+        }
+        if (!this.connect(blockShadow.outputConnection)) {
+          throw new Error('Could not connect shadow block to connection');
+        }
+      } else if (this.type == Blockly.connectionTypes.NEXT_STATEMENT) {
+        if (!blockShadow.previousConnection) {
+          throw new Error('Shadow block is missing previous connection');
+        }
+        if (!this.connect(blockShadow.previousConnection)) {
+          throw new Error('Could not connect shadow block to connection');
+        }
       } else {
-        throw Error('Shadow block does not have output or previous statement.');
+        throw new Error(
+            'Cannot connect a shadow block to a previous/output connection');
       }
     }
     return blockShadow;
diff --git a/tests/mocha/connection_test.js b/tests/mocha/connection_test.js
index a9788a29f..aa3ebabd0 100644
--- a/tests/mocha/connection_test.js
+++ b/tests/mocha/connection_test.js
@@ -1296,6 +1296,56 @@ suite('Connection', function() {
               assertNextNotHasBlock(parent);
             });
           });
+
+          suite('Invalid', function() {
+            test('Attach to output', function() {
+              const block = this.workspace.newBlock('row_block');
+              chai.assert.throws(() =>
+                block.outputConnection.setShadowDom(Blockly.Xml.textToDom(
+                    '<block type="row_block">')));
+            });
+
+            test('Attach to previous', function() {
+              const block = this.workspace.newBlock('stack_block');
+              chai.assert.throws(() =>
+                block.previousConnection.setShadowDom(Blockly.Xml.textToDom(
+                    '<block type="stack_block">')));
+            });
+
+            test('Missing output', function() {
+              const block = this.workspace.newBlock('row_block');
+              chai.assert.throws(() =>
+                block.outputConnection.setShadowDom(Blockly.Xml.textToDom(
+                    '<block type="stack_block">')));
+            });
+
+            test('Missing previous', function() {
+              const block = this.workspace.newBlock('stack_block');
+              chai.assert.throws(() =>
+                block.previousConnection.setShadowDom(Blockly.Xml.textToDom(
+                    '<block type="row_block">')));
+            });
+
+            test('Invalid connection checks, output', function() {
+              const block = this.workspace.newBlock('logic_operation');
+              chai.assert.throws(() =>
+                block.getInput('A').connection.setShadowDom(
+                    Blockly.Xml.textToDom('<block type="stack_block">')));
+            });
+
+            test('Invalid connection checks, previous', function() {
+              Blockly.defineBlocksWithJsonArray([{
+                "type": "stack_checks_block",
+                "message0": "",
+                "previousStatement": "check 1",
+                "nextStatement": "check 2"
+              }]);
+              const block = this.workspace.newBlock('stack_checks_block');
+              chai.assert.throws(() =>
+                block.nextConnection.setShadowDom(Blockly.Xml.textToDom(
+                    '<block type="stack_checks_block">')));
+            });
+          });
         });
 
         suite('setShadowState', function() {
@@ -2516,6 +2566,53 @@ suite('Connection', function() {
               assertNextNotHasBlock(parent);
             });
           });
+
+          suite('Invalid', function() {
+            test('Attach to output', function() {
+              const block = this.workspace.newBlock('row_block');
+              chai.assert.throws(() =>
+                block.outputConnection.setShadowState({'type': 'row_block'}));
+            });
+
+            test('Attach to previous', function() {
+              const block = this.workspace.newBlock('stack_block');
+              chai.assert.throws(() =>
+                block.previousConnection.setShadowState(
+                    {'type': 'stack_block'}));
+            });
+
+            test('Missing output', function() {
+              const block = this.workspace.newBlock('row_block');
+              chai.assert.throws(() =>
+                block.outputConnection.setShadowState({'type': 'stack_block'}));
+            });
+
+            test('Missing previous', function() {
+              const block = this.workspace.newBlock('stack_block');
+              chai.assert.throws(() =>
+                block.previousConnection.setShadowState({'type': 'row_block'}));
+            });
+
+            test('Invalid connection checks, output', function() {
+              const block = this.workspace.newBlock('logic_operation');
+              chai.assert.throws(() =>
+                block.getInput('A').connection.setShadowState(
+                    {'type': 'math_number'}));
+            });
+
+            test('Invalid connection checks, previous', function() {
+              Blockly.defineBlocksWithJsonArray([{
+                "type": "stack_checks_block",
+                "message0": "",
+                "previousStatement": "check 1",
+                "nextStatement": "check 2"
+              }]);
+              const block = this.workspace.newBlock('stack_checks_block');
+              chai.assert.throws(() =>
+                block.nextConnection.setShadowState(
+                    {'type': 'stack_checks_block'}));
+            });
+          });
         });
       });
     });

From 4f890d73a5cac637d1ca78669636e8771bffaa03 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Mon, 23 Aug 2021 20:01:19 +0000
Subject: [PATCH 781/833] fix: redo disconnect from shadow bug

---
 core/connection.js                     | 11 ++--
 core/serialization/blocks.js           | 73 +++++++++++++++++++-------
 tests/deps.mocha.js                    |  1 +
 tests/mocha/block_change_event_test.js |  1 -
 tests/mocha/block_create_event_test.js | 58 ++++++++++++++++++++
 tests/mocha/index.html                 |  1 +
 6 files changed, 122 insertions(+), 23 deletions(-)
 create mode 100644 tests/mocha/block_create_event_test.js

diff --git a/core/connection.js b/core/connection.js
index 15644c8eb..368729431 100644
--- a/core/connection.js
+++ b/core/connection.js
@@ -760,22 +760,25 @@ Connection.prototype.createShadowBlock_ = function(attemptToConnect) {
     blockShadow = blocks.loadInternal(
         shadowState,
         parentBlock.workspace,
-        attemptToConnect ? this : undefined,
-        true);
+        {
+          parentConnection: attemptToConnect ? this : undefined,
+          isShadow: true,
+          recordUndo: false,
+        });
     return blockShadow;
   }
   
   if (shadowDom) {
     blockShadow = Xml.domToBlock(shadowDom, parentBlock.workspace);
     if (attemptToConnect) {
-      if (this.type == Blockly.connectionTypes.INPUT_VALUE) {
+      if (this.type == connectionTypes.INPUT_VALUE) {
         if (!blockShadow.outputConnection) {
           throw new Error('Shadow block is missing an output connection');
         }
         if (!this.connect(blockShadow.outputConnection)) {
           throw new Error('Could not connect shadow block to connection');
         }
-      } else if (this.type == Blockly.connectionTypes.NEXT_STATEMENT) {
+      } else if (this.type == connectionTypes.NEXT_STATEMENT) {
         if (!blockShadow.previousConnection) {
           throw new Error('Shadow block is missing previous connection');
         }
diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index 49dcde835..7955a1c01 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -259,7 +259,7 @@ const saveConnection = function(connection) {
   if (!shadow && !child) {
     return null;
   }
-  var state = Object.create(null);
+  const state = Object.create(null);
   if (shadow) {
     state['shadow'] = shadow;
   }
@@ -279,21 +279,49 @@ const saveConnection = function(connection) {
  * @return {!Block} The block that was just loaded.
  */
 const load = function(state, workspace, {recordUndo = false} = {}) {
+  return loadInternal(state, workspace, {recordUndo});
+};
+exports.load = load;
+
+/**
+ * Loads the block represented by the given state into the given workspace.
+ * This is defined internally so that the extra parameters don't clutter our
+ * external API.
+ * But it is exported so that other places within Blockly can call it directly
+ * with the extra paramters.
+ * @param {!State} state The state of a block to deserialize into the workspace.
+ * @param {!Workspace} workspace The workspace to add the block to.
+ * @param {{parentConnection: (!Connection|undefined), isShadow:
+ *     (boolean|undefined), recordUndo: (boolean|undefined)}=} param1
+ *     parentConnection: If provided, the system will attempt to connect the
+ *       block to this connection after it is created. Undefined by default.
+ *     isShadow: The block will be set to a shadow block after it is created.
+ *       False by default.
+ *     recordUndo: If true, events triggered by this function will be undo-able
+ *       by the user. False by default.
+ * @return {!Block} The block that was just loaded.
+ */
+const loadInternal = function(
+    state,
+    workspace,
+    {
+      parentConnection = undefined,
+      isShadow = false,
+      recordUndo = false
+    } = {}
+) {
   const prevRecordUndo = Events.getRecordUndo();
   Events.setRecordUndo(recordUndo);
   const existingGroup = Events.getGroup();
   if (!existingGroup) {
     Events.setGroup(true);
   }
-
-  // We only want to fire an event for the top block.
   Events.disable();
 
-  const block = loadInternal(state, workspace);
+  const block = loadPrivate(state, workspace, {parentConnection, isShadow});
 
   Events.enable();
   Events.fire(new (Events.get(Events.BLOCK_CREATE))(block));
-
   Events.setGroup(existingGroup);
   Events.setRecordUndo(prevRecordUndo);
   
@@ -309,22 +337,32 @@ const load = function(state, workspace, {recordUndo = false} = {}) {
 
   return block;
 };
-exports.load = load;
+/** @package */
+exports.loadInternal = loadInternal;
 
 /**
  * Loads the block represented by the given state into the given workspace.
- * This is defined internally so that the extra optional parameter doesn't
- * clutter our external API.
+ * This is defined privately so that it can be called recursively without firing
+ * eroneous events. Events (and other things we only want to occur on the top
+ * block) are handled by loadInternal.
  * @param {!State} state The state of a block to deserialize into the workspace.
  * @param {!Workspace} workspace The workspace to add the block to.
- * @param {!Connection=} parentConnection The optional parent connection to
- *     attach the block to.
- * @param {boolean} isShadow Whether the block we are loading is a shadow block
- *     or not.
+ * @param {{parentConnection: (!Connection|undefined), isShadow:
+ *     (boolean|undefined), recordUndo: (boolean|undefined)}=} param1
+ *     parentConnection: If provided, the system will attempt to connect the
+ *       block to this connection after it is created. Undefined by default.
+ *     isShadow: The block will be set to a shadow block after it is created.
+ *       False by default.
  * @return {!Block} The block that was just loaded.
  */
-const loadInternal = function(
-    state, workspace, parentConnection = undefined, isShadow = false) {
+const loadPrivate = function(
+    state,
+    workspace,
+    {
+      parentConnection = undefined,
+      isShadow = false,
+    } = {}
+) {
   if (!state['type']) {
     throw new MissingBlockType(state);
   }
@@ -340,10 +378,9 @@ const loadInternal = function(
   loadInputBlocks(block, state);
   loadNextBlocks(block, state);
   initBlock(block, workspace.rendered);
+
   return block;
 };
-/** @package */
-exports.loadInternal = loadInternal;
 
 /**
  * Applies any coordinate information available on the state object to the
@@ -533,10 +570,10 @@ const loadConnection = function(connection, connectionState) {
     connection.setShadowState(connectionState['shadow']);
   }
   if (connectionState['block']) {
-    loadInternal(
+    loadPrivate(
         connectionState['block'],
         connection.getSourceBlock().workspace,
-        connection);
+        {parentConnection: connection});
   }
 };
 
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 06a879fa1..450d1e4f3 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -307,6 +307,7 @@ goog.addDependency('../../generators/python/variables_dynamic.js', ['Blockly.Pyt
 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/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'});
 goog.addDependency('../../tests/mocha/block_test.js', ['Blockly.test.blocks'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/comment_test.js', ['Blockly.test.comments'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/block_change_event_test.js b/tests/mocha/block_change_event_test.js
index d29e01daa..e4e3f49cf 100644
--- a/tests/mocha/block_change_event_test.js
+++ b/tests/mocha/block_change_event_test.js
@@ -1,4 +1,3 @@
-
 /**
  * @license
  * Copyright 2021 Google LLC
diff --git a/tests/mocha/block_create_event_test.js b/tests/mocha/block_create_event_test.js
new file mode 100644
index 000000000..72971c9d4
--- /dev/null
+++ b/tests/mocha/block_create_event_test.js
@@ -0,0 +1,58 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+goog.module('Blockly.test.blockCreateEvent');
+
+const {assertEventFired, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+
+
+suite('Block Create Event', function() {
+  setup(function() {
+    sharedTestSetup.call(this);
+    this.workspace = new Blockly.Workspace();
+  });
+
+  teardown(function() {
+    sharedTestTeardown.call(this);
+  });
+
+  test('Create shadow on disconnect', function() {
+    Blockly.Events.disable();
+    const block = Blockly.serialization.blocks.load(
+        {
+          "type": "text_print",
+          "inputs": {
+            "TEXT": {
+              "shadow": {
+                "type": "text",
+                "id": "shadowId",
+                "fields": {
+                  "TEXT": "abc"
+                }
+              },
+              "block": {
+                "type": "text",
+                "fields": {
+                  "TEXT": ""
+                }
+              }
+            }
+          }
+        },
+        this.workspace);
+    Blockly.Events.enable();
+    block.getInput('TEXT').connection.disconnect();
+    assertEventFired(
+        this.eventsFireStub,
+        Blockly.Events.BlockCreate,
+        {'recordUndo': false},
+        this.workspace.id,
+        'shadowId');
+    const calls = this.eventsFireStub.getCalls();
+    const event = calls[calls.length - 1].args[0];
+    chai.assert.equal(event.xml.tagName, 'shadow');
+  });
+});
diff --git a/tests/mocha/index.html b/tests/mocha/index.html
index 0500b3581..2bdddc2b5 100644
--- a/tests/mocha/index.html
+++ b/tests/mocha/index.html
@@ -54,6 +54,7 @@
     <script>
       goog.require('Blockly.test.astNode');
       goog.require('Blockly.test.blockChangeEvent');
+      goog.require('Blockly.test.blockCreateEvent');
       goog.require('Blockly.test.blockJson');
       goog.require('Blockly.test.blocks');
       goog.require('Blockly.test.comments');

From 6d87b85e6c60b43bb0f9b97dca0df3177c923760 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Thu, 26 Aug 2021 18:56:02 +0000
Subject: [PATCH 782/833] fix: not being able to specifying variable names in
 toolbox (#5408)

* fix: not being able to specifying variable names in toolbox

* fix: id -> ID
---
 core/field_dropdown.js                  |  4 +-
 core/field_variable.js                  | 18 +++++--
 tests/mocha/field_variable_test.js      | 66 ++++++++++++++++++++++++-
 tests/mocha/jso_deserialization_test.js |  8 ++-
 4 files changed, 85 insertions(+), 11 deletions(-)

diff --git a/core/field_dropdown.js b/core/field_dropdown.js
index 0a1a1013a..c9671149e 100644
--- a/core/field_dropdown.js
+++ b/core/field_dropdown.js
@@ -172,12 +172,12 @@ FieldDropdown.prototype.fromXml = function(fieldElement) {
 
 /**
  * Saves this field's value.
- * @return {string} The dropdown value held by this field.
+ * @return {*} The dropdown value held by this field.
  * @override
  * @package
  */
 FieldDropdown.prototype.saveState = function() {
-  return /** @type {string} */ (this.getValue());
+  return this.getValue();
 };
 
 /**
diff --git a/core/field_variable.js b/core/field_variable.js
index eb67b0bf9..9cb95eff5 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -199,24 +199,32 @@ FieldVariable.prototype.toXml = function(fieldElement) {
 
 /**
  * Saves this field's value.
- * @return {string} The id of the variable referenced by this field.
+ * @return {{id: string}} The ID of the variable referenced by this field.
  * @override
  * @package
  */
 FieldVariable.prototype.saveState = function() {
   // Make sure the variable is initialized.
   this.initModel();
-  return this.variable_.getId();
+  return {
+    'id': this.variable_.getId()
+  };
 };
 
 /**
  * Sets the field's value based on the given state.
- * @param {*} id The id of the variable to assign to this variable field.
+ * @param {*} state The state of the variable to assign to this variable field.
  * @override
  * @package
  */
-FieldVariable.prototype.loadState = function(id) {
-  this.setValue(id);
+FieldVariable.prototype.loadState = function(state) {
+  // This is necessary so that blocks in the flyout can have custom var names.
+  const variable = Variables.getOrCreateVariablePackage(
+      this.sourceBlock_.workspace,
+      state['id'] || null,
+      state['name'],
+      state['type'] || '');
+  this.setValue(variable.getId());
 };
 
 /**
diff --git a/tests/mocha/field_variable_test.js b/tests/mocha/field_variable_test.js
index d12188f9a..5eb2a9ce0 100644
--- a/tests/mocha/field_variable_test.js
+++ b/tests/mocha/field_variable_test.js
@@ -399,7 +399,7 @@ suite('Variable Fields', function() {
       const field = new Blockly.FieldVariable('x');
       block.getInput('INPUT').appendField(field, 'VAR');
       const jso = Blockly.serialization.blocks.save(block);
-      chai.assert.deepEqual(jso['fields'], {'VAR': 'id2'});
+      chai.assert.deepEqual(jso['fields'], {'VAR': {'id': 'id2'}});
     });
 
     test('Typed', function() {
@@ -408,7 +408,69 @@ suite('Variable Fields', function() {
           new Blockly.FieldVariable('x', undefined, undefined, ['String']);
       block.getInput('INPUT').appendField(field, 'VAR');
       const jso = Blockly.serialization.blocks.save(block);
-      chai.assert.deepEqual(jso['fields'], {'VAR': 'id2'});
+      chai.assert.deepEqual(jso['fields'], {'VAR': {'id': 'id2'}});
+    });
+  });
+
+  suite('Deserialization', function() {
+    setup(function() {
+      this.workspace = new Blockly.Workspace();
+      defineRowBlock();
+      createGenUidStubWithReturns(new Array(10).fill().map((_, i) => 'id' + i));
+    });
+
+    teardown(function() {
+      workspaceTeardown.call(this, this.workspace);
+    });
+
+    test('ID', function() {
+      this.workspace.createVariable('test', '', 'id1');
+      var block = Blockly.serialization.blocks.load({
+        'type': 'variables_get',
+        'fields': {
+          'VAR': {
+            'id': 'id1'
+          }
+        }
+      },
+      this.workspace);
+      var variable = block.getField('VAR').getVariable();
+      chai.assert.equal(variable.name, 'test');
+      chai.assert.equal(variable.type, '');
+      chai.assert.equal(variable.getId(), 'id1');
+    });
+
+    test('Name, untyped', function() {
+      var block = Blockly.serialization.blocks.load({
+        'type': 'variables_get',
+        'fields': {
+          'VAR': {
+            'name': 'test',
+          }
+        }
+      },
+      this.workspace);
+      var variable = block.getField('VAR').getVariable();
+      chai.assert.equal(variable.name, 'test');
+      chai.assert.equal(variable.type, '');
+      chai.assert.equal(variable.getId(), 'id2');
+    });
+
+    test('Name, typed', function() {
+      var block = Blockly.serialization.blocks.load({
+        'type': 'variables_get',
+        'fields': {
+          'VAR': {
+            'name': 'test',
+            'type': 'string',
+          }
+        }
+      },
+      this.workspace);
+      var variable = block.getField('VAR').getVariable();
+      chai.assert.equal(variable.name, 'test');
+      chai.assert.equal(variable.type, 'string');
+      chai.assert.equal(variable.getId(), 'id2');
     });
   });
 });
diff --git a/tests/mocha/jso_deserialization_test.js b/tests/mocha/jso_deserialization_test.js
index 24d74fbf3..003499e5b 100644
--- a/tests/mocha/jso_deserialization_test.js
+++ b/tests/mocha/jso_deserialization_test.js
@@ -80,7 +80,9 @@ suite('JSO Deserialization', function() {
                 'x': 42,
                 'y': 42,
                 'fields': {
-                  'VAR': 'testId'
+                  'VAR': {
+                    'id': 'testId'
+                  }
                 }
               },
             ]
@@ -196,7 +198,9 @@ suite('JSO Deserialization', function() {
                 'x': 42,
                 'y': 42,
                 'fields': {
-                  'VAR': 'testId'
+                  'VAR': {
+                    'id': 'testId'
+                  }
                 }
               },
             ]

From 410365f4a137edcc3eb6245db6b84b7af28e5231 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Thu, 2 Sep 2021 16:01:29 +0000
Subject: [PATCH 783/833] feat: add support for defining toolboxes using pure
 json (#5392)

* feat: add recycling to core

* feat: add support for json block definitions in flyout

* tests: reorganize tests

* tests: add tests for generating contents

* Fixup reycling

* tests: add tests for recycling

* fix: types

* fix: lint

* fix: PR comments

* fix: creating blocks from flyout

* test: add test block to playground

* fix: types

* feat: add support for enabled
---
 core/flyout_base.js           | 190 +++++++++++------
 core/serialization/blocks.js  |   9 +-
 core/utils/toolbox.js         |  20 +-
 core/workspace_svg.js         |  15 +-
 tests/deps.js                 |   2 +-
 tests/deps.mocha.js           |   4 +-
 tests/mocha/flyout_test.js    | 377 +++++++++++++++++++++++++++++-----
 tests/mocha/index.html        |  17 +-
 tests/mocha/toolbox_helper.js |  83 +++++++-
 tests/mocha/toolbox_test.js   |   4 +-
 tests/playground.html         | 139 +++++++++++++
 11 files changed, 719 insertions(+), 141 deletions(-)

diff --git a/core/flyout_base.js b/core/flyout_base.js
index 52c9367a1..2a999cf1f 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -34,13 +34,13 @@ 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');
 const dom = goog.require('Blockly.utils.dom');
 const idGenerator = goog.require('Blockly.utils.idGenerator');
 const object = goog.require('Blockly.utils.object');
 const toolbox = goog.require('Blockly.utils.toolbox');
 const utils = goog.require('Blockly.utils');
-const utilsXml = goog.require('Blockly.utils.xml');
 /** @suppress {extraRequire} */
 goog.require('Blockly.blockRendering');
 /** @suppress {extraRequire} */
@@ -155,6 +155,13 @@ const Flyout = function(workspaceOptions) {
    * @package
    */
   this.targetWorkspace = null;
+
+  /**
+   * A list of blocks that can be reused.
+   * @type {!Array<!BlockSvg>}
+   * @private
+   */
+  this.recycledBlocks_ = [];
 };
 object.inherits(Flyout, DeleteArea);
 
@@ -560,6 +567,7 @@ Flyout.prototype.show = function(flyoutDef) {
 
   this.reflowWrapper_ = this.reflow.bind(this);
   this.workspace_.addChangeListener(this.reflowWrapper_);
+  this.emptyRecycledBlocks_();
 };
 
 /**
@@ -591,15 +599,10 @@ Flyout.prototype.createFlyoutInfo_ = function(parsedContent) {
 
     switch (contentInfo['kind'].toUpperCase()) {
       case 'BLOCK': {
-        const blockInfo = /** @type {!toolbox.BlockInfo} */ (contentInfo);
-        const blockXml = this.getBlockXml_(blockInfo);
-        const block = this.createBlock_(blockXml);
-        // This is a deprecated method for adding gap to a block.
-        // <block type="math_arithmetic" gap="8"></block>
-        const gap =
-            parseInt(blockInfo['gap'] || blockXml.getAttribute('gap'), 10);
-        gaps.push(isNaN(gap) ? defaultGap : gap);
+        var blockInfo = /** @type {!toolbox.BlockInfo} */ (contentInfo);
+        var block = this.createFlyoutBlock_(blockInfo);
         contents.push({type: 'block', block: block});
+        this.addBlockGap_(blockInfo, gaps, defaultGap);
         break;
       }
       case 'SEP': {
@@ -630,7 +633,8 @@ Flyout.prototype.createFlyoutInfo_ = function(parsedContent) {
 /**
  * Gets the flyout definition for the dynamic category.
  * @param {string} categoryName The name of the dynamic category.
- * @return {!Array<!Element>} The array of flyout items.
+ * @return {!Blockly.utils.toolbox.FlyoutDefinition} The definition of the
+ *     flyout in one of its many forms.
  * @private
  */
 Flyout.prototype.getDynamicCategoryContents_ = function(categoryName) {
@@ -643,12 +647,7 @@ Flyout.prototype.getDynamicCategoryContents_ = function(categoryName) {
         'Couldn\'t find a callback function when opening' +
         ' a toolbox category.');
   }
-  const flyoutDef = fnToApply(this.workspace_.targetWorkspace);
-  if (!Array.isArray(flyoutDef)) {
-    throw new TypeError(
-        'Result of toolbox category callback must be an array.');
-  }
-  return flyoutDef;
+  return fnToApply(this.workspace_.targetWorkspace);
 };
 
 /**
@@ -674,50 +673,77 @@ Flyout.prototype.createButton_ = function(btnInfo, isLabel) {
 /**
  * Create a block from the xml and permanently disable any blocks that were
  * defined as disabled.
- * @param {!Element} blockXml The xml of the block.
+ * @param {!toolbox.BlockInfo} blockInfo The info of the block.
  * @return {!BlockSvg} The block created from the blockXml.
- * @protected
+ * @private
  */
-Flyout.prototype.createBlock_ = function(blockXml) {
-  const curBlock =
-      /** @type {!BlockSvg} */ (Xml.domToBlock(blockXml, this.workspace_));
-  if (!curBlock.isEnabled()) {
+Flyout.prototype.createFlyoutBlock_ = function(blockInfo) {
+  let block;
+  if (blockInfo['blockxml']) {
+    const xml = typeof blockInfo['blockxml'] === 'string' ?
+        Xml.textToDom(blockInfo['blockxml']) :
+        blockInfo['blockxml'];
+    block = this.getRecycledBlock_(xml.getAttribute('type'));
+    if (!block) {
+      block = Xml.domToBlock(xml, this.workspace_);
+    }
+  } else {
+    block = this.getRecycledBlock_(blockInfo['type']);
+    if (!block) {
+      if (blockInfo['enabled'] === undefined) {
+        blockInfo['enabled'] =
+            blockInfo['disabled'] !== 'true' && blockInfo['disabled'] !== true;
+      }
+      block = blocks.load(
+          /** @type {blocks.State} */ (blockInfo),this.workspace_);
+    }
+  }
+
+  if (!block.isEnabled()) {
     // Record blocks that were initially disabled.
     // Do not enable these blocks as a result of capacity filtering.
-    this.permanentlyDisabled_.push(curBlock);
+    this.permanentlyDisabled_.push(block);
   }
-  return curBlock;
+  return /** @type {!BlockSvg} */ (block);
 };
 
 /**
- * Get the xml from the block info object.
- * @param {!toolbox.BlockInfo}  blockInfo The object holding
- *    information about a block.
- * @return {!Element} The xml for the block.
- * @throws {Error} if the xml is not a valid block definition.
+ * Returns a block from the array of recycled blocks with the given type, or
+ * undefined if one cannot be found.
+ * @param {string} blockType The type of the block to try to recycle.
+ * @return {(!BlockSvg|undefined)} The recycled block, or undefined if
+ *     one could not be recycled.
  * @private
  */
-Flyout.prototype.getBlockXml_ = function(blockInfo) {
-  let blockElement = null;
-  const blockXml = blockInfo['blockxml'];
-
-  if (blockXml && typeof blockXml != 'string') {
-    blockElement = blockXml;
-  } else if (blockXml && typeof blockXml == 'string') {
-    blockElement = Xml.textToDom(blockXml);
-    blockInfo['blockxml'] = blockElement;
-  } else if (blockInfo['type']) {
-    blockElement = utilsXml.createElement('xml');
-    blockElement.setAttribute('type', blockInfo['type']);
-    blockElement.setAttribute('disabled', blockInfo['disabled']);
-    blockInfo['blockxml'] = blockElement;
+Flyout.prototype.getRecycledBlock_ = function(blockType) {
+  let index = -1;
+  for (let i = 0; i < this.recycledBlocks_.length; i++) {
+    if (this.recycledBlocks_[i].type == blockType) {
+      index = i;
+      break;
+    }
   }
+  return index == -1 ? undefined : this.recycledBlocks_.splice(index, 1)[0];
+};
 
-  if (!blockElement) {
-    throw Error(
-        'Error: Invalid block definition. Block definition must have blockxml or type.');
+/**
+ * Adds a gap in the flyout based on block info.
+ * @param {!toolbox.BlockInfo} blockInfo Information about a block.
+ * @param {!Array<number>} gaps The list of gaps between items in the flyout.
+ * @param {number} defaultGap The default gap between one element and the next.
+ * @private
+ */
+Flyout.prototype.addBlockGap_ = function(blockInfo, gaps, defaultGap) {
+  let gap;
+  if (blockInfo['gap']) {
+    gap = parseInt(blockInfo['gap'], 10);
+  } else if (blockInfo['blockxml']) {
+    const xml = typeof blockInfo['blockxml'] === 'string' ?
+        Xml.textToDom(blockInfo['blockxml']) :
+        blockInfo['blockxml'];
+    gap = parseInt(xml.getAttribute('gap'), 10);
   }
-  return blockElement;
+  gaps.push(isNaN(gap) ? defaultGap : gap);
 };
 
 /**
@@ -745,13 +771,15 @@ Flyout.prototype.addSeparatorGap_ = function(sepInfo, gaps, defaultGap) {
 
 /**
  * Delete blocks, mats and buttons from a previous showing of the flyout.
- * @protected
+ * @private
  */
 Flyout.prototype.clearOldBlocks_ = function() {
   // Delete any blocks from a previous showing.
   const oldBlocks = this.workspace_.getTopBlocks(false);
   for (let i = 0, block; (block = oldBlocks[i]); i++) {
-    if (block.workspace == this.workspace_) {
+    if (this.blockIsRecyclable_(block)) {
+      this.recycleBlock_(block);
+    } else {
       block.dispose(false, false);
     }
   }
@@ -774,6 +802,41 @@ Flyout.prototype.clearOldBlocks_ = function() {
   this.workspace_.getPotentialVariableMap().clear();
 };
 
+/**
+ * Empties all of the recycled blocks, properly disposing of them.
+ * @private
+ */
+Flyout.prototype.emptyRecycledBlocks_ = function() {
+  for (let i = 0; i < this.recycledBlocks_.length; i++) {
+    this.recycledBlocks_[i].dispose();
+  }
+  this.recycledBlocks_ = [];
+};
+
+/**
+ * Returns whether the given block can be recycled or not.
+ * @param {!BlockSvg} _block The block to check for recyclability.
+ * @return {boolean} True if the block can be recycled. False otherwise.
+ * @protected
+ */
+Flyout.prototype.blockIsRecyclable_ = function(_block) {
+  // By default, recycling is disabled.
+  return false;
+};
+
+/**
+ * Puts a previously created block into the recycle bin and moves it to the
+ * top of the workspace. Used during large workspace swaps to limit the number
+ * of new DOM elements we need to create.
+ * @param {!BlockSvg} block The block to recycle.
+ * @private
+ */
+Flyout.prototype.recycleBlock_ = function(block) {
+  const xy = block.getRelativeToSurfaceXY();
+  block.moveBy(-xy.x, -xy.y);
+  this.recycledBlocks_.push(block);
+};
+
 /**
  * Add listeners to a block that has been added to the flyout.
  * @param {!SVGElement} root The root node of the SVG group the block is in.
@@ -1010,20 +1073,21 @@ Flyout.prototype.placeNewBlock_ = function(oldBlock) {
     throw Error('oldBlock is not rendered.');
   }
 
-  // Create the new block by cloning the block in the flyout (via XML).
-  // This cast assumes that the oldBlock can not be an insertion marker.
-  const xml = /** @type {!Element} */ (Xml.blockToDom(oldBlock, true));
-  // The target workspace would normally resize during domToBlock, which will
-  // lead to weird jumps.  Save it for terminateDrag.
-  targetWorkspace.setResizesEnabled(false);
-
-  // Using domToBlock instead of domToWorkspace means that the new block will be
-  // placed at position (0, 0) in main workspace units.
-  const block = /** @type {!BlockSvg} */
-      (Xml.domToBlock(xml, targetWorkspace));
-  const svgRootNew = block.getSvgRoot();
-  if (!svgRootNew) {
-    throw Error('block is not rendered.');
+  let block;
+  if (oldBlock.mutationToDom && !oldBlock.saveExtraState) {
+    // Create the new block by cloning the block in the flyout (via XML).
+    // This cast assumes that the oldBlock can not be an insertion marker.
+    const xml = /** @type {!Element} */ (Xml.blockToDom(oldBlock, true));
+    // The target workspace would normally resize during domToBlock, which will
+    // lead to weird jumps.  Save it for terminateDrag.
+    targetWorkspace.setResizesEnabled(false);
+    // Using domToBlock instead of domToWorkspace means that the new block will be
+    // placed at position (0, 0) in main workspace units.
+    block = /** @type {!BlockSvg} */ (Xml.domToBlock(xml, targetWorkspace));
+  } else {
+    const json = /** @type {!blocks.State} */ (blocks.save(oldBlock));
+    targetWorkspace.setResizesEnabled(false);
+    block = /** @type {!BlockSvg} */ (blocks.load(json, targetWorkspace));
   }
 
   // The offset in pixels between the main workspace's origin and the upper left
diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index 7955a1c01..903a996e8 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -46,14 +46,17 @@ exports.ConnectionState = ConnectionState;
  * Represents the state of a given block.
  * @typedef {{
  *     type: string,
- *     id: string,
+ *     id: (string|undefined),
  *     x: (number|undefined),
  *     y: (number|undefined),
  *     collapsed: (boolean|undefined),
- *     disabled: (boolean|undefined),
+ *     enabled: (boolean|undefined),
+ *     editable: (boolean|undefined),
+ *     deletable: (boolean|undefined),
+ *     movable: (boolean|undefined),
  *     inline: (boolean|undefined),
  *     data: (string|undefined),
- *     extra-state: *,
+ *     extra-state: (*|undefined),
  *     icons: (!Object<string, *>|undefined),
  *     fields: (!Object<string, *>|undefined),
  *     inputs: (!Object<string, !ConnectionState>|undefined),
diff --git a/core/utils/toolbox.js b/core/utils/toolbox.js
index 34208bf13..157addeb0 100644
--- a/core/utils/toolbox.js
+++ b/core/utils/toolbox.js
@@ -16,6 +16,8 @@
  */
 goog.module('Blockly.utils.toolbox');
 
+/* eslint-disable-next-line no-unused-vars */
+const {ConnectionState} = goog.requireType('Blockly.serialization.blocks');
 /* eslint-disable-next-line no-unused-vars */
 const ToolboxCategory = goog.requireType('Blockly.ToolboxCategory');
 /* eslint-disable-next-line no-unused-vars */
@@ -25,12 +27,28 @@ const userAgent = goog.require('Blockly.utils.userAgent');
 
 /**
  * The information needed to create a block in the toolbox.
+ * Note that disabled has a different type for backwards compatibility.
  * @typedef {{
  *            kind:string,
  *            blockxml:(string|!Node|undefined),
  *            type:(string|undefined),
  *            gap:(string|number|undefined),
- *            disabled: (string|boolean|undefined)
+ *            disabled: (string|boolean|undefined),
+ *            enabled: (boolean|undefined),
+ *            id: (string|undefined),
+ *            x: (number|undefined),
+ *            y: (number|undefined),
+ *            collapsed: (boolean|undefined),
+ *            editable: (boolean|undefined),
+ *            deletable: (boolean|undefined),
+ *            movable: (boolean|undefined),
+ *            inline: (boolean|undefined),
+ *            data: (string|undefined),
+ *            extra-state: (*|undefined),
+ *            icons: (!Object<string, *>|undefined),
+ *            fields: (!Object<string, *>|undefined),
+ *            inputs: (!Object<string, !ConnectionState>|undefined),
+ *            next: (!ConnectionState|undefined)
  *          }}
  */
 let BlockInfo;
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 2da56275f..a6c81e741 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -200,11 +200,12 @@ const WorkspaceSvg = function(
   this.markerManager_ = new MarkerManager(this);
 
   /**
-   * Map from function names to callbacks, for deciding what to do when a custom
-   * toolbox category is opened.
-   * @type {!Object<string, ?function(!Workspace):!Array<!Element>>}
-   * @private
-   */
+  * Map from function names to callbacks, for deciding what to do when a custom
+  * toolbox category is opened.
+  * @type {!Object<string, ?function(!Workspace):
+  *     !toolbox.FlyoutDefinition>}
+  * @private
+  */
   this.toolboxCategoryCallbacks_ = Object.create(null);
 
   /**
@@ -2547,7 +2548,7 @@ WorkspaceSvg.prototype.removeButtonCallback = function(key) {
  * custom toolbox categories in this workspace.  See the variable and procedure
  * categories as an example.
  * @param {string} key The name to use to look up this function.
- * @param {function(!Workspace):!Array<!Element>} func The function to
+ * @param {function(!Workspace): !toolbox.FlyoutDefinition} func The function to
  *     call when the given toolbox category is opened.
  */
 WorkspaceSvg.prototype.registerToolboxCategoryCallback = function(key, func) {
@@ -2561,7 +2562,7 @@ WorkspaceSvg.prototype.registerToolboxCategoryCallback = function(key, func) {
  * Get the callback function associated with a given key, for populating
  * custom toolbox categories in this workspace.
  * @param {string} key The name to use to look up the function.
- * @return {?function(!Workspace):!Array<!Element>} The function
+ * @return {?function(!Workspace): !toolbox.FlyoutDefinition} The function
  *     corresponding to the given key for this workspace, or null if no function
  *     is registered.
  */
diff --git a/tests/deps.js b/tests/deps.js
index 9e2eab19c..b7ff00900 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -78,7 +78,7 @@ goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Bloc
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 450d1e4f3..17485d31f 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -78,7 +78,7 @@ goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Bloc
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -353,7 +353,7 @@ goog.addDependency('../../tests/mocha/serializer_test.js', ['Blockly.test.serial
 goog.addDependency('../../tests/mocha/shortcut_registry_test.js', ['Blockly.test.shortcutRegistry'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/test_helpers.js', ['Blockly.test.helpers'], ['Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/theme_test.js', ['Blockly.test.theme'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/toolbox_helper.js', ['Blockly.test.toolboxHelpers'], [], {'lang': 'es5', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/toolbox_helper.js', ['Blockly.test.toolboxHelpers'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/toolbox_test.js', ['Blockly.test.toolbox'], ['Blockly.test.helpers', 'Blockly.test.toolboxHelpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/tooltip_test.js', ['Blockly.test.tooltip'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/trashcan_test.js', ['Blockly.test.trashcan'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/flyout_test.js b/tests/mocha/flyout_test.js
index e860727d8..5faf8bf84 100644
--- a/tests/mocha/flyout_test.js
+++ b/tests/mocha/flyout_test.js
@@ -7,7 +7,7 @@
 goog.module('Blockly.test.flyout');
 
 const {defineStackBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
-const {getBasicToolbox, getChildItem, getCollapsibleItem, getDeeplyNestedJSON, getInjectedToolbox, getNonCollapsibleItem, getSeparator, getSimpleJSON, getXmlArray} = goog.require('Blockly.test.toolboxHelpers');
+const {getBasicToolbox, getChildItem, getCollapsibleItem, getDeeplyNestedJSON, getInjectedToolbox, getNonCollapsibleItem, getProperSimpleJson, getSeparator, getSimpleJson, getXmlArray} = goog.require('Blockly.test.toolboxHelpers');
 
 
 suite('Flyout', function() {
@@ -242,74 +242,345 @@ suite('Flyout', function() {
 
   suite('createFlyoutInfo_', function() {
     setup(function() {
-      this.simpleToolboxJSON = getSimpleJSON();
       this.flyout = this.workspace.getFlyout();
       this.createFlyoutSpy = sinon.spy(this.flyout, 'createFlyoutInfo_');
-
     });
 
-    function checkLayoutContents(actual, expected, opt_message) {
-      chai.assert.equal(actual.length, expected.length, opt_message);
-      for (var i = 0; i < actual.length; i++) {
-        chai.assert.equal(actual[i].type, expected[i].type, opt_message);
-        if (actual[i].type == 'BLOCK') {
-          chai.assert.typeOf(actual[i]['block'], 'Blockly.Block');
-        } else if (actual[i].type == 'BUTTON' || actual[i].type == 'LABEL') {
-          chai.assert.typeOf(actual[i]['block'], 'Blockly.FlyoutButton');
-        }
-      }
-    }
-
     function checkFlyoutInfo(flyoutSpy) {
-      var expectedContents = [
-        {type: "block"},
-        {type: "button"},
-        {type: "button"}
-      ];
-      var expectedGaps = [20, 24, 24];
       var flyoutInfo = flyoutSpy.returnValues[0];
       var contents = flyoutInfo.contents;
       var gaps = flyoutInfo.gaps;
+
+      var expectedGaps = [20, 24, 24];
       chai.assert.deepEqual(gaps, expectedGaps);
-      checkLayoutContents(contents, expectedContents, 'Contents');
+
+      chai.assert.equal(contents.length, 3, 'Contents');
+
+      chai.assert.equal(contents[0].type, 'block', 'Contents');
+      var block = contents[0]['block'];
+      chai.assert.instanceOf(block, Blockly.BlockSvg);
+      chai.assert.equal(block.getFieldValue('OP'), 'NEQ');
+      var childA = block.getInputTargetBlock('A');
+      var childB = block.getInputTargetBlock('B');
+      chai.assert.isTrue(childA.isShadow());
+      chai.assert.isFalse(childB.isShadow());
+      chai.assert.equal(childA.getFieldValue('NUM'), 1);
+      chai.assert.equal(childB.getFieldValue('NUM'), 2);
+
+      chai.assert.equal(contents[1].type, 'button', 'Contents');
+      chai.assert.instanceOf(contents[1]['button'], Blockly.FlyoutButton);
+
+      chai.assert.equal(contents[2].type, 'button', 'Contents');
+      chai.assert.instanceOf(contents[2]['button'], Blockly.FlyoutButton);
     }
 
-    test('Node', function() {
-      this.flyout.show(this.toolboxXml);
-      checkFlyoutInfo(this.createFlyoutSpy);
+    suite('Direct show', function() {
+      test('Node', function() {
+        this.flyout.show(this.toolboxXml);
+        checkFlyoutInfo(this.createFlyoutSpy);
+      });
+
+      test('NodeList', function() {
+        var nodeList = document.getElementById('toolbox-simple').childNodes;
+        this.flyout.show(nodeList);
+        checkFlyoutInfo(this.createFlyoutSpy);
+      });
+
+      test('Array of JSON', function() {
+        this.flyout.show(getSimpleJson());
+        checkFlyoutInfo(this.createFlyoutSpy);
+      });
+
+      test('Array of Proper JSON', function() {
+        this.flyout.show(getProperSimpleJson());
+        checkFlyoutInfo(this.createFlyoutSpy);
+      });
+
+      test('Array of XML', function() {
+        this.flyout.show(getXmlArray());
+        checkFlyoutInfo(this.createFlyoutSpy);
+      });
     });
-    test('NodeList', function() {
-      var nodeList = document.getElementById('toolbox-simple').childNodes;
-      this.flyout.show(nodeList);
-      checkFlyoutInfo(this.createFlyoutSpy);
+
+    suite('Dynamic category', function() {
+      setup(function() {
+        this.stubAndAssert = function(val) {
+          sinon.stub(
+              this.flyout.workspace_.targetWorkspace,
+              'getToolboxCategoryCallback')
+              .returns(function() { return val; });
+          this.flyout.show('someString');
+          checkFlyoutInfo(this.createFlyoutSpy);
+        };
+      });
+
+      test('No category available', function() {
+        chai.assert.throws(
+            function() {
+              this.flyout.show('someString');
+            }.bind(this),
+            'Couldn\'t find a callback function when opening ' +
+            'a toolbox category.');
+      });
+
+      test('Node', function() {
+        this.stubAndAssert(this.toolboxXml);
+      });
+
+      test('NodeList', function() {
+        this.stubAndAssert(
+            document.getElementById('toolbox-simple').childNodes);
+      });
+
+      test('Array of JSON', function() {
+        this.stubAndAssert(getSimpleJson());
+      });
+
+      test('Array of Proper JSON', function() {
+        this.stubAndAssert(getProperSimpleJson());
+      });
+
+      test('Array of XML', function() {
+        this.stubAndAssert(getXmlArray());
+      });
     });
-    test('Array of JSON', function() {
-      this.flyout.show(this.simpleToolboxJSON);
-      checkFlyoutInfo(this.createFlyoutSpy);
+  });
+
+  suite('Creating blocks', function() {
+    suite('Enabled/Disabled', function() {
+      setup(function() {
+        this.flyout = this.workspace.getFlyout();
+
+        this.assertDisabled = function(disabled) {
+          var block = this.flyout.getWorkspace().getTopBlocks(false)[0];
+          chai.assert.equal(!block.isEnabled(), disabled);
+        };
+      });
+
+      suite('XML', function() {
+        test('True string', function() {
+          var xml = Blockly.Xml.textToDom(
+              '<xml>' +
+              '<block type="text_print" disabled="true"></block>' +
+              '</xml>'
+          );
+          this.flyout.show(xml);
+          this.assertDisabled(true);
+        });
+
+        test('False string', function() {
+          var xml = Blockly.Xml.textToDom(
+              '<xml>' +
+              '<block type="text_print" disabled="false"></block>' +
+              '</xml>'
+          );
+          this.flyout.show(xml);
+          this.assertDisabled(false);
+        });
+
+        test('Disabled string', function() {
+          // The XML system supports this for some reason!?
+          var xml = Blockly.Xml.textToDom(
+              '<xml>' +
+              '<block type="text_print" disabled="disabled"></block>' +
+              '</xml>'
+          );
+          this.flyout.show(xml);
+          this.assertDisabled(true);
+        });
+
+        test('Different string', function() {
+          var xml = Blockly.Xml.textToDom(
+              '<xml>' +
+              '<block type="text_print" disabled="random"></block>' +
+              '</xml>'
+          );
+          this.flyout.show(xml);
+          this.assertDisabled(false);
+        });
+      });
+
+      suite('JSON', function() {
+        test('All undefined', function() {
+          var json = [
+            {
+              'kind': 'block',
+              'type': 'text_print',
+            }
+          ];
+          this.flyout.show(json);
+          this.assertDisabled(false);
+        });
+
+        test('Enabled true', function() {
+          var json = [
+            {
+              'kind': 'block',
+              'type': 'text_print',
+              'enabled': true,
+            }
+          ];
+          this.flyout.show(json);
+          this.assertDisabled(false);
+        });
+
+        test('Enabled false', function() {
+          var json = [
+            {
+              'kind': 'block',
+              'type': 'text_print',
+              'enabled': false,
+            }
+          ];
+          this.flyout.show(json);
+          this.assertDisabled(true);
+        });
+
+        test('Disabled true string', function() {
+          var json = [
+            {
+              'kind': 'block',
+              'type': 'text_print',
+              'disabled': 'true'
+            }
+          ];
+          this.flyout.show(json);
+          this.assertDisabled(true);
+        });
+
+        test('Disabled false string', function() {
+          var json = [
+            {
+              'kind': 'block',
+              'type': 'text_print',
+              'disabled': 'false'
+            }
+          ];
+          this.flyout.show(json);
+          this.assertDisabled(false);
+        });
+
+        test('Disabled string', function() {
+          var json = [
+            {
+              'kind': 'block',
+              'type': 'text_print',
+              'disabled': 'disabled'  // This is not respected by the JSON!
+            }
+          ];
+          this.flyout.show(json);
+          this.assertDisabled(false);
+        });
+
+        test('Disabled true value', function() {
+          var json = [
+            {
+              'kind': 'block',
+              'type': 'text_print',
+              'disabled': true
+            }
+          ];
+          this.flyout.show(json);
+          this.assertDisabled(true);
+        });
+
+        test('Disabled false value', function() {
+          var json = [
+            {
+              'kind': 'block',
+              'type': 'text_print',
+              'disabled': false
+            }
+          ];
+          this.flyout.show(json);
+          this.assertDisabled(false);
+        });
+
+        test('Disabled different string', function() {
+          var json = [
+            {
+              'kind': 'block',
+              'type': 'text_print',
+              'disabled': 'random'
+            }
+          ];
+          this.flyout.show(json);
+          this.assertDisabled(false);
+        });
+
+        test('Disabled empty string', function() {
+          var json = [
+            {
+              'kind': 'block',
+              'type': 'text_print',
+              'disabled': ''
+            }
+          ];
+          this.flyout.show(json);
+          this.assertDisabled(false);
+        });
+      });
     });
-    test('Array of xml', function() {
-      this.flyout.show(getXmlArray());
-      checkFlyoutInfo(this.createFlyoutSpy);
+  });
+
+  suite('Recycling', function() {
+    setup(function() {
+      this.flyout = this.workspace.getFlyout();
     });
-    test('Custom Toolbox: No Category Available', function() {
-      chai.assert.throws(function() {
-        this.flyout.show('someString');
-      }.bind(this), 'Couldn\'t find a callback function when opening' +
-          ' a toolbox category.');
+
+    test('Recycling disabled', function() {
+      this.flyout.show({
+        'contents': [
+          {
+            'kind': 'BLOCK',
+            'type': 'math_number',
+            'fields': {
+              'NUM': 123
+            }
+          }
+        ]
+      });
+      this.flyout.show({
+        'contents': [
+          {
+            'kind': 'BLOCK',
+            'type': 'math_number',
+            'fields': {
+              'NUM': 321
+            }
+          }
+        ]
+      });
+      const block = this.flyout.workspace_.getAllBlocks()[0];
+      chai.assert.equal(block.getFieldValue('NUM'), 321);
     });
-    test('Custom Toolbox: Function does not return array', function() {
-      sinon.stub(this.flyout.workspace_.targetWorkspace,
-          'getToolboxCategoryCallback').returns(function(){return null;});
-      chai.assert.throws(function() {
-        this.flyout.show('someString');
-      }.bind(this), 'Result of toolbox category callback must be an array.');
-    });
-    test('Custom Toolbox: Returns Array', function() {
-      sinon.stub(this.flyout.workspace_.targetWorkspace,
-          'getToolboxCategoryCallback').returns(function(){return getXmlArray();});
-      chai.assert.doesNotThrow(function() {
-        this.flyout.show('someString');
-      }.bind(this));
+
+    test('Recycling enabled', function() {
+      this.flyout.blockIsRecyclable_ = function() { return true; };
+      this.flyout.show({
+        'contents': [
+          {
+            'kind': 'BLOCK',
+            'type': 'math_number',
+            'fields': {
+              'NUM': 123
+            }
+          }
+        ]
+      });
+      this.flyout.show({
+        'contents': [
+          {
+            'kind': 'BLOCK',
+            'type': 'math_number',
+            'fields': {
+              'NUM': 321
+            }
+          }
+        ]
+      });
+      const block = this.flyout.workspace_.getAllBlocks()[0];
+      chai.assert.equal(block.getFieldValue('NUM'), 123);
     });
   });
 });
diff --git a/tests/mocha/index.html b/tests/mocha/index.html
index 2bdddc2b5..ec5f778fd 100644
--- a/tests/mocha/index.html
+++ b/tests/mocha/index.html
@@ -113,12 +113,26 @@
     </script>
 
     <div id="blocklyDiv"></div>
+
     <xml xmlns="https://developers.google.com/blockly/xml" id="toolbox-simple" style="display: none">
-      <block type="logic_operation"></block>
+      <block type="logic_compare">
+        <field name="OP">NEQ</field>
+        <value name="A">
+          <shadow type="math_number">
+            <field name="NUM">1</field>
+          </shadow>
+        </value>
+        <value name="B">
+          <block type="math_number">
+            <field name="NUM">2</field>
+          </block>
+        </value>
+      </block>
       <sep gap="20"></sep>
       <button text="insert" callbackkey="insertConnectionRows"></button>
       <label text="tooltips"></label>
     </xml>
+
     <xml xmlns="https://developers.google.com/blockly/xml" id="toolbox-categories" style="display: none">
       <category name="First" css-container="something">
         <block type="basic_block">
@@ -134,6 +148,7 @@
         </block>
       </category>
     </xml>
+
     <xml xmlns="https://developers.google.com/blockly/xml" id="toolbox-test" style="display: none">
       <category name="First" expanded="true" categorystyle="logic_category">
         <sep gap="-1"></sep>
diff --git a/tests/mocha/toolbox_helper.js b/tests/mocha/toolbox_helper.js
index 1d1fc8d3d..cd3efb7a8 100644
--- a/tests/mocha/toolbox_helper.js
+++ b/tests/mocha/toolbox_helper.js
@@ -49,12 +49,24 @@ exports.getCategoryJSON = getCategoryJSON;
  * @return {Blockly.utils.toolbox.ToolboxJson} The array holding information
  *    for a simple toolbox.
  */
-function getSimpleJSON() {
+function getSimpleJson() {
   return {"contents":[
     {
       "kind":"BLOCK",
-      "blockxml": "<block type=\"logic_operation\"></block>",
-      "type":"logic_operation"
+      "blockxml":
+        `<block type="logic_compare">
+          <field name="OP">NEQ</field>
+          <value name="A">
+            <shadow type="math_number">
+              <field name="NUM">1</field>
+            </shadow>
+          </value>
+          <value name="B">
+            <block type="math_number">
+              <field name="NUM">2</field>
+            </block>
+          </value>
+        </block>`,
     },
     {
       "kind":"SEP",
@@ -71,7 +83,52 @@ function getSimpleJSON() {
     }
   ]};
 }
-exports.getSimpleJSON = getSimpleJSON;
+exports.getSimpleJson = getSimpleJson;
+
+function getProperSimpleJson() {
+  return {
+    "contents": [
+      {
+        "kind":"BLOCK",
+        "type": "logic_compare",
+        "fields": {
+          "OP": "NEQ",
+        },
+        "inputs": {
+          "A": {
+            "shadow": {
+              "type": "math_number",
+              "fields": {
+                "NUM": 1,
+              }
+            }
+          },
+          "B": {
+            "block": {
+              "type": "math_number",
+              "fields": {
+                "NUM": 2,
+              }
+            }
+          }
+        }
+      },
+      {
+        "kind":"SEP",
+        "gap":"20"
+      },
+      {
+        "kind":"BUTTON",
+        "text": "insert",
+        "callbackkey": "insertConnectionRows"
+      },
+      {
+        "kind":"LABEL",
+        "text":"tooltips"
+      }
+    ]};
+}
+exports.getProperSimpleJson = getProperSimpleJson;
 
 /**
  * Get JSON for a toolbox that contains categories that contain categories.
@@ -123,10 +180,20 @@ exports.getDeeplyNestedJSON = getDeeplyNestedJSON;
  * @return {Array<Node>} Array holding xml elements for a toolbox.
  */
 function getXmlArray() {
-  // Need to use HTMLElement instead of Element so parser output is
-  // consistent with other tests
-  var block = document.createElement('block');
-  block.setAttribute('type', 'logic_operation');
+  var block = Blockly.Xml.textToDom(
+      `<block type="logic_compare">
+        <field name="OP">NEQ</field>
+        <value name="A">
+          <shadow type="math_number">
+            <field name="NUM">1</field>
+          </shadow>
+        </value>
+        <value name="B">
+          <block type="math_number">
+            <field name="NUM">2</field>
+          </block>
+        </value>
+      </block>`);
   var separator = Blockly.Xml.textToDom('<sep gap="20"></sep>');
   var button = Blockly.Xml.textToDom('<button text="insert" callbackkey="insertConnectionRows"></button>');
   var label = Blockly.Xml.textToDom('<label text="tooltips"></label>');
diff --git a/tests/mocha/toolbox_test.js b/tests/mocha/toolbox_test.js
index c2cc2cece..35b25b293 100644
--- a/tests/mocha/toolbox_test.js
+++ b/tests/mocha/toolbox_test.js
@@ -7,7 +7,7 @@
 goog.module('Blockly.test.toolbox');
 
 const {defineStackBlock, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
-const {getBasicToolbox, getCategoryJSON, getChildItem, getCollapsibleItem, getDeeplyNestedJSON, getInjectedToolbox, getNonCollapsibleItem, getSeparator, getSimpleJSON, getXmlArray} = goog.require('Blockly.test.toolboxHelpers');
+const {getBasicToolbox, getCategoryJSON, getChildItem, getCollapsibleItem, getDeeplyNestedJSON, getInjectedToolbox, getNonCollapsibleItem, getSeparator, getSimpleJson, getXmlArray} = goog.require('Blockly.test.toolboxHelpers');
 
 
 suite('Toolbox', function() {
@@ -494,7 +494,7 @@ suite('Toolbox', function() {
   suite('parseMethods', function() {
     setup(function() {
       this.categoryToolboxJSON = getCategoryJSON();
-      this.simpleToolboxJSON = getSimpleJSON();
+      this.simpleToolboxJSON = getSimpleJson();
     });
 
     function checkValue(actual, expected, value) {
diff --git a/tests/playground.html b/tests/playground.html
index c94c05c2f..c797162dd 100644
--- a/tests/playground.html
+++ b/tests/playground.html
@@ -196,6 +196,19 @@ function setToolboxDropdown() {
 }
 
 function initToolbox(workspace) {
+  workspace.registerToolboxCategoryCallback('JSON', function() {
+    return [
+      {
+        'kind': 'block',
+        'type': 'lists_create_with_json'
+      },
+      {
+        'kind': 'block',
+        'type': 'lists_create_with_json',
+        'extraState': {'itemCount': 2}
+      }
+    ]
+  });
   var toolboxSuffix = getToolboxSuffix();
   if (toolboxSuffix == 'test-blocks' &&
       typeof window.toolboxTestBlocksInit !== 'undefined') {
@@ -447,6 +460,130 @@ var spaghettiXml = [
     'next': { }
   });
 
+
+Blockly.Blocks['lists_create_with_json'] = {
+  /**
+   * Block for creating a list with any number of elements of any type.
+   * @this {Blockly.Block}
+   */
+  init: function() {
+    this.setHelpUrl(Blockly.Msg['LISTS_CREATE_WITH_HELPURL']);
+    this.setStyle('list_blocks');
+    this.itemCount_ = 3;
+    this.updateShape_();
+    this.setOutput(true, 'Array');
+    this.setMutator(new Blockly.Mutator(['lists_create_with_item']));
+    this.setTooltip(Blockly.Msg['LISTS_CREATE_WITH_TOOLTIP']);
+  },
+  /**
+   * Returns the state of this block as a JSON serializable object.
+   * @return {{itemCount: number}} The state of this block, ie the item count.
+   */
+  saveExtraState: function() {
+    return {
+      'itemCount': this.itemCount_,
+    };
+  },
+  /**
+   * Applies the given state to this block.
+   * @param {*} state The state to apply to this block, ie the item count.
+   */
+  loadExtraState: function(state) {
+    this.itemCount_ = state['itemCount'];
+    this.updateShape_();
+  },
+  /**
+   * Populate the mutator's dialog with this block's components.
+   * @param {!Blockly.Workspace} workspace Mutator's workspace.
+   * @return {!Blockly.Block} Root block in mutator.
+   * @this {Blockly.Block}
+   */
+  decompose: function(workspace) {
+    var containerBlock = workspace.newBlock('lists_create_with_container');
+    containerBlock.initSvg();
+    var connection = containerBlock.getInput('STACK').connection;
+    for (var i = 0; i < this.itemCount_; i++) {
+      var itemBlock = workspace.newBlock('lists_create_with_item');
+      itemBlock.initSvg();
+      connection.connect(itemBlock.previousConnection);
+      connection = itemBlock.nextConnection;
+    }
+    return containerBlock;
+  },
+  /**
+   * Reconfigure this block based on the mutator dialog's components.
+   * @param {!Blockly.Block} containerBlock Root block in mutator.
+   * @this {Blockly.Block}
+   */
+  compose: function(containerBlock) {
+    var itemBlock = containerBlock.getInputTargetBlock('STACK');
+    // Count number of inputs.
+    var connections = [];
+    while (itemBlock && !itemBlock.isInsertionMarker()) {
+      connections.push(itemBlock.valueConnection_);
+      itemBlock = itemBlock.nextConnection &&
+          itemBlock.nextConnection.targetBlock();
+    }
+    // Disconnect any children that don't belong.
+    for (var i = 0; i < this.itemCount_; i++) {
+      var connection = this.getInput('ADD' + i).connection.targetConnection;
+      if (connection && connections.indexOf(connection) == -1) {
+        connection.disconnect();
+      }
+    }
+    this.itemCount_ = connections.length;
+    this.updateShape_();
+    // Reconnect any child blocks.
+    for (var i = 0; i < this.itemCount_; i++) {
+      Blockly.Mutator.reconnect(connections[i], this, 'ADD' + i);
+    }
+  },
+  /**
+   * Store pointers to any connected child blocks.
+   * @param {!Blockly.Block} containerBlock Root block in mutator.
+   * @this {Blockly.Block}
+   */
+  saveConnections: function(containerBlock) {
+    var itemBlock = containerBlock.getInputTargetBlock('STACK');
+    var i = 0;
+    while (itemBlock) {
+      var input = this.getInput('ADD' + i);
+      itemBlock.valueConnection_ = input && input.connection.targetConnection;
+      i++;
+      itemBlock = itemBlock.nextConnection &&
+          itemBlock.nextConnection.targetBlock();
+    }
+  },
+  /**
+   * Modify this block to have the correct number of inputs.
+   * @private
+   * @this {Blockly.Block}
+   */
+  updateShape_: function() {
+    if (this.itemCount_ && this.getInput('EMPTY')) {
+      this.removeInput('EMPTY');
+    } else if (!this.itemCount_ && !this.getInput('EMPTY')) {
+      this.appendDummyInput('EMPTY')
+          .appendField(Blockly.Msg['LISTS_CREATE_EMPTY_TITLE']);
+    }
+    // Add new inputs.
+    for (var i = 0; i < this.itemCount_; i++) {
+      if (!this.getInput('ADD' + i)) {
+        var input = this.appendValueInput('ADD' + i)
+            .setAlign(Blockly.ALIGN_RIGHT);
+        if (i == 0) {
+          input.appendField(Blockly.Msg['LISTS_CREATE_WITH_INPUT_WITH']);
+        }
+      }
+    }
+    // Remove deleted inputs.
+    while (this.getInput('ADD' + i)) {
+      this.removeInput('ADD' + i);
+      i++;
+    }
+  }
+};
+
 </script>
 
 <style>
@@ -922,6 +1059,8 @@ var spaghettiXml = [
     <sep></sep>
     <category name="Variables" categorystyle="variable_category" custom="VARIABLE"></category>
     <category name="Functions" categorystyle="procedure_category" custom="PROCEDURE"></category>
+    <sep></sep>
+    <category name="JSON" categorystyle="procedure_category" custom="JSON"></category>
   </xml>
 
   <!-- toolbox-categories-typed-variables has a category menu and an

From 448c433abeacb26a0d110ac1caad05ac9541fbff Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Fri, 3 Sep 2021 20:35:23 +0000
Subject: [PATCH 784/833] fix: serializing edited shadows (#5424)

* fix: serializing shadows

* tests: add tests for serializing editted shadows
---
 core/serialization/blocks.js          |  2 +-
 tests/mocha/jso_serialization_test.js | 56 +++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index 903a996e8..c795edfa9 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -257,7 +257,7 @@ const saveNextBlocks = function(block, state) {
  *     shadow block, or any connected real block.
  */
 const saveConnection = function(connection) {
-  const shadow = connection.getShadowState();
+  const shadow = connection.getShadowState(true);
   const child = connection.targetBlock();
   if (!shadow && !child) {
     return null;
diff --git a/tests/mocha/jso_serialization_test.js b/tests/mocha/jso_serialization_test.js
index 9e05482c1..e7cfeef85 100644
--- a/tests/mocha/jso_serialization_test.js
+++ b/tests/mocha/jso_serialization_test.js
@@ -431,6 +431,62 @@ suite('JSO Serialization', function() {
         };
       });
 
+      suite('Editing shadow value', function() {
+        test('Not overwritten', function() {
+          const block = this.workspace.newBlock('text_print');
+          block.getInput('TEXT').connection.setShadowState({
+            'type': 'text',
+            'id': 'id'
+          });
+          block.getInputTargetBlock('TEXT').setFieldValue('new value', 'TEXT');
+          const jso = Blockly.serialization.blocks.save(block);
+          this.assertInput(
+              jso,
+              'TEXT',
+              {
+                'shadow': {
+                  'type': 'text',
+                  'id': 'id',
+                  'fields': {
+                    'TEXT': 'new value'
+                  }
+                }
+              });
+        });
+
+        test('Overwritten', function() {
+          const block = this.workspace.newBlock('text_print');
+          block.getInput('TEXT').connection.setShadowState({
+            'type': 'text',
+            'id': 'id'
+          });
+          block.getInputTargetBlock('TEXT').setFieldValue('new value', 'TEXT');
+          const childBlock = this.workspace.newBlock('text');
+          block.getInput('TEXT').connection.connect(
+              childBlock.outputConnection);
+          const jso = Blockly.serialization.blocks.save(block);
+          this.assertInput(
+              jso,
+              'TEXT',
+              {
+                'shadow': {
+                  'type': 'text',
+                  'id': 'id',
+                  'fields': {
+                    'TEXT': 'new value'
+                  }
+                },
+                'block': {
+                  'type': 'text',
+                  'id': 'id3',
+                  'fields': {
+                    'TEXT': ''
+                  }
+                },
+              });
+        });
+      });
+
       suite('Value', function() {
         suite('With serialization', function() {
           test('Child', function() {

From 96935c25020acb127b43cf6e53b16e05ffe92d0d Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Fri, 3 Sep 2021 22:03:25 +0000
Subject: [PATCH 785/833] fix: cereal backwards compatibility (#5421)

* fix: remove duplicate serialization hook implementations

* feat: add backwards compatibility to field serialization

* feat: add support for serializing old mutator hooks

* fix: build

* fix: refactor field changes into helpers

* fix: typo

* fix: removing xmlns

* tests: add tests for serialization and deserialization of mutator hooks

* fix: switch to early returns
---
 core/field.js                           |  53 +++++
 core/field_angle.js                     |  20 --
 core/field_checkbox.js                  |  18 +-
 core/field_colour.js                    |  20 --
 core/field_dropdown.js                  |  13 +-
 core/field_label_serializable.js        |  20 --
 core/field_multilineinput.js            |  14 +-
 core/field_number.js                    |  20 --
 core/field_textinput.js                 |  20 --
 core/field_variable.js                  |   9 +-
 core/serialization/blocks.js            |  13 +-
 tests/deps.js                           |   4 +-
 tests/mocha/field_test.js               | 266 ++++++++++++++++++++++++
 tests/mocha/jso_deserialization_test.js |  27 +++
 tests/mocha/jso_serialization_test.js   |  12 ++
 15 files changed, 399 insertions(+), 130 deletions(-)

diff --git a/core/field.js b/core/field.js
index fbc4ff341..647a366c8 100644
--- a/core/field.js
+++ b/core/field.js
@@ -45,11 +45,13 @@ 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 dom = goog.require('Blockly.utils.dom');
 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');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
@@ -439,6 +441,10 @@ Field.prototype.toXml = function(fieldElement) {
  * @package
  */
 Field.prototype.saveState = function() {
+  const legacyState = this.saveLegacyState(Field);
+  if (legacyState !== null) {
+    return legacyState;
+  }
   return this.getValue();
 };
 
@@ -449,9 +455,56 @@ Field.prototype.saveState = function() {
  * @package
  */
 Field.prototype.loadState = function(state) {
+  if (this.loadLegacyState(Field, state)) {
+    return;
+  }
   this.setValue(state);
 };
 
+// eslint-disable-next-line valid-jsdoc
+/**
+ * Returns a stringified version of the XML state, if it should be used.
+ * Otherwise this returns null, to signal the field should use its own
+ * serialization.
+ * @param {?} callingClass The class calling this method.
+ *     Used to see if `this` has overridden any relevant hooks.
+ * @return {?string} The stringified version of the XML state, or null.
+ * @protected
+ */
+Field.prototype.saveLegacyState = function(callingClass) {
+  if (callingClass.prototype.saveState === this.saveState &&
+      callingClass.prototype.toXml !== this.toXml) {
+    const elem = utilsXml.createElement("field");
+    elem.setAttribute("name", this.name || '');
+    const text = Xml.domToText(this.toXml(elem));
+    return text.replace(
+        ' xmlns="https://developers.google.com/blockly/xml"', '');
+  }
+  // Either they called this on purpose from their saveState, or they have
+  // no implementations of either hook. Just do our thing.
+  return null;
+};
+
+// eslint-disable-next-line valid-jsdoc
+/**
+ * Loads the given state using either the old XML hoooks, if they should be
+ * used. Returns true to indicate loading has been handled, false otherwise.
+ * @param {?} callingClass The class calling this method.
+ *     Used to see if `this` has overridden any relevant hooks.
+ * @param {*} state The state to apply to the field.
+ * @return {boolean} Whether the state was applied or not.
+ */
+Field.prototype.loadLegacyState = function(callingClass, state) {
+  if (callingClass.prototype.loadState === this.loadState &&
+      callingClass.prototype.fromXml !== this.fromXml) {
+    this.fromXml(Xml.textToDom(/** @type {string} */ (state)));
+    return true;
+  }
+  // Either they called this on purpose from their loadState, or they have
+  // no implementations of either hook. Just do our thing.
+  return false;
+};
+
 /**
  * Dispose of all DOM objects and events belonging to this editable field.
  * @package
diff --git a/core/field_angle.js b/core/field_angle.js
index c4c292799..ab877589a 100644
--- a/core/field_angle.js
+++ b/core/field_angle.js
@@ -254,26 +254,6 @@ Blockly.FieldAngle.prototype.initView = function() {
   this.textElement_.appendChild(this.symbol_);
 };
 
-/**
- * Saves this field's value.
- * @return {number} The angle value held by this field.
- * @override
- * @package
- */
-Blockly.FieldAngle.prototype.saveState = function() {
-  return /** @type {number} */ (this.getValue());
-};
-
-/**
- * Sets the field's value based on the given state.
- * @param {*} state The state to apply to the angle field.
- * @override
- * @package
- */
-Blockly.FieldAngle.prototype.loadState = function(state) {
-  this.setValue(state);
-};
-
 /**
  * Updates the graph when the field rerenders.
  * @protected
diff --git a/core/field_checkbox.js b/core/field_checkbox.js
index 274123995..388e18a26 100644
--- a/core/field_checkbox.js
+++ b/core/field_checkbox.js
@@ -104,22 +104,16 @@ FieldCheckbox.prototype.configure_ = function(config) {
 
 /**
  * Saves this field's value.
- * @return {boolean} The boolean value held by this field.
+ * @return {*} The boolean value held by this field.
  * @override
  * @package
  */
 FieldCheckbox.prototype.saveState = function() {
-  return /** @type {boolean} */ (this.getValueBoolean());
-};
-
-/**
- * Sets the field's value based on the given state.
- * @param {*} state The state to apply to the checkbox field.
- * @override
- * @package
- */
-FieldCheckbox.prototype.loadState = function(state) {
-  this.setValue(state);
+  const legacyState = this.saveLegacyState(FieldCheckbox);
+  if (legacyState !== null) {
+    return legacyState;
+  }
+  return this.getValueBoolean();
 };
 
 /**
diff --git a/core/field_colour.js b/core/field_colour.js
index a8ac41e8f..b05290460 100644
--- a/core/field_colour.js
+++ b/core/field_colour.js
@@ -188,26 +188,6 @@ FieldColour.prototype.initView = function() {
   }
 };
 
-/**
- * Saves this field's value.
- * @return {string} The colour value held by this field.
- * @override
- * @package
- */
-FieldColour.prototype.saveState = function() {
-  return /** @type {string} */ (this.getValue());
-};
-
-/**
- * Sets the field's value based on the given state.
- * @param {*} state The state to apply to the colour field.
- * @override
- * @package
- */
-FieldColour.prototype.loadState = function(state) {
-  this.setValue(state);
-};
-
 /**
  * @override
  */
diff --git a/core/field_dropdown.js b/core/field_dropdown.js
index c9671149e..cec7bab97 100644
--- a/core/field_dropdown.js
+++ b/core/field_dropdown.js
@@ -170,16 +170,6 @@ FieldDropdown.prototype.fromXml = function(fieldElement) {
   this.setValue(fieldElement.textContent);
 };
 
-/**
- * Saves this field's value.
- * @return {*} The dropdown value held by this field.
- * @override
- * @package
- */
-FieldDropdown.prototype.saveState = function() {
-  return this.getValue();
-};
-
 /**
  * Sets the field's value based on the given state.
  * @param {*} state The state to apply to the dropdown field.
@@ -187,6 +177,9 @@ FieldDropdown.prototype.saveState = function() {
  * @package
  */
 FieldDropdown.prototype.loadState = function(state) {
+  if (this.loadLegacyState(FieldDropdown, state)) {
+    return;
+  }
   if (this.isOptionListDynamic()) {
     this.getOptions(false);
   }
diff --git a/core/field_label_serializable.js b/core/field_label_serializable.js
index df2119c15..dee9da1ef 100644
--- a/core/field_label_serializable.js
+++ b/core/field_label_serializable.js
@@ -68,26 +68,6 @@ FieldLabelSerializable.prototype.EDITABLE = false;
  */
 FieldLabelSerializable.prototype.SERIALIZABLE = true;
 
-/**
- * Saves this field's value.
- * @return {string} The text value held by this field.
- * @override
- * @package
- */
-FieldLabelSerializable.prototype.saveState = function() {
-  return /** @type {string} */ (this.getValue());
-};
-
-/**
- * Sets the field's value based on the given state.
- * @param {*} state The state to apply to the label field.
- * @override
- * @package
- */
-FieldLabelSerializable.prototype.loadState = function(state) {
-  this.setValue(state);
-};
-
 fieldRegistry.register('field_label_serializable', FieldLabelSerializable);
 
 exports = FieldLabelSerializable;
diff --git a/core/field_multilineinput.js b/core/field_multilineinput.js
index c72f9983d..7d0d4bcea 100644
--- a/core/field_multilineinput.js
+++ b/core/field_multilineinput.js
@@ -124,21 +124,27 @@ FieldMultilineInput.prototype.fromXml = function(fieldElement) {
 
 /**
  * Saves this field's value.
- * @return {string} The text value held by this field.
- * @override
+ * @return {*} The state of this field.
  * @package
  */
 FieldMultilineInput.prototype.saveState = function() {
-  return /** @type {string} */ (this.getValue());
+  const legacyState = this.saveLegacyState(FieldMultilineInput);
+  if (legacyState !== null) {
+    return legacyState;
+  }
+  return this.getValue();
 };
 
 /**
  * Sets the field's value based on the given state.
- * @param {*} state The state to apply to the multiline input field.
+ * @param {*} state The state of the variable to assign to this variable field.
  * @override
  * @package
  */
 FieldMultilineInput.prototype.loadState = function(state) {
+  if (this.loadLegacyState(Field, state)) {
+    return;
+  }
   this.setValue(state);
 };
 
diff --git a/core/field_number.js b/core/field_number.js
index 50cbc7fe7..4ed5ac5aa 100644
--- a/core/field_number.js
+++ b/core/field_number.js
@@ -118,26 +118,6 @@ FieldNumber.prototype.configure_ = function(config) {
   this.setPrecisionInternal_(config['precision']);
 };
 
-/**
- * Saves this field's value.
- * @return {number} The number value held by this field.
- * @override
- * @package
- */
-FieldNumber.prototype.saveState = function() {
-  return /** @type {number} */ (this.getValue());
-};
-
-/**
- * Sets the field's value based on the given state.
- * @param {*} state The state to apply to the nuber field.
- * @override
- * @package
- */
-FieldNumber.prototype.loadState = function(state) {
-  this.setValue(state);
-};
-
 /**
  * Set the maximum, minimum and precision constraints on this field.
  * Any of these properties may be undefined or NaN to be disabled.
diff --git a/core/field_textinput.js b/core/field_textinput.js
index e07ac22e4..789bc0a96 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -182,26 +182,6 @@ FieldTextInput.prototype.initView = function() {
   this.createTextElement_();
 };
 
-/**
- * Saves this field's value.
- * @return {*} The text value held by this field.
- * @override
- * @package
- */
-FieldTextInput.prototype.saveState = function() {
-  return this.getValue();
-};
-
-/**
- * Sets the field's value based on the given state.
- * @param {*} state The state to apply to the text input field.
- * @override
- * @package
- */
-FieldTextInput.prototype.loadState = function(state) {
-  this.setValue(state);
-};
-
 /**
  * Ensure that the input value casts to a valid string.
  * @param {*=} opt_newValue The input value.
diff --git a/core/field_variable.js b/core/field_variable.js
index 9cb95eff5..7e76f7e35 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -199,11 +199,15 @@ FieldVariable.prototype.toXml = function(fieldElement) {
 
 /**
  * Saves this field's value.
- * @return {{id: string}} The ID of the variable referenced by this field.
+ * @return {*} The ID of the variable referenced by this field.
  * @override
  * @package
  */
 FieldVariable.prototype.saveState = function() {
+  const legacyState = this.saveLegacyState(FieldVariable);
+  if (legacyState !== null) {
+    return legacyState;
+  }
   // Make sure the variable is initialized.
   this.initModel();
   return {
@@ -218,6 +222,9 @@ FieldVariable.prototype.saveState = function() {
  * @package
  */
 FieldVariable.prototype.loadState = function(state) {
+  if (this.loadLegacyState(FieldVariable, state)) {
+    return;
+  }
   // This is necessary so that blocks in the flyout can have custom var names.
   const variable = Variables.getOrCreateVariablePackage(
       this.sourceBlock_.workspace,
diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index c795edfa9..f2dd78d4e 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -24,6 +24,7 @@ const {ISerializer} = goog.requireType('Blockly.serialization.ISerializer');
 const Size = goog.require('Blockly.utils.Size');
 // eslint-disable-next-line no-unused-vars
 const Workspace = goog.requireType('Blockly.Workspace');
+const Xml = goog.require('Blockly.Xml');
 const inputTypes = goog.require('Blockly.inputTypes');
 const priorities = goog.require('Blockly.serialization.priorities');
 const serializationRegistry = goog.require('Blockly.serialization.registry');
@@ -162,6 +163,12 @@ const saveExtraState = function(block, state) {
     if (extraState !== null) {
       state['extraState'] = extraState;
     }
+  } else if (block.mutationToDom) {
+    const extraState = block.mutationToDom();
+    if (extraState !== null) {
+      state['extraState'] = Xml.domToText(extraState).replace(
+          ' xmlns="https://developers.google.com/blockly/xml"', '');
+    }
   }
 };
 
@@ -427,7 +434,11 @@ const loadExtraState = function(block, state) {
   if (!state['extraState']) {
     return;
   }
-  block.loadExtraState(state['extraState']);
+  if (block.loadExtraState) {
+    block.loadExtraState(state['extraState']);
+  } else {
+    block.domToMutation(Xml.textToDom(state['extraState']));
+  }
 };
 
 /**
diff --git a/tests/deps.js b/tests/deps.js
index b7ff00900..b7a164eff 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -65,7 +65,7 @@ goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.Va
 goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -197,7 +197,7 @@ goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Ren
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.registry', 'Blockly.serialization.variables', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.serialization.exceptions', 'Blockly.serialization.priorities', 'Blockly.serialization.registry', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes', 'Blockly.serialization.exceptions', 'Blockly.serialization.priorities', 'Blockly.serialization.registry', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/exceptions.js', ['Blockly.serialization.exceptions'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/priorities.js', ['Blockly.serialization.priorities'], [], {'module': 'goog'});
 goog.addDependency('../../core/serialization/registry.js', ['Blockly.serialization.registry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/field_test.js b/tests/mocha/field_test.js
index 46fd65d69..ed446df71 100644
--- a/tests/mocha/field_test.js
+++ b/tests/mocha/field_test.js
@@ -17,9 +17,11 @@ suite('Abstract Fields', function() {
     // console logs.
     createDeprecationWarningStub();
   });
+
   teardown(function() {
     sharedTestTeardown.call(this);
   });
+
   suite('Is Serializable', function() {
     // Both EDITABLE and SERIALIZABLE are default.
     function FieldDefault() {
@@ -73,6 +75,269 @@ suite('Abstract Fields', function() {
       chai.assert.isTrue(field.isSerializable());
     });
   });
+
+  suite('Serialization', function() {
+    class DefaultSerializationField extends Blockly.Field {
+      constructor(value, validator = undefined, config = undefined) {
+        super(value, validator, config);
+        this.SERIALIZABLE = true;
+      }
+    }
+
+    class CustomXmlField extends Blockly.Field {
+      constructor(value, validator = undefined, config = undefined) {
+        super(value, validator, config);
+        this.SERIALIZABLE = true;
+      }
+
+      toXml(fieldElement) {
+        fieldElement.textContent = 'custom value';
+        return fieldElement;
+      }
+
+      fromXml(fieldElement) {
+        this.someProperty = fieldElement.textContent;
+      }
+    }
+
+    class CustomXmlCallSuperField extends Blockly.Field {
+      constructor(value, validator = undefined, config = undefined) {
+        super(value, validator, config);
+        this.SERIALIZABLE = true;
+      }
+
+      toXml(fieldElement) {
+        super.toXml(fieldElement);
+        fieldElement.setAttribute('attribute', 'custom value');
+        return fieldElement;
+      }
+
+      fromXml(fieldElement) {
+        super.fromXml(fieldElement);
+        this.someProperty = fieldElement.getAttribute('attribute');
+      }
+    }
+
+    class CustomJsoField extends Blockly.Field {
+      constructor(value, validator = undefined, config = undefined) {
+        super(value, validator, config);
+        this.SERIALIZABLE = true;
+      }
+
+      saveState() {
+        return 'custom value';
+      }
+
+      loadState(state) {
+        this.someProperty = state;
+      }
+    }
+
+    class CustomJsoCallSuperField extends Blockly.Field {
+      constructor(value, validator = undefined, config = undefined) {
+        super(value, validator, config);
+        this.SERIALIZABLE = true;
+      }
+
+      saveState() {
+        return {
+          default: super.saveState(),
+          val: 'custom value'
+        };
+      }
+
+      loadState(state) {
+        super.loadState(state.default);
+        this.someProperty = state.val;
+      }
+    }
+
+    class CustomXmlAndJsoField extends Blockly.Field {
+      constructor(value, validator = undefined, config = undefined) {
+        super(value, validator, config);
+        this.SERIALIZABLE = true;
+      }
+
+      toXml(fieldElement) {
+        fieldElement.textContent = 'custom value';
+        return fieldElement;
+      }
+
+      fromXml(fieldElement) {
+        this.someProperty = fieldElement.textContent;
+      }
+
+      saveState() {
+        return 'custom value';
+      }
+
+      loadState(state) {
+        this.someProperty = state;
+      }
+    }
+
+    suite('Save', function() {
+      suite('JSO', function() {
+        test('No implementations', function() {
+          const field = new DefaultSerializationField('test value');
+          const value = field.saveState();
+          chai.assert.equal(value, 'test value');
+        });
+  
+        test('Xml implementations', function() {
+          const field = new CustomXmlField('test value');
+          const value = field.saveState();
+          chai.assert.equal(value, '<field name="">custom value</field>');
+        });
+  
+        test('Xml super implementation', function() {
+          const field = new CustomXmlCallSuperField('test value');
+          const value = field.saveState();
+          chai.assert.equal(
+              value,
+              '<field name="" attribute="custom value">test value</field>');
+        });
+  
+        test('JSO implementations', function() {
+          const field = new CustomJsoField('test value');
+          const value = field.saveState();
+          chai.assert.equal(value, 'custom value');
+        });
+  
+        test('JSO super implementations', function() {
+          const field = new CustomJsoCallSuperField('test value');
+          const value = field.saveState();
+          chai.assert.deepEqual(
+              value, {default: 'test value', val: 'custom value'});
+        });
+
+        test('Xml and JSO implementations', function() {
+          const field = new CustomXmlAndJsoField('test value');
+          const value = field.saveState();
+          chai.assert.equal(value, 'custom value');
+        });
+      });
+
+      suite('Xml', function() {
+        test('No implementations', function() {
+          const field = new DefaultSerializationField('test value');
+          const element = document.createElement('field');
+          const value = Blockly.Xml.domToText(field.toXml(element));
+          chai.assert.equal(
+              value,
+              '<field xmlns="http://www.w3.org/1999/xhtml">test value</field>');
+        });
+  
+        test('Xml implementations', function() {
+          const field = new CustomXmlField('test value');
+          const element = document.createElement('field');
+          const value = Blockly.Xml.domToText(field.toXml(element));
+          chai.assert.equal(
+              value,
+              '<field xmlns="http://www.w3.org/1999/xhtml">custom value</field>'
+          );
+        });
+  
+        test('Xml super implementation', function() {
+          const field = new CustomXmlCallSuperField('test value');
+          const element = document.createElement('field');
+          const value = Blockly.Xml.domToText(field.toXml(element));
+          chai.assert.equal(
+              value,
+              '<field xmlns="http://www.w3.org/1999/xhtml" ' +
+              'attribute="custom value">test value</field>');
+        });
+
+        test('Xml and JSO implementations', function() {
+          const field = new CustomXmlAndJsoField('test value');
+          const element = document.createElement('field');
+          const value = Blockly.Xml.domToText(field.toXml(element));
+          chai.assert.equal(
+              value,
+              '<field xmlns="http://www.w3.org/1999/xhtml">custom value</field>'
+          );
+        });
+      });
+    });
+
+    suite('Load', function() {
+      suite('JSO', function() {
+        test('No implementations', function() {
+          const field = new DefaultSerializationField('');
+          field.loadState('test value');
+          chai.assert.equal(field.getValue(), 'test value');
+        });
+  
+        test('Xml implementations', function() {
+          const field = new CustomXmlField('');
+          field.loadState('<field name="">custom value</field>');
+          chai.assert.equal(field.someProperty, 'custom value');
+        });
+  
+        test('Xml super implementation', function() {
+          const field = new CustomXmlCallSuperField('');
+          field.loadState(
+              '<field attribute="custom value" name="">test value</field>');
+          chai.assert.equal(field.getValue(), 'test value');
+          chai.assert.equal(field.someProperty, 'custom value');
+        });
+  
+        test('JSO implementations', function() {
+          const field = new CustomJsoField('');
+          field.loadState('custom value');
+          chai.assert.equal(field.someProperty, 'custom value');
+        });
+  
+        test('JSO super implementations', function() {
+          const field = new CustomJsoCallSuperField('');
+          field.loadState({default: 'test value', val: 'custom value'});
+          chai.assert.equal(field.getValue(), 'test value');
+          chai.assert.equal(field.someProperty, 'custom value');
+        });
+        
+        test('Xml and JSO implementations', function() {
+          const field = new CustomXmlAndJsoField('');
+          field.loadState('custom value');
+          chai.assert.equal(field.someProperty, 'custom value');
+        });
+      });
+
+      suite('Xml', function() {
+        test('No implementations', function() {
+          const field = new DefaultSerializationField('');
+          field.fromXml(
+              Blockly.Xml.textToDom('<field name="">test value</field>'));
+          chai.assert.equal(field.getValue(), 'test value');
+        });
+  
+        test('Xml implementations', function() {
+          const field = new CustomXmlField('');
+          field.fromXml(
+              Blockly.Xml.textToDom('<field name="">custom value</field>'));
+          chai.assert.equal(field.someProperty, 'custom value');
+        });
+  
+        test('Xml super implementation', function() {
+          const field = new CustomXmlCallSuperField('');
+          field.fromXml(
+              Blockly.Xml.textToDom(
+                  '<field attribute="custom value" name="">test value</field>'
+              )
+          );
+          chai.assert.equal(field.getValue(), 'test value');
+          chai.assert.equal(field.someProperty, 'custom value');
+        });
+
+        test('XML andd JSO implementations', function() {
+          const field = new CustomXmlAndJsoField('');
+          field.fromXml(
+              Blockly.Xml.textToDom('<field name="">custom value</field>'));
+          chai.assert.equal(field.someProperty, 'custom value');
+        });
+      });
+    });
+  });
+
   suite('setValue', function() {
     function addSpies(field, excludeSpies = []) {
       if (!excludeSpies.includes('doValueInvalid_')) {
@@ -321,6 +586,7 @@ suite('Abstract Fields', function() {
       sinon.assert.calledOnce(this.field.doValueUpdate_);
     });
   });
+
   suite('Customization', function() {
     // All this field does is wrap the abstract field.
     function CustomField(opt_config) {
diff --git a/tests/mocha/jso_deserialization_test.js b/tests/mocha/jso_deserialization_test.js
index 003499e5b..0ec532062 100644
--- a/tests/mocha/jso_deserialization_test.js
+++ b/tests/mocha/jso_deserialization_test.js
@@ -681,4 +681,31 @@ suite('JSO Deserialization', function() {
           'third-load'
         ]);
   });
+
+  suite('Extra state', function() {
+    // Most of this is covered by our round-trip tests. But we need one test
+    // for old xml hooks.
+    test('Xml hooks', function() {
+      Blockly.Blocks['test_block'] = {
+        init: function() { },
+
+        mutationToDom: function() { },
+
+        domToMutation: function(element) {
+          this.someProperty = element.getAttribute('value');
+        }
+      };
+
+      const block = Blockly.serialization.blocks.load(
+          {
+            'type': 'test_block',
+            'extraState': '<mutation value="some value"></mutation>',
+          },
+          this.workspace);
+
+      delete Blockly.Blocks['test_block'];
+
+      chai.assert.equal(block.someProperty, 'some value');
+    });
+  });
 });
diff --git a/tests/mocha/jso_serialization_test.js b/tests/mocha/jso_serialization_test.js
index e7cfeef85..cfd931d3e 100644
--- a/tests/mocha/jso_serialization_test.js
+++ b/tests/mocha/jso_serialization_test.js
@@ -208,6 +208,18 @@ suite('JSO Serialization', function() {
         const jso = Blockly.serialization.blocks.save(block);
         assertProperty(jso, 'extraState', ['state1', 42, true]);
       });
+
+      test('Xml hooks', function() {
+        const block = this.workspace.newBlock('row_block');
+        block.mutationToDom = function() {
+          var container = Blockly.utils.xml.createElement('mutation');
+          container.setAttribute('value', 'some value');
+          return container;
+        };
+        const jso = Blockly.serialization.blocks.save(block);
+        assertProperty(
+            jso, 'extraState', '<mutation value="some value"></mutation>');
+      });
     });
 
     suite('Icons', function() {

From e7541cb3156164b690c867f09e0be91f69d8efba Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Fri, 3 Sep 2021 22:19:52 +0000
Subject: [PATCH 786/833] fix: copy paste with json system (#5423)

* fix: copy paste w/ json system

* fix: pr comments
---
 core/block_svg.js             | 12 ++------
 core/clipboard.js             | 14 +++------
 core/interfaces/i_copyable.js |  3 +-
 core/workspace_comment_svg.js |  6 +++-
 core/workspace_svg.js         | 53 ++++++++++++++++++++++-------------
 tests/deps.js                 | 22 +++++++--------
 tests/deps.mocha.js           | 26 ++++++++---------
 7 files changed, 72 insertions(+), 64 deletions(-)

diff --git a/core/block_svg.js b/core/block_svg.js
index 17bb2ba02..62dcb1f87 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -57,8 +57,8 @@ const Tooltip = goog.require('Blockly.Tooltip');
 const Warning = goog.requireType('Blockly.Warning');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
-const Xml = goog.require('Blockly.Xml');
 const blockAnimations = goog.require('Blockly.blockAnimations');
+const blocks = goog.require('Blockly.serialization.blocks');
 const browserEvents = goog.require('Blockly.browserEvents');
 const common = goog.require('Blockly.common');
 const connectionTypes = goog.require('Blockly.connectionTypes');
@@ -996,15 +996,9 @@ BlockSvg.prototype.toCopyData = function() {
   if (this.isInsertionMarker_) {
     return null;
   }
-  const xml = /** @type {!Element} */ (Xml.blockToDom(this, true));
-  // Copy only the selected block and internal blocks.
-  Xml.deleteNext(xml);
-  // Encode start position in XML.
-  const xy = this.getRelativeToSurfaceXY();
-  xml.setAttribute('x', this.RTL ? -xy.x : xy.x);
-  xml.setAttribute('y', xy.y);
   return {
-    xml: xml,
+    saveInfo: /** @type {!blocks.State} */(blocks.save(
+        this, {addCoordinates: true, addNextBlocks: false})),
     source: this.workspace,
     typeCounts: utils.getBlockTypeCounts(this, true)
   };
diff --git a/core/clipboard.js b/core/clipboard.js
index 9810836f9..56e0cbeab 100644
--- a/core/clipboard.js
+++ b/core/clipboard.js
@@ -38,19 +38,19 @@ exports.copy = copy;
  * @return {boolean} True if the paste was successful, false otherwise.
  */
 const paste = function() {
-  if (!copyData.xml) {
+  if (!copyData) {
     return false;
   }
   // Pasting always pastes to the main workspace, even if the copy
   // started in a flyout workspace.
-  var workspace = copyData.source;
+  let workspace = copyData.source;
   if (workspace.isFlyout) {
     workspace = workspace.targetWorkspace;
   }
   if (copyData.typeCounts &&
       workspace.isCapacityAvailable(copyData.typeCounts)) {
     Events.setGroup(true);
-    workspace.paste(copyData.xml);
+    workspace.paste(copyData.saveInfo);
     Events.setGroup(false);
     return true;
   }
@@ -65,15 +65,9 @@ exports.paste = paste;
  *     duplicated.
  */
 const duplicate = function(toDuplicate) {
-  // Save the clipboard.
   const oldCopyData = copyData;
-
-  // Create a duplicate via a copy/paste operation.
   copy(toDuplicate);
-  // copy() replaced the value of copyData.
-  toDuplicate.workspace.paste(copyData.xml);
-
-  // Restore the clipboard.
+  toDuplicate.workspace.paste(copyData.saveInfo);
   copyData = oldCopyData;
 };
 /** @package */
diff --git a/core/interfaces/i_copyable.js b/core/interfaces/i_copyable.js
index 87b776600..0ba476b72 100644
--- a/core/interfaces/i_copyable.js
+++ b/core/interfaces/i_copyable.js
@@ -29,13 +29,14 @@ const ICopyable = function() {};
 /**
  * Encode for copying.
  * @return {?ICopyable.CopyData} Copy metadata.
+ * @package
  */
 ICopyable.prototype.toCopyData;
 
 /**
  * Copy Metadata.
  * @typedef {{
- *            xml:!Element,
+ *            saveInfo:(!Object|!Element),
  *            source:WorkspaceSvg,
  *            typeCounts:?Object
  *          }}
diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 974f159ae..58ff479a4 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -665,7 +665,11 @@ WorkspaceCommentSvg.prototype.toXmlWithXY = function(opt_noId) {
  * @package
  */
 WorkspaceCommentSvg.prototype.toCopyData = function() {
-  return {xml: this.toXmlWithXY(), source: this.workspace, typeCounts: null};
+  return {
+    saveInfo: this.toXmlWithXY(),
+    source: this.workspace,
+    typeCounts: null
+  };
 };
 
 /**
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index a6c81e741..241d81504 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -87,6 +87,7 @@ const Xml = goog.require('Blockly.Xml');
 /* eslint-disable-next-line no-unused-vars */
 const ZoomControls = goog.requireType('Blockly.ZoomControls');
 const blockRendering = goog.require('Blockly.blockRendering');
+const blocks = goog.require('Blockly.serialization.blocks');
 const browserEvents = goog.require('Blockly.browserEvents');
 const common = goog.require('Blockly.common');
 const dom = goog.require('Blockly.utils.dom');
@@ -1504,43 +1505,57 @@ WorkspaceSvg.prototype.highlightBlock = function(id, opt_state) {
 };
 
 /**
- * Paste the provided block onto the workspace.
- * @param {!Element|!DocumentFragment} xmlBlock XML block element or an empty
- *     DocumentFragment if the block was an insertion marker.
+ * Pastes the provided block or workspace comment onto the workspace.
+ * Does not check whether there is remaining capacity for the object, that
+ * should be done before calling this method.
+ * @param {!Object|!Element|!DocumentFragment} state The representation of the
+ *     thing to paste.
  */
-WorkspaceSvg.prototype.paste = function(xmlBlock) {
-  if (!this.rendered || !xmlBlock.tagName ||
-      xmlBlock.getElementsByTagName('block').length >=
-          this.remainingCapacity()) {
+WorkspaceSvg.prototype.paste = function(state) {
+  if (!this.rendered || !state['type'] && !state.tagName) {
     return;
   }
-  // The check above for tagName rules out the possibility of this being a
-  // DocumentFragment.
-  xmlBlock = /** @type {!Element} */ (xmlBlock);
   if (this.currentGesture_) {
     this.currentGesture_.cancel();  // Dragging while pasting?  No.
   }
-  if (xmlBlock.tagName.toLowerCase() == 'comment') {
-    this.pasteWorkspaceComment_(xmlBlock);
+  
+  // Checks if this is JSON. JSON has a type property, while elements don't.
+  if (state['type']) {
+    this.pasteBlock_(null, /** @type {!blocks.State} */ (state));
   } else {
-    this.pasteBlock_(xmlBlock);
+    const xmlBlock = /** @type {!Element} */ (state);
+    if (xmlBlock.tagName.toLowerCase() == 'comment') {
+      this.pasteWorkspaceComment_(xmlBlock);
+    } else {
+      this.pasteBlock_(xmlBlock, null);
+    }
   }
 };
 
 /**
  * Paste the provided block onto the workspace.
- * @param {!Element} xmlBlock XML block element.
+ * @param {?Element} xmlBlock XML block element.
+ * @param {?blocks.State} jsonBlock JSON block
+ *     representation.
  * @private
  */
-WorkspaceSvg.prototype.pasteBlock_ = function(xmlBlock) {
+WorkspaceSvg.prototype.pasteBlock_ = function(xmlBlock, jsonBlock) {
   Events.disable();
   let block;
   try {
-    block = Xml.domToBlock(xmlBlock, this);
+    let blockX;
+    let blockY;
+    if (xmlBlock) {
+      block = Xml.domToBlock(xmlBlock, this);
+      blockX = parseInt(xmlBlock.getAttribute('x'), 10);
+      blockY = parseInt(xmlBlock.getAttribute('y'), 10);
+    } else if (jsonBlock) {
+      block = blocks.load(jsonBlock, this);
+      blockX = jsonBlock['x'] || 10;
+      blockY = jsonBlock['y'] || 10;
+    }
 
     // Move the duplicate to original position.
-    let blockX = parseInt(xmlBlock.getAttribute('x'), 10);
-    let blockY = parseInt(xmlBlock.getAttribute('y'), 10);
     if (!isNaN(blockX) && !isNaN(blockY)) {
       if (this.RTL) {
         blockX = -blockX;
@@ -1580,7 +1595,7 @@ WorkspaceSvg.prototype.pasteBlock_ = function(xmlBlock) {
           blockY += internalConstants.SNAP_RADIUS * 2;
         }
       } while (collide);
-      block.moveBy(blockX, blockY);
+      block.moveTo(new Coordinate(blockX, blockY));
     }
   } finally {
     Events.enable();
diff --git a/tests/deps.js b/tests/deps.js
index b7a164eff..782703700 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -11,12 +11,12 @@ goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode',
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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.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/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.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_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'});
-goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bump_objects.js', ['Blockly.bumpObjects'], ['Blockly.Events', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
@@ -80,11 +80,11 @@ goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'],
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.common', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
@@ -212,13 +212,13 @@ goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Bl
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], ['Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
@@ -251,7 +251,7 @@ goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.common', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.Tooltip', 'Blockly.TouchGesture', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.Tooltip', 'Blockly.TouchGesture', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 17485d31f..134e87152 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -11,12 +11,12 @@ goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode',
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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.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/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.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_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'});
-goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bump_objects.js', ['Blockly.bumpObjects'], ['Blockly.Events', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
@@ -65,7 +65,7 @@ goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.Va
 goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -80,11 +80,11 @@ goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'],
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.common', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
@@ -197,7 +197,7 @@ goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Ren
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.registry', 'Blockly.serialization.variables', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.serialization.exceptions', 'Blockly.serialization.priorities', 'Blockly.serialization.registry', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes', 'Blockly.serialization.exceptions', 'Blockly.serialization.priorities', 'Blockly.serialization.registry', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/exceptions.js', ['Blockly.serialization.exceptions'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/priorities.js', ['Blockly.serialization.priorities'], [], {'module': 'goog'});
 goog.addDependency('../../core/serialization/registry.js', ['Blockly.serialization.registry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
@@ -212,13 +212,13 @@ goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Bl
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], ['Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
@@ -251,7 +251,7 @@ goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.common', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.Tooltip', 'Blockly.TouchGesture', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.Tooltip', 'Blockly.TouchGesture', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../generators/dart.js', ['Blockly.Dart'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.string']);

From a4d84e57f89a6498f3bee48f595ea4a44c04d4d3 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Mon, 6 Sep 2021 16:28:20 +0000
Subject: [PATCH 787/833] fix: dragging blocks from the flyout that only have
 XML hooks (#5422)

* fix: positioning of flyout blocks

* fix: move flyout to JSON system

* cleanup: remove test code from playground
---
 core/flyout_base.js          |  27 ++-----
 core/serialization/blocks.js |   4 +-
 tests/playground.html        | 139 -----------------------------------
 3 files changed, 10 insertions(+), 160 deletions(-)

diff --git a/core/flyout_base.js b/core/flyout_base.js
index 2a999cf1f..425648574 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -599,8 +599,8 @@ Flyout.prototype.createFlyoutInfo_ = function(parsedContent) {
 
     switch (contentInfo['kind'].toUpperCase()) {
       case 'BLOCK': {
-        var blockInfo = /** @type {!toolbox.BlockInfo} */ (contentInfo);
-        var block = this.createFlyoutBlock_(blockInfo);
+        const blockInfo = /** @type {!toolbox.BlockInfo} */ (contentInfo);
+        const block = this.createFlyoutBlock_(blockInfo);
         contents.push({type: 'block', block: block});
         this.addBlockGap_(blockInfo, gaps, defaultGap);
         break;
@@ -633,7 +633,7 @@ Flyout.prototype.createFlyoutInfo_ = function(parsedContent) {
 /**
  * Gets the flyout definition for the dynamic category.
  * @param {string} categoryName The name of the dynamic category.
- * @return {!Blockly.utils.toolbox.FlyoutDefinition} The definition of the
+ * @return {!toolbox.FlyoutDefinition} The definition of the
  *     flyout in one of its many forms.
  * @private
  */
@@ -1073,22 +1073,11 @@ Flyout.prototype.placeNewBlock_ = function(oldBlock) {
     throw Error('oldBlock is not rendered.');
   }
 
-  let block;
-  if (oldBlock.mutationToDom && !oldBlock.saveExtraState) {
-    // Create the new block by cloning the block in the flyout (via XML).
-    // This cast assumes that the oldBlock can not be an insertion marker.
-    const xml = /** @type {!Element} */ (Xml.blockToDom(oldBlock, true));
-    // The target workspace would normally resize during domToBlock, which will
-    // lead to weird jumps.  Save it for terminateDrag.
-    targetWorkspace.setResizesEnabled(false);
-    // Using domToBlock instead of domToWorkspace means that the new block will be
-    // placed at position (0, 0) in main workspace units.
-    block = /** @type {!BlockSvg} */ (Xml.domToBlock(xml, targetWorkspace));
-  } else {
-    const json = /** @type {!blocks.State} */ (blocks.save(oldBlock));
-    targetWorkspace.setResizesEnabled(false);
-    block = /** @type {!BlockSvg} */ (blocks.load(json, targetWorkspace));
-  }
+  // Clone the block.
+  const json = /** @type {!blocks.State} */ (blocks.save(oldBlock));
+  // Normallly this resizes leading to weird jumps. Save it for terminateDrag.
+  targetWorkspace.setResizesEnabled(false);
+  const block = /** @type {!BlockSvg} */ (blocks.load(json, targetWorkspace));
 
   // The offset in pixels between the main workspace's origin and the upper left
   // corner of the injection div.
diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index f2dd78d4e..20633a302 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -399,8 +399,8 @@ const loadPrivate = function(
  * @param {!State} state The state object to reference.
  */
 const loadCoords = function(block, state) {
-  const x = state['x'] === undefined ? 10 : state['x'];
-  const y = state['y'] === undefined ? 10 : state['y'];
+  const x = state['x'] === undefined ? 0 : state['x'];
+  const y = state['y'] === undefined ? 0 : state['y'];
   block.moveBy(x, y);
 };
 
diff --git a/tests/playground.html b/tests/playground.html
index c797162dd..c94c05c2f 100644
--- a/tests/playground.html
+++ b/tests/playground.html
@@ -196,19 +196,6 @@ function setToolboxDropdown() {
 }
 
 function initToolbox(workspace) {
-  workspace.registerToolboxCategoryCallback('JSON', function() {
-    return [
-      {
-        'kind': 'block',
-        'type': 'lists_create_with_json'
-      },
-      {
-        'kind': 'block',
-        'type': 'lists_create_with_json',
-        'extraState': {'itemCount': 2}
-      }
-    ]
-  });
   var toolboxSuffix = getToolboxSuffix();
   if (toolboxSuffix == 'test-blocks' &&
       typeof window.toolboxTestBlocksInit !== 'undefined') {
@@ -460,130 +447,6 @@ var spaghettiXml = [
     'next': { }
   });
 
-
-Blockly.Blocks['lists_create_with_json'] = {
-  /**
-   * Block for creating a list with any number of elements of any type.
-   * @this {Blockly.Block}
-   */
-  init: function() {
-    this.setHelpUrl(Blockly.Msg['LISTS_CREATE_WITH_HELPURL']);
-    this.setStyle('list_blocks');
-    this.itemCount_ = 3;
-    this.updateShape_();
-    this.setOutput(true, 'Array');
-    this.setMutator(new Blockly.Mutator(['lists_create_with_item']));
-    this.setTooltip(Blockly.Msg['LISTS_CREATE_WITH_TOOLTIP']);
-  },
-  /**
-   * Returns the state of this block as a JSON serializable object.
-   * @return {{itemCount: number}} The state of this block, ie the item count.
-   */
-  saveExtraState: function() {
-    return {
-      'itemCount': this.itemCount_,
-    };
-  },
-  /**
-   * Applies the given state to this block.
-   * @param {*} state The state to apply to this block, ie the item count.
-   */
-  loadExtraState: function(state) {
-    this.itemCount_ = state['itemCount'];
-    this.updateShape_();
-  },
-  /**
-   * Populate the mutator's dialog with this block's components.
-   * @param {!Blockly.Workspace} workspace Mutator's workspace.
-   * @return {!Blockly.Block} Root block in mutator.
-   * @this {Blockly.Block}
-   */
-  decompose: function(workspace) {
-    var containerBlock = workspace.newBlock('lists_create_with_container');
-    containerBlock.initSvg();
-    var connection = containerBlock.getInput('STACK').connection;
-    for (var i = 0; i < this.itemCount_; i++) {
-      var itemBlock = workspace.newBlock('lists_create_with_item');
-      itemBlock.initSvg();
-      connection.connect(itemBlock.previousConnection);
-      connection = itemBlock.nextConnection;
-    }
-    return containerBlock;
-  },
-  /**
-   * Reconfigure this block based on the mutator dialog's components.
-   * @param {!Blockly.Block} containerBlock Root block in mutator.
-   * @this {Blockly.Block}
-   */
-  compose: function(containerBlock) {
-    var itemBlock = containerBlock.getInputTargetBlock('STACK');
-    // Count number of inputs.
-    var connections = [];
-    while (itemBlock && !itemBlock.isInsertionMarker()) {
-      connections.push(itemBlock.valueConnection_);
-      itemBlock = itemBlock.nextConnection &&
-          itemBlock.nextConnection.targetBlock();
-    }
-    // Disconnect any children that don't belong.
-    for (var i = 0; i < this.itemCount_; i++) {
-      var connection = this.getInput('ADD' + i).connection.targetConnection;
-      if (connection && connections.indexOf(connection) == -1) {
-        connection.disconnect();
-      }
-    }
-    this.itemCount_ = connections.length;
-    this.updateShape_();
-    // Reconnect any child blocks.
-    for (var i = 0; i < this.itemCount_; i++) {
-      Blockly.Mutator.reconnect(connections[i], this, 'ADD' + i);
-    }
-  },
-  /**
-   * Store pointers to any connected child blocks.
-   * @param {!Blockly.Block} containerBlock Root block in mutator.
-   * @this {Blockly.Block}
-   */
-  saveConnections: function(containerBlock) {
-    var itemBlock = containerBlock.getInputTargetBlock('STACK');
-    var i = 0;
-    while (itemBlock) {
-      var input = this.getInput('ADD' + i);
-      itemBlock.valueConnection_ = input && input.connection.targetConnection;
-      i++;
-      itemBlock = itemBlock.nextConnection &&
-          itemBlock.nextConnection.targetBlock();
-    }
-  },
-  /**
-   * Modify this block to have the correct number of inputs.
-   * @private
-   * @this {Blockly.Block}
-   */
-  updateShape_: function() {
-    if (this.itemCount_ && this.getInput('EMPTY')) {
-      this.removeInput('EMPTY');
-    } else if (!this.itemCount_ && !this.getInput('EMPTY')) {
-      this.appendDummyInput('EMPTY')
-          .appendField(Blockly.Msg['LISTS_CREATE_EMPTY_TITLE']);
-    }
-    // Add new inputs.
-    for (var i = 0; i < this.itemCount_; i++) {
-      if (!this.getInput('ADD' + i)) {
-        var input = this.appendValueInput('ADD' + i)
-            .setAlign(Blockly.ALIGN_RIGHT);
-        if (i == 0) {
-          input.appendField(Blockly.Msg['LISTS_CREATE_WITH_INPUT_WITH']);
-        }
-      }
-    }
-    // Remove deleted inputs.
-    while (this.getInput('ADD' + i)) {
-      this.removeInput('ADD' + i);
-      i++;
-    }
-  }
-};
-
 </script>
 
 <style>
@@ -1059,8 +922,6 @@ Blockly.Blocks['lists_create_with_json'] = {
     <sep></sep>
     <category name="Variables" categorystyle="variable_category" custom="VARIABLE"></category>
     <category name="Functions" categorystyle="procedure_category" custom="PROCEDURE"></category>
-    <sep></sep>
-    <category name="JSON" categorystyle="procedure_category" custom="JSON"></category>
   </xml>
 
   <!-- toolbox-categories-typed-variables has a category menu and an

From 17f9f4f6896b8faa2e928b7a86bdb698fb7f62fa Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Mon, 6 Sep 2021 20:29:10 +0000
Subject: [PATCH 788/833] fix: loading blocks in RTL

---
 core/serialization/blocks.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index 20633a302..a3ee95acf 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -399,8 +399,12 @@ const loadPrivate = function(
  * @param {!State} state The state object to reference.
  */
 const loadCoords = function(block, state) {
-  const x = state['x'] === undefined ? 0 : state['x'];
+  let x = state['x'] === undefined ? 0 : state['x'];
   const y = state['y'] === undefined ? 0 : state['y'];
+
+  const workspace = block.workspace;
+  x = workspace.RTL ? workspace.getWidth() - x : x;
+
   block.moveBy(x, y);
 };
 

From 84514efb0937463b76ae18eb3a2204e5f363e241 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Thu, 9 Sep 2021 20:48:38 +0000
Subject: [PATCH 789/833] fix: create and delete events, and the trashcan
 (#5425)

* fix: create and delete events with JSON serialization

* fix: trashcan with JSON serialization

* fix: build

* fix: tests

* fix: PR comments

* fix: types

* fix: tests
---
 core/events/events_block_create.js      |  21 +--
 core/events/events_block_delete.js      |  30 +++--
 core/trashcan.js                        | 100 +++++++-------
 tests/deps.js                           |   6 +-
 tests/deps.mocha.js                     |   6 +-
 tests/mocha/event_test.js               | 122 +++++++++++++----
 tests/mocha/jso_deserialization_test.js |   6 +-
 tests/mocha/test_helpers.js             |  16 +--
 tests/mocha/trashcan_test.js            | 168 +++++++++++-------------
 9 files changed, 274 insertions(+), 201 deletions(-)

diff --git a/core/events/events_block_create.js b/core/events/events_block_create.js
index 2a6afb003..67afa5485 100644
--- a/core/events/events_block_create.js
+++ b/core/events/events_block_create.js
@@ -18,9 +18,9 @@ const Block = goog.requireType('Blockly.Block');
 const BlockBase = goog.require('Blockly.Events.BlockBase');
 const Events = goog.require('Blockly.Events');
 const Xml = goog.require('Blockly.Xml');
+const blocks = goog.require('Blockly.serialization.blocks');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
-const xml = goog.require('Blockly.utils.xml');
 
 
 /**
@@ -40,12 +40,15 @@ const BlockCreate = function(opt_block) {
     this.recordUndo = false;
   }
 
-  if (opt_block.workspace.rendered) {
-    this.xml = Xml.blockToDomWithXY(opt_block);
-  } else {
-    this.xml = Xml.blockToDom(opt_block);
-  }
+  this.xml = Xml.blockToDomWithXY(opt_block);
   this.ids = Events.getDescendantIds(opt_block);
+
+  /**
+   * JSON representation of the block that was just created.
+   * @type {!blocks.State}
+   */
+  this.json = /** @type {!blocks.State} */ (blocks.save(
+      opt_block, {addCoordinates: true}));
 };
 object.inherits(BlockCreate, BlockBase);
 
@@ -63,6 +66,7 @@ BlockCreate.prototype.toJson = function() {
   const json = BlockCreate.superClass_.toJson.call(this);
   json['xml'] = Xml.domToText(this.xml);
   json['ids'] = this.ids;
+  json['json'] = this.json;
   if (!this.recordUndo) {
     json['recordUndo'] = this.recordUndo;
   }
@@ -77,6 +81,7 @@ BlockCreate.prototype.fromJson = function(json) {
   BlockCreate.superClass_.fromJson.call(this, json);
   this.xml = Xml.textToDom(json['xml']);
   this.ids = json['ids'];
+  this.json = /** @type {!blocks.State} */ (json['json']);
   if (json['recordUndo'] !== undefined) {
     this.recordUndo = json['recordUndo'];
   }
@@ -89,9 +94,7 @@ BlockCreate.prototype.fromJson = function(json) {
 BlockCreate.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   if (forward) {
-    const xmlEl = xml.createElement('xml');
-    xmlEl.appendChild(this.xml);
-    Xml.domToWorkspace(xmlEl, workspace);
+    blocks.load(this.json, workspace);
   } else {
     for (let i = 0; i < this.ids.length; i++) {
       const id = this.ids[i];
diff --git a/core/events/events_block_delete.js b/core/events/events_block_delete.js
index f44caa7f0..7ab770a0b 100644
--- a/core/events/events_block_delete.js
+++ b/core/events/events_block_delete.js
@@ -18,9 +18,9 @@ const Block = goog.requireType('Blockly.Block');
 const BlockBase = goog.require('Blockly.Events.BlockBase');
 const Events = goog.require('Blockly.Events');
 const Xml = goog.require('Blockly.Xml');
+const blocks = goog.require('Blockly.serialization.blocks');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
-const xml = goog.require('Blockly.utils.xml');
 
 
 /**
@@ -43,12 +43,21 @@ const BlockDelete = function(opt_block) {
     this.recordUndo = false;
   }
 
-  if (opt_block.workspace.rendered) {
-    this.oldXml = Xml.blockToDomWithXY(opt_block);
-  } else {
-    this.oldXml = Xml.blockToDom(opt_block);
-  }
+  this.oldXml = Xml.blockToDomWithXY(opt_block);
   this.ids = Events.getDescendantIds(opt_block);
+
+  /**
+   * Was the block that was just deleted a shadow?
+   * @type {boolean}
+   */
+  this.wasShadow = opt_block.isShadow();
+
+  /**
+   * JSON representation of the block that was just deleted.
+   * @type {!blocks.State}
+   */
+  this.oldJson = /** @type {!blocks.State} */ (blocks.save(
+      opt_block, {addCoordinates: true}));
 };
 object.inherits(BlockDelete, BlockBase);
 
@@ -66,6 +75,8 @@ BlockDelete.prototype.toJson = function() {
   const json = BlockDelete.superClass_.toJson.call(this);
   json['oldXml'] = Xml.domToText(this.oldXml);
   json['ids'] = this.ids;
+  json['wasShadow'] = this.wasShadow;
+  json['oldJson'] = this.oldJson;
   if (!this.recordUndo) {
     json['recordUndo'] = this.recordUndo;
   }
@@ -80,6 +91,9 @@ BlockDelete.prototype.fromJson = function(json) {
   BlockDelete.superClass_.fromJson.call(this, json);
   this.oldXml = Xml.textToDom(json['oldXml']);
   this.ids = json['ids'];
+  this.wasShadow =
+    json['wasShadow'] || this.oldXml.tagName.toLowerCase() == 'shadow';
+  this.oldJson = /** @type {!blocks.State} */ (json['oldJson']);
   if (json['recordUndo'] !== undefined) {
     this.recordUndo = json['recordUndo'];
   }
@@ -103,9 +117,7 @@ BlockDelete.prototype.run = function(forward) {
       }
     }
   } else {
-    const xmlEl = xml.createElement('xml');
-    xmlEl.appendChild(this.oldXml);
-    Xml.domToWorkspace(xmlEl, workspace);
+    blocks.load(this.oldJson, workspace);
   }
 };
 
diff --git a/core/trashcan.js b/core/trashcan.js
index d34cd0803..b68f67e95 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -36,7 +36,8 @@ 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');
-const Xml = goog.require('Blockly.Xml');
+/* eslint-disable-next-line no-unused-vars */
+const blocks = goog.requireType('Blockly.serialization.blocks');
 const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
 const internalConstants = goog.require('Blockly.internalConstants');
@@ -73,7 +74,7 @@ const Trashcan = function(workspace) {
   this.id = 'trashcan';
 
   /**
-   * A list of XML (stored as strings) representing blocks in the trashcan.
+   * A list of JSON (stored as strings) representing blocks in the trashcan.
    * @type {!Array<string>}
    * @private
    */
@@ -393,8 +394,10 @@ Trashcan.prototype.openFlyout = function() {
   if (this.contentsIsOpen()) {
     return;
   }
-  const xml = this.contents_.map(Xml.textToDom);
-  this.flyout.show(xml);
+  const contents = this.contents_.map(function(string) {
+    return JSON.parse(string);
+  });
+  this.flyout.show(contents);
   this.fireUiEvent_(true);
 };
 
@@ -669,14 +672,12 @@ Trashcan.prototype.onDelete_ = function(event) {
   if (this.workspace_.options.maxTrashcanContents <= 0) {
     return;
   }
-  // Must check that the tagName exists since oldXml can be a DocumentFragment.
-  if (event.type == Events.BLOCK_DELETE && event.oldXml.tagName &&
-      event.oldXml.tagName.toLowerCase() != 'shadow') {
-    const cleanedXML = this.cleanBlockXML_(event.oldXml);
-    if (this.contents_.indexOf(cleanedXML) != -1) {
+  if (event.type == Events.BLOCK_DELETE && !event.wasShadow) {
+    const cleanedJson = this.cleanBlockJson_(event.oldJson);
+    if (this.contents_.indexOf(cleanedJson) != -1) {
       return;
     }
-    this.contents_.unshift(cleanedXML);
+    this.contents_.unshift(cleanedJson);
     while (this.contents_.length >
            this.workspace_.options.maxTrashcanContents) {
       this.contents_.pop();
@@ -687,52 +688,51 @@ Trashcan.prototype.onDelete_ = function(event) {
 };
 
 /**
- * Converts XML representing a block into text that can be stored in the
- *    content array.
- * @param {!Element} xml An XML tree defining the block and any
- *    connected child blocks.
- * @return {string} Text representing the XML tree, cleaned of all unnecessary
- * attributes.
+ * Converts JSON representing a block into text that can be stored in the
+ * content array.
+ * @param {!blocks.State} json A JSON representation of
+ *     a block's state.
+ * @return {string} Text representing the JSON, cleaned of all unnecessary
+ *     attributes.
  * @private
  */
-Trashcan.prototype.cleanBlockXML_ = function(xml) {
-  const xmlBlock = xml.cloneNode(true);
-  let node = xmlBlock;
-  while (node) {
-    // Things like text inside tags are still treated as nodes, but they
-    // don't have attributes (or the removeAttribute function) so we can
-    // skip removing attributes from them.
-    if (node.removeAttribute) {
-      node.removeAttribute('x');
-      node.removeAttribute('y');
-      node.removeAttribute('id');
-      node.removeAttribute('disabled');
-      if (node.nodeName == 'comment') {  // Future proof just in case.
-        node.removeAttribute('h');
-        node.removeAttribute('w');
-        node.removeAttribute('pinned');
-      }
+Trashcan.prototype.cleanBlockJson_ = function(json) {
+  // Create a deep copy.
+  json = /** @type {!blocks.State} */(JSON.parse(JSON.stringify(json)));
+
+  function cleanRec(json) {
+    if (!json) {
+      return;
     }
 
-    // Try to go down the tree
-    let nextNode = node.firstChild || node.nextSibling;
-    // If we can't go down, try to go back up the tree.
-    if (!nextNode) {
-      nextNode = node.parentNode;
-      while (nextNode) {
-        // We are valid again!
-        if (nextNode.nextSibling) {
-          nextNode = nextNode.nextSibling;
-          break;
-        }
-        // Try going up again. If parentNode is null that means we have
-        // reached the top, and we will break out of both loops.
-        nextNode = nextNode.parentNode;
-      }
+    delete json['id'];
+    delete json['x'];
+    delete json['y'];
+    delete json['enabled'];
+
+    if (json['icons'] && json['icons']['comment']) {
+      const comment = json['icons']['comment'];
+      delete comment['height'];
+      delete comment['width'];
+      delete comment['pinned'];
+    }
+
+    const inputs = json['inputs'];
+    for (var name in inputs) {
+      const input = inputs[name];
+      cleanRec(input['block']);
+      cleanRec(input['shadow']);
+    }
+    if (json['next']) {
+      const next = json['next'];
+      cleanRec(next['block']);
+      cleanRec(next['shadow']);
     }
-    node = nextNode;
   }
-  return Xml.domToText(xmlBlock);
+
+  cleanRec(json);
+  json['kind'] = 'BLOCK';
+  return JSON.stringify(json);
 };
 
 exports = Trashcan;
diff --git a/tests/deps.js b/tests/deps.js
index 782703700..711a49591 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -40,8 +40,8 @@ goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.
 goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.BlockBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -217,7 +217,7 @@ goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem']
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], ['Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 134e87152..2dc83a1de 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -40,8 +40,8 @@ goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.
 goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.BlockBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -217,7 +217,7 @@ goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem']
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], ['Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/event_test.js b/tests/mocha/event_test.js
index 499ab6b47..c0f1711e8 100644
--- a/tests/mocha/event_test.js
+++ b/tests/mocha/event_test.js
@@ -437,48 +437,118 @@ suite('Events', function() {
           viewLeft: 0, scale: 1.2, oldScale: 1})},
     ];
     var blockEventTestCases = [
-      {title: 'Block change', class: Blockly.Events.BlockChange,
+      {
+        title: 'Block change',
+        class: Blockly.Events.BlockChange,
         getArgs: (thisObj) => [thisObj.block, 'collapsed', null, false, true],
-        getExpectedJson: (thisObj) => ({type: 'change',
-          blockId: thisObj.block.id, element: 'collapsed', oldValue: false,
-          newValue: true})},
-      {title: 'Block create', class: Blockly.Events.BlockCreate,
+        getExpectedJson: (thisObj) => ({
+          type: 'change',
+          blockId: thisObj.block.id,
+          element: 'collapsed',
+          oldValue: false,
+          newValue: true
+        })
+      },
+      {
+        title: 'Block create',
+        class: Blockly.Events.BlockCreate,
         getArgs: (thisObj) => [thisObj.block],
-        getExpectedJson: (thisObj) => ({type: 'create',
+        getExpectedJson: (thisObj) => ({
+          type: 'create',
           blockId: thisObj.block.id,
           xml: '<block xmlns="https://developers.google.com/blockly/xml"' +
-              ' type="simple_test_block" id="testBlockId1"></block>',
-          ids: [thisObj.block.id]})},
-      {title: 'Block create (shadow)', class: Blockly.Events.BlockCreate,
+              ' type="simple_test_block" id="testBlockId1" x="0" y="0">' +
+              '</block>',
+          ids: [thisObj.block.id],
+          json: {
+            'type': 'simple_test_block',
+            'id': 'testBlockId1',
+            'x': 0,
+            'y': 0,
+          },
+        })
+      },
+      {
+        title: 'Block create (shadow)',
+        class: Blockly.Events.BlockCreate,
         getArgs: (thisObj) => [thisObj.shadowBlock],
-        getExpectedJson: (thisObj) => ({type: 'create',
+        getExpectedJson: (thisObj) => ({
+          type: 'create',
           blockId: thisObj.shadowBlock.id,
           xml: '<shadow xmlns="https://developers.google.com/blockly/xml"' +
-              ' type="simple_test_block" id="testBlockId2"></shadow>',
-          ids: [thisObj.shadowBlock.id], recordUndo: false})},
-      {title: 'Block delete', class: Blockly.Events.BlockDelete,
+              ' type="simple_test_block" id="testBlockId2" x="0" y="0">' +
+              '</shadow>',
+          ids: [thisObj.shadowBlock.id],
+          json: {
+            'type': 'simple_test_block',
+            'id': 'testBlockId2',
+            'x': 0,
+            'y': 0,
+          },
+          recordUndo: false
+        })
+      },
+      {
+        title: 'Block delete',
+        class: Blockly.Events.BlockDelete,
         getArgs: (thisObj) => [thisObj.block],
-        getExpectedJson: (thisObj) => ({type: 'delete',
+        getExpectedJson: (thisObj) => ({
+          type: 'delete',
           blockId: thisObj.block.id,
           oldXml: '<block xmlns="https://developers.google.com/blockly/xml"' +
-              ' type="simple_test_block" id="testBlockId1"></block>',
-          ids: [thisObj.block.id]})},
-      {title: 'Block delete (shadow)', class: Blockly.Events.BlockDelete,
+              ' type="simple_test_block" id="testBlockId1" x="0" y="0">' +
+              '</block>',
+          ids: [thisObj.block.id],
+          wasShadow: false,
+          oldJson: {
+            'type': 'simple_test_block',
+            'id': 'testBlockId1',
+            'x': 0,
+            'y': 0,
+          },
+        })
+      },
+      {
+        title: 'Block delete (shadow)',
+        class: Blockly.Events.BlockDelete,
         getArgs: (thisObj) => [thisObj.shadowBlock],
-        getExpectedJson: (thisObj) => ({type: 'delete',
+        getExpectedJson: (thisObj) => ({
+          type: 'delete',
           blockId: thisObj.shadowBlock.id,
           oldXml: '<shadow xmlns="https://developers.google.com/blockly/xml"' +
-              ' type="simple_test_block" id="testBlockId2"></shadow>',
-          ids: [thisObj.shadowBlock.id], recordUndo: false})},
+              ' type="simple_test_block" id="testBlockId2" x="0" y="0">' +
+              '</shadow>',
+          ids: [thisObj.shadowBlock.id],
+          wasShadow: true,
+          oldJson: {
+            'type': 'simple_test_block',
+            'id': 'testBlockId2',
+            'x': 0,
+            'y': 0,
+          },
+          recordUndo: false
+        })
+      },
       // TODO(#4577) Test serialization of move event coordinate properties.
-      {title: 'Block move', class: Blockly.Events.BlockMove,
+      {
+        title: 'Block move',
+        class: Blockly.Events.BlockMove,
         getArgs: (thisObj) => [thisObj.block],
-        getExpectedJson: (thisObj) => ({type: 'move',
-          blockId: thisObj.block.id})},
-      {title: 'Block move (shadow)', class: Blockly.Events.BlockMove,
+        getExpectedJson: (thisObj) => ({
+          type: 'move',
+          blockId: thisObj.block.id
+        })
+      },
+      {
+        title: 'Block move (shadow)',
+        class: Blockly.Events.BlockMove,
         getArgs: (thisObj) => [thisObj.shadowBlock],
-        getExpectedJson: (thisObj) => ({type: 'move',
-          blockId: thisObj.shadowBlock.id, recordUndo: false})},
+        getExpectedJson: (thisObj) => ({
+          type: 'move',
+          blockId: thisObj.shadowBlock.id,
+          recordUndo: false
+        })
+      },
     ];
     var workspaceEventTestCases = [
       {title: 'Finished Loading', class: Blockly.Events.FinishedLoading,
diff --git a/tests/mocha/jso_deserialization_test.js b/tests/mocha/jso_deserialization_test.js
index 0ec532062..d554af810 100644
--- a/tests/mocha/jso_deserialization_test.js
+++ b/tests/mocha/jso_deserialization_test.js
@@ -689,7 +689,11 @@ suite('JSO Deserialization', function() {
       Blockly.Blocks['test_block'] = {
         init: function() { },
 
-        mutationToDom: function() { },
+        mutationToDom: function() {
+          var container = Blockly.utils.xml.createElement('mutation');
+          container.setAttribute('value', 'some value');
+          return container;
+        },
 
         domToMutation: function(element) {
           this.someProperty = element.getAttribute('value');
diff --git a/tests/mocha/test_helpers.js b/tests/mocha/test_helpers.js
index b93ccd368..fe726d19f 100644
--- a/tests/mocha/test_helpers.js
+++ b/tests/mocha/test_helpers.js
@@ -481,9 +481,9 @@ function assertNthCallEventArgEquals(spy, n, instanceType, expectedProperties,
 }
 exports.assertNthCallEventArgEquals = assertNthCallEventArgEquals;
 
-function defineStackBlock() {
+function defineStackBlock(name = 'stack_block') {
   Blockly.defineBlocksWithJsonArray([{
-    "type": "stack_block",
+    "type": name,
     "message0": "",
     "previousStatement": null,
     "nextStatement": null
@@ -491,9 +491,9 @@ function defineStackBlock() {
 }
 exports.defineStackBlock = defineStackBlock;
 
-function defineRowBlock() {
+function defineRowBlock(name = 'row_block') {
   Blockly.defineBlocksWithJsonArray([{
-    "type": "row_block",
+    "type": name,
     "message0": "%1",
     "args0": [
       {
@@ -506,9 +506,9 @@ function defineRowBlock() {
 }
 exports.defineRowBlock = defineRowBlock;
 
-function defineStatementBlock() {
+function defineStatementBlock(name = 'statement_block') {
   Blockly.defineBlocksWithJsonArray([{
-    "type": "statement_block",
+    "type": name,
     "message0": "%1",
     "args0": [
       {
@@ -525,9 +525,9 @@ function defineStatementBlock() {
 }
 exports.defineStatementBlock = defineStatementBlock;
 
-function defineBasicBlockWithField() {
+function defineBasicBlockWithField(name = 'test_field_block') {
   Blockly.defineBlocksWithJsonArray([{
-    "type": "test_field_block",
+    "type": name,
     "message0": "%1",
     "args0": [
       {
diff --git a/tests/mocha/trashcan_test.js b/tests/mocha/trashcan_test.js
index b8641292b..d7373235b 100644
--- a/tests/mocha/trashcan_test.js
+++ b/tests/mocha/trashcan_test.js
@@ -6,7 +6,7 @@
 
 goog.module('Blockly.test.trashcan');
 
-const {assertEventFired, assertEventNotFired, sharedTestSetup, sharedTestTeardown, simulateClick} = goog.require('Blockly.test.helpers');
+const {assertEventFired, assertEventNotFired, defineBasicBlockWithField, defineRowBlock, defineStatementBlock, defineStackBlock, defineMutatorBlocks, sharedTestSetup, sharedTestTeardown, simulateClick} = goog.require('Blockly.test.helpers');
 
 
 suite("Trashcan", function() {
@@ -15,14 +15,13 @@ suite("Trashcan", function() {
         '<xml xmlns="https://developers.google.com/blockly/xml">' +
         xmlString + '</xml>');
     xml = xml.children[0];
-    var event = new Blockly.Events.BlockDelete();
-    event.oldXml = xml;
-    event.workspaceId = workspace.id;
+    var block = Blockly.Xml.domToBlock(xml, workspace);
+    var event = new Blockly.Events.BlockDelete(block);
     Blockly.Events.fire(event);
   }
   function fireNonDeleteEvent(workspace, oldXml) {
     var event = new Blockly.Events.Abstract();
-    event.type = 'dummy_type';
+    event.type = 'test_field_block';
     event.workspaceId = workspace.id;
     if (oldXml) {
       event.oldXml = oldXml;
@@ -32,17 +31,27 @@ suite("Trashcan", function() {
 
   setup(function() {
     sharedTestSetup.call(this);
+    defineBasicBlockWithField();
+    defineRowBlock();
+    defineRowBlock('row_block2');
+    defineStatementBlock();
+    defineStatementBlock('statement_block2');
+    defineStackBlock();
+    defineStackBlock('stack_block2');
+    defineMutatorBlocks();
     this.workspace = Blockly.inject('blocklyDiv',
         {'trashcan': true, 'maxTrashcanContents': Infinity});
     this.trashcan = this.workspace.trashcan;
   });
   teardown(function() {
     sharedTestTeardown.call(this);
+    Blockly.Extensions.unregister('xml_mutator');
+    Blockly.Extensions.unregister('jso_mutator');
   });
 
   suite("Events", function() {
     test("Delete", function() {
-      fireDeleteEvent(this.workspace, '<block type="dummy_type"/>');
+      fireDeleteEvent(this.workspace, '<block type="test_field_block"/>');
       chai.assert.equal(this.trashcan.contents_.length, 1);
     });
     test("Non-Delete", function() {
@@ -52,7 +61,7 @@ suite("Trashcan", function() {
     test("Non-Delete w/ oldXml", function() {
       var xml = Blockly.Xml.textToDom(
           '<xml xmlns="https://developers.google.com/blockly/xml">' +
-          '  <block type="dummy_type"/>' +
+          '  <block type="test_field_block"/>' +
           '</xml>'
       );
       xml = xml.children[0];
@@ -60,7 +69,7 @@ suite("Trashcan", function() {
       chai.assert.equal(this.trashcan.contents_.length, 0);
     });
     test("Shadow Delete", function() {
-      fireDeleteEvent(this.workspace, '<shadow type="dummy_type"/>');
+      fireDeleteEvent(this.workspace, '<shadow type="test_field_block"/>');
       chai.assert.equal(this.trashcan.contents_.length, 0);
     });
     test("Click without contents - fires workspace click", function() {
@@ -73,7 +82,7 @@ suite("Trashcan", function() {
           this.workspace.id, null);
     });
     test("Click with contents - fires trashcanOpen", function() {
-      fireDeleteEvent(this.workspace, '<block type="dummy_type"/>');
+      fireDeleteEvent(this.workspace, '<block type="test_field_block"/>');
       chai.assert.equal(this.trashcan.contents_.length, 1);
       // Stub flyout interaction.
       var showFlyoutStub = sinon.stub(this.trashcan.flyout, "show");
@@ -107,56 +116,52 @@ suite("Trashcan", function() {
   });
   suite("Unique Contents", function() {
     test("Simple", function() {
-      fireDeleteEvent(this.workspace, '<block type="dummy_type"/>');
-      fireDeleteEvent(this.workspace, '<block type="dummy_type"/>');
+      fireDeleteEvent(this.workspace, '<block type="test_field_block"/>');
+      fireDeleteEvent(this.workspace, '<block type="test_field_block"/>');
       chai.assert.equal(this.trashcan.contents_.length, 1);
     });
     test("Different Coords", function() {
-      fireDeleteEvent(this.workspace, '<block type="dummy_type" x="10" y="10"/>');
-      fireDeleteEvent(this.workspace, '<block type="dummy_type" x="20" y="20"/>');
+      fireDeleteEvent(
+          this.workspace, '<block type="test_field_block" x="10" y="10"/>');
+      fireDeleteEvent(
+          this.workspace, '<block type="test_field_block" x="20" y="20"/>');
       chai.assert.equal(this.trashcan.contents_.length, 1);
     });
     test("Different IDs", function() {
-      fireDeleteEvent(this.workspace, '<block type="dummy_type" id="id1"/>');
-      fireDeleteEvent(this.workspace, '<block type="dummy_type" id="id2"/>');
+      fireDeleteEvent(
+          this.workspace, '<block type="test_field_block" id="id1"/>');
+      fireDeleteEvent(
+          this.workspace, '<block type="test_field_block" id="id2"/>');
       chai.assert.equal(this.trashcan.contents_.length, 1);
     });
     test("No Disabled - Disabled True", function() {
-      fireDeleteEvent(this.workspace, '<block type="dummy_type"/>');
-      fireDeleteEvent(this.workspace, '<block type="dummy_type" disabled="true"/>');
+      fireDeleteEvent(
+          this.workspace, '<block type="test_field_block"/>');
+      fireDeleteEvent(
+          this.workspace, '<block type="test_field_block" disabled="true"/>');
       // Disabled tags get removed because disabled blocks aren't allowed to
       // be dragged from flyouts. See #2239 and #3243.
       chai.assert.equal(this.trashcan.contents_.length, 1);
     });
-    test("No Editable - Editable False", function() {
-      fireDeleteEvent(this.workspace, '<block type="dummy_type"/>');
-      fireDeleteEvent(this.workspace, '<block type="dummy_type" editable="false"/>');
-      chai.assert.equal(this.trashcan.contents_.length, 2);
-    });
-    test("No Movable - Movable False", function() {
-      fireDeleteEvent(this.workspace, '<block type="dummy_type"/>');
-      fireDeleteEvent(this.workspace, '<block type="dummy_type" movable="false"/>');
-      chai.assert.equal(this.trashcan.contents_.length, 2);
-    });
     test("Different Field Values", function() {
       fireDeleteEvent(this.workspace,
-          '<block type="dummy_type">' +
-          '  <field name="dummy_name">dummy_value1</field>' +
+          '<block type="test_field_block">' +
+          '  <field name="NAME">dummy_value1</field>' +
           '</block>'
       );
       fireDeleteEvent(this.workspace,
-          '<block type="dummy_type">' +
-          '  <field name="dummy_name">dummy_value2</field>' +
+          '<block type="test_field_block">' +
+          '  <field name="NAME">dummy_value2</field>' +
           '</block>'
       );
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
     test("No Values - Values", function() {
-      fireDeleteEvent(this.workspace, '<block type="dummy_type"/>');
+      fireDeleteEvent(this.workspace, '<block type="row_block"/>');
       fireDeleteEvent(this.workspace,
-          '<block type="dummy_type">' +
-          '  <value name="dummy_input">' +
-          '    <block type="dummy_type"/>' +
+          '<block type="row_block">' +
+          '  <value name="INPUT">' +
+          '    <block type="row_block"/>' +
           '  </value>' +
           '</block>'
       );
@@ -164,27 +169,27 @@ suite("Trashcan", function() {
     });
     test("Different Value Blocks", function() {
       fireDeleteEvent(this.workspace,
-          '<block type="dummy_type">' +
-          '  <value name="dummy_input">' +
-          '    <block type="dummy_type1"/>' +
+          '<block type="row_block">' +
+          '  <value name="INPUT">' +
+          '    <block type="row_block"/>' +
           '  </value>' +
           '</block>'
       );
       fireDeleteEvent(this.workspace,
-          '<block type="dummy_type">' +
-          '  <value name="dummy_input">' +
-          '    <block type="dummy_type2"/>' +
+          '<block type="row_block">' +
+          '  <value name="INPUT">' +
+          '    <block type="row_block2"/>' +
           '  </value>' +
           '</block>'
       );
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
     test("No Statements - Statements", function() {
-      fireDeleteEvent(this.workspace, '<block type="dummy_type"/>');
+      fireDeleteEvent(this.workspace, '<block type="statement_block"/>');
       fireDeleteEvent(this.workspace,
-          '<block type="dummy_type">' +
-          '  <statement name="dummy_input">' +
-          '    <block type="dummy_type"/>' +
+          '<block type="statement_block">' +
+          '  <statement name="NAME">' +
+          '    <block type="statement_block"/>' +
           '  </statement>' +
           '</block>'
       );
@@ -192,27 +197,27 @@ suite("Trashcan", function() {
     });
     test("Different Statement Blocks", function() {
       fireDeleteEvent(this.workspace,
-          '<block type="dummy_type">' +
-          '  <statement name="dummy_input">' +
-          '    <block type="dummy_type1"/>' +
+          '<block type="statement_block">' +
+          '  <statement name="NAME">' +
+          '    <block type="statement_block"/>' +
           '  </statement>' +
           '</block>'
       );
       fireDeleteEvent(this.workspace,
-          '<block type="dummy_type">' +
-          '  <statement name="dummy_input">' +
-          '    <block type="dummy_type2"/>' +
+          '<block type="test_field_block">' +
+          '  <statement name="NAME">' +
+          '    <block type="statement_block2"/>' +
           '  </statement>' +
           '</block>'
       );
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
     test("No Next - Next", function() {
-      fireDeleteEvent(this.workspace, '<block type="dummy_type"/>');
+      fireDeleteEvent(this.workspace, '<block type="stack_block"/>');
       fireDeleteEvent(this.workspace,
-          '<block type="dummy_type">' +
+          '<block type="stack_block">' +
           '  <next>' +
-          '    <block type="dummy_type"/>' +
+          '    <block type="stack_block"/>' +
           '  </next>' +
           '</block>'
       );
@@ -220,25 +225,25 @@ suite("Trashcan", function() {
     });
     test("Different Next Blocks", function() {
       fireDeleteEvent(this.workspace,
-          '<block type="dummy_type">' +
+          '<block type="stack_block">' +
           '  <next>' +
-          '    <block type="dummy_type1"/>' +
+          '    <block type="stack_block"/>' +
           '  </next>' +
           '</block>'
       );
       fireDeleteEvent(this.workspace,
-          '<block type="dummy_type">' +
+          '<block type="stack_block">' +
           '  <next>' +
-          '    <block type="dummy_type2"/>' +
+          '    <block type="stack_block2"/>' +
           '  </next>' +
           '</block>'
       );
       chai.assert.equal(this.trashcan.contents_.length, 2);
     });
     test("No Comment - Comment", function() {
-      fireDeleteEvent(this.workspace, '<block type="dummy_type"/>');
+      fireDeleteEvent(this.workspace, '<block type="test_field_block"/>');
       fireDeleteEvent(this.workspace,
-          '<block type="dummy_type">' +
+          '<block type="test_field_block">' +
           '  <comment>comment_text</comment>' +
           '</block>'
       );
@@ -246,12 +251,12 @@ suite("Trashcan", function() {
     });
     test("Different Comment Text", function() {
       fireDeleteEvent(this.workspace,
-          '<block type="dummy_type">' +
+          '<block type="test_field_block">' +
           '  <comment>comment_text1</comment>' +
           '</block>'
       );
       fireDeleteEvent(this.workspace,
-          '<block type="dummy_type">' +
+          '<block type="test_field_block">' +
           '  <comment>comment_text2</comment>' +
           '</block>'
       );
@@ -259,12 +264,12 @@ suite("Trashcan", function() {
     });
     test("Different Comment Size", function() {
       fireDeleteEvent(this.workspace,
-          '<block type="dummy_type">' +
+          '<block type="test_field_block">' +
           '  <comment h="10" w="10">comment_text</comment>' +
           '</block>'
       );
       fireDeleteEvent(this.workspace,
-          '<block type="dummy_type">' +
+          '<block type="test_field_block">' +
           '  <comment h="20" w="20">comment_text</comment>' +
           '</block>'
       );
@@ -273,36 +278,27 @@ suite("Trashcan", function() {
     });
     test("Different Comment Pinned", function() {
       fireDeleteEvent(this.workspace,
-          '<block type="dummy_type">' +
+          '<block type="test_field_block">' +
           '  <comment pinned="false">comment_text</comment>' +
           '</block>'
       );
       fireDeleteEvent(this.workspace,
-          '<block type="dummy_type">' +
+          '<block type="test_field_block">' +
           '  <comment pinned="true">comment_text</comment>' +
           '</block>'
       );
       // pinned tags are removed b/c the blocks appear the same.
       chai.assert.equal(this.trashcan.contents_.length, 1);
     });
-    test("No Mutator - Mutator", function() {
-      fireDeleteEvent(this.workspace, '<block type="dummy_type"/>');
-      fireDeleteEvent(this.workspace,
-          '<block type="dummy_type">' +
-          '  <mutation dummy_attribute="dummy_value"></mutation>' +
-          '</block>'
-      );
-      chai.assert.equal(this.trashcan.contents_.length, 2);
-    });
     test("Different Mutator", function() {
       fireDeleteEvent(this.workspace,
-          '<block type="dummy_type">' +
-          '  <mutation dummy_attribute="dummy_value1"></mutation>' +
+          '<block type="xml_block">' +
+          '  <mutation hasInput="true"></mutation>' +
           '</block>'
       );
       fireDeleteEvent(this.workspace,
-          '<block type="dummy_type">' +
-          '  <mutation dummy_attribute="dummy_value2"></mutation>' +
+          '<block type="xml_block">' +
+          '  <mutation hasInputt="false"></mutation>' +
           '</block>'
       );
       chai.assert.equal(this.trashcan.contents_.length, 2);
@@ -312,22 +308,10 @@ suite("Trashcan", function() {
     test("Max 0", function() {
       this.workspace.options.maxTrashcanContents = 0;
       fireDeleteEvent(this.workspace,
-          '<block type="dummy_type"/>'
+          '<block type="test_field_block"/>'
       );
       chai.assert.equal(this.trashcan.contents_.length, 0);
       this.workspace.options.maxTrashcanContents = Infinity;
     });
-    test("Last In First Out", function() {
-      this.workspace.options.maxTrashcanContents = 1;
-      fireDeleteEvent(this.workspace, '<block type="dummy_type1"/>');
-      fireDeleteEvent(this.workspace, '<block type="dummy_type2"/>');
-      chai.assert.equal(this.trashcan.contents_.length, 1);
-      chai.assert.equal(
-          Blockly.Xml.textToDom(this.trashcan.contents_[0])
-              .getAttribute('type'),
-          'dummy_type2'
-      );
-      this.workspace.options.maxTrashcanContents = Infinity;
-    });
   });
 });

From ee221520a9d03ed5cbb55eb266f83145db93a3a6 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Fri, 10 Sep 2021 13:51:12 +0000
Subject: [PATCH 790/833] fix: update code demo to include JSON (#5444)

* fix: update code demo to include JSON

* fix: do property renames

* fix: change XML to place holder

* fix: PR comments
---
 demos/code/code.js          | 36 +++++++++++++++++++++++++++++++-----
 demos/code/index.html       |  3 +++
 demos/code/msg/ar.js        |  4 ++--
 demos/code/msg/be-tarask.js |  4 ++--
 demos/code/msg/br.js        |  4 ++--
 demos/code/msg/ca.js        |  4 ++--
 demos/code/msg/cs.js        |  4 ++--
 demos/code/msg/da.js        |  4 ++--
 demos/code/msg/de.js        |  4 ++--
 demos/code/msg/el.js        |  4 ++--
 demos/code/msg/en.js        |  4 ++--
 demos/code/msg/es.js        |  4 ++--
 demos/code/msg/et.js        |  4 ++--
 demos/code/msg/fa.js        |  4 ++--
 demos/code/msg/fr.js        |  4 ++--
 demos/code/msg/he.js        |  4 ++--
 demos/code/msg/hrx.js       |  4 ++--
 demos/code/msg/hu.js        |  4 ++--
 demos/code/msg/ia.js        |  4 ++--
 demos/code/msg/is.js        |  4 ++--
 demos/code/msg/it.js        |  4 ++--
 demos/code/msg/ja.js        |  4 ++--
 demos/code/msg/kab.js       |  4 ++--
 demos/code/msg/ko.js        |  4 ++--
 demos/code/msg/mk.js        |  4 ++--
 demos/code/msg/ms.js        |  4 ++--
 demos/code/msg/nb.js        |  4 ++--
 demos/code/msg/nl.js        |  4 ++--
 demos/code/msg/oc.js        |  4 ++--
 demos/code/msg/pl.js        |  4 ++--
 demos/code/msg/pms.js       |  4 ++--
 demos/code/msg/pt-br.js     |  4 ++--
 demos/code/msg/ro.js        |  4 ++--
 demos/code/msg/ru.js        |  4 ++--
 demos/code/msg/sc.js        |  4 ++--
 demos/code/msg/sk.js        |  4 ++--
 demos/code/msg/sr.js        |  4 ++--
 demos/code/msg/sv.js        |  4 ++--
 demos/code/msg/ta.js        |  4 ++--
 demos/code/msg/th.js        |  4 ++--
 demos/code/msg/tlh.js       |  4 ++--
 demos/code/msg/tr.js        |  4 ++--
 demos/code/msg/uk.js        |  4 ++--
 demos/code/msg/vi.js        |  4 ++--
 demos/code/msg/zh-hans.js   |  4 ++--
 demos/code/msg/zh-hant.js   |  4 ++--
 46 files changed, 122 insertions(+), 93 deletions(-)

diff --git a/demos/code/code.js b/demos/code/code.js
index b86020649..9ae4f792c 100644
--- a/demos/code/code.js
+++ b/demos/code/code.js
@@ -234,14 +234,16 @@ Code.LANG = Code.getLang();
  * List of tab names.
  * @private
  */
-Code.TABS_ = ['blocks', 'javascript', 'php', 'python', 'dart', 'lua', 'xml'];
+Code.TABS_ = [
+  'blocks', 'javascript', 'php', 'python', 'dart', 'lua', 'xml', 'json'
+];
 
 /**
  * List of tab names with casing, for display in the UI.
  * @private
  */
 Code.TABS_DISPLAY_ = [
-  'Blocks', 'JavaScript', 'PHP', 'Python', 'Dart', 'Lua', 'XML',
+  'Blocks', 'JavaScript', 'PHP', 'Python', 'Dart', 'Lua', 'XML', 'JSON'
 ];
 
 Code.selected = 'blocks';
@@ -259,8 +261,8 @@ Code.tabClick = function(clickedName) {
     try {
       xmlDom = Blockly.Xml.textToDom(xmlText);
     } catch (e) {
-      var q =
-          window.confirm(MSG['badXml'].replace('%1', e));
+      var q = window.confirm(
+          MSG['parseError'].replace(/%1/g, 'XML').replace('%2', e));
       if (!q) {
         // Leave the user on the XML tab.
         return;
@@ -272,6 +274,25 @@ Code.tabClick = function(clickedName) {
     }
   }
 
+  if (document.getElementById('tab_json').classList.contains('tabon')) {
+    var jsonTextarea = document.getElementById('content_json');
+    var jsonText = jsonTextarea.value;
+    var json = null;
+    try {
+      json = JSON.parse(jsonText);
+    } catch (e) {
+      var q = window.confirm(
+          MSG['parseError'].replace(/%1/g, 'JSON').replace('%2', e));
+      if (!q) {
+        // Leave the user on the JSON tab.
+        return;
+      }
+    }
+    if (json) {
+      Blockly.serialization.workspaces.load(json, Code.workspace);
+    }
+  }
+
   if (document.getElementById('tab_blocks').classList.contains('tabon')) {
     Code.workspace.setVisible(false);
   }
@@ -324,6 +345,11 @@ Code.renderContent = function() {
     var xmlText = Blockly.Xml.domToPrettyText(xmlDom);
     xmlTextarea.value = xmlText;
     xmlTextarea.focus();
+  } else if (content.id == 'content_json') {
+    var jsonTextarea = document.getElementById('content_json');
+    jsonTextarea.value = JSON.stringify(
+        Blockly.serialization.workspaces.save(Code.workspace), null, 2);
+    jsonTextarea.focus();
   } else if (content.id == 'content_javascript') {
     Code.attemptCodeGeneration(Blockly.JavaScript);
   } else if (content.id == 'content_python') {
@@ -466,7 +492,7 @@ Code.init = function() {
     BlocklyStorage['HTTPREQUEST_ERROR'] = MSG['httpRequestError'];
     BlocklyStorage['LINK_ALERT'] = MSG['linkAlert'];
     BlocklyStorage['HASH_ERROR'] = MSG['hashError'];
-    BlocklyStorage['XML_ERROR'] = MSG['xmlError'];
+    BlocklyStorage['XML_ERROR'] = MSG['loadError'];
     Code.bindClick(linkButton,
         function() {BlocklyStorage.link(Code.workspace);});
   } else if (linkButton) {
diff --git a/demos/code/index.html b/demos/code/index.html
index 9fd858aef..a3a69bb7d 100644
--- a/demos/code/index.html
+++ b/demos/code/index.html
@@ -47,6 +47,8 @@
             <td id="tab_dart" class="taboff tab_collapse">Dart</td>
             <td class="tabmin tab_collapse">&nbsp;</td>
             <td id="tab_xml" class="taboff tab_collapse">XML</td>
+            <td class="tabmin tab_collapse">&nbsp;</td>
+            <td id="tab_json" class="taboff tab_collapse">JSON</td>
             <td class="tabmin">&nbsp;</td>
             <td id="tab_code" class="taboff">
               <select id="code_menu"></select>
@@ -78,6 +80,7 @@
   <pre id="content_lua" class="content prettyprint lang-lua"></pre>
   <pre id="content_dart" class="content prettyprint lang-dart"></pre>
   <textarea id="content_xml" class="content" wrap="off"></textarea>
+  <textarea id="content_json" class="content" wrap="off"></textarea>
 
   <xml xmlns="https://developers.google.com/blockly/xml" id="toolbox" style="display: none">
     <category name="%{BKY_CATLOGIC}" colour="%{BKY_LOGIC_HUE}">
diff --git a/demos/code/msg/ar.js b/demos/code/msg/ar.js
index 952198b21..7a4521d45 100644
--- a/demos/code/msg/ar.js
+++ b/demos/code/msg/ar.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "كانت هناك مشكلة مع هذا الطلب.",
   linkAlert: "مشاركة كود بلوكلي الخاص بك مع هذا الرابط:\n %1",
   hashError: "عذراً،ال '%1' لا تتوافق مع أي برنامج تم حفظه.",
-  xmlError: "تعذر تحميل الملف المحفوظة الخاصة بك.  ربما تم إنشاؤه باستخدام إصدار مختلف من بلوكلي؟",
-  badXml: "خطأ في توزيع ال \"XML\":\n %1\n\nحدد 'موافق' للتخلي عن التغييرات أو 'إلغاء الأمر' لمواصلة تحرير ال\"XML\"."
+  loadError: "تعذر تحميل الملف المحفوظة الخاصة بك.  ربما تم إنشاؤه باستخدام إصدار مختلف من بلوكلي؟",
+  parseError: "خطأ في توزيع ال \"%1\":\n %2\n\nحدد 'موافق' للتخلي عن التغييرات أو 'إلغاء الأمر' لمواصلة تحرير ال\"%1\"."
 };
diff --git a/demos/code/msg/be-tarask.js b/demos/code/msg/be-tarask.js
index 5c8d72264..3f32173d0 100644
--- a/demos/code/msg/be-tarask.js
+++ b/demos/code/msg/be-tarask.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Узьнікла праблема з запытам.",
   linkAlert: "Падзяліцца Вашым блёкам праз гэтую спасылку:\n\n%1",
   hashError: "Прабачце, '%1' не адпавядае ніводнай захаванай праграме.",
-  xmlError: "Не атрымалася загрузіць захаваны файл. Магчыма, ён быў створаны з іншай вэрсіяй Блёклі?",
-  badXml: "Памылка сынтаксічнага аналізу XML:\n%1\n\nАбярыце \"ОК\", каб адмовіцца ад зьменаў ці \"Скасаваць\" для далейшага рэдагаваньня XML."
+  loadError: "Не атрымалася загрузіць захаваны файл. Магчыма, ён быў створаны з іншай вэрсіяй Блёклі?",
+  parseError: "Памылка сынтаксічнага аналізу %1:\n%2\n\nАбярыце \"ОК\", каб адмовіцца ад зьменаў ці \"Скасаваць\" для далейшага рэдагаваньня %1."
 };
diff --git a/demos/code/msg/br.js b/demos/code/msg/br.js
index 321e28e58..1a283245c 100644
--- a/demos/code/msg/br.js
+++ b/demos/code/msg/br.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Ur gudenn zo gant ar reked.",
   linkAlert: "Rannañ ho ploc'hoù gant al liamm-mañ :\n\n%1",
   hashError: "Digarezit. \"%1\" ne glot gant programm enrollet ebet.",
-  xmlError: "Ne c'haller ket kargañ ho restr enrollet. Marteze e oa bet krouet gant ur stumm disheñvel eus Blockly ?",
-  badXml: "Fazi dielfennañ XML :\n%1\n\nDibabit \"Mat eo\" evit dilezel ar c'hemmoù-se pe \"Nullañ\" evit kemmañ an XML c'hoazh."
+  loadError: "Ne c'haller ket kargañ ho restr enrollet. Marteze e oa bet krouet gant ur stumm disheñvel eus Blockly ?",
+  parseError: "Fazi dielfennañ %1 :\n%2\n\nDibabit \"Mat eo\" evit dilezel ar c'hemmoù-se pe \"Nullañ\" evit kemmañ an %1 c'hoazh."
 };
diff --git a/demos/code/msg/ca.js b/demos/code/msg/ca.js
index 2b6d9738e..0ec584050 100644
--- a/demos/code/msg/ca.js
+++ b/demos/code/msg/ca.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Hi ha hagut un problema amb la sol·licitud.",
   linkAlert: "Comparteix els teus blocs amb aquest enllaç: %1",
   hashError: "Ho sentim, '%1' no es correspon amb cap fitxer desat de Blockly.",
-  xmlError: "No s'ha pogut carregar el teu fitxer desat.  Potser va ser creat amb una versió diferent de Blockly?",
-  badXml: "Error d'anàlisi XML:\n%1\n\nSeleccioneu 'Acceptar' per abandonar els vostres canvis, o 'Cancel·lar' per continuar editant l'XML."
+  loadError: "No s'ha pogut carregar el teu fitxer desat.  Potser va ser creat amb una versió diferent de Blockly?",
+  parseError: "Error d'anàlisi %1:\n%2\n\nSeleccioneu 'Acceptar' per abandonar els vostres canvis, o 'Cancel·lar' per continuar editant l'%1."
 };
diff --git a/demos/code/msg/cs.js b/demos/code/msg/cs.js
index 1026511e3..0cdd38bb3 100644
--- a/demos/code/msg/cs.js
+++ b/demos/code/msg/cs.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Došlo k potížím s požadavkem.",
   linkAlert: "Sdílej bloky tímto odkazem: \n\n%1",
   hashError: "Omlouváme se, '%1' nesouhlasí s žádným z uložených souborů.",
-  xmlError: "Nepodařilo se uložit vás soubor.  Pravděpodobně byl vytvořen jinou verzí Blockly?",
-  badXml: "Chyba parsování XML:\n%1\n\nVybrat \"OK\" pro zahození vašich změn nebo 'Cancel' k dalšímu upravování XML."
+  loadError: "Nepodařilo se uložit vás soubor.  Pravděpodobně byl vytvořen jinou verzí Blockly?",
+  parseError: "Chyba parsování %1:\n%2\n\nVybrat \"OK\" pro zahození vašich změn nebo 'Cancel' k dalšímu upravování %1."
 };
diff --git a/demos/code/msg/da.js b/demos/code/msg/da.js
index 089450b2d..0b2493be3 100644
--- a/demos/code/msg/da.js
+++ b/demos/code/msg/da.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Der var et problem med forespørgslen.",
   linkAlert: "Del dine blokke med dette link:\n\n%1",
   hashError: "Beklager, '%1' passer ikke med nogen gemt Blockly fil.",
-  xmlError: "Kunne ikke hente din gemte fil.  Måske er den lavet med en anden udgave af Blockly?",
-  badXml: "Fejl under fortolkningen af XML:\n%1\n\nVælg 'OK' for at opgive dine ændringer eller 'Afbryd' for at redigere XML-filen yderligere."
+  loadError: "Kunne ikke hente din gemte fil.  Måske er den lavet med en anden udgave af Blockly?",
+  parseError: "Fejl under fortolkningen af %1:\n%2\n\nVælg 'OK' for at opgive dine ændringer eller 'Afbryd' for at redigere %1-filen yderligere."
 };
diff --git a/demos/code/msg/de.js b/demos/code/msg/de.js
index 422f9187d..bc2f3bee8 100644
--- a/demos/code/msg/de.js
+++ b/demos/code/msg/de.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Mit der Anfrage gab es ein Problem.",
   linkAlert: "Teile deine Bausteine mit diesem Link:\n\n%1",
   hashError: "„%1“ stimmt leider mit keinem gespeicherten Programm überein.",
-  xmlError: "Deine gespeicherte Datei konnte nicht geladen werden. Vielleicht wurde sie mit einer anderen Version von Blockly erstellt.",
-  badXml: "Fehler beim Parsen von XML:\n%1\n\nWähle 'OK' zum Verwerfen deiner Änderungen oder 'Abbrechen' zum weiteren Bearbeiten des XML."
+  loadError: "Deine gespeicherte Datei konnte nicht geladen werden. Vielleicht wurde sie mit einer anderen Version von Blockly erstellt.",
+  parseError: "Fehler beim Parsen von %1:\n%2\n\nWähle 'OK' zum Verwerfen deiner Änderungen oder 'Abbrechen' zum weiteren Bearbeiten des %1."
 };
diff --git a/demos/code/msg/el.js b/demos/code/msg/el.js
index c63b7a685..ad5b3f15c 100644
--- a/demos/code/msg/el.js
+++ b/demos/code/msg/el.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Υπήρξε πρόβλημα με το αίτημα.",
   linkAlert: "Κοινοποίησε τα μπλοκ σου με αυτόν τον σύνδεσμο:\n\n%1",
   hashError: "Λυπάμαι, το «%1» δεν αντιστοιχεί σε κανένα αποθηκευμένο πρόγραμμα.",
-  xmlError: "Δεν μπορώ να φορτώσω το αποθηκευμένο αρχείο σου.  Μήπως δημιουργήθηκε από μία παλιότερη έκδοση του Blockly;",
-  badXml: "Σφάλμα ανάλυσης XML:\n%1\n\nΕπίλεξε «Εντάξει» για να εγκαταλείψεις τις αλλαγές σου ή «Ακύρωση» για να επεξεργαστείς το XML κι άλλο."
+  loadError: "Δεν μπορώ να φορτώσω το αποθηκευμένο αρχείο σου.  Μήπως δημιουργήθηκε από μία παλιότερη έκδοση του Blockly;",
+  parseError: "Σφάλμα ανάλυσης %1:\n%2\n\nΕπίλεξε «Εντάξει» για να εγκαταλείψεις τις αλλαγές σου ή «Ακύρωση» για να επεξεργαστείς το %1 κι άλλο."
 };
diff --git a/demos/code/msg/en.js b/demos/code/msg/en.js
index 113b84639..212ea17a2 100644
--- a/demos/code/msg/en.js
+++ b/demos/code/msg/en.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "There was a problem with the request.",
   linkAlert: "Share your blocks with this public link. We\'ll delete them if not used for a year. They are not associated with your account and handled as per Google\'s Privacy Policy. Please be sure not to include any private information.\n\n%1",
   hashError: "Sorry, '%1' doesn't correspond with any saved program.",
-  xmlError: "Could not load your saved file. Perhaps it was created with a different version of Blockly?",
-  badXml: "Error parsing XML:\n%1\n\nSelect 'OK' to abandon your changes or 'Cancel' to further edit the XML."
+  loadError: "Could not load your saved file. Perhaps it was created with a different version of Blockly?",
+  parseError: "Error parsing %1:\n%2\n\nSelect 'OK' to abandon your changes or 'Cancel' to further edit the %1."
 };
diff --git a/demos/code/msg/es.js b/demos/code/msg/es.js
index 24358e368..7b9b9995a 100644
--- a/demos/code/msg/es.js
+++ b/demos/code/msg/es.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Hubo un problema con la petición.",
   linkAlert: "Comparte tus bloques con este enlace:\n\n%1",
   hashError: "«%1» no corresponde con ningún programa guardado.",
-  xmlError: "No se pudo cargar el archivo guardado.  ¿Quizá fue creado con otra versión de Blockly?",
-  badXml: "Error de análisis XML:\n%1\n\nSelecciona OK para abandonar tus cambios o Cancelar para seguir editando el XML."
+  loadError: "No se pudo cargar el archivo guardado.  ¿Quizá fue creado con otra versión de Blockly?",
+  parseError: "Error de análisis %1:\n%2\n\nSelecciona OK para abandonar tus cambios o Cancelar para seguir editando el %1."
 };
diff --git a/demos/code/msg/et.js b/demos/code/msg/et.js
index 320c39174..3437925cd 100644
--- a/demos/code/msg/et.js
+++ b/demos/code/msg/et.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Probleem päringuga.",
   linkAlert: "Oma plokke saad jagada selle lingiga:\n\n%1",
   hashError: "Vabandust, kuid '%1' ei vasta ühelegi salvestatud programmile.",
-  xmlError: "Su salvestatud faili ei õnnestunud laadida. Võibolla on see loodud mõne teise Blockly versiooniga?",
-  badXml: "Viga XML-i parsimisel:\n%1\n\nTehtud muudatustest loobumiseks vajuta 'OK', XML-i muudatuste tegemise jätkamiseks 'Katkesta'."
+  loadError: "Su salvestatud faili ei õnnestunud laadida. Võibolla on see loodud mõne teise Blockly versiooniga?",
+  parseError: "Viga %1-i parsimisel:\n%2\n\nTehtud muudatustest loobumiseks vajuta 'OK', %1-i muudatuste tegemise jätkamiseks 'Katkesta'."
 };
diff --git a/demos/code/msg/fa.js b/demos/code/msg/fa.js
index 96dd966b0..1376cfa58 100644
--- a/demos/code/msg/fa.js
+++ b/demos/code/msg/fa.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "مشکلی با درخواست وجود داشت.",
   linkAlert: "اشتراک‌گذاری بلاک‌هایتان با این پیوند:\n\n%1",
   hashError: "شرمنده، «%1» با هیچ برنامهٔ ذخیره‌شده‌ای تطبیق پیدا نکرد.",
-  xmlError: "نتوانست پروندهٔ ذخیرهٔ شما بارگیری شود.  احتمالاً با نسخهٔ متفاوتی از بلوکی درست شده‌است؟",
-  badXml: "خطای تجزیهٔ اکس‌ام‌ال:\n%1\n\n«باشد» را برای ذخیره و «فسخ» را برای ویرایش بیشتر اکس‌ام‌ال انتخاب کنید."
+  loadError: "نتوانست پروندهٔ ذخیرهٔ شما بارگیری شود.  احتمالاً با نسخهٔ متفاوتی از بلوکی درست شده‌است؟",
+  parseError: "خطای تجزیهٔ اکس‌ام‌ال:\n%2\n\n«باشد» را برای ذخیره و «فسخ» را برای ویرایش بیشتر اکس‌ام‌ال انتخاب کنید."
 };
diff --git a/demos/code/msg/fr.js b/demos/code/msg/fr.js
index 60181131a..d98d386bb 100644
--- a/demos/code/msg/fr.js
+++ b/demos/code/msg/fr.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Il y a eu un problème avec la demande.",
   linkAlert: "Partagez vos blocs grâce à ce lien:\n\n%1",
   hashError: "Désolé, '%1' ne correspond à aucun programme sauvegardé.",
-  xmlError: "Impossible de charger le fichier de sauvegarde.  Peut être a t-il été créé avec une autre version de Blockly?",
-  badXml: "Erreur d’analyse du XML :\n%1\n\nSélectionner 'OK' pour abandonner vos modifications ou 'Annuler' pour continuer à modifier le XML."
+  loadError: "Impossible de charger le fichier de sauvegarde.  Peut être a t-il été créé avec une autre version de Blockly?",
+  parseError: "Erreur d’analyse du %1 :\n%2\n\nSélectionner 'OK' pour abandonner vos modifications ou 'Annuler' pour continuer à modifier le %1."
 };
diff --git a/demos/code/msg/he.js b/demos/code/msg/he.js
index dc2826620..c12f28ad6 100644
--- a/demos/code/msg/he.js
+++ b/demos/code/msg/he.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "הבקשה נכשלה.",
   linkAlert: "ניתן לשתף את קטעי הקוד שלך באמצעות קישור זה:\n\n%1",
   hashError: "לצערנו, '%1' איננו מתאים לאף אחת מהתוכניות השמורות",
-  xmlError: "נסיון הטעינה של הקובץ השמור שלך נכשל. האם ייתכן שהוא נוצר בגרסא שונה של בלוקלי?",
-  badXml: "תקלה בפענוח XML:\n\n%1\n\nנא לבחור 'אישור' כדי לנטוש את השינויים שלך או 'ביטול' כדי להמשיך ולערוך את ה־XML."
+  loadError: "נסיון הטעינה של הקובץ השמור שלך נכשל. האם ייתכן שהוא נוצר בגרסא שונה של בלוקלי?",
+  parseError: "תקלה בפענוח %1:\n\n%2\n\nנא לבחור 'אישור' כדי לנטוש את השינויים שלך או 'ביטול' כדי להמשיך ולערוך את ה־%1."
 };
diff --git a/demos/code/msg/hrx.js b/demos/code/msg/hrx.js
index ca0dea3fc..deda3cd20 100644
--- a/demos/code/msg/hrx.js
+++ b/demos/code/msg/hrx.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Mit der Oonfroch hots en Problem geb.",
   linkAlert: "Tel von dein Bausten mit dem Link:\n\n%1",
   hashError: "„%1“ stimmt leider mit kenem üweren gespeicherte Programm.",
-  xmlError: "Dein gespeicherte Datei könnt net gelood sin. Vielleicht woard se mit ener annre Version von Blockly erstellt.",
-  badXml: "Fehler beim Parse von XML:\n%1\n\nWähle 'OK' zum Verwerfe von deiner Ändrunge orrer 'Abbreche' zum XML weiter beoorbeite."
+  loadError: "Dein gespeicherte Datei könnt net gelood sin. Vielleicht woard se mit ener annre Version von Blockly erstellt.",
+  parseError: "Fehler beim Parse von %1:\n%2\n\nWähle 'OK' zum Verwerfe von deiner Ändrunge orrer 'Abbreche' zum %1 weiter beoorbeite."
 };
diff --git a/demos/code/msg/hu.js b/demos/code/msg/hu.js
index eee186863..4575a4965 100644
--- a/demos/code/msg/hu.js
+++ b/demos/code/msg/hu.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "A kéréssel kapcsolatban probléma merült fel.",
   linkAlert: "Ezzel a hivatkozással tudod megosztani a programodat:\n\n%1",
   hashError: "Sajnos a '%1' hivatkozás nem tartozik egyetlen programhoz sem.",
-  xmlError: "A programodat nem lehet betölteni.  Elképzelhető, hogy a Blockly egy másik verziójában készült?",
-  badXml: "Hiba az XML feldolgozásakor:\n%1\n\nVáltozások elvetése?"
+  loadError: "A programodat nem lehet betölteni.  Elképzelhető, hogy a Blockly egy másik verziójában készült?",
+  parseError: "Hiba az %1 feldolgozásakor:\n%2\n\nVáltozások elvetése?"
 };
diff --git a/demos/code/msg/ia.js b/demos/code/msg/ia.js
index 5938458bb..30ff22720 100644
--- a/demos/code/msg/ia.js
+++ b/demos/code/msg/ia.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Il habeva un problema con le requesta.",
   linkAlert: "Divide tu blocos con iste ligamine:\n\n%1",
   hashError: "Infelicemente, '%1' non corresponde a alcun programma salveguardate.",
-  xmlError: "Impossibile cargar le file salveguardate. Pote esser que illo ha essite create con un altere version de Blockly?",
-  badXml: "Error de analyse del XML:\n%1\n\nSelige 'OK' pro abandonar le modificationes o 'Cancellar' pro continuar a modificar le codice XML."
+  loadError: "Impossibile cargar le file salveguardate. Pote esser que illo ha essite create con un altere version de Blockly?",
+  parseError: "Error de analyse del %1:\n%2\n\nSelige 'OK' pro abandonar le modificationes o 'Cancellar' pro continuar a modificar le codice %1."
 };
diff --git a/demos/code/msg/is.js b/demos/code/msg/is.js
index fa5c40d80..ba79df697 100644
--- a/demos/code/msg/is.js
+++ b/demos/code/msg/is.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Það kom upp vandamál með beiðnina.",
   linkAlert: "Deildu kubbunum þínum með þessari krækju:",
   hashError: "Því miður, '%1' passar ekki við neitt vistað forrit.",
-  xmlError: "Gat ekki hlaðið vistuðu skrána þína. Var hún kannske búin til í annarri útgáfu af Blockly?",
-  badXml: "Villa við úrvinnslu XML:\n%1\n\nVeldu 'Í lagi' til að sleppa breytingum eða 'Hætta við' til að halda áfram með XML."
+  loadError: "Gat ekki hlaðið vistuðu skrána þína. Var hún kannske búin til í annarri útgáfu af Blockly?",
+  parseError: "Villa við úrvinnslu %1:\n%2\n\nVeldu 'Í lagi' til að sleppa breytingum eða 'Hætta við' til að halda áfram með %1."
 };
diff --git a/demos/code/msg/it.js b/demos/code/msg/it.js
index cd69b66b3..e9def2a19 100644
--- a/demos/code/msg/it.js
+++ b/demos/code/msg/it.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "La richiesta non è stata soddisfatta.",
   linkAlert: "Condividi i tuoi blocchi con questo collegamento:\n\n%1",
   hashError: "Mi spiace, '%1' non corrisponde ad alcun programma salvato.",
-  xmlError: "Non è stato possibile caricare il documento.  Forse è stato creato con una versione diversa di Blockly?",
-  badXml: "Errore durante l'analisi XML:\n%1\n\nSeleziona 'OK' per abbandonare le modifiche o 'Annulla' per continuare a modificare l'XML."
+  loadError: "Non è stato possibile caricare il documento.  Forse è stato creato con una versione diversa di Blockly?",
+  parseError: "Errore durante l'analisi %1:\n%2\n\nSeleziona 'OK' per abbandonare le modifiche o 'Annulla' per continuare a modificare l'%1."
 };
diff --git a/demos/code/msg/ja.js b/demos/code/msg/ja.js
index 6d5041982..44beb3bdb 100644
--- a/demos/code/msg/ja.js
+++ b/demos/code/msg/ja.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "ネットワーク接続のエラーです。",
   linkAlert: "ブロックの状態をこのリンクで共有できます:\n\n%1",
   hashError: "すみません。「%1」という名前のプログラムは保存されていません。",
-  xmlError: "保存されたファイルを読み込めませんでした。別のバージョンのブロックリーで作成された可能性があります。",
-  badXml: "XML のエラーです:\n%1\n\nXML の変更をやめるには「OK」、編集を続けるには「キャンセル」を選んでください。"
+  loadError: "保存されたファイルを読み込めませんでした。別のバージョンのブロックリーで作成された可能性があります。",
+  parseError: "%1 のエラーです:\n%2\n\n%1 の変更をやめるには「OK」、編集を続けるには「キャンセル」を選んでください。"
 };
diff --git a/demos/code/msg/kab.js b/demos/code/msg/kab.js
index 648ff7fb8..621442e07 100644
--- a/demos/code/msg/kab.js
+++ b/demos/code/msg/kab.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "yella ugur deg usuter.",
   linkAlert: "Bḍu iḥedran-ik s useqdec n useɣwen-agi:\n\n%1",
   hashError: "Suref-aɣ, '%1' ur imenṭaḍ ulad d yiwen n wahil yettwaskelsen.",
-  xmlError: "Ur izmir ara ad d-isali afaylu  n usekles. Ahatyettwarna s lqem-nniḍen n Blockly?",
-  badXml: "Tuccḍa di tesleḍt n XML :\n%1\n\nFren 'IH' akken ad tzgleḍ asnifel-ik 'Sefsex' akken ad tkemmleḍ asnifel n XML."
+  loadError: "Ur izmir ara ad d-isali afaylu  n usekles. Ahatyettwarna s lqem-nniḍen n Blockly?",
+  parseError: "Tuccḍa di tesleḍt n %1 :\n%2\n\nFren 'IH' akken ad tzgleḍ asnifel-ik 'Sefsex' akken ad tkemmleḍ asnifel n %1."
 };
diff --git a/demos/code/msg/ko.js b/demos/code/msg/ko.js
index 990cb6f23..2daf0c9ad 100644
--- a/demos/code/msg/ko.js
+++ b/demos/code/msg/ko.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "요청에 문제가 있습니다.",
   linkAlert: "다음 링크로 블록을 공유하세요:\n\n%1",
   hashError: "죄송하지만 '%1'은 어떤 저장된 프로그램으로 일치하지 않습니다.",
-  xmlError: "저장된 파일을 불러올 수 없습니다. 혹시 블록리의 다른 버전으로 만들었습니까?",
-  badXml: "XML 구문 분석 오류:\n%1\n\n바뀜을 포기하려면 '확인'을 선택하고 XML을 더 편집하려면 '취소'를 선택하세요."
+  loadError: "저장된 파일을 불러올 수 없습니다. 혹시 블록리의 다른 버전으로 만들었습니까?",
+  parseError: "%1 구문 분석 오류:\n%2\n\n바뀜을 포기하려면 '확인'을 선택하고 %1을 더 편집하려면 '취소'를 선택하세요."
 };
diff --git a/demos/code/msg/mk.js b/demos/code/msg/mk.js
index cc344a69c..905f5032a 100644
--- a/demos/code/msg/mk.js
+++ b/demos/code/msg/mk.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Се појави проблем во барањето.",
   linkAlert: "Споделете ги вашите блокчиња со оваа врска:\n\n%1",
   hashError: "„%1“ не одговара на ниеден зачуван програм.",
-  xmlError: "Не можев да ја вчитам зачуваната податотека. Да не сте ја создале со друга верзија на Blockly?",
-  badXml: "Грешка при расчленувањето на XML:\n%1\n\nСтиснете на „ОК“ за да ги напуштите промените или на „Откажи“ ако сакате уште да ја уредувате XML-податотеката."
+  loadError: "Не можев да ја вчитам зачуваната податотека. Да не сте ја создале со друга верзија на Blockly?",
+  parseError: "Грешка при расчленувањето на %1:\n%2\n\nСтиснете на „ОК“ за да ги напуштите промените или на „Откажи“ ако сакате уште да ја уредувате %1-податотеката."
 };
diff --git a/demos/code/msg/ms.js b/demos/code/msg/ms.js
index 87ee8deef..d369fd6b4 100644
--- a/demos/code/msg/ms.js
+++ b/demos/code/msg/ms.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Permintaan itu terdapat masalah.",
   linkAlert: "Kongsikan blok-blok anda dengan pautan ini:\n\n%1",
   hashError: "Maaf, '%1' tidak berpadanan dengan sebarang aturcara yang disimpan.",
-  xmlError: "Fail simpanan anda tidak dapat dimuatkan. Jangan-jangan ia dicipta dengan versi Blockly yang berlainan?",
-  badXml: "Ralat ketika menghuraikan XML:\n%1\n\nPilih 'OK' untuk melucutkan suntingan anda atau 'Batal' untuk bersambung menyunting XML-nya."
+  loadError: "Fail simpanan anda tidak dapat dimuatkan. Jangan-jangan ia dicipta dengan versi Blockly yang berlainan?",
+  parseError: "Ralat ketika menghuraikan %1:\n%2\n\nPilih 'OK' untuk melucutkan suntingan anda atau 'Batal' untuk bersambung menyunting %1-nya."
 };
diff --git a/demos/code/msg/nb.js b/demos/code/msg/nb.js
index 60ac0394d..5eb2219ae 100644
--- a/demos/code/msg/nb.js
+++ b/demos/code/msg/nb.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Det oppsto et problem med forespørselen din",
   linkAlert: "Del dine blokker med denne lenken:\n\n%1",
   hashError: "Beklager, '%1' samsvarer ikke med noe lagret program.",
-  xmlError: "Kunne ikke laste inn filen. Kanskje den ble laget med en annen versjon av Blockly?",
-  badXml: "Feil ved parsering av XML:\n%1\n\nVelg 'OK' for å avbryte endringene eller 'Cancel' for å fortsette å redigere XML-koden."
+  loadError: "Kunne ikke laste inn filen. Kanskje den ble laget med en annen versjon av Blockly?",
+  parseError: "Feil ved parsering av %1:\n%2\n\nVelg 'OK' for å avbryte endringene eller 'Cancel' for å fortsette å redigere %1-koden."
 };
diff --git a/demos/code/msg/nl.js b/demos/code/msg/nl.js
index 339a5e882..003082310 100644
--- a/demos/code/msg/nl.js
+++ b/demos/code/msg/nl.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Er is een probleem opgetreden tijdens het verwerken van het verzoek.",
   linkAlert: "Deel uw blokken via deze koppeling:\n\n%1",
   hashError: "\"%1\" komt helaas niet overeen met een opgeslagen bestand.",
-  xmlError: "Uw opgeslagen bestand kan niet geladen worden. Is het misschien gemaakt met een andere versie van Blockly?",
-  badXml: "Fout tijdens het verwerken van de XML:\n%1\n\nSelecteer \"OK\" om uw wijzigingen te negeren of \"Annuleren\" om de XML verder te bewerken."
+  loadError: "Uw opgeslagen bestand kan niet geladen worden. Is het misschien gemaakt met een andere versie van Blockly?",
+  parseError: "Fout tijdens het verwerken van de %1:\n%2\n\nSelecteer \"OK\" om uw wijzigingen te negeren of \"Annuleren\" om de %1 verder te bewerken."
 };
diff --git a/demos/code/msg/oc.js b/demos/code/msg/oc.js
index c184ac8fb..35c89581d 100644
--- a/demos/code/msg/oc.js
+++ b/demos/code/msg/oc.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "I a agut un problèma amb la demanda.",
   linkAlert: "Partejatz vòstres blòts gràcia a aqueste ligam :\n\n%1",
   hashError: "O planhèm, '%1' correspond pas a un fichièr Blockly salvament.",
-  xmlError: "Impossible de cargar lo fichièr de salvament.  Benlèu qu'es estat creat amb una autra version de Blockly ?",
-  badXml: "Error d’analisi del XML :\n%1\n\nSeleccionar 'D'acòrdi' per abandonar vòstras modificacions o 'Anullar' per modificar encara lo XML."
+  loadError: "Impossible de cargar lo fichièr de salvament.  Benlèu qu'es estat creat amb una autra version de Blockly ?",
+  parseError: "Error d’analisi del %1 :\n%2\n\nSeleccionar 'D'acòrdi' per abandonar vòstras modificacions o 'Anullar' per modificar encara lo %1."
 };
diff --git a/demos/code/msg/pl.js b/demos/code/msg/pl.js
index 83bb05d2f..ade2b76cd 100644
--- a/demos/code/msg/pl.js
+++ b/demos/code/msg/pl.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Wystąpił problem z żądaniem.",
   linkAlert: "Udpostępnij swoje bloki korzystając z poniższego linku : \n\n\n%1",
   hashError: "Przepraszamy, \"%1\" nie odpowiada żadnemu zapisanemu programowi.",
-  xmlError: "Nie można załadować zapisanego pliku. Być może został utworzony za pomocą innej wersji Blockly?",
-  badXml: "Błąd parsowania XML : \n%1\n\nZaznacz 'OK' aby odrzucić twoje zmiany lub 'Cancel', żeby w przyszłości edytować XML."
+  loadError: "Nie można załadować zapisanego pliku. Być może został utworzony za pomocą innej wersji Blockly?",
+  parseError: "Błąd parsowania %1 : \n%2\n\nZaznacz 'OK' aby odrzucić twoje zmiany lub 'Cancel', żeby w przyszłości edytować %1."
 };
diff --git a/demos/code/msg/pms.js b/demos/code/msg/pms.js
index a7704f764..f60be55d9 100644
--- a/demos/code/msg/pms.js
+++ b/demos/code/msg/pms.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "A-i é staje un problema con l'arcesta.",
   linkAlert: "Ch'a partagia ij sò blòch grassie a sta liura: %1",
   hashError: "An dëspias, '%1 a corëspond a gnun programa salvà.",
-  xmlError: "A l'é nen podusse carié so archivi salvà. Miraco a l'é stàit creà con na version diferenta ëd Blockly?",
-  badXml: "Eror d'anàlisi dl'XML:\n%1\n\nSelessioné 'Va bin' për lassé perde toe modìfiche o 'Anulé' për modifiché ancora l'XML."
+  loadError: "A l'é nen podusse carié so archivi salvà. Miraco a l'é stàit creà con na version diferenta ëd Blockly?",
+  parseError: "Eror d'anàlisi dl'%1:\n%2\n\nSelessioné 'Va bin' për lassé perde toe modìfiche o 'Anulé' për modifiché ancora l'%1."
 };
diff --git a/demos/code/msg/pt-br.js b/demos/code/msg/pt-br.js
index 9b18d6360..68d54dadb 100644
--- a/demos/code/msg/pt-br.js
+++ b/demos/code/msg/pt-br.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Houve um problema com a requisição.",
   linkAlert: "Compartilhe seus blocos com este link:\n\n%1",
   hashError: "Desculpe, '%1' não corresponde a um programa salvo.",
-  xmlError: "Não foi possível carregar seu arquivo salvo. Talvez ele tenha sido criado com uma versão diferente do Blockly?",
-  badXml: "Erro de análise XML:\n%1\n\nSelecione 'OK' para abandonar suas mudanças ou 'Cancelar' para editar o XML."
+  loadError: "Não foi possível carregar seu arquivo salvo. Talvez ele tenha sido criado com uma versão diferente do Blockly?",
+  parseError: "Erro de análise %1:\n%2\n\nSelecione 'OK' para abandonar suas mudanças ou 'Cancelar' para editar o %1."
 };
diff --git a/demos/code/msg/ro.js b/demos/code/msg/ro.js
index cd3de11d7..e6ab7be82 100644
--- a/demos/code/msg/ro.js
+++ b/demos/code/msg/ro.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "A apărut o problemă la solicitare.",
   linkAlert: "Distribuie-ți blocurile folosind această legătură:\n\n%1",
   hashError: "Scuze, „%1” nu corespunde nici unui program salvat.",
-  xmlError: "Sistemul nu a putut încărca fișierul salvat. Poate că a fost creat cu o altă versiune de Blockly?",
-  badXml: "Eroare de parsare XML:\n%1\n\nAlege „OK” pentru a renunța la modificările efectuate sau „Revocare” pentru a modifica în continuare fișierul XML."
+  loadError: "Sistemul nu a putut încărca fișierul salvat. Poate că a fost creat cu o altă versiune de Blockly?",
+  parseError: "Eroare de parsare %1:\n%2\n\nAlege „OK” pentru a renunța la modificările efectuate sau „Revocare” pentru a modifica în continuare fișierul %1."
 };
diff --git a/demos/code/msg/ru.js b/demos/code/msg/ru.js
index 389e9052a..da7a2f7b9 100644
--- a/demos/code/msg/ru.js
+++ b/demos/code/msg/ru.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Произошла проблема при запросе.",
   linkAlert: "Поделитесь своими блоками по этой ссылке:\n\n%1",
   hashError: "К сожалению, «%1» не соответствует ни одному сохраненному файлу Блокли.",
-  xmlError: "Не удалось загрузить ваш сохраненный файл.  Возможно, он был создан в другой версии Блокли?",
-  badXml: "Ошибка синтаксического анализа XML:\n%1\n\nВыберите 'ОК', чтобы отказаться от изменений или 'Cancel' для дальнейшего редактирования XML."
+  loadError: "Не удалось загрузить ваш сохраненный файл.  Возможно, он был создан в другой версии Блокли?",
+  parseError: "Ошибка синтаксического анализа %1:\n%2\n\nВыберите 'ОК', чтобы отказаться от изменений или 'Cancel' для дальнейшего редактирования %1."
 };
diff --git a/demos/code/msg/sc.js b/demos/code/msg/sc.js
index 82f94d61d..8fe88ef18 100644
--- a/demos/code/msg/sc.js
+++ b/demos/code/msg/sc.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Ddui fut unu problema cun sa pregunta",
   linkAlert: "Poni is brocus tuus in custu acàpiu:\n\n%1",
   hashError: "Mi dispraxit, '%1' non torrat a pari cun nimancu unu de is programas sarvaus.",
-  xmlError: "Non potzu carrigai su file sarvau. Fortzis est stètiu fatu cun d-una versioni diferenti de Blockly?",
-  badXml: "Errori in s'anàlisi XML:\n%1\n\nCraca 'OK' po perdi is mudàntzias 'Anudda' po sighì a scriri su XML."
+  loadError: "Non potzu carrigai su file sarvau. Fortzis est stètiu fatu cun d-una versioni diferenti de Blockly?",
+  parseError: "Errori in s'anàlisi %1:\n%2\n\nCraca 'OK' po perdi is mudàntzias 'Anudda' po sighì a scriri su %1."
 };
diff --git a/demos/code/msg/sk.js b/demos/code/msg/sk.js
index 3917df293..0c07cae28 100644
--- a/demos/code/msg/sk.js
+++ b/demos/code/msg/sk.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Problém so spracovaním požiadavky.",
   linkAlert: "Zdieľať tento program skopírovaním odkazu\n\n%1",
   hashError: "Prepáč, '%1' nie je meno žiadnemu uloženému programu.",
-  xmlError: "Nebolo možné načítať uložený súbor. Možno bol vytvorený v inej verzii Blocky.",
-  badXml: "Chyba pri parsovaní XML:\n%1\n\nStlačte 'OK' ak chcete zrušiť zmeny alebo 'Zrušiť' pre pokračovanie v úpravách XML."
+  loadError: "Nebolo možné načítať uložený súbor. Možno bol vytvorený v inej verzii Blocky.",
+  parseError: "Chyba pri parsovaní %1:\n%2\n\nStlačte 'OK' ak chcete zrušiť zmeny alebo 'Zrušiť' pre pokračovanie v úpravách %1."
 };
diff --git a/demos/code/msg/sr.js b/demos/code/msg/sr.js
index f9a026ca0..876fad709 100644
--- a/demos/code/msg/sr.js
+++ b/demos/code/msg/sr.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Дошло је до проблема у захтеву.",
   linkAlert: "Делите своје блокове овом везом:\n\n%1",
   hashError: "„%1“ не одговара ниједном сачуваном програму.",
-  xmlError: "Не могу да учитам сачувану датотеку. Можда је направљена другом верзијом Blockly-ја.",
-  badXml: "Грешка при рашчлањивању XML-а:\n%1\n\nПритисните „У реду“ да напустите измене или „Откажи“ да наставите са уређивањем XML датотеке."
+  loadError: "Не могу да учитам сачувану датотеку. Можда је направљена другом верзијом Blockly-ја.",
+  parseError: "Грешка при рашчлањивању %1-а:\n%2\n\nПритисните „У реду“ да напустите измене или „Откажи“ да наставите са уређивањем %1 датотеке."
 };
diff --git a/demos/code/msg/sv.js b/demos/code/msg/sv.js
index 4134a4c7d..2c3245a89 100644
--- a/demos/code/msg/sv.js
+++ b/demos/code/msg/sv.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Det uppstod ett problem med begäran.",
   linkAlert: "Dela dina block med denna länk: \n\n%1",
   hashError: "Tyvärr, '%1' överensstämmer inte med något sparat program.",
-  xmlError: "Kunde inte läsa din sparade fil. Den skapades kanske med en annan version av Blockly?",
-  badXml: "Fel vid parsning av XML:\n%1\n\nKlicka på 'OK' för att strunta i dina ändringar eller 'Avbryt' för att fortsätta redigera XML-koden."
+  loadError: "Kunde inte läsa din sparade fil. Den skapades kanske med en annan version av Blockly?",
+  parseError: "Fel vid parsning av %1:\n%2\n\nKlicka på 'OK' för att strunta i dina ändringar eller 'Avbryt' för att fortsätta redigera %1-koden."
 };
diff --git a/demos/code/msg/ta.js b/demos/code/msg/ta.js
index ff472e2b7..d415da98e 100644
--- a/demos/code/msg/ta.js
+++ b/demos/code/msg/ta.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "இந்த செயலை இயக்குவதில் கோளாறு ஏற்பட்டது",
   linkAlert: "இந்த சுட்டி வழியாக நிரல் துண்டுகளை பகிரவும்:\n\n%1",
   hashError: "'%1' : இது சேமித்த நிரலாக தெரியவில்லை.",
-  xmlError: "உங்களது நிரலை காணவில்லை; வேறு Blockly அத்தியாயத்தில் சேமித்தீரா?",
-  badXml: "XML பகுப்பதில் கோளாறு:\n%1\n\nOK' கிளிக் செய்தால் மாற்றங்கள் இழப்பீர்கள்; பிழைகளுடன் தொடர 'Cancel' கிளிக் செய்யவும்."
+  loadError: "உங்களது நிரலை காணவில்லை; வேறு Blockly அத்தியாயத்தில் சேமித்தீரா?",
+  parseError: "%1 பகுப்பதில் கோளாறு:\n%2\n\n'OK' கிளிக் செய்தால் மாற்றங்கள் இழப்பீர்கள்; பிழைகளுடன் தொடர 'Cancel' கிளிக் செய்யவும்."
 };
diff --git a/demos/code/msg/th.js b/demos/code/msg/th.js
index 1ac36245b..91dc7c489 100644
--- a/demos/code/msg/th.js
+++ b/demos/code/msg/th.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "มีปัญหาเกี่ยวกับการร้องขอ",
   linkAlert: "แบ่งปันบล็อกของคุณด้วยลิงก์นี้:\n\n%1",
   hashError: "เสียใจด้วย '%1' ไม่ตรงกับโปรแกรมใดๆ ที่เคยบันทึกเอาไว้เลย",
-  xmlError: "ไม่สามารถโหลดไฟล์ที่บันทึกไว้ของคุณได้ บางทีมันอาจจะถูกสร้างขึ้นด้วย Blockly รุ่นอื่นที่แตกต่างกัน?",
-  badXml: "เกิดข้อผิดพลาดในการแยกวิเคราะห์ XML:\n%1\n\nเลือก 'ตกลง' เพื่อละทิ้งการเปลี่ยนแปลงต่างๆ ที่ทำไว้ หรือเลือก 'ยกเลิก' เพื่อแก้ไข XML ต่อไป"
+  loadError: "ไม่สามารถโหลดไฟล์ที่บันทึกไว้ของคุณได้ บางทีมันอาจจะถูกสร้างขึ้นด้วย Blockly รุ่นอื่นที่แตกต่างกัน?",
+  parseError: "เกิดข้อผิดพลาดในการแยกวิเคราะห์ %1:\n%2\n\nเลือก 'ตกลง' เพื่อละทิ้งการเปลี่ยนแปลงต่างๆ ที่ทำไว้ หรือเลือก 'ยกเลิก' เพื่อแก้ไข %1 ต่อไป"
 };
diff --git a/demos/code/msg/tlh.js b/demos/code/msg/tlh.js
index 8d0c056f9..9ee511a14 100644
--- a/demos/code/msg/tlh.js
+++ b/demos/code/msg/tlh.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Qapbe' tlhobmeH QIn.",
   linkAlert: "latlhvaD ngoghmeylIj DangeHmeH Quvvam yIlo':\n\n%1",
   hashError: "Do'Ha', ngogh nab pollu'pu'bogh 'oHbe'law' \"%1\"'e'.",
-  xmlError: "ngogh nablIj pollu'pu'bogh chu'qa'laHbe' vay'.  chaq pollu'pu'DI' ghunmeH ngogh pIm lo'lu'pu'.",
-  badXml: "XML yajchu'laHbe' vay':\n%1\n\nchoHmeylIj DalonmeH \"ruch\" yIwIv pagh XML DachoHqa'meH \"qIl\" yIwIv."
+  loadError: "ngogh nablIj pollu'pu'bogh chu'qa'laHbe' vay'.  chaq pollu'pu'DI' ghunmeH ngogh pIm lo'lu'pu'.",
+  parseError: "%1 yajchu'laHbe' vay':\n%2\n\nchoHmeylIj DalonmeH \"ruch\" yIwIv pagh %1 DachoHqa'meH \"qIl\" yIwIv."
 };
diff --git a/demos/code/msg/tr.js b/demos/code/msg/tr.js
index 144830092..ec0f04a2a 100644
--- a/demos/code/msg/tr.js
+++ b/demos/code/msg/tr.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "İstek ile ilgili bir problem var.",
   linkAlert: "Bloklarını bu bağlantı ile paylaş:\n\n%1",
   hashError: "Üzgünüz, '%1' hiç bir kaydedilmiş program ile uyuşmuyor.",
-  xmlError: "Kaydedilen dosyanız yüklenemiyor\nBlockly'nin önceki sürümü ile kaydedilmiş olabilir mi?",
-  badXml: "XML ayrıştırma hatası:\n%1\n\nDeğişikliklerden vazgeçmek için 'Tamam'ı, düzenlemeye devam etmek için 'İptal' seçeneğini seçiniz."
+  loadError: "Kaydedilen dosyanız yüklenemiyor\nBlockly'nin önceki sürümü ile kaydedilmiş olabilir mi?",
+  parseError: "%1 ayrıştırma hatası:\n%2\n\nDeğişikliklerden vazgeçmek için 'Tamam'ı, düzenlemeye devam etmek için 'İptal' seçeneğini seçiniz."
 };
diff --git a/demos/code/msg/uk.js b/demos/code/msg/uk.js
index 6b3462721..7ddd0e422 100644
--- a/demos/code/msg/uk.js
+++ b/demos/code/msg/uk.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Виникла проблема із запитом.",
   linkAlert: "Поділитися вашим блоками через посилання:\n\n%1",
   hashError: "На жаль, \"%1\" не відповідає жодній збереженій програмі.",
-  xmlError: "Не вдалося завантажити ваш збережений файл.  Можливо, він був створений з іншої версії Blockly?",
-  badXml: "Помилка синтаксичного аналізу XML:\n%1\n\nВиберіть \"Гаразд\", щоб відмовитися від змін або 'Скасувати' для подальшого редагування XML."
+  loadError: "Не вдалося завантажити ваш збережений файл.  Можливо, він був створений з іншої версії Blockly?",
+  parseError: "Помилка синтаксичного аналізу %1:\n%2\n\nВиберіть \"Гаразд\", щоб відмовитися від змін або 'Скасувати' для подальшого редагування %1."
 };
diff --git a/demos/code/msg/vi.js b/demos/code/msg/vi.js
index 952d024b4..8d8596437 100644
--- a/demos/code/msg/vi.js
+++ b/demos/code/msg/vi.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "Hoạt động bị trục trặc, không thực hiện được yêu cầu của bạn.",
   linkAlert: "Chia sẻ chương trình của bạn với liên kết sau:\n\n %1",
   hashError: "Không tìm thấy chương trình được lưu ở '%1'.",
-  xmlError: "Không mở được chương trình của bạn.  Có thể nó nằm trong một phiên bản khác của Blockly?",
-  badXml: "Lỗi sử lý XML:\n %1\n\nChọn 'OK' để từ bỏ các thay đổi hoặc 'Hủy' để tiếp tục chỉnh sửa các XML."
+  loadError: "Không mở được chương trình của bạn.  Có thể nó nằm trong một phiên bản khác của Blockly?",
+  parseError: "Lỗi sử lý %1:\n %2\n\nChọn 'OK' để từ bỏ các thay đổi hoặc 'Hủy' để tiếp tục chỉnh sửa các %1."
 };
diff --git a/demos/code/msg/zh-hans.js b/demos/code/msg/zh-hans.js
index abf8a6589..ef8951bac 100644
--- a/demos/code/msg/zh-hans.js
+++ b/demos/code/msg/zh-hans.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "请求存在问题。",
   linkAlert: "通过这个链接分享您的模块：\n\n%1",
   hashError: "对不起，没有任何已保存的程序对应'%1' 。",
-  xmlError: "无法载入您保存的文件。您是否使用其他版本的Blockly创建该文件的？",
-  badXml: "XML解析错误：\n%1\n\n选择“确定”以取消您对XML的修改，或选择“取消”以继续编辑XML。"
+  loadError: "无法载入您保存的文件。您是否使用其他版本的Blockly创建该文件的？",
+  parseError: "%1解析错误：\n%2\n\n选择“确定”以取消您对%1的修改，或选择“取消”以继续编辑%1。"
 };
diff --git a/demos/code/msg/zh-hant.js b/demos/code/msg/zh-hant.js
index 48a8b5272..fd7193268 100644
--- a/demos/code/msg/zh-hant.js
+++ b/demos/code/msg/zh-hant.js
@@ -19,6 +19,6 @@ var MSG = {
   httpRequestError: "命令出現錯誤。",
   linkAlert: "透過此連結分享您的積木組：\n\n%1",
   hashError: "對不起，「%1」並未對應任何已保存的程式。",
-  xmlError: "未能載入您保存的檔案。或許它是由其他版本的Blockly創建？",
-  badXml: "解析 XML 時出現錯誤：\n%1\n\n選擇'確定'以放棄您的更改，或選擇'取消'以進一步編輯 XML。"
+  loadError: "未能載入您保存的檔案。或許它是由其他版本的Blockly創建？",
+  parseError: "解析 %1 時出現錯誤：\n%2\n\n選擇'確定'以放棄您的更改，或選擇'取消'以進一步編輯 %1。"
 };

From 0e0c5fea0edef253f33624bcb57b5542172b2be3 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Fri, 10 Sep 2021 16:11:20 +0000
Subject: [PATCH 791/833] fix: dragging variables from flyout (#5434)

* fix: dragging variables from flyout

* fix: rename positionBlock_ to positionNewBlock_

* fix: type

* fix: try alternative method for handling variables in flyout
---
 core/block.js                         |  2 +-
 core/field.js                         |  5 +-
 core/field_variable.js                | 14 ++++--
 core/flyout_base.js                   | 15 +++++-
 core/serialization/blocks.js          | 44 ++++++++++------
 tests/mocha/field_variable_test.js    | 55 +++++++++++++++-----
 tests/mocha/jso_serialization_test.js | 72 +++++++++++++++++++++++++++
 7 files changed, 173 insertions(+), 34 deletions(-)

diff --git a/core/block.js b/core/block.js
index eb072da34..c73649a4c 100644
--- a/core/block.js
+++ b/core/block.js
@@ -1074,7 +1074,7 @@ Block.prototype.getField = function(name) {
 
 /**
  * Return all variables referenced by this block.
- * @return {!Array<string>} List of variable names.
+ * @return {!Array<string>} List of variable ids.
  */
 Block.prototype.getVars = function() {
   const vars = [];
diff --git a/core/field.js b/core/field.js
index 647a366c8..a82a31164 100644
--- a/core/field.js
+++ b/core/field.js
@@ -437,10 +437,13 @@ Field.prototype.toXml = function(fieldElement) {
 /**
  * Saves this fields value as something which can be serialized to JSON. Should
  * only be called by the serialization system.
+ * @param {boolean=} _doFullSerialization If true, this signals to the field that
+ *     if it normally just saves a reference to some state (eg variable fields)
+ *     it should instead serialize the full state of the thing being referenced.
  * @return {*} JSON serializable state.
  * @package
  */
-Field.prototype.saveState = function() {
+Field.prototype.saveState = function(_doFullSerialization) {
   const legacyState = this.saveLegacyState(Field);
   if (legacyState !== null) {
     return legacyState;
diff --git a/core/field_variable.js b/core/field_variable.js
index 7e76f7e35..331b06dc0 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -199,20 +199,28 @@ FieldVariable.prototype.toXml = function(fieldElement) {
 
 /**
  * Saves this field's value.
- * @return {*} The ID of the variable referenced by this field.
+ * @param {boolean=} doFullSerialization If true, the variable field will
+ *     serialize the full state of the field being referenced (ie ID, name,
+ *     and type) rather than just a reference to it (ie ID).
+ * @return {*} The state of the variable field.
  * @override
  * @package
  */
-FieldVariable.prototype.saveState = function() {
+FieldVariable.prototype.saveState = function(doFullSerialization) {
   const legacyState = this.saveLegacyState(FieldVariable);
   if (legacyState !== null) {
     return legacyState;
   }
   // Make sure the variable is initialized.
   this.initModel();
-  return {
+  const state = {
     'id': this.variable_.getId()
   };
+  if (doFullSerialization) {
+    state['name'] = this.variable_.name;
+    state['type'] = this.variable_.type;
+  }
+  return state;
 };
 
 /**
diff --git a/core/flyout_base.js b/core/flyout_base.js
index 425648574..49b291639 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -1079,6 +1079,20 @@ Flyout.prototype.placeNewBlock_ = function(oldBlock) {
   targetWorkspace.setResizesEnabled(false);
   const block = /** @type {!BlockSvg} */ (blocks.load(json, targetWorkspace));
 
+  this.positionNewBlock_(oldBlock, block);
+
+  return block;
+};
+
+/**
+ * Positions a block on the target workspace.
+ * @param {!BlockSvg} oldBlock The flyout block being copied.
+ * @param {!BlockSvg} block The block to posiiton.
+ * @private
+ */
+Flyout.prototype.positionNewBlock_ = function(oldBlock, block) {
+  const targetWorkspace = this.targetWorkspace;
+
   // The offset in pixels between the main workspace's origin and the upper left
   // corner of the injection div.
   const mainOffsetPixels = targetWorkspace.getOriginOffsetInPixels();
@@ -1105,7 +1119,6 @@ Flyout.prototype.placeNewBlock_ = function(oldBlock) {
   finalOffset.scale(1 / targetWorkspace.scale);
 
   block.moveBy(finalOffset.x, finalOffset.y);
-  return block;
 };
 
 /**
diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index a3ee95acf..5d09190fb 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -71,7 +71,8 @@ exports.State = State;
  * Returns the state of the given block as a plain JavaScript object.
  * @param {!Block} block The block to serialize.
  * @param {{addCoordinates: (boolean|undefined), addInputBlocks:
- *     (boolean|undefined), addNextBlocks: (boolean|undefined)}=} param1
+ *     (boolean|undefined), addNextBlocks: (boolean|undefined),
+ *     doFullSerialization: (boolean|undefined)}=} param1
  *     addCoordinates: If true, the coordinates of the block are added to the
  *       serialized state. False by default.
  *     addinputBlocks: If true, children of the block which are connected to
@@ -79,6 +80,10 @@ exports.State = State;
  *     addNextBlocks: If true, children of the block which are connected to the
  *       block's next connection (if it exists) will be serialized.
  *       True by default.
+ *     doFullSerialization: If true, fields that normally just save a reference
+ *       to some external state (eg variables) will instead serialize all of the
+ *       info about that state. This supports deserializing the block into a
+ *       workspace where that state doesn't yet exist. True by default.
  * @return {?State} The serialized state of the block, or null if the block
  *     could not be serialied (eg it was an insertion marker).
  */
@@ -87,7 +92,8 @@ const save = function(
     {
       addCoordinates = false,
       addInputBlocks = true,
-      addNextBlocks = true
+      addNextBlocks = true,
+      doFullSerialization = true,
     } = {}
 ) {
   if (block.isInsertionMarker()) {
@@ -105,12 +111,12 @@ const save = function(
   saveAttributes(block, state);
   saveExtraState(block, state);
   saveIcons(block, state);
-  saveFields(block, state);
+  saveFields(block, state, doFullSerialization);
   if (addInputBlocks) {
-    saveInputBlocks(block, state);
+    saveInputBlocks(block, state, doFullSerialization);
   }
   if (addNextBlocks) {
-    saveNextBlocks(block, state);
+    saveNextBlocks(block, state, doFullSerialization);
   }
 
   return state;
@@ -195,8 +201,11 @@ const saveIcons = function(block, state) {
  * Adds the state of all of the fields on the block to the given state object.
  * @param {!Block} block The block to serialize the field state of.
  * @param {!State} state The state object to append to.
+ * @param {boolean} doFullSerialization Whether or not to serialize the full
+ *     state of the field (rather than possibly saving a reference to some
+ *     state).
  */
-const saveFields = function(block, state) {
+const saveFields = function(block, state, doFullSerialization) {
   let hasFieldState = false;
   const fields = Object.create(null);
   for (let i = 0; i < block.inputList.length; i++) {
@@ -205,7 +214,7 @@ const saveFields = function(block, state) {
       const field = input.fieldRow[j];
       if (field.isSerializable()) {
         hasFieldState = true;
-        fields[field.name] = field.saveState();
+        fields[field.name] = field.saveState(doFullSerialization);
       }
     }
   }
@@ -219,16 +228,17 @@ const saveFields = function(block, state) {
  * connected to inputs) to the given state object.
  * @param {!Block} block The block to serialize the input blocks of.
  * @param {!State} state The state object to append to.
+ * @param {boolean} doFullSerialization Whether or not to do full serialization.
  */
-const saveInputBlocks = function(block, state) {
+const saveInputBlocks = function(block, state, doFullSerialization) {
   const inputs = Object.create(null);
   for (let i = 0; i < block.inputList.length; i++) {
     const input = block.inputList[i];
     if (input.type === inputTypes.DUMMY) {
       continue;
     }
-    const connectionState =
-        saveConnection(/** @type {!Connection} */ (input.connection));
+    const connectionState = saveConnection(
+        /** @type {!Connection} */ (input.connection), doFullSerialization);
     if (connectionState) {
       inputs[input.name] = connectionState;
     }
@@ -244,12 +254,14 @@ const saveInputBlocks = function(block, state) {
  * state object.
  * @param {!Block} block The block to serialize the next blocks of.
  * @param {!State} state The state object to append to.
+ * @param {boolean} doFullSerialization Whether or not to do full serialization.
  */
-const saveNextBlocks = function(block, state) {
+const saveNextBlocks = function(block, state, doFullSerialization) {
   if (!block.nextConnection) {
     return;
   }
-  const connectionState = saveConnection(block.nextConnection);
+  const connectionState = saveConnection(
+      block.nextConnection, doFullSerialization);
   if (connectionState) {
     state['next'] = connectionState;
   }
@@ -262,8 +274,9 @@ const saveNextBlocks = function(block, state) {
  *     blocks of.
  * @return {?ConnectionState} An object containing the state of any connected
  *     shadow block, or any connected real block.
+ * @param {boolean} doFullSerialization Whether or not to do full serialization.
  */
-const saveConnection = function(connection) {
+const saveConnection = function(connection, doFullSerialization) {
   const shadow = connection.getShadowState(true);
   const child = connection.targetBlock();
   if (!shadow && !child) {
@@ -274,7 +287,7 @@ const saveConnection = function(connection) {
     state['shadow'] = shadow;
   }
   if (child && !child.isShadow()) {
-    state['block'] = save(child);
+    state['block'] = save(child, {doFullSerialization});
   }
   return state;
 };
@@ -640,7 +653,8 @@ class BlockSerializer {
   save(workspace) {
     const blockState = [];
     for (const block of workspace.getTopBlocks(false)) {
-      const state = saveBlock(block, {addCoordinates: true});
+      const state = saveBlock(
+          block, {addCoordinates: true, doFullSerialization: false});
       if (state) {
         blockState.push(state);
       }
diff --git a/tests/mocha/field_variable_test.js b/tests/mocha/field_variable_test.js
index 5eb2a9ce0..0bee6acda 100644
--- a/tests/mocha/field_variable_test.js
+++ b/tests/mocha/field_variable_test.js
@@ -394,21 +394,50 @@ suite('Variable Fields', function() {
       workspaceTeardown.call(this, this.workspace);
     });
 
-    test('Untyped', function() {
-      const block = this.workspace.newBlock('row_block');
-      const field = new Blockly.FieldVariable('x');
-      block.getInput('INPUT').appendField(field, 'VAR');
-      const jso = Blockly.serialization.blocks.save(block);
-      chai.assert.deepEqual(jso['fields'], {'VAR': {'id': 'id2'}});
+    suite('Full', function() {
+      test('Untyped', function() {
+        const block = this.workspace.newBlock('row_block');
+        const field = new Blockly.FieldVariable('x');
+        block.getInput('INPUT').appendField(field, 'VAR');
+        const jso = Blockly.serialization.blocks.save(block);
+        chai.assert.deepEqual(
+            jso['fields'], {'VAR': {'id': 'id2', 'name': 'x', 'type': ''}});
+      });
+  
+      test('Typed', function() {
+        const block = this.workspace.newBlock('row_block');
+        const field =
+            new Blockly.FieldVariable('x', undefined, undefined, 'String');
+        block.getInput('INPUT').appendField(field, 'VAR');
+        const jso = Blockly.serialization.blocks.save(block);
+        chai.assert.deepEqual(
+            jso['fields'], {'VAR': {'id': 'id2', 'name': 'x', 'type': 'String'}});
+      });
     });
 
-    test('Typed', function() {
-      const block = this.workspace.newBlock('row_block');
-      const field =
-          new Blockly.FieldVariable('x', undefined, undefined, ['String']);
-      block.getInput('INPUT').appendField(field, 'VAR');
-      const jso = Blockly.serialization.blocks.save(block);
-      chai.assert.deepEqual(jso['fields'], {'VAR': {'id': 'id2'}});
+    suite('Not full', function() {
+      test('Untyped', function() {
+        const block = this.workspace.newBlock('row_block');
+        const field = new Blockly.FieldVariable('x');
+        block.getInput('INPUT').appendField(field, 'VAR');
+        const jso = Blockly.serialization.blocks.save(
+            block, {doFullSerialization: false});
+        chai.assert.deepEqual(jso['fields'], {'VAR': {'id': 'id2'}});
+        chai.assert.isUndefined(jso['fields']['VAR']['name']);
+        chai.assert.isUndefined(jso['fields']['VAR']['type']);
+      });
+  
+      test('Typed', function() {
+        const block = this.workspace.newBlock('row_block');
+        const field =
+            new Blockly.FieldVariable('x', undefined, undefined, 'String');
+        block.getInput('INPUT').appendField(field, 'VAR');
+        const jso = Blockly.serialization.blocks.save(
+            block, {doFullSerialization: false});
+        chai.assert.deepEqual(jso['fields'], {'VAR': {'id': 'id2'}});
+        chai.assert.isUndefined(jso['fields']['VAR']['name']);
+        chai.assert.isUndefined(jso['fields']['VAR']['type']);
+      });
     });
   });
 
diff --git a/tests/mocha/jso_serialization_test.js b/tests/mocha/jso_serialization_test.js
index cfd931d3e..1b40a4b97 100644
--- a/tests/mocha/jso_serialization_test.js
+++ b/tests/mocha/jso_serialization_test.js
@@ -699,6 +699,78 @@ suite('JSO Serialization', function() {
         });
       });
     });
+
+    suite('Do full serialization', function() {
+      suite('True', function() {
+        test('Single block', function() {
+          var block = this.workspace.newBlock('variables_get');
+          var jso = Blockly.serialization.blocks.save(block);
+          chai.assert.deepEqual(
+              jso['fields']['VAR'], {'id': 'id2', 'name': 'item', 'type': ''});
+        });
+
+        test('Input block', function() {
+          var block = this.workspace.newBlock('row_block');
+          var childBlock = this.workspace.newBlock('variables_get');
+          block.getInput('INPUT').connection.connect(
+              childBlock.outputConnection);
+          var jso = Blockly.serialization.blocks.save(block);
+          chai.assert.deepEqual(
+              jso['inputs']['INPUT']['block']['fields']['VAR'],
+              {'id': 'id4', 'name': 'item', 'type': ''});
+        });
+
+        test('Next block', function() {
+          var block = this.workspace.newBlock('stack_block');
+          var childBlock = this.workspace.newBlock('variables_set');
+          block.nextConnection.connect(childBlock.previousConnection);
+          var jso = Blockly.serialization.blocks.save(block);
+          chai.assert.deepEqual(
+              jso['next']['block']['fields']['VAR'],
+              {'id': 'id4', 'name': 'item', 'type': ''});
+        });
+      });
+
+      suite('False', function() {
+        test('Single block', function() {
+          var block = this.workspace.newBlock('variables_get');
+          var jso = Blockly.serialization.blocks.save(
+              block, {doFullSerialization: false});
+          chai.assert.deepEqual(jso['fields']['VAR'], {'id': 'id2'});
+          chai.assert.isUndefined(jso['fields']['VAR']['name']);
+          chai.assert.isUndefined(jso['fields']['VAR']['type']);
+        });
+
+        test('Input block', function() {
+          var block = this.workspace.newBlock('row_block');
+          var childBlock = this.workspace.newBlock('variables_get');
+          block.getInput('INPUT').connection.connect(
+              childBlock.outputConnection);
+          var jso = Blockly.serialization.blocks.save(
+              block, {doFullSerialization: false});
+          chai.assert.deepEqual(
+              jso['inputs']['INPUT']['block']['fields']['VAR'], {'id': 'id4'});
+          chai.assert.isUndefined(
+              jso['inputs']['INPUT']['block']['fields']['VAR']['name']);
+          chai.assert.isUndefined(
+              jso['inputs']['INPUT']['block']['fields']['VAR']['type']);
+        });
+
+        test('Next block', function() {
+          var block = this.workspace.newBlock('stack_block');
+          var childBlock = this.workspace.newBlock('variables_set');
+          block.nextConnection.connect(childBlock.previousConnection);
+          var jso = Blockly.serialization.blocks.save(
+              block, {doFullSerialization: false});
+          chai.assert.deepEqual(
+              jso['next']['block']['fields']['VAR'], {'id': 'id4'});
+          chai.assert.isUndefined(
+              jso['next']['block']['fields']['VAR']['name']);
+          chai.assert.isUndefined(
+              jso['next']['block']['fields']['VAR']['type']);
+        });
+      });
+    });
   });
 
   suite('Variables', function() {

From e9541930092b95ee6af339177c89a4f15654e237 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Fri, 10 Sep 2021 21:05:17 +0000
Subject: [PATCH 792/833] fix: project cereal cleanup (#5398)

* fix: make exception constructors package

* fix: rename blocks.load to blocks.append

* fix: inline docs

* fix: consistency in block serialization

* fix: remove unexported functions

* fix: interface requires

* fix: tag TODO with issue number
---
 core/connection.js                      |  2 +-
 core/events/events_block_create.js      |  2 +-
 core/events/events_block_delete.js      |  2 +-
 core/flyout_base.js                     |  6 +--
 core/interfaces/i_serializer.js         | 22 ++++-----
 core/registry.js                        |  2 +-
 core/serialization/blocks.js            | 64 +++++++++++--------------
 core/serialization/exceptions.js        |  4 ++
 core/serialization/variables.js         | 59 +++++------------------
 core/utils/toolbox.js                   |  3 --
 core/workspace_svg.js                   |  2 +-
 tests/deps.js                           |  4 +-
 tests/mocha/block_create_event_test.js  |  2 +-
 tests/mocha/connection_test.js          | 55 +++++++++++----------
 tests/mocha/field_variable_test.js      |  6 +--
 tests/mocha/jso_deserialization_test.js | 10 ++--
 16 files changed, 102 insertions(+), 143 deletions(-)

diff --git a/core/connection.js b/core/connection.js
index 368729431..67d4eb5c8 100644
--- a/core/connection.js
+++ b/core/connection.js
@@ -757,7 +757,7 @@ Connection.prototype.createShadowBlock_ = function(attemptToConnect) {
 
   let blockShadow;
   if (shadowState) {
-    blockShadow = blocks.loadInternal(
+    blockShadow = blocks.appendInternal(
         shadowState,
         parentBlock.workspace,
         {
diff --git a/core/events/events_block_create.js b/core/events/events_block_create.js
index 67afa5485..f1ce54da7 100644
--- a/core/events/events_block_create.js
+++ b/core/events/events_block_create.js
@@ -94,7 +94,7 @@ BlockCreate.prototype.fromJson = function(json) {
 BlockCreate.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   if (forward) {
-    blocks.load(this.json, workspace);
+    blocks.append(this.json, workspace);
   } else {
     for (let i = 0; i < this.ids.length; i++) {
       const id = this.ids[i];
diff --git a/core/events/events_block_delete.js b/core/events/events_block_delete.js
index 7ab770a0b..0dcf88d42 100644
--- a/core/events/events_block_delete.js
+++ b/core/events/events_block_delete.js
@@ -117,7 +117,7 @@ BlockDelete.prototype.run = function(forward) {
       }
     }
   } else {
-    blocks.load(this.oldJson, workspace);
+    blocks.append(this.oldJson, workspace);
   }
 };
 
diff --git a/core/flyout_base.js b/core/flyout_base.js
index 49b291639..1f106b0f8 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -674,7 +674,7 @@ Flyout.prototype.createButton_ = function(btnInfo, isLabel) {
  * Create a block from the xml and permanently disable any blocks that were
  * defined as disabled.
  * @param {!toolbox.BlockInfo} blockInfo The info of the block.
- * @return {!BlockSvg} The block created from the blockXml.
+ * @return {!BlockSvg} The block created from the blockInfo.
  * @private
  */
 Flyout.prototype.createFlyoutBlock_ = function(blockInfo) {
@@ -694,7 +694,7 @@ Flyout.prototype.createFlyoutBlock_ = function(blockInfo) {
         blockInfo['enabled'] =
             blockInfo['disabled'] !== 'true' && blockInfo['disabled'] !== true;
       }
-      block = blocks.load(
+      block = blocks.append(
           /** @type {blocks.State} */ (blockInfo),this.workspace_);
     }
   }
@@ -1077,7 +1077,7 @@ Flyout.prototype.placeNewBlock_ = function(oldBlock) {
   const json = /** @type {!blocks.State} */ (blocks.save(oldBlock));
   // Normallly this resizes leading to weird jumps. Save it for terminateDrag.
   targetWorkspace.setResizesEnabled(false);
-  const block = /** @type {!BlockSvg} */ (blocks.load(json, targetWorkspace));
+  const block = /** @type {!BlockSvg} */ (blocks.append(json, targetWorkspace));
 
   this.positionNewBlock_(oldBlock, block);
 
diff --git a/core/interfaces/i_serializer.js b/core/interfaces/i_serializer.js
index e7b75b9e4..5976e74b3 100644
--- a/core/interfaces/i_serializer.js
+++ b/core/interfaces/i_serializer.js
@@ -19,17 +19,17 @@ const Workspace = goog.requireType('Blockly.Workspace');
 
 
 /**
- * Serializes and deserializes a plugin.
+ * Serializes and deserializes a plugin or system.
  * @interface
  */
 class ISerializer {
   constructor() {
     /**
-     * A priority value used to determine the order of deserializing plugins.
+     * A priority value used to determine the order of deserializing state.
      * More positive priorities are deserialized before less positive
      * priorities. Eg if you have priorities (0, -10, 10, 100) the order of
      * deserialiation will be (100, 10, 0, -10).
-     * If two plugins have the same priority, they are deserialized in an
+     * If two serializers have the same priority, they are deserialized in an
      * arbitrary order relative to each other.
      * @type {number}
      */
@@ -39,10 +39,10 @@ class ISerializer {
   /* eslint-disable no-unused-vars, valid-jsdoc */
 
   /**
-   * Saves the state of the plugin.
-   * @param {!Workspace} workspace The workspace the plugin to serialize is
+   * Saves the state of the plugin or system.
+   * @param {!Workspace} workspace The workspace the system to serialize is
    *     associated with.
-   * @return {?} A JS object containing the plugin's state, or null if
+   * @return {?} A JS object containing the system's state, or null if
    *     there is no state to record.
    */
   save(workspace) {}
@@ -50,17 +50,17 @@ class ISerializer {
   /* eslint-enable valid-jsdoc */
 
   /**
-   * Loads the state of the plugin.
-   * @param {?} state The state of the plugin to deserialize. This will always
+   * Loads the state of the plugin or system.
+   * @param {?} state The state of the system to deserialize. This will always
    *     be non-null.
-   * @param {!Workspace} workspace The workspace the plugin to deserialize is
+   * @param {!Workspace} workspace The workspace the system to deserialize is
    *     associated with.
    */
   load(state, workspace) {}
 
   /**
-   * Clears the state of the plugin.
-   * @param {!Workspace} workspace The workspace the plugin to clear the state
+   * Clears the state of the plugin or system.
+   * @param {!Workspace} workspace The workspace the system to clear the state
    *     of is associated with.
    */
   clear(workspace) {}
diff --git a/core/registry.js b/core/registry.js
index 671daa631..c7afaf646 100644
--- a/core/registry.js
+++ b/core/registry.js
@@ -145,7 +145,7 @@ Type.SERIALIZER = new Type('serializer');
  *     an already registered item.
  * @throws {Error} if the type or name is empty, a name with the given type has
  *     already been registered, or if the given class or object is not valid for
- *     it's type.
+ *     its type.
  * @template T
  */
 const register = function(type, name, registryItem, opt_allowOverrides) {
diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index 5d09190fb..e8af944cc 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -20,7 +20,7 @@ const Block = goog.requireType('Blockly.Block');
 const Connection = goog.requireType('Blockly.Connection');
 const Events = goog.require('Blockly.Events');
 // eslint-disable-next-line no-unused-vars
-const {ISerializer} = goog.requireType('Blockly.serialization.ISerializer');
+const {ISerializer} = goog.require('Blockly.serialization.ISerializer');
 const Size = goog.require('Blockly.utils.Size');
 // eslint-disable-next-line no-unused-vars
 const Workspace = goog.requireType('Blockly.Workspace');
@@ -30,7 +30,7 @@ const priorities = goog.require('Blockly.serialization.priorities');
 const serializationRegistry = goog.require('Blockly.serialization.registry');
 
 
-// TODO: Remove this once lint is fixed.
+// TODO(#5160): Remove this once lint is fixed.
 /* eslint-disable no-use-before-define */
 
 /**
@@ -52,9 +52,6 @@ exports.ConnectionState = ConnectionState;
  *     y: (number|undefined),
  *     collapsed: (boolean|undefined),
  *     enabled: (boolean|undefined),
- *     editable: (boolean|undefined),
- *     deletable: (boolean|undefined),
- *     movable: (boolean|undefined),
  *     inline: (boolean|undefined),
  *     data: (string|undefined),
  *     extra-state: (*|undefined),
@@ -148,8 +145,8 @@ const saveAttributes = function(block, state) {
 
 /**
  * Adds the coordinates of the given block to the given state object.
- * @param {!Block} block The block to base the coordinates on
- * @param {!State} state The state object to append to
+ * @param {!Block} block The block to base the coordinates on.
+ * @param {!State} state The state object to append to.
  */
 const saveCoords = function(block, state) {
   const workspace = block.workspace;
@@ -206,19 +203,17 @@ const saveIcons = function(block, state) {
  *     state).
  */
 const saveFields = function(block, state, doFullSerialization) {
-  let hasFieldState = false;
   const fields = Object.create(null);
   for (let i = 0; i < block.inputList.length; i++) {
     const input = block.inputList[i];
     for (let j = 0; j < input.fieldRow.length; j++) {
       const field = input.fieldRow[j];
       if (field.isSerializable()) {
-        hasFieldState = true;
         fields[field.name] = field.saveState(doFullSerialization);
       }
     }
   }
-  if (hasFieldState) {
+  if (Object.keys(fields).length) {
     state['fields'] = fields;
   }
 };
@@ -301,10 +296,10 @@ const saveConnection = function(connection, doFullSerialization) {
  *       by the user. False by default.
  * @return {!Block} The block that was just loaded.
  */
-const load = function(state, workspace, {recordUndo = false} = {}) {
-  return loadInternal(state, workspace, {recordUndo});
+const append = function(state, workspace, {recordUndo = false} = {}) {
+  return appendInternal(state, workspace, {recordUndo});
 };
-exports.load = load;
+exports.append = append;
 
 /**
  * Loads the block represented by the given state into the given workspace.
@@ -318,13 +313,13 @@ exports.load = load;
  *     (boolean|undefined), recordUndo: (boolean|undefined)}=} param1
  *     parentConnection: If provided, the system will attempt to connect the
  *       block to this connection after it is created. Undefined by default.
- *     isShadow: The block will be set to a shadow block after it is created.
- *       False by default.
+ *     isShadow: If true, the block will be set to a shadow block after it is
+ *       created. False by default.
  *     recordUndo: If true, events triggered by this function will be undo-able
  *       by the user. False by default.
- * @return {!Block} The block that was just loaded.
+ * @return {!Block} The block that was just appended.
  */
-const loadInternal = function(
+const appendInternal = function(
     state,
     workspace,
     {
@@ -341,7 +336,7 @@ const loadInternal = function(
   }
   Events.disable();
 
-  const block = loadPrivate(state, workspace, {parentConnection, isShadow});
+  const block = appendPrivate(state, workspace, {parentConnection, isShadow});
 
   Events.enable();
   Events.fire(new (Events.get(Events.BLOCK_CREATE))(block));
@@ -361,24 +356,24 @@ const loadInternal = function(
   return block;
 };
 /** @package */
-exports.loadInternal = loadInternal;
+exports.appendInternal = appendInternal;
 
 /**
  * Loads the block represented by the given state into the given workspace.
  * This is defined privately so that it can be called recursively without firing
  * eroneous events. Events (and other things we only want to occur on the top
- * block) are handled by loadInternal.
+ * block) are handled by appendInternal.
  * @param {!State} state The state of a block to deserialize into the workspace.
  * @param {!Workspace} workspace The workspace to add the block to.
- * @param {{parentConnection: (!Connection|undefined), isShadow:
- *     (boolean|undefined), recordUndo: (boolean|undefined)}=} param1
+ * @param {{parentConnection: (!Connection|undefined),
+ *     isShadow: (boolean|undefined)}=} param1
  *     parentConnection: If provided, the system will attempt to connect the
  *       block to this connection after it is created. Undefined by default.
  *     isShadow: The block will be set to a shadow block after it is created.
  *       False by default.
- * @return {!Block} The block that was just loaded.
+ * @return {!Block} The block that was just appended.
  */
-const loadPrivate = function(
+const appendPrivate = function(
     state,
     workspace,
     {
@@ -460,9 +455,9 @@ const loadExtraState = function(block, state) {
 
 /**
  * Attempts to connect the block to the parent connection, if it exists.
- * @param {(!Connection|undefined)} parentConnection The parent connnection to
+ * @param {(!Connection|undefined)} parentConnection The parent connection to
  *     try to connect the block to.
- * @param {!Block} child The block to try to conecnt to the parent.
+ * @param {!Block} child The block to try to connect to the parent.
  * @param {!State} state The state which defines the given block
  */
 const tryToConnectParent = function(parentConnection, child, state) {
@@ -591,7 +586,7 @@ const loadNextBlocks = function(block, state) {
 /**
  * Applies the state defined by connectionState to the given connection, ie
  * assigns shadows and attaches child blocks.
- * @param {!Connection} connection The connection to serialize the
+ * @param {!Connection} connection The connection to deserialize the
  *     connected blocks of.
  * @param {!ConnectionState} connectionState The object containing the state of
  *     any connected shadow block, or any connected real block.
@@ -601,7 +596,7 @@ const loadConnection = function(connection, connectionState) {
     connection.setShadowState(connectionState['shadow']);
   }
   if (connectionState['block']) {
-    loadPrivate(
+    appendPrivate(
         connectionState['block'],
         connection.getSourceBlock().workspace,
         {parentConnection: connection});
@@ -627,9 +622,8 @@ const initBlock = function(block, rendered) {
   }
 };
 
-// Aliases to disambiguate saving/loading within the serializer.
+// Alias to disambiguate saving within the serializer.
 const saveBlock = save;
-const loadBlock = load;
 
 /**
  * Serializer for saving and loading block state.
@@ -651,18 +645,18 @@ class BlockSerializer {
    *     the workspace's blocks, or null if there are no blocks.
    */
   save(workspace) {
-    const blockState = [];
+    const blockStates = [];
     for (const block of workspace.getTopBlocks(false)) {
       const state = saveBlock(
           block, {addCoordinates: true, doFullSerialization: false});
       if (state) {
-        blockState.push(state);
+        blockStates.push(state);
       }
     }
-    if (blockState.length) {
+    if (blockStates.length) {
       return {
         'languageVersion': 0, // Currently unused.
-        'blocks': blockState
+        'blocks': blockStates
       };
     }
     return null;
@@ -678,7 +672,7 @@ class BlockSerializer {
   load(state, workspace) {
     const blockStates = state['blocks'];
     for (const state of blockStates) {
-      loadBlock(state, workspace, {recordUndo: Events.getRecordUndo()});
+      append(state, workspace, {recordUndo: Events.getRecordUndo()});
     }
   }
 
diff --git a/core/serialization/exceptions.js b/core/serialization/exceptions.js
index 0ddb021a2..1d6cd129c 100644
--- a/core/serialization/exceptions.js
+++ b/core/serialization/exceptions.js
@@ -27,6 +27,7 @@ exports.DeserializationError = DeserializationError;
 class MissingBlockType extends DeserializationError {
   /**
    * @param {!State} state The state object which is missing the block type.
+   * @package
    */
   constructor(state) {
     super(`Expected to find a 'type' property, defining the block type`);
@@ -50,6 +51,7 @@ class MissingConnection extends DeserializationError {
    *     'IF0', or 'next'.
    * @param {!Blockly.Block} block The block missing the connection.
    * @param {!State} state The state object containing the bad connection.
+   * @package
    */
   constructor(connection, block, state) {
     super(`The block ${block.toDevString()} is missing a(n) ${connection}
@@ -82,6 +84,7 @@ class BadConnectionCheck extends DeserializationError {
    * @param {!Blockly.Block} childBlock The child block that could not connect
    *     to its parent.
    * @param {!State} childState The state object representing the child block.
+   * @package
    */
   constructor(reason, childConnection, childBlock, childState) {
     super(`The block ${childBlock.toDevString()} could not connect its
@@ -112,6 +115,7 @@ exports.BadConnectionCheck = BadConnectionCheck;
 class RealChildOfShadow extends DeserializationError {
   /**
    * @param {!State} state The state object representing the real block.
+   * @package
    */
   constructor(state) {
     super(`Encountered a real block which is defined as a child of a shadow
diff --git a/core/serialization/variables.js b/core/serialization/variables.js
index 9606f32d2..1d4786c66 100644
--- a/core/serialization/variables.js
+++ b/core/serialization/variables.js
@@ -13,11 +13,8 @@
 goog.module('Blockly.serialization.variables');
 goog.module.declareLegacyNamespace();
 
-const Events = goog.require('Blockly.Events');
 // eslint-disable-next-line no-unused-vars
-const {ISerializer} = goog.requireType('Blockly.serialization.ISerializer');
-// eslint-disable-next-line no-unused-vars
-const VariableModel = goog.requireType('Blockly.VariableModel');
+const {ISerializer} = goog.require('Blockly.serialization.ISerializer');
 // eslint-disable-next-line no-unused-vars
 const Workspace = goog.requireType('Blockly.Workspace');
 const priorities = goog.require('Blockly.serialization.priorities');
@@ -35,45 +32,6 @@ const serializationRegistry = goog.require('Blockly.serialization.registry');
 var State;
 exports.State = State;
 
-/**
- * Returns the state of the variable as a plain JavaScript object.
- * @param {!VariableModel} variableModel The variable to serialize.
- * @return {!State} The serialized state of the variable.
- */
-const saveVariable = function(variableModel) {
-  const state = {
-    'name': variableModel.name,
-    'id': variableModel.getId()
-  };
-  if (variableModel.type) {
-    state['type'] = variableModel.type;
-  }
-  return state;
-};
-
-/**
- * Loads the variable represented by the given state into the given workspace.
- * @param {!State} state The state of a variable to deserialize into the
- *     workspace.
- * @param {!Workspace} workspace The workspace to add the variable to.
- * @param {{recordUndo: (boolean|undefined)}=} param1
- *     recordUndo: If true, events triggered by this function will be undo-able
- *       by the user. False by default.
- */
-const loadVariable = function(state, workspace, {recordUndo = false} = {}) {
-  const prevRecordUndo = Events.getRecordUndo();
-  Events.setRecordUndo(recordUndo);
-  const existingGroup = Events.getGroup();
-  if (!existingGroup) {
-    Events.setGroup(true);
-  }
-
-  workspace.createVariable(state['name'], state['type'], state['id']);
-
-  Events.setGroup(existingGroup);
-  Events.setRecordUndo(prevRecordUndo);
-};
-
 /**
  * Serializer for saving and loading variable state.
  * @implements {ISerializer}
@@ -96,7 +54,14 @@ class VariableSerializer {
   save(workspace) {
     const variableStates = [];
     for (const variable of workspace.getAllVariables()) {
-      variableStates.push(saveVariable(variable));
+      const state = {
+        'name': variable.name,
+        'id': variable.getId()
+      };
+      if (variable.type) {
+        state['type'] = variable.type;
+      }
+      variableStates.push(state);
     }
     return variableStates.length ? variableStates : null;
   }
@@ -109,13 +74,13 @@ class VariableSerializer {
    */
   load(state, workspace) {
     for (const varState of state) {
-      loadVariable(varState, workspace, {recordUndo: Events.getRecordUndo()});
+      workspace.createVariable(
+          varState['name'], varState['type'], varState['id']);
     }
   }
 
   /**
-   * Disposes of any variables or potential variables that exist on the
-   * workspace.
+   * Disposes of any variables that exist on the workspace.
    * @param {!Workspace} workspace The workspace to clear the variables of.
    */
   clear(workspace) {
diff --git a/core/utils/toolbox.js b/core/utils/toolbox.js
index 157addeb0..3c26205b8 100644
--- a/core/utils/toolbox.js
+++ b/core/utils/toolbox.js
@@ -39,9 +39,6 @@ const userAgent = goog.require('Blockly.utils.userAgent');
  *            x: (number|undefined),
  *            y: (number|undefined),
  *            collapsed: (boolean|undefined),
- *            editable: (boolean|undefined),
- *            deletable: (boolean|undefined),
- *            movable: (boolean|undefined),
  *            inline: (boolean|undefined),
  *            data: (string|undefined),
  *            extra-state: (*|undefined),
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 241d81504..f65f379b8 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -1550,7 +1550,7 @@ WorkspaceSvg.prototype.pasteBlock_ = function(xmlBlock, jsonBlock) {
       blockX = parseInt(xmlBlock.getAttribute('x'), 10);
       blockY = parseInt(xmlBlock.getAttribute('y'), 10);
     } else if (jsonBlock) {
-      block = blocks.load(jsonBlock, this);
+      block = blocks.append(jsonBlock, this);
       blockX = jsonBlock['x'] || 10;
       blockY = jsonBlock['y'] || 10;
     }
diff --git a/tests/deps.js b/tests/deps.js
index 711a49591..09ba89fff 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -197,11 +197,11 @@ goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Ren
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.registry', 'Blockly.serialization.variables', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes', 'Blockly.serialization.exceptions', 'Blockly.serialization.priorities', 'Blockly.serialization.registry', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes', 'Blockly.serialization.ISerializer', 'Blockly.serialization.exceptions', 'Blockly.serialization.priorities', 'Blockly.serialization.registry', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/exceptions.js', ['Blockly.serialization.exceptions'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/priorities.js', ['Blockly.serialization.priorities'], [], {'module': 'goog'});
 goog.addDependency('../../core/serialization/registry.js', ['Blockly.serialization.registry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.Events', 'Blockly.serialization.priorities', 'Blockly.serialization.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.serialization.ISerializer', 'Blockly.serialization.priorities', 'Blockly.serialization.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Events', 'Blockly.Workspace', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/block_create_event_test.js b/tests/mocha/block_create_event_test.js
index 72971c9d4..b1a07e7dd 100644
--- a/tests/mocha/block_create_event_test.js
+++ b/tests/mocha/block_create_event_test.js
@@ -21,7 +21,7 @@ suite('Block Create Event', function() {
 
   test('Create shadow on disconnect', function() {
     Blockly.Events.disable();
-    const block = Blockly.serialization.blocks.load(
+    const block = Blockly.serialization.blocks.append(
         {
           "type": "text_print",
           "inputs": {
diff --git a/tests/mocha/connection_test.js b/tests/mocha/connection_test.js
index aa3ebabd0..f10338540 100644
--- a/tests/mocha/connection_test.js
+++ b/tests/mocha/connection_test.js
@@ -1352,18 +1352,18 @@ suite('Connection', function() {
           suite('Add - No Block Connected', function() {
             // These are defined separately in each suite.
             function createRowBlock(workspace) {
-              return Blockly.serialization.blocks
-                  .load({'type': 'row_block', 'id': 'id0'}, workspace);
+              return Blockly.serialization.blocks.append(
+                  {'type': 'row_block', 'id': 'id0'}, workspace);
             }
   
             function createStatementBlock(workspace) {
-              return Blockly.serialization.blocks
-                  .load({'type': 'statement_block', 'id': 'id0'}, workspace);
+              return Blockly.serialization.blocks.append(
+                  {'type': 'statement_block', 'id': 'id0'}, workspace);
             }
   
             function createStackBlock(workspace) {
-              return Blockly.serialization.blocks
-                  .load({'type': 'stack_block', 'id': 'id0'}, workspace);
+              return Blockly.serialization.blocks.append(
+                  {'type': 'stack_block', 'id': 'id0'}, workspace);
             }
 
             test('Value', function() {
@@ -1551,7 +1551,6 @@ suite('Connection', function() {
                   '</block>'
               );
             });
-
             test('Multiple Next', function() {
               var parent = createStackBlock(this.workspace);
               parent.nextConnection.setShadowState({
@@ -1601,7 +1600,7 @@ suite('Connection', function() {
           suite('Add - With Block Connected', function() {
             // These are defined separately in each suite.
             function createRowBlocks(workspace) {
-              return Blockly.serialization.blocks.load(
+              return Blockly.serialization.blocks.append(
                   {
                     'type': 'row_block',
                     'id': 'id0',
@@ -1618,7 +1617,7 @@ suite('Connection', function() {
             }
   
             function createStatementBlocks(workspace) {
-              return Blockly.serialization.blocks.load(
+              return Blockly.serialization.blocks.append(
                   {
                     'type': 'statement_block',
                     'id': 'id0',
@@ -1635,7 +1634,7 @@ suite('Connection', function() {
             }
   
             function createStackBlocks(workspace) {
-              return Blockly.serialization.blocks.load(
+              return Blockly.serialization.blocks.append(
                   {
                     'type': 'stack_block',
                     'id': 'id0',
@@ -1906,18 +1905,18 @@ suite('Connection', function() {
           suite('Add - With Shadow Connected', function() {
             // These are defined separately in each suite.
             function createRowBlock(workspace) {
-              return Blockly.serialization.blocks
-                  .load({'type': 'row_block', 'id': 'id0'}, workspace);
+              return Blockly.serialization.blocks.append(
+                  {'type': 'row_block', 'id': 'id0'}, workspace);
             }
   
             function createStatementBlock(workspace) {
-              return Blockly.serialization.blocks
-                  .load({'type': 'statement_block', 'id': 'id0'}, workspace);
+              return Blockly.serialization.blocks.append(
+                  {'type': 'statement_block', 'id': 'id0'}, workspace);
             }
   
             function createStackBlock(workspace) {
-              return Blockly.serialization.blocks
-                  .load({'type': 'stack_block', 'id': 'id0'}, workspace);
+              return Blockly.serialization.blocks.append(
+                  {'type': 'stack_block', 'id': 'id0'}, workspace);
             }
   
             test('Value', function() {
@@ -2218,7 +2217,7 @@ suite('Connection', function() {
           suite('Remove - No Block Connected', function() {
             // These are defined separately in each suite.
             function createRowBlocks(workspace) {
-              return Blockly.serialization.blocks.load(
+              return Blockly.serialization.blocks.append(
                   {
                     'type': 'row_block',
                     'id': 'id0',
@@ -2235,7 +2234,7 @@ suite('Connection', function() {
             }
   
             function createStatementBlocks(workspace) {
-              return Blockly.serialization.blocks.load(
+              return Blockly.serialization.blocks.append(
                   {
                     'type': 'statement_block',
                     'id': 'id0',
@@ -2252,7 +2251,7 @@ suite('Connection', function() {
             }
   
             function createStackBlocks(workspace) {
-              return Blockly.serialization.blocks.load(
+              return Blockly.serialization.blocks.append(
                   {
                     'type': 'stack_block',
                     'id': 'id0',
@@ -2318,7 +2317,7 @@ suite('Connection', function() {
           suite('Remove - Block Connected', function() {
             // These are defined separately in each suite.
             function createRowBlocks(workspace) {
-              return Blockly.serialization.blocks.load(
+              return Blockly.serialization.blocks.append(
                   {
                     'type': 'row_block',
                     'id': 'id0',
@@ -2339,7 +2338,7 @@ suite('Connection', function() {
             }
   
             function createStatementBlocks(workspace) {
-              return Blockly.serialization.blocks.load(
+              return Blockly.serialization.blocks.append(
                   {
                     'type': 'statement_block',
                     'id': 'id0',
@@ -2360,7 +2359,7 @@ suite('Connection', function() {
             }
   
             function createStackBlocks(workspace) {
-              return Blockly.serialization.blocks.load(
+              return Blockly.serialization.blocks.append(
                   {
                     'type': 'stack_block',
                     'id': 'id0',
@@ -2436,18 +2435,18 @@ suite('Connection', function() {
           suite('Add - Connect & Disconnect - Remove', function() {
             // These are defined separately in each suite.
             function createRowBlock(workspace) {
-              return Blockly.serialization.blocks
-                  .load({'type': 'row_block'}, workspace);
+              return Blockly.serialization.blocks.append(
+                  {'type': 'row_block'}, workspace);
             }
   
             function createStatementBlock(workspace) {
-              return Blockly.serialization.blocks
-                  .load({'type': 'statement_block'}, workspace);
+              return Blockly.serialization.blocks.append(
+                  {'type': 'statement_block'}, workspace);
             }
   
             function createStackBlock(workspace) {
-              return Blockly.serialization.blocks
-                  .load({'type': 'stack_block'}, workspace);
+              return Blockly.serialization.blocks.append(
+                  {'type': 'stack_block'}, workspace);
             }
   
             test('Value', function() {
diff --git a/tests/mocha/field_variable_test.js b/tests/mocha/field_variable_test.js
index 0bee6acda..b28781baa 100644
--- a/tests/mocha/field_variable_test.js
+++ b/tests/mocha/field_variable_test.js
@@ -454,7 +454,7 @@ suite('Variable Fields', function() {
 
     test('ID', function() {
       this.workspace.createVariable('test', '', 'id1');
-      var block = Blockly.serialization.blocks.load({
+      var block = Blockly.serialization.blocks.append({
         'type': 'variables_get',
         'fields': {
           'VAR': {
@@ -470,7 +470,7 @@ suite('Variable Fields', function() {
     });
 
     test('Name, untyped', function() {
-      var block = Blockly.serialization.blocks.load({
+      var block = Blockly.serialization.blocks.append({
         'type': 'variables_get',
         'fields': {
           'VAR': {
@@ -486,7 +486,7 @@ suite('Variable Fields', function() {
     });
 
     test('Name, typed', function() {
-      var block = Blockly.serialization.blocks.load({
+      var block = Blockly.serialization.blocks.append({
         'type': 'variables_get',
         'fields': {
           'VAR': {
diff --git a/tests/mocha/jso_deserialization_test.js b/tests/mocha/jso_deserialization_test.js
index d554af810..7e8da06fd 100644
--- a/tests/mocha/jso_deserialization_test.js
+++ b/tests/mocha/jso_deserialization_test.js
@@ -362,7 +362,7 @@ suite('JSO Deserialization', function() {
             'x': 42,
             'y': 42
           };
-          Blockly.serialization.blocks.load(state, this.workspace);
+          Blockly.serialization.blocks.append(state, this.workspace);
           assertEventFired(
               this.eventsFireStub,
               Blockly.Events.BlockCreate,
@@ -378,8 +378,8 @@ suite('JSO Deserialization', function() {
             'x': 42,
             'y': 42
           };
-          Blockly.serialization.blocks
-              .load(state, this.workspace, {'recordUndo': true});
+          Blockly.serialization.blocks.append(
+              state, this.workspace, {'recordUndo': true});
           assertEventFired(
               this.eventsFireStub,
               Blockly.Events.BlockCreate,
@@ -396,7 +396,7 @@ suite('JSO Deserialization', function() {
             'y': 42
           };
           Blockly.Events.setGroup('my group');
-          Blockly.serialization.blocks.load(state, this.workspace);
+          Blockly.serialization.blocks.append(state, this.workspace);
           assertEventFired(
               this.eventsFireStub,
               Blockly.Events.BlockCreate,
@@ -700,7 +700,7 @@ suite('JSO Deserialization', function() {
         }
       };
 
-      const block = Blockly.serialization.blocks.load(
+      const block = Blockly.serialization.blocks.append(
           {
             'type': 'test_block',
             'extraState': '<mutation value="some value"></mutation>',

From 745164405565cefb4dd7dbaa89b6b11b15a4c610 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Tue, 14 Sep 2021 18:13:37 +0000
Subject: [PATCH 793/833] fix: remove eslit disables

---
 core/field.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/field.js b/core/field.js
index a82a31164..ce55b7c3a 100644
--- a/core/field.js
+++ b/core/field.js
@@ -464,12 +464,11 @@ Field.prototype.loadState = function(state) {
   this.setValue(state);
 };
 
-// eslint-disable-next-line valid-jsdoc
 /**
  * Returns a stringified version of the XML state, if it should be used.
  * Otherwise this returns null, to signal the field should use its own
  * serialization.
- * @param {?} callingClass The class calling this method.
+ * @param {*} callingClass The class calling this method.
  *     Used to see if `this` has overridden any relevant hooks.
  * @return {?string} The stringified version of the XML state, or null.
  * @protected
@@ -488,11 +487,10 @@ Field.prototype.saveLegacyState = function(callingClass) {
   return null;
 };
 
-// eslint-disable-next-line valid-jsdoc
 /**
  * Loads the given state using either the old XML hoooks, if they should be
  * used. Returns true to indicate loading has been handled, false otherwise.
- * @param {?} callingClass The class calling this method.
+ * @param {*} callingClass The class calling this method.
  *     Used to see if `this` has overridden any relevant hooks.
  * @param {*} state The state to apply to the field.
  * @return {boolean} Whether the state was applied or not.

From d79640592f5efdf68a4f53e5c94bdce4365db950 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Mon, 20 Sep 2021 10:36:12 -0700
Subject: [PATCH 794/833] chore: rebuild deps after rebase

---
 tests/deps.js       | 18 +++++++++---------
 tests/deps.mocha.js | 22 +++++++++++-----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/tests/deps.js b/tests/deps.js
index 09ba89fff..94944cb55 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -12,11 +12,11 @@ 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.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'});
-goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'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'});
+goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bump_objects.js', ['Blockly.bumpObjects'], ['Blockly.Events', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
@@ -80,11 +80,11 @@ goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'],
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.common', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
@@ -212,13 +212,13 @@ goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Bl
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], ['Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 2dc83a1de..4c4ddea7d 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -12,11 +12,11 @@ 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.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'});
-goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'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'});
+goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bump_objects.js', ['Blockly.bumpObjects'], ['Blockly.Events', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
@@ -80,11 +80,11 @@ goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'],
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.common', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
@@ -197,11 +197,11 @@ goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Ren
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.registry', 'Blockly.serialization.variables', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes', 'Blockly.serialization.exceptions', 'Blockly.serialization.priorities', 'Blockly.serialization.registry', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes', 'Blockly.serialization.ISerializer', 'Blockly.serialization.exceptions', 'Blockly.serialization.priorities', 'Blockly.serialization.registry', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/exceptions.js', ['Blockly.serialization.exceptions'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/priorities.js', ['Blockly.serialization.priorities'], [], {'module': 'goog'});
 goog.addDependency('../../core/serialization/registry.js', ['Blockly.serialization.registry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.Events', 'Blockly.serialization.priorities', 'Blockly.serialization.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.serialization.ISerializer', 'Blockly.serialization.priorities', 'Blockly.serialization.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Events', 'Blockly.Workspace', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -212,13 +212,13 @@ goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Bl
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], ['Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});

From 66e6b6218ae92b49b48c7a69ea5e8a3bcce1f0ba Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Tue, 21 Sep 2021 08:13:38 -0700
Subject: [PATCH 795/833] Make several exported private fields/methods
 TEST_ONLY (#5479)

---
 core/events/events.js              | 17 +------
 core/extensions.js                 |  2 +-
 core/registry.js                   |  3 +-
 tests/mocha/block_test.js          |  2 +-
 tests/mocha/extensions_test.js     | 78 ++++++++++++++++++++----------
 tests/mocha/field_registry_test.js |  4 +-
 tests/mocha/logic_ternary_test.js  |  6 +--
 tests/mocha/test_helpers.js        | 12 +++--
 tests/mocha/theme_test.js          |  2 +-
 9 files changed, 71 insertions(+), 55 deletions(-)

diff --git a/core/events/events.js b/core/events/events.js
index 1f9c26bba..ef7d3cfcb 100644
--- a/core/events/events.js
+++ b/core/events/events.js
@@ -90,17 +90,6 @@ Object.defineProperties(exports, {
  * @type {number}
  */
 let disabled = 0;
-/** @private */
-exports.disabled_ = disabled;
-
-
-Object.defineProperties(exports, {
-  disabled_: {
-    set: function(newValue) {
-      disabled = newValue;
-    },
-  },
-});
 
 /**
  * Name of event that creates a block. Will be deprecated for BLOCK_CREATE.
@@ -310,8 +299,6 @@ exports.BUMP_EVENTS = BUMP_EVENTS;
  * List of events queued for firing.
  */
 const FIRE_QUEUE = [];
-/** @private */
-exports.FIRE_QUEUE_ = FIRE_QUEUE;
 
 /**
  * Create a custom event and fire it.
@@ -346,8 +333,6 @@ const fireNow = function() {
     }
   }
 };
-/** @private */
-exports.fireNow_ = fireNow;
 
 /**
  * Filter the queued events and merge duplicates.
@@ -571,3 +556,5 @@ const disableOrphans = function(event) {
   }
 };
 exports.disableOrphans = disableOrphans;
+
+exports.TEST_ONLY = {FIRE_QUEUE, fireNow};
diff --git a/core/extensions.js b/core/extensions.js
index 7c828135d..f5da2ed83 100644
--- a/core/extensions.js
+++ b/core/extensions.js
@@ -31,7 +31,7 @@ goog.requireType('Blockly.Mutator');
  * @private
  */
 const allExtensions = Object.create(null);
-exports.ALL_ = allExtensions;
+exports.TEST_ONLY = {allExtensions};
 
 /**
  * Registers a new extension function. Extensions are functions that help
diff --git a/core/registry.js b/core/registry.js
index c7afaf646..08e812f0f 100644
--- a/core/registry.js
+++ b/core/registry.js
@@ -50,8 +50,7 @@ const ISerializer = goog.requireType('Blockly.serialization.ISerializer');
  * @type {!Object<string, !Object<string, (function(new:?)|!Object)>>}
  */
 const typeMap = Object.create(null);
-/** @private */
-exports.typeMap_ = typeMap;
+exports.TEST_ONLY = {typeMap};
 
 /**
  * A map of maps. With the keys being the type and caseless name of the class we
diff --git a/tests/mocha/block_test.js b/tests/mocha/block_test.js
index 5d07b0d88..082e43f0c 100644
--- a/tests/mocha/block_test.js
+++ b/tests/mocha/block_test.js
@@ -1830,7 +1830,7 @@ suite('Blocks', function() {
       teardown(function() {
         workspaceTeardown.call(this, this.workspace);
         // Clear all registered themes.
-        Blockly.registry.typeMap_['theme'] = {};
+        Blockly.registry.TEST_ONLY.typeMap['theme'] = {};
       });
       test('Set colour hue', function() {
         this.block.setColour('20');
diff --git a/tests/mocha/extensions_test.js b/tests/mocha/extensions_test.js
index c8d789b97..07ff865f5 100644
--- a/tests/mocha/extensions_test.js
+++ b/tests/mocha/extensions_test.js
@@ -19,7 +19,7 @@ suite('Extensions', function() {
     sharedTestTeardown.call(this);
     for (let i = 0; i < this.extensionsCleanup_.length; i++) {
       var extension = this.extensionsCleanup_[i];
-      delete Blockly.Extensions.ALL_[extension];
+      delete Blockly.Extensions.TEST_ONLY.allExtensions[extension];
     }
   });
 
@@ -27,7 +27,8 @@ suite('Extensions', function() {
     this.extensionsCleanup_.push('extensions_test_before');
     this.extensionsCleanup_.push('extensions_test_after');
 
-    chai.assert.isUndefined(Blockly.Extensions.ALL_['extensions_test_before']);
+    chai.assert.isUndefined(
+        Blockly.Extensions.TEST_ONLY.allExtensions['extensions_test_before']);
     var beforeCallback = sinon.spy();
     // Extension defined before the block type is defined.
     Blockly.Extensions.register('extensions_test_before', beforeCallback);
@@ -38,13 +39,18 @@ suite('Extensions', function() {
       "extensions": ["extensions_test_before", "extensions_test_after"]
     }]);
 
-    chai.assert.isUndefined(Blockly.Extensions.ALL_['extensions_test_after']);
+    chai.assert.isUndefined(
+        Blockly.Extensions.TEST_ONLY.allExtensions['extensions_test_after']);
     var afterCallback = sinon.spy();
     // Extension defined after the block type (but before instantiation).
     Blockly.Extensions.register('extensions_test_after', afterCallback);
 
-    chai.assert.typeOf(Blockly.Extensions.ALL_['extensions_test_before'], 'function');
-    chai.assert.typeOf(Blockly.Extensions.ALL_['extensions_test_after'], 'function');
+    chai.assert.typeOf(
+        Blockly.Extensions.TEST_ONLY.allExtensions['extensions_test_before'],
+        'function');
+    chai.assert.typeOf(
+        Blockly.Extensions.TEST_ONLY.allExtensions['extensions_test_after'],
+        'function');
     sinon.assert.notCalled(beforeCallback);
     sinon.assert.notCalled(afterCallback);
 
@@ -118,11 +124,13 @@ suite('Extensions', function() {
         }
       };
 
-      chai.assert.isUndefined(Blockly.Extensions.ALL_['mixin_test']);
+      chai.assert.isUndefined(
+          Blockly.Extensions.TEST_ONLY.allExtensions['mixin_test']);
       // Extension defined before the block type is defined.
       Blockly.Extensions.registerMixin('mixin_test', testMixin);
 
-      chai.assert.typeOf(Blockly.Extensions.ALL_['mixin_test'], 'function');
+      chai.assert.typeOf(
+          Blockly.Extensions.TEST_ONLY.allExtensions['mixin_test'], 'function');
 
 
       Blockly.defineBlocksWithJsonArray([{
@@ -187,7 +195,8 @@ suite('Extensions', function() {
         // Events code calls mutationToDom and expects it to give back a
         // meaningful value.
         Blockly.Events.disable();
-        chai.assert.isUndefined(Blockly.Extensions.ALL_['extensions_test']);
+        chai.assert.isUndefined(
+            Blockly.Extensions.TEST_ONLY.allExtensions['extensions_test']);
         var helperFunctionSpy = sinon.spy();
         Blockly.Extensions.registerMutator('extensions_test',
             {
@@ -218,7 +227,8 @@ suite('Extensions', function() {
         // Events code calls mutationToDom and expects it to give back a
         // meaningful value.
         Blockly.Events.disable();
-        chai.assert.isUndefined(Blockly.Extensions.ALL_['mutator_test']);
+        chai.assert.isUndefined(
+            Blockly.Extensions.TEST_ONLY.allExtensions['mutator_test']);
         Blockly.Extensions.registerMutator('mutator_test',
             {
               domToMutation: function() {
@@ -248,7 +258,8 @@ suite('Extensions', function() {
         "extensions": ["missing_extension"]
       }]);
 
-      chai.assert.isUndefined(Blockly.Extensions.ALL_['missing_extension']);
+      chai.assert.isUndefined(
+          Blockly.Extensions.TEST_ONLY.allExtensions['missing_extension']);
       var workspace = this.workspace;
       chai.assert.throws(function() {
         var _ = new Blockly.Block(workspace, 'missing_extension_block');
@@ -262,10 +273,14 @@ suite('Extensions', function() {
         inputList: 'bad inputList'  // Defined in constructor
       };
 
-      chai.assert.isUndefined(Blockly.Extensions.ALL_['mixin_bad_inputList']);
+      chai.assert.isUndefined(
+          Blockly.Extensions.TEST_ONLY.allExtensions['mixin_bad_inputList']);
       // Extension defined before the block type is defined.
-      Blockly.Extensions.registerMixin('mixin_bad_inputList', TEST_MIXIN_BAD_INPUTLIST);
-      chai.assert.typeOf(Blockly.Extensions.ALL_['mixin_bad_inputList'], 'function');
+      Blockly.Extensions.registerMixin(
+          'mixin_bad_inputList', TEST_MIXIN_BAD_INPUTLIST);
+      chai.assert.typeOf(
+          Blockly.Extensions.TEST_ONLY.allExtensions['mixin_bad_inputList'],
+          'function');
 
       Blockly.defineBlocksWithJsonArray([{
         "type": "test_block_bad_inputList",
@@ -286,10 +301,14 @@ suite('Extensions', function() {
         colour_: 'bad colour_' // Defined on prototype
       };
 
-      chai.assert.isUndefined(Blockly.Extensions.ALL_['mixin_bad_colour_']);
+      chai.assert.isUndefined(
+          Blockly.Extensions.TEST_ONLY.allExtensions['mixin_bad_colour_']);
       // Extension defined before the block type is defined.
-      Blockly.Extensions.registerMixin('mixin_bad_colour_', TEST_MIXIN_BAD_COLOUR);
-      chai.assert.typeOf(Blockly.Extensions.ALL_['mixin_bad_colour_'], 'function');
+      Blockly.Extensions.registerMixin(
+          'mixin_bad_colour_', TEST_MIXIN_BAD_COLOUR);
+      chai.assert.typeOf(
+          Blockly.Extensions.TEST_ONLY.allExtensions['mixin_bad_colour_'],
+          'function');
 
       Blockly.defineBlocksWithJsonArray([{
         "type": "test_block_bad_colour",
@@ -315,7 +334,8 @@ suite('Extensions', function() {
       // Events code calls mutationToDom and expects it to give back a
       // meaningful value.
       Blockly.Events.disable();
-      chai.assert.isUndefined(Blockly.Extensions.ALL_['mutator_test']);
+      chai.assert.isUndefined(
+          Blockly.Extensions.TEST_ONLY.allExtensions['mutator_test']);
       Blockly.Extensions.registerMutator('mutator_test',
           {
             domToMutation: function() {
@@ -331,7 +351,8 @@ suite('Extensions', function() {
         var _ = new Blockly.Block(workspace, 'mutator_test_block');
       });
       // Should have failed on apply, not on register.
-      chai.assert.isNotNull(Blockly.Extensions.ALL_['mutator_test']);
+      chai.assert.isNotNull(
+          Blockly.Extensions.TEST_ONLY.allExtensions['mutator_test']);
     });
 
     test('Use mutator mixin as extension', function() {
@@ -346,7 +367,8 @@ suite('Extensions', function() {
       // Events code calls mutationToDom and expects it to give back a
       // meaningful value.
       Blockly.Events.disable();
-      chai.assert.isUndefined(Blockly.Extensions.ALL_['mutator_test']);
+      chai.assert.isUndefined(
+          Blockly.Extensions.TEST_ONLY.allExtensions['mutator_test']);
       Blockly.Extensions.registerMixin('mutator_test',
           {
             domToMutation: function() {
@@ -362,7 +384,8 @@ suite('Extensions', function() {
         var _ = new Blockly.Block(workspace, 'mutator_test_block');
       });
       // Should have failed on apply, not on register.
-      chai.assert.isNotNull(Blockly.Extensions.ALL_['mutator_test']);
+      chai.assert.isNotNull(
+          Blockly.Extensions.TEST_ONLY.allExtensions['mutator_test']);
     });
 
     test('Use extension as mutator', function() {
@@ -377,7 +400,8 @@ suite('Extensions', function() {
       // Events code calls mutationToDom and expects it to give back a
       // meaningful value.
       Blockly.Events.disable();
-      chai.assert.isUndefined(Blockly.Extensions.ALL_['extensions_test']);
+      chai.assert.isUndefined(
+          Blockly.Extensions.TEST_ONLY.allExtensions['extensions_test']);
       Blockly.Extensions.register('extensions_test', function() {
         return 'extensions_test_fn';
       });
@@ -387,13 +411,15 @@ suite('Extensions', function() {
         var _ = new Blockly.Block(workspace, 'mutator_test_block');
       });
       // Should have failed on apply, not on register.
-      chai.assert.isNotNull(Blockly.Extensions.ALL_['extensions_test']);
+      chai.assert.isNotNull(
+          Blockly.Extensions.TEST_ONLY.allExtensions['extensions_test']);
     });
 
     suite('register', function() {
       test('Just a string', function() {
         this.extensionsCleanup_.push('extension_just_a_string');
-        chai.assert.isUndefined(Blockly.Extensions.ALL_['extension_just_a_string']);
+        chai.assert.isUndefined(Blockly.Extensions.TEST_ONLY
+                                    .allExtensions['extension_just_a_string']);
         chai.assert.throws(function() {
           Blockly.Extensions.register('extension_just_a_string', null);
         });
@@ -401,7 +427,8 @@ suite('Extensions', function() {
 
       test('Null', function() {
         this.extensionsCleanup_.push('extension_is_null');
-        chai.assert.isUndefined(Blockly.Extensions.ALL_['extension_is_null']);
+        chai.assert.isUndefined(
+            Blockly.Extensions.TEST_ONLY.allExtensions['extension_is_null']);
         chai.assert.throws(function() {
           Blockly.Extensions.register('extension_is_null', null);
         });
@@ -409,7 +436,8 @@ suite('Extensions', function() {
 
       test('Undefined', function() {
         this.extensionsCleanup_.push('extension_is_undefined');
-        chai.assert.isUndefined(Blockly.Extensions.ALL_['extension_is_undefined']);
+        chai.assert.isUndefined(Blockly.Extensions.TEST_ONLY
+                                    .allExtensions['extension_is_undefined']);
         chai.assert.throws(function() {
           Blockly.Extensions.register('extension_is_undefined', null);
         });
diff --git a/tests/mocha/field_registry_test.js b/tests/mocha/field_registry_test.js
index 89e96760a..c8978d1fb 100644
--- a/tests/mocha/field_registry_test.js
+++ b/tests/mocha/field_registry_test.js
@@ -23,8 +23,8 @@ suite('Field Registry', function() {
   });
   teardown(function() {
     sharedTestTeardown.call(this);
-    if (Blockly.registry.typeMap_['field']['field_custom_test']) {
-      delete Blockly.registry.typeMap_['field']['field_custom_test'];
+    if (Blockly.registry.TEST_ONLY.typeMap['field']['field_custom_test']) {
+      delete Blockly.registry.TEST_ONLY.typeMap['field']['field_custom_test'];
     }
   });
 
diff --git a/tests/mocha/logic_ternary_test.js b/tests/mocha/logic_ternary_test.js
index 5e208bfda..763db44f3 100644
--- a/tests/mocha/logic_ternary_test.js
+++ b/tests/mocha/logic_ternary_test.js
@@ -78,7 +78,7 @@ suite('Logic ternary', function() {
     function connectParentAndCheckConnections(
         block, parent, parentInputName, opt_thenInput, opt_elseInput) {
       parent.getInput(parentInputName).connection.connect(block.outputConnection);
-      Blockly.Events.fireNow_();  // Force synchronous onchange() call.
+      Blockly.Events.TEST_ONLY.fireNow();  // Force synchronous onchange() call.
       chai.assert.equal(block.getParent(), parent,
           'Successful connection to parent');
       if (opt_thenInput) {
@@ -93,7 +93,7 @@ suite('Logic ternary', function() {
     function connectThenInputAndCheckConnections(
         block, thenInput, opt_elseInput, opt_parent) {
       block.getInput('THEN').connection.connect(thenInput.outputConnection);
-      Blockly.Events.fireNow_();  // Force synchronous onchange() call.
+      Blockly.Events.TEST_ONLY.fireNow();  // Force synchronous onchange() call.
       chai.assert.equal(thenInput.getParent(), block, 'THEN is connected');
       if (opt_parent) {
         chai.assert.equal(block.getParent(), opt_parent,
@@ -107,7 +107,7 @@ suite('Logic ternary', function() {
     function connectElseInputAndCheckConnections(
         block, elseInput, opt_thenInput, opt_parent) {
       block.getInput('ELSE').connection.connect(elseInput.outputConnection);
-      Blockly.Events.fireNow_();  // Force synchronous onchange() call.
+      Blockly.Events.TEST_ONLY.fireNow();  // Force synchronous onchange() call.
       chai.assert.equal(elseInput.getParent(), block, 'ELSE is connected');
       if (opt_parent) {
         chai.assert.equal(block.getParent(), opt_parent,
diff --git a/tests/mocha/test_helpers.js b/tests/mocha/test_helpers.js
index fe726d19f..093560620 100644
--- a/tests/mocha/test_helpers.js
+++ b/tests/mocha/test_helpers.js
@@ -232,16 +232,18 @@ function sharedTestTeardown() {
   } finally {
     // Clear Blockly.Event state.
     Blockly.Events.setGroup(false);
-    Blockly.Events.disabled_ = 0;
+    while (!Blockly.Events.isEnabled()) {
+      Blockly.Events.enable();
+    }
     Blockly.Events.setRecordUndo(true);
-    if (Blockly.Events.FIRE_QUEUE_.length) {
+    if (Blockly.Events.TEST_ONLY.FIRE_QUEUE.length) {
       // If this happens, it may mean that some previous test is missing cleanup
       // (i.e. a previous test added an event to the queue on a timeout that
       // did not use a stubbed clock).
-      Blockly.Events.FIRE_QUEUE_.length = 0;
+      Blockly.Events.TEST_ONLY.FIRE_QUEUE.length = 0;
       console.warn(testRef.fullTitle() +
-          '" needed cleanup of Blockly.Events.FIRE_QUEUE_. This may indicate ' +
-          'leakage from an earlier test');
+          '" needed cleanup of Blockly.Events.TEST_ONLY.FIRE_QUEUE. This may ' +
+          'indicate leakage from an earlier test');
     }
 
     // Restore all stubbed methods.
diff --git a/tests/mocha/theme_test.js b/tests/mocha/theme_test.js
index feea9daa3..f0c37f505 100644
--- a/tests/mocha/theme_test.js
+++ b/tests/mocha/theme_test.js
@@ -16,7 +16,7 @@ suite('Theme', function() {
   teardown(function() {
     sharedTestTeardown.call(this);
     // Clear all registered themes.
-    Blockly.registry.typeMap_['theme'] = {};
+    Blockly.registry.TEST_ONLY.typeMap['theme'] = {};
   });
 
   function defineThemeTestBlocks() {

From e7955084ae8efc736b114a165657e7b6a3044a4b Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Tue, 21 Sep 2021 17:51:35 +0100
Subject: [PATCH 796/833] refactor: Remove remaining references to Blockly.*
 from goog.modules (#5505)

---
 core/block_svg.js               | 4 ++--
 core/blockly.js                 | 5 +++--
 core/contextmenu.js             | 3 ++-
 core/dropdowndiv.js             | 4 ++--
 core/renderers/common/drawer.js | 3 ++-
 core/workspace_svg.js           | 2 +-
 tests/deps.js                   | 6 +++---
 tests/deps.mocha.js             | 6 +++---
 8 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/core/block_svg.js b/core/block_svg.js
index 62dcb1f87..9053d1cc7 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -974,7 +974,7 @@ BlockSvg.prototype.checkAndDelete = function() {
   if (this.workspace.isFlyout) {
     return;
   }
-  Blockly.Events.setGroup(true);
+  Events.setGroup(true);
   this.workspace.hideChaff();
   if (this.outputConnection) {
     // Do not attempt to heal rows
@@ -983,7 +983,7 @@ BlockSvg.prototype.checkAndDelete = function() {
   } else {
     this.dispose(/* heal */ true, true);
   }
-  Blockly.Events.setGroup(false);
+  Events.setGroup(false);
 };
 
 /**
diff --git a/core/blockly.js b/core/blockly.js
index e878f293c..f858f0351 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -17,6 +17,7 @@
 goog.module('Blockly');
 goog.module.declareLegacyNamespace();
 
+const Blocks = goog.require('Blockly.Blocks');
 /* eslint-disable-next-line no-unused-vars */
 const ICopyable = goog.requireType('Blockly.ICopyable');
 const Size = goog.require('Blockly.utils.Size');
@@ -237,12 +238,12 @@ const defineBlocksWithJsonArray = function(jsonArray) {
             'Block definition #' + i +
             ' in JSON array is missing a type attribute. Skipping.');
       } else {
-        if (Blockly.Blocks[typename]) {
+        if (Blocks[typename]) {
           console.warn(
               'Block definition #' + i + ' in JSON array' +
               ' overwrites prior definition of "' + typename + '".');
         }
-        Blockly.Blocks[typename] = {init: jsonInitFactory(elem)};
+        Blocks[typename] = {init: jsonInitFactory(elem)};
       }
     }
   }
diff --git a/core/contextmenu.js b/core/contextmenu.js
index f6eb99d66..82dbdb6ff 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -29,6 +29,7 @@ const WidgetDiv = goog.require('Blockly.WidgetDiv');
 const Xml = goog.require('Blockly.Xml');
 const aria = goog.require('Blockly.utils.aria');
 const browserEvents = goog.require('Blockly.browserEvents');
+const clipboard = goog.require('Blockly.clipboard');
 const deprecation = goog.require('Blockly.utils.deprecation');
 const dom = goog.require('Blockly.utils.dom');
 const internalConstants = goog.require('Blockly.internalConstants');
@@ -302,7 +303,7 @@ const commentDuplicateOption = function(comment) {
     text: Msg['DUPLICATE_COMMENT'],
     enabled: true,
     callback: function() {
-      Blockly.duplicate(comment);
+      clipboard.duplicate(comment);
     }
   };
   return duplicateOption;
diff --git a/core/dropdowndiv.js b/core/dropdowndiv.js
index 070fb89bf..a59017a90 100644
--- a/core/dropdowndiv.js
+++ b/core/dropdowndiv.js
@@ -187,7 +187,7 @@ DropDownDiv.createDom = function() {
   }
   const containerDiv = document.createElement('div');
   containerDiv.className = 'blocklyDropDownDiv';
-  const parentDiv = Blockly.parentContainer || document.body;
+  const parentDiv = common.getParentContainer() || document.body;
   parentDiv.appendChild(containerDiv);
 
   DropDownDiv.DIV_ = containerDiv;
@@ -387,7 +387,7 @@ DropDownDiv.show = function(
   div.style.direction = rtl ? 'rtl' : 'ltr';
 
   const mainWorkspace =
-      /** @type {!WorkspaceSvg} */ (Blockly.getMainWorkspace());
+      /** @type {!WorkspaceSvg} */ (common.getMainWorkspace());
   DropDownDiv.rendererClassName_ = mainWorkspace.getRenderer().getClassName();
   DropDownDiv.themeClassName_ = mainWorkspace.getTheme().getClassName();
   dom.addClass(div, DropDownDiv.rendererClassName_);
diff --git a/core/renderers/common/drawer.js b/core/renderers/common/drawer.js
index af03eaf2e..430d91c47 100644
--- a/core/renderers/common/drawer.js
+++ b/core/renderers/common/drawer.js
@@ -28,6 +28,7 @@ const RenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
 /* eslint-disable-next-line no-unused-vars */
 const Row = goog.requireType('Blockly.blockRendering.Row');
 const Types = goog.require('Blockly.blockRendering.Types');
+const blockRendering = goog.require('Blockly.blockRendering');
 const svgPaths = goog.require('Blockly.utils.svgPaths');
 
 
@@ -73,7 +74,7 @@ Drawer.prototype.draw = function() {
   if (this.info_.RTL) {
     this.block_.pathObject.flipRTL();
   }
-  if (Blockly.blockRendering.isDebuggerEnabled()) {
+  if (blockRendering.isDebuggerEnabled()) {
     this.block_.renderingDebugger.drawDebug(this.block_, this.info_);
   }
   this.recordSizeOnBlock_();
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index f65f379b8..15263d1c4 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -2674,7 +2674,7 @@ WorkspaceSvg.prototype.hideChaff = function(opt_onlyClosePopups) {
 
   var onlyClosePopups = !!opt_onlyClosePopups;
   var autoHideables = this.getComponentManager().getComponents(
-      Blockly.ComponentManager.Capability.AUTOHIDEABLE, true);
+      ComponentManager.Capability.AUTOHIDEABLE, true);
   autoHideables.forEach(
       (autoHideable) => autoHideable.autoHide(onlyClosePopups));
 };
diff --git a/tests/deps.js b/tests/deps.js
index 94944cb55..3eeb03fab 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.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.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.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_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'});
@@ -28,7 +28,7 @@ goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionCheck
 goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.dialog', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
@@ -141,7 +141,7 @@ goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnec
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 4c4ddea7d..aa77435a4 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.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.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.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_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'});
@@ -28,7 +28,7 @@ goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionCheck
 goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.dialog', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
@@ -141,7 +141,7 @@ goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnec
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});

From bbf26e5e6b0f80fd69d488f725effb1947c09ffa Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 20 Sep 2021 16:08:37 -0700
Subject: [PATCH 797/833] Fix jsdoc in core/utils/useragent.js

---
 core/utils/useragent.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/utils/useragent.js b/core/utils/useragent.js
index 245a23c27..ab7cf1480 100644
--- a/core/utils/useragent.js
+++ b/core/utils/useragent.js
@@ -22,8 +22,8 @@ const {globalThis} = goog.require('Blockly.utils.global');
 
 
 /**
- * @type {string}
  * The raw useragent string.
+ * @type {string}
  */
 let rawUserAgent;
 

From 7454d2f2c97ff45d55aaa48e69df96285de958bb Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 20 Sep 2021 16:10:02 -0700
Subject: [PATCH 798/833] Fix jsdoc in core/serialization/variables.js

---
 core/serialization/variables.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/serialization/variables.js b/core/serialization/variables.js
index 1d4786c66..c1ae6dc60 100644
--- a/core/serialization/variables.js
+++ b/core/serialization/variables.js
@@ -26,7 +26,7 @@ const serializationRegistry = goog.require('Blockly.serialization.registry');
  * @typedef {{
  *   name: string,
  *   id: string,
- *   type: (string|undefined),
+ *   type: (string|undefined)
  * }}
  */
 var State;

From 953e3b67b1cb265168619614b2a7a1744062fc0c Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 21 Sep 2021 13:10:33 -0700
Subject: [PATCH 799/833] chore: remove deprecated functions (#5509)

---
 core/block_svg.js   | 30 ------------------------------
 core/options.js     | 15 ---------------
 tests/deps.js       |  4 ++--
 tests/deps.mocha.js |  4 ++--
 4 files changed, 4 insertions(+), 49 deletions(-)

diff --git a/core/block_svg.js b/core/block_svg.js
index 9053d1cc7..dcc52d99a 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -63,7 +63,6 @@ const browserEvents = goog.require('Blockly.browserEvents');
 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 dom = goog.require('Blockly.utils.dom');
 const internalConstants = goog.require('Blockly.internalConstants');
 const object = goog.require('Blockly.utils.object');
@@ -274,35 +273,6 @@ BlockSvg.prototype.getColourTertiary = function() {
   return this.style.colourTertiary;
 };
 
-/**
- * Get the shadow colour of a block.
- * @return {?string} #RRGGBB string.
- * @deprecated Use style.colourSecondary. (2020 January 21)
- */
-BlockSvg.prototype.getColourShadow = function() {
-  deprecation.warn(
-      'BlockSvg.prototype.getColourShadow', 'January 2020', 'January 2021',
-      'style.colourSecondary');
-  return this.getColourSecondary();
-};
-
-/**
- * Get the border colour(s) of a block.
- * @return {{colourDark, colourLight, colourBorder}} An object containing
- *     colour values for the border(s) of the block. If the block is using a
- *     style the colourBorder will be defined and equal to the tertiary colour
- *     of the style (#RRGGBB string). Otherwise the colourDark and colourLight
- *     attributes will be defined (#RRGGBB strings).
- * @deprecated Use style.colourTertiary. (2020 January 21)
- */
-BlockSvg.prototype.getColourBorder = function() {
-  deprecation.warn(
-      'BlockSvg.prototype.getColourBorder', 'January 2020', 'January 2021',
-      'style.colourTertiary');
-  const colourTertiary = this.getColourTertiary();
-  return {colourBorder: colourTertiary, colourLight: null, colourDark: null};
-};
-
 /**
  * Selects this block. Highlights the block visually and fires a select event
  * if the block is not already selected.
diff --git a/core/options.js b/core/options.js
index 14db8c0a2..cc2d412ef 100644
--- a/core/options.js
+++ b/core/options.js
@@ -21,7 +21,6 @@ const Metrics = goog.requireType('Blockly.utils.Metrics');
 const Theme = goog.require('Blockly.Theme');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
-const deprecation = goog.require('Blockly.utils.deprecation');
 const idGenerator = goog.require('Blockly.utils.idGenerator');
 const registry = goog.require('Blockly.registry');
 const toolbox = goog.require('Blockly.utils.toolbox');
@@ -380,18 +379,4 @@ Options.parseThemeOptions_ = function(options) {
       theme.name || ('builtin' + idGenerator.getNextUniqueId()), theme);
 };
 
-/**
- * Parse the provided toolbox tree into a consistent DOM format.
- * @param {?Node|?string} toolboxDef DOM tree of blocks, or text representation
- *    of same.
- * @return {?Node} DOM tree of blocks, or null.
- * @deprecated Use toolbox.parseToolboxTree. (2020 September 28)
- */
-Options.parseToolboxTree = function(toolboxDef) {
-  deprecation.warn(
-      'Options.parseToolboxTree', 'September 2020', 'September 2021',
-      'toolbox.parseToolboxTree');
-  return toolbox.parseToolboxTree(toolboxDef);
-};
-
 exports = Options;
diff --git a/tests/deps.js b/tests/deps.js
index 3eeb03fab..8756ba4ed 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -11,7 +11,7 @@ goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode',
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'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.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_options.js', ['Blockly.BlocklyOptions'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
@@ -133,7 +133,7 @@ goog.addDependency('../../core/metrics_manager.js', ['Blockly.MetricsManager'],
 goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', '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', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.deprecation', 'Blockly.utils.idGenerator', 'Blockly.utils.toolbox'], {'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'});
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index aa77435a4..1a1a84b3c 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -11,7 +11,7 @@ goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode',
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'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.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_options.js', ['Blockly.BlocklyOptions'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
@@ -133,7 +133,7 @@ goog.addDependency('../../core/metrics_manager.js', ['Blockly.MetricsManager'],
 goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', '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', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.deprecation', 'Blockly.utils.idGenerator', 'Blockly.utils.toolbox'], {'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'});
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});

From d6c9423bdf4b1a51c4558f4361b1eed314223e91 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Tue, 21 Sep 2021 13:07:19 -0700
Subject: [PATCH 800/833] Remove declareLegacyNamespace from block-related
 files.

---
 core/block.js              | 1 -
 core/block_animations.js   | 1 -
 core/block_drag_surface.js | 1 -
 core/block_dragger.js      | 1 -
 core/block_svg.js          | 1 -
 core/blockly.js            | 9 +++++++++
 tests/deps.js              | 2 +-
 tests/deps.mocha.js        | 2 +-
 8 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/core/block.js b/core/block.js
index c73649a4c..5daad64b5 100644
--- a/core/block.js
+++ b/core/block.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.Block');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Abstract = goog.requireType('Blockly.Events.Abstract');
diff --git a/core/block_animations.js b/core/block_animations.js
index 27926002e..0d9971910 100644
--- a/core/block_animations.js
+++ b/core/block_animations.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.blockAnimations');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
diff --git a/core/block_drag_surface.js b/core/block_drag_surface.js
index 717713915..83d63fd10 100644
--- a/core/block_drag_surface.js
+++ b/core/block_drag_surface.js
@@ -17,7 +17,6 @@
 'use strict';
 
 goog.module('Blockly.BlockDragSurfaceSvg');
-goog.module.declareLegacyNamespace();
 
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Svg = goog.require('Blockly.utils.Svg');
diff --git a/core/block_dragger.js b/core/block_dragger.js
index 5c523cb55..221ff53b9 100644
--- a/core/block_dragger.js
+++ b/core/block_dragger.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.BlockDragger');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
diff --git a/core/block_svg.js b/core/block_svg.js
index dcc52d99a..26353fb1f 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.BlockSvg');
-goog.module.declareLegacyNamespace();
 
 const ASTNode = goog.require('Blockly.ASTNode');
 const Block = goog.require('Blockly.Block');
diff --git a/core/blockly.js b/core/blockly.js
index f858f0351..86efd7bcf 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -17,7 +17,11 @@
 goog.module('Blockly');
 goog.module.declareLegacyNamespace();
 
+const Block = goog.require('Blockly.Block');
 const Blocks = goog.require('Blockly.Blocks');
+const BlockDragger = goog.require('Blockly.BlockDragger');
+const BlockDragSurfaceSvg = goog.require('Blockly.BlockDragSurfaceSvg');
+const BlockSvg = goog.require('Blockly.BlockSvg');
 /* eslint-disable-next-line no-unused-vars */
 const ICopyable = goog.requireType('Blockly.ICopyable');
 const Size = goog.require('Blockly.utils.Size');
@@ -397,3 +401,8 @@ 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;
+
+exports.Block = Block;
+exports.BlockDragger = BlockDragger;
+exports.BlockDragSurfaceSvg = BlockDragSurfaceSvg;
+exports.BlockSvg = BlockSvg;
diff --git a/tests/deps.js b/tests/deps.js
index 8756ba4ed..cf7c2da1e 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.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.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_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 1a1a84b3c..18a3d019d 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.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.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_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'});

From d83eb1364bc2bdb0449162f9d258112366444f3a Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 21 Sep 2021 13:19:55 -0700
Subject: [PATCH 801/833] fix: enable missingRequire in build_tasks (#5510)

---
 core/common.js                   | 14 +++++++++-----
 core/interfaces/i_selectable.js  | 10 ++++++----
 core/serialization/exceptions.js | 13 +++++++------
 core/toolbox/category.js         |  2 +-
 core/zoom_controls.js            |  8 +++++---
 scripts/gulpfiles/build_tasks.js |  5 ++---
 6 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/core/common.js b/core/common.js
index 8efbcba6d..edc2ab6ce 100644
--- a/core/common.js
+++ b/core/common.js
@@ -17,7 +17,11 @@ goog.module.declareLegacyNamespace();
 /* eslint-disable-next-line no-unused-vars */
 const Connection = goog.requireType('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
+const ICopyable = goog.requireType('Blockly.ICopyable');
+/* 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');
 
 
 /**
@@ -49,13 +53,13 @@ exports.setMainWorkspace = setMainWorkspace;
 
 /**
  * Currently selected block.
- * @type {?Blockly.ICopyable}
+ * @type {?ICopyable}
  */
 let selected = null;
 
 /**
  * Returns the currently selected block.
- * @return {?Blockly.ICopyable} The currently selected block.
+ * @return {?ICopyable} The currently selected block.
  */
 const getSelected = function() {
   return selected;
@@ -64,7 +68,7 @@ exports.getSelected = getSelected;
 
 /**
  * Sets the currently selected block.
- * @param {?Blockly.ICopyable} newSelection The newly selected block.
+ * @param {?ICopyable} newSelection The newly selected block.
  */
 const setSelected = function(newSelection) {
   selected = newSelection;
@@ -105,9 +109,9 @@ exports.setParentContainer = setParentContainer;
  * See Blockly.resizeSvgContents to resize the workspace when the contents
  * change (e.g. when a block is added or removed).
  * Record the height/width of the SVG image.
- * @param {!Blockly.WorkspaceSvg} workspace Any workspace in the SVG.
+ * @param {!WorkspaceSvg} workspace Any workspace in the SVG.
  */
- const svgResize = function(workspace) {
+const svgResize = function(workspace) {
   let mainWorkspace = workspace;
   while (mainWorkspace.options.parentWorkspace) {
     mainWorkspace = mainWorkspace.options.parentWorkspace;
diff --git a/core/interfaces/i_selectable.js b/core/interfaces/i_selectable.js
index d3355f9ab..e95b0dcfe 100644
--- a/core/interfaces/i_selectable.js
+++ b/core/interfaces/i_selectable.js
@@ -14,14 +14,16 @@
 goog.module('Blockly.ISelectable');
 goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.IDeletable');
-goog.requireType('Blockly.IMovable');
+// eslint-disable-next-line no-unused-vars
+const IDeletable = goog.requireType('Blockly.IDeletable');
+// eslint-disable-next-line no-unused-vars
+const IMovable = goog.requireType('Blockly.IMovable');
 
 
 /**
  * The interface for an object that is selectable.
- * @extends {Blockly.IDeletable}
- * @extends {Blockly.IMovable}
+ * @extends {IDeletable}
+ * @extends {IMovable}
  * @interface
  */
 const ISelectable = function() {};
diff --git a/core/serialization/exceptions.js b/core/serialization/exceptions.js
index 1d6cd129c..4b85f5603 100644
--- a/core/serialization/exceptions.js
+++ b/core/serialization/exceptions.js
@@ -13,11 +13,12 @@
 goog.module('Blockly.serialization.exceptions');
 goog.module.declareLegacyNamespace();
 
-
+// eslint-disable-next-line no-unused-vars
+const Block = goog.requireType('Blockly.Block');
 // eslint-disable-next-line no-unused-vars
 const {State} = goog.requireType('Blockly.serialization.blocks');
 
-class DeserializationError extends Error { }
+class DeserializationError extends Error {}
 exports.DeserializationError = DeserializationError;
 
 /**
@@ -49,7 +50,7 @@ class MissingConnection extends DeserializationError {
   /**
    * @param {string} connection The name of the connection that is missing. E.g.
    *     'IF0', or 'next'.
-   * @param {!Blockly.Block} block The block missing the connection.
+   * @param {!Block} block The block missing the connection.
    * @param {!State} state The state object containing the bad connection.
    * @package
    */
@@ -59,7 +60,7 @@ connection`);
 
     /**
      * The block missing the connection.
-     * @type {!Blockly.Block}
+     * @type {!Block}
      */
     this.block = block;
 
@@ -81,7 +82,7 @@ class BadConnectionCheck extends DeserializationError {
    * @param {string} reason The reason the connections were not compatible.
    * @param {string} childConnection The name of the incompatible child
    *     connection. E.g. 'output' or 'previous'.
-   * @param {!Blockly.Block} childBlock The child block that could not connect
+   * @param {!Block} childBlock The child block that could not connect
    *     to its parent.
    * @param {!State} childState The state object representing the child block.
    * @package
@@ -92,7 +93,7 @@ ${childConnection} to its parent, because: ${reason}`);
 
     /**
      * The block that could not connect to its parent.
-     * @type {!Blockly.Block}
+     * @type {!Block}
      */
     this.childBlock = childBlock;
 
diff --git a/core/toolbox/category.js b/core/toolbox/category.js
index c085420c5..d05029034 100644
--- a/core/toolbox/category.js
+++ b/core/toolbox/category.js
@@ -206,7 +206,7 @@ ToolboxCategory.prototype.parseContents_ = function(categoryDef) {
     for (let i = 0; i < contents.length; i++) {
       const itemDef = contents[i];
       const flyoutItem =
-          /** @type {Blockly.utils.toolbox.FlyoutItemInfo} */ (itemDef);
+          /** @type {toolbox.FlyoutItemInfo} */ (itemDef);
       this.flyoutItems_.push(flyoutItem);
     }
   }
diff --git a/core/zoom_controls.js b/core/zoom_controls.js
index 0348a202f..5919c9578 100644
--- a/core/zoom_controls.js
+++ b/core/zoom_controls.js
@@ -18,6 +18,8 @@ const Css = goog.require('Blockly.Css');
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const IPositionable = goog.requireType('Blockly.IPositionable');
+/* eslint-disable-next-line no-unused-vars */
+const MetricsManager = goog.requireType('Blockly.MetricsManager');
 const Rect = goog.require('Blockly.utils.Rect');
 const Size = goog.require('Blockly.utils.Size');
 const Svg = goog.require('Blockly.utils.Svg');
@@ -247,7 +249,7 @@ ZoomControls.prototype.getBoundingRectangle = function() {
  * Positions the zoom controls.
  * It is positioned in the opposite corner to the corner the
  * categories/toolbox starts at.
- * @param {!Blockly.MetricsManager.UiMetrics} metrics The workspace metrics.
+ * @param {!MetricsManager.UiMetrics} metrics The workspace metrics.
  * @param {!Array<!Rect>} savedPositions List of rectangles that
  *     are already on the workspace.
  */
@@ -264,8 +266,8 @@ ZoomControls.prototype.position = function(metrics, savedPositions) {
     height += this.LARGE_SPACING_ + this.HEIGHT_;
   }
   const startRect = uiPosition.getStartPositionRect(
-      cornerPosition, new Size(this.WIDTH_, height),
-      this.MARGIN_HORIZONTAL_, this.MARGIN_VERTICAL_, metrics, this.workspace_);
+      cornerPosition, new Size(this.WIDTH_, height), this.MARGIN_HORIZONTAL_,
+      this.MARGIN_VERTICAL_, metrics, this.workspace_);
 
   const verticalPosition = cornerPosition.vertical;
   const bumpDirection = verticalPosition === uiPosition.verticalPosition.TOP ?
diff --git a/scripts/gulpfiles/build_tasks.js b/scripts/gulpfiles/build_tasks.js
index 42fa62d21..a22e0414e 100644
--- a/scripts/gulpfiles/build_tasks.js
+++ b/scripts/gulpfiles/build_tasks.js
@@ -77,8 +77,7 @@ var JSCOMP_ERROR = [
   'missingPolyfill',
   'missingProperties',
   'missingProvide',
-  // 'missingRequire', As of Jan 8 2021, this enables the strict require check.
-  // Disabling this until we have fixed all the require issues.
+  'missingRequire',
   'missingReturn',
   // 'missingSourcesWarnings',
   'moduleLoad',
@@ -397,7 +396,7 @@ function buildLangfiles(done) {
   // Create output directory.
   const outputDir = path.join(BUILD_DIR, 'msg', 'js');
   fs.mkdirSync(outputDir, {recursive: true});
-  
+
   // Run create_messages.py.
   let json_files = fs.readdirSync(path.join('msg', 'json'));
   json_files = json_files.filter(file => file.endsWith('json') &&

From cf091351d8d9548a20710f7283b7e90aa76094c1 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Tue, 21 Sep 2021 17:18:34 -0700
Subject: [PATCH 802/833] chore: remove deprecateLegacyNamespace from keyboard
 nav files

* chore: Remove deprecateLegacyNamespace & fix tests

* chore: export from the blockly file
---
 core/blockly.js                          |  10 +
 core/keyboard_nav/ast_node.js            |   1 -
 core/keyboard_nav/basic_cursor.js        |   1 -
 core/keyboard_nav/cursor.js              |   1 -
 core/keyboard_nav/marker.js              |   1 -
 core/keyboard_nav/tab_navigate_cursor.js |   1 -
 tests/mocha/astnode_test.js              | 223 ++++++++++++-----------
 tests/mocha/cursor_test.js               |  11 +-
 tests/mocha/event_test.js                |  21 ++-
 9 files changed, 139 insertions(+), 131 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index 86efd7bcf..63694ec2a 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -17,14 +17,19 @@
 goog.module('Blockly');
 goog.module.declareLegacyNamespace();
 
+const ASTNode = goog.require('Blockly.ASTNode');
+const BasicCursor = goog.require('Blockly.BasicCursor');
 const Block = goog.require('Blockly.Block');
 const Blocks = goog.require('Blockly.Blocks');
 const BlockDragger = goog.require('Blockly.BlockDragger');
 const BlockDragSurfaceSvg = goog.require('Blockly.BlockDragSurfaceSvg');
 const BlockSvg = goog.require('Blockly.BlockSvg');
+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');
 const Size = goog.require('Blockly.utils.Size');
+const TabNavigateCursor = goog.require('Blockly.TabNavigateCursor');
 /* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
 /* eslint-disable-next-line no-unused-vars */
@@ -402,7 +407,12 @@ exports.DELETE_VARIABLE_ID = internalConstants.DELETE_VARIABLE_ID;
 exports.COLLAPSED_INPUT_NAME = constants.COLLAPSED_INPUT_NAME;
 exports.COLLAPSED_FIELD_NAME = constants.COLLAPSED_FIELD_NAME;
 
+exports.ASTNode = ASTNode;
+exports.BasicCursor = BasicCursor;
 exports.Block = Block;
 exports.BlockDragger = BlockDragger;
 exports.BlockDragSurfaceSvg = BlockDragSurfaceSvg;
 exports.BlockSvg = BlockSvg;
+exports.Cursor = Cursor;
+exports.Marker = Marker;
+exports.TabNavigateCursor = TabNavigateCursor;
diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index b52ca1b18..48e8eb1ae 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.ASTNode');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Block = goog.requireType('Blockly.Block');
diff --git a/core/keyboard_nav/basic_cursor.js b/core/keyboard_nav/basic_cursor.js
index 78ee3fe1b..a5340bcda 100644
--- a/core/keyboard_nav/basic_cursor.js
+++ b/core/keyboard_nav/basic_cursor.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.BasicCursor');
-goog.module.declareLegacyNamespace();
 
 const ASTNode = goog.require('Blockly.ASTNode');
 const Cursor = goog.require('Blockly.Cursor');
diff --git a/core/keyboard_nav/cursor.js b/core/keyboard_nav/cursor.js
index 9bc9526e2..c307d3227 100644
--- a/core/keyboard_nav/cursor.js
+++ b/core/keyboard_nav/cursor.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.Cursor');
-goog.module.declareLegacyNamespace();
 
 const ASTNode = goog.require('Blockly.ASTNode');
 const Marker = goog.require('Blockly.Marker');
diff --git a/core/keyboard_nav/marker.js b/core/keyboard_nav/marker.js
index 4b6f341bb..f0f1843d1 100644
--- a/core/keyboard_nav/marker.js
+++ b/core/keyboard_nav/marker.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.Marker');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ASTNode = goog.requireType('Blockly.ASTNode');
diff --git a/core/keyboard_nav/tab_navigate_cursor.js b/core/keyboard_nav/tab_navigate_cursor.js
index 3847b03a9..9e0e2ee86 100644
--- a/core/keyboard_nav/tab_navigate_cursor.js
+++ b/core/keyboard_nav/tab_navigate_cursor.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.TabNavigateCursor');
-goog.module.declareLegacyNamespace();
 
 const ASTNode = goog.require('Blockly.ASTNode');
 const BasicCursor = goog.require('Blockly.BasicCursor');
diff --git a/tests/mocha/astnode_test.js b/tests/mocha/astnode_test.js
index c2bf7cd72..de5e055bb 100644
--- a/tests/mocha/astnode_test.js
+++ b/tests/mocha/astnode_test.js
@@ -6,6 +6,7 @@
 
 goog.module('Blockly.test.astNode');
 
+const ASTNode = goog.require('Blockly.ASTNode');
 const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
 
 
@@ -103,7 +104,7 @@ suite('ASTNode', function() {
       var input = this.blocks.statementInput1.inputList[0];
       var input2 = this.blocks.statementInput1.inputList[1];
       var connection = input.connection;
-      var node = Blockly.ASTNode.createConnectionNode(connection);
+      var node = ASTNode.createConnectionNode(connection);
       var newASTNode = node.findNextForInput_(input);
       chai.assert.equal(newASTNode.getLocation(), input2.connection);
     });
@@ -112,7 +113,7 @@ suite('ASTNode', function() {
       var input = this.blocks.statementInput1.inputList[0];
       var input2 = this.blocks.statementInput1.inputList[1];
       var connection = input2.connection;
-      var node = Blockly.ASTNode.createConnectionNode(connection);
+      var node = ASTNode.createConnectionNode(connection);
       var newASTNode = node.findPrevForInput_(input2);
       chai.assert.equal(newASTNode.getLocation(), input.connection);
     });
@@ -120,7 +121,7 @@ suite('ASTNode', function() {
     test('findNextForField_', function() {
       var field = this.blocks.statementInput1.inputList[0].fieldRow[0];
       var field2 = this.blocks.statementInput1.inputList[0].fieldRow[1];
-      var node = Blockly.ASTNode.createFieldNode(field);
+      var node = ASTNode.createFieldNode(field);
       var newASTNode = node.findNextForField_(field);
       chai.assert.equal(newASTNode.getLocation(), field2);
     });
@@ -128,39 +129,39 @@ suite('ASTNode', function() {
     test('findPrevForField_', function() {
       var field = this.blocks.statementInput1.inputList[0].fieldRow[0];
       var field2 = this.blocks.statementInput1.inputList[0].fieldRow[1];
-      var node = Blockly.ASTNode.createFieldNode(field2);
+      var node = ASTNode.createFieldNode(field2);
       var newASTNode = node.findPrevForField_(field2);
       chai.assert.equal(newASTNode.getLocation(), field);
     });
 
     test('navigateBetweenStacks_Forward', function() {
-      var node = new Blockly.ASTNode(
-          Blockly.ASTNode.types.NEXT, this.blocks.statementInput1.nextConnection);
+      var node = new ASTNode(
+          ASTNode.types.NEXT, this.blocks.statementInput1.nextConnection);
       var newASTNode = node.navigateBetweenStacks_(true);
       chai.assert.equal(newASTNode.getLocation(), this.blocks.statementInput4);
     });
 
     test('navigateBetweenStacks_Backward', function() {
-      var node = new Blockly.ASTNode(
-          Blockly.ASTNode.types.BLOCK, this.blocks.statementInput4);
+      var node = new ASTNode(
+          ASTNode.types.BLOCK, this.blocks.statementInput4);
       var newASTNode = node.navigateBetweenStacks_(false);
       chai.assert.equal(newASTNode.getLocation(), this.blocks.statementInput1);
     });
     test('getOutAstNodeForBlock_', function() {
-      var node = new Blockly.ASTNode(
-          Blockly.ASTNode.types.BLOCK, this.blocks.statementInput2);
+      var node = new ASTNode(
+          ASTNode.types.BLOCK, this.blocks.statementInput2);
       var newASTNode = node.getOutAstNodeForBlock_(this.blocks.statementInput2);
       chai.assert.equal(newASTNode.getLocation(), this.blocks.statementInput1);
     });
     test('getOutAstNodeForBlock_OneBlock', function() {
-      var node = new Blockly.ASTNode(
-          Blockly.ASTNode.types.BLOCK, this.blocks.statementInput4);
+      var node = new ASTNode(
+          ASTNode.types.BLOCK, this.blocks.statementInput4);
       var newASTNode = node.getOutAstNodeForBlock_(this.blocks.statementInput4);
       chai.assert.equal(newASTNode.getLocation(), this.blocks.statementInput4);
     });
     test('findFirstFieldOrInput_', function() {
-      var node = new Blockly.ASTNode(
-          Blockly.ASTNode.types.BLOCK, this.blocks.statementInput4);
+      var node = new ASTNode(
+          ASTNode.types.BLOCK, this.blocks.statementInput4);
       var field = this.blocks.statementInput4.inputList[0].fieldRow[0];
       var newASTNode = node.findFirstFieldOrInput_(this.blocks.statementInput4);
       chai.assert.equal(newASTNode.getLocation(), field);
@@ -321,95 +322,95 @@ suite('ASTNode', function() {
 
       test('fromPreviousToBlock', function() {
         var prevConnection = this.blocks.statementInput1.previousConnection;
-        var node = Blockly.ASTNode.createConnectionNode(prevConnection);
+        var node = ASTNode.createConnectionNode(prevConnection);
         var nextNode = node.next();
         chai.assert.equal(nextNode.getLocation(), this.blocks.statementInput1);
       });
       test('fromBlockToNext', function() {
         var nextConnection = this.blocks.statementInput1.nextConnection;
-        var node = Blockly.ASTNode.createBlockNode(this.blocks.statementInput1);
+        var node = ASTNode.createBlockNode(this.blocks.statementInput1);
         var nextNode = node.next();
         chai.assert.equal(nextNode.getLocation(), nextConnection);
       });
       test('fromBlockToNull', function() {
-        var node = Blockly.ASTNode.createBlockNode(this.blocks.noNextConnection);
+        var node = ASTNode.createBlockNode(this.blocks.noNextConnection);
         var nextNode = node.next();
         chai.assert.isNull(nextNode);
       });
       test('fromNextToPrevious', function() {
         var nextConnection = this.blocks.statementInput1.nextConnection;
         var prevConnection = this.blocks.statementInput2.previousConnection;
-        var node = Blockly.ASTNode.createConnectionNode(nextConnection);
+        var node = ASTNode.createConnectionNode(nextConnection);
         var nextNode = node.next();
         chai.assert.equal(nextNode.getLocation(), prevConnection);
       });
       test('fromNextToNull', function() {
         var nextConnection = this.blocks.statementInput2.nextConnection;
-        var node = Blockly.ASTNode.createConnectionNode(nextConnection);
+        var node = ASTNode.createConnectionNode(nextConnection);
         var nextNode = node.next();
         chai.assert.isNull(nextNode);
       });
       test('fromInputToInput', function() {
         var input = this.blocks.statementInput1.inputList[0];
         var inputConnection = this.blocks.statementInput1.inputList[1].connection;
-        var node = Blockly.ASTNode.createInputNode(input);
+        var node = ASTNode.createInputNode(input);
         var nextNode = node.next();
         chai.assert.equal(nextNode.getLocation(), inputConnection);
       });
       test('fromInputToStatementInput', function() {
         var input = this.blocks.fieldAndInputs2.inputList[1];
         var inputConnection = this.blocks.fieldAndInputs2.inputList[2].connection;
-        var node = Blockly.ASTNode.createInputNode(input);
+        var node = ASTNode.createInputNode(input);
         var nextNode = node.next();
         chai.assert.equal(nextNode.getLocation(), inputConnection);
       });
       test('fromInputToField', function() {
         var input = this.blocks.fieldAndInputs2.inputList[0];
         var field = this.blocks.fieldAndInputs2.inputList[1].fieldRow[0];
-        var node = Blockly.ASTNode.createInputNode(input);
+        var node = ASTNode.createInputNode(input);
         var nextNode = node.next();
         chai.assert.equal(nextNode.getLocation(), field);
       });
       test('fromInputToNull', function() {
         var input = this.blocks.fieldAndInputs2.inputList[2];
-        var node = Blockly.ASTNode.createInputNode(input);
+        var node = ASTNode.createInputNode(input);
         var nextNode = node.next();
         chai.assert.isNull(nextNode);
       });
       test('fromOutputToBlock', function() {
         var output = this.blocks.fieldWithOutput.outputConnection;
-        var node = Blockly.ASTNode.createConnectionNode(output);
+        var node = ASTNode.createConnectionNode(output);
         var nextNode = node.next();
         chai.assert.equal(nextNode.getLocation(), this.blocks.fieldWithOutput);
       });
       test('fromFieldToInput', function() {
         var field = this.blocks.statementInput1.inputList[0].fieldRow[1];
         var inputConnection = this.blocks.statementInput1.inputList[0].connection;
-        var node = Blockly.ASTNode.createFieldNode(field);
+        var node = ASTNode.createFieldNode(field);
         var nextNode = node.next();
         chai.assert.equal(nextNode.getLocation(), inputConnection);
       });
       test('fromFieldToField', function() {
         var field = this.blocks.fieldAndInputs.inputList[0].fieldRow[0];
-        var node = Blockly.ASTNode.createFieldNode(field);
+        var node = ASTNode.createFieldNode(field);
         var field2 = this.blocks.fieldAndInputs.inputList[1].fieldRow[0];
         var nextNode = node.next();
         chai.assert.equal(nextNode.getLocation(), field2);
       });
       test('fromFieldToNull', function() {
         var field = this.blocks.twoFields.inputList[0].fieldRow[0];
-        var node = Blockly.ASTNode.createFieldNode(field);
+        var node = ASTNode.createFieldNode(field);
         var nextNode = node.next();
         chai.assert.isNull(nextNode);
       });
       test('fromStackToStack', function() {
-        var node = Blockly.ASTNode.createStackNode(this.blocks.statementInput1);
+        var node = ASTNode.createStackNode(this.blocks.statementInput1);
         var nextNode = node.next();
         chai.assert.equal(nextNode.getLocation(), this.blocks.statementInput4);
-        chai.assert.equal(nextNode.getType(), Blockly.ASTNode.types.STACK);
+        chai.assert.equal(nextNode.getType(), ASTNode.types.STACK);
       });
       test('fromStackToNull', function() {
-        var node = Blockly.ASTNode.createStackNode(this.blocks.singleBlock);
+        var node = ASTNode.createStackNode(this.blocks.singleBlock);
         var nextNode = node.next();
         chai.assert.isNull(nextNode);
       });
@@ -418,96 +419,96 @@ suite('ASTNode', function() {
     suite('Previous', function() {
       test('fromPreviousToNull', function() {
         var prevConnection = this.blocks.statementInput1.previousConnection;
-        var node = Blockly.ASTNode.createConnectionNode(prevConnection);
+        var node = ASTNode.createConnectionNode(prevConnection);
         var prevNode = node.prev();
         chai.assert.isNull(prevNode);
       });
       test('fromPreviousToNext', function() {
         var prevConnection = this.blocks.statementInput2.previousConnection;
-        var node = Blockly.ASTNode.createConnectionNode(prevConnection);
+        var node = ASTNode.createConnectionNode(prevConnection);
         var prevNode = node.prev();
         var nextConnection = this.blocks.statementInput1.nextConnection;
         chai.assert.equal(prevNode.getLocation(), nextConnection);
       });
       test('fromPreviousToInput', function() {
         var prevConnection = this.blocks.statementInput3.previousConnection;
-        var node = Blockly.ASTNode.createConnectionNode(prevConnection);
+        var node = ASTNode.createConnectionNode(prevConnection);
         var prevNode = node.prev();
         chai.assert.isNull(prevNode);
       });
       test('fromBlockToPrevious', function() {
-        var node = Blockly.ASTNode.createBlockNode(this.blocks.statementInput1);
+        var node = ASTNode.createBlockNode(this.blocks.statementInput1);
         var prevNode = node.prev();
         var prevConnection = this.blocks.statementInput1.previousConnection;
         chai.assert.equal(prevNode.getLocation(), prevConnection);
       });
       test('fromBlockToNull', function() {
-        var node = Blockly.ASTNode.createBlockNode(this.blocks.noPrevConnection);
+        var node = ASTNode.createBlockNode(this.blocks.noPrevConnection);
         var prevNode = node.prev();
         chai.assert.isNull(prevNode);
       });
       test('fromBlockToOutput', function() {
-        var node = Blockly.ASTNode.createBlockNode(this.blocks.fieldWithOutput);
+        var node = ASTNode.createBlockNode(this.blocks.fieldWithOutput);
         var prevNode = node.prev();
         var outputConnection = this.blocks.fieldWithOutput.outputConnection;
         chai.assert.equal(prevNode.getLocation(), outputConnection);
       });
       test('fromNextToBlock', function() {
         var nextConnection = this.blocks.statementInput1.nextConnection;
-        var node = Blockly.ASTNode.createConnectionNode(nextConnection);
+        var node = ASTNode.createConnectionNode(nextConnection);
         var prevNode = node.prev();
         chai.assert.equal(prevNode.getLocation(), this.blocks.statementInput1);
       });
       test('fromInputToField', function() {
         var input = this.blocks.statementInput1.inputList[0];
-        var node = Blockly.ASTNode.createInputNode(input);
+        var node = ASTNode.createInputNode(input);
         var prevNode = node.prev();
         chai.assert.equal(prevNode.getLocation(), input.fieldRow[1]);
       });
       test('fromInputToNull', function() {
         var input = this.blocks.fieldAndInputs2.inputList[0];
-        var node = Blockly.ASTNode.createInputNode(input);
+        var node = ASTNode.createInputNode(input);
         var prevNode = node.prev();
         chai.assert.isNull(prevNode);
       });
       test('fromInputToInput', function() {
         var input = this.blocks.fieldAndInputs2.inputList[2];
         var inputConnection = this.blocks.fieldAndInputs2.inputList[1].connection;
-        var node = Blockly.ASTNode.createInputNode(input);
+        var node = ASTNode.createInputNode(input);
         var prevNode = node.prev();
         chai.assert.equal(prevNode.getLocation(), inputConnection);
       });
       test('fromOutputToNull', function() {
         var output = this.blocks.fieldWithOutput.outputConnection;
-        var node = Blockly.ASTNode.createConnectionNode(output);
+        var node = ASTNode.createConnectionNode(output);
         var prevNode = node.prev();
         chai.assert.isNull(prevNode);
       });
       test('fromFieldToNull', function() {
         var field = this.blocks.statementInput1.inputList[0].fieldRow[0];
-        var node = Blockly.ASTNode.createFieldNode(field);
+        var node = ASTNode.createFieldNode(field);
         var prevNode = node.prev();
         chai.assert.isNull(prevNode);
       });
       test('fromFieldToInput', function() {
         var field = this.blocks.fieldAndInputs2.inputList[1].fieldRow[0];
         var inputConnection = this.blocks.fieldAndInputs2.inputList[0].connection;
-        var node = Blockly.ASTNode.createFieldNode(field);
+        var node = ASTNode.createFieldNode(field);
         var prevNode = node.prev();
         chai.assert.equal(prevNode.getLocation(), inputConnection);
       });
       test('fromFieldToField', function() {
         var field = this.blocks.fieldAndInputs.inputList[1].fieldRow[0];
         var field2 = this.blocks.fieldAndInputs.inputList[0].fieldRow[0];
-        var node = Blockly.ASTNode.createFieldNode(field);
+        var node = ASTNode.createFieldNode(field);
         var prevNode = node.prev();
         chai.assert.equal(prevNode.getLocation(), field2);
       });
       test('fromStackToStack', function() {
-        var node = Blockly.ASTNode.createStackNode(this.blocks.statementInput4);
+        var node = ASTNode.createStackNode(this.blocks.statementInput4);
         var prevNode = node.prev();
         chai.assert.equal(prevNode.getLocation(), this.blocks.statementInput1);
-        chai.assert.equal(prevNode.getType(), Blockly.ASTNode.types.STACK);
+        chai.assert.equal(prevNode.getType(), ASTNode.types.STACK);
       });
     });
 
@@ -521,99 +522,99 @@ suite('ASTNode', function() {
 
       test('fromInputToOutput', function() {
         var input = this.blocks.statementInput1.inputList[0];
-        var node = Blockly.ASTNode.createInputNode(input);
+        var node = ASTNode.createInputNode(input);
         var inNode = node.in();
         var outputConnection = this.blocks.fieldWithOutput.outputConnection;
         chai.assert.equal(inNode.getLocation(), outputConnection);
       });
       test('fromInputToNull', function() {
         var input = this.blocks.statementInput2.inputList[0];
-        var node = Blockly.ASTNode.createInputNode(input);
+        var node = ASTNode.createInputNode(input);
         var inNode = node.in();
         chai.assert.isNull(inNode);
       });
       test('fromInputToPrevious', function() {
         var input = this.blocks.statementInput2.inputList[1];
         var previousConnection = this.blocks.statementInput3.previousConnection;
-        var node = Blockly.ASTNode.createInputNode(input);
+        var node = ASTNode.createInputNode(input);
         var inNode = node.in();
         chai.assert.equal(inNode.getLocation(), previousConnection);
       });
       test('fromBlockToInput', function() {
         var input = this.blocks.valueInput.inputList[0];
-        var node = Blockly.ASTNode.createBlockNode(this.blocks.valueInput);
+        var node = ASTNode.createBlockNode(this.blocks.valueInput);
         var inNode = node.in();
         chai.assert.equal(inNode.getLocation(), input.connection);
       });
       test('fromBlockToField', function() {
-        var node = Blockly.ASTNode.createBlockNode(this.blocks.statementInput1);
+        var node = ASTNode.createBlockNode(this.blocks.statementInput1);
         var inNode = node.in();
         var field = this.blocks.statementInput1.inputList[0].fieldRow[0];
         chai.assert.equal(inNode.getLocation(), field);
       });
       test('fromBlockToPrevious', function() {
         var prevConnection = this.blocks.statementInput4.previousConnection;
-        var node = Blockly.ASTNode.createStackNode(this.blocks.statementInput4);
+        var node = ASTNode.createStackNode(this.blocks.statementInput4);
         var inNode = node.in();
         chai.assert.equal(inNode.getLocation(), prevConnection);
-        chai.assert.equal(inNode.getType(), Blockly.ASTNode.types.PREVIOUS);
+        chai.assert.equal(inNode.getType(), ASTNode.types.PREVIOUS);
       });
       test('fromBlockToNull_DummyInput', function() {
-        var node = Blockly.ASTNode.createBlockNode(this.blocks.dummyInput);
+        var node = ASTNode.createBlockNode(this.blocks.dummyInput);
         var inNode = node.in();
         chai.assert.isNull(inNode);
       });
       test('fromBlockToInput_DummyInputValue', function() {
-        var node = Blockly.ASTNode.createBlockNode(this.blocks.dummyInputValue);
+        var node = ASTNode.createBlockNode(this.blocks.dummyInputValue);
         var inputConnection = this.blocks.dummyInputValue.inputList[1].connection;
         var inNode = node.in();
         chai.assert.equal(inNode.getLocation(), inputConnection);
       });
       test('fromOuputToNull', function() {
         var output = this.blocks.fieldWithOutput.outputConnection;
-        var node = Blockly.ASTNode.createConnectionNode(output);
+        var node = ASTNode.createConnectionNode(output);
         var inNode = node.in();
         chai.assert.isNull(inNode);
       });
       test('fromFieldToNull', function() {
         var field = this.blocks.statementInput1.inputList[0].fieldRow[0];
-        var node = Blockly.ASTNode.createFieldNode(field);
+        var node = ASTNode.createFieldNode(field);
         var inNode = node.in();
         chai.assert.isNull(inNode);
       });
       test('fromWorkspaceToStack', function() {
         var coordinate = new Blockly.utils.Coordinate(100, 100);
-        var node = Blockly.ASTNode.createWorkspaceNode(this.workspace, coordinate);
+        var node = ASTNode.createWorkspaceNode(this.workspace, coordinate);
         var inNode = node.in();
         chai.assert.equal(inNode.getLocation(), this.workspace.getTopBlocks()[0]);
-        chai.assert.equal(inNode.getType(), Blockly.ASTNode.types.STACK);
+        chai.assert.equal(inNode.getType(), ASTNode.types.STACK);
       });
       test('fromWorkspaceToNull', function() {
         var coordinate = new Blockly.utils.Coordinate(100, 100);
-        var node = Blockly.ASTNode.createWorkspaceNode(
+        var node = ASTNode.createWorkspaceNode(
             this.emptyWorkspace, coordinate);
         var inNode = node.in();
         chai.assert.isNull(inNode);
       });
       test('fromStackToPrevious', function() {
-        var node = Blockly.ASTNode.createStackNode(this.blocks.statementInput1);
+        var node = ASTNode.createStackNode(this.blocks.statementInput1);
         var previous = this.blocks.statementInput1.previousConnection;
         var inNode = node.in();
         chai.assert.equal(inNode.getLocation(), previous);
-        chai.assert.equal(inNode.getType(), Blockly.ASTNode.types.PREVIOUS);
+        chai.assert.equal(inNode.getType(), ASTNode.types.PREVIOUS);
       });
       test('fromStackToOutput', function() {
-        var node = Blockly.ASTNode.createStackNode(this.blocks.fieldWithOutput2);
+        var node = ASTNode.createStackNode(this.blocks.fieldWithOutput2);
         var output = this.blocks.fieldWithOutput2.outputConnection;
         var inNode = node.in();
         chai.assert.equal(inNode.getLocation(), output);
-        chai.assert.equal(inNode.getType(), Blockly.ASTNode.types.OUTPUT);
+        chai.assert.equal(inNode.getType(), ASTNode.types.OUTPUT);
       });
       test('fromStackToBlock', function() {
-        var node = Blockly.ASTNode.createStackNode(this.blocks.dummyInput);
+        var node = ASTNode.createStackNode(this.blocks.dummyInput);
         var inNode = node.in();
         chai.assert.equal(inNode.getLocation(), this.blocks.dummyInput);
-        chai.assert.equal(inNode.getType(), Blockly.ASTNode.types.BLOCK);
+        chai.assert.equal(inNode.getType(), ASTNode.types.BLOCK);
       });
     });
 
@@ -628,39 +629,39 @@ suite('ASTNode', function() {
 
       test('fromInputToBlock', function() {
         var input = this.blocks.statementInput1.inputList[0];
-        var node = Blockly.ASTNode.createInputNode(input);
+        var node = ASTNode.createInputNode(input);
         var outNode = node.out();
-        chai.assert.equal(outNode.getType(), Blockly.ASTNode.types.BLOCK);
+        chai.assert.equal(outNode.getType(), ASTNode.types.BLOCK);
         chai.assert.equal(outNode.getLocation(), this.blocks.statementInput1);
       });
       test('fromOutputToInput', function() {
         var output = this.blocks.fieldWithOutput.outputConnection;
-        var node = Blockly.ASTNode.createConnectionNode(output);
+        var node = ASTNode.createConnectionNode(output);
         var outNode = node.out();
-        chai.assert.equal(outNode.getType(), Blockly.ASTNode.types.INPUT);
+        chai.assert.equal(outNode.getType(), ASTNode.types.INPUT);
         chai.assert.equal(outNode.getLocation(),
             this.blocks.statementInput1.inputList[0].connection);
       });
       test('fromOutputToStack', function() {
         var output = this.blocks.fieldWithOutput2.outputConnection;
-        var node = Blockly.ASTNode.createConnectionNode(output);
+        var node = ASTNode.createConnectionNode(output);
         var outNode = node.out();
-        chai.assert.equal(outNode.getType(), Blockly.ASTNode.types.STACK);
+        chai.assert.equal(outNode.getType(), ASTNode.types.STACK);
         chai.assert.equal(outNode.getLocation(), this.blocks.fieldWithOutput2);
       });
       test('fromFieldToBlock', function() {
         var field = this.blocks.statementInput1.inputList[0].fieldRow[0];
-        var node = Blockly.ASTNode.createFieldNode(field);
+        var node = ASTNode.createFieldNode(field);
         var outNode = node.out();
-        chai.assert.equal(outNode.getType(), Blockly.ASTNode.types.BLOCK);
+        chai.assert.equal(outNode.getType(), ASTNode.types.BLOCK);
         chai.assert.equal(outNode.getLocation(), this.blocks.statementInput1);
       });
       test('fromStackToWorkspace', function() {
         var stub = sinon.stub(this.blocks.statementInput4,
             "getRelativeToSurfaceXY").returns({x: 10, y:10});
-        var node = Blockly.ASTNode.createStackNode(this.blocks.statementInput4);
+        var node = ASTNode.createStackNode(this.blocks.statementInput4);
         var outNode = node.out();
-        chai.assert.equal(outNode.getType(), Blockly.ASTNode.types.WORKSPACE);
+        chai.assert.equal(outNode.getType(), ASTNode.types.WORKSPACE);
         chai.assert.equal(outNode.wsCoordinate_.x, 10);
         chai.assert.equal(outNode.wsCoordinate_.y, -10);
         stub.restore();
@@ -668,38 +669,38 @@ suite('ASTNode', function() {
       test('fromPreviousToInput', function() {
         var previous = this.blocks.statementInput3.previousConnection;
         var inputConnection = this.blocks.statementInput2.inputList[1].connection;
-        var node = Blockly.ASTNode.createConnectionNode(previous);
+        var node = ASTNode.createConnectionNode(previous);
         var outNode = node.out();
-        chai.assert.equal(outNode.getType(), Blockly.ASTNode.types.INPUT);
+        chai.assert.equal(outNode.getType(), ASTNode.types.INPUT);
         chai.assert.equal(outNode.getLocation(), inputConnection);
       });
       test('fromPreviousToStack', function() {
         var previous = this.blocks.statementInput2.previousConnection;
-        var node = Blockly.ASTNode.createConnectionNode(previous);
+        var node = ASTNode.createConnectionNode(previous);
         var outNode = node.out();
-        chai.assert.equal(outNode.getType(), Blockly.ASTNode.types.STACK);
+        chai.assert.equal(outNode.getType(), ASTNode.types.STACK);
         chai.assert.equal(outNode.getLocation(), this.blocks.statementInput1);
       });
       test('fromNextToInput', function() {
         var next = this.blocks.statementInput3.nextConnection;
         var inputConnection = this.blocks.statementInput2.inputList[1].connection;
-        var node = Blockly.ASTNode.createConnectionNode(next);
+        var node = ASTNode.createConnectionNode(next);
         var outNode = node.out();
-        chai.assert.equal(outNode.getType(), Blockly.ASTNode.types.INPUT);
+        chai.assert.equal(outNode.getType(), ASTNode.types.INPUT);
         chai.assert.equal(outNode.getLocation(), inputConnection);
       });
       test('fromNextToStack', function() {
         var next = this.blocks.statementInput2.nextConnection;
-        var node = Blockly.ASTNode.createConnectionNode(next);
+        var node = ASTNode.createConnectionNode(next);
         var outNode = node.out();
-        chai.assert.equal(outNode.getType(), Blockly.ASTNode.types.STACK);
+        chai.assert.equal(outNode.getType(), ASTNode.types.STACK);
         chai.assert.equal(outNode.getLocation(), this.blocks.statementInput1);
       });
       test('fromNextToStack_NoPreviousConnection', function() {
         var next = this.blocks.secondBlock.nextConnection;
-        var node = Blockly.ASTNode.createConnectionNode(next);
+        var node = ASTNode.createConnectionNode(next);
         var outNode = node.out();
-        chai.assert.equal(outNode.getType(), Blockly.ASTNode.types.STACK);
+        chai.assert.equal(outNode.getType(), ASTNode.types.STACK);
         chai.assert.equal(outNode.getLocation(), this.blocks.noPrevConnection);
       });
       /**
@@ -708,42 +709,42 @@ suite('ASTNode', function() {
        */
       test('fromNextToInput_OutputAndPreviousConnection', function() {
         var next = this.blocks.outputNextBlock.nextConnection;
-        var node = Blockly.ASTNode.createConnectionNode(next);
+        var node = ASTNode.createConnectionNode(next);
         var outNode = node.out();
-        chai.assert.equal(outNode.getType(), Blockly.ASTNode.types.INPUT);
+        chai.assert.equal(outNode.getType(), ASTNode.types.INPUT);
         chai.assert.equal(outNode.getLocation(),
             this.blocks.secondBlock.inputList[0].connection);
       });
       test('fromBlockToStack', function() {
-        var node = Blockly.ASTNode.createBlockNode(this.blocks.statementInput2);
+        var node = ASTNode.createBlockNode(this.blocks.statementInput2);
         var outNode = node.out();
-        chai.assert.equal(outNode.getType(), Blockly.ASTNode.types.STACK);
+        chai.assert.equal(outNode.getType(), ASTNode.types.STACK);
         chai.assert.equal(outNode.getLocation(), this.blocks.statementInput1);
       });
       test('fromBlockToInput', function() {
         var input = this.blocks.statementInput2.inputList[1].connection;
-        var node = Blockly.ASTNode.createBlockNode(this.blocks.statementInput3);
+        var node = ASTNode.createBlockNode(this.blocks.statementInput3);
         var outNode = node.out();
-        chai.assert.equal(outNode.getType(), Blockly.ASTNode.types.INPUT);
+        chai.assert.equal(outNode.getType(), ASTNode.types.INPUT);
         chai.assert.equal(outNode.getLocation(), input);
       });
       test('fromTopBlockToStack', function() {
-        var node = Blockly.ASTNode.createBlockNode(this.blocks.statementInput1);
+        var node = ASTNode.createBlockNode(this.blocks.statementInput1);
         var outNode = node.out();
-        chai.assert.equal(outNode.getType(), Blockly.ASTNode.types.STACK);
+        chai.assert.equal(outNode.getType(), ASTNode.types.STACK);
         chai.assert.equal(outNode.getLocation(), this.blocks.statementInput1);
       });
       test('fromBlockToStack_OutputConnection', function() {
-        var node = Blockly.ASTNode.createBlockNode(this.blocks.fieldWithOutput2);
+        var node = ASTNode.createBlockNode(this.blocks.fieldWithOutput2);
         var outNode = node.out();
-        chai.assert.equal(outNode.getType(), Blockly.ASTNode.types.STACK);
+        chai.assert.equal(outNode.getType(), ASTNode.types.STACK);
         chai.assert.equal(outNode.getLocation(), this.blocks.fieldWithOutput2);
       });
       test('fromBlockToInput_OutputConnection', function() {
-        var node = Blockly.ASTNode.createBlockNode(this.blocks.outputNextBlock);
+        var node = ASTNode.createBlockNode(this.blocks.outputNextBlock);
         var inputConnection = this.blocks.secondBlock.inputList[0].connection;
         var outNode = node.out();
-        chai.assert.equal(outNode.getType(), Blockly.ASTNode.types.INPUT);
+        chai.assert.equal(outNode.getType(), ASTNode.types.INPUT);
         chai.assert.equal(outNode.getLocation(), inputConnection);
       });
     });
@@ -751,55 +752,55 @@ suite('ASTNode', function() {
     suite('createFunctions', function() {
       test('createFieldNode', function() {
         var field = this.blocks.statementInput1.inputList[0].fieldRow[0];
-        var node = Blockly.ASTNode.createFieldNode(field);
+        var node = ASTNode.createFieldNode(field);
         chai.assert.equal(node.getLocation(), field);
-        chai.assert.equal(node.getType(), Blockly.ASTNode.types.FIELD);
+        chai.assert.equal(node.getType(), ASTNode.types.FIELD);
         chai.assert.isFalse(node.isConnection());
       });
       test('createConnectionNode', function() {
         var prevConnection = this.blocks.statementInput4.previousConnection;
-        var node = Blockly.ASTNode.createConnectionNode(prevConnection);
+        var node = ASTNode.createConnectionNode(prevConnection);
         chai.assert.equal(node.getLocation(), prevConnection);
-        chai.assert.equal(node.getType(), Blockly.ASTNode.types.PREVIOUS);
+        chai.assert.equal(node.getType(), ASTNode.types.PREVIOUS);
         chai.assert.isTrue(node.isConnection());
       });
       test('createInputNode', function() {
         var input = this.blocks.statementInput1.inputList[0];
-        var node = Blockly.ASTNode.createInputNode(input);
+        var node = ASTNode.createInputNode(input);
         chai.assert.equal(node.getLocation(), input.connection);
-        chai.assert.equal(node.getType(), Blockly.ASTNode.types.INPUT);
+        chai.assert.equal(node.getType(), ASTNode.types.INPUT);
         chai.assert.isTrue(node.isConnection());
       });
       test('createWorkspaceNode', function() {
         var coordinate = new Blockly.utils.Coordinate(100, 100);
-        var node = Blockly.ASTNode
+        var node = ASTNode
             .createWorkspaceNode(this.workspace, coordinate);
         chai.assert.equal(node.getLocation(), this.workspace);
-        chai.assert.equal(node.getType(), Blockly.ASTNode.types.WORKSPACE);
+        chai.assert.equal(node.getType(), ASTNode.types.WORKSPACE);
         chai.assert.equal(node.getWsCoordinate(), coordinate);
         chai.assert.isFalse(node.isConnection());
       });
       test('createStatementConnectionNode', function() {
         var nextConnection = this.blocks.statementInput1.inputList[1].connection;
         var inputConnection = this.blocks.statementInput1.inputList[1].connection;
-        var node = Blockly.ASTNode.createConnectionNode(nextConnection);
+        var node = ASTNode.createConnectionNode(nextConnection);
         chai.assert.equal(node.getLocation(), inputConnection);
-        chai.assert.equal(node.getType(), Blockly.ASTNode.types.INPUT);
+        chai.assert.equal(node.getType(), ASTNode.types.INPUT);
         chai.assert.isTrue(node.isConnection());
       });
       test('createTopNode-previous', function() {
         var block = this.blocks.statementInput1;
-        var topNode = Blockly.ASTNode.createTopNode(block);
+        var topNode = ASTNode.createTopNode(block);
         chai.assert.equal(topNode.getLocation(), block.previousConnection);
       });
       test('createTopNode-block', function() {
         var block = this.blocks.noPrevConnection;
-        var topNode = Blockly.ASTNode.createTopNode(block);
+        var topNode = ASTNode.createTopNode(block);
         chai.assert.equal(topNode.getLocation(), block);
       });
       test('createTopNode-output', function() {
         var block = this.blocks.outputNextBlock;
-        var topNode = Blockly.ASTNode.createTopNode(block);
+        var topNode = ASTNode.createTopNode(block);
         chai.assert.equal(topNode.getLocation(), block.outputConnection);
       });
     });
diff --git a/tests/mocha/cursor_test.js b/tests/mocha/cursor_test.js
index 1359b1a68..e34e716c6 100644
--- a/tests/mocha/cursor_test.js
+++ b/tests/mocha/cursor_test.js
@@ -7,6 +7,7 @@
 goog.module('Blockly.test.cursor');
 
 const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+const ASTNode = goog.require('Blockly.ASTNode');
 
 
 suite('Cursor', function() {
@@ -82,14 +83,14 @@ suite('Cursor', function() {
   });
 
   test('Next - From a Previous skip over next connection and block', function() {
-    var prevNode = Blockly.ASTNode.createConnectionNode(this.blocks.A.previousConnection);
+    var prevNode = ASTNode.createConnectionNode(this.blocks.A.previousConnection);
     this.cursor.setCurNode(prevNode);
     this.cursor.next();
     var curNode = this.cursor.getCurNode();
     chai.assert.equal(curNode.getLocation(), this.blocks.B.previousConnection);
   });
   test('Next - From last block in a stack go to next connection', function() {
-    var prevNode = Blockly.ASTNode.createConnectionNode(this.blocks.B.previousConnection);
+    var prevNode = ASTNode.createConnectionNode(this.blocks.B.previousConnection);
     this.cursor.setCurNode(prevNode);
     this.cursor.next();
     var curNode = this.cursor.getCurNode();
@@ -98,7 +99,7 @@ suite('Cursor', function() {
 
   test('In - From output connection', function() {
     var fieldBlock = this.blocks.E;
-    var outputNode = Blockly.ASTNode.createConnectionNode(fieldBlock.outputConnection);
+    var outputNode = ASTNode.createConnectionNode(fieldBlock.outputConnection);
     this.cursor.setCurNode(outputNode);
     this.cursor.in();
     var curNode = this.cursor.getCurNode();
@@ -107,7 +108,7 @@ suite('Cursor', function() {
 
   test('Prev - From previous connection skip over next connection', function() {
     var prevConnection = this.blocks.B.previousConnection;
-    var prevConnectionNode = Blockly.ASTNode.createConnectionNode(prevConnection);
+    var prevConnectionNode = ASTNode.createConnectionNode(prevConnection);
     this.cursor.setCurNode(prevConnectionNode);
     this.cursor.prev();
     var curNode = this.cursor.getCurNode();
@@ -116,7 +117,7 @@ suite('Cursor', function() {
 
   test('Out - From field skip over block node', function() {
     var field = this.blocks.E.inputList[0].fieldRow[0];
-    var fieldNode = Blockly.ASTNode.createFieldNode(field);
+    var fieldNode = ASTNode.createFieldNode(field);
     this.cursor.setCurNode(fieldNode);
     this.cursor.out();
     var curNode = this.cursor.getCurNode();
diff --git a/tests/mocha/event_test.js b/tests/mocha/event_test.js
index c0f1711e8..6df2c03f3 100644
--- a/tests/mocha/event_test.js
+++ b/tests/mocha/event_test.js
@@ -7,6 +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');
 goog.require('Blockly.WorkspaceComment');
 
 
@@ -367,36 +368,36 @@ suite('Events', function() {
           isStart: false, blockId: thisObj.block.id, blocks: [thisObj.block]})},
       {title: 'null to Block Marker move', class: Blockly.Events.MarkerMove,
         getArgs: (thisObj) => [thisObj.block, true, null,
-          new Blockly.ASTNode(Blockly.ASTNode.types.BLOCK, thisObj.block)],
+          new ASTNode(ASTNode.types.BLOCK, thisObj.block)],
         getExpectedJson: (thisObj) => ({type: 'marker_move',
           isCursor: true, blockId: thisObj.block.id, oldNode: null,
-          newNode: new Blockly.ASTNode(Blockly.ASTNode.types.BLOCK,
+          newNode: new ASTNode(ASTNode.types.BLOCK,
               thisObj.block)})},
       {title: 'null to Workspace Marker move', class: Blockly.Events.MarkerMove,
         getArgs: (thisObj) => [null, true, null,
-          Blockly.ASTNode.createWorkspaceNode(thisObj.workspace,
+          ASTNode.createWorkspaceNode(thisObj.workspace,
               new Blockly.utils.Coordinate(0, 0))],
         getExpectedJson: (thisObj) => ({type: 'marker_move',
           isCursor: true, blockId: null, oldNode: null,
-          newNode: Blockly.ASTNode.createWorkspaceNode(thisObj.workspace,
+          newNode: ASTNode.createWorkspaceNode(thisObj.workspace,
               new Blockly.utils.Coordinate(0, 0))})},
       {title: 'Workspace to Block Marker move',
         class: Blockly.Events.MarkerMove,
         getArgs: (thisObj) => [thisObj.block, true,
-          Blockly.ASTNode.createWorkspaceNode(thisObj.workspace,
+          ASTNode.createWorkspaceNode(thisObj.workspace,
               new Blockly.utils.Coordinate(0, 0)),
-          new Blockly.ASTNode(Blockly.ASTNode.types.BLOCK, thisObj.block)],
+          new ASTNode(ASTNode.types.BLOCK, thisObj.block)],
         getExpectedJson: (thisObj) => ({type: 'marker_move',
           isCursor: true, blockId: thisObj.block.id,
-          oldNode: Blockly.ASTNode.createWorkspaceNode(thisObj.workspace,
+          oldNode: ASTNode.createWorkspaceNode(thisObj.workspace,
               new Blockly.utils.Coordinate(0, 0)),
-          newNode: new Blockly.ASTNode(Blockly.ASTNode.types.BLOCK,
+          newNode: new ASTNode(ASTNode.types.BLOCK,
               thisObj.block)})},
       {title: 'Block to Workspace Marker move',
         class: Blockly.Events.MarkerMove,
         getArgs: (thisObj) => [null, true,
-          new Blockly.ASTNode(Blockly.ASTNode.types.BLOCK, thisObj.block),
-          Blockly.ASTNode.createWorkspaceNode(thisObj.workspace,
+          new ASTNode(ASTNode.types.BLOCK, thisObj.block),
+          ASTNode.createWorkspaceNode(thisObj.workspace,
               new Blockly.utils.Coordinate(0, 0))]},
       {title: 'Selected', class: Blockly.Events.Selected,
         getArgs: (thisObj) => [null, thisObj.block.id, thisObj.workspace.id],

From 3adfaaf6d90257f025bcf102b9d83e1159ff5f3e Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Wed, 22 Sep 2021 08:46:19 -0700
Subject: [PATCH 803/833] chore: named exports for block* files (#5512)

* chore: named export for block.js

* chore: named export for block_drag_surface.js

* chore: named export for block_dragger.js

* chore: named export for block_svg.js

* Fix import ordering

* chore: fix imports using requireType

* Remove extra require
---
 core/block.js                                     |  2 +-
 core/block_animations.js                          |  4 ++--
 core/block_drag_surface.js                        |  2 +-
 core/block_dragger.js                             |  6 +++---
 core/block_svg.js                                 |  4 ++--
 core/blockly.js                                   |  8 ++++----
 core/bubble.js                                    |  8 ++++----
 core/bubble_dragger.js                            |  4 ++--
 core/bump_objects.js                              |  4 ++--
 core/comment.js                                   |  8 ++++----
 core/connection.js                                |  6 +++---
 core/contextmenu.js                               |  4 ++--
 core/contextmenu_items.js                         |  4 ++--
 core/contextmenu_registry.js                      |  4 ++--
 core/delete_area.js                               |  3 ++-
 core/dropdowndiv.js                               |  4 ++--
 core/events/events.js                             |  4 ++--
 core/events/events_block_base.js                  |  4 ++--
 core/events/events_block_change.js                |  8 ++++----
 core/events/events_block_create.js                |  4 ++--
 core/events/events_block_delete.js                |  4 ++--
 core/events/events_block_drag.js                  |  4 ++--
 core/events/events_block_move.js                  |  4 ++--
 core/events/events_bubble_open.js                 |  4 ++--
 core/events/events_click.js                       |  4 ++--
 core/events/events_marker_move.js                 |  4 ++--
 core/events/events_ui.js                          |  4 ++--
 core/extensions.js                                |  6 +++---
 core/field.js                                     |  8 ++++----
 core/field_textinput.js                           |  4 ++--
 core/field_variable.js                            |  4 ++--
 core/flyout_base.js                               |  8 ++++----
 core/generator.js                                 |  4 ++--
 core/gesture.js                                   |  4 ++--
 core/icon.js                                      |  4 ++--
 core/inject.js                                    |  2 +-
 core/input.js                                     |  8 ++++----
 core/insertion_marker_manager.js                  |  4 ++--
 core/interfaces/i_ast_node_location_with_block.js |  4 ++--
 core/interfaces/i_block_dragger.js                |  4 ++--
 core/interfaces/i_bubble.js                       |  4 ++--
 core/interfaces/i_flyout.js                       |  4 ++--
 core/keyboard_nav/ast_node.js                     |  4 ++--
 core/mutator.js                                   |  8 ++++----
 core/procedures.js                                |  4 ++--
 core/rendered_connection.js                       |  8 ++++----
 core/renderers/common/debugger.js                 |  4 ++--
 core/renderers/common/drawer.js                   |  4 ++--
 core/renderers/common/i_path_object.js            |  4 ++--
 core/renderers/common/info.js                     |  5 ++---
 core/renderers/common/marker_svg.js               |  4 ++--
 core/renderers/common/path_object.js              |  4 ++--
 core/renderers/common/renderer.js                 |  8 ++++----
 core/renderers/geras/drawer.js                    |  4 ++--
 core/renderers/geras/info.js                      |  4 ++--
 core/renderers/geras/renderer.js                  |  4 ++--
 core/renderers/measurables/bottom_row.js          |  4 ++--
 core/renderers/measurables/top_row.js             |  4 ++--
 core/renderers/minimalist/drawer.js               |  4 ++--
 core/renderers/minimalist/info.js                 |  4 ++--
 core/renderers/minimalist/renderer.js             |  4 ++--
 core/renderers/thrasos/info.js                    |  4 ++--
 core/renderers/thrasos/renderer.js                |  4 ++--
 core/renderers/zelos/drawer.js                    |  4 ++--
 core/renderers/zelos/info.js                      |  4 ++--
 core/renderers/zelos/marker_svg.js                |  4 ++--
 core/renderers/zelos/renderer.js                  |  4 ++--
 core/serialization/blocks.js                      |  8 ++++----
 core/serialization/exceptions.js                  |  5 +++--
 core/shortcut_items.js                            |  4 ++--
 core/toolbox/toolbox.js                           |  2 +-
 core/utils.js                                     |  4 ++--
 core/variable_map.js                              |  4 ++--
 core/warning.js                                   |  8 ++++----
 core/workspace.js                                 |  6 +++---
 core/workspace_comment_svg.js                     |  4 ++--
 core/workspace_svg.js                             | 12 ++++++------
 core/xml.js                                       |  4 ++--
 78 files changed, 185 insertions(+), 184 deletions(-)

diff --git a/core/block.js b/core/block.js
index 5daad64b5..afbc86742 100644
--- a/core/block.js
+++ b/core/block.js
@@ -2155,4 +2155,4 @@ Block.prototype.toDevString = function() {
   return msg;
 };
 
-exports = Block;
+exports.Block = Block;
diff --git a/core/block_animations.js b/core/block_animations.js
index 0d9971910..ea8999a84 100644
--- a/core/block_animations.js
+++ b/core/block_animations.js
@@ -12,10 +12,10 @@
 
 goog.module('Blockly.blockAnimations');
 
-/* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
 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');
 
 
 /**
diff --git a/core/block_drag_surface.js b/core/block_drag_surface.js
index 83d63fd10..9cea21c39 100644
--- a/core/block_drag_surface.js
+++ b/core/block_drag_surface.js
@@ -256,4 +256,4 @@ BlockDragSurfaceSvg.prototype.clearAndHide = function(opt_newSurface) {
   this.surfaceXY_ = null;
 };
 
-exports = BlockDragSurfaceSvg;
+exports.BlockDragSurfaceSvg = BlockDragSurfaceSvg;
diff --git a/core/block_dragger.js b/core/block_dragger.js
index 221ff53b9..650cf4a88 100644
--- a/core/block_dragger.js
+++ b/core/block_dragger.js
@@ -12,8 +12,6 @@
 
 goog.module('Blockly.BlockDragger');
 
-/* 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.requireType('Blockly.IBlockDragger');
@@ -28,6 +26,8 @@ const common = goog.require('Blockly.common');
 const dom = goog.require('Blockly.utils.dom');
 const events = goog.require('Blockly.Events');
 const registry = goog.require('Blockly.registry');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockDrag');
 /** @suppress {extraRequire} */
@@ -468,4 +468,4 @@ BlockDragger.prototype.getInsertionMarkers = function() {
 
 registry.register(registry.Type.BLOCK_DRAGGER, registry.DEFAULT, BlockDragger);
 
-exports = BlockDragger;
+exports.BlockDragger = BlockDragger;
diff --git a/core/block_svg.js b/core/block_svg.js
index 26353fb1f..26166ac61 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -13,7 +13,6 @@
 goog.module('Blockly.BlockSvg');
 
 const ASTNode = goog.require('Blockly.ASTNode');
-const Block = goog.require('Blockly.Block');
 /* eslint-disable-next-line no-unused-vars */
 const BlockRenderingDebug = goog.requireType('Blockly.blockRendering.Debug');
 /* eslint-disable-next-line no-unused-vars */
@@ -67,6 +66,7 @@ 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 {Block} = goog.require('Blockly.Block');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockMove');
 /** @suppress {extraRequire} */
@@ -1775,4 +1775,4 @@ BlockSvg.prototype.highlightShapeForInput = function(conn, add) {
   this.pathObject.updateShapeForInputHighlight(conn, add);
 };
 
-exports = BlockSvg;
+exports.BlockSvg = BlockSvg;
diff --git a/core/blockly.js b/core/blockly.js
index 63694ec2a..83c246208 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -19,11 +19,7 @@ goog.module.declareLegacyNamespace();
 
 const ASTNode = goog.require('Blockly.ASTNode');
 const BasicCursor = goog.require('Blockly.BasicCursor');
-const Block = goog.require('Blockly.Block');
 const Blocks = goog.require('Blockly.Blocks');
-const BlockDragger = goog.require('Blockly.BlockDragger');
-const BlockDragSurfaceSvg = goog.require('Blockly.BlockDragSurfaceSvg');
-const BlockSvg = goog.require('Blockly.BlockSvg');
 const Cursor = goog.require('Blockly.Cursor');
 /* eslint-disable-next-line no-unused-vars */
 const ICopyable = goog.requireType('Blockly.ICopyable');
@@ -45,6 +41,10 @@ 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');
+const {Block} = goog.require('Blockly.Block');
+const {BlockDragger} = goog.require('Blockly.BlockDragger');
+const {BlockDragSurfaceSvg} = goog.require('Blockly.BlockDragSurfaceSvg');
+const {BlockSvg} = goog.require('Blockly.BlockSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
 /** @suppress {extraRequire} */
diff --git a/core/bubble.js b/core/bubble.js
index 6f0b93a03..ad72c9e9b 100644
--- a/core/bubble.js
+++ b/core/bubble.js
@@ -13,10 +13,6 @@
 goog.module('Blockly.Bubble');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-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.requireType('Blockly.IBubble');
@@ -32,6 +28,10 @@ const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
 const math = goog.require('Blockly.utils.math');
 const userAgent = goog.require('Blockly.utils.userAgent');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockDragSurfaceSvg} = goog.requireType('Blockly.BlockDragSurfaceSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Workspace');
 
diff --git a/core/bubble_dragger.js b/core/bubble_dragger.js
index d879e4748..736332f6f 100644
--- a/core/bubble_dragger.js
+++ b/core/bubble_dragger.js
@@ -13,8 +13,6 @@
 goog.module('Blockly.BubbleDragger');
 goog.module.declareLegacyNamespace();
 
-/* 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');
 const Events = goog.require('Blockly.Events');
@@ -29,6 +27,8 @@ const WorkspaceCommentSvg = goog.requireType('Blockly.WorkspaceCommentSvg');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const utils = goog.require('Blockly.utils');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockDragSurfaceSvg} = goog.requireType('Blockly.BlockDragSurfaceSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Bubble');
 /** @suppress {extraRequire} */
diff --git a/core/bump_objects.js b/core/bump_objects.js
index 4c53356dc..200e2d0d2 100644
--- a/core/bump_objects.js
+++ b/core/bump_objects.js
@@ -12,8 +12,6 @@
 
 goog.module('Blockly.bumpObjects');
 
-/* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
 /* eslint-disable-next-line no-unused-vars */
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
@@ -25,6 +23,8 @@ const WorkspaceCommentSvg = goog.requireType('Blockly.WorkspaceCommentSvg');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const mathUtils = goog.require('Blockly.utils.math');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/comment.js b/core/comment.js
index b126aaf57..6c7d050f6 100644
--- a/core/comment.js
+++ b/core/comment.js
@@ -13,10 +13,6 @@
 goog.module('Blockly.Comment');
 goog.module.declareLegacyNamespace();
 
-/* 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 Bubble = goog.require('Blockly.Bubble');
 /* eslint-disable-next-line no-unused-vars */
 const Coordinate = goog.requireType('Blockly.utils.Coordinate');
@@ -32,6 +28,10 @@ const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
 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');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
diff --git a/core/connection.js b/core/connection.js
index 67d4eb5c8..fc01edebc 100644
--- a/core/connection.js
+++ b/core/connection.js
@@ -13,8 +13,6 @@
 goog.module('Blockly.Connection');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const Block = goog.requireType('Blockly.Block');
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const IASTNodeLocationWithBlock = goog.requireType('Blockly.IASTNodeLocationWithBlock');
@@ -26,6 +24,8 @@ const Xml = goog.require('Blockly.Xml');
 const blocks = goog.require('Blockly.serialization.blocks');
 const connectionTypes = goog.require('Blockly.connectionTypes');
 const deprecation = goog.require('Blockly.utils.deprecation');
+/* eslint-disable-next-line no-unused-vars */
+const {Block} = goog.requireType('Blockly.Block');
 /** @suppress {extraRequire} */
 goog.require('Blockly.constants');
 /** @suppress {extraRequire} */
@@ -767,7 +767,7 @@ Connection.prototype.createShadowBlock_ = function(attemptToConnect) {
         });
     return blockShadow;
   }
-  
+
   if (shadowDom) {
     blockShadow = Xml.domToBlock(shadowDom, parentBlock.workspace);
     if (attemptToConnect) {
diff --git a/core/contextmenu.js b/core/contextmenu.js
index 82dbdb6ff..5afc69172 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -16,8 +16,6 @@ goog.module.declareLegacyNamespace();
 // TODO(#5073): Add Blockly require after fixing circular dependency.
 // goog.require('Blockly');
 /* eslint-disable-next-line no-unused-vars */
-const Block = goog.requireType('Blockly.Block');
-/* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Events = goog.require('Blockly.Events');
@@ -36,6 +34,8 @@ const internalConstants = goog.require('Blockly.internalConstants');
 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');
+/* eslint-disable-next-line no-unused-vars */
 const WorkspaceCommentSvg = goog.requireType('Blockly.WorkspaceCommentSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js
index 0e38129dc..3e32c2ca0 100644
--- a/core/contextmenu_items.js
+++ b/core/contextmenu_items.js
@@ -13,8 +13,6 @@
 goog.module('Blockly.ContextMenuItems');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const ContextMenuRegistry = goog.require('Blockly.ContextMenuRegistry');
 const Events = goog.require('Blockly.Events');
 const Msg = goog.require('Blockly.Msg');
@@ -25,6 +23,8 @@ const dialog = goog.require('Blockly.dialog');
 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');
 
 
 /** Option to undo previous action. */
diff --git a/core/contextmenu_registry.js b/core/contextmenu_registry.js
index a97dc30f4..918a11bd6 100644
--- a/core/contextmenu_registry.js
+++ b/core/contextmenu_registry.js
@@ -17,10 +17,10 @@
 goog.module('Blockly.ContextMenuRegistry');
 goog.module.declareLegacyNamespace();
 
-/* 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');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/delete_area.js b/core/delete_area.js
index 6dbe50db6..9ca08bc7b 100644
--- a/core/delete_area.js
+++ b/core/delete_area.js
@@ -15,13 +15,14 @@
 goog.module('Blockly.DeleteArea');
 goog.module.declareLegacyNamespace();
 
-const BlockSvg = goog.require('Blockly.BlockSvg');
 const DragTarget = goog.require('Blockly.DragTarget');
 /* eslint-disable-next-line no-unused-vars */
 const IDeleteArea = goog.requireType('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');
+
 
 /**
  * Abstract class for a component that can delete a block or bubble that is
diff --git a/core/dropdowndiv.js b/core/dropdowndiv.js
index a59017a90..b9d814891 100644
--- a/core/dropdowndiv.js
+++ b/core/dropdowndiv.js
@@ -16,8 +16,6 @@
 goog.module('Blockly.DropDownDiv');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const Rect = goog.require('Blockly.utils.Rect');
 /* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.Field');
@@ -29,6 +27,8 @@ 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');
 
 
 /**
diff --git a/core/events/events.js b/core/events/events.js
index ef7d3cfcb..996391ee8 100644
--- a/core/events/events.js
+++ b/core/events/events.js
@@ -20,8 +20,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 Block = goog.requireType('Blockly.Block');
-/* 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');
@@ -34,6 +32,8 @@ const Workspace = goog.requireType('Blockly.Workspace');
 const deprecation = goog.require('Blockly.utils.deprecation');
 const idGenerator = goog.require('Blockly.utils.idGenerator');
 const registry = goog.require('Blockly.registry');
+/* eslint-disable-next-line no-unused-vars */
+const {Block} = goog.requireType('Blockly.Block');
 
 
 /**
diff --git a/core/events/events_block_base.js b/core/events/events_block_base.js
index 1f22a4ed8..96cf24dc3 100644
--- a/core/events/events_block_base.js
+++ b/core/events/events_block_base.js
@@ -14,9 +14,9 @@ goog.module('Blockly.Events.BlockBase');
 goog.module.declareLegacyNamespace();
 
 const Abstract = goog.require('Blockly.Events.Abstract');
-/* eslint-disable-next-line no-unused-vars */
-const Block = goog.requireType('Blockly.Block');
 const object = goog.require('Blockly.utils.object');
+/* eslint-disable-next-line no-unused-vars */
+const {Block} = goog.requireType('Blockly.Block');
 
 
 /**
diff --git a/core/events/events_block_change.js b/core/events/events_block_change.js
index 96afcd862..7934f901d 100644
--- a/core/events/events_block_change.js
+++ b/core/events/events_block_change.js
@@ -13,14 +13,14 @@
 goog.module('Blockly.Events.BlockChange');
 goog.module.declareLegacyNamespace();
 
-/* 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 Events = goog.require('Blockly.Events');
 const Xml = goog.require('Blockly.Xml');
 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');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/events/events_block_create.js b/core/events/events_block_create.js
index f1ce54da7..a43c2985b 100644
--- a/core/events/events_block_create.js
+++ b/core/events/events_block_create.js
@@ -13,14 +13,14 @@
 goog.module('Blockly.Events.BlockCreate');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const Block = goog.requireType('Blockly.Block');
 const BlockBase = goog.require('Blockly.Events.BlockBase');
 const Events = goog.require('Blockly.Events');
 const Xml = goog.require('Blockly.Xml');
 const blocks = goog.require('Blockly.serialization.blocks');
 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');
 
 
 /**
diff --git a/core/events/events_block_delete.js b/core/events/events_block_delete.js
index 0dcf88d42..023023322 100644
--- a/core/events/events_block_delete.js
+++ b/core/events/events_block_delete.js
@@ -13,14 +13,14 @@
 goog.module('Blockly.Events.BlockDelete');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const Block = goog.requireType('Blockly.Block');
 const BlockBase = goog.require('Blockly.Events.BlockBase');
 const Events = goog.require('Blockly.Events');
 const Xml = goog.require('Blockly.Xml');
 const blocks = goog.require('Blockly.serialization.blocks');
 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');
 
 
 /**
diff --git a/core/events/events_block_drag.js b/core/events/events_block_drag.js
index 6fd3f0a9f..caef95ba7 100644
--- a/core/events/events_block_drag.js
+++ b/core/events/events_block_drag.js
@@ -13,12 +13,12 @@
 goog.module('Blockly.Events.BlockDrag');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const Block = goog.requireType('Blockly.Block');
 const Events = goog.require('Blockly.Events');
 const UiBase = goog.require('Blockly.Events.UiBase');
 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');
 
 
 /**
diff --git a/core/events/events_block_move.js b/core/events/events_block_move.js
index f026c080b..a160441f5 100644
--- a/core/events/events_block_move.js
+++ b/core/events/events_block_move.js
@@ -13,14 +13,14 @@
 goog.module('Blockly.Events.BlockMove');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const Block = goog.requireType('Blockly.Block');
 const BlockBase = goog.require('Blockly.Events.BlockBase');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Events = goog.require('Blockly.Events');
 const connectionTypes = goog.require('Blockly.connectionTypes');
 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');
 
 
 /**
diff --git a/core/events/events_bubble_open.js b/core/events/events_bubble_open.js
index 1e177f33e..5c2718c02 100644
--- a/core/events/events_bubble_open.js
+++ b/core/events/events_bubble_open.js
@@ -13,12 +13,12 @@
 goog.module('Blockly.Events.BubbleOpen');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const Events = goog.require('Blockly.Events');
 const UiBase = goog.require('Blockly.Events.UiBase');
 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');
 
 
 /**
diff --git a/core/events/events_click.js b/core/events/events_click.js
index 521f87763..3b3ca8ad2 100644
--- a/core/events/events_click.js
+++ b/core/events/events_click.js
@@ -13,12 +13,12 @@
 goog.module('Blockly.Events.Click');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const Block = goog.requireType('Blockly.Block');
 const Events = goog.require('Blockly.Events');
 const UiBase = goog.require('Blockly.Events.UiBase');
 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');
 
 /**
  * Class for a click event.
diff --git a/core/events/events_marker_move.js b/core/events/events_marker_move.js
index 2d0e0957b..d05f84de0 100644
--- a/core/events/events_marker_move.js
+++ b/core/events/events_marker_move.js
@@ -14,14 +14,14 @@ goog.module('Blockly.Events.MarkerMove');
 goog.module.declareLegacyNamespace();
 
 const ASTNode = goog.require('Blockly.ASTNode');
-/* eslint-disable-next-line no-unused-vars */
-const Block = goog.requireType('Blockly.Block');
 const Events = goog.require('Blockly.Events');
 const UiBase = goog.require('Blockly.Events.UiBase');
 /* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
 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');
 
 
 /**
diff --git a/core/events/events_ui.js b/core/events/events_ui.js
index 5598f30a0..42a5e9bb6 100644
--- a/core/events/events_ui.js
+++ b/core/events/events_ui.js
@@ -14,12 +14,12 @@
 goog.module('Blockly.Events.Ui');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const Block = goog.requireType('Blockly.Block');
 const Events = goog.require('Blockly.Events');
 const UiBase = goog.require('Blockly.Events.UiBase');
 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');
 
 
 /**
diff --git a/core/extensions.js b/core/extensions.js
index f5da2ed83..ef4e59bf4 100644
--- a/core/extensions.js
+++ b/core/extensions.js
@@ -20,9 +20,9 @@
 goog.module('Blockly.Extensions');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const Block = goog.requireType('Blockly.Block');
 const utils = goog.require('Blockly.utils');
+/* eslint-disable-next-line no-unused-vars */
+const {Block} = goog.requireType('Blockly.Block');
 goog.requireType('Blockly.Mutator');
 
 
@@ -246,7 +246,7 @@ const checkHasFunctionPair =
   function(object, name1, name2, errorPrefix) {
     var has1 = object[name1] !== undefined;
     var has2 = object[name2] !== undefined;
-  
+
     if (has1 && has2) {
       if (typeof object[name1] != 'function') {
         throw Error(errorPrefix + name1 + ' must be a function.');
diff --git a/core/field.js b/core/field.js
index ce55b7c3a..4be8dfd63 100644
--- a/core/field.js
+++ b/core/field.js
@@ -15,10 +15,6 @@
 goog.module('Blockly.Field');
 goog.module.declareLegacyNamespace();
 
-/* 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 ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
 /* eslint-disable-next-line no-unused-vars */
@@ -52,6 +48,10 @@ 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 {Block} = goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
diff --git a/core/field_textinput.js b/core/field_textinput.js
index 789bc0a96..eab4de6e0 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -13,8 +13,6 @@
 goog.module('Blockly.FieldTextInput');
 goog.module.declareLegacyNamespace();
 
-/* 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 Events = goog.require('Blockly.Events');
@@ -32,6 +30,8 @@ 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');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 
diff --git a/core/field_variable.js b/core/field_variable.js
index 331b06dc0..c3e6988e8 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -13,8 +13,6 @@
 goog.module('Blockly.FieldVariable');
 goog.module.declareLegacyNamespace();
 
-/* 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 Menu = goog.requireType('Blockly.Menu');
@@ -29,6 +27,8 @@ const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const internalConstants = goog.require('Blockly.internalConstants');
 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');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 
diff --git a/core/flyout_base.js b/core/flyout_base.js
index 1f106b0f8..c4d1832a0 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -13,10 +13,6 @@
 goog.module('Blockly.Flyout');
 goog.module.declareLegacyNamespace();
 
-/* 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 ComponentManager = goog.require('Blockly.ComponentManager');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const DeleteArea = goog.require('Blockly.DeleteArea');
@@ -41,6 +37,10 @@ const idGenerator = goog.require('Blockly.utils.idGenerator');
 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');
 /** @suppress {extraRequire} */
diff --git a/core/generator.js b/core/generator.js
index 7ebb000d2..ed7e20329 100644
--- a/core/generator.js
+++ b/core/generator.js
@@ -14,8 +14,6 @@
 goog.module('Blockly.Generator');
 goog.module.declareLegacyNamespace();
 
-/* 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 */
@@ -23,6 +21,8 @@ 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');
 
 
 /**
diff --git a/core/gesture.js b/core/gesture.js
index 9267c2998..077e14788 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -14,8 +14,6 @@
 goog.module('Blockly.Gesture');
 goog.module.declareLegacyNamespace();
 
-/* 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');
 const Events = goog.require('Blockly.Events');
@@ -38,6 +36,8 @@ const browserEvents = goog.require('Blockly.browserEvents');
 const common = goog.require('Blockly.common');
 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');
 /** @suppress {extraRequire} */
 goog.require('Blockly.BlockDragger');
 /** @suppress {extraRequire} */
diff --git a/core/icon.js b/core/icon.js
index ba470e6bc..83dbaf583 100644
--- a/core/icon.js
+++ b/core/icon.js
@@ -13,8 +13,6 @@
 goog.module('Blockly.Icon');
 goog.module.declareLegacyNamespace();
 
-/* 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');
@@ -23,6 +21,8 @@ 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');
 
 
 /**
diff --git a/core/inject.js b/core/inject.js
index 1e50d1914..054b97b24 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -13,7 +13,6 @@
 goog.module('Blockly.inject');
 goog.module.declareLegacyNamespace();
 
-const BlockDragSurfaceSvg = goog.require('Blockly.BlockDragSurfaceSvg');
 /* eslint-disable-next-line no-unused-vars */
 const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
 const Css = goog.require('Blockly.Css');
@@ -37,6 +36,7 @@ const common = goog.require('Blockly.common');
 const dom = goog.require('Blockly.utils.dom');
 const userAgent = goog.require('Blockly.utils.userAgent');
 const utils = goog.require('Blockly.utils');
+const {BlockDragSurfaceSvg} = goog.require('Blockly.BlockDragSurfaceSvg');
 
 
 /**
diff --git a/core/input.js b/core/input.js
index 9eb3892f8..04dda6620 100644
--- a/core/input.js
+++ b/core/input.js
@@ -13,10 +13,6 @@
 goog.module('Blockly.Input');
 goog.module.declareLegacyNamespace();
 
-/* 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 Connection = goog.requireType('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
@@ -26,6 +22,10 @@ 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 {Block} = goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.FieldLabel');
 
diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js
index 004ac569e..bc4c2f311 100644
--- a/core/insertion_marker_manager.js
+++ b/core/insertion_marker_manager.js
@@ -15,8 +15,6 @@ goog.module.declareLegacyNamespace();
 
 // TODO(#5073): Add Blockly require after fixing circular dependency.
 // goog.require('Blockly');
-/* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const ComponentManager = goog.require('Blockly.ComponentManager');
 /* eslint-disable-next-line no-unused-vars */
 const Coordinate = goog.requireType('Blockly.utils.Coordinate');
@@ -34,6 +32,8 @@ const common = goog.require('Blockly.common');
 const connectionTypes = goog.require('Blockly.connectionTypes');
 const constants = goog.require('Blockly.constants');
 const internalConstants = goog.require('Blockly.internalConstants');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/interfaces/i_ast_node_location_with_block.js b/core/interfaces/i_ast_node_location_with_block.js
index 0bef06154..b45bca4ea 100644
--- a/core/interfaces/i_ast_node_location_with_block.js
+++ b/core/interfaces/i_ast_node_location_with_block.js
@@ -15,10 +15,10 @@
 goog.module('Blockly.IASTNodeLocationWithBlock');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const Block = goog.requireType('Blockly.Block');
 /* eslint-disable-next-line no-unused-vars */
 const IASTNodeLocation = goog.requireType('Blockly.IASTNodeLocation');
+/* eslint-disable-next-line no-unused-vars */
+const {Block} = goog.requireType('Blockly.Block');
 
 
 /**
diff --git a/core/interfaces/i_block_dragger.js b/core/interfaces/i_block_dragger.js
index b87cd9865..a5068e192 100644
--- a/core/interfaces/i_block_dragger.js
+++ b/core/interfaces/i_block_dragger.js
@@ -14,10 +14,10 @@
 goog.module('Blockly.IBlockDragger');
 goog.module.declareLegacyNamespace();
 
-/* 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 {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/interfaces/i_bubble.js b/core/interfaces/i_bubble.js
index a7578fc09..be59509b7 100644
--- a/core/interfaces/i_bubble.js
+++ b/core/interfaces/i_bubble.js
@@ -14,14 +14,14 @@
 goog.module('Blockly.IBubble');
 goog.module.declareLegacyNamespace();
 
-/* 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.requireType('Blockly.IContextMenu');
 /* eslint-disable-next-line no-unused-vars */
 const IDraggable = goog.requireType('Blockly.IDraggable');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockDragSurfaceSvg} = goog.requireType('Blockly.BlockDragSurfaceSvg');
 
 
 /**
diff --git a/core/interfaces/i_flyout.js b/core/interfaces/i_flyout.js
index 405f0e482..030fd89fe 100644
--- a/core/interfaces/i_flyout.js
+++ b/core/interfaces/i_flyout.js
@@ -14,8 +14,6 @@
 goog.module('Blockly.IFlyout');
 goog.module.declareLegacyNamespace();
 
-/* 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 */
@@ -26,6 +24,8 @@ const Svg = goog.requireType('Blockly.utils.Svg');
 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');
 
 
 /**
diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index 48e8eb1ae..550625681 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -12,8 +12,6 @@
 
 goog.module('Blockly.ASTNode');
 
-/* eslint-disable-next-line no-unused-vars */
-const Block = goog.requireType('Blockly.Block');
 /* eslint-disable-next-line no-unused-vars */
 const Connection = goog.requireType('Blockly.Connection');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
@@ -28,6 +26,8 @@ const Input = goog.requireType('Blockly.Input');
 /* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
 const connectionTypes = goog.require('Blockly.connectionTypes');
+/* eslint-disable-next-line no-unused-vars */
+const {Block} = goog.requireType('Blockly.Block');
 
 
 /**
diff --git a/core/mutator.js b/core/mutator.js
index e3b5fd9d8..9a662750f 100644
--- a/core/mutator.js
+++ b/core/mutator.js
@@ -17,11 +17,7 @@ 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 Block = goog.requireType('Blockly.Block');
-/* eslint-disable-next-line no-unused-vars */
 const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
-/* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const Bubble = goog.require('Blockly.Bubble');
 /* eslint-disable-next-line no-unused-vars */
 const Connection = goog.requireType('Blockly.Connection');
@@ -39,6 +35,10 @@ const internalConstants = goog.require('Blockly.internalConstants');
 const object = goog.require('Blockly.utils.object');
 const toolbox = goog.require('Blockly.utils.toolbox');
 const xml = goog.require('Blockly.utils.xml');
+/* 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.Events.BlockChange');
 /** @suppress {extraRequire} */
diff --git a/core/procedures.js b/core/procedures.js
index 57a18b5dd..dbde96688 100644
--- a/core/procedures.js
+++ b/core/procedures.js
@@ -19,8 +19,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 Block = goog.requireType('Blockly.Block');
 const Blocks = goog.require('Blockly.Blocks');
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
@@ -33,6 +31,8 @@ const Workspace = goog.require('Blockly.Workspace');
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const Xml = goog.require('Blockly.Xml');
 const utilsXml = goog.require('Blockly.utils.xml');
+/* eslint-disable-next-line no-unused-vars */
+const {Block} = goog.requireType('Blockly.Block');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 
diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index a4958c0f9..974093b71 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -13,10 +13,6 @@
 goog.module('Blockly.RenderedConnection');
 goog.module.declareLegacyNamespace();
 
-/* 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.require('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
 const ConnectionDB = goog.requireType('Blockly.ConnectionDB');
@@ -31,6 +27,10 @@ const internalConstants = goog.require('Blockly.internalConstants');
 const object = goog.require('Blockly.utils.object');
 const svgPaths = goog.require('Blockly.utils.svgPaths');
 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');
 
 
 /**
diff --git a/core/renderers/common/debugger.js b/core/renderers/common/debugger.js
index ebe19d791..299fd0a96 100644
--- a/core/renderers/common/debugger.js
+++ b/core/renderers/common/debugger.js
@@ -13,8 +13,6 @@
 goog.module('Blockly.blockRendering.Debug');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
 const FieldLabel = goog.require('Blockly.FieldLabel');
@@ -32,6 +30,8 @@ const Svg = goog.require('Blockly.utils.Svg');
 const Types = goog.require('Blockly.blockRendering.Types');
 const connectionTypes = goog.require('Blockly.connectionTypes');
 const dom = goog.require('Blockly.utils.dom');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/renderers/common/drawer.js b/core/renderers/common/drawer.js
index 430d91c47..f88e9faaa 100644
--- a/core/renderers/common/drawer.js
+++ b/core/renderers/common/drawer.js
@@ -13,8 +13,6 @@
 goog.module('Blockly.blockRendering.Drawer');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
 /* eslint-disable-next-line no-unused-vars */
@@ -30,6 +28,8 @@ const Row = goog.requireType('Blockly.blockRendering.Row');
 const Types = goog.require('Blockly.blockRendering.Types');
 const blockRendering = goog.require('Blockly.blockRendering');
 const svgPaths = goog.require('Blockly.utils.svgPaths');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/renderers/common/i_path_object.js b/core/renderers/common/i_path_object.js
index 1a8deb11e..80d465682 100644
--- a/core/renderers/common/i_path_object.js
+++ b/core/renderers/common/i_path_object.js
@@ -15,12 +15,12 @@
 goog.module('Blockly.blockRendering.IPathObject');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const Block = goog.requireType('Blockly.Block');
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
 /* eslint-disable-next-line no-unused-vars */
 const Theme = goog.requireType('Blockly.Theme');
+/* eslint-disable-next-line no-unused-vars */
+const {Block} = goog.requireType('Blockly.Block');
 
 
 /**
diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js
index b5da1701d..3d807d04d 100644
--- a/core/renderers/common/info.js
+++ b/core/renderers/common/info.js
@@ -13,8 +13,6 @@
 goog.module('Blockly.blockRendering.RenderInfo');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const BottomRow = goog.require('Blockly.blockRendering.BottomRow');
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
@@ -47,7 +45,8 @@ const TopRow = goog.require('Blockly.blockRendering.TopRow');
 const Types = goog.require('Blockly.blockRendering.Types');
 const constants = goog.require('Blockly.constants');
 const inputTypes = goog.require('Blockly.inputTypes');
-
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js
index 171fa36a6..4ce311b36 100644
--- a/core/renderers/common/marker_svg.js
+++ b/core/renderers/common/marker_svg.js
@@ -16,8 +16,6 @@ goog.module.declareLegacyNamespace();
 
 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 Connection = goog.requireType('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
@@ -36,6 +34,8 @@ 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');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.MarkerMove');
 
diff --git a/core/renderers/common/path_object.js b/core/renderers/common/path_object.js
index d8d36c9dc..34f6ee16a 100644
--- a/core/renderers/common/path_object.js
+++ b/core/renderers/common/path_object.js
@@ -14,8 +14,6 @@
 goog.module('Blockly.blockRendering.PathObject');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const Block = goog.requireType('Blockly.Block');
 /* eslint-disable-next-line no-unused-vars */
 const Connection = goog.requireType('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
@@ -26,6 +24,8 @@ const Svg = goog.require('Blockly.utils.Svg');
 /* eslint-disable-next-line no-unused-vars */
 const Theme = goog.requireType('Blockly.Theme');
 const dom = goog.require('Blockly.utils.dom');
+/* eslint-disable-next-line no-unused-vars */
+const {Block} = goog.requireType('Blockly.Block');
 
 
 /**
diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js
index 0fdd2d00f..4f4f0a699 100644
--- a/core/renderers/common/renderer.js
+++ b/core/renderers/common/renderer.js
@@ -13,10 +13,6 @@
 goog.module('Blockly.blockRendering.Renderer');
 goog.module.declareLegacyNamespace();
 
-/* 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.require('Blockly.Connection');
 const ConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider');
 /* eslint-disable-next-line no-unused-vars */
@@ -41,6 +37,10 @@ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const blockRendering = goog.require('Blockly.blockRendering');
 const connectionTypes = goog.require('Blockly.connectionTypes');
 const object = goog.require('Blockly.utils.object');
+/* 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');
 
 
 /**
diff --git a/core/renderers/geras/drawer.js b/core/renderers/geras/drawer.js
index 8c4781890..15dcff2ae 100644
--- a/core/renderers/geras/drawer.js
+++ b/core/renderers/geras/drawer.js
@@ -14,8 +14,6 @@ goog.module('Blockly.geras.Drawer');
 goog.module.declareLegacyNamespace();
 
 const BaseDrawer = goog.require('Blockly.blockRendering.Drawer');
-/* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const Highlighter = goog.require('Blockly.geras.Highlighter');
 /* eslint-disable-next-line no-unused-vars */
 const PathObject = goog.requireType('Blockly.geras.PathObject');
@@ -24,6 +22,8 @@ const RenderInfo = goog.requireType('Blockly.geras.RenderInfo');
 const blockRendering = goog.require('Blockly.blockRendering');
 const object = goog.require('Blockly.utils.object');
 const svgPaths = goog.require('Blockly.utils.svgPaths');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/renderers/geras/info.js b/core/renderers/geras/info.js
index 582aab2da..8226cb292 100644
--- a/core/renderers/geras/info.js
+++ b/core/renderers/geras/info.js
@@ -15,8 +15,6 @@ goog.module('Blockly.geras.RenderInfo');
 goog.module.declareLegacyNamespace();
 
 const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo');
-/* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const ExternalValueInput = goog.require('Blockly.blockRendering.ExternalValueInput');
 /* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.blockRendering.Field');
@@ -30,6 +28,8 @@ const StatementInput = goog.require('Blockly.geras.StatementInput');
 const Types = goog.require('Blockly.blockRendering.Types');
 const inputTypes = goog.require('Blockly.inputTypes');
 const object = goog.require('Blockly.utils.object');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/renderers/geras/renderer.js b/core/renderers/geras/renderer.js
index 7c505e8c8..9cf592c69 100644
--- a/core/renderers/geras/renderer.js
+++ b/core/renderers/geras/renderer.js
@@ -18,8 +18,6 @@ const BaseRenderer = goog.require('Blockly.blockRendering.Renderer');
 const BaseRenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
 /* eslint-disable-next-line no-unused-vars */
 const BaseConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
-/* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const ConstantProvider = goog.require('Blockly.geras.ConstantProvider');
 const Drawer = goog.require('Blockly.geras.Drawer');
 const HighlightConstantProvider = goog.require('Blockly.geras.HighlightConstantProvider');
@@ -29,6 +27,8 @@ const RenderInfo = goog.require('Blockly.geras.RenderInfo');
 const Theme = goog.requireType('Blockly.Theme');
 const blockRendering = goog.require('Blockly.blockRendering');
 const object = goog.require('Blockly.utils.object');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/renderers/measurables/bottom_row.js b/core/renderers/measurables/bottom_row.js
index 1c4fe02ac..2ed324afe 100644
--- a/core/renderers/measurables/bottom_row.js
+++ b/core/renderers/measurables/bottom_row.js
@@ -13,8 +13,6 @@
 goog.module('Blockly.blockRendering.BottomRow');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
 /* eslint-disable-next-line no-unused-vars */
@@ -22,6 +20,8 @@ const NextConnection = goog.requireType('Blockly.blockRendering.NextConnection')
 const Row = goog.require('Blockly.blockRendering.Row');
 const Types = goog.require('Blockly.blockRendering.Types');
 const object = goog.require('Blockly.utils.object');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/renderers/measurables/top_row.js b/core/renderers/measurables/top_row.js
index bc59170d6..e64ba06a6 100644
--- a/core/renderers/measurables/top_row.js
+++ b/core/renderers/measurables/top_row.js
@@ -12,8 +12,6 @@
 goog.module('Blockly.blockRendering.TopRow');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
 /* eslint-disable-next-line no-unused-vars */
@@ -21,6 +19,8 @@ const PreviousConnection = goog.requireType('Blockly.blockRendering.PreviousConn
 const Row = goog.require('Blockly.blockRendering.Row');
 const Types = goog.require('Blockly.blockRendering.Types');
 const object = goog.require('Blockly.utils.object');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/renderers/minimalist/drawer.js b/core/renderers/minimalist/drawer.js
index d0cd3a417..161287b7a 100644
--- a/core/renderers/minimalist/drawer.js
+++ b/core/renderers/minimalist/drawer.js
@@ -14,10 +14,10 @@ goog.module.declareLegacyNamespace();
 
 const BaseDrawer = goog.require('Blockly.blockRendering.Drawer');
 /* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
-/* eslint-disable-next-line no-unused-vars */
 const RenderInfo = goog.requireType('Blockly.minimalist.RenderInfo');
 const object = goog.require('Blockly.utils.object');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/renderers/minimalist/info.js b/core/renderers/minimalist/info.js
index a2d40f041..c46b16860 100644
--- a/core/renderers/minimalist/info.js
+++ b/core/renderers/minimalist/info.js
@@ -14,10 +14,10 @@ goog.module.declareLegacyNamespace();
 
 const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo');
 /* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
-/* eslint-disable-next-line no-unused-vars */
 const Renderer = goog.requireType('Blockly.minimalist.Renderer');
 const object = goog.require('Blockly.utils.object');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/renderers/minimalist/renderer.js b/core/renderers/minimalist/renderer.js
index 365a00774..c2d1855f1 100644
--- a/core/renderers/minimalist/renderer.js
+++ b/core/renderers/minimalist/renderer.js
@@ -15,13 +15,13 @@ goog.module.declareLegacyNamespace();
 /* eslint-disable-next-line no-unused-vars */
 const BaseRenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
 const BaseRenderer = goog.require('Blockly.blockRendering.Renderer');
-/* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const ConstantProvider = goog.require('Blockly.minimalist.ConstantProvider');
 const Drawer = goog.require('Blockly.minimalist.Drawer');
 const RenderInfo = goog.require('Blockly.minimalist.RenderInfo');
 const blockRendering = goog.require('Blockly.blockRendering');
 const object = goog.require('Blockly.utils.object');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/renderers/thrasos/info.js b/core/renderers/thrasos/info.js
index 974a0e76e..a48b3c2af 100644
--- a/core/renderers/thrasos/info.js
+++ b/core/renderers/thrasos/info.js
@@ -16,14 +16,14 @@ goog.module.declareLegacyNamespace();
 
 const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo');
 /* 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.blockRendering.Field');
 const InRowSpacer = goog.require('Blockly.blockRendering.InRowSpacer');
 /* eslint-disable-next-line no-unused-vars */
 const Renderer = goog.requireType('Blockly.thrasos.Renderer');
 const Types = goog.require('Blockly.blockRendering.Types');
 const object = goog.require('Blockly.utils.object');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/renderers/thrasos/renderer.js b/core/renderers/thrasos/renderer.js
index cda5d40d5..bbe85db11 100644
--- a/core/renderers/thrasos/renderer.js
+++ b/core/renderers/thrasos/renderer.js
@@ -14,11 +14,11 @@ goog.module('Blockly.thrasos.Renderer');
 goog.module.declareLegacyNamespace();
 
 const BaseRenderer = goog.require('Blockly.blockRendering.Renderer');
-/* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const RenderInfo = goog.require('Blockly.thrasos.RenderInfo');
 const blockRendering = goog.require('Blockly.blockRendering');
 const object = goog.require('Blockly.utils.object');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/renderers/zelos/drawer.js b/core/renderers/zelos/drawer.js
index 554859b93..52e371a4d 100644
--- a/core/renderers/zelos/drawer.js
+++ b/core/renderers/zelos/drawer.js
@@ -15,8 +15,6 @@ goog.module.declareLegacyNamespace();
 
 const BaseDrawer = goog.require('Blockly.blockRendering.Drawer');
 /* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
-/* eslint-disable-next-line no-unused-vars */
 const PathObject = goog.requireType('Blockly.zelos.PathObject');
 /* eslint-disable-next-line no-unused-vars */
 const RenderInfo = goog.requireType('Blockly.zelos.RenderInfo');
@@ -25,6 +23,8 @@ const Row = goog.requireType('Blockly.blockRendering.Row');
 const blockRendering = goog.require('Blockly.blockRendering');
 const object = goog.require('Blockly.utils.object');
 const svgPaths = goog.require('Blockly.utils.svgPaths');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/renderers/zelos/info.js b/core/renderers/zelos/info.js
index c98826e27..7c2d62062 100644
--- a/core/renderers/zelos/info.js
+++ b/core/renderers/zelos/info.js
@@ -15,8 +15,6 @@ goog.module('Blockly.zelos.RenderInfo');
 goog.module.declareLegacyNamespace();
 
 const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo');
-/* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const BottomRow = goog.require('Blockly.zelos.BottomRow');
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.zelos.ConstantProvider');
@@ -34,6 +32,8 @@ const Types = goog.require('Blockly.blockRendering.Types');
 const constants = goog.require('Blockly.constants');
 const inputTypes = goog.require('Blockly.inputTypes');
 const object = goog.require('Blockly.utils.object');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/renderers/zelos/marker_svg.js b/core/renderers/zelos/marker_svg.js
index 0cd8c5dc9..af056a51f 100644
--- a/core/renderers/zelos/marker_svg.js
+++ b/core/renderers/zelos/marker_svg.js
@@ -17,8 +17,6 @@ goog.module.declareLegacyNamespace();
 const ASTNode = goog.requireType('Blockly.ASTNode');
 const BaseMarkerSvg = goog.require('Blockly.blockRendering.MarkerSvg');
 /* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
-/* 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');
@@ -29,6 +27,8 @@ const Svg = goog.require('Blockly.utils.Svg');
 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 {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/renderers/zelos/renderer.js b/core/renderers/zelos/renderer.js
index 0eb0ef4ed..f5a866f00 100644
--- a/core/renderers/zelos/renderer.js
+++ b/core/renderers/zelos/renderer.js
@@ -16,8 +16,6 @@ goog.module.declareLegacyNamespace();
 const BaseRenderer = goog.require('Blockly.blockRendering.Renderer');
 /* eslint-disable-next-line no-unused-vars */
 const BaseRenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
-/* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const ConstantProvider = goog.require('Blockly.zelos.ConstantProvider');
 const Drawer = goog.require('Blockly.zelos.Drawer');
 const InsertionMarkerManager = goog.require('Blockly.InsertionMarkerManager');
@@ -33,6 +31,8 @@ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const blockRendering = goog.require('Blockly.blockRendering');
 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');
 
 
 /**
diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index e8af944cc..56b07af71 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -15,8 +15,6 @@ goog.module.declareLegacyNamespace();
 
 const {BadConnectionCheck, MissingBlockType, MissingConnection, RealChildOfShadow} = goog.require('Blockly.serialization.exceptions');
 // eslint-disable-next-line no-unused-vars
-const Block = goog.requireType('Blockly.Block');
-// eslint-disable-next-line no-unused-vars
 const Connection = goog.requireType('Blockly.Connection');
 const Events = goog.require('Blockly.Events');
 // eslint-disable-next-line no-unused-vars
@@ -28,6 +26,8 @@ const Xml = goog.require('Blockly.Xml');
 const inputTypes = goog.require('Blockly.inputTypes');
 const priorities = goog.require('Blockly.serialization.priorities');
 const serializationRegistry = goog.require('Blockly.serialization.registry');
+/* eslint-disable-next-line no-unused-vars */
+const {Block} = goog.requireType('Blockly.Block');
 
 
 // TODO(#5160): Remove this once lint is fixed.
@@ -342,7 +342,7 @@ const appendInternal = function(
   Events.fire(new (Events.get(Events.BLOCK_CREATE))(block));
   Events.setGroup(existingGroup);
   Events.setRecordUndo(prevRecordUndo);
-  
+
   // Adding connections to the connection db is expensive. This defers that
   // operation to decrease load time.
   if (workspace.rendered) {
@@ -468,7 +468,7 @@ const tryToConnectParent = function(parentConnection, child, state) {
   if (parentConnection.getSourceBlock().isShadow() && !child.isShadow()) {
     throw new RealChildOfShadow(state);
   }
-  
+
   let connected = false;
   let childConnection;
   if (parentConnection.type == inputTypes.VALUE) {
diff --git a/core/serialization/exceptions.js b/core/serialization/exceptions.js
index 4b85f5603..c776689a8 100644
--- a/core/serialization/exceptions.js
+++ b/core/serialization/exceptions.js
@@ -13,10 +13,11 @@
 goog.module('Blockly.serialization.exceptions');
 goog.module.declareLegacyNamespace();
 
-// eslint-disable-next-line no-unused-vars
-const Block = goog.requireType('Blockly.Block');
 // eslint-disable-next-line no-unused-vars
 const {State} = goog.requireType('Blockly.serialization.blocks');
+/* eslint-disable-next-line no-unused-vars */
+const {Block} = goog.requireType('Blockly.Block');
+
 
 class DeserializationError extends Error {}
 exports.DeserializationError = DeserializationError;
diff --git a/core/shortcut_items.js b/core/shortcut_items.js
index ca8a06441..45e48eb88 100644
--- a/core/shortcut_items.js
+++ b/core/shortcut_items.js
@@ -13,8 +13,6 @@
 goog.module('Blockly.ShortcutItems');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const Gesture = goog.require('Blockly.Gesture');
 /* eslint-disable-next-line no-unused-vars */
 const ICopyable = goog.requireType('Blockly.ICopyable');
@@ -22,6 +20,8 @@ const KeyCodes = goog.require('Blockly.utils.KeyCodes');
 const ShortcutRegistry = goog.require('Blockly.ShortcutRegistry');
 const clipboard = goog.require('Blockly.clipboard');
 const common = goog.require('Blockly.common');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 
 
 /**
diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index 564f06aa5..e0eb0f611 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -15,7 +15,6 @@ goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
-const BlockSvg = goog.require('Blockly.BlockSvg');
 const CollapsibleToolboxCategory = goog.require('Blockly.CollapsibleToolboxCategory');
 const ComponentManager = goog.require('Blockly.ComponentManager');
 const Css = goog.require('Blockly.Css');
@@ -54,6 +53,7 @@ const keyCodes = goog.require('Blockly.utils.KeyCodes');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
 const toolbox = goog.require('Blockly.utils.toolbox');
+const {BlockSvg} = goog.require('Blockly.BlockSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.ToolboxItemSelect');
 
diff --git a/core/utils.js b/core/utils.js
index 5b5e74f8a..891e4d415 100644
--- a/core/utils.js
+++ b/core/utils.js
@@ -19,8 +19,6 @@
 goog.module('Blockly.utils');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const Block = goog.requireType('Blockly.Block');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const KeyCodes = goog.require('Blockly.utils.KeyCodes');
 const Metrics = goog.require('Blockly.utils.Metrics');
@@ -46,6 +44,8 @@ const svgPaths = goog.require('Blockly.utils.svgPaths');
 const toolbox = goog.require('Blockly.utils.toolbox');
 const userAgent = goog.require('Blockly.utils.userAgent');
 const xmlUtils = goog.require('Blockly.utils.xml');
+/* eslint-disable-next-line no-unused-vars */
+const {Block} = goog.requireType('Blockly.Block');
 
 
 exports.aria = aria;
diff --git a/core/variable_map.js b/core/variable_map.js
index 29988150c..30b0eb6ec 100644
--- a/core/variable_map.js
+++ b/core/variable_map.js
@@ -13,8 +13,6 @@
 goog.module('Blockly.VariableMap');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const Block = goog.requireType('Blockly.Block');
 const Events = goog.require('Blockly.Events');
 const Msg = goog.require('Blockly.Msg');
 const Names = goog.require('Blockly.Names');
@@ -24,6 +22,8 @@ const Workspace = goog.requireType('Blockly.Workspace');
 const dialog = goog.require('Blockly.dialog');
 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');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.VarDelete');
 /** @suppress {extraRequire} */
diff --git a/core/warning.js b/core/warning.js
index 6ed5d0c02..debd9d529 100644
--- a/core/warning.js
+++ b/core/warning.js
@@ -13,10 +13,6 @@
 goog.module('Blockly.Warning');
 goog.module.declareLegacyNamespace();
 
-/* 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 Bubble = goog.require('Blockly.Bubble');
 /* eslint-disable-next-line no-unused-vars */
 const Coordinate = goog.requireType('Blockly.utils.Coordinate');
@@ -25,6 +21,10 @@ const Icon = goog.require('Blockly.Icon');
 const Svg = goog.require('Blockly.utils.Svg');
 const dom = goog.require('Blockly.utils.dom');
 const object = goog.require('Blockly.utils.object');
+/* 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.Events.BubbleOpen');
 
diff --git a/core/workspace.js b/core/workspace.js
index c0c3bb608..55e273525 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -16,8 +16,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 Block = goog.requireType('Blockly.Block');
-/* eslint-disable-next-line no-unused-vars */
 const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
 /* eslint-disable-next-line no-unused-vars */
 const ConnectionDB = goog.requireType('Blockly.ConnectionDB');
@@ -38,6 +36,8 @@ const registry = goog.require('Blockly.registry');
 /* eslint-disable-next-line no-unused-vars */
 const toolbox = goog.requireType('Blockly.utils.toolbox');
 const utils = goog.require('Blockly.utils');
+/* eslint-disable-next-line no-unused-vars */
+const {Block} = goog.requireType('Blockly.Block');
 /** @suppress {extraRequire} */
 goog.require('Blockly.ConnectionChecker');
 
@@ -522,7 +522,7 @@ Workspace.prototype.getWidth = function() {
  * @return {!Block} The created block.
  */
 Workspace.prototype.newBlock = function(prototypeName, opt_id) {
-  const Block = goog.module.get('Blockly.Block');
+  const {Block} = goog.module.get('Blockly.Block');
   return new Block(this, prototypeName, opt_id);
 };
 
diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 58ff479a4..3e4dc288b 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -13,8 +13,6 @@
 goog.module('Blockly.WorkspaceCommentSvg');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const BlockDragSurfaceSvg = goog.requireType('Blockly.BlockDragSurfaceSvg');
 const ContextMenu = goog.require('Blockly.ContextMenu');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Css = goog.require('Blockly.Css');
@@ -36,6 +34,8 @@ const common = goog.require('Blockly.common');
 const dom = goog.require('Blockly.utils.dom');
 const object = goog.require('Blockly.utils.object');
 const utils = goog.require('Blockly.utils');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockDragSurfaceSvg} = goog.requireType('Blockly.BlockDragSurfaceSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.CommentCreate');
 /** @suppress {extraRequire} */
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 15263d1c4..f4edf287d 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -13,11 +13,6 @@
 goog.module('Blockly.WorkspaceSvg');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-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 BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
 const Classic = goog.require('Blockly.Themes.Classic');
@@ -96,6 +91,11 @@ const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
 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 {BlockDragSurfaceSvg} = goog.requireType('Blockly.BlockDragSurfaceSvg');
+const {BlockSvg} = goog.require('Blockly.BlockSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
 /** @suppress {extraRequire} */
@@ -1518,7 +1518,7 @@ WorkspaceSvg.prototype.paste = function(state) {
   if (this.currentGesture_) {
     this.currentGesture_.cancel();  // Dragging while pasting?  No.
   }
-  
+
   // Checks if this is JSON. JSON has a type property, while elements don't.
   if (state['type']) {
     this.pasteBlock_(null, /** @type {!blocks.State} */ (state));
diff --git a/core/xml.js b/core/xml.js
index 7406e0e09..c6a14f491 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -13,8 +13,6 @@
 goog.module('Blockly.Xml');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const Block = goog.requireType('Blockly.Block');
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const Connection = goog.requireType('Blockly.Connection');
@@ -30,6 +28,8 @@ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const dom = goog.require('Blockly.utils.dom');
 const inputTypes = goog.require('Blockly.inputTypes');
 const utilsXml = goog.require('Blockly.utils.xml');
+/* eslint-disable-next-line no-unused-vars */
+const {Block} = goog.requireType('Blockly.Block');
 goog.requireType('Blockly.Comment');
 goog.requireType('Blockly.Variables');
 goog.requireType('Blockly.WorkspaceComment');

From 900dfc7c6809a920f19b95e0d761cca23f4bf50d Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 22 Sep 2021 09:37:47 -0700
Subject: [PATCH 804/833] Remove references to fully qualified namespace

---
 core/renderers/zelos/info.js | 2 +-
 core/workspace.js            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/renderers/zelos/info.js b/core/renderers/zelos/info.js
index b00488ba8..710b1f6ba 100644
--- a/core/renderers/zelos/info.js
+++ b/core/renderers/zelos/info.js
@@ -266,7 +266,7 @@ RenderInfo.prototype.addInput_ = function(input, activeRow) {
       activeRow.align == constants.ALIGN.LEFT &&
       input.align == constants.ALIGN.RIGHT) {
     activeRow.rightAlignedDummyInput = input;
-  } else if (input.type == Blockly.inputTypes.STATEMENT) {
+  } else if (input.type == inputTypes.STATEMENT) {
     // Handle statements without next connections correctly.
     activeRow.elements.push(
         new StatementInput(this.constants_, input));
diff --git a/core/workspace.js b/core/workspace.js
index bd00555f1..2b844d5cc 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -257,7 +257,7 @@ Workspace.prototype.addTypedBlock = function(block) {
  * @param {!Block} block Block to remove.
  */
 Workspace.prototype.removeTypedBlock = function(block) {
-  Blockly.utils.arrayRemove(this.typedBlocksDB_[block.type], block);
+  utils.arrayRemove(this.typedBlocksDB_[block.type], block);
   if (!this.typedBlocksDB_[block.type].length) {
     delete this.typedBlocksDB_[block.type];
   }

From b956fa758f3838e0ac9d6aaaeaec59feb3338c49 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 22 Sep 2021 10:09:27 -0700
Subject: [PATCH 805/833] Remove duplicate declaration

---
 core/field.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/core/field.js b/core/field.js
index bfa69b2fd..4be8dfd63 100644
--- a/core/field.js
+++ b/core/field.js
@@ -223,13 +223,6 @@ Field.prototype.visible_ = true;
  */
 Field.prototype.enabled_ = true;
 
-/**
- * Can the field value be changed using the editor on an editable block?
- * @type {boolean}
- * @protected
- */
-Field.prototype.enabled_ = true;
-
 /**
  * The element the click handler is bound to.
  * @type {Element}

From d614f5859d900bd842bd21001a7a1d833bbf38c6 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 22 Sep 2021 10:28:06 -0700
Subject: [PATCH 806/833] Fix bug in variable_map that was introduced during
 merge conflict resolving

---
 core/variable_map.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/variable_map.js b/core/variable_map.js
index 997a26e96..3725df516 100644
--- a/core/variable_map.js
+++ b/core/variable_map.js
@@ -152,7 +152,7 @@ VariableMap.prototype.renameVariableWithConflict_ = function(
   // Finally delete the original variable, which is now unreferenced.
   Events.fire(new (Events.get(Events.VAR_DELETE))(variable));
   // And remove it from the list.
-  utils.arrayRemove(this.getVariablesOfType(type), variable);
+  utils.arrayRemove(this.variableMap_[type], variable);
 };
 
 /* End functions for renaming variables. */

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 807/833] 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');
 
 

From d141dc571aa2086ed52df9658033a7394355176a Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Wed, 22 Sep 2021 11:27:18 -0700
Subject: [PATCH 808/833] chore: update dev tools dev dependency (#5516)

---
 package-lock.json | 15 +++++++--------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c4172ca05..55769ae09 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,7 +5,6 @@
   "requires": true,
   "packages": {
     "": {
-      "name": "blockly",
       "version": "6.20210701.0",
       "license": "Apache-2.0",
       "dependencies": {
@@ -13,7 +12,7 @@
       },
       "devDependencies": {
         "@blockly/block-test": "^1.0.0",
-        "@blockly/dev-tools": "^2.6.1-beta.0",
+        "@blockly/dev-tools": "^2.6.1",
         "@blockly/theme-modern": "^2.1.1",
         "@wdio/selenium-standalone-service": "^6.11.0",
         "babel-eslint": "^10.1.0",
@@ -279,9 +278,9 @@
       }
     },
     "node_modules/@blockly/dev-tools": {
-      "version": "2.6.1-beta.0",
-      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-2.6.1-beta.0.tgz",
-      "integrity": "sha512-GKnOT+EkvhRtwG6ZRseWEFB96xMyzzY6CPCkPHbCHGNnOB4Z4j3jmU2zIMkWG8lR8pQF0CCWKZinDrMtXSeLjQ==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-2.6.1.tgz",
+      "integrity": "sha512-mv7u3x/Z2qA2PCSPomz0S4ofQn+m/UHC/AoNu1FZuwNAwuE5SCy7HCTDracpKWqoK8iuXwi4PWUdu669CDbp5A==",
       "dev": true,
       "dependencies": {
         "@blockly/block-test": "^1.1.5",
@@ -12735,9 +12734,9 @@
       "requires": {}
     },
     "@blockly/dev-tools": {
-      "version": "2.6.1-beta.0",
-      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-2.6.1-beta.0.tgz",
-      "integrity": "sha512-GKnOT+EkvhRtwG6ZRseWEFB96xMyzzY6CPCkPHbCHGNnOB4Z4j3jmU2zIMkWG8lR8pQF0CCWKZinDrMtXSeLjQ==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-2.6.1.tgz",
+      "integrity": "sha512-mv7u3x/Z2qA2PCSPomz0S4ofQn+m/UHC/AoNu1FZuwNAwuE5SCy7HCTDracpKWqoK8iuXwi4PWUdu669CDbp5A==",
       "dev": true,
       "requires": {
         "@blockly/block-test": "^1.1.5",
diff --git a/package.json b/package.json
index dc83a9df4..611fda618 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@blockly/block-test": "^1.0.0",
-    "@blockly/dev-tools": "^2.6.1-beta.0",
+    "@blockly/dev-tools": "^2.6.1",
     "@blockly/theme-modern": "^2.1.1",
     "@wdio/selenium-standalone-service": "^6.11.0",
     "babel-eslint": "^10.1.0",

From 07894c1d05c8f973793dafe557743abc124e4a35 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 22 Sep 2021 13:20:45 -0700
Subject: [PATCH 809/833] Update package-lock.json

---
 package-lock.json | 18604 ++++++++------------------------------------
 1 file changed, 3172 insertions(+), 15432 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1f6c24768..8541a7196 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12524 +1,222 @@
 {
   "name": "blockly",
   "version": "6.20210701.0",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
   "requires": true,
-  "packages": {
-    "": {
-      "name": "blockly",
-      "version": "6.20210701.0",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "jsdom": "15.2.1"
-      },
-      "devDependencies": {
-        "@blockly/block-test": "^1.0.0",
-        "@blockly/dev-tools": "^2.6.1-beta.0",
-        "@blockly/theme-modern": "^2.1.1",
-        "@wdio/selenium-standalone-service": "^7.10.1",
-        "babel-eslint": "^10.1.0",
-        "chai": "^4.2.0",
-        "clang-format": "^1.5.0",
-        "concurrently": "^6.0.0",
-        "eslint": "^7.28.0",
-        "google-closure-compiler": "^20210601.0.0",
-        "google-closure-deps": "^20210601.0.0",
-        "gulp": "^4.0.2",
-        "gulp-concat": "^2.6.1",
-        "gulp-insert": "^0.5.0",
-        "gulp-rename": "^2.0.0",
-        "gulp-replace": "^1.0.0",
-        "gulp-series": "^1.0.2",
-        "gulp-shell": "^0.8.0",
-        "gulp-sourcemaps": "^3.0.0",
-        "gulp-umd": "^2.0.0",
-        "http-server": "^13.0.2",
-        "js-green-licenses": "^3.0.0",
-        "mocha": "^9.1.1",
-        "readline-sync": "^1.4.10",
-        "rimraf": "^3.0.2",
-        "selenium-standalone": "^7.1.0",
-        "through2": "^4.0.2",
-        "typescript": "^4.3.2",
-        "typescript-closure-tools": "^0.0.7",
-        "webdriverio": "^7.0.3",
-        "yargs": "^16.0.3"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
-      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/generator": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.8.tgz",
-      "integrity": "sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.14.8",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz",
-      "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-get-function-arity": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz",
-      "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz",
-      "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz",
-      "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz",
-      "integrity": "sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.8.tgz",
-      "integrity": "sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/runtime": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz",
-      "integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==",
-      "dev": true,
-      "dependencies": {
-        "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/runtime-corejs3": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.8.tgz",
-      "integrity": "sha512-4dMD5QRBkumn45oweR0SxoNtt15oz3BUBAQ8cIx7HJqZTtE8zjpM0My8aHJHVnyf4XfRg6DNzaE1080WLBiC1w==",
-      "dev": true,
-      "dependencies": {
-        "core-js-pure": "^3.15.0",
-        "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/template": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
-      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.8.tgz",
-      "integrity": "sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.14.8",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/parser": "^7.14.8",
-        "@babel/types": "^7.14.8",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/types": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz",
-      "integrity": "sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.8",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@blockly/block-test": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@blockly/block-test/-/block-test-1.1.5.tgz",
-      "integrity": "sha512-lSDPuwOIEn8DLOzOLu/xNX6U4E4ps+9o5epxJ1JXxBjHqIBw7ghihHfsvuZ1c+rSsBnKGgwBzh5odq6ynIV2GQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.17.0"
-      },
-      "peerDependencies": {
-        "blockly": "2 - 6"
-      }
-    },
-    "node_modules/@blockly/dev-tools": {
-      "version": "2.6.1-beta.0",
-      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-2.6.1-beta.0.tgz",
-      "integrity": "sha512-GKnOT+EkvhRtwG6ZRseWEFB96xMyzzY6CPCkPHbCHGNnOB4Z4j3jmU2zIMkWG8lR8pQF0CCWKZinDrMtXSeLjQ==",
-      "dev": true,
-      "dependencies": {
-        "@blockly/block-test": "^1.1.5",
-        "@blockly/theme-dark": "^2.0.6",
-        "@blockly/theme-deuteranopia": "^1.0.7",
-        "@blockly/theme-highcontrast": "^1.0.7",
-        "@blockly/theme-tritanopia": "^1.0.7",
-        "chai": "^4.2.0",
-        "dat.gui": "^0.7.7",
-        "lodash.assign": "^4.2.0",
-        "lodash.merge": "^4.6.2",
-        "monaco-editor": "^0.20.0",
-        "sinon": "^9.0.2"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      },
-      "peerDependencies": {
-        "blockly": "4.20201217.0 - 6"
-      }
-    },
-    "node_modules/@blockly/theme-dark": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-2.0.6.tgz",
-      "integrity": "sha512-2gPz3Iw+VjBFaNhoYXm/zRA2Xhe/nDnpOyPxbav7sGs4XcO4F0yPruuXxBm7oGGbGudmxmJXhTdmV+4d8MpvSg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.17.0"
-      },
-      "peerDependencies": {
-        "blockly": "3.20200123.0 - 6"
-      }
-    },
-    "node_modules/@blockly/theme-deuteranopia": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-1.0.7.tgz",
-      "integrity": "sha512-m2Jo6lCYnVn3eLzmBoSBN31t2qQ8fAjEJmcUBcpJ56TGB1gks1vGVJHg/yhcK+vUB85IFuUUUJ6+MOjhEZFOvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.17.0"
-      },
-      "peerDependencies": {
-        "blockly": "3.20200123.0 - 6"
-      }
-    },
-    "node_modules/@blockly/theme-highcontrast": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-1.0.7.tgz",
-      "integrity": "sha512-FI/LyP/gGCatpeKvKTLSyColgyHETKSFo5RrgbZ+GTgVAQxXAj7MQ4DZDtlWECOKaT6WGQLNk5OserBXMCtDbQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.17.0"
-      },
-      "peerDependencies": {
-        "blockly": "3.20200123.0 - 6"
-      }
-    },
-    "node_modules/@blockly/theme-modern": {
-      "version": "2.1.24",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-modern/-/theme-modern-2.1.24.tgz",
-      "integrity": "sha512-glTi5qhHr+S87S1skWG8Sre+DYeSIBG3j+YBbwwRX9k3zYtGO+W7sOdJ9DsBJj8NVukPpV1RhQhu5rt93Pp2rw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.17.0"
-      },
-      "peerDependencies": {
-        "blockly": "3.20200123.0 - 6"
-      }
-    },
-    "node_modules/@blockly/theme-tritanopia": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-1.0.7.tgz",
-      "integrity": "sha512-Y6d8ZR3y9iz1GdihHbSYGTIwWEanWtp0tYPtsVx3QlcKMuc+NyAtGQVE324ZTA+N1ayH4L31CGRAAo7AAm3gPA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.17.0"
-      },
-      "peerDependencies": {
-        "blockly": "3.20200123.0 - 6"
-      }
-    },
-    "node_modules/@eslint/eslintrc": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
-      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.1.1",
-        "espree": "^7.3.0",
-        "globals": "^13.9.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^3.13.1",
-        "minimatch": "^3.0.4",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.10.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz",
-      "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@gulp-sourcemaps/identity-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz",
-      "integrity": "sha512-Tb+nSISZku+eQ4X1lAkevcQa+jknn/OVUgZ3XCxEKIsLsqYuPoJwJOPQeaOk75X3WPftb29GWY1eqE7GLsXb1Q==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^6.4.1",
-        "normalize-path": "^3.0.0",
-        "postcss": "^7.0.16",
-        "source-map": "^0.6.0",
-        "through2": "^3.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/@gulp-sourcemaps/identity-map/node_modules/acorn": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/@gulp-sourcemaps/identity-map/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@gulp-sourcemaps/identity-map/node_modules/through2": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
-      "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "readable-stream": "2 || 3"
-      }
-    },
-    "node_modules/@gulp-sourcemaps/map-sources": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz",
-      "integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=",
-      "dev": true,
-      "dependencies": {
-        "normalize-path": "^2.0.1",
-        "through2": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/@gulp-sourcemaps/map-sources/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@gulp-sourcemaps/map-sources/node_modules/through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
-      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
-      "dev": true,
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.0",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
-      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
-      "dev": true
-    },
-    "node_modules/@sindresorhus/is": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
-      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@sinonjs/commons": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
-      "dev": true,
-      "dependencies": {
-        "type-detect": "4.0.8"
-      }
-    },
-    "node_modules/@sinonjs/fake-timers": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
-      "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
-      "dev": true,
-      "dependencies": {
-        "@sinonjs/commons": "^1.7.0"
-      }
-    },
-    "node_modules/@sinonjs/samsam": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.3.1.tgz",
-      "integrity": "sha512-1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg==",
-      "dev": true,
-      "dependencies": {
-        "@sinonjs/commons": "^1.6.0",
-        "lodash.get": "^4.4.2",
-        "type-detect": "^4.0.8"
-      }
-    },
-    "node_modules/@sinonjs/text-encoding": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz",
-      "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==",
-      "dev": true
-    },
-    "node_modules/@szmarczak/http-timer": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
-      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
-      "dev": true,
-      "dependencies": {
-        "defer-to-connect": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@types/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
-      "dev": true
-    },
-    "node_modules/@types/cacheable-request": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz",
-      "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==",
-      "dev": true,
-      "dependencies": {
-        "@types/http-cache-semantics": "*",
-        "@types/keyv": "*",
-        "@types/node": "*",
-        "@types/responselike": "*"
-      }
-    },
-    "node_modules/@types/ejs": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.0.tgz",
-      "integrity": "sha512-DCg+Ka+uDQ31lJ/UtEXVlaeV3d6t81gifaVWKJy4MYVVgvJttyX/viREy+If7fz+tK/gVxTGMtyrFPnm4gjrVA==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/@types/expect": {
-      "version": "1.20.4",
-      "resolved": "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz",
-      "integrity": "sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==",
-      "dev": true
-    },
-    "node_modules/@types/fs-extra": {
-      "version": "9.0.12",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.12.tgz",
-      "integrity": "sha512-I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/http-cache-semantics": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
-      "dev": true
-    },
-    "node_modules/@types/inquirer": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-7.3.3.tgz",
-      "integrity": "sha512-HhxyLejTHMfohAuhRun4csWigAMjXTmRyiJTU1Y/I1xmggikFMkOUoMQRlFm+zQcPEGHSs3io/0FAmNZf8EymQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@types/through": "*",
-        "rxjs": "^6.4.0"
-      }
-    },
-    "node_modules/@types/keyv": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.2.tgz",
-      "integrity": "sha512-/FvAK2p4jQOaJ6CGDHJTqZcUtbZe820qIeTg7o0Shg7drB4JHeL+V/dhSaly7NXx6u8eSee+r7coT+yuJEvDLg==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/lodash": {
-      "version": "4.14.172",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.172.tgz",
-      "integrity": "sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/@types/lodash.flattendeep": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/@types/lodash.flattendeep/-/lodash.flattendeep-4.4.6.tgz",
-      "integrity": "sha512-uLm2MaRVlqJSGsMK0RZpP5T3KqReq+9WbYDHCUhBhp98v56hMG/Yht52bsoTSui9xz2mUvQ9NfG3LrNGDL92Ng==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@types/lodash": "*"
-      }
-    },
-    "node_modules/@types/lodash.pickby": {
-      "version": "4.6.6",
-      "resolved": "https://registry.npmjs.org/@types/lodash.pickby/-/lodash.pickby-4.6.6.tgz",
-      "integrity": "sha512-NFa13XxlMd9eFi0UFZFWIztpMpXhozbijrx3Yb1viYZphT7jyopIFVoIRF4eYMjruWNEG1rnyrRmg/8ej9T8Iw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@types/lodash": "*"
-      }
-    },
-    "node_modules/@types/lodash.union": {
-      "version": "4.6.6",
-      "resolved": "https://registry.npmjs.org/@types/lodash.union/-/lodash.union-4.6.6.tgz",
-      "integrity": "sha512-Wu0ZEVNcyCz8eAn6TlUbYWZoGbH9E+iOHxAZbwUoCEXdUiy6qpcz5o44mMXViM4vlPLLCPlkAubEP1gokoSZaw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@types/lodash": "*"
-      }
-    },
-    "node_modules/@types/minimist": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
-      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "16.4.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.4.1.tgz",
-      "integrity": "sha512-UW7cbLqf/Wu5XH2RKKY1cHwUNLicIDRLMraYKz+HHAerJ0ZffUEk+fMnd8qU2JaS6cAy0r8tsaf7yqHASf/Y0Q==",
-      "dev": true
-    },
-    "node_modules/@types/normalize-package-data": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
-      "dev": true
-    },
-    "node_modules/@types/recursive-readdir": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@types/recursive-readdir/-/recursive-readdir-2.2.0.tgz",
-      "integrity": "sha512-HGk753KRu2N4mWduovY4BLjYq4jTOL29gV2OfGdGxHcPSWGFkC5RRIdk+VTs5XmYd7MVAD+JwKrcb5+5Y7FOCg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/responselike": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
-      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/selenium-standalone": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/@types/selenium-standalone/-/selenium-standalone-7.0.1.tgz",
-      "integrity": "sha512-zbKenL0fAXzPyiOaaFMrvFdMNhj5BgNJQq8bxiZfwQD9ID2J8bUG5xbcS3tQtlzIX/62z9nG5Vo45oaHWTbvbw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/through": {
-      "version": "0.0.30",
-      "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.30.tgz",
-      "integrity": "sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/vinyl": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.5.tgz",
-      "integrity": "sha512-1m6uReH8R/RuLVQGvTT/4LlWq67jZEUxp+FBHt0hYv2BT7TUwFbKI0wa7JZVEU/XtlcnX1QcTuZ36es4rGj7jg==",
-      "dev": true,
-      "dependencies": {
-        "@types/expect": "^1.20.4",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/which": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@types/which/-/which-1.3.2.tgz",
-      "integrity": "sha512-8oDqyLC7eD4HM307boe2QWKyuzdzWBj56xI/imSl2cpL+U3tCMaTAkMJ4ee5JBZ/FsOJlvRGeIShiZDAl1qERA==",
-      "dev": true
-    },
-    "node_modules/@types/yauzl": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz",
-      "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@ungap/promise-all-settled": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
-      "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
-      "dev": true
-    },
-    "node_modules/@wdio/cli": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-7.11.0.tgz",
-      "integrity": "sha512-vhJftrdDNzY7AHwteouEuVp/zA0Fo4IaBdG9P+szh95p4POlGCcXxBZmpbEeYpsgo99tJRwaU/WcCCaVcPypCQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@types/ejs": "^3.0.5",
-        "@types/fs-extra": "^9.0.4",
-        "@types/inquirer": "^7.3.1",
-        "@types/lodash.flattendeep": "^4.4.6",
-        "@types/lodash.pickby": "^4.6.6",
-        "@types/lodash.union": "^4.6.6",
-        "@types/node": "^15.12.5",
-        "@types/recursive-readdir": "^2.2.0",
-        "@wdio/config": "7.10.1",
-        "@wdio/logger": "7.7.0",
-        "@wdio/types": "7.10.1",
-        "@wdio/utils": "7.11.0",
-        "async-exit-hook": "^2.0.1",
-        "chalk": "^4.0.0",
-        "chokidar": "^3.0.0",
-        "cli-spinners": "^2.1.0",
-        "ejs": "^3.0.1",
-        "fs-extra": "^10.0.0",
-        "inquirer": "^8.0.0",
-        "lodash.flattendeep": "^4.4.0",
-        "lodash.pickby": "^4.6.0",
-        "lodash.union": "^4.6.0",
-        "mkdirp": "^1.0.4",
-        "recursive-readdir": "^2.2.2",
-        "webdriverio": "7.11.0",
-        "yargs": "^17.0.0",
-        "yarn-install": "^1.0.0"
-      },
-      "bin": {
-        "wdio": "bin/wdio.js"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@wdio/cli/node_modules/@types/node": {
-      "version": "15.14.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.9.tgz",
-      "integrity": "sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/@wdio/cli/node_modules/webdriverio": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.11.0.tgz",
-      "integrity": "sha512-II28RBTi7+/W8e6li4qKsgS/KF3yE/r0Q3QHysylU+QTZnH3xIzMz0TRoo8bNyeBZiZuTqH6yuWi+kJ5m5FC/g==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@types/aria-query": "^4.2.1",
-        "@types/node": "^15.12.5",
-        "@wdio/config": "7.10.1",
-        "@wdio/logger": "7.7.0",
-        "@wdio/protocols": "7.11.0",
-        "@wdio/repl": "7.11.0",
-        "@wdio/types": "7.10.1",
-        "@wdio/utils": "7.11.0",
-        "archiver": "^5.0.0",
-        "aria-query": "^4.2.2",
-        "atob": "^2.1.2",
-        "css-shorthand-properties": "^1.1.1",
-        "css-value": "^0.0.1",
-        "devtools": "7.11.0",
-        "devtools-protocol": "^0.0.915197",
-        "fs-extra": "^10.0.0",
-        "get-port": "^5.1.1",
-        "grapheme-splitter": "^1.0.2",
-        "lodash.clonedeep": "^4.5.0",
-        "lodash.isobject": "^3.0.2",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.zip": "^4.2.0",
-        "minimatch": "^3.0.4",
-        "puppeteer-core": "^10.1.0",
-        "query-selector-shadow-dom": "^1.0.0",
-        "resq": "^1.9.1",
-        "rgb2hex": "0.2.5",
-        "serialize-error": "^8.0.0",
-        "webdriver": "7.11.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@wdio/cli/node_modules/yargs": {
-      "version": "17.1.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz",
-      "integrity": "sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@wdio/config": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.10.1.tgz",
-      "integrity": "sha512-EA+kJBNPeIxkkyilHcmiIwqjtOUcWx5FVp69kSBs4BN2fG+6CgpzoVecuTm/qPU6D0DT5KIfxVR4FRHCF99F/g==",
-      "dev": true,
-      "dependencies": {
-        "@wdio/logger": "7.7.0",
-        "@wdio/types": "7.10.1",
-        "deepmerge": "^4.0.0",
-        "glob": "^7.1.2"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@wdio/logger": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.7.0.tgz",
-      "integrity": "sha512-XX/OkC8NlvsBdhKsb9j7ZbuQtF/Vuo0xf38PXdqYtVezOrYbDuba0hPG++g/IGNuAF34ZbSi+49cvz4u5w92kQ==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "loglevel": "^1.6.0",
-        "loglevel-plugin-prefix": "^0.8.4",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@wdio/protocols": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.11.0.tgz",
-      "integrity": "sha512-yWKmCUmbHB1AH0U3lebXRh/G3+JtsD9Tx9fevgP9qA7Hq+rHj7KqUf15k1lPPodhOms8ncPj0J6ET1E13wh2qg==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@wdio/repl": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.11.0.tgz",
-      "integrity": "sha512-2GtWkUqepQ0QGvdo7fLWiZklf/O4eh3AB4vcafwGVKQhE8bpSh0l8/fkXOzYU7oK/PBGHJyWXxPOVf+H5DAViA==",
-      "dev": true,
-      "dependencies": {
-        "@wdio/utils": "7.11.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@wdio/selenium-standalone-service": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@wdio/selenium-standalone-service/-/selenium-standalone-service-7.10.1.tgz",
-      "integrity": "sha512-25J1iqNpEdqhnNe6B016Mm5+38F8WTfZ5eIRttjLSACdtsWtW2DGgMMeWvwunqNSzhfK8S6jDZ+s2nOvg+gD6A==",
-      "dev": true,
-      "dependencies": {
-        "@types/fs-extra": "^9.0.1",
-        "@types/node": "^15.12.5",
-        "@types/selenium-standalone": "^7.0.0",
-        "@wdio/config": "7.10.1",
-        "@wdio/logger": "7.7.0",
-        "@wdio/types": "7.10.1",
-        "fs-extra": "^10.0.0",
-        "selenium-standalone": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "@wdio/cli": "^7.0.0"
-      }
-    },
-    "node_modules/@wdio/selenium-standalone-service/node_modules/@types/node": {
-      "version": "15.14.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.9.tgz",
-      "integrity": "sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==",
-      "dev": true
-    },
-    "node_modules/@wdio/types": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.10.1.tgz",
-      "integrity": "sha512-wEDmdux2VCGO4wWVj7v9UbVRqQG7liHnDVPYJuQURPj3hJMiQQTIHwRi7EmwYfbJ9/mRoHBOGeZt7nSvtcjeaQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "^15.12.5",
-        "got": "^11.8.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@wdio/types/node_modules/@sindresorhus/is": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz",
-      "integrity": "sha512-Qm9hBEBu18wt1PO2flE7LPb30BHMQt1eQgbV76YntdNk73XZGpn3izvGTYxbGgzXKgbCjiia0uxTd3aTNQrY/g==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/is?sponsor=1"
-      }
-    },
-    "node_modules/@wdio/types/node_modules/@szmarczak/http-timer": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
-      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
-      "dev": true,
-      "dependencies": {
-        "defer-to-connect": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@wdio/types/node_modules/@types/node": {
-      "version": "15.14.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.9.tgz",
-      "integrity": "sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==",
-      "dev": true
-    },
-    "node_modules/@wdio/types/node_modules/cacheable-request": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
-      "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
-      "dev": true,
-      "dependencies": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^4.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^6.0.1",
-        "responselike": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@wdio/types/node_modules/decompress-response": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-      "dev": true,
-      "dependencies": {
-        "mimic-response": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@wdio/types/node_modules/defer-to-connect": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
-      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@wdio/types/node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@wdio/types/node_modules/got": {
-      "version": "11.8.2",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.2.tgz",
-      "integrity": "sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==",
-      "dev": true,
-      "dependencies": {
-        "@sindresorhus/is": "^4.0.0",
-        "@szmarczak/http-timer": "^4.0.5",
-        "@types/cacheable-request": "^6.0.1",
-        "@types/responselike": "^1.0.0",
-        "cacheable-lookup": "^5.0.3",
-        "cacheable-request": "^7.0.1",
-        "decompress-response": "^6.0.0",
-        "http2-wrapper": "^1.0.0-beta.5.2",
-        "lowercase-keys": "^2.0.0",
-        "p-cancelable": "^2.0.0",
-        "responselike": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.19.0"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/got?sponsor=1"
-      }
-    },
-    "node_modules/@wdio/types/node_modules/json-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
-    },
-    "node_modules/@wdio/types/node_modules/keyv": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz",
-      "integrity": "sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA==",
-      "dev": true,
-      "dependencies": {
-        "json-buffer": "3.0.1"
-      }
-    },
-    "node_modules/@wdio/types/node_modules/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@wdio/types/node_modules/mimic-response": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@wdio/types/node_modules/normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@wdio/types/node_modules/p-cancelable": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
-      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@wdio/types/node_modules/responselike": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz",
-      "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==",
-      "dev": true,
-      "dependencies": {
-        "lowercase-keys": "^2.0.0"
-      }
-    },
-    "node_modules/@wdio/utils": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.11.0.tgz",
-      "integrity": "sha512-0n5mZha2QktV0181nMhw+IQ8MgYrqyvVDjP20P7JEnl6hehSkyXTAYQcYuKaw5AAVqipV3Eh96JBi5CnhpsoKQ==",
-      "dev": true,
-      "dependencies": {
-        "@wdio/logger": "7.7.0",
-        "@wdio/types": "7.10.1",
-        "p-iteration": "^1.1.8"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/abab": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
-      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="
-    },
-    "node_modules/abort-controller": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
-      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
-      "dev": true,
-      "dependencies": {
-        "event-target-shim": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=6.5"
-      }
-    },
-    "node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-globals": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz",
-      "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==",
-      "dependencies": {
-        "acorn": "^6.0.1",
-        "acorn-walk": "^6.0.1"
-      }
-    },
-    "node_modules/acorn-globals/node_modules/acorn": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/acorn-walk": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
-      "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "type-fest": "^0.21.3"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ansi-gray": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
-      "dev": true,
-      "dependencies": {
-        "ansi-wrap": "0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/ansi-wrap": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "dev": true,
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/append-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
-      "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
-      "dev": true,
-      "dependencies": {
-        "buffer-equal": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/archiver": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.0.tgz",
-      "integrity": "sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg==",
-      "dev": true,
-      "dependencies": {
-        "archiver-utils": "^2.1.0",
-        "async": "^3.2.0",
-        "buffer-crc32": "^0.2.1",
-        "readable-stream": "^3.6.0",
-        "readdir-glob": "^1.0.0",
-        "tar-stream": "^2.2.0",
-        "zip-stream": "^4.1.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/archiver-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz",
-      "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.2.0",
-        "lazystream": "^1.0.0",
-        "lodash.defaults": "^4.2.0",
-        "lodash.difference": "^4.5.0",
-        "lodash.flatten": "^4.4.0",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.union": "^4.6.0",
-        "normalize-path": "^3.0.0",
-        "readable-stream": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/archiver/node_modules/async": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
-      "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==",
-      "dev": true
-    },
-    "node_modules/archiver/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/archy": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
-      "dev": true
-    },
-    "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.10.2",
-        "@babel/runtime-corejs3": "^7.10.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-filter": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
-      "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
-      "dev": true,
-      "dependencies": {
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
-      "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
-      "dev": true,
-      "dependencies": {
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-each": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
-      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM="
-    },
-    "node_modules/array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-initial": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
-      "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
-      "dev": true,
-      "dependencies": {
-        "array-slice": "^1.0.0",
-        "is-number": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-initial/node_modules/is-number": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-last": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
-      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-last/node_modules/is-number": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-slice": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-sort": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
-      "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
-      "dev": true,
-      "dependencies": {
-        "default-compare": "^1.0.0",
-        "get-value": "^2.0.6",
-        "kind-of": "^5.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dependencies": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/async": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-      "dev": true
-    },
-    "node_modules/async-done": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
-      "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.2",
-        "process-nextick-args": "^2.0.0",
-        "stream-exhaust": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/async-each": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-      "dev": true
-    },
-    "node_modules/async-exit-hook": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz",
-      "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/async-settle": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
-      "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
-      "dev": true,
-      "dependencies": {
-        "async-done": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
-    "node_modules/atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true,
-      "bin": {
-        "atob": "bin/atob.js"
-      },
-      "engines": {
-        "node": ">= 4.5.0"
-      }
-    },
-    "node_modules/aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/aws4": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
-    },
-    "node_modules/babel-eslint": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
-      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
-      "deprecated": "babel-eslint is now @babel/eslint-parser. This package will no longer receive updates.",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.7.0",
-        "@babel/traverse": "^7.7.0",
-        "@babel/types": "^7.7.0",
-        "eslint-visitor-keys": "^1.0.0",
-        "resolve": "^1.12.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "eslint": ">= 4.12.1"
-      }
-    },
-    "node_modules/bach": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
-      "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
-      "dev": true,
-      "dependencies": {
-        "arr-filter": "^1.1.1",
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "array-each": "^1.0.0",
-        "array-initial": "^1.0.0",
-        "array-last": "^1.1.1",
-        "async-done": "^1.2.2",
-        "async-settle": "^1.0.0",
-        "now-and-later": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
-      "dependencies": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/basic-auth": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz",
-      "integrity": "sha1-RSIe5Cn37h5QNb4/UVM/HN/SmIQ=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dependencies": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/binaryextensions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-2.3.0.tgz",
-      "integrity": "sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      },
-      "funding": {
-        "url": "https://bevry.me/fund"
-      }
-    },
-    "node_modules/bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
-    "node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dev": true,
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "node_modules/bl/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/blockly": {
-      "version": "6.20210701.0",
-      "resolved": "https://registry.npmjs.org/blockly/-/blockly-6.20210701.0.tgz",
-      "integrity": "sha512-cNrwFOAxXE5Pbs1FJAyLTlSRzpNW/C+0gPT2rGQDOJVVKcyF3vhFC1StgnxvQNsv//ueuksKWIXxDuSWh1VI4w==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "jsdom": "15.2.1"
-      }
-    },
-    "node_modules/bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/browser-process-hrtime": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
-    },
-    "node_modules/browser-stdout": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-      "dev": true
-    },
-    "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "node_modules/buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/buffer-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-      "dev": true
-    },
-    "node_modules/builtins": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
-      "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=",
-      "dev": true
-    },
-    "node_modules/cac": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/cac/-/cac-3.0.4.tgz",
-      "integrity": "sha1-bSTO7Dcu/lybeYgIvH9JtHJCpO8=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "camelcase-keys": "^3.0.0",
-        "chalk": "^1.1.3",
-        "indent-string": "^3.0.0",
-        "minimist": "^1.2.0",
-        "read-pkg-up": "^1.0.1",
-        "suffix": "^0.1.0",
-        "text-table": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cac/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/camelcase": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/camelcase-keys": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-3.0.0.tgz",
-      "integrity": "sha1-/AxsNgNj9zd+N5O5oWvM8QcMHKQ=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "camelcase": "^3.0.0",
-        "map-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/cac/node_modules/find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/cac/node_modules/indent-string": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-      "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cac/node_modules/map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "node_modules/cac/node_modules/path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "peer": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/cac/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
-      "dependencies": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cacheable-lookup": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
-      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.6.0"
-      }
-    },
-    "node_modules/cacheable-request": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
-      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
-      "dev": true,
-      "dependencies": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^3.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^4.1.0",
-        "responselike": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cacheable-request/node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cacheable-request/node_modules/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camelcase-keys": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "map-obj": "^4.0.0",
-        "quick-lru": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-    },
-    "node_modules/catharsis": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz",
-      "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.15"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/chai": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz",
-      "integrity": "sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA==",
-      "dev": true,
-      "dependencies": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^3.0.1",
-        "get-func-name": "^2.0.0",
-        "pathval": "^1.1.1",
-        "type-detect": "^4.0.5"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/check-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/chokidar": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
-      "dev": true,
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
-    },
-    "node_modules/chrome-launcher": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.14.0.tgz",
-      "integrity": "sha512-W//HpflaW6qBGrmuskup7g+XJZN6w03ko9QSIe5CtcTal2u0up5SeReK3Ll1Why4Ey8dPkv8XSodZyHPnGbVHQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "escape-string-regexp": "^4.0.0",
-        "is-wsl": "^2.2.0",
-        "lighthouse-logger": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=12.13.0"
-      }
-    },
-    "node_modules/clang-format": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/clang-format/-/clang-format-1.5.0.tgz",
-      "integrity": "sha512-C1LucFX7E+ABVYcPEbBHM4PYQ2+WInXsqsLpFlQ9cmRfSbk7A7b1I06h/nE4bQ3MsyEkb31jY2gC0Dtc76b4IA==",
-      "dev": true,
-      "dependencies": {
-        "async": "^1.5.2",
-        "glob": "^7.0.0",
-        "resolve": "^1.1.6"
-      },
-      "bin": {
-        "check-clang-format": "bin/check-clang-format.js",
-        "clang-format": "index.js",
-        "git-clang-format": "bin/git-clang-format"
-      }
-    },
-    "node_modules/class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "dev": true,
-      "dependencies": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cli-spinners": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz",
-      "integrity": "sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "node_modules/clone": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/clone-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/clone-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
-      "dev": true,
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      }
-    },
-    "node_modules/clone-stats": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-      "dev": true
-    },
-    "node_modules/cloneable-readable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
-      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "process-nextick-args": "^2.0.0",
-        "readable-stream": "^2.3.5"
-      }
-    },
-    "node_modules/code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/collection-map": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
-      "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
-      "dev": true,
-      "dependencies": {
-        "arr-map": "^2.0.2",
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "dev": true,
-      "dependencies": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "dev": true,
-      "bin": {
-        "color-support": "bin.js"
-      }
-    },
-    "node_modules/colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.1.90"
-      }
-    },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-      "dev": true
-    },
-    "node_modules/compress-commons": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.1.tgz",
-      "integrity": "sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==",
-      "dev": true,
-      "dependencies": {
-        "buffer-crc32": "^0.2.13",
-        "crc32-stream": "^4.0.2",
-        "normalize-path": "^3.0.0",
-        "readable-stream": "^3.6.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/compress-commons/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "node_modules/concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "engines": [
-        "node >= 0.8"
-      ],
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "node_modules/concat-with-sourcemaps": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
-      "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "^0.6.1"
-      }
-    },
-    "node_modules/concat-with-sourcemaps/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/concurrently": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-6.2.1.tgz",
-      "integrity": "sha512-emgwhH+ezkuYKSHZQ+AkgEpoUZZlbpPVYCVv7YZx0r+T7fny1H03r2nYRebpi2DudHR4n1Rgbo2YTxKOxVJ4+g==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "date-fns": "^2.16.1",
-        "lodash": "^4.17.21",
-        "read-pkg": "^5.2.0",
-        "rxjs": "^6.6.3",
-        "spawn-command": "^0.0.2-1",
-        "supports-color": "^8.1.0",
-        "tree-kill": "^1.2.2",
-        "yargs": "^16.2.0"
-      },
-      "bin": {
-        "concurrently": "bin/concurrently.js"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/concurrently/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/convert-source-map": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "node_modules/copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/copy-props": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz",
-      "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==",
-      "dev": true,
-      "dependencies": {
-        "each-props": "^1.3.2",
-        "is-plain-object": "^5.0.0"
-      }
-    },
-    "node_modules/core-js-pure": {
-      "version": "3.15.2",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.15.2.tgz",
-      "integrity": "sha512-D42L7RYh1J2grW8ttxoY1+17Y4wXZeKe7uyplAI3FkNQyI5OgBIAjUfFiTPfL1rs0qLpxaabITNbjKl1Sp82tA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
-    "node_modules/corser": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/corser/-/corser-2.0.1.tgz",
-      "integrity": "sha1-jtolLsqrWEDc2XXOuQ2TcMgZ/4c=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/crc-32": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz",
-      "integrity": "sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==",
-      "dev": true,
-      "dependencies": {
-        "exit-on-epipe": "~1.0.1",
-        "printj": "~1.1.0"
-      },
-      "bin": {
-        "crc32": "bin/crc32.njs"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/crc32-stream": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.2.tgz",
-      "integrity": "sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==",
-      "dev": true,
-      "dependencies": {
-        "crc-32": "^1.2.0",
-        "readable-stream": "^3.4.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/crc32-stream/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/css": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
-      "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.6.0"
-      }
-    },
-    "node_modules/css-shorthand-properties": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/css-shorthand-properties/-/css-shorthand-properties-1.1.1.tgz",
-      "integrity": "sha512-Md+Juc7M3uOdbAFwOYlTrccIZ7oCFuzrhKYQjdeUEW/sE1hv17Jp/Bws+ReOPpGVBTYCBoYo+G17V5Qo8QQ75A==",
-      "dev": true
-    },
-    "node_modules/css-value": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/css-value/-/css-value-0.0.1.tgz",
-      "integrity": "sha1-Xv1sLupeof1rasV+wEJ7GEUkJOo=",
-      "dev": true
-    },
-    "node_modules/css/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cssom": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="
-    },
-    "node_modules/cssstyle": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-      "dependencies": {
-        "cssom": "~0.3.6"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cssstyle/node_modules/cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
-    },
-    "node_modules/d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "dev": true,
-      "dependencies": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
-      }
-    },
-    "node_modules/dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/dat.gui": {
-      "version": "0.7.7",
-      "resolved": "https://registry.npmjs.org/dat.gui/-/dat.gui-0.7.7.tgz",
-      "integrity": "sha512-sRl/28gF/XRC5ywC9I4zriATTsQcpSsRG7seXCPnTkK8/EQMIbCu5NPMpICLGxX9ZEUvcXR3ArLYCtgreFoMDw==",
-      "dev": true
-    },
-    "node_modules/data-urls": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
-      "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
-      "dependencies": {
-        "abab": "^2.0.0",
-        "whatwg-mimetype": "^2.2.0",
-        "whatwg-url": "^7.0.0"
-      }
-    },
-    "node_modules/date-fns": {
-      "version": "2.22.1",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.22.1.tgz",
-      "integrity": "sha512-yUFPQjrxEmIsMqlHhAhmxkuH769baF21Kk+nZwZGyrMoyLA+LugaQtC0+Tqf9CBUUULWwUJt6Q5ySI3LJDDCGg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.11"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/date-fns"
-      }
-    },
-    "node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/debug-fabulous": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz",
-      "integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "3.X",
-        "memoizee": "0.4.X",
-        "object-assign": "4.X"
-      }
-    },
-    "node_modules/debug-fabulous/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decamelize-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
-      "dev": true,
-      "dependencies": {
-        "decamelize": "^1.1.0",
-        "map-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decamelize-keys/node_modules/map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-      "dev": true,
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/deep-eql": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
-      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
-      "dev": true,
-      "dependencies": {
-        "type-detect": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
-    },
-    "node_modules/deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/default-compare": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
-      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^5.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/default-resolution": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
-      "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "clone": "^1.0.2"
-      }
-    },
-    "node_modules/defaults/node_modules/clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/defer-to-connect": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
-      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
-      "dev": true
-    },
-    "node_modules/define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "dependencies": {
-        "object-keys": "^1.0.12"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/detect-file": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/detect-newline": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
-      "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/devtools": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.11.0.tgz",
-      "integrity": "sha512-V3mIskCVv+OrqgJf9EU4bvoOrEx+qQ+sNoyLxqzxkFgh0wwtYIhcMiqDluL8dBKlhToV16UsYDKoqa67ylNwOg==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "^15.12.5",
-        "@wdio/config": "7.10.1",
-        "@wdio/logger": "7.7.0",
-        "@wdio/protocols": "7.11.0",
-        "@wdio/types": "7.10.1",
-        "@wdio/utils": "7.11.0",
-        "chrome-launcher": "^0.14.0",
-        "edge-paths": "^2.1.0",
-        "puppeteer-core": "^10.1.0",
-        "query-selector-shadow-dom": "^1.0.0",
-        "ua-parser-js": "^0.7.21",
-        "uuid": "^8.0.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/devtools-protocol": {
-      "version": "0.0.915197",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.915197.tgz",
-      "integrity": "sha512-JXt4akUoL62CtxKLQBxcJlI7gsCZyAQ1Qb/0MZJOz8VETazoJB6+IjUwTkECrvye9AnNLDQyyV00kz/vWXVifQ==",
-      "dev": true
-    },
-    "node_modules/devtools/node_modules/@types/node": {
-      "version": "15.14.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.9.tgz",
-      "integrity": "sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==",
-      "dev": true
-    },
-    "node_modules/devtools/node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/diff": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/domexception": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
-      "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
-      "dependencies": {
-        "webidl-conversions": "^4.0.2"
-      }
-    },
-    "node_modules/duplexer3": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
-      "dev": true
-    },
-    "node_modules/duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "node_modules/each-props": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
-      "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.1",
-        "object.defaults": "^1.1.0"
-      }
-    },
-    "node_modules/each-props/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dependencies": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "node_modules/edge-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/edge-paths/-/edge-paths-2.2.1.tgz",
-      "integrity": "sha512-AI5fC7dfDmCdKo3m5y7PkYE8m6bMqR6pvVpgtrZkkhcJXFLelUgkjrhk3kXXx8Kbw2cRaTT4LkOR7hqf39KJdw==",
-      "dev": true,
-      "dependencies": {
-        "@types/which": "^1.3.2",
-        "which": "^2.0.2"
-      }
-    },
-    "node_modules/ejs": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz",
-      "integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "jake": "^10.6.1"
-      },
-      "bin": {
-        "ejs": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.4.0"
-      }
-    },
-    "node_modules/enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/entities": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
-      "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
-      "dev": true
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/es5-ext": {
-      "version": "0.10.53",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
-      "dev": true,
-      "dependencies": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.3",
-        "next-tick": "~1.0.0"
-      }
-    },
-    "node_modules/es5-ext/node_modules/next-tick": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-      "dev": true
-    },
-    "node_modules/es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "dev": true,
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "node_modules/es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-      "dev": true,
-      "dependencies": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
-      }
-    },
-    "node_modules/es6-weak-map": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
-      "dev": true,
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "^0.10.46",
-        "es6-iterator": "^2.0.3",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/escodegen": {
-      "version": "1.14.3",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
-      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
-      "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^4.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=4.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/escodegen/node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dependencies": {
-        "prelude-ls": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint": {
-      "version": "7.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
-      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.3",
-        "@humanwhocodes/config-array": "^0.5.0",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "enquirer": "^2.3.5",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^2.1.0",
-        "eslint-visitor-keys": "^2.0.0",
-        "espree": "^7.3.1",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.1.2",
-        "globals": "^13.6.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.0.4",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "progress": "^2.0.0",
-        "regexpp": "^3.1.0",
-        "semver": "^7.2.1",
-        "strip-ansi": "^6.0.0",
-        "strip-json-comments": "^3.1.0",
-        "table": "^6.0.9",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint/node_modules/@babel/code-frame": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.10.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz",
-      "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/espree": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
-      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^7.4.0",
-        "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^1.3.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esquery/node_modules/estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse/node_modules/estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/event-emitter": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-      "dev": true,
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
-      }
-    },
-    "node_modules/event-target-shim": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true
-    },
-    "node_modules/exit-on-epipe": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz",
-      "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/expand-tilde": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-      "dev": true,
-      "dependencies": {
-        "homedir-polyfill": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ext": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
-      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
-      "dev": true,
-      "dependencies": {
-        "type": "^2.0.0"
-      }
-    },
-    "node_modules/ext/node_modules/type": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
-      "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==",
-      "dev": true
-    },
-    "node_modules/extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-    },
-    "node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "dependencies": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extract-zip": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.1",
-        "get-stream": "^5.1.0",
-        "yauzl": "^2.10.0"
-      },
-      "bin": {
-        "extract-zip": "cli.js"
-      },
-      "engines": {
-        "node": ">= 10.17.0"
-      },
-      "optionalDependencies": {
-        "@types/yauzl": "^2.9.1"
-      }
-    },
-    "node_modules/extract-zip/node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "engines": [
-        "node >=0.6.0"
-      ]
-    },
-    "node_modules/fancy-log": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
-      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
-      "dev": true,
-      "dependencies": {
-        "ansi-gray": "^0.1.1",
-        "color-support": "^1.1.3",
-        "parse-node-version": "^1.0.0",
-        "time-stamp": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
-    },
-    "node_modules/fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
-      "dev": true,
-      "dependencies": {
-        "pend": "~1.2.0"
-      }
-    },
-    "node_modules/figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/figures/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/filelist": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz",
-      "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "minimatch": "^3.0.4"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/findup-sync": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
-      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
-      "dev": true,
-      "dependencies": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/fined": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
-      "dev": true,
-      "dependencies": {
-        "expand-tilde": "^2.0.2",
-        "is-plain-object": "^2.0.3",
-        "object.defaults": "^1.1.0",
-        "object.pick": "^1.2.0",
-        "parse-filepath": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/fined/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/flagged-respawn": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
-      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/flat": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
-      "dev": true,
-      "bin": {
-        "flat": "cli.js"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.1.tgz",
-      "integrity": "sha512-OMQjaErSFHmHqZe+PSidH5n8j3O0F2DdnVh8JB4j4eUQ2k6KvB0qGfrKIhapvez5JerBbmWkaLYUYWISaESoXg==",
-      "dev": true
-    },
-    "node_modules/flush-write-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
-      }
-    },
-    "node_modules/follow-redirects": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
-      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/for-own": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-      "dev": true,
-      "dependencies": {
-        "for-in": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 0.12"
-      }
-    },
-    "node_modules/fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-      "dev": true,
-      "dependencies": {
-        "map-cache": "^0.2.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true
-    },
-    "node_modules/fs-extra": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
-      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/fs-mkdirp-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
-      "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "through2": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/fs-mkdirp-stream/node_modules/through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "node_modules/functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "node_modules/gaxios": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.3.0.tgz",
-      "integrity": "sha512-pHplNbslpwCLMyII/lHPWFQbJWOX0B3R1hwBEOvzYi1GmdKZruuEHK4N9V6f7tf1EaPYyF80mui1+344p6SmLg==",
-      "dev": true,
-      "dependencies": {
-        "abort-controller": "^3.0.0",
-        "extend": "^3.0.2",
-        "https-proxy-agent": "^5.0.0",
-        "is-stream": "^2.0.0",
-        "node-fetch": "^2.3.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/get-func-name": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-port": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz",
-      "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.1.7",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/glob-stream": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
-      "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
-      "dev": true,
-      "dependencies": {
-        "extend": "^3.0.0",
-        "glob": "^7.1.1",
-        "glob-parent": "^3.1.0",
-        "is-negated-glob": "^1.0.0",
-        "ordered-read-streams": "^1.0.0",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.1.5",
-        "remove-trailing-separator": "^1.0.1",
-        "to-absolute-glob": "^2.0.0",
-        "unique-stream": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/glob-stream/node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/glob-stream/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz",
-      "integrity": "sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==",
-      "dev": true,
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-done": "^1.2.0",
-        "chokidar": "^2.0.0",
-        "is-negated-glob": "^1.0.0",
-        "just-debounce": "^1.0.0",
-        "normalize-path": "^3.0.0",
-        "object.defaults": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "dependencies": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/anymatch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/binary-extensions": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.",
-      "dev": true,
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      },
-      "optionalDependencies": {
-        "fsevents": "^1.2.7"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/fsevents": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/glob-parent/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "dev": true,
-      "dependencies": {
-        "binary-extensions": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/global-modules": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-      "dev": true,
-      "dependencies": {
-        "global-prefix": "^1.0.1",
-        "is-windows": "^1.0.1",
-        "resolve-dir": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/global-prefix": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-      "dev": true,
-      "dependencies": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/global-prefix/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/glogg": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
-      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
-      "dev": true,
-      "dependencies": {
-        "sparkles": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/google-closure-compiler": {
-      "version": "20210601.0.0",
-      "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20210601.0.0.tgz",
-      "integrity": "sha512-lzzEoG2VTB7uUjnWnMyeZMU163w69HJpM27yh8Up9Ha5McHZeESjt3NRwU8cWMbCRdY06nFbRCDIVCRcadHCiw==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "2.x",
-        "google-closure-compiler-java": "^20210601.0.0",
-        "minimist": "1.x",
-        "vinyl": "2.x",
-        "vinyl-sourcemaps-apply": "^0.2.0"
-      },
-      "bin": {
-        "google-closure-compiler": "cli.js"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "optionalDependencies": {
-        "google-closure-compiler-linux": "^20210601.0.0",
-        "google-closure-compiler-osx": "^20210601.0.0",
-        "google-closure-compiler-windows": "^20210601.0.0"
-      }
-    },
-    "node_modules/google-closure-compiler-java": {
-      "version": "20210601.0.0",
-      "resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20210601.0.0.tgz",
-      "integrity": "sha512-bH6nIwOmp4qDWvlbXx5/DE3XA2aDGQoCpmRYZJGONY1Sy6Xfbq0ioXRHH9eBDP9hxhCJ5Sd/K89A0NZ8Nz9RJA==",
-      "dev": true
-    },
-    "node_modules/google-closure-compiler-linux": {
-      "version": "20210601.0.0",
-      "resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20210601.0.0.tgz",
-      "integrity": "sha512-rnEQt7zz/1P1SfPhJiHQpfCgMPrsVVyEgDs09h67xn6+LXa9L0RP+hrJDEHqSWwjDPz0BkfUUv6zkqZvp1h/lw==",
-      "cpu": [
-        "x64",
-        "x86"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/google-closure-compiler-osx": {
-      "version": "20210601.0.0",
-      "resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20210601.0.0.tgz",
-      "integrity": "sha512-A5r4s/WthR2iLMM0mxsluw8EW2AcOomC5ri/H6FjzpMq0RVEnLTgaGYdXolUAfEzH/7XtJJT2+JkYk3HSLCtrg==",
-      "cpu": [
-        "x64",
-        "x86",
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/google-closure-compiler-windows": {
-      "version": "20210601.0.0",
-      "resolved": "https://registry.npmjs.org/google-closure-compiler-windows/-/google-closure-compiler-windows-20210601.0.0.tgz",
-      "integrity": "sha512-6r94bPShnB0XXh9+5/qXGDHJN2PQGhF9yJPcgBZj+FAZlQGzlYkT0pkyp+loZT3lG+YRbjD28Lgo7xMcY4xgkA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/google-closure-compiler/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/google-closure-compiler/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/google-closure-compiler/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/google-closure-compiler/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/google-closure-compiler/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/google-closure-compiler/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/google-closure-compiler/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/google-closure-deps": {
-      "version": "20210601.0.0",
-      "resolved": "https://registry.npmjs.org/google-closure-deps/-/google-closure-deps-20210601.0.0.tgz",
-      "integrity": "sha512-ko3PUEDkFosckQPGqBx3f1jjHcyPbzDGvLCMB9rmYOGkvyvRsmABgJovFg1CpKLVlw10nuRXPWoyupEqH0hssQ==",
-      "dev": true,
-      "dependencies": {
-        "minimatch": "^3.0.4",
-        "yargs": "^16.2.0"
-      },
-      "bin": {
-        "closure-make-deps": "bin/closuremakedeps.js",
-        "get-js-version": "bin/getjsversion.js"
-      }
-    },
-    "node_modules/got": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
-      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
-      "dev": true,
-      "dependencies": {
-        "@sindresorhus/is": "^0.14.0",
-        "@szmarczak/http-timer": "^1.1.2",
-        "cacheable-request": "^6.0.0",
-        "decompress-response": "^3.3.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^4.1.0",
-        "lowercase-keys": "^1.0.1",
-        "mimic-response": "^1.0.1",
-        "p-cancelable": "^1.0.0",
-        "to-readable-stream": "^1.0.0",
-        "url-parse-lax": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
-      "dev": true
-    },
-    "node_modules/grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-      "dev": true
-    },
-    "node_modules/growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.x"
-      }
-    },
-    "node_modules/gulp": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
-      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
-      "dev": true,
-      "dependencies": {
-        "glob-watcher": "^5.0.3",
-        "gulp-cli": "^2.2.0",
-        "undertaker": "^1.2.1",
-        "vinyl-fs": "^3.0.0"
-      },
-      "bin": {
-        "gulp": "bin/gulp.js"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/gulp-cli": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
-      "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^1.0.1",
-        "archy": "^1.0.0",
-        "array-sort": "^1.0.0",
-        "color-support": "^1.1.3",
-        "concat-stream": "^1.6.0",
-        "copy-props": "^2.0.1",
-        "fancy-log": "^1.3.2",
-        "gulplog": "^1.0.0",
-        "interpret": "^1.4.0",
-        "isobject": "^3.0.1",
-        "liftoff": "^3.1.0",
-        "matchdep": "^2.0.0",
-        "mute-stdout": "^1.0.0",
-        "pretty-hrtime": "^1.0.0",
-        "replace-homedir": "^1.0.0",
-        "semver-greatest-satisfied-range": "^1.1.0",
-        "v8flags": "^3.2.0",
-        "yargs": "^7.1.0"
-      },
-      "bin": {
-        "gulp": "bin/gulp.js"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/ansi-colors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-wrap": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/camelcase": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wrap-ansi": "^2.0.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "dev": true,
-      "dependencies": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-      "dev": true
-    },
-    "node_modules/gulp-cli/node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
-    },
-    "node_modules/gulp-cli/node_modules/is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true,
-      "dependencies": {
-        "number-is-nan": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "dev": true,
-      "dependencies": {
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "dev": true,
-      "dependencies": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "dev": true,
-      "dependencies": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/y18n": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
-      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
-      "dev": true
-    },
-    "node_modules/gulp-cli/node_modules/yargs": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz",
-      "integrity": "sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^3.0.0",
-        "cliui": "^3.2.0",
-        "decamelize": "^1.1.1",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^1.4.0",
-        "read-pkg-up": "^1.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
-        "set-blocking": "^2.0.0",
-        "string-width": "^1.0.2",
-        "which-module": "^1.0.0",
-        "y18n": "^3.2.1",
-        "yargs-parser": "^5.0.1"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/yargs-parser": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz",
-      "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^3.0.0",
-        "object.assign": "^4.1.0"
-      }
-    },
-    "node_modules/gulp-concat": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
-      "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
-      "dev": true,
-      "dependencies": {
-        "concat-with-sourcemaps": "^1.0.0",
-        "through2": "^2.0.0",
-        "vinyl": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/gulp-concat/node_modules/through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "node_modules/gulp-insert": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/gulp-insert/-/gulp-insert-0.5.0.tgz",
-      "integrity": "sha1-MjE/E+SiPPWsylzl8MCAkjx3hgI=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "^1.0.26-4",
-        "streamqueue": "0.0.6"
-      }
-    },
-    "node_modules/gulp-insert/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
-    "node_modules/gulp-insert/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/gulp-insert/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
-    "node_modules/gulp-rename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz",
-      "integrity": "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/gulp-replace": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.3.tgz",
-      "integrity": "sha512-HcPHpWY4XdF8zxYkDODHnG2+7a3nD/Y8Mfu3aBgMiCFDW3X2GiOKXllsAmILcxe3KZT2BXoN18WrpEFm48KfLQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "^14.14.41",
-        "@types/vinyl": "^2.0.4",
-        "istextorbinary": "^3.0.0",
-        "replacestream": "^4.0.3",
-        "yargs-parser": ">=5.0.0-security.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/gulp-replace/node_modules/@types/node": {
-      "version": "14.17.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.5.tgz",
-      "integrity": "sha512-bjqH2cX/O33jXT/UmReo2pM7DIJREPMnarixbQ57DOOzzFaI6D2+IcwaJQaJpv0M1E9TIhPCYVxrkcityLjlqA==",
-      "dev": true
-    },
-    "node_modules/gulp-series": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/gulp-series/-/gulp-series-1.0.2.tgz",
-      "integrity": "sha1-gWGZA1AXh13QDUiIklBP659jCgs=",
-      "dev": true
-    },
-    "node_modules/gulp-shell": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/gulp-shell/-/gulp-shell-0.8.0.tgz",
-      "integrity": "sha512-wHNCgmqbWkk1c6Gc2dOL5SprcoeujQdeepICwfQRo91DIylTE7a794VEE+leq3cE2YDoiS5ulvRfKVIEMazcTQ==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^3.0.0",
-        "fancy-log": "^1.3.3",
-        "lodash.template": "^4.5.0",
-        "plugin-error": "^1.0.1",
-        "through2": "^3.0.1",
-        "tslib": "^1.10.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/gulp-shell/node_modules/chalk": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/gulp-shell/node_modules/through2": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
-      "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "readable-stream": "2 || 3"
-      }
-    },
-    "node_modules/gulp-sourcemaps": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-3.0.0.tgz",
-      "integrity": "sha512-RqvUckJkuYqy4VaIH60RMal4ZtG0IbQ6PXMNkNsshEGJ9cldUPRb/YCgboYae+CLAs1HQNb4ADTKCx65HInquQ==",
-      "dev": true,
-      "dependencies": {
-        "@gulp-sourcemaps/identity-map": "^2.0.1",
-        "@gulp-sourcemaps/map-sources": "^1.0.0",
-        "acorn": "^6.4.1",
-        "convert-source-map": "^1.0.0",
-        "css": "^3.0.0",
-        "debug-fabulous": "^1.0.0",
-        "detect-newline": "^2.0.0",
-        "graceful-fs": "^4.0.0",
-        "source-map": "^0.6.0",
-        "strip-bom-string": "^1.0.0",
-        "through2": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/gulp-sourcemaps/node_modules/acorn": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/gulp-sourcemaps/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-sourcemaps/node_modules/through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "node_modules/gulp-umd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-umd/-/gulp-umd-2.0.0.tgz",
-      "integrity": "sha512-zA0RDIITdOwpVUBQ6vy2R+iCsTXwDImPnWreNBmVJQAg3nDGefowV7KYwWoIeEVoxyHZT2CR50nEF6ovUh5/2A==",
-      "dev": true,
-      "dependencies": {
-        "concat-stream": "^1.6.2",
-        "lodash.template": "^4.4.0",
-        "through2": "^2.0.3"
-      }
-    },
-    "node_modules/gulp-umd/node_modules/through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "node_modules/gulplog": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-      "dev": true,
-      "dependencies": {
-        "glogg": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "deprecated": "this library is no longer supported",
-      "dependencies": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/hard-rejection": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-ansi/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "dev": true,
-      "dependencies": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/kind-of": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-      "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true,
-      "bin": {
-        "he": "bin/he"
-      }
-    },
-    "node_modules/homedir-polyfill": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-      "dev": true,
-      "dependencies": {
-        "parse-passwd": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hosted-git-info": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-      "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/html-encoding-sniffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
-      "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
-      "dependencies": {
-        "whatwg-encoding": "^1.0.1"
-      }
-    },
-    "node_modules/http-cache-semantics": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
-      "dev": true
-    },
-    "node_modules/http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "dev": true,
-      "dependencies": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/http-server": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/http-server/-/http-server-13.0.2.tgz",
-      "integrity": "sha512-R8kvPT7qp11AMJWLZsRShvm6heIXdlR/+tL5oAWNG/86A/X+IAFX6q0F9SA2G+dR5aH/759+9PLH0V34Q6j4rg==",
-      "dev": true,
-      "dependencies": {
-        "basic-auth": "^1.0.3",
-        "colors": "^1.4.0",
-        "corser": "^2.0.1",
-        "he": "^1.1.0",
-        "http-proxy": "^1.18.0",
-        "mime": "^1.6.0",
-        "minimist": "^1.2.5",
-        "opener": "^1.5.1",
-        "portfinder": "^1.0.25",
-        "secure-compare": "3.0.1",
-        "union": "~0.5.0",
-        "url-join": "^2.0.5"
-      },
-      "bin": {
-        "http-server": "bin/http-server"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      },
-      "engines": {
-        "node": ">=0.8",
-        "npm": ">=1.3.7"
-      }
-    },
-    "node_modules/http2-wrapper": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
-      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
-      "dev": true,
-      "dependencies": {
-        "quick-lru": "^5.1.1",
-        "resolve-alpn": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=10.19.0"
-      }
-    },
-    "node_modules/http2-wrapper/node_modules/quick-lru": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
-    },
-    "node_modules/inquirer": {
-      "version": "8.1.2",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.1.2.tgz",
-      "integrity": "sha512-DHLKJwLPNgkfwNmsuEUKSejJFbkv0FMO9SMiQbjI3n5NQuCrSIBqP66ggqyz2a6t2qEolKrMjhQ3+W/xXgUQ+Q==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.1",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.21",
-        "mute-stream": "0.0.8",
-        "ora": "^5.3.0",
-        "run-async": "^2.4.0",
-        "rxjs": "^7.2.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/inquirer/node_modules/rxjs": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.3.0.tgz",
-      "integrity": "sha512-p2yuGIg9S1epc3vrjKf6iVb3RCaAYjYskkO+jHIaV0IjOPlJop4UnodOoFb2xeNwlguqLYvGw1b1McillYb5Gw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "tslib": "~2.1.0"
-      }
-    },
-    "node_modules/inquirer/node_modules/tslib": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
-      "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/interpret": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/is-absolute": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
-      "dev": true,
-      "dependencies": {
-        "is-relative": "^1.0.0",
-        "is-windows": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/is-core-module": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz",
-      "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-      "dev": true,
-      "bin": {
-        "is-docker": "cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-extendable/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-negated-glob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
-      "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-port-reachable": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-port-reachable/-/is-port-reachable-3.0.0.tgz",
-      "integrity": "sha512-056IzLiWHdgVd6Eq1F9HtJl+cIkvi5X2MJ/A1fjQtByHkzQE1wGardnPhqrarOGDF88BOW+297X7PDvZ2vcyVg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-promise": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
-      "dev": true
-    },
-    "node_modules/is-relative": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
-      "dev": true,
-      "dependencies": {
-        "is-unc-path": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-    },
-    "node_modules/is-unc-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-      "dev": true,
-      "dependencies": {
-        "unc-path-regex": "^0.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true
-    },
-    "node_modules/is-valid-glob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-      "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dev": true,
-      "dependencies": {
-        "is-docker": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-    },
-    "node_modules/istextorbinary": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-3.3.0.tgz",
-      "integrity": "sha512-Tvq1W6NAcZeJ8op+Hq7tdZ434rqnMx4CCZ7H0ff83uEloDvVbqAwaMTZcafKGJT0VHkYzuXUiCY4hlXQg6WfoQ==",
-      "dev": true,
-      "dependencies": {
-        "binaryextensions": "^2.2.0",
-        "textextensions": "^3.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://bevry.me/fund"
-      }
-    },
-    "node_modules/jake": {
-      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz",
-      "integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "async": "0.9.x",
-        "chalk": "^2.4.2",
-        "filelist": "^1.0.1",
-        "minimatch": "^3.0.4"
-      },
-      "bin": {
-        "jake": "bin/cli.js"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/jake/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/jake/node_modules/async": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-      "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/jake/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/jake/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/jake/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/jake/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/jake/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/jake/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/js-green-licenses": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/js-green-licenses/-/js-green-licenses-3.0.1.tgz",
-      "integrity": "sha512-dKyO14U6LaDzJ5gNlvP/v1vkTW7TTXEKNxMHnkxqdYStcYVEJlfubfqbEageVzV41PWu7felyNbwawoEJ/RpYQ==",
-      "dev": true,
-      "dependencies": {
-        "gaxios": "^4.0.0",
-        "meow": "^9.0.0",
-        "npm-package-arg": "^8.0.0",
-        "package-json": "^6.0.0",
-        "semver": "^7.3.2",
-        "spdx-correct": "^3.0.0",
-        "spdx-satisfies": "^5.0.0",
-        "strip-json-comments": "^3.0.0"
-      },
-      "bin": {
-        "jsgl": "build/src/cli.js"
-      },
-      "engines": {
-        "node": ">= 10.x"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/js2xmlparser": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.1.tgz",
-      "integrity": "sha512-KrPTolcw6RocpYjdC7pL7v62e55q7qOMHvLX1UCLc5AAS8qeJ6nukarEJAF2KL2PZxlbGueEbINqZR2bDe/gUw==",
-      "dev": true,
-      "dependencies": {
-        "xmlcreate": "^2.0.3"
-      }
-    },
-    "node_modules/jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
-    },
-    "node_modules/jsdoc": {
-      "version": "3.6.7",
-      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.7.tgz",
-      "integrity": "sha512-sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/parser": "^7.9.4",
-        "bluebird": "^3.7.2",
-        "catharsis": "^0.9.0",
-        "escape-string-regexp": "^2.0.0",
-        "js2xmlparser": "^4.0.1",
-        "klaw": "^3.0.0",
-        "markdown-it": "^10.0.0",
-        "markdown-it-anchor": "^5.2.7",
-        "marked": "^2.0.3",
-        "mkdirp": "^1.0.4",
-        "requizzle": "^0.2.3",
-        "strip-json-comments": "^3.1.0",
-        "taffydb": "2.6.2",
-        "underscore": "~1.13.1"
-      },
-      "bin": {
-        "jsdoc": "jsdoc.js"
-      },
-      "engines": {
-        "node": ">=8.15.0"
-      }
-    },
-    "node_modules/jsdoc/node_modules/escape-string-regexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jsdom": {
-      "version": "15.2.1",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.2.1.tgz",
-      "integrity": "sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g==",
-      "dependencies": {
-        "abab": "^2.0.0",
-        "acorn": "^7.1.0",
-        "acorn-globals": "^4.3.2",
-        "array-equal": "^1.0.0",
-        "cssom": "^0.4.1",
-        "cssstyle": "^2.0.0",
-        "data-urls": "^1.1.0",
-        "domexception": "^1.0.1",
-        "escodegen": "^1.11.1",
-        "html-encoding-sniffer": "^1.0.2",
-        "nwsapi": "^2.2.0",
-        "parse5": "5.1.0",
-        "pn": "^1.1.0",
-        "request": "^2.88.0",
-        "request-promise-native": "^1.0.7",
-        "saxes": "^3.1.9",
-        "symbol-tree": "^3.2.2",
-        "tough-cookie": "^3.0.1",
-        "w3c-hr-time": "^1.0.1",
-        "w3c-xmlserializer": "^1.1.2",
-        "webidl-conversions": "^4.0.2",
-        "whatwg-encoding": "^1.0.5",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^7.0.0",
-        "ws": "^7.0.0",
-        "xml-name-validator": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
-      "dev": true
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
-    "node_modules/json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "node_modules/json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-    },
-    "node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "dependencies": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
-    "node_modules/just-debounce": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz",
-      "integrity": "sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==",
-      "dev": true
-    },
-    "node_modules/just-extend": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz",
-      "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==",
-      "dev": true
-    },
-    "node_modules/keyv": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
-      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
-      "dev": true,
-      "dependencies": {
-        "json-buffer": "3.0.0"
-      }
-    },
-    "node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/klaw": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz",
-      "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.9"
-      }
-    },
-    "node_modules/ky": {
-      "version": "0.28.5",
-      "resolved": "https://registry.npmjs.org/ky/-/ky-0.28.5.tgz",
-      "integrity": "sha512-O5gg9kF4MeyfSw+YkgPAafOPwEUU6xcdGEJKUJmKpIPbLzk3oxUtY4OdBNekG7mawofzkyZ/ZHuR9ev5uZZdAA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/ky?sponsor=1"
-      }
-    },
-    "node_modules/last-run": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
-      "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
-      "dev": true,
-      "dependencies": {
-        "default-resolution": "^2.0.0",
-        "es6-weak-map": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/lazystream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "^2.0.5"
-      },
-      "engines": {
-        "node": ">= 0.6.3"
-      }
-    },
-    "node_modules/lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "dev": true,
-      "dependencies": {
-        "invert-kv": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/lead": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
-      "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
-      "dev": true,
-      "dependencies": {
-        "flush-write-stream": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/liftoff": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
-      "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
-      "dev": true,
-      "dependencies": {
-        "extend": "^3.0.0",
-        "findup-sync": "^3.0.0",
-        "fined": "^1.0.1",
-        "flagged-respawn": "^1.0.0",
-        "is-plain-object": "^2.0.4",
-        "object.map": "^1.0.0",
-        "rechoir": "^0.6.2",
-        "resolve": "^1.1.7"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/liftoff/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/lighthouse-logger": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.3.0.tgz",
-      "integrity": "sha512-BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.6.9",
-        "marky": "^1.2.2"
-      }
-    },
-    "node_modules/lighthouse-logger/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/lighthouse-logger/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/lines-and-columns": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
-      "dev": true
-    },
-    "node_modules/linkify-it": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
-      "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
-      "dev": true,
-      "dependencies": {
-        "uc.micro": "^1.0.1"
-      }
-    },
-    "node_modules/load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/load-json-file/node_modules/parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "node_modules/lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-      "dev": true
-    },
-    "node_modules/lodash.assign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
-      "dev": true
-    },
-    "node_modules/lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
-    },
-    "node_modules/lodash.defaults": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
-      "dev": true
-    },
-    "node_modules/lodash.difference": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
-      "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=",
-      "dev": true
-    },
-    "node_modules/lodash.flatten": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
-      "dev": true
-    },
-    "node_modules/lodash.flattendeep": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-      "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
-      "dev": true
-    },
-    "node_modules/lodash.isobject": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-      "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=",
-      "dev": true
-    },
-    "node_modules/lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
-      "dev": true
-    },
-    "node_modules/lodash.mapvalues": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz",
-      "integrity": "sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=",
-      "dev": true
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "node_modules/lodash.pickby": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz",
-      "integrity": "sha1-feoh2MGNdwOifHBMFdO4SmfjOv8=",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
-    },
-    "node_modules/lodash.template": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
-      "dev": true,
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.templatesettings": "^4.0.0"
-      }
-    },
-    "node_modules/lodash.templatesettings": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
-      "dev": true,
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0"
-      }
-    },
-    "node_modules/lodash.truncate": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-      "dev": true
-    },
-    "node_modules/lodash.union": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz",
-      "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=",
-      "dev": true
-    },
-    "node_modules/lodash.zip": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz",
-      "integrity": "sha1-7GZi5IlkCO1KtsVCo5kLcswIACA=",
-      "dev": true
-    },
-    "node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/loglevel": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz",
-      "integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.0"
-      },
-      "funding": {
-        "type": "tidelift",
-        "url": "https://tidelift.com/funding/github/npm/loglevel"
-      }
-    },
-    "node_modules/loglevel-plugin-prefix": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/loglevel-plugin-prefix/-/loglevel-plugin-prefix-0.8.4.tgz",
-      "integrity": "sha512-WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g==",
-      "dev": true
-    },
-    "node_modules/lowercase-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/lru-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
-      "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
-      "dev": true,
-      "dependencies": {
-        "es5-ext": "~0.10.2"
-      }
-    },
-    "node_modules/make-iterator": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/make-iterator/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/map-obj": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
-      "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "dev": true,
-      "dependencies": {
-        "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/markdown-it": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz",
-      "integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "entities": "~2.0.0",
-        "linkify-it": "^2.0.0",
-        "mdurl": "^1.0.1",
-        "uc.micro": "^1.0.5"
-      },
-      "bin": {
-        "markdown-it": "bin/markdown-it.js"
-      }
-    },
-    "node_modules/markdown-it-anchor": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.3.0.tgz",
-      "integrity": "sha512-/V1MnLL/rgJ3jkMWo84UR+K+jF1cxNG1a+KwqeXqTIJ+jtA8aWSHuigx8lTzauiIjBDbwF3NcWQMotd0Dm39jA==",
-      "dev": true,
-      "peerDependencies": {
-        "markdown-it": "*"
-      }
-    },
-    "node_modules/marked": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-2.1.3.tgz",
-      "integrity": "sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA==",
-      "dev": true,
-      "bin": {
-        "marked": "bin/marked"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/marky": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.2.tgz",
-      "integrity": "sha512-k1dB2HNeaNyORco8ulVEhctyEGkKHb2YWAhDsxeFlW2nROIirsctBYzKwwS3Vza+sKTS1zO4Z+n9/+9WbGLIxQ==",
-      "dev": true
-    },
-    "node_modules/matchdep": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
-      "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
-      "dev": true,
-      "dependencies": {
-        "findup-sync": "^2.0.0",
-        "micromatch": "^3.0.4",
-        "resolve": "^1.4.0",
-        "stack-trace": "0.0.10"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/findup-sync": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-      "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
-      "dev": true,
-      "dependencies": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^3.1.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/matchdep/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
-      "dev": true
-    },
-    "node_modules/memoizee": {
-      "version": "0.4.15",
-      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz",
-      "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==",
-      "dev": true,
-      "dependencies": {
-        "d": "^1.0.1",
-        "es5-ext": "^0.10.53",
-        "es6-weak-map": "^2.0.3",
-        "event-emitter": "^0.3.5",
-        "is-promise": "^2.2.2",
-        "lru-queue": "^0.1.0",
-        "next-tick": "^1.1.0",
-        "timers-ext": "^0.1.7"
-      }
-    },
-    "node_modules/meow": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimist": "^1.2.0",
-        "camelcase-keys": "^6.2.2",
-        "decamelize": "^1.2.0",
-        "decamelize-keys": "^1.1.0",
-        "hard-rejection": "^2.1.0",
-        "minimist-options": "4.1.0",
-        "normalize-package-data": "^3.0.0",
-        "read-pkg-up": "^7.0.1",
-        "redent": "^3.0.0",
-        "trim-newlines": "^3.0.0",
-        "type-fest": "^0.18.0",
-        "yargs-parser": "^20.2.3"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/meow/node_modules/type-fest": {
-      "version": "0.18.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mime-db": {
-      "version": "1.48.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
-      "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.31",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
-      "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
-      "dependencies": {
-        "mime-db": "1.48.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/min-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-      "dev": true
-    },
-    "node_modules/minimist-options": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
-      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
-      "dev": true,
-      "dependencies": {
-        "arrify": "^1.0.1",
-        "is-plain-obj": "^1.1.0",
-        "kind-of": "^6.0.3"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/minimist-options/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "dev": true,
-      "dependencies": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/mocha": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.1.tgz",
-      "integrity": "sha512-0wE74YMgOkCgBUj8VyIDwmLUjTsS13WV1Pg7l0SHea2qzZzlq7MDnfbPsHKcELBRk3+izEVkRofjmClpycudCA==",
-      "dev": true,
-      "dependencies": {
-        "@ungap/promise-all-settled": "1.1.2",
-        "ansi-colors": "4.1.1",
-        "browser-stdout": "1.3.1",
-        "chokidar": "3.5.2",
-        "debug": "4.3.1",
-        "diff": "5.0.0",
-        "escape-string-regexp": "4.0.0",
-        "find-up": "5.0.0",
-        "glob": "7.1.7",
-        "growl": "1.10.5",
-        "he": "1.2.0",
-        "js-yaml": "4.1.0",
-        "log-symbols": "4.1.0",
-        "minimatch": "3.0.4",
-        "ms": "2.1.3",
-        "nanoid": "3.1.23",
-        "serialize-javascript": "6.0.0",
-        "strip-json-comments": "3.1.1",
-        "supports-color": "8.1.1",
-        "which": "2.0.2",
-        "wide-align": "1.1.3",
-        "workerpool": "6.1.5",
-        "yargs": "16.2.0",
-        "yargs-parser": "20.2.4",
-        "yargs-unparser": "2.0.0"
-      },
-      "bin": {
-        "_mocha": "bin/_mocha",
-        "mocha": "bin/mocha"
-      },
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mochajs"
-      }
-    },
-    "node_modules/mocha/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/mocha/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/mocha/node_modules/debug/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/mocha/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/mocha/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
-    },
-    "node_modules/mocha/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/mocha/node_modules/yargs-parser": {
-      "version": "20.2.4",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/monaco-editor": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.20.0.tgz",
-      "integrity": "sha512-hkvf4EtPJRMQlPC3UbMoRs0vTAFAYdzFQ+gpMb8A+9znae1c43q8Mab9iVsgTcg/4PNiLGGn3SlDIa8uvK1FIQ==",
-      "dev": true
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/mute-stdout": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
-      "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/nan": {
-      "version": "2.14.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/nanoid": {
-      "version": "3.1.23",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz",
-      "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==",
-      "dev": true,
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/nanomatch/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "node_modules/next-tick": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
-      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
-      "dev": true
-    },
-    "node_modules/nise": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/nise/-/nise-4.1.0.tgz",
-      "integrity": "sha512-eQMEmGN/8arp0xsvGoQ+B1qvSkR73B1nWSCh7nOt5neMCtwcQVYQGdzQMhcNscktTsWB54xnlSQFzOAPJD8nXA==",
-      "dev": true,
-      "dependencies": {
-        "@sinonjs/commons": "^1.7.0",
-        "@sinonjs/fake-timers": "^6.0.0",
-        "@sinonjs/text-encoding": "^0.7.1",
-        "just-extend": "^4.0.2",
-        "path-to-regexp": "^1.7.0"
-      }
-    },
-    "node_modules/node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
-      "dev": true,
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      }
-    },
-    "node_modules/normalize-package-data": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz",
-      "integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^4.0.1",
-        "resolve": "^1.20.0",
-        "semver": "^7.3.4",
-        "validate-npm-package-license": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-url": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/now-and-later": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
-      "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/npm-package-arg": {
-      "version": "8.1.5",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz",
-      "integrity": "sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^4.0.1",
-        "semver": "^7.3.4",
-        "validate-npm-package-name": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/nwsapi": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="
-    },
-    "node_modules/oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "dev": true,
-      "dependencies": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.defaults": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
-      "dev": true,
-      "dependencies": {
-        "array-each": "^1.0.1",
-        "array-slice": "^1.0.0",
-        "for-own": "^1.0.0",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.map": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
-      "dev": true,
-      "dependencies": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.reduce": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
-      "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
-      "dev": true,
-      "dependencies": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/opener": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
-      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
-      "dev": true,
-      "bin": {
-        "opener": "bin/opener-bin.js"
-      }
-    },
-    "node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ordered-read-streams": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
-      "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "node_modules/os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-      "dev": true,
-      "dependencies": {
-        "lcid": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/p-cancelable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
-      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/p-iteration": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/p-iteration/-/p-iteration-1.1.8.tgz",
-      "integrity": "sha512-IMFBSDIYcPNnW7uWYGrBqmvTiq7W0uB0fJn6shQZs7dlF3OvrHOre+JT9ikSZ7gZS3vWqclVgoQSvToJrns7uQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/package-json": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
-      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
-      "dev": true,
-      "dependencies": {
-        "got": "^9.6.0",
-        "registry-auth-token": "^4.0.0",
-        "registry-url": "^5.0.0",
-        "semver": "^6.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/package-json/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse-filepath": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-      "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
-      "dev": true,
-      "dependencies": {
-        "is-absolute": "^1.0.0",
-        "map-cache": "^0.2.0",
-        "path-root": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/parse-node-version": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/parse-passwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/parse5": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
-      "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="
-    },
-    "node_modules/pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-      "dev": true
-    },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/path-root": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
-      "dev": true,
-      "dependencies": {
-        "path-root-regex": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-root-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-to-regexp": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
-      "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
-      "dev": true,
-      "dependencies": {
-        "isarray": "0.0.1"
-      }
-    },
-    "node_modules/path-to-regexp/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
-    "node_modules/path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pathval": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-      "dev": true
-    },
-    "node_modules/performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
-      "dependencies": {
-        "pinkie": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/plugin-error": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
-      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^1.0.1",
-        "arr-diff": "^4.0.0",
-        "arr-union": "^3.1.0",
-        "extend-shallow": "^3.0.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/plugin-error/node_modules/ansi-colors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-wrap": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
-      "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="
-    },
-    "node_modules/portfinder": {
-      "version": "1.0.28",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
-      "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
-      "dev": true,
-      "dependencies": {
-        "async": "^2.6.2",
-        "debug": "^3.1.1",
-        "mkdirp": "^0.5.5"
-      },
-      "engines": {
-        "node": ">= 0.12.0"
-      }
-    },
-    "node_modules/portfinder/node_modules/async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.14"
-      }
-    },
-    "node_modules/portfinder/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/portfinder/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss": {
-      "version": "7.0.36",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
-      "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.2",
-        "source-map": "^0.6.1",
-        "supports-color": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      }
-    },
-    "node_modules/postcss/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss/node_modules/chalk/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/postcss/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/postcss/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/postcss/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss/node_modules/supports-color": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/prepend-http": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pretty-hrtime": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/printj": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz",
-      "integrity": "sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==",
-      "dev": true,
-      "bin": {
-        "printj": "bin/printj.njs"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
-    "node_modules/progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "dev": true
-    },
-    "node_modules/pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
-    },
-    "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/pumpify": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-      "dev": true,
-      "dependencies": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
-      }
-    },
-    "node_modules/pumpify/node_modules/pump": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/puppeteer-core": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-10.2.0.tgz",
-      "integrity": "sha512-c1COxSnfynsE6Mtt+dW0t3TITjF9Ku4dnJbFMDDVhLQuMTYSpz4rkSP37qvzcSo3k02/Ac3GYWk0/ncp6DKZNA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "4.3.1",
-        "devtools-protocol": "0.0.901419",
-        "extract-zip": "2.0.1",
-        "https-proxy-agent": "5.0.0",
-        "node-fetch": "2.6.1",
-        "pkg-dir": "4.2.0",
-        "progress": "2.0.1",
-        "proxy-from-env": "1.1.0",
-        "rimraf": "3.0.2",
-        "tar-fs": "2.0.0",
-        "unbzip2-stream": "1.3.3",
-        "ws": "7.4.6"
-      },
-      "engines": {
-        "node": ">=10.18.1"
-      }
-    },
-    "node_modules/puppeteer-core/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/puppeteer-core/node_modules/devtools-protocol": {
-      "version": "0.0.901419",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.901419.tgz",
-      "integrity": "sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ==",
-      "dev": true
-    },
-    "node_modules/puppeteer-core/node_modules/progress": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz",
-      "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/puppeteer-core/node_modules/ws": {
-      "version": "7.4.6",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
-      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.3.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/query-selector-shadow-dom": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/query-selector-shadow-dom/-/query-selector-shadow-dom-1.0.0.tgz",
-      "integrity": "sha512-bK0/0cCI+R8ZmOF1QjT7HupDUYCxbf/9TJgAmSXQxZpftXmTAeil9DRoCnTDkWbvOyZzhcMBwKpptWcdkGFIMg==",
-      "dev": true
-    },
-    "node_modules/quick-lru": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/rc": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "dev": true,
-      "dependencies": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      },
-      "bin": {
-        "rc": "cli.js"
-      }
-    },
-    "node_modules/rc/node_modules/strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/read-pkg": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-      "dev": true,
-      "dependencies": {
-        "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^2.5.0",
-        "parse-json": "^5.0.0",
-        "type-fest": "^0.6.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.1.0",
-        "read-pkg": "^5.2.0",
-        "type-fest": "^0.8.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg/node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
-    },
-    "node_modules/read-pkg/node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "node_modules/read-pkg/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/read-pkg/node_modules/type-fest": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/readdir-glob": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.1.tgz",
-      "integrity": "sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA==",
-      "dev": true,
-      "dependencies": {
-        "minimatch": "^3.0.4"
-      }
-    },
-    "node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/readline-sync": {
-      "version": "1.4.10",
-      "resolved": "https://registry.npmjs.org/readline-sync/-/readline-sync-1.4.10.tgz",
-      "integrity": "sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-      "dev": true,
-      "dependencies": {
-        "resolve": "^1.1.6"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/recursive-readdir": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
-      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "minimatch": "3.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/redent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-      "dev": true,
-      "dependencies": {
-        "indent-string": "^4.0.0",
-        "strip-indent": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/regenerator-runtime": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
-      "dev": true
-    },
-    "node_modules/regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
-    "node_modules/registry-auth-token": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz",
-      "integrity": "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==",
-      "dev": true,
-      "dependencies": {
-        "rc": "^1.2.8"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/registry-url": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
-      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
-      "dev": true,
-      "dependencies": {
-        "rc": "^1.2.8"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/remove-bom-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
-      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5",
-        "is-utf8": "^0.2.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/remove-bom-stream": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
-      "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
-      "dev": true,
-      "dependencies": {
-        "remove-bom-buffer": "^3.0.0",
-        "safe-buffer": "^5.1.0",
-        "through2": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/remove-bom-stream/node_modules/through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "node_modules/remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true
-    },
-    "node_modules/repeat-element": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
-      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/replace-ext": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
-      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/replace-homedir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
-      "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
-      "dev": true,
-      "dependencies": {
-        "homedir-polyfill": "^1.0.1",
-        "is-absolute": "^1.0.0",
-        "remove-trailing-separator": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/replacestream": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz",
-      "integrity": "sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^1.0.3",
-        "object-assign": "^4.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "node_modules/replacestream/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
-      "dependencies": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/request-promise-core": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
-      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
-      "dependencies": {
-        "lodash": "^4.17.19"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "peerDependencies": {
-        "request": "^2.34"
-      }
-    },
-    "node_modules/request-promise-native": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
-      "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
-      "deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142",
-      "dependencies": {
-        "request-promise-core": "1.1.4",
-        "stealthy-require": "^1.1.1",
-        "tough-cookie": "^2.3.3"
-      },
-      "engines": {
-        "node": ">=0.12.0"
-      },
-      "peerDependencies": {
-        "request": "^2.34"
-      }
-    },
-    "node_modules/request-promise-native/node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/request/node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-      "dev": true
-    },
-    "node_modules/requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-      "dev": true
-    },
-    "node_modules/requizzle": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.3.tgz",
-      "integrity": "sha512-YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.14"
-      }
-    },
-    "node_modules/resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-alpn": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.0.tgz",
-      "integrity": "sha512-e4FNQs+9cINYMO5NMFc6kOUCdohjqFPSgMuwuZAOUWqrfWsen+Yjy5qZFkV5K7VO7tFSLKcUL97olkED7sCBHA==",
-      "dev": true
-    },
-    "node_modules/resolve-dir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-      "dev": true,
-      "dependencies": {
-        "expand-tilde": "^2.0.0",
-        "global-modules": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve-options": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
-      "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
-      "dev": true,
-      "dependencies": {
-        "value-or-function": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
-      "dev": true
-    },
-    "node_modules/responselike": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
-      "dev": true,
-      "dependencies": {
-        "lowercase-keys": "^1.0.0"
-      }
-    },
-    "node_modules/resq": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/resq/-/resq-1.10.1.tgz",
-      "integrity": "sha512-zhp1iyUH02MLciv3bIM2bNtTFx/fqRsK4Jk73jcPqp00d/sMTTjOtjdTMAcgjrQKGx5DvQ/HSpeqaMW0atGRJA==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^2.0.1"
-      }
-    },
-    "node_modules/resq/node_modules/fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-      "dev": true
-    },
-    "node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/rgb2hex": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.2.5.tgz",
-      "integrity": "sha512-22MOP1Rh7sAo1BZpDG6R5RFYzR2lYEgwq7HEmyW2qcsOqR2lQKmn+O//xV3YG/0rrhMC6KVX2hU+ZXuaw9a5bw==",
-      "dev": true
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "node_modules/safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-      "dev": true,
-      "dependencies": {
-        "ret": "~0.1.10"
-      }
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "node_modules/saxes": {
-      "version": "3.1.11",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz",
-      "integrity": "sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==",
-      "dependencies": {
-        "xmlchars": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/secure-compare": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/secure-compare/-/secure-compare-3.0.1.tgz",
-      "integrity": "sha1-8aAymzCLIh+uN7mXTz1XjQypmeM=",
-      "dev": true
-    },
-    "node_modules/selenium-standalone": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/selenium-standalone/-/selenium-standalone-7.1.0.tgz",
-      "integrity": "sha512-Pc7U48qwB4LVy/XczBrPPXwUhEPl3XQSik8SjLfj2qzBEtZqrjyzOlnnXq4aVCdr5wH9FiFJm8LwheJbK2+/oQ==",
-      "dev": true,
-      "dependencies": {
-        "commander": "^7.2.0",
-        "cross-spawn": "^7.0.3",
-        "debug": "^4.3.1",
-        "fs-extra": "^10.0.0",
-        "got": "^11.8.2",
-        "is-port-reachable": "^3.0.0",
-        "lodash.mapvalues": "^4.6.0",
-        "lodash.merge": "^4.6.2",
-        "minimist": "^1.2.5",
-        "mkdirp": "^1.0.4",
-        "progress": "2.0.3",
-        "tar-stream": "2.2.0",
-        "which": "^2.0.2",
-        "yauzl": "^2.10.0"
-      },
-      "bin": {
-        "selenium-standalone": "bin/selenium-standalone"
-      },
-      "engines": {
-        "node": ">=12.0.0",
-        "npm": ">=6.0.0"
-      }
-    },
-    "node_modules/selenium-standalone/node_modules/@sindresorhus/is": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz",
-      "integrity": "sha512-Qm9hBEBu18wt1PO2flE7LPb30BHMQt1eQgbV76YntdNk73XZGpn3izvGTYxbGgzXKgbCjiia0uxTd3aTNQrY/g==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/is?sponsor=1"
-      }
-    },
-    "node_modules/selenium-standalone/node_modules/@szmarczak/http-timer": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
-      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
-      "dev": true,
-      "dependencies": {
-        "defer-to-connect": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/selenium-standalone/node_modules/cacheable-request": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
-      "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
-      "dev": true,
-      "dependencies": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^4.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^6.0.1",
-        "responselike": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/selenium-standalone/node_modules/decompress-response": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-      "dev": true,
-      "dependencies": {
-        "mimic-response": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/selenium-standalone/node_modules/defer-to-connect": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
-      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/selenium-standalone/node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/selenium-standalone/node_modules/got": {
-      "version": "11.8.2",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.2.tgz",
-      "integrity": "sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==",
-      "dev": true,
-      "dependencies": {
-        "@sindresorhus/is": "^4.0.0",
-        "@szmarczak/http-timer": "^4.0.5",
-        "@types/cacheable-request": "^6.0.1",
-        "@types/responselike": "^1.0.0",
-        "cacheable-lookup": "^5.0.3",
-        "cacheable-request": "^7.0.1",
-        "decompress-response": "^6.0.0",
-        "http2-wrapper": "^1.0.0-beta.5.2",
-        "lowercase-keys": "^2.0.0",
-        "p-cancelable": "^2.0.0",
-        "responselike": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.19.0"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/got?sponsor=1"
-      }
-    },
-    "node_modules/selenium-standalone/node_modules/json-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
-    },
-    "node_modules/selenium-standalone/node_modules/keyv": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz",
-      "integrity": "sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA==",
-      "dev": true,
-      "dependencies": {
-        "json-buffer": "3.0.1"
-      }
-    },
-    "node_modules/selenium-standalone/node_modules/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/selenium-standalone/node_modules/mimic-response": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/selenium-standalone/node_modules/normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/selenium-standalone/node_modules/p-cancelable": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
-      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/selenium-standalone/node_modules/responselike": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz",
-      "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==",
-      "dev": true,
-      "dependencies": {
-        "lowercase-keys": "^2.0.0"
-      }
-    },
-    "node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/semver-greatest-satisfied-range": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
-      "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
-      "dev": true,
-      "dependencies": {
-        "sver-compat": "^1.5.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/serialize-error": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-8.1.0.tgz",
-      "integrity": "sha512-3NnuWfM6vBYoy5gZFvHiYsVbafvI9vZv/+jlIigFn4oP4zjNPK3LhcY0xSCgeb1a5L8jO71Mit9LlNoi2UfDDQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/serialize-error/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/serialize-javascript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
-    },
-    "node_modules/set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/sinon": {
-      "version": "9.2.4",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz",
-      "integrity": "sha512-zljcULZQsJxVra28qIAL6ow1Z9tpattkCTEJR4RBP3TGc00FcttsP5pK284Nas5WjMZU5Yzy3kAIp3B3KRf5Yg==",
-      "dev": true,
-      "dependencies": {
-        "@sinonjs/commons": "^1.8.1",
-        "@sinonjs/fake-timers": "^6.0.1",
-        "@sinonjs/samsam": "^5.3.1",
-        "diff": "^4.0.2",
-        "nise": "^4.0.4",
-        "supports-color": "^7.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/sinon"
-      }
-    },
-    "node_modules/sinon/node_modules/diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "node_modules/snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "dev": true,
-      "dependencies": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/snapdragon/node_modules/source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-      "dev": true,
-      "dependencies": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-resolve": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
-      "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
-      "dev": true,
-      "dependencies": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0"
-      }
-    },
-    "node_modules/source-map-url": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
-      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
-      "dev": true
-    },
-    "node_modules/sparkles": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
-      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/spawn-command": {
-      "version": "0.0.2-1",
-      "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz",
-      "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=",
-      "dev": true
-    },
-    "node_modules/spdx-compare": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-compare/-/spdx-compare-1.0.0.tgz",
-      "integrity": "sha512-C1mDZOX0hnu0ep9dfmuoi03+eOdDoz2yvK79RxbcrVEG1NO1Ph35yW102DHWKN4pk80nwCgeMmSY5L25VE4D9A==",
-      "dev": true,
-      "dependencies": {
-        "array-find-index": "^1.0.2",
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-ranges": "^2.0.0"
-      }
-    },
-    "node_modules/spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-      "dev": true,
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
-    },
-    "node_modules/spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
-      "dependencies": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-license-ids": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz",
-      "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==",
-      "dev": true
-    },
-    "node_modules/spdx-ranges": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-ranges/-/spdx-ranges-2.1.1.tgz",
-      "integrity": "sha512-mcdpQFV7UDAgLpXEE/jOMqvK4LBoO0uTQg0uvXUewmEFhpiZx5yJSZITHB8w1ZahKdhfZqP5GPEOKLyEq5p8XA==",
-      "dev": true
-    },
-    "node_modules/spdx-satisfies": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-satisfies/-/spdx-satisfies-5.0.1.tgz",
-      "integrity": "sha512-Nwor6W6gzFp8XX4neaKQ7ChV4wmpSh2sSDemMFSzHxpTw460jxFYeOn+jq4ybnSSw/5sc3pjka9MQPouksQNpw==",
-      "dev": true,
-      "dependencies": {
-        "spdx-compare": "^1.0.0",
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-ranges": "^2.0.0"
-      }
-    },
-    "node_modules/split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "node_modules/sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "dependencies": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      },
-      "bin": {
-        "sshpk-conv": "bin/sshpk-conv",
-        "sshpk-sign": "bin/sshpk-sign",
-        "sshpk-verify": "bin/sshpk-verify"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/stack-trace": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/stealthy-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/stream-exhaust": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
-      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
-      "dev": true
-    },
-    "node_modules/stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
-      "dev": true
-    },
-    "node_modules/streamqueue": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/streamqueue/-/streamqueue-0.0.6.tgz",
-      "integrity": "sha1-ZvX17JTpuK8knkrsLdH3Qb/pTeM=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "^1.0.26-2"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/streamqueue/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
-    "node_modules/streamqueue/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/streamqueue/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
-    "node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dev": true,
-      "dependencies": {
-        "is-utf8": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-bom-string": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
-      "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
-      "dependencies": {
-        "min-indent": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/suffix": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/suffix/-/suffix-0.1.1.tgz",
-      "integrity": "sha1-zFgjFkag7xEC95R47zqSSP2chC8=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/sver-compat": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
-      "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
-      "dev": true,
-      "dependencies": {
-        "es6-iterator": "^2.0.1",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "node_modules/symbol-tree": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
-    },
-    "node_modules/table": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
-      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.1",
-        "lodash.clonedeep": "^4.5.0",
-        "lodash.truncate": "^4.4.2",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/table/node_modules/ajv": {
-      "version": "8.6.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz",
-      "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/table/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/taffydb": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz",
-      "integrity": "sha1-fLy2S1oUG2ou/CxdLGe04VCyomg=",
-      "dev": true
-    },
-    "node_modules/tar-fs": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz",
-      "integrity": "sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==",
-      "dev": true,
-      "dependencies": {
-        "chownr": "^1.1.1",
-        "mkdirp": "^0.5.1",
-        "pump": "^3.0.0",
-        "tar-stream": "^2.0.0"
-      }
-    },
-    "node_modules/tar-fs/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/tar-stream": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-      "dev": true,
-      "dependencies": {
-        "bl": "^4.0.3",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tar-stream/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "node_modules/textextensions": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-3.3.0.tgz",
-      "integrity": "sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://bevry.me/fund"
-      }
-    },
-    "node_modules/through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
-    "node_modules/through2": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
-      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "3"
-      }
-    },
-    "node_modules/through2-filter": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
-      "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
-      "dev": true,
-      "dependencies": {
-        "through2": "~2.0.0",
-        "xtend": "~4.0.0"
-      }
-    },
-    "node_modules/through2-filter/node_modules/through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "node_modules/through2/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/time-stamp": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/timers-ext": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
-      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
-      "dev": true,
-      "dependencies": {
-        "es5-ext": "~0.10.46",
-        "next-tick": "1"
-      }
-    },
-    "node_modules/tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "os-tmpdir": "~1.0.2"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/to-absolute-glob": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-      "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
-      "dev": true,
-      "dependencies": {
-        "is-absolute": "^1.0.0",
-        "is-negated-glob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-object-path/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-readable-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
-      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/to-regex-range/node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/to-through": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
-      "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
-      "dev": true,
-      "dependencies": {
-        "through2": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/to-through/node_modules/through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "node_modules/tough-cookie": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-      "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
-      "dependencies": {
-        "ip-regex": "^2.1.0",
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/tree-kill": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
-      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
-      "dev": true,
-      "bin": {
-        "tree-kill": "cli.js"
-      }
-    },
-    "node_modules/trim-newlines": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
-    "node_modules/tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
-    },
-    "node_modules/type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-      "dev": true
-    },
-    "node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
-    "node_modules/typescript": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
-      "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
-    "node_modules/typescript-closure-tools": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/typescript-closure-tools/-/typescript-closure-tools-0.0.7.tgz",
-      "integrity": "sha512-trz9OhHC8d96c8aqlolk7ckNWlxqqgLPkeSqwi4PuEPu5zMjQqTg8m0E2gNpS3uUPyL0wwBTQOVB/rigFCPJPw==",
-      "dev": true,
-      "dependencies": {
-        "colors": "*",
-        "doctrine": "github:fivetran/doctrine",
-        "escodegen": "*",
-        "esprima": "*",
-        "jsdoc": "*",
-        "mkdirp": "*"
-      },
-      "bin": {
-        "closure2ts": "definition-generator/src/cli.js",
-        "ts2externs": "externs-generator/src/cli.js"
-      }
-    },
-    "node_modules/typescript-closure-tools/node_modules/doctrine": {
-      "version": "0.5.2-dev",
-      "resolved": "git+ssh://git@github.com/fivetran/doctrine.git#169ebc1cbf23492363f9442543d1e78e1df9c3d5",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/ua-parser-js": {
-      "version": "0.7.28",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz",
-      "integrity": "sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/ua-parser-js"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/faisalman"
-        }
-      ],
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/uc.micro": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
-      "dev": true
-    },
-    "node_modules/unbzip2-stream": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz",
-      "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==",
-      "dev": true,
-      "dependencies": {
-        "buffer": "^5.2.1",
-        "through": "^2.3.8"
-      }
-    },
-    "node_modules/unc-path-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/underscore": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==",
-      "dev": true
-    },
-    "node_modules/undertaker": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz",
-      "integrity": "sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "bach": "^1.0.0",
-        "collection-map": "^1.0.0",
-        "es6-weak-map": "^2.0.1",
-        "fast-levenshtein": "^1.0.0",
-        "last-run": "^1.1.0",
-        "object.defaults": "^1.0.0",
-        "object.reduce": "^1.0.0",
-        "undertaker-registry": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/undertaker-registry": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
-      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/undertaker/node_modules/fast-levenshtein": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz",
-      "integrity": "sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk=",
-      "dev": true
-    },
-    "node_modules/union": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/union/-/union-0.5.0.tgz",
-      "integrity": "sha512-N6uOhuW6zO95P3Mel2I2zMsbsanvvtgn6jVqJv4vbVcz/JN0OkL9suomjQGmWtxJQXOCqUJvquc1sMeNz/IwlA==",
-      "dev": true,
-      "dependencies": {
-        "qs": "^6.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/union-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "dev": true,
-      "dependencies": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/union-value/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unique-stream": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
-      "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
-      "dev": true,
-      "dependencies": {
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "through2-filter": "^3.0.0"
-      }
-    },
-    "node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "dev": true,
-      "dependencies": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-      "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-      "dev": true,
-      "dependencies": {
-        "get-value": "^2.0.3",
-        "has-values": "^0.1.4",
-        "isobject": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-      "dev": true,
-      "dependencies": {
-        "isarray": "1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-values": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-      "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4",
-        "yarn": "*"
-      }
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
-      "dev": true
-    },
-    "node_modules/url-join": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/url-join/-/url-join-2.0.5.tgz",
-      "integrity": "sha1-WvIvGMBSoACkjXuCxenC4v7tpyg=",
-      "dev": true
-    },
-    "node_modules/url-parse-lax": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
-      "dev": true,
-      "dependencies": {
-        "prepend-http": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
-    "node_modules/v8flags": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
-      "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
-      "dev": true,
-      "dependencies": {
-        "homedir-polyfill": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/validate-npm-package-name": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
-      "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
-      "dev": true,
-      "dependencies": {
-        "builtins": "^1.0.3"
-      }
-    },
-    "node_modules/value-or-function": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
-      "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
-    "node_modules/vinyl": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
-      "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
-      "dev": true,
-      "dependencies": {
-        "clone": "^2.1.1",
-        "clone-buffer": "^1.0.0",
-        "clone-stats": "^1.0.0",
-        "cloneable-readable": "^1.0.0",
-        "remove-trailing-separator": "^1.0.1",
-        "replace-ext": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vinyl-fs": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
-      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
-      "dev": true,
-      "dependencies": {
-        "fs-mkdirp-stream": "^1.0.0",
-        "glob-stream": "^6.1.0",
-        "graceful-fs": "^4.0.0",
-        "is-valid-glob": "^1.0.0",
-        "lazystream": "^1.0.0",
-        "lead": "^1.0.0",
-        "object.assign": "^4.0.4",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.3.3",
-        "remove-bom-buffer": "^3.0.0",
-        "remove-bom-stream": "^1.2.0",
-        "resolve-options": "^1.1.0",
-        "through2": "^2.0.0",
-        "to-through": "^2.0.0",
-        "value-or-function": "^3.0.0",
-        "vinyl": "^2.0.0",
-        "vinyl-sourcemap": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vinyl-fs/node_modules/through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "node_modules/vinyl-sourcemap": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
-      "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
-      "dev": true,
-      "dependencies": {
-        "append-buffer": "^1.0.2",
-        "convert-source-map": "^1.5.0",
-        "graceful-fs": "^4.1.6",
-        "normalize-path": "^2.1.1",
-        "now-and-later": "^2.0.0",
-        "remove-bom-buffer": "^3.0.0",
-        "vinyl": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vinyl-sourcemap/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/vinyl-sourcemaps-apply": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
-      "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
-      "dev": true,
-      "dependencies": {
-        "source-map": "^0.5.1"
-      }
-    },
-    "node_modules/w3c-hr-time": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-      "dependencies": {
-        "browser-process-hrtime": "^1.0.0"
-      }
-    },
-    "node_modules/w3c-xmlserializer": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz",
-      "integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==",
-      "dependencies": {
-        "domexception": "^1.0.1",
-        "webidl-conversions": "^4.0.2",
-        "xml-name-validator": "^3.0.0"
-      }
-    },
-    "node_modules/wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "defaults": "^1.0.3"
-      }
-    },
-    "node_modules/webdriver": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.11.0.tgz",
-      "integrity": "sha512-Sd4n3Hxz/6WDa4Ay8cJj/ICDbf2ndlAzd7NMj+dmhfDsDF7L77eCZYB8zrrxs2hoK63E54eyKzyycK3BB3WoYQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "^15.12.5",
-        "@wdio/config": "7.10.1",
-        "@wdio/logger": "7.7.0",
-        "@wdio/protocols": "7.11.0",
-        "@wdio/types": "7.10.1",
-        "@wdio/utils": "7.11.0",
-        "got": "^11.0.2",
-        "ky": "^0.28.5",
-        "lodash.merge": "^4.6.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/webdriver/node_modules/@sindresorhus/is": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz",
-      "integrity": "sha512-Qm9hBEBu18wt1PO2flE7LPb30BHMQt1eQgbV76YntdNk73XZGpn3izvGTYxbGgzXKgbCjiia0uxTd3aTNQrY/g==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/is?sponsor=1"
-      }
-    },
-    "node_modules/webdriver/node_modules/@szmarczak/http-timer": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
-      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
-      "dev": true,
-      "dependencies": {
-        "defer-to-connect": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/webdriver/node_modules/@types/node": {
-      "version": "15.14.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.9.tgz",
-      "integrity": "sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==",
-      "dev": true
-    },
-    "node_modules/webdriver/node_modules/cacheable-request": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
-      "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
-      "dev": true,
-      "dependencies": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^4.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^6.0.1",
-        "responselike": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/webdriver/node_modules/decompress-response": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-      "dev": true,
-      "dependencies": {
-        "mimic-response": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/webdriver/node_modules/defer-to-connect": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
-      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/webdriver/node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/webdriver/node_modules/got": {
-      "version": "11.8.2",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.2.tgz",
-      "integrity": "sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==",
-      "dev": true,
-      "dependencies": {
-        "@sindresorhus/is": "^4.0.0",
-        "@szmarczak/http-timer": "^4.0.5",
-        "@types/cacheable-request": "^6.0.1",
-        "@types/responselike": "^1.0.0",
-        "cacheable-lookup": "^5.0.3",
-        "cacheable-request": "^7.0.1",
-        "decompress-response": "^6.0.0",
-        "http2-wrapper": "^1.0.0-beta.5.2",
-        "lowercase-keys": "^2.0.0",
-        "p-cancelable": "^2.0.0",
-        "responselike": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.19.0"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/got?sponsor=1"
-      }
-    },
-    "node_modules/webdriver/node_modules/json-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
-    },
-    "node_modules/webdriver/node_modules/keyv": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz",
-      "integrity": "sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA==",
-      "dev": true,
-      "dependencies": {
-        "json-buffer": "3.0.1"
-      }
-    },
-    "node_modules/webdriver/node_modules/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/webdriver/node_modules/mimic-response": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/webdriver/node_modules/normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/webdriver/node_modules/p-cancelable": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
-      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/webdriver/node_modules/responselike": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz",
-      "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==",
-      "dev": true,
-      "dependencies": {
-        "lowercase-keys": "^2.0.0"
-      }
-    },
-    "node_modules/webdriverio": {
-      "version": "7.11.1",
-      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.11.1.tgz",
-      "integrity": "sha512-N796qZIqkfIJJtSNBcAimnVr3SrnEjbwjYSBqAhVdGSidUKb1k6bxjC223WFwpANGkxABJUrVkx+qGNOtc+yGg==",
-      "dev": true,
-      "dependencies": {
-        "@types/aria-query": "^4.2.1",
-        "@types/node": "^15.12.5",
-        "@wdio/config": "7.10.1",
-        "@wdio/logger": "7.7.0",
-        "@wdio/protocols": "7.11.0",
-        "@wdio/repl": "7.11.0",
-        "@wdio/types": "7.10.1",
-        "@wdio/utils": "7.11.0",
-        "archiver": "^5.0.0",
-        "aria-query": "^4.2.2",
-        "atob": "^2.1.2",
-        "css-shorthand-properties": "^1.1.1",
-        "css-value": "^0.0.1",
-        "devtools": "7.11.0",
-        "devtools-protocol": "^0.0.915197",
-        "fs-extra": "^10.0.0",
-        "get-port": "^5.1.1",
-        "grapheme-splitter": "^1.0.2",
-        "lodash.clonedeep": "^4.5.0",
-        "lodash.isobject": "^3.0.2",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.zip": "^4.2.0",
-        "minimatch": "^3.0.4",
-        "puppeteer-core": "^10.1.0",
-        "query-selector-shadow-dom": "^1.0.0",
-        "resq": "^1.9.1",
-        "rgb2hex": "0.2.5",
-        "serialize-error": "^8.0.0",
-        "webdriver": "7.11.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/webdriverio/node_modules/@types/node": {
-      "version": "15.14.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.9.tgz",
-      "integrity": "sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==",
-      "dev": true
-    },
-    "node_modules/webidl-conversions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
-    },
-    "node_modules/whatwg-encoding": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
-      "dependencies": {
-        "iconv-lite": "0.4.24"
-      }
-    },
-    "node_modules/whatwg-mimetype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
-    },
-    "node_modules/whatwg-url": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
-      "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
-      "dependencies": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^1.0.1",
-        "webidl-conversions": "^4.0.2"
-      }
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-      "dev": true
-    },
-    "node_modules/wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^1.0.2 || 2"
-      }
-    },
-    "node_modules/wide-align/node_modules/ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wide-align/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wide-align/node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dev": true,
-      "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wide-align/node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/workerpool": {
-      "version": "6.1.5",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz",
-      "integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==",
-      "dev": true
-    },
-    "node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "node_modules/ws": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
-      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
-      "engines": {
-        "node": ">=8.3.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/xml-name-validator": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
-    },
-    "node_modules/xmlchars": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
-    },
-    "node_modules/xmlcreate": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.3.tgz",
-      "integrity": "sha512-HgS+X6zAztGa9zIK3Y3LXuJes33Lz9x+YyTxgrkIdabu2vqcGOWwdfCpf1hWLRrd553wd4QCDf6BBO6FfdsRiQ==",
-      "dev": true
-    },
-    "node_modules/xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yargs-unparser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
-      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^6.0.0",
-        "decamelize": "^4.0.0",
-        "flat": "^5.0.2",
-        "is-plain-obj": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yargs-unparser/node_modules/camelcase": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yargs-unparser/node_modules/decamelize": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
-      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yargs-unparser/node_modules/is-plain-obj": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yarn-install": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/yarn-install/-/yarn-install-1.0.0.tgz",
-      "integrity": "sha1-V/RQULgu/VcYKzlzxUqgXLXSUjA=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "cac": "^3.0.3",
-        "chalk": "^1.1.3",
-        "cross-spawn": "^4.0.2"
-      },
-      "bin": {
-        "yarn-install": "bin/yarn-install.js",
-        "yarn-remove": "bin/yarn-remove.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yarn-install/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yarn-install/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yarn-install/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yarn-install/node_modules/cross-spawn": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
-      "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "lru-cache": "^4.0.1",
-        "which": "^1.2.9"
-      }
-    },
-    "node_modules/yarn-install/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/yarn-install/node_modules/lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
-      }
-    },
-    "node_modules/yarn-install/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yarn-install/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/yarn-install/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/yarn-install/node_modules/yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
-      "dev": true,
-      "dependencies": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
-      }
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/zip-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.0.tgz",
-      "integrity": "sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==",
-      "dev": true,
-      "dependencies": {
-        "archiver-utils": "^2.1.0",
-        "compress-commons": "^4.1.0",
-        "readable-stream": "^3.6.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/zip-stream/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    }
-  },
   "dependencies": {
     "@babel/code-frame": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
-      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
+      "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.14.5"
+        "@babel/highlight": "^7.0.0"
       }
     },
     "@babel/generator": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.8.tgz",
-      "integrity": "sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.5.tgz",
+      "integrity": "sha512-3vXxr3FEW7E7lJZiWQ3bM4+v/Vyr9C+hpolQ8BGFr9Y8Ri2tFLWTixmwKBafDujO1WVah4fhZBeU1bieKdghig==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.14.8",
+        "@babel/types": "^7.10.5",
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
-      }
-    },
-    "@babel/helper-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz",
-      "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-get-function-arity": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-get-function-arity": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz",
-      "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-hoist-variables": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz",
-      "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz",
-      "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz",
-      "integrity": "sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==",
-      "dev": true
-    },
-    "@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
           "dev": true
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
+    "@babel/helper-function-name": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+      "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-get-function-arity": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-get-function-arity": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+      "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz",
+      "integrity": "sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+      "dev": true
+    },
+    "@babel/highlight": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
+      "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.0",
+        "esutils": "^2.0.2",
+        "js-tokens": "^4.0.0"
+      }
+    },
     "@babel/parser": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.8.tgz",
-      "integrity": "sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.0.tgz",
+      "integrity": "sha512-+o2q111WEx4srBs7L9eJmcwi655eD8sXniLqMB93TBK9GrNzGrxDWSjiqz2hLU0Ha8MTXFIP0yd9fNdP+m43ZQ==",
       "dev": true
     },
     "@babel/runtime": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz",
-      "integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+      "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
       "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.4"
       }
     },
     "@babel/runtime-corejs3": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.8.tgz",
-      "integrity": "sha512-4dMD5QRBkumn45oweR0SxoNtt15oz3BUBAQ8cIx7HJqZTtE8zjpM0My8aHJHVnyf4XfRg6DNzaE1080WLBiC1w==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.0.tgz",
+      "integrity": "sha512-0R0HTZWHLk6G8jIk0FtoX+AatCtKnswS98VhXwGImFc759PJRp4Tru0PQYZofyijTFUr+gT8Mu7sgXVJLQ0ceg==",
       "dev": true,
       "requires": {
-        "core-js-pure": "^3.15.0",
+        "core-js-pure": "^3.0.0",
         "regenerator-runtime": "^0.13.4"
       }
     },
     "@babel/template": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
-      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.4"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.10.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.5.tgz",
+          "integrity": "sha512-wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ==",
+          "dev": true
+        }
       }
     },
     "@babel/traverse": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.8.tgz",
-      "integrity": "sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.5.tgz",
+      "integrity": "sha512-yc/fyv2gUjPqzTz0WHeRJH2pv7jA9kA7mBX2tXl/x5iOE81uaVPuGPtaYk7wmkx4b67mQ7NqI8rmT2pF47KYKQ==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.14.8",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/parser": "^7.14.8",
-        "@babel/types": "^7.14.8",
+        "@babel/code-frame": "^7.10.4",
+        "@babel/generator": "^7.10.5",
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.10.4",
+        "@babel/parser": "^7.10.5",
+        "@babel/types": "^7.10.5",
         "debug": "^4.1.0",
-        "globals": "^11.1.0"
+        "globals": "^11.1.0",
+        "lodash": "^4.17.19"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.4"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.10.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.5.tgz",
+          "integrity": "sha512-wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ==",
+          "dev": true
+        },
+        "lodash": {
+          "version": "4.17.19",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+          "dev": true
+        }
       }
     },
     "@babel/types": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz",
-      "integrity": "sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz",
+      "integrity": "sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.14.8",
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "lodash": "^4.17.19",
         "to-fast-properties": "^2.0.0"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.19",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+          "dev": true
+        }
       }
     },
     "@blockly/block-test": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/@blockly/block-test/-/block-test-1.1.5.tgz",
       "integrity": "sha512-lSDPuwOIEn8DLOzOLu/xNX6U4E4ps+9o5epxJ1JXxBjHqIBw7ghihHfsvuZ1c+rSsBnKGgwBzh5odq6ynIV2GQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@blockly/dev-tools": {
       "version": "2.6.1-beta.0",
@@ -12543,41 +241,36 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-2.0.6.tgz",
       "integrity": "sha512-2gPz3Iw+VjBFaNhoYXm/zRA2Xhe/nDnpOyPxbav7sGs4XcO4F0yPruuXxBm7oGGbGudmxmJXhTdmV+4d8MpvSg==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@blockly/theme-deuteranopia": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-1.0.7.tgz",
       "integrity": "sha512-m2Jo6lCYnVn3eLzmBoSBN31t2qQ8fAjEJmcUBcpJ56TGB1gks1vGVJHg/yhcK+vUB85IFuUUUJ6+MOjhEZFOvQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@blockly/theme-highcontrast": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-1.0.7.tgz",
       "integrity": "sha512-FI/LyP/gGCatpeKvKTLSyColgyHETKSFo5RrgbZ+GTgVAQxXAj7MQ4DZDtlWECOKaT6WGQLNk5OserBXMCtDbQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@blockly/theme-modern": {
-      "version": "2.1.24",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-modern/-/theme-modern-2.1.24.tgz",
-      "integrity": "sha512-glTi5qhHr+S87S1skWG8Sre+DYeSIBG3j+YBbwwRX9k3zYtGO+W7sOdJ9DsBJj8NVukPpV1RhQhu5rt93Pp2rw==",
-      "dev": true,
-      "requires": {}
+      "version": "2.1.19",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-modern/-/theme-modern-2.1.19.tgz",
+      "integrity": "sha512-a9+f1T01JR6CguQFAXnobnZ7bD41McdeShc/RWtF73T8hxvgeea3lCFV0YfGSxxoHPkidcNIR90fAsAnip8qZg==",
+      "dev": true
     },
     "@blockly/theme-tritanopia": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-1.0.7.tgz",
       "integrity": "sha512-Y6d8ZR3y9iz1GdihHbSYGTIwWEanWtp0tYPtsVx3QlcKMuc+NyAtGQVE324ZTA+N1ayH4L31CGRAAo7AAm3gPA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@eslint/eslintrc": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
-      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz",
+      "integrity": "sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
@@ -12592,19 +285,13 @@
       },
       "dependencies": {
         "globals": {
-          "version": "13.10.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz",
-          "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==",
+          "version": "13.9.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz",
+          "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==",
           "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
           }
-        },
-        "type-fest": {
-          "version": "0.20.2",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-          "dev": true
         }
       }
     },
@@ -12621,16 +308,10 @@
         "through2": "^3.0.1"
       },
       "dependencies": {
-        "acorn": {
-          "version": "6.4.2",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-          "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
           "dev": true
         },
         "through2": {
@@ -12655,15 +336,6 @@
         "through2": "^2.0.3"
       },
       "dependencies": {
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        },
         "through2": {
           "version": "2.0.5",
           "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
@@ -12676,23 +348,6 @@
         }
       }
     },
-    "@humanwhocodes/config-array": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
-      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
-      "dev": true,
-      "requires": {
-        "@humanwhocodes/object-schema": "^1.2.0",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
-      }
-    },
-    "@humanwhocodes/object-schema": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
-      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
-      "dev": true
-    },
     "@sindresorhus/is": {
       "version": "0.14.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
@@ -12744,15 +399,15 @@
       }
     },
     "@types/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.1.tgz",
+      "integrity": "sha512-S6oPal772qJZHoRZLFc/XoZW2gFvwXusYUmXPXkgxJLuEk2vOt7jc4Yo6z/vtI0EBkbPBVrJJ0B+prLIKiWqHg==",
       "dev": true
     },
     "@types/cacheable-request": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz",
-      "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz",
+      "integrity": "sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ==",
       "dev": true,
       "requires": {
         "@types/http-cache-semantics": "*",
@@ -12761,12 +416,11 @@
         "@types/responselike": "*"
       }
     },
-    "@types/ejs": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.0.tgz",
-      "integrity": "sha512-DCg+Ka+uDQ31lJ/UtEXVlaeV3d6t81gifaVWKJy4MYVVgvJttyX/viREy+If7fz+tK/gVxTGMtyrFPnm4gjrVA==",
-      "dev": true,
-      "peer": true
+    "@types/color-name": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
+      "dev": true
     },
     "@types/expect": {
       "version": "1.20.4",
@@ -12775,105 +429,47 @@
       "dev": true
     },
     "@types/fs-extra": {
-      "version": "9.0.12",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.12.tgz",
-      "integrity": "sha512-I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw==",
+      "version": "9.0.13",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz",
+      "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==",
       "dev": true,
       "requires": {
         "@types/node": "*"
       }
     },
     "@types/http-cache-semantics": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz",
+      "integrity": "sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==",
       "dev": true
     },
-    "@types/inquirer": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-7.3.3.tgz",
-      "integrity": "sha512-HhxyLejTHMfohAuhRun4csWigAMjXTmRyiJTU1Y/I1xmggikFMkOUoMQRlFm+zQcPEGHSs3io/0FAmNZf8EymQ==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@types/through": "*",
-        "rxjs": "^6.4.0"
-      }
-    },
     "@types/keyv": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.2.tgz",
-      "integrity": "sha512-/FvAK2p4jQOaJ6CGDHJTqZcUtbZe820qIeTg7o0Shg7drB4JHeL+V/dhSaly7NXx6u8eSee+r7coT+yuJEvDLg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz",
+      "integrity": "sha512-MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw==",
       "dev": true,
       "requires": {
         "@types/node": "*"
       }
     },
-    "@types/lodash": {
-      "version": "4.14.172",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.172.tgz",
-      "integrity": "sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw==",
-      "dev": true,
-      "peer": true
-    },
-    "@types/lodash.flattendeep": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/@types/lodash.flattendeep/-/lodash.flattendeep-4.4.6.tgz",
-      "integrity": "sha512-uLm2MaRVlqJSGsMK0RZpP5T3KqReq+9WbYDHCUhBhp98v56hMG/Yht52bsoTSui9xz2mUvQ9NfG3LrNGDL92Ng==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@types/lodash": "*"
-      }
-    },
-    "@types/lodash.pickby": {
-      "version": "4.6.6",
-      "resolved": "https://registry.npmjs.org/@types/lodash.pickby/-/lodash.pickby-4.6.6.tgz",
-      "integrity": "sha512-NFa13XxlMd9eFi0UFZFWIztpMpXhozbijrx3Yb1viYZphT7jyopIFVoIRF4eYMjruWNEG1rnyrRmg/8ej9T8Iw==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@types/lodash": "*"
-      }
-    },
-    "@types/lodash.union": {
-      "version": "4.6.6",
-      "resolved": "https://registry.npmjs.org/@types/lodash.union/-/lodash.union-4.6.6.tgz",
-      "integrity": "sha512-Wu0ZEVNcyCz8eAn6TlUbYWZoGbH9E+iOHxAZbwUoCEXdUiy6qpcz5o44mMXViM4vlPLLCPlkAubEP1gokoSZaw==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@types/lodash": "*"
-      }
-    },
     "@types/minimist": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
-      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
+      "integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
       "dev": true
     },
     "@types/node": {
-      "version": "16.4.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.4.1.tgz",
-      "integrity": "sha512-UW7cbLqf/Wu5XH2RKKY1cHwUNLicIDRLMraYKz+HHAerJ0ZffUEk+fMnd8qU2JaS6cAy0r8tsaf7yqHASf/Y0Q==",
+      "version": "14.14.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz",
+      "integrity": "sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ==",
       "dev": true
     },
     "@types/normalize-package-data": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
       "dev": true
     },
-    "@types/recursive-readdir": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@types/recursive-readdir/-/recursive-readdir-2.2.0.tgz",
-      "integrity": "sha512-HGk753KRu2N4mWduovY4BLjYq4jTOL29gV2OfGdGxHcPSWGFkC5RRIdk+VTs5XmYd7MVAD+JwKrcb5+5Y7FOCg==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
     "@types/responselike": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
@@ -12892,20 +488,10 @@
         "@types/node": "*"
       }
     },
-    "@types/through": {
-      "version": "0.0.30",
-      "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.30.tgz",
-      "integrity": "sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
     "@types/vinyl": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.5.tgz",
-      "integrity": "sha512-1m6uReH8R/RuLVQGvTT/4LlWq67jZEUxp+FBHt0hYv2BT7TUwFbKI0wa7JZVEU/XtlcnX1QcTuZ36es4rGj7jg==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.4.tgz",
+      "integrity": "sha512-2o6a2ixaVI2EbwBPg1QYLGQoHK56p/8X/sGfKbFC8N6sY9lfjsMf/GprtkQkSya0D4uRiutRZ2BWj7k3JvLsAQ==",
       "dev": true,
       "requires": {
         "@types/expect": "^1.20.4",
@@ -12919,9 +505,9 @@
       "dev": true
     },
     "@types/yauzl": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz",
-      "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==",
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz",
+      "integrity": "sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -12934,182 +520,131 @@
       "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
       "dev": true
     },
-    "@wdio/cli": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-7.11.0.tgz",
-      "integrity": "sha512-vhJftrdDNzY7AHwteouEuVp/zA0Fo4IaBdG9P+szh95p4POlGCcXxBZmpbEeYpsgo99tJRwaU/WcCCaVcPypCQ==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@types/ejs": "^3.0.5",
-        "@types/fs-extra": "^9.0.4",
-        "@types/inquirer": "^7.3.1",
-        "@types/lodash.flattendeep": "^4.4.6",
-        "@types/lodash.pickby": "^4.6.6",
-        "@types/lodash.union": "^4.6.6",
-        "@types/node": "^15.12.5",
-        "@types/recursive-readdir": "^2.2.0",
-        "@wdio/config": "7.10.1",
-        "@wdio/logger": "7.7.0",
-        "@wdio/types": "7.10.1",
-        "@wdio/utils": "7.11.0",
-        "async-exit-hook": "^2.0.1",
-        "chalk": "^4.0.0",
-        "chokidar": "^3.0.0",
-        "cli-spinners": "^2.1.0",
-        "ejs": "^3.0.1",
-        "fs-extra": "^10.0.0",
-        "inquirer": "^8.0.0",
-        "lodash.flattendeep": "^4.4.0",
-        "lodash.pickby": "^4.6.0",
-        "lodash.union": "^4.6.0",
-        "mkdirp": "^1.0.4",
-        "recursive-readdir": "^2.2.2",
-        "webdriverio": "7.11.0",
-        "yargs": "^17.0.0",
-        "yarn-install": "^1.0.0"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "15.14.9",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.9.tgz",
-          "integrity": "sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==",
-          "dev": true,
-          "peer": true
-        },
-        "webdriverio": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.11.0.tgz",
-          "integrity": "sha512-II28RBTi7+/W8e6li4qKsgS/KF3yE/r0Q3QHysylU+QTZnH3xIzMz0TRoo8bNyeBZiZuTqH6yuWi+kJ5m5FC/g==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "@types/aria-query": "^4.2.1",
-            "@types/node": "^15.12.5",
-            "@wdio/config": "7.10.1",
-            "@wdio/logger": "7.7.0",
-            "@wdio/protocols": "7.11.0",
-            "@wdio/repl": "7.11.0",
-            "@wdio/types": "7.10.1",
-            "@wdio/utils": "7.11.0",
-            "archiver": "^5.0.0",
-            "aria-query": "^4.2.2",
-            "atob": "^2.1.2",
-            "css-shorthand-properties": "^1.1.1",
-            "css-value": "^0.0.1",
-            "devtools": "7.11.0",
-            "devtools-protocol": "^0.0.915197",
-            "fs-extra": "^10.0.0",
-            "get-port": "^5.1.1",
-            "grapheme-splitter": "^1.0.2",
-            "lodash.clonedeep": "^4.5.0",
-            "lodash.isobject": "^3.0.2",
-            "lodash.isplainobject": "^4.0.6",
-            "lodash.zip": "^4.2.0",
-            "minimatch": "^3.0.4",
-            "puppeteer-core": "^10.1.0",
-            "query-selector-shadow-dom": "^1.0.0",
-            "resq": "^1.9.1",
-            "rgb2hex": "0.2.5",
-            "serialize-error": "^8.0.0",
-            "webdriver": "7.11.0"
-          }
-        },
-        "yargs": {
-          "version": "17.1.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz",
-          "integrity": "sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "cliui": "^7.0.2",
-            "escalade": "^3.1.1",
-            "get-caller-file": "^2.0.5",
-            "require-directory": "^2.1.1",
-            "string-width": "^4.2.0",
-            "y18n": "^5.0.5",
-            "yargs-parser": "^20.2.2"
-          }
-        }
-      }
-    },
     "@wdio/config": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.10.1.tgz",
-      "integrity": "sha512-EA+kJBNPeIxkkyilHcmiIwqjtOUcWx5FVp69kSBs4BN2fG+6CgpzoVecuTm/qPU6D0DT5KIfxVR4FRHCF99F/g==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.6.0.tgz",
+      "integrity": "sha512-SNm4qRU5dyvNBBvCu8q59wB3zBKNoKIMCktzA2I8kBq+QLyIcbda1rVuOvywUM+s7h9xVzet9eP5OaPK7VXkaA==",
       "dev": true,
       "requires": {
-        "@wdio/logger": "7.7.0",
-        "@wdio/types": "7.10.1",
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.6.0",
         "deepmerge": "^4.0.0",
         "glob": "^7.1.2"
       }
     },
     "@wdio/logger": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.7.0.tgz",
-      "integrity": "sha512-XX/OkC8NlvsBdhKsb9j7ZbuQtF/Vuo0xf38PXdqYtVezOrYbDuba0hPG++g/IGNuAF34ZbSi+49cvz4u5w92kQ==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "loglevel": "^1.6.0",
         "loglevel-plugin-prefix": "^0.8.4",
         "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "@wdio/protocols": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.11.0.tgz",
-      "integrity": "sha512-yWKmCUmbHB1AH0U3lebXRh/G3+JtsD9Tx9fevgP9qA7Hq+rHj7KqUf15k1lPPodhOms8ncPj0J6ET1E13wh2qg==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.5.3.tgz",
+      "integrity": "sha512-lpNaKwxYhDSL6neDtQQYXvzMAw+u4PXx65ryeMEX82mkARgzSZps5Kyrg9ub7X4T17K1NPfnY6UhZEWg6cKJCg==",
       "dev": true
     },
     "@wdio/repl": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.11.0.tgz",
-      "integrity": "sha512-2GtWkUqepQ0QGvdo7fLWiZklf/O4eh3AB4vcafwGVKQhE8bpSh0l8/fkXOzYU7oK/PBGHJyWXxPOVf+H5DAViA==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.6.0.tgz",
+      "integrity": "sha512-xaAs5HRi8oii+Zsf9FKQVQkMLSy6bQRSmWeCLGr04MlOwyQs8KM5FzzPpHlA+qBWgLr3ck1HdC7EiUqmLYYfIQ==",
       "dev": true,
       "requires": {
-        "@wdio/utils": "7.11.0"
+        "@wdio/utils": "7.6.0"
       }
     },
     "@wdio/selenium-standalone-service": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@wdio/selenium-standalone-service/-/selenium-standalone-service-7.10.1.tgz",
-      "integrity": "sha512-25J1iqNpEdqhnNe6B016Mm5+38F8WTfZ5eIRttjLSACdtsWtW2DGgMMeWvwunqNSzhfK8S6jDZ+s2nOvg+gD6A==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@wdio/selenium-standalone-service/-/selenium-standalone-service-7.13.0.tgz",
+      "integrity": "sha512-yQJ+LRLyaaySdDKdLUonAG3jc2StwSEPTk7q103M/Gu1vEVig4Y/iGVSPdPciBYgWpLc26IuEst730f3u+9cag==",
       "dev": true,
       "requires": {
         "@types/fs-extra": "^9.0.1",
         "@types/node": "^15.12.5",
         "@types/selenium-standalone": "^7.0.0",
-        "@wdio/config": "7.10.1",
+        "@wdio/config": "7.13.0",
         "@wdio/logger": "7.7.0",
-        "@wdio/types": "7.10.1",
+        "@wdio/types": "7.13.0",
         "fs-extra": "^10.0.0",
         "selenium-standalone": "^7.0.1"
       },
-      "dependencies": {
-        "@types/node": {
-          "version": "15.14.9",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.9.tgz",
-          "integrity": "sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==",
-          "dev": true
-        }
-      }
-    },
-    "@wdio/types": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.10.1.tgz",
-      "integrity": "sha512-wEDmdux2VCGO4wWVj7v9UbVRqQG7liHnDVPYJuQURPj3hJMiQQTIHwRi7EmwYfbJ9/mRoHBOGeZt7nSvtcjeaQ==",
-      "dev": true,
-      "requires": {
-        "@types/node": "^15.12.5",
-        "got": "^11.8.1"
-      },
       "dependencies": {
         "@sindresorhus/is": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz",
-          "integrity": "sha512-Qm9hBEBu18wt1PO2flE7LPb30BHMQt1eQgbV76YntdNk73XZGpn3izvGTYxbGgzXKgbCjiia0uxTd3aTNQrY/g==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.2.0.tgz",
+          "integrity": "sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw==",
           "dev": true
         },
         "@szmarczak/http-timer": {
@@ -13127,6 +662,49 @@
           "integrity": "sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==",
           "dev": true
         },
+        "@wdio/config": {
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.13.0.tgz",
+          "integrity": "sha512-FDOaGjlZ+FiTlJIWvze+Nc/UBICFcdVfqHC46Aav1MqRLpDbgOxFIWpbuOtMtMth6EJAYbJmnCuL6v7Ra/9ogQ==",
+          "dev": true,
+          "requires": {
+            "@wdio/logger": "7.7.0",
+            "@wdio/types": "7.13.0",
+            "deepmerge": "^4.0.0",
+            "glob": "^7.1.2"
+          }
+        },
+        "@wdio/logger": {
+          "version": "7.7.0",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.7.0.tgz",
+          "integrity": "sha512-XX/OkC8NlvsBdhKsb9j7ZbuQtF/Vuo0xf38PXdqYtVezOrYbDuba0hPG++g/IGNuAF34ZbSi+49cvz4u5w92kQ==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "@wdio/types": {
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.13.0.tgz",
+          "integrity": "sha512-rsfB2GoWX2lTeO4pFkaXqKBj1C5bCKjoDLoRqhm3GMZ6Shk2z24QJ+TtpNuuMAn9TqVKMO7xvdgHeiCfIkiNbg==",
+          "dev": true,
+          "requires": {
+            "@types/node": "^15.12.5",
+            "got": "^11.8.1"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "cacheable-request": {
           "version": "7.0.2",
           "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
@@ -13142,6 +720,185 @@
             "responselike": "^2.0.0"
           }
         },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "decompress-response": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+          "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+          "dev": true,
+          "requires": {
+            "mimic-response": "^3.1.0"
+          }
+        },
+        "defer-to-connect": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
+          "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
+          "dev": true
+        },
+        "get-stream": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "got": {
+          "version": "11.8.2",
+          "resolved": "https://registry.npmjs.org/got/-/got-11.8.2.tgz",
+          "integrity": "sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==",
+          "dev": true,
+          "requires": {
+            "@sindresorhus/is": "^4.0.0",
+            "@szmarczak/http-timer": "^4.0.5",
+            "@types/cacheable-request": "^6.0.1",
+            "@types/responselike": "^1.0.0",
+            "cacheable-lookup": "^5.0.3",
+            "cacheable-request": "^7.0.1",
+            "decompress-response": "^6.0.0",
+            "http2-wrapper": "^1.0.0-beta.5.2",
+            "lowercase-keys": "^2.0.0",
+            "p-cancelable": "^2.0.0",
+            "responselike": "^2.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "json-buffer": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+          "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+          "dev": true
+        },
+        "keyv": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz",
+          "integrity": "sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA==",
+          "dev": true,
+          "requires": {
+            "json-buffer": "3.0.1"
+          }
+        },
+        "lowercase-keys": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+          "dev": true
+        },
+        "mimic-response": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+          "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+          "dev": true
+        },
+        "normalize-url": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+          "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+          "dev": true
+        },
+        "p-cancelable": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
+          "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
+          "dev": true
+        },
+        "responselike": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz",
+          "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==",
+          "dev": true,
+          "requires": {
+            "lowercase-keys": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "@wdio/types": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.6.0.tgz",
+      "integrity": "sha512-BPPd7K6TpF4v1YaqUf+wDRwpys5asc7H7LDik4kHjLaGMwDfj+r0Goo3Z7xQn2fFdCuV99dkrI1N9vkgc2pDjA==",
+      "dev": true,
+      "requires": {
+        "@types/node": "^14.14.31",
+        "got": "^11.8.1"
+      },
+      "dependencies": {
+        "@sindresorhus/is": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz",
+          "integrity": "sha512-Qm9hBEBu18wt1PO2flE7LPb30BHMQt1eQgbV76YntdNk73XZGpn3izvGTYxbGgzXKgbCjiia0uxTd3aTNQrY/g==",
+          "dev": true
+        },
+        "@szmarczak/http-timer": {
+          "version": "4.0.5",
+          "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz",
+          "integrity": "sha512-PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ==",
+          "dev": true,
+          "requires": {
+            "defer-to-connect": "^2.0.0"
+          }
+        },
+        "@types/node": {
+          "version": "14.17.0",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.0.tgz",
+          "integrity": "sha512-w8VZUN/f7SSbvVReb9SWp6cJFevxb4/nkG65yLAya//98WgocKm5PLDAtSs5CtJJJM+kHmJjO/6mmYW4MHShZA==",
+          "dev": true
+        },
+        "cacheable-request": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.1.tgz",
+          "integrity": "sha512-lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw==",
+          "dev": true,
+          "requires": {
+            "clone-response": "^1.0.2",
+            "get-stream": "^5.1.0",
+            "http-cache-semantics": "^4.0.0",
+            "keyv": "^4.0.0",
+            "lowercase-keys": "^2.0.0",
+            "normalize-url": "^4.1.0",
+            "responselike": "^2.0.0"
+          }
+        },
         "decompress-response": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
@@ -13212,12 +969,6 @@
           "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
           "dev": true
         },
-        "normalize-url": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-          "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-          "dev": true
-        },
         "p-cancelable": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
@@ -13236,14 +987,13 @@
       }
     },
     "@wdio/utils": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.11.0.tgz",
-      "integrity": "sha512-0n5mZha2QktV0181nMhw+IQ8MgYrqyvVDjP20P7JEnl6hehSkyXTAYQcYuKaw5AAVqipV3Eh96JBi5CnhpsoKQ==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.6.0.tgz",
+      "integrity": "sha512-nfbQCAToX01pUCyojF2osVmg9grHWf3kGnK9gD65GG9lPXEs76T/ACYUfo+gRgeNBq8UTeZOoHSrXOtQrCoEbQ==",
       "dev": true,
       "requires": {
-        "@wdio/logger": "7.7.0",
-        "@wdio/types": "7.10.1",
-        "p-iteration": "^1.1.8"
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.6.0"
       }
     },
     "abab": {
@@ -13261,9 +1011,9 @@
       }
     },
     "acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+      "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="
     },
     "acorn-globals": {
       "version": "4.3.4",
@@ -13272,21 +1022,13 @@
       "requires": {
         "acorn": "^6.0.1",
         "acorn-walk": "^6.0.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "6.4.2",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-          "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="
-        }
       }
     },
     "acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "requires": {}
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
+      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
+      "dev": true
     },
     "acorn-walk": {
       "version": "6.2.0",
@@ -13311,22 +1053,22 @@
         "fast-json-stable-stringify": "^2.0.0",
         "json-schema-traverse": "^0.4.1",
         "uri-js": "^4.2.2"
+      },
+      "dependencies": {
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+        }
       }
     },
     "ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true
-    },
-    "ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
       "dev": true,
-      "peer": true,
       "requires": {
-        "type-fest": "^0.21.3"
+        "ansi-wrap": "^0.1.0"
       }
     },
     "ansi-gray": {
@@ -13339,18 +1081,18 @@
       }
     },
     "ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true
     },
     "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
       "requires": {
-        "color-convert": "^2.0.1"
+        "color-convert": "^1.9.0"
       }
     },
     "ansi-wrap": {
@@ -13360,13 +1102,13 @@
       "dev": true
     },
     "anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "dev": true,
       "requires": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
       }
     },
     "append-buffer": {
@@ -13393,12 +1135,6 @@
         "zip-stream": "^4.1.0"
       },
       "dependencies": {
-        "async": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
-          "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==",
-          "dev": true
-        },
         "readable-stream": {
           "version": "3.6.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -13409,6 +1145,19 @@
             "string_decoder": "^1.1.1",
             "util-deprecate": "^1.0.1"
           }
+        },
+        "tar-stream": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+          "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+          "dev": true,
+          "requires": {
+            "bl": "^4.0.3",
+            "end-of-stream": "^1.4.1",
+            "fs-constants": "^1.0.0",
+            "inherits": "^2.0.3",
+            "readable-stream": "^3.1.1"
+          }
         }
       }
     },
@@ -13428,6 +1177,14 @@
         "lodash.union": "^4.6.0",
         "normalize-path": "^3.0.0",
         "readable-stream": "^2.0.0"
+      },
+      "dependencies": {
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        }
       }
     },
     "archy": {
@@ -13558,6 +1315,14 @@
         "default-compare": "^1.0.0",
         "get-value": "^2.0.6",
         "kind-of": "^5.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
       }
     },
     "array-unique": {
@@ -13604,9 +1369,9 @@
       "dev": true
     },
     "async": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
+      "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==",
       "dev": true
     },
     "async-done": {
@@ -13627,13 +1392,6 @@
       "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
       "dev": true
     },
-    "async-exit-hook": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz",
-      "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==",
-      "dev": true,
-      "peer": true
-    },
     "async-settle": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
@@ -13676,6 +1434,14 @@
         "@babel/types": "^7.7.0",
         "eslint-visitor-keys": "^1.0.0",
         "resolve": "^1.12.0"
+      },
+      "dependencies": {
+        "@babel/parser": {
+          "version": "7.10.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.5.tgz",
+          "integrity": "sha512-wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ==",
+          "dev": true
+        }
       }
     },
     "bach": {
@@ -13696,9 +1462,9 @@
       }
     },
     "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
       "dev": true
     },
     "base": {
@@ -13724,13 +1490,42 @@
           "requires": {
             "is-descriptor": "^1.0.0"
           }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
         }
       }
     },
     "base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
       "dev": true
     },
     "basic-auth": {
@@ -13748,9 +1543,9 @@
       }
     },
     "binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
       "dev": true
     },
     "binaryextensions": {
@@ -13759,20 +1554,10 @@
       "integrity": "sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==",
       "dev": true
     },
-    "bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
     "bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz",
+      "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==",
       "dev": true,
       "requires": {
         "buffer": "^5.5.0",
@@ -13793,20 +1578,10 @@
         }
       }
     },
-    "blockly": {
-      "version": "6.20210701.0",
-      "resolved": "https://registry.npmjs.org/blockly/-/blockly-6.20210701.0.tgz",
-      "integrity": "sha512-cNrwFOAxXE5Pbs1FJAyLTlSRzpNW/C+0gPT2rGQDOJVVKcyF3vhFC1StgnxvQNsv//ueuksKWIXxDuSWh1VI4w==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "jsdom": "15.2.1"
-      }
-    },
     "bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "version": "3.5.5",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
+      "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
       "dev": true
     },
     "brace-expansion": {
@@ -13820,12 +1595,32 @@
       }
     },
     "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "dev": true,
       "requires": {
-        "fill-range": "^7.0.1"
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
       }
     },
     "browser-process-hrtime": {
@@ -13840,13 +1635,13 @@
       "dev": true
     },
     "buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.5.0.tgz",
+      "integrity": "sha512-9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww==",
       "dev": true,
       "requires": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4"
       }
     },
     "buffer-crc32": {
@@ -13873,179 +1668,6 @@
       "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=",
       "dev": true
     },
-    "cac": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/cac/-/cac-3.0.4.tgz",
-      "integrity": "sha1-bSTO7Dcu/lybeYgIvH9JtHJCpO8=",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "camelcase-keys": "^3.0.0",
-        "chalk": "^1.1.3",
-        "indent-string": "^3.0.0",
-        "minimist": "^1.2.0",
-        "read-pkg-up": "^1.0.1",
-        "suffix": "^0.1.0",
-        "text-table": "^0.2.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true,
-          "peer": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true,
-          "peer": true
-        },
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true,
-          "peer": true
-        },
-        "camelcase-keys": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-3.0.0.tgz",
-          "integrity": "sha1-/AxsNgNj9zd+N5O5oWvM8QcMHKQ=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "camelcase": "^3.0.0",
-            "map-obj": "^1.0.0"
-          }
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-          "dev": true,
-          "peer": true
-        },
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "hosted-git-info": {
-          "version": "2.8.9",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-          "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-          "dev": true,
-          "peer": true
-        },
-        "indent-string": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-          "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
-          "dev": true,
-          "peer": true
-        },
-        "map-obj": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-          "dev": true,
-          "peer": true
-        },
-        "normalize-package-data": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-          "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "hosted-git-info": "^2.1.4",
-            "resolve": "^1.10.0",
-            "semver": "2 || 3 || 4 || 5",
-            "validate-npm-package-license": "^3.0.1"
-          }
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "read-pkg": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "load-json-file": "^1.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^1.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-          "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "find-up": "^1.0.0",
-            "read-pkg": "^1.0.0"
-          }
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true,
-          "peer": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true,
-          "peer": true
-        }
-      }
-    },
     "cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
@@ -14064,9 +1686,9 @@
       }
     },
     "cacheable-lookup": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
-      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.3.tgz",
+      "integrity": "sha512-W+JBqF9SWe18A72XFzN/V/CULFzPm7sBXzzR6ekkE+3tLG72wFZrBiBZhrZuDoYexop4PHJVdFAKb/Nj9+tm9w==",
       "dev": true
     },
     "cacheable-request": {
@@ -14101,16 +1723,6 @@
         }
       }
     },
-    "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      }
-    },
     "callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -14132,6 +1744,14 @@
         "camelcase": "^5.3.1",
         "map-obj": "^4.0.0",
         "quick-lru": "^4.0.1"
+      },
+      "dependencies": {
+        "quick-lru": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
+          "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+          "dev": true
+        }
       }
     },
     "caseless": {
@@ -14140,12 +1760,12 @@
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "catharsis": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz",
-      "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==",
+      "version": "0.8.11",
+      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.11.tgz",
+      "integrity": "sha512-a+xUyMV7hD1BrDQA/3iPV7oc+6W26BgVJO05PGEoatMyIuPScQKsde6i3YorWX1qs+AZjnJ18NqdKoCtKiNh1g==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.15"
+        "lodash": "^4.17.14"
       }
     },
     "chai": {
@@ -14163,22 +1783,27 @@
       }
     },
     "chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
       "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "dependencies": {
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
-    "chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true,
-      "peer": true
-    },
     "check-error": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
@@ -14186,19 +1811,31 @@
       "dev": true
     },
     "chokidar": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
       "dev": true,
       "requires": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "fsevents": "~2.3.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "fsevents": "^1.2.7",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
+      },
+      "dependencies": {
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        }
       }
     },
     "chownr": {
@@ -14208,15 +1845,28 @@
       "dev": true
     },
     "chrome-launcher": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.14.0.tgz",
-      "integrity": "sha512-W//HpflaW6qBGrmuskup7g+XJZN6w03ko9QSIe5CtcTal2u0up5SeReK3Ll1Why4Ey8dPkv8XSodZyHPnGbVHQ==",
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.4.tgz",
+      "integrity": "sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A==",
       "dev": true,
       "requires": {
         "@types/node": "*",
-        "escape-string-regexp": "^4.0.0",
+        "escape-string-regexp": "^1.0.5",
         "is-wsl": "^2.2.0",
-        "lighthouse-logger": "^1.0.0"
+        "lighthouse-logger": "^1.0.0",
+        "mkdirp": "^0.5.3",
+        "rimraf": "^3.0.2"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        }
       }
     },
     "clang-format": {
@@ -14228,6 +1878,14 @@
         "async": "^1.5.2",
         "glob": "^7.0.0",
         "resolve": "^1.1.6"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        }
       }
     },
     "class-utils": {
@@ -14250,95 +1908,9 @@
           "requires": {
             "is-descriptor": "^0.1.0"
           }
-        },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
         }
       }
     },
-    "cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "restore-cursor": "^3.1.0"
-      }
-    },
-    "cli-spinners": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz",
-      "integrity": "sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==",
-      "dev": true,
-      "peer": true
-    },
-    "cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-      "dev": true,
-      "peer": true
-    },
-    "cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dev": true,
-      "requires": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
     "clone": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
@@ -14405,18 +1977,18 @@
       }
     },
     "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
       "requires": {
-        "color-name": "~1.1.4"
+        "color-name": "1.1.3"
       }
     },
     "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
     },
     "color-support": {
@@ -14452,17 +2024,23 @@
       "dev": true
     },
     "compress-commons": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.1.tgz",
-      "integrity": "sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.0.tgz",
+      "integrity": "sha512-ofaaLqfraD1YRTkrRKPCrGJ1pFeDG/MVCkVVV2FNGeWquSlqw5wOrwOfPQ1xF2u+blpeWASie5EubHz+vsNIgA==",
       "dev": true,
       "requires": {
         "buffer-crc32": "^0.2.13",
-        "crc32-stream": "^4.0.2",
+        "crc32-stream": "^4.0.1",
         "normalize-path": "^3.0.0",
         "readable-stream": "^3.6.0"
       },
       "dependencies": {
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        },
         "readable-stream": {
           "version": "3.6.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -14501,20 +2079,12 @@
       "dev": true,
       "requires": {
         "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
       }
     },
     "concurrently": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-6.2.1.tgz",
-      "integrity": "sha512-emgwhH+ezkuYKSHZQ+AkgEpoUZZlbpPVYCVv7YZx0r+T7fny1H03r2nYRebpi2DudHR4n1Rgbo2YTxKOxVJ4+g==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-6.2.0.tgz",
+      "integrity": "sha512-v9I4Y3wFoXCSY2L73yYgwA9ESrQMpRn80jMcqMgHx720Hecz2GZAvTI6bREVST6lkddNypDKRN22qhK0X8Y00g==",
       "dev": true,
       "requires": {
         "chalk": "^4.1.0",
@@ -14528,6 +2098,63 @@
         "yargs": "^16.2.0"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "7.2.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        },
         "supports-color": {
           "version": "8.1.1",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -14540,12 +2167,20 @@
       }
     },
     "convert-source-map": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
+      "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
       "dev": true,
       "requires": {
         "safe-buffer": "~5.1.1"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        }
       }
     },
     "copy-descriptor": {
@@ -14555,19 +2190,19 @@
       "dev": true
     },
     "copy-props": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz",
-      "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
+      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
       "dev": true,
       "requires": {
-        "each-props": "^1.3.2",
-        "is-plain-object": "^5.0.0"
+        "each-props": "^1.3.0",
+        "is-plain-object": "^2.0.1"
       }
     },
     "core-js-pure": {
-      "version": "3.15.2",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.15.2.tgz",
-      "integrity": "sha512-D42L7RYh1J2grW8ttxoY1+17Y4wXZeKe7uyplAI3FkNQyI5OgBIAjUfFiTPfL1rs0qLpxaabITNbjKl1Sp82tA==",
+      "version": "3.12.1",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.12.1.tgz",
+      "integrity": "sha512-1cch+qads4JnDSWsvc7d6nzlKAippwjUlf6vykkTLW53VSV+NkE6muGBToAjEA8pG90cSfcud3JgVmW2ds5TaQ==",
       "dev": true
     },
     "core-util-is": {
@@ -14623,6 +2258,17 @@
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
         "which": "^2.0.1"
+      },
+      "dependencies": {
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
       }
     },
     "css": {
@@ -14636,11 +2282,15 @@
         "source-map-resolve": "^0.6.0"
       },
       "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
+        "source-map-resolve": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
+          "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
+          "dev": true,
+          "requires": {
+            "atob": "^2.1.2",
+            "decode-uri-component": "^0.2.0"
+          }
         }
       }
     },
@@ -14717,12 +2367,12 @@
       "dev": true
     },
     "debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
       "dev": true,
       "requires": {
-        "ms": "2.1.2"
+        "ms": "^2.1.1"
       }
     },
     "debug-fabulous": {
@@ -14737,9 +2387,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
@@ -14819,6 +2469,14 @@
       "dev": true,
       "requires": {
         "kind-of": "^5.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
       }
     },
     "default-resolution": {
@@ -14827,25 +2485,6 @@
       "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
       "dev": true
     },
-    "defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "clone": "^1.0.2"
-      },
-      "dependencies": {
-        "clone": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-          "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-          "dev": true,
-          "peer": true
-        }
-      }
-    },
     "defer-to-connect": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
@@ -14869,6 +2508,37 @@
       "requires": {
         "is-descriptor": "^1.0.2",
         "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
       }
     },
     "delayed-stream": {
@@ -14889,29 +2559,29 @@
       "dev": true
     },
     "devtools": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.11.0.tgz",
-      "integrity": "sha512-V3mIskCVv+OrqgJf9EU4bvoOrEx+qQ+sNoyLxqzxkFgh0wwtYIhcMiqDluL8dBKlhToV16UsYDKoqa67ylNwOg==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.6.0.tgz",
+      "integrity": "sha512-N7A9rHlkeo8cQEgOpFjOmUQfIReERFe/nNU7CY7T1HO8JI2f57dzRzqq0jDlM4VtX4Y0/vQtkVzknZ9O1Ff3UA==",
       "dev": true,
       "requires": {
-        "@types/node": "^15.12.5",
-        "@wdio/config": "7.10.1",
-        "@wdio/logger": "7.7.0",
-        "@wdio/protocols": "7.11.0",
-        "@wdio/types": "7.10.1",
-        "@wdio/utils": "7.11.0",
-        "chrome-launcher": "^0.14.0",
+        "@types/node": "^14.14.31",
+        "@wdio/config": "7.6.0",
+        "@wdio/logger": "7.5.3",
+        "@wdio/protocols": "7.5.3",
+        "@wdio/types": "7.6.0",
+        "@wdio/utils": "7.6.0",
+        "chrome-launcher": "^0.13.1",
         "edge-paths": "^2.1.0",
-        "puppeteer-core": "^10.1.0",
+        "puppeteer-core": "^9.1.0",
         "query-selector-shadow-dom": "^1.0.0",
         "ua-parser-js": "^0.7.21",
         "uuid": "^8.0.0"
       },
       "dependencies": {
         "@types/node": {
-          "version": "15.14.9",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.9.tgz",
-          "integrity": "sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==",
+          "version": "14.17.0",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.0.tgz",
+          "integrity": "sha512-w8VZUN/f7SSbvVReb9SWp6cJFevxb4/nkG65yLAya//98WgocKm5PLDAtSs5CtJJJM+kHmJjO/6mmYW4MHShZA==",
           "dev": true
         },
         "uuid": {
@@ -14923,15 +2593,15 @@
       }
     },
     "devtools-protocol": {
-      "version": "0.0.915197",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.915197.tgz",
-      "integrity": "sha512-JXt4akUoL62CtxKLQBxcJlI7gsCZyAQ1Qb/0MZJOz8VETazoJB6+IjUwTkECrvye9AnNLDQyyV00kz/vWXVifQ==",
+      "version": "0.0.882987",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.882987.tgz",
+      "integrity": "sha512-BXKWVSagixwFcGy+cHh6TEBL39f9hgDsVREAq+KaEaQy8Vn4a7Xhj70ClvZL9+S5M7U4800F9CSjUsAzkgsuRg==",
       "dev": true
     },
     "diff": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
       "dev": true
     },
     "doctrine": {
@@ -14977,17 +2647,6 @@
       "requires": {
         "is-plain-object": "^2.0.1",
         "object.defaults": "^1.1.0"
-      },
-      "dependencies": {
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        }
       }
     },
     "ecc-jsbn": {
@@ -15007,16 +2666,17 @@
       "requires": {
         "@types/which": "^1.3.2",
         "which": "^2.0.2"
-      }
-    },
-    "ejs": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz",
-      "integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "jake": "^10.6.1"
+      },
+      "dependencies": {
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
       }
     },
     "emoji-regex": {
@@ -15026,9 +2686,9 @@
       "dev": true
     },
     "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.2.tgz",
+      "integrity": "sha512-gUSUszrsxlDnUbUwEI9Oygyrk4ZEWtVaHQc+uZHphVeNxl+qeqMV/jDWoTkjN1RmGlZ5QWAP7o458p/JMlikQg==",
       "dev": true,
       "requires": {
         "once": "^1.4.0"
@@ -15041,14 +2701,16 @@
       "dev": true,
       "requires": {
         "ansi-colors": "^4.1.1"
+      },
+      "dependencies": {
+        "ansi-colors": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+          "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+          "dev": true
+        }
       }
     },
-    "entities": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
-      "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
-      "dev": true
-    },
     "error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -15059,22 +2721,14 @@
       }
     },
     "es5-ext": {
-      "version": "0.10.53",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
+      "version": "0.10.51",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz",
+      "integrity": "sha512-oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==",
       "dev": true,
       "requires": {
         "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.3",
-        "next-tick": "~1.0.0"
-      },
-      "dependencies": {
-        "next-tick": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-          "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-          "dev": true
-        }
+        "es6-symbol": "~3.1.1",
+        "next-tick": "^1.0.0"
       }
     },
     "es6-iterator": {
@@ -15089,13 +2743,13 @@
       }
     },
     "es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz",
+      "integrity": "sha512-/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==",
       "dev": true,
       "requires": {
         "d": "^1.0.1",
-        "ext": "^1.1.2"
+        "es5-ext": "^0.10.51"
       }
     },
     "es6-weak-map": {
@@ -15117,75 +2771,31 @@
       "dev": true
     },
     "escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
       "dev": true
     },
     "escodegen": {
-      "version": "1.14.3",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
-      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz",
+      "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==",
       "requires": {
-        "esprima": "^4.0.1",
+        "esprima": "^3.1.3",
         "estraverse": "^4.2.0",
         "esutils": "^2.0.2",
         "optionator": "^0.8.1",
         "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "levn": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-          "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-          "requires": {
-            "prelude-ls": "~1.1.2",
-            "type-check": "~0.3.2"
-          }
-        },
-        "optionator": {
-          "version": "0.8.3",
-          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-          "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-          "requires": {
-            "deep-is": "~0.1.3",
-            "fast-levenshtein": "~2.0.6",
-            "levn": "~0.3.0",
-            "prelude-ls": "~1.1.2",
-            "type-check": "~0.3.2",
-            "word-wrap": "~1.2.3"
-          }
-        },
-        "prelude-ls": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-          "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "optional": true
-        },
-        "type-check": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-          "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-          "requires": {
-            "prelude-ls": "~1.1.2"
-          }
-        }
       }
     },
     "eslint": {
-      "version": "7.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
-      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.29.0.tgz",
+      "integrity": "sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.3",
-        "@humanwhocodes/config-array": "^0.5.0",
+        "@eslint/eslintrc": "^0.4.2",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -15234,26 +2844,200 @@
             "@babel/highlight": "^7.10.4"
           }
         },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz",
+          "integrity": "sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.14.5",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
+          "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.5",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          },
+          "dependencies": {
+            "chalk": {
+              "version": "2.4.2",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+              "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+              "dev": true,
+              "requires": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+              }
+            },
+            "escape-string-regexp": {
+              "version": "1.0.5",
+              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+              "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+              "dev": true
+            }
+          }
+        },
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          },
+          "dependencies": {
+            "ansi-styles": {
+              "version": "4.3.0",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+              "dev": true,
+              "requires": {
+                "color-convert": "^2.0.1"
+              }
+            },
+            "has-flag": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+              "dev": true
+            },
+            "supports-color": {
+              "version": "7.2.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
+        },
         "eslint-visitor-keys": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
           "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
           "dev": true
         },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+          "dev": true
+        },
+        "glob-parent": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        },
         "globals": {
-          "version": "13.10.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz",
-          "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==",
+          "version": "13.9.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz",
+          "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==",
           "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
           }
         },
-        "type-fest": {
-          "version": "0.20.2",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+        "levn": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+          "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+          "dev": true,
+          "requires": {
+            "prelude-ls": "^1.2.1",
+            "type-check": "~0.4.0"
+          }
+        },
+        "optionator": {
+          "version": "0.9.1",
+          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+          "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+          "dev": true,
+          "requires": {
+            "deep-is": "^0.1.3",
+            "fast-levenshtein": "^2.0.6",
+            "levn": "^0.4.1",
+            "prelude-ls": "^1.2.1",
+            "type-check": "^0.4.0",
+            "word-wrap": "^1.2.3"
+          }
+        },
+        "prelude-ls": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+          "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
           "dev": true
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
+        "type-check": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+          "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+          "dev": true,
+          "requires": {
+            "prelude-ls": "^1.2.1"
+          }
         }
       }
     },
@@ -15277,9 +3061,9 @@
       }
     },
     "eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
+      "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
       "dev": true
     },
     "espree": {
@@ -15291,12 +3075,26 @@
         "acorn": "^7.4.0",
         "acorn-jsx": "^5.3.1",
         "eslint-visitor-keys": "^1.3.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "7.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+          "dev": true
+        },
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
+        }
       }
     },
     "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+      "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM="
     },
     "esquery": {
       "version": "1.4.0",
@@ -15412,63 +3210,6 @@
             "is-extendable": "^0.1.0"
           }
         },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -15486,23 +3227,6 @@
         "homedir-polyfill": "^1.0.1"
       }
     },
-    "ext": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
-      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
-      "dev": true,
-      "requires": {
-        "type": "^2.0.0"
-      },
-      "dependencies": {
-        "type": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
-          "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==",
-          "dev": true
-        }
-      }
-    },
     "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -15516,18 +3240,17 @@
       "requires": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
-      }
-    },
-    "external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
       }
     },
     "extglob": {
@@ -15564,11 +3287,34 @@
             "is-extendable": "^0.1.0"
           }
         },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
         }
       }
     },
@@ -15613,14 +3359,15 @@
       }
     },
     "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "dev": true
     },
     "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
     },
     "fast-levenshtein": {
       "version": "2.0.6",
@@ -15636,25 +3383,6 @@
         "pend": "~1.2.0"
       }
     },
-    "figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "dependencies": {
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-          "dev": true,
-          "peer": true
-        }
-      }
-    },
     "file-entry-cache": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -15664,39 +3392,36 @@
         "flat-cache": "^3.0.4"
       }
     },
-    "file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "dev": true,
-      "optional": true
-    },
-    "filelist": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz",
-      "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "minimatch": "^3.0.4"
-      }
-    },
     "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "dev": true,
       "requires": {
-        "to-regex-range": "^5.0.1"
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
       }
     },
     "find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dev": true,
       "requires": {
-        "locate-path": "^6.0.0",
+        "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
       }
     },
@@ -15723,17 +3448,6 @@
         "object.defaults": "^1.1.0",
         "object.pick": "^1.2.0",
         "parse-filepath": "^1.0.1"
-      },
-      "dependencies": {
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        }
       }
     },
     "flagged-respawn": {
@@ -15759,9 +3473,9 @@
       }
     },
     "flatted": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.1.tgz",
-      "integrity": "sha512-OMQjaErSFHmHqZe+PSidH5n8j3O0F2DdnVh8JB4j4eUQ2k6KvB0qGfrKIhapvez5JerBbmWkaLYUYWISaESoXg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
+      "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
       "dev": true
     },
     "flush-write-stream": {
@@ -15775,9 +3489,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
-      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
+      "version": "1.14.4",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
+      "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==",
       "dev": true
     },
     "for-in": {
@@ -15865,11 +3579,552 @@
       "dev": true
     },
     "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "requires": {
+        "nan": "^2.12.1",
+        "node-pre-gyp": "^0.12.0"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aproba": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
+          }
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "balanced-match": "^1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "chownr": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "debug": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "deep-extend": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "fs-minipass": {
+          "version": "1.2.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "iconv-lite": {
+          "version": "0.4.24",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
+        "ignore-walk": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minimatch": "^3.0.4"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "once": "^1.3.0",
+            "wrappy": "1"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ini": {
+          "version": "1.3.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "minipass": {
+          "version": "2.3.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.0"
+          }
+        },
+        "minizlib": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "needle": {
+          "version": "2.3.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "^4.1.0",
+            "iconv-lite": "^0.4.4",
+            "sax": "^1.2.4"
+          }
+        },
+        "node-pre-gyp": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "^1.0.2",
+            "mkdirp": "^0.5.1",
+            "needle": "^2.2.1",
+            "nopt": "^4.0.1",
+            "npm-packlist": "^1.1.6",
+            "npmlog": "^4.0.2",
+            "rc": "^1.2.7",
+            "rimraf": "^2.6.1",
+            "semver": "^5.3.0",
+            "tar": "^4"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1",
+            "osenv": "^0.1.4"
+          }
+        },
+        "npm-bundled": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "npm-packlist": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ignore-walk": "^3.0.1",
+            "npm-bundled": "^1.0.1"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "wrappy": "1"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "^0.6.0",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sax": {
+          "version": "1.2.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "semver": {
+          "version": "5.7.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "4.4.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chownr": "^1.1.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.3.4",
+            "minizlib": "^1.1.1",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.2"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "wide-align": {
+          "version": "1.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "^1.0.2 || 2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "yallist": {
+          "version": "3.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        }
+      }
     },
     "function-bind": {
       "version": "1.1.1",
@@ -15884,9 +4139,9 @@
       "dev": true
     },
     "gaxios": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.3.0.tgz",
-      "integrity": "sha512-pHplNbslpwCLMyII/lHPWFQbJWOX0B3R1hwBEOvzYi1GmdKZruuEHK4N9V6f7tf1EaPYyF80mui1+344p6SmLg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.2.0.tgz",
+      "integrity": "sha512-Ms7fNifGv0XVU+6eIyL9LB7RVESeML9+cMvkwGS70xyD6w2Z80wl6RiqiJ9k1KFlJCUTQqFFc8tXmPQfSKUe8g==",
       "dev": true,
       "requires": {
         "abort-controller": "^3.0.0",
@@ -15894,12 +4149,20 @@
         "https-proxy-agent": "^5.0.0",
         "is-stream": "^2.0.0",
         "node-fetch": "^2.3.0"
+      },
+      "dependencies": {
+        "is-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+          "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+          "dev": true
+        }
       }
     },
     "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
       "dev": true
     },
     "get-func-name": {
@@ -15908,17 +4171,6 @@
       "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
       "dev": true
     },
-    "get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      }
-    },
     "get-port": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz",
@@ -15949,9 +4201,9 @@
       }
     },
     "glob": {
-      "version": "7.1.7",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+      "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
       "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
@@ -15963,12 +4215,24 @@
       }
     },
     "glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
       "dev": true,
       "requires": {
-        "is-glob": "^4.0.1"
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      },
+      "dependencies": {
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.0"
+          }
+        }
       }
     },
     "glob-stream": {
@@ -15987,33 +4251,12 @@
         "remove-trailing-separator": "^1.0.1",
         "to-absolute-glob": "^2.0.0",
         "unique-stream": "^2.0.2"
-      },
-      "dependencies": {
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          }
-        },
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.0"
-          }
-        }
       }
     },
     "glob-watcher": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz",
-      "integrity": "sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz",
+      "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==",
       "dev": true,
       "requires": {
         "anymatch": "^2.0.0",
@@ -16021,164 +4264,7 @@
         "chokidar": "^2.0.0",
         "is-negated-glob": "^1.0.0",
         "just-debounce": "^1.0.0",
-        "normalize-path": "^3.0.0",
         "object.defaults": "^1.1.0"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          },
-          "dependencies": {
-            "normalize-path": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-              "dev": true,
-              "requires": {
-                "remove-trailing-separator": "^1.0.1"
-              }
-            }
-          }
-        },
-        "binary-extensions": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          }
-        },
-        "chokidar": {
-          "version": "2.1.8",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.3",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^3.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.2.1",
-            "upath": "^1.1.1"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          }
-        },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "is-binary-path": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-          "dev": true,
-          "requires": {
-            "binary-extensions": "^1.0.0"
-          }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
-        "readdirp": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "micromatch": "^3.1.10",
-            "readable-stream": "^2.0.2"
-          }
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
       }
     },
     "global-modules": {
@@ -16203,17 +4289,6 @@
         "ini": "^1.3.4",
         "is-windows": "^1.0.1",
         "which": "^1.2.14"
-      },
-      "dependencies": {
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
       }
     },
     "globals": {
@@ -16245,64 +4320,6 @@
         "minimist": "1.x",
         "vinyl": "2.x",
         "vinyl-sourcemaps-apply": "^0.2.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "google-closure-compiler-java": {
@@ -16362,9 +4379,9 @@
       }
     },
     "graceful-fs": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+      "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
       "dev": true
     },
     "grapheme-splitter": {
@@ -16389,43 +4406,8 @@
         "gulp-cli": "^2.2.0",
         "undertaker": "^1.2.1",
         "vinyl-fs": "^3.0.0"
-      }
-    },
-    "gulp-cli": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
-      "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^1.0.1",
-        "archy": "^1.0.0",
-        "array-sort": "^1.0.0",
-        "color-support": "^1.1.3",
-        "concat-stream": "^1.6.0",
-        "copy-props": "^2.0.1",
-        "fancy-log": "^1.3.2",
-        "gulplog": "^1.0.0",
-        "interpret": "^1.4.0",
-        "isobject": "^3.0.1",
-        "liftoff": "^3.1.0",
-        "matchdep": "^2.0.0",
-        "mute-stdout": "^1.0.0",
-        "pretty-hrtime": "^1.0.0",
-        "replace-homedir": "^1.0.0",
-        "semver-greatest-satisfied-range": "^1.1.0",
-        "v8flags": "^3.2.0",
-        "yargs": "^7.1.0"
       },
       "dependencies": {
-        "ansi-colors": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-          "dev": true,
-          "requires": {
-            "ansi-wrap": "^0.1.0"
-          }
-        },
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
@@ -16449,26 +4431,36 @@
             "wrap-ansi": "^2.0.0"
           }
         },
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+        "gulp-cli": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.2.0.tgz",
+          "integrity": "sha512-rGs3bVYHdyJpLqR0TUBnlcZ1O5O++Zs4bA0ajm+zr3WFCfiSLjGwoCBqFs18wzN+ZxahT9DkOK5nDf26iDsWjA==",
           "dev": true,
           "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "ansi-colors": "^1.0.1",
+            "archy": "^1.0.0",
+            "array-sort": "^1.0.0",
+            "color-support": "^1.1.3",
+            "concat-stream": "^1.6.0",
+            "copy-props": "^2.0.1",
+            "fancy-log": "^1.3.2",
+            "gulplog": "^1.0.0",
+            "interpret": "^1.1.0",
+            "isobject": "^3.0.1",
+            "liftoff": "^3.1.0",
+            "matchdep": "^2.0.0",
+            "mute-stdout": "^1.0.0",
+            "pretty-hrtime": "^1.0.0",
+            "replace-homedir": "^1.0.0",
+            "semver-greatest-satisfied-range": "^1.1.0",
+            "v8flags": "^3.0.1",
+            "yargs": "^7.1.0"
           }
         },
-        "get-caller-file": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-          "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-          "dev": true
-        },
-        "hosted-git-info": {
-          "version": "2.8.9",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-          "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+        "invert-kv": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+          "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
           "dev": true
         },
         "is-fullwidth-code-point": {
@@ -16480,54 +4472,24 @@
             "number-is-nan": "^1.0.0"
           }
         },
-        "normalize-package-data": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-          "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+        "lcid": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+          "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
           "dev": true,
           "requires": {
-            "hosted-git-info": "^2.1.4",
-            "resolve": "^1.10.0",
-            "semver": "2 || 3 || 4 || 5",
-            "validate-npm-package-license": "^3.0.1"
+            "invert-kv": "^1.0.0"
           }
         },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+        "os-locale": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+          "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
           "dev": true,
           "requires": {
-            "pinkie-promise": "^2.0.0"
+            "lcid": "^1.0.0"
           }
         },
-        "read-pkg": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-          "dev": true,
-          "requires": {
-            "load-json-file": "^1.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^1.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-          "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-          "dev": true,
-          "requires": {
-            "find-up": "^1.0.0",
-            "read-pkg": "^1.0.0"
-          }
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        },
         "string-width": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -16548,26 +4510,22 @@
             "ansi-regex": "^2.0.0"
           }
         },
-        "wrap-ansi": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-          "dev": true,
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
-          }
+        "which-module": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+          "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+          "dev": true
         },
         "y18n": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
-          "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
           "dev": true
         },
         "yargs": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz",
-          "integrity": "sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==",
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+          "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
           "dev": true,
           "requires": {
             "camelcase": "^3.0.0",
@@ -16582,17 +4540,16 @@
             "string-width": "^1.0.2",
             "which-module": "^1.0.0",
             "y18n": "^3.2.1",
-            "yargs-parser": "^5.0.1"
+            "yargs-parser": "^5.0.0"
           }
         },
         "yargs-parser": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz",
-          "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
+          "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
           "dev": true,
           "requires": {
-            "camelcase": "^3.0.0",
-            "object.assign": "^4.1.0"
+            "camelcase": "^3.0.0"
           }
         }
       }
@@ -16676,9 +4633,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "14.17.5",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.5.tgz",
-          "integrity": "sha512-bjqH2cX/O33jXT/UmReo2pM7DIJREPMnarixbQ57DOOzzFaI6D2+IcwaJQaJpv0M1E9TIhPCYVxrkcityLjlqA==",
+          "version": "14.14.44",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.44.tgz",
+          "integrity": "sha512-+gaugz6Oce6ZInfI/tK4Pq5wIIkJMEJUu92RB3Eu93mtj4wjjjz9EB5mLp5s1pSsLXdC/CPut/xF20ZzAQJbTA==",
           "dev": true
         }
       }
@@ -16703,6 +4660,16 @@
         "tslib": "^1.10.0"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "dev": true,
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
         "chalk": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
@@ -16713,6 +4680,36 @@
             "supports-color": "^7.1.0"
           }
         },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
         "through2": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
@@ -16744,18 +4741,6 @@
         "through2": "^2.0.0"
       },
       "dependencies": {
-        "acorn": {
-          "version": "6.4.2",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-          "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
         "through2": {
           "version": "2.0.5",
           "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
@@ -16829,35 +4814,16 @@
         "function-bind": "^1.1.1"
       }
     },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true,
-          "peer": true
-        }
-      }
-    },
     "has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true
     },
     "has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
       "dev": true
     },
     "has-value": {
@@ -16908,13 +4874,10 @@
       }
     },
     "hosted-git-info": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-      "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
-      "dev": true,
-      "requires": {
-        "lru-cache": "^6.0.0"
-      }
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz",
+      "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==",
+      "dev": true
     },
     "html-encoding-sniffer": {
       "version": "1.0.2",
@@ -16972,21 +4935,13 @@
       }
     },
     "http2-wrapper": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
-      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
+      "version": "1.0.0-beta.5.2",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.0-beta.5.2.tgz",
+      "integrity": "sha512-xYz9goEyBnC8XwXDTuC/MZ6t+MrKVQZOk4s7+PaDkwIsQd8IwqvM+0M6bA/2lvG8GHXcPdf+MejTUeO2LCPCeQ==",
       "dev": true,
       "requires": {
         "quick-lru": "^5.1.1",
         "resolve-alpn": "^1.0.0"
-      },
-      "dependencies": {
-        "quick-lru": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-          "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-          "dev": true
-        }
       }
     },
     "https-proxy-agent": {
@@ -17008,9 +4963,9 @@
       }
     },
     "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
       "dev": true
     },
     "ignore": {
@@ -17063,58 +5018,10 @@
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
       "dev": true
     },
-    "inquirer": {
-      "version": "8.1.2",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.1.2.tgz",
-      "integrity": "sha512-DHLKJwLPNgkfwNmsuEUKSejJFbkv0FMO9SMiQbjI3n5NQuCrSIBqP66ggqyz2a6t2qEolKrMjhQ3+W/xXgUQ+Q==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.1",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.21",
-        "mute-stream": "0.0.8",
-        "ora": "^5.3.0",
-        "run-async": "^2.4.0",
-        "rxjs": "^7.2.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "dependencies": {
-        "rxjs": {
-          "version": "7.3.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.3.0.tgz",
-          "integrity": "sha512-p2yuGIg9S1epc3vrjKf6iVb3RCaAYjYskkO+jHIaV0IjOPlJop4UnodOoFb2xeNwlguqLYvGw1b1McillYb5Gw==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "tslib": "~2.1.0"
-          }
-        },
-        "tslib": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
-          "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==",
-          "dev": true,
-          "peer": true
-        }
-      }
-    },
     "interpret": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-      "dev": true
-    },
-    "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
+      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
       "dev": true
     },
     "ip-regex": {
@@ -17133,19 +5040,22 @@
       }
     },
     "is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "dev": true,
       "requires": {
-        "kind-of": "^6.0.0"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
         }
       }
     },
@@ -17156,12 +5066,12 @@
       "dev": true
     },
     "is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
       "dev": true,
       "requires": {
-        "binary-extensions": "^2.0.0"
+        "binary-extensions": "^1.0.0"
       }
     },
     "is-buffer": {
@@ -17171,46 +5081,49 @@
       "dev": true
     },
     "is-core-module": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz",
-      "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
+      "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
       "dev": true,
       "requires": {
         "has": "^1.0.3"
       }
     },
     "is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "dev": true,
       "requires": {
-        "kind-of": "^6.0.0"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
         }
       }
     },
     "is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
       "requires": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
       },
       "dependencies": {
         "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
           "dev": true
         }
       }
@@ -17222,24 +5135,10 @@
       "dev": true
     },
     "is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "requires": {
-        "is-plain-object": "^2.0.4"
-      },
-      "dependencies": {
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        }
-      }
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
     },
     "is-extglob": {
       "version": "2.1.1",
@@ -17248,9 +5147,9 @@
       "dev": true
     },
     "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
       "dev": true
     },
     "is-glob": {
@@ -17262,13 +5161,6 @@
         "is-extglob": "^2.1.1"
       }
     },
-    "is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-      "dev": true,
-      "peer": true
-    },
     "is-negated-glob": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
@@ -17296,16 +5188,19 @@
       }
     },
     "is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
       "dev": true
     },
     "is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-      "dev": true
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
     },
     "is-port-reachable": {
       "version": "3.0.0",
@@ -17328,12 +5223,6 @@
         "is-unc-path": "^1.0.0"
       }
     },
-    "is-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
-      "dev": true
-    },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -17414,91 +5303,6 @@
         "textextensions": "^3.2.0"
       }
     },
-    "jake": {
-      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz",
-      "integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "async": "0.9.x",
-        "chalk": "^2.4.2",
-        "filelist": "^1.0.1",
-        "minimatch": "^3.0.4"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "async": {
-          "version": "0.9.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
-          "dev": true,
-          "peer": true
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true,
-          "peer": true
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-          "dev": true,
-          "peer": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true,
-          "peer": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
     "js-green-licenses": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/js-green-licenses/-/js-green-licenses-3.0.1.tgz",
@@ -17513,6 +5317,17 @@
         "spdx-correct": "^3.0.0",
         "spdx-satisfies": "^5.0.0",
         "strip-json-comments": "^3.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
       }
     },
     "js-tokens": {
@@ -17529,15 +5344,23 @@
       "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+          "dev": true
+        }
       }
     },
     "js2xmlparser": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.1.tgz",
-      "integrity": "sha512-KrPTolcw6RocpYjdC7pL7v62e55q7qOMHvLX1UCLc5AAS8qeJ6nukarEJAF2KL2PZxlbGueEbINqZR2bDe/gUw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.0.tgz",
+      "integrity": "sha512-WuNgdZOXVmBk5kUPMcTcVUpbGRzLfNkv7+7APq7WiDihpXVKrgxo6wwRpRl9OQeEBgKCVk9mR7RbzrnNWC8oBw==",
       "dev": true,
       "requires": {
-        "xmlcreate": "^2.0.3"
+        "xmlcreate": "^2.0.0"
       }
     },
     "jsbn": {
@@ -17546,25 +5369,25 @@
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
     },
     "jsdoc": {
-      "version": "3.6.7",
-      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.7.tgz",
-      "integrity": "sha512-sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw==",
+      "version": "3.6.3",
+      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.3.tgz",
+      "integrity": "sha512-Yf1ZKA3r9nvtMWHO1kEuMZTlHOF8uoQ0vyo5eH7SQy5YeIiHM+B0DgKnn+X6y6KDYZcF7G2SPkKF+JORCXWE/A==",
       "dev": true,
       "requires": {
-        "@babel/parser": "^7.9.4",
-        "bluebird": "^3.7.2",
-        "catharsis": "^0.9.0",
+        "@babel/parser": "^7.4.4",
+        "bluebird": "^3.5.4",
+        "catharsis": "^0.8.11",
         "escape-string-regexp": "^2.0.0",
-        "js2xmlparser": "^4.0.1",
+        "js2xmlparser": "^4.0.0",
         "klaw": "^3.0.0",
-        "markdown-it": "^10.0.0",
-        "markdown-it-anchor": "^5.2.7",
-        "marked": "^2.0.3",
-        "mkdirp": "^1.0.4",
+        "markdown-it": "^8.4.2",
+        "markdown-it-anchor": "^5.0.2",
+        "marked": "^0.7.0",
+        "mkdirp": "^0.5.1",
         "requizzle": "^0.2.3",
-        "strip-json-comments": "^3.1.0",
+        "strip-json-comments": "^3.0.1",
         "taffydb": "2.6.2",
-        "underscore": "~1.13.1"
+        "underscore": "~1.9.1"
       },
       "dependencies": {
         "escape-string-regexp": {
@@ -17572,6 +5395,27 @@
           "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
           "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
           "dev": true
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz",
+          "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
+        "strip-json-comments": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
+          "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
+          "dev": true
         }
       }
     },
@@ -17606,6 +5450,13 @@
         "whatwg-url": "^7.0.0",
         "ws": "^7.0.0",
         "xml-name-validator": "^3.0.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "7.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
+        }
       }
     },
     "jsesc": {
@@ -17669,9 +5520,9 @@
       }
     },
     "just-debounce": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz",
-      "integrity": "sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
+      "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=",
       "dev": true
     },
     "just-extend": {
@@ -17690,9 +5541,9 @@
       }
     },
     "kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true
     },
     "klaw": {
@@ -17704,12 +5555,6 @@
         "graceful-fs": "^4.1.9"
       }
     },
-    "ky": {
-      "version": "0.28.5",
-      "resolved": "https://registry.npmjs.org/ky/-/ky-0.28.5.tgz",
-      "integrity": "sha512-O5gg9kF4MeyfSw+YkgPAafOPwEUU6xcdGEJKUJmKpIPbLzk3oxUtY4OdBNekG7mawofzkyZ/ZHuR9ev5uZZdAA==",
-      "dev": true
-    },
     "last-run": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
@@ -17729,15 +5574,6 @@
         "readable-stream": "^2.0.5"
       }
     },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "dev": true,
-      "requires": {
-        "invert-kv": "^1.0.0"
-      }
-    },
     "lead": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
@@ -17748,13 +5584,12 @@
       }
     },
     "levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
       "requires": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
       }
     },
     "liftoff": {
@@ -17771,27 +5606,16 @@
         "object.map": "^1.0.0",
         "rechoir": "^0.6.2",
         "resolve": "^1.1.7"
-      },
-      "dependencies": {
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        }
       }
     },
     "lighthouse-logger": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.3.0.tgz",
-      "integrity": "sha512-BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.2.0.tgz",
+      "integrity": "sha512-wzUvdIeJZhRsG6gpZfmSCfysaxNEr43i+QT+Hie94wvHDKFLi4n7C2GqZ4sTC+PH5b5iktmXJvU87rWvhP3lHw==",
       "dev": true,
       "requires": {
-        "debug": "^2.6.9",
-        "marky": "^1.2.2"
+        "debug": "^2.6.8",
+        "marky": "^1.2.0"
       },
       "dependencies": {
         "debug": {
@@ -17847,22 +5671,28 @@
           "requires": {
             "error-ex": "^1.2.0"
           }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
         }
       }
     },
     "locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dev": true,
       "requires": {
-        "p-locate": "^5.0.0"
+        "p-locate": "^4.1.0"
       }
     },
     "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "version": "4.17.19",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
     },
     "lodash._reinterpolate": {
       "version": "3.0.0",
@@ -17900,13 +5730,6 @@
       "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
       "dev": true
     },
-    "lodash.flattendeep": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-      "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
-      "dev": true,
-      "peer": true
-    },
     "lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
@@ -17937,13 +5760,6 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "lodash.pickby": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz",
-      "integrity": "sha1-feoh2MGNdwOifHBMFdO4SmfjOv8=",
-      "dev": true,
-      "peer": true
-    },
     "lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
@@ -17994,6 +5810,57 @@
       "requires": {
         "chalk": "^4.1.0",
         "is-unicode-supported": "^0.1.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "loglevel": {
@@ -18039,14 +5906,6 @@
       "dev": true,
       "requires": {
         "kind-of": "^6.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
       }
     },
     "map-cache": {
@@ -18071,29 +5930,36 @@
       }
     },
     "markdown-it": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz",
-      "integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==",
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz",
+      "integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==",
       "dev": true,
       "requires": {
         "argparse": "^1.0.7",
-        "entities": "~2.0.0",
+        "entities": "~1.1.1",
         "linkify-it": "^2.0.0",
         "mdurl": "^1.0.1",
         "uc.micro": "^1.0.5"
+      },
+      "dependencies": {
+        "entities": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+          "dev": true
+        }
       }
     },
     "markdown-it-anchor": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.3.0.tgz",
-      "integrity": "sha512-/V1MnLL/rgJ3jkMWo84UR+K+jF1cxNG1a+KwqeXqTIJ+jtA8aWSHuigx8lTzauiIjBDbwF3NcWQMotd0Dm39jA==",
-      "dev": true,
-      "requires": {}
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.2.4.tgz",
+      "integrity": "sha512-n8zCGjxA3T+Mx1pG8HEgbJbkB8JFUuRkeTZQuIM8iPY6oQ8sWOPRZJDFC9a/pNg2QkHEjjGkhBEl/RSyzaDZ3A==",
+      "dev": true
     },
     "marked": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-2.1.3.tgz",
-      "integrity": "sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
+      "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==",
       "dev": true
     },
     "marky": {
@@ -18144,19 +6010,19 @@
       "dev": true
     },
     "memoizee": {
-      "version": "0.4.15",
-      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz",
-      "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==",
+      "version": "0.4.14",
+      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz",
+      "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==",
       "dev": true,
       "requires": {
-        "d": "^1.0.1",
-        "es5-ext": "^0.10.53",
-        "es6-weak-map": "^2.0.3",
+        "d": "1",
+        "es5-ext": "^0.10.45",
+        "es6-weak-map": "^2.0.2",
         "event-emitter": "^0.3.5",
-        "is-promise": "^2.2.2",
-        "lru-queue": "^0.1.0",
-        "next-tick": "^1.1.0",
-        "timers-ext": "^0.1.7"
+        "is-promise": "^2.1",
+        "lru-queue": "0.1",
+        "next-tick": "1",
+        "timers-ext": "^0.1.5"
       }
     },
     "meow": {
@@ -18179,11 +6045,110 @@
         "yargs-parser": "^20.2.3"
       },
       "dependencies": {
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "hosted-git-info": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
+          "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "normalize-package-data": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz",
+          "integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==",
+          "dev": true,
+          "requires": {
+            "hosted-git-info": "^4.0.1",
+            "resolve": "^1.20.0",
+            "semver": "^7.3.4",
+            "validate-npm-package-license": "^3.0.1"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "read-pkg-up": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+          "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+          "dev": true,
+          "requires": {
+            "find-up": "^4.1.0",
+            "read-pkg": "^5.2.0",
+            "type-fest": "^0.8.1"
+          },
+          "dependencies": {
+            "type-fest": {
+              "version": "0.8.1",
+              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+              "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+              "dev": true
+            }
+          }
+        },
+        "resolve": {
+          "version": "1.20.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+          "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.2.0",
+            "path-parse": "^1.0.6"
+          }
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
         "type-fest": {
           "version": "0.18.1",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
           "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
           "dev": true
+        },
+        "yargs-parser": {
+          "version": "20.2.7",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
+          "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
+          "dev": true
         }
       }
     },
@@ -18206,82 +6171,6 @@
         "regex-not": "^1.0.0",
         "snapdragon": "^0.8.1",
         "to-regex": "^3.0.2"
-      },
-      "dependencies": {
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
       }
     },
     "mime": {
@@ -18291,25 +6180,18 @@
       "dev": true
     },
     "mime-db": {
-      "version": "1.48.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
-      "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ=="
+      "version": "1.47.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz",
+      "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw=="
     },
     "mime-types": {
-      "version": "2.1.31",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
-      "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
+      "version": "2.1.30",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz",
+      "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==",
       "requires": {
-        "mime-db": "1.48.0"
+        "mime-db": "1.47.0"
       }
     },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
-      "peer": true
-    },
     "mimic-response": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
@@ -18348,10 +6230,10 @@
         "kind-of": "^6.0.3"
       },
       "dependencies": {
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+        "is-plain-obj": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+          "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
           "dev": true
         }
       }
@@ -18364,12 +6246,29 @@
       "requires": {
         "for-in": "^1.0.2",
         "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
       }
     },
     "mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz",
+      "integrity": "sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==",
+      "dev": true
+    },
+    "mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
       "dev": true
     },
     "mocha": {
@@ -18405,12 +6304,59 @@
         "yargs-unparser": "2.0.0"
       },
       "dependencies": {
+        "ansi-colors": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+          "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+          "dev": true
+        },
+        "anymatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+          "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+          "dev": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
+          }
+        },
         "argparse": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
           "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
           "dev": true
         },
+        "binary-extensions": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+          "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+          "dev": true
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "chokidar": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+          "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+          "dev": true,
+          "requires": {
+            "anymatch": "~3.1.2",
+            "braces": "~3.0.2",
+            "fsevents": "~2.3.2",
+            "glob-parent": "~5.1.2",
+            "is-binary-path": "~2.1.0",
+            "is-glob": "~4.0.1",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.6.0"
+          }
+        },
         "debug": {
           "version": "4.3.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
@@ -18428,6 +6374,88 @@
             }
           }
         },
+        "diff": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+          "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+          "dev": true
+        },
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "find-up": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^6.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+          "dev": true,
+          "optional": true
+        },
+        "glob": {
+          "version": "7.1.7",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+          "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "glob-parent": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "is-binary-path": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+          "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+          "dev": true,
+          "requires": {
+            "binary-extensions": "^2.0.0"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
         "js-yaml": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -18437,12 +6465,54 @@
             "argparse": "^2.0.1"
           }
         },
+        "locate-path": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^5.0.0"
+          }
+        },
         "ms": {
           "version": "2.1.3",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
           "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
           "dev": true
         },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+          "dev": true,
+          "requires": {
+            "yocto-queue": "^0.1.0"
+          }
+        },
+        "p-locate": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^3.0.2"
+          }
+        },
+        "readdirp": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+          "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+          "dev": true,
+          "requires": {
+            "picomatch": "^2.2.1"
+          }
+        },
         "supports-color": {
           "version": "8.1.1",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -18452,6 +6522,24 @@
             "has-flag": "^4.0.0"
           }
         },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        },
         "yargs-parser": {
           "version": "20.2.4",
           "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
@@ -18478,17 +6566,10 @@
       "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
       "dev": true
     },
-    "mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true,
-      "peer": true
-    },
     "nan": {
-      "version": "2.14.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
       "dev": true,
       "optional": true
     },
@@ -18515,14 +6596,6 @@
         "regex-not": "^1.0.0",
         "snapdragon": "^0.8.1",
         "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
       }
     },
     "natural-compare": {
@@ -18532,9 +6605,9 @@
       "dev": true
     },
     "next-tick": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
-      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
       "dev": true
     },
     "nise": {
@@ -18557,27 +6630,30 @@
       "dev": true
     },
     "normalize-package-data": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz",
-      "integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
       "dev": true,
       "requires": {
-        "hosted-git-info": "^4.0.1",
-        "resolve": "^1.20.0",
-        "semver": "^7.3.4",
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
         "validate-npm-package-license": "^3.0.1"
       }
     },
     "normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "requires": {
+        "remove-trailing-separator": "^1.0.1"
+      }
     },
     "normalize-url": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
+      "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
       "dev": true
     },
     "now-and-later": {
@@ -18590,14 +6666,34 @@
       }
     },
     "npm-package-arg": {
-      "version": "8.1.5",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz",
-      "integrity": "sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==",
+      "version": "8.1.2",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.2.tgz",
+      "integrity": "sha512-6Eem455JsSMJY6Kpd3EyWE+n5hC+g9bSyHr9K9U2zqZb7+02+hObQ2c0+8iDk/mNF+8r1MhY44WypKJAkySIYA==",
       "dev": true,
       "requires": {
         "hosted-git-info": "^4.0.1",
         "semver": "^7.3.4",
         "validate-npm-package-name": "^3.0.0"
+      },
+      "dependencies": {
+        "hosted-git-info": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
+          "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
       }
     },
     "number-is-nan": {
@@ -18642,43 +6738,6 @@
             "is-descriptor": "^0.1.0"
           }
         },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "dev": true
-            }
-          }
-        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -18706,15 +6765,15 @@
       }
     },
     "object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
       }
     },
     "object.defaults": {
@@ -18767,16 +6826,6 @@
         "wrappy": "1"
       }
     },
-    "onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      }
-    },
     "opener": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
@@ -18784,35 +6833,16 @@
       "dev": true
     },
     "optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
       "requires": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      }
-    },
-    "ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.4",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "wordwrap": "~1.0.0"
       }
     },
     "ordered-read-streams": {
@@ -18824,50 +6854,28 @@
         "readable-stream": "^2.0.1"
       }
     },
-    "os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-      "dev": true,
-      "requires": {
-        "lcid": "^1.0.0"
-      }
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true,
-      "peer": true
-    },
     "p-cancelable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
       "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
       "dev": true
     },
-    "p-iteration": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/p-iteration/-/p-iteration-1.1.8.tgz",
-      "integrity": "sha512-IMFBSDIYcPNnW7uWYGrBqmvTiq7W0uB0fJn6shQZs7dlF3OvrHOre+JT9ikSZ7gZS3vWqclVgoQSvToJrns7uQ==",
-      "dev": true
-    },
     "p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
+      "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
       "dev": true,
       "requires": {
-        "yocto-queue": "^0.1.0"
+        "p-try": "^2.0.0"
       }
     },
     "p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dev": true,
       "requires": {
-        "p-limit": "^3.0.2"
+        "p-limit": "^2.2.0"
       }
     },
     "p-try": {
@@ -18976,9 +6984,9 @@
       "dev": true
     },
     "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
       "dev": true
     },
     "path-root": {
@@ -19022,6 +7030,14 @@
         "graceful-fs": "^4.1.2",
         "pify": "^2.0.0",
         "pinkie-promise": "^2.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
       }
     },
     "pathval": {
@@ -19047,12 +7063,6 @@
       "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
       "dev": true
     },
-    "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true
-    },
     "pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
@@ -19075,45 +7085,6 @@
       "dev": true,
       "requires": {
         "find-up": "^4.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        }
       }
     },
     "plugin-error": {
@@ -19126,17 +7097,6 @@
         "arr-diff": "^4.0.0",
         "arr-union": "^3.1.0",
         "extend-shallow": "^3.0.2"
-      },
-      "dependencies": {
-        "ansi-colors": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-          "dev": true,
-          "requires": {
-            "ansi-wrap": "^0.1.0"
-          }
-        }
       }
     },
     "pn": {
@@ -19191,96 +7151,20 @@
       "dev": true
     },
     "postcss": {
-      "version": "7.0.36",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
-      "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
+      "version": "7.0.35",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
+      "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
       "dev": true,
       "requires": {
         "chalk": "^2.4.2",
         "source-map": "^0.6.1",
         "supports-color": "^6.1.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
     },
     "prepend-http": {
       "version": "2.0.0",
@@ -19318,13 +7202,6 @@
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
       "dev": true
     },
-    "pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-      "dev": true,
-      "peer": true
-    },
     "psl": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
@@ -19369,52 +7246,30 @@
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
     "puppeteer-core": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-10.2.0.tgz",
-      "integrity": "sha512-c1COxSnfynsE6Mtt+dW0t3TITjF9Ku4dnJbFMDDVhLQuMTYSpz4rkSP37qvzcSo3k02/Ac3GYWk0/ncp6DKZNA==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz",
+      "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==",
       "dev": true,
       "requires": {
-        "debug": "4.3.1",
-        "devtools-protocol": "0.0.901419",
-        "extract-zip": "2.0.1",
-        "https-proxy-agent": "5.0.0",
-        "node-fetch": "2.6.1",
-        "pkg-dir": "4.2.0",
-        "progress": "2.0.1",
-        "proxy-from-env": "1.1.0",
-        "rimraf": "3.0.2",
-        "tar-fs": "2.0.0",
-        "unbzip2-stream": "1.3.3",
-        "ws": "7.4.6"
+        "debug": "^4.1.0",
+        "devtools-protocol": "0.0.869402",
+        "extract-zip": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "node-fetch": "^2.6.1",
+        "pkg-dir": "^4.2.0",
+        "progress": "^2.0.1",
+        "proxy-from-env": "^1.1.0",
+        "rimraf": "^3.0.2",
+        "tar-fs": "^2.0.0",
+        "unbzip2-stream": "^1.3.3",
+        "ws": "^7.2.3"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
         "devtools-protocol": {
-          "version": "0.0.901419",
-          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.901419.tgz",
-          "integrity": "sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ==",
+          "version": "0.0.869402",
+          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
+          "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
           "dev": true
-        },
-        "progress": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz",
-          "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==",
-          "dev": true
-        },
-        "ws": {
-          "version": "7.4.6",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
-          "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
-          "dev": true,
-          "requires": {}
         }
       }
     },
@@ -19430,9 +7285,9 @@
       "dev": true
     },
     "quick-lru": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
       "dev": true
     },
     "randombytes": {
@@ -19476,30 +7331,6 @@
         "type-fest": "^0.6.0"
       },
       "dependencies": {
-        "hosted-git-info": {
-          "version": "2.8.9",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-          "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-          "dev": true
-        },
-        "normalize-package-data": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-          "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-          "dev": true,
-          "requires": {
-            "hosted-git-info": "^2.1.4",
-            "resolve": "^1.10.0",
-            "semver": "2 || 3 || 4 || 5",
-            "validate-npm-package-license": "^3.0.1"
-          }
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        },
         "type-fest": {
           "version": "0.6.0",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
@@ -19509,65 +7340,51 @@
       }
     },
     "read-pkg-up": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
       "dev": true,
       "requires": {
-        "find-up": "^4.1.0",
-        "read-pkg": "^5.2.0",
-        "type-fest": "^0.8.1"
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
       },
       "dependencies": {
         "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
           "dev": true,
           "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
+            "path-exists": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
           }
         },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
           "dev": true,
           "requires": {
-            "p-locate": "^4.1.0"
+            "pinkie-promise": "^2.0.0"
           }
         },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+        "read-pkg": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "load-json-file": "^1.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^1.0.0"
           }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "type-fest": {
-          "version": "0.8.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-          "dev": true
         }
       }
     },
     "readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
       "dev": true,
       "requires": {
         "core-util-is": "~1.0.0",
@@ -19577,6 +7394,14 @@
         "safe-buffer": "~5.1.1",
         "string_decoder": "~1.1.1",
         "util-deprecate": "~1.0.1"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        }
       }
     },
     "readdir-glob": {
@@ -19589,12 +7414,14 @@
       }
     },
     "readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
       "dev": true,
       "requires": {
-        "picomatch": "^2.2.1"
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
       }
     },
     "readline-sync": {
@@ -19612,16 +7439,6 @@
         "resolve": "^1.1.6"
       }
     },
-    "recursive-readdir": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
-      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "minimatch": "3.0.4"
-      }
-    },
     "redent": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
@@ -19633,9 +7450,9 @@
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+      "version": "0.13.7",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
       "dev": true
     },
     "regex-not": {
@@ -19712,9 +7529,9 @@
       "dev": true
     },
     "repeat-element": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
-      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
       "dev": true
     },
     "repeat-string": {
@@ -19724,9 +7541,9 @@
       "dev": true
     },
     "replace-ext": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
-      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+      "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
       "dev": true
     },
     "replace-homedir": {
@@ -19749,14 +7566,6 @@
         "escape-string-regexp": "^1.0.3",
         "object-assign": "^4.0.1",
         "readable-stream": "^2.0.2"
-      },
-      "dependencies": {
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-          "dev": true
-        }
       }
     },
     "request": {
@@ -19860,19 +7669,18 @@
       }
     },
     "resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+      "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
       "dev": true,
       "requires": {
-        "is-core-module": "^2.2.0",
         "path-parse": "^1.0.6"
       }
     },
     "resolve-alpn": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.0.tgz",
-      "integrity": "sha512-e4FNQs+9cINYMO5NMFc6kOUCdohjqFPSgMuwuZAOUWqrfWsen+Yjy5qZFkV5K7VO7tFSLKcUL97olkED7sCBHA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.0.0.tgz",
+      "integrity": "sha512-rTuiIEqFmGxne4IovivKSDzld2lWW9QCjqv80SYjPgf+gS35eaCAjaP54CCwGAwBtnCsvNLYtqxe1Nw+i6JEmA==",
       "dev": true
     },
     "resolve-dir": {
@@ -19916,31 +7724,12 @@
       }
     },
     "resq": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/resq/-/resq-1.10.1.tgz",
-      "integrity": "sha512-zhp1iyUH02MLciv3bIM2bNtTFx/fqRsK4Jk73jcPqp00d/sMTTjOtjdTMAcgjrQKGx5DvQ/HSpeqaMW0atGRJA==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/resq/-/resq-1.10.0.tgz",
+      "integrity": "sha512-hCUd0xMalqtPDz4jXIqs0M5Wnv/LZXN8h7unFOo4/nvExT9dDPbhwd3udRxLlp0HgBnHcV009UlduE9NZi7A6w==",
       "dev": true,
       "requires": {
         "fast-deep-equal": "^2.0.1"
-      },
-      "dependencies": {
-        "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
-        }
-      }
-    },
-    "restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
       }
     },
     "ret": {
@@ -19964,13 +7753,6 @@
         "glob": "^7.1.3"
       }
     },
-    "run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-      "dev": true,
-      "peer": true
-    },
     "rxjs": {
       "version": "6.6.7",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
@@ -19981,9 +7763,9 @@
       }
     },
     "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+      "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
     },
     "safe-regex": {
       "version": "1.1.0",
@@ -20042,9 +7824,9 @@
           "dev": true
         },
         "@szmarczak/http-timer": {
-          "version": "4.0.6",
-          "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
-          "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
+          "version": "4.0.5",
+          "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz",
+          "integrity": "sha512-PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ==",
           "dev": true,
           "requires": {
             "defer-to-connect": "^2.0.0"
@@ -20065,6 +7847,15 @@
             "responselike": "^2.0.0"
           }
         },
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
         "decompress-response": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
@@ -20135,6 +7926,12 @@
           "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
           "dev": true
         },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        },
         "normalize-url": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
@@ -20147,6 +7944,17 @@
           "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
           "dev": true
         },
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
         "responselike": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz",
@@ -20155,17 +7963,36 @@
           "requires": {
             "lowercase-keys": "^2.0.0"
           }
+        },
+        "tar-stream": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+          "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+          "dev": true,
+          "requires": {
+            "bl": "^4.0.3",
+            "end-of-stream": "^1.4.1",
+            "fs-constants": "^1.0.0",
+            "inherits": "^2.0.3",
+            "readable-stream": "^3.1.1"
+          }
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
         }
       }
     },
     "semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
-      "requires": {
-        "lru-cache": "^6.0.0"
-      }
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true
     },
     "semver-greatest-satisfied-range": {
       "version": "1.1.0",
@@ -20228,21 +8055,6 @@
           "requires": {
             "is-extendable": "^0.1.0"
           }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
         }
       }
     },
@@ -20261,13 +8073,6 @@
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true
     },
-    "signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
-      "dev": true,
-      "peer": true
-    },
     "sinon": {
       "version": "9.2.4",
       "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz",
@@ -20282,11 +8087,20 @@
         "supports-color": "^7.1.0"
       },
       "dependencies": {
-        "diff": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-          "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
@@ -20299,6 +8113,38 @@
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
         "is-fullwidth-code-point": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        }
       }
     },
     "snapdragon": {
@@ -20344,81 +8190,17 @@
             "is-extendable": "^0.1.0"
           }
         },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         },
-        "source-map-resolve": {
-          "version": "0.5.3",
-          "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-          "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-          "dev": true,
-          "requires": {
-            "atob": "^2.1.2",
-            "decode-uri-component": "^0.2.0",
-            "resolve-url": "^0.2.1",
-            "source-map-url": "^0.4.0",
-            "urix": "^0.1.0"
-          }
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
         }
       }
     },
@@ -20441,6 +8223,35 @@
           "requires": {
             "is-descriptor": "^1.0.0"
           }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
         }
       }
     },
@@ -20465,24 +8276,27 @@
       }
     },
     "source-map": {
-      "version": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
     },
     "source-map-resolve": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
-      "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
       "dev": true,
       "requires": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0"
+        "atob": "^2.1.1",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
       }
     },
     "source-map-url": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
-      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
       "dev": true
     },
     "sparkles": {
@@ -20509,9 +8323,9 @@
       }
     },
     "spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
       "dev": true,
       "requires": {
         "spdx-expression-parse": "^3.0.0",
@@ -20519,15 +8333,15 @@
       }
     },
     "spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
       "dev": true
     },
     "spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
       "dev": true,
       "requires": {
         "spdx-exceptions": "^2.1.0",
@@ -20535,9 +8349,9 @@
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz",
-      "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
       "dev": true
     },
     "spdx-ranges": {
@@ -20547,9 +8361,9 @@
       "dev": true
     },
     "spdx-satisfies": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-satisfies/-/spdx-satisfies-5.0.1.tgz",
-      "integrity": "sha512-Nwor6W6gzFp8XX4neaKQ7ChV4wmpSh2sSDemMFSzHxpTw460jxFYeOn+jq4ybnSSw/5sc3pjka9MQPouksQNpw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-satisfies/-/spdx-satisfies-5.0.0.tgz",
+      "integrity": "sha512-/hGhwh20BeGmkA+P/lm06RvXD94JduwNxtx/oX3B5ClPt1/u/m5MCaDNo1tV3Y9laLkQr/NRde63b9lLMhlNfw==",
       "dev": true,
       "requires": {
         "spdx-compare": "^1.0.0",
@@ -20612,57 +8426,6 @@
           "requires": {
             "is-descriptor": "^0.1.0"
           }
-        },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
         }
       }
     },
@@ -20678,9 +8441,9 @@
       "dev": true
     },
     "stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
       "dev": true
     },
     "streamqueue": {
@@ -20718,6 +8481,33 @@
         }
       }
     },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dev": true,
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
     "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -20725,17 +8515,14 @@
       "dev": true,
       "requires": {
         "safe-buffer": "~5.1.0"
-      }
-    },
-    "string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dev": true,
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        }
       }
     },
     "strip-ansi": {
@@ -20777,20 +8564,13 @@
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true
     },
-    "suffix": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/suffix/-/suffix-0.1.1.tgz",
-      "integrity": "sha1-zFgjFkag7xEC95R47zqSSP2chC8=",
-      "dev": true,
-      "peer": true
-    },
     "supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
       "dev": true,
       "requires": {
-        "has-flag": "^4.0.0"
+        "has-flag": "^3.0.0"
       }
     },
     "sver-compat": {
@@ -20823,9 +8603,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "8.6.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz",
-          "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==",
+          "version": "8.6.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
+          "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -20834,11 +8614,49 @@
             "uri-js": "^4.2.2"
           }
         },
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
         "json-schema-traverse": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
           "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
           "dev": true
+        },
+        "string-width": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
         }
       }
     },
@@ -20849,32 +8667,21 @@
       "dev": true
     },
     "tar-fs": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz",
-      "integrity": "sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
       "dev": true,
       "requires": {
         "chownr": "^1.1.1",
-        "mkdirp": "^0.5.1",
+        "mkdirp-classic": "^0.5.2",
         "pump": "^3.0.0",
-        "tar-stream": "^2.0.0"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        }
+        "tar-stream": "^2.1.4"
       }
     },
     "tar-stream": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.4.tgz",
+      "integrity": "sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==",
       "dev": true,
       "requires": {
         "bl": "^4.0.3",
@@ -20975,16 +8782,6 @@
         "next-tick": "1"
       }
     },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "os-tmpdir": "~1.0.2"
-      }
-    },
     "to-absolute-glob": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
@@ -21040,20 +8837,13 @@
       }
     },
     "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
       "dev": true,
       "requires": {
-        "is-number": "^7.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        }
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
       }
     },
     "to-through": {
@@ -21102,15 +8892,15 @@
       "dev": true
     },
     "trim-newlines": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.0.tgz",
+      "integrity": "sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==",
       "dev": true
     },
     "tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
+      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
       "dev": true
     },
     "tunnel-agent": {
@@ -21133,12 +8923,11 @@
       "dev": true
     },
     "type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
       "requires": {
-        "prelude-ls": "^1.2.1"
+        "prelude-ls": "~1.1.2"
       }
     },
     "type-detect": {
@@ -21148,11 +8937,10 @@
       "dev": true
     },
     "type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "dev": true,
-      "peer": true
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true
     },
     "typedarray": {
       "version": "0.0.6",
@@ -21161,9 +8949,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
-      "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.2.tgz",
+      "integrity": "sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==",
       "dev": true
     },
     "typescript-closure-tools": {
@@ -21173,7 +8961,7 @@
       "dev": true,
       "requires": {
         "colors": "*",
-        "doctrine": "github:fivetran/doctrine",
+        "doctrine": "doctrine@github:fivetran/doctrine",
         "escodegen": "*",
         "esprima": "*",
         "jsdoc": "*",
@@ -21182,8 +8970,8 @@
       "dependencies": {
         "doctrine": {
           "version": "git+ssh://git@github.com/fivetran/doctrine.git#169ebc1cbf23492363f9442543d1e78e1df9c3d5",
-          "dev": true,
-          "from": "doctrine@github:fivetran/doctrine"
+          "from": "doctrine@github:fivetran/doctrine",
+          "dev": true
         }
       }
     },
@@ -21200,9 +8988,9 @@
       "dev": true
     },
     "unbzip2-stream": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz",
-      "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
       "dev": true,
       "requires": {
         "buffer": "^5.2.1",
@@ -21216,15 +9004,15 @@
       "dev": true
     },
     "underscore": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
+      "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==",
       "dev": true
     },
     "undertaker": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz",
-      "integrity": "sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.1.tgz",
+      "integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==",
       "dev": true,
       "requires": {
         "arr-flatten": "^1.0.1",
@@ -21232,19 +9020,10 @@
         "bach": "^1.0.0",
         "collection-map": "^1.0.0",
         "es6-weak-map": "^2.0.1",
-        "fast-levenshtein": "^1.0.0",
         "last-run": "^1.1.0",
         "object.defaults": "^1.0.0",
         "object.reduce": "^1.0.0",
         "undertaker-registry": "^1.0.0"
-      },
-      "dependencies": {
-        "fast-levenshtein": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz",
-          "integrity": "sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk=",
-          "dev": true
-        }
       }
     },
     "undertaker-registry": {
@@ -21272,14 +9051,6 @@
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
         "set-value": "^2.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        }
       }
     },
     "unique-stream": {
@@ -21345,9 +9116,9 @@
       "dev": true
     },
     "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -21397,9 +9168,9 @@
       "dev": true
     },
     "v8flags": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
-      "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz",
+      "integrity": "sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==",
       "dev": true,
       "requires": {
         "homedir-polyfill": "^1.0.1"
@@ -21441,9 +9212,9 @@
       }
     },
     "vinyl": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
-      "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
+      "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
       "dev": true,
       "requires": {
         "clone": "^2.1.1",
@@ -21504,17 +9275,6 @@
         "now-and-later": "^2.0.0",
         "remove-bom-buffer": "^3.0.0",
         "vinyl": "^2.0.0"
-      },
-      "dependencies": {
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        }
       }
     },
     "vinyl-sourcemaps-apply": {
@@ -21524,6 +9284,14 @@
       "dev": true,
       "requires": {
         "source-map": "^0.5.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
       }
     },
     "w3c-hr-time": {
@@ -21544,30 +9312,19 @@
         "xml-name-validator": "^3.0.0"
       }
     },
-    "wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "defaults": "^1.0.3"
-      }
-    },
     "webdriver": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.11.0.tgz",
-      "integrity": "sha512-Sd4n3Hxz/6WDa4Ay8cJj/ICDbf2ndlAzd7NMj+dmhfDsDF7L77eCZYB8zrrxs2hoK63E54eyKzyycK3BB3WoYQ==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.6.0.tgz",
+      "integrity": "sha512-3IaaKhCP9onAmKcvEZ+2O08Q61DLRUEf0E1Ck8uXMxq8D9WjvVoSIdJ10AppaHuxK8PFXeymS2Y2klKVyUeMow==",
       "dev": true,
       "requires": {
-        "@types/node": "^15.12.5",
-        "@wdio/config": "7.10.1",
-        "@wdio/logger": "7.7.0",
-        "@wdio/protocols": "7.11.0",
-        "@wdio/types": "7.10.1",
-        "@wdio/utils": "7.11.0",
+        "@types/node": "^14.14.31",
+        "@wdio/config": "7.6.0",
+        "@wdio/logger": "7.5.3",
+        "@wdio/protocols": "7.5.3",
+        "@wdio/types": "7.6.0",
+        "@wdio/utils": "7.6.0",
         "got": "^11.0.2",
-        "ky": "^0.28.5",
         "lodash.merge": "^4.6.1"
       },
       "dependencies": {
@@ -21578,24 +9335,24 @@
           "dev": true
         },
         "@szmarczak/http-timer": {
-          "version": "4.0.6",
-          "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
-          "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
+          "version": "4.0.5",
+          "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz",
+          "integrity": "sha512-PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ==",
           "dev": true,
           "requires": {
             "defer-to-connect": "^2.0.0"
           }
         },
         "@types/node": {
-          "version": "15.14.9",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.9.tgz",
-          "integrity": "sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==",
+          "version": "14.17.0",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.0.tgz",
+          "integrity": "sha512-w8VZUN/f7SSbvVReb9SWp6cJFevxb4/nkG65yLAya//98WgocKm5PLDAtSs5CtJJJM+kHmJjO/6mmYW4MHShZA==",
           "dev": true
         },
         "cacheable-request": {
-          "version": "7.0.2",
-          "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
-          "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.1.tgz",
+          "integrity": "sha512-lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw==",
           "dev": true,
           "requires": {
             "clone-response": "^1.0.2",
@@ -21603,7 +9360,7 @@
             "http-cache-semantics": "^4.0.0",
             "keyv": "^4.0.0",
             "lowercase-keys": "^2.0.0",
-            "normalize-url": "^6.0.1",
+            "normalize-url": "^4.1.0",
             "responselike": "^2.0.0"
           }
         },
@@ -21677,12 +9434,6 @@
           "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
           "dev": true
         },
-        "normalize-url": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-          "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-          "dev": true
-        },
         "p-cancelable": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
@@ -21701,26 +9452,26 @@
       }
     },
     "webdriverio": {
-      "version": "7.11.1",
-      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.11.1.tgz",
-      "integrity": "sha512-N796qZIqkfIJJtSNBcAimnVr3SrnEjbwjYSBqAhVdGSidUKb1k6bxjC223WFwpANGkxABJUrVkx+qGNOtc+yGg==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.6.0.tgz",
+      "integrity": "sha512-o93L4dD4Ia0WOXghuv7Aj4vuSkK/eIDKRf7G5+dwh/j0myw3v2PKXC9pIG7Bxvp9exax5h/1NM+IFbvkTQAOlA==",
       "dev": true,
       "requires": {
         "@types/aria-query": "^4.2.1",
-        "@types/node": "^15.12.5",
-        "@wdio/config": "7.10.1",
-        "@wdio/logger": "7.7.0",
-        "@wdio/protocols": "7.11.0",
-        "@wdio/repl": "7.11.0",
-        "@wdio/types": "7.10.1",
-        "@wdio/utils": "7.11.0",
+        "@types/node": "^14.14.31",
+        "@wdio/config": "7.6.0",
+        "@wdio/logger": "7.5.3",
+        "@wdio/protocols": "7.5.3",
+        "@wdio/repl": "7.6.0",
+        "@wdio/types": "7.6.0",
+        "@wdio/utils": "7.6.0",
         "archiver": "^5.0.0",
         "aria-query": "^4.2.2",
         "atob": "^2.1.2",
         "css-shorthand-properties": "^1.1.1",
         "css-value": "^0.0.1",
-        "devtools": "7.11.0",
-        "devtools-protocol": "^0.0.915197",
+        "devtools": "7.6.0",
+        "devtools-protocol": "^0.0.882987",
         "fs-extra": "^10.0.0",
         "get-port": "^5.1.1",
         "grapheme-splitter": "^1.0.2",
@@ -21729,18 +9480,18 @@
         "lodash.isplainobject": "^4.0.6",
         "lodash.zip": "^4.2.0",
         "minimatch": "^3.0.4",
-        "puppeteer-core": "^10.1.0",
+        "puppeteer-core": "^9.1.0",
         "query-selector-shadow-dom": "^1.0.0",
         "resq": "^1.9.1",
         "rgb2hex": "0.2.5",
         "serialize-error": "^8.0.0",
-        "webdriver": "7.11.0"
+        "webdriver": "7.6.0"
       },
       "dependencies": {
         "@types/node": {
-          "version": "15.14.9",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.9.tgz",
-          "integrity": "sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==",
+          "version": "14.17.0",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.0.tgz",
+          "integrity": "sha512-w8VZUN/f7SSbvVReb9SWp6cJFevxb4/nkG65yLAya//98WgocKm5PLDAtSs5CtJJJM+kHmJjO/6mmYW4MHShZA==",
           "dev": true
         }
       }
@@ -21774,20 +9525,14 @@
       }
     },
     "which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
       "requires": {
         "isexe": "^2.0.0"
       }
     },
-    "which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-      "dev": true
-    },
     "wide-align": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
@@ -21795,45 +9540,18 @@
       "dev": true,
       "requires": {
         "string-width": "^1.0.2 || 2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
       }
     },
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true
+    },
+    "wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
     },
     "workerpool": {
       "version": "6.1.5",
@@ -21842,14 +9560,50 @@
       "dev": true
     },
     "wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "dev": true,
       "requires": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "dev": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        }
       }
     },
     "wrappy": {
@@ -21859,10 +9613,9 @@
       "dev": true
     },
     "ws": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
-      "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
-      "requires": {}
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz",
+      "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw=="
     },
     "xml-name-validator": {
       "version": "3.0.0",
@@ -21875,9 +9628,9 @@
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
     },
     "xmlcreate": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.3.tgz",
-      "integrity": "sha512-HgS+X6zAztGa9zIK3Y3LXuJes33Lz9x+YyTxgrkIdabu2vqcGOWwdfCpf1hWLRrd553wd4QCDf6BBO6FfdsRiQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.1.tgz",
+      "integrity": "sha512-MjGsXhKG8YjTKrDCXseFo3ClbMGvUD4en29H2Cev1dv4P/chlpw6KdYmlCWDkhosBVKRDjM836+3e3pm1cBNJA==",
       "dev": true
     },
     "xtend": {
@@ -21886,12 +9639,6 @@
       "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
       "dev": true
     },
-    "y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true
-    },
     "yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -21911,12 +9658,116 @@
         "string-width": "^4.2.0",
         "y18n": "^5.0.5",
         "yargs-parser": "^20.2.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "cliui": {
+          "version": "7.0.4",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^7.0.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
+        },
+        "get-caller-file": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "y18n": {
+          "version": "5.0.5",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz",
+          "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==",
+          "dev": true
+        },
+        "yargs-parser": {
+          "version": "20.2.4",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+          "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+          "dev": true
+        }
       }
     },
     "yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "version": "20.2.7",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
+      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
       "dev": true
     },
     "yargs-unparser": {
@@ -21942,117 +9793,6 @@
           "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
           "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
           "dev": true
-        },
-        "is-plain-obj": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-          "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-          "dev": true
-        }
-      }
-    },
-    "yarn-install": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/yarn-install/-/yarn-install-1.0.0.tgz",
-      "integrity": "sha1-V/RQULgu/VcYKzlzxUqgXLXSUjA=",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "cac": "^3.0.3",
-        "chalk": "^1.1.3",
-        "cross-spawn": "^4.0.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true,
-          "peer": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true,
-          "peer": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "cross-spawn": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
-          "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "which": "^1.2.9"
-          }
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-          "dev": true,
-          "peer": true
-        },
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true,
-          "peer": true
-        },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-          "dev": true,
-          "peer": true
         }
       }
     },

From e1310b6464e7996d01d5f64538175ad074e1f316 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 22 Sep 2021 14:37:36 -0700
Subject: [PATCH 810/833] fix: JSDoc generation for modules without classes

---
 core/blockly.js                  | 12 +++++++
 core/css.js                      |  3 ++
 core/events/events.js            | 43 +++++++++++++++++++++++
 core/extensions.js               |  7 ++++
 core/procedures.js               | 11 ++++++
 core/serialization/priorities.js |  2 ++
 core/tooltip.js                  | 27 ++++++++++++++
 core/utils.js                    | 19 ++++++++++
 core/utils/aria.js               |  4 +++
 core/utils/colour.js             |  7 ++++
 core/utils/deprecation.js        |  1 +
 core/utils/dom.js                | 60 ++++++++++++++++++++------------
 core/utils/idgenerator.js        |  2 ++
 core/utils/keycodes.js           |  1 +
 core/utils/math.js               |  3 ++
 core/utils/object.js             |  4 +++
 core/utils/string.js             |  5 +++
 core/utils/style.js              | 10 ++++++
 core/utils/svg_paths.js          |  8 +++++
 core/utils/toolbox.js            | 20 +++++++++++
 core/utils/useragent.js          | 56 +++++++++++++++++++++--------
 core/utils/xml.js                |  7 ++++
 core/variables.js                | 20 ++++++++++-
 core/widgetdiv.js                |  8 +++++
 24 files changed, 303 insertions(+), 37 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index fe0c3021a..ffb8fa47d 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -75,6 +75,7 @@ goog.require('Blockly.Xml');
  * For local builds, you can pass --define='Blockly.VERSION=X.Y.Z' to the
  * compiler to override this constant.
  * @define {string}
+ * @alias Blockly.VERSION
  */
 exports.VERSION = 'uncompiled';
 
@@ -152,6 +153,7 @@ Object.defineProperties(exports, {
  * @param {!SVGElement} svg SVG image.
  * @return {!Size} Contains width and height properties.
  * @deprecated Use workspace.setCachedParentSvgSize. (2021 March 5)
+ * @alias Blockly.svgSize
  */
 const svgSize = function(svg) {
   // When removing this function, remove svg.cachedWidth_ and svg.cachedHeight_
@@ -168,6 +170,7 @@ exports.svgSize = svgSize;
  * Size the workspace when the contents change.  This also updates
  * scrollbars accordingly.
  * @param {!WorkspaceSvg} workspace The workspace to resize.
+ * @alias Blockly.resizeSvgContents
  */
 const resizeSvgContents = function(workspace) {
   workspace.resizeContents();
@@ -178,6 +181,7 @@ exports.resizeSvgContents = resizeSvgContents;
  * Copy a block or workspace comment onto the local clipboard.
  * @param {!ICopyable} toCopy Block or Workspace Comment to be copied.
  * @package
+ * @alias Blockly.copy
  */
 exports.copy = clipboard.copy;
 
@@ -185,6 +189,7 @@ 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
+ * @alias Blockly.paste
  */
 exports.paste = clipboard.paste;
 
@@ -193,6 +198,7 @@ exports.paste = clipboard.paste;
  * @param {!ICopyable} toDuplicate Block or Workspace Comment to be
  *     copied.
  * @package
+ * @alias Blockly.duplicate
  */
 exports.duplicate = clipboard.duplicate;
 
@@ -200,6 +206,7 @@ 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.
+ * @alias Blockly.hideChaff
  */
 const hideChaff = function(opt_onlyClosePopups) {
   deprecation.warn('Blockly.hideChaff', 'September 2021', 'September 2022');
@@ -212,6 +219,7 @@ exports.hideChaff = hideChaff;
  * focus).  Try not to use this function, particularly if there are multiple
  * Blockly instances on a page.
  * @return {!Workspace} The main workspace.
+ * @alias Blockly.getMainWorkspace
  */
 exports.getMainWorkspace = common.getMainWorkspace;
 
@@ -232,6 +240,7 @@ const jsonInitFactory = function(jsonDef) {
  * Define blocks from an array of JSON block definitions, as might be generated
  * by the Blockly Developer Tools.
  * @param {!Array<!Object>} jsonArray An array of JSON block definitions.
+ * @alias Blockly.defineBlocksWithJsonArray
  */
 const defineBlocksWithJsonArray = function(jsonArray) {
   for (let i = 0; i < jsonArray.length; i++) {
@@ -263,6 +272,7 @@ 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.
+ * @alias Blockly.isNumber
  */
 const isNumber = function(str) {
   return /^\s*-?\d+(\.\d+)?\s*$/.test(str);
@@ -276,6 +286,7 @@ exports.isNumber = isNumber;
  * is called.
  * This method is a NOP if called after the first ``Blockly.inject``.
  * @param {!Element} container The container element.
+ * @alias Blockly.setParentContainer
  */
 exports.setParentContainer = common.setParentContainer;
 
@@ -284,6 +295,7 @@ exports.setParentContainer = common.setParentContainer;
 /**
  * @see colour.hueToHex
  * @deprecated Use Blockly.utils.colour.hueToHex (September 2021).
+ * @alias Blockly.hueToHex
  */
  exports.hueToHex = colour.hueToHex;
 
diff --git a/core/css.js b/core/css.js
index 6f34e6c0d..519feac09 100644
--- a/core/css.js
+++ b/core/css.js
@@ -30,6 +30,7 @@ let injected = false;
  * components such as fields and the toolbox to store separate CSS.
  * The provided array of CSS will be destroyed by this function.
  * @param {!Array<string>} cssArray Array of CSS strings.
+ * @alias Blockly.Css.register
  */
 const register = function(cssArray) {
   if (injected) {
@@ -50,6 +51,7 @@ exports.register = register;
  * @param {boolean} hasCss If false, don't inject CSS
  *     (providing CSS becomes the document's responsibility).
  * @param {string} pathToMedia Path from page to the Blockly media directory.
+ * @alias Blockly.Css.inject
  */
 const inject = function(hasCss, pathToMedia) {
   // Only inject the CSS once.
@@ -77,6 +79,7 @@ exports.inject = inject;
 
 /**
  * Array making up the CSS content for Blockly.
+ * @alias Blockly.Css.CONTENT
  */
 const CONTENT = [
   `.blocklySvg {
diff --git a/core/events/events.js b/core/events/events.js
index 996391ee8..4c88f1c03 100644
--- a/core/events/events.js
+++ b/core/events/events.js
@@ -45,6 +45,7 @@ let group = '';
 /**
  * Sets whether the next event should be added to the undo stack.
  * @type {boolean}
+ * @alias Blockly.Events.recordUndo
  */
 let recordUndo = true;
 /** @deprecated September 2021 */
@@ -53,6 +54,7 @@ exports.recordUndo = recordUndo;
 /**
  * Sets whether events should be added to the undo stack.
  * @param {boolean} newValue True if events should be added to the undo stack.
+ * @alias Blockly.Events.setRecordUndo
  */
 const setRecordUndo = function(newValue) {
   recordUndo = newValue;
@@ -62,6 +64,7 @@ exports.setRecordUndo = setRecordUndo;
 /**
  * Returns whether or not events will be added to the undo stack.
  * @returns {boolean} True if events will be added to the undo stack.
+ * @alias Blockly.Events.getRecordUndo
  */
 const getRecordUndo = function() {
   return recordUndo;
@@ -94,6 +97,7 @@ let disabled = 0;
 /**
  * Name of event that creates a block. Will be deprecated for BLOCK_CREATE.
  * @const
+ * @alias Blockly.Events.CREATE
  */
 const CREATE = 'create';
 exports.CREATE = CREATE;
@@ -101,6 +105,7 @@ exports.CREATE = CREATE;
 /**
  * Name of event that creates a block.
  * @const
+ * @alias Blockly.Events.BLOCK_CREATE
  */
 const BLOCK_CREATE = CREATE;
 exports.BLOCK_CREATE = BLOCK_CREATE;
@@ -108,6 +113,7 @@ exports.BLOCK_CREATE = BLOCK_CREATE;
 /**
  * Name of event that deletes a block. Will be deprecated for BLOCK_DELETE.
  * @const
+ * @alias Blockly.Events.DELETE
  */
 const DELETE = 'delete';
 exports.DELETE = DELETE;
@@ -115,6 +121,7 @@ exports.DELETE = DELETE;
 /**
  * Name of event that deletes a block.
  * @const
+ * @alias Blockly.Events.BLOCK_DELETE
  */
 const BLOCK_DELETE = DELETE;
 exports.BLOCK_DELETE = BLOCK_DELETE;
@@ -122,6 +129,7 @@ exports.BLOCK_DELETE = BLOCK_DELETE;
 /**
  * Name of event that changes a block. Will be deprecated for BLOCK_CHANGE.
  * @const
+ * @alias Blockly.Events.CHANGE
  */
 const CHANGE = 'change';
 exports.CHANGE = CHANGE;
@@ -129,6 +137,7 @@ exports.CHANGE = CHANGE;
 /**
  * Name of event that changes a block.
  * @const
+ * @alias Blockly.Events.BLOCK_CHANGE
  */
 const BLOCK_CHANGE = CHANGE;
 exports.BLOCK_CHANGE = BLOCK_CHANGE;
@@ -136,6 +145,7 @@ exports.BLOCK_CHANGE = BLOCK_CHANGE;
 /**
  * Name of event that moves a block. Will be deprecated for BLOCK_MOVE.
  * @const
+ * @alias Blockly.Events.MOVE
  */
 const MOVE = 'move';
 exports.MOVE = MOVE;
@@ -143,6 +153,7 @@ exports.MOVE = MOVE;
 /**
  * Name of event that moves a block.
  * @const
+ * @alias Blockly.Events.BLOCK_MOVE
  */
 const BLOCK_MOVE = MOVE;
 exports.BLOCK_MOVE = BLOCK_MOVE;
@@ -150,6 +161,7 @@ exports.BLOCK_MOVE = BLOCK_MOVE;
 /**
  * Name of event that creates a variable.
  * @const
+ * @alias Blockly.Events.VAR_CREATE
  */
 const VAR_CREATE = 'var_create';
 exports.VAR_CREATE = VAR_CREATE;
@@ -157,6 +169,7 @@ exports.VAR_CREATE = VAR_CREATE;
 /**
  * Name of event that deletes a variable.
  * @const
+ * @alias Blockly.Events.VAR_DELETE
  */
 const VAR_DELETE = 'var_delete';
 exports.VAR_DELETE = VAR_DELETE;
@@ -164,6 +177,7 @@ exports.VAR_DELETE = VAR_DELETE;
 /**
  * Name of event that renames a variable.
  * @const
+ * @alias Blockly.Events.VAR_RENAME
  */
 const VAR_RENAME = 'var_rename';
 exports.VAR_RENAME = VAR_RENAME;
@@ -171,6 +185,7 @@ exports.VAR_RENAME = VAR_RENAME;
 /**
  * Name of generic event that records a UI change.
  * @const
+ * @alias Blockly.Events.UI
  */
 const UI = 'ui';
 exports.UI = UI;
@@ -178,6 +193,7 @@ exports.UI = UI;
 /**
  * Name of event that record a block drags a block.
  * @const
+ * @alias Blockly.Events.BLOCK_DRAG
  */
 const BLOCK_DRAG = 'drag';
 exports.BLOCK_DRAG = BLOCK_DRAG;
@@ -185,6 +201,7 @@ exports.BLOCK_DRAG = BLOCK_DRAG;
 /**
  * Name of event that records a change in selected element.
  * @const
+ * @alias Blockly.Events.SELECTED
  */
 const SELECTED = 'selected';
 exports.SELECTED = SELECTED;
@@ -192,6 +209,7 @@ exports.SELECTED = SELECTED;
 /**
  * Name of event that records a click.
  * @const
+ * @alias Blockly.Events.CLICK
  */
 const CLICK = 'click';
 exports.CLICK = CLICK;
@@ -199,6 +217,7 @@ exports.CLICK = CLICK;
 /**
  * Name of event that records a marker move.
  * @const
+ * @alias Blockly.Events.MARKER_MOVE
  */
 const MARKER_MOVE = 'marker_move';
 exports.MARKER_MOVE = MARKER_MOVE;
@@ -206,6 +225,7 @@ exports.MARKER_MOVE = MARKER_MOVE;
 /**
  * Name of event that records a bubble open.
  * @const
+ * @alias Blockly.Events.BUBBLE_OPEN
  */
 const BUBBLE_OPEN = 'bubble_open';
 exports.BUBBLE_OPEN = BUBBLE_OPEN;
@@ -213,6 +233,7 @@ exports.BUBBLE_OPEN = BUBBLE_OPEN;
 /**
  * Name of event that records a trashcan open.
  * @const
+ * @alias Blockly.Events.TRASHCAN_OPEN
  */
 const TRASHCAN_OPEN = 'trashcan_open';
 exports.TRASHCAN_OPEN = TRASHCAN_OPEN;
@@ -220,6 +241,7 @@ exports.TRASHCAN_OPEN = TRASHCAN_OPEN;
 /**
  * Name of event that records a toolbox item select.
  * @const
+ * @alias Blockly.Events.TOOLBOX_ITEM_SELECT
  */
 const TOOLBOX_ITEM_SELECT = 'toolbox_item_select';
 exports.TOOLBOX_ITEM_SELECT = TOOLBOX_ITEM_SELECT;
@@ -227,6 +249,7 @@ exports.TOOLBOX_ITEM_SELECT = TOOLBOX_ITEM_SELECT;
 /**
  * Name of event that records a theme change.
  * @const
+ * @alias Blockly.Events.THEME_CHANGE
  */
 const THEME_CHANGE = 'theme_change';
 exports.THEME_CHANGE = THEME_CHANGE;
@@ -234,6 +257,7 @@ exports.THEME_CHANGE = THEME_CHANGE;
 /**
  * Name of event that records a viewport change.
  * @const
+ * @alias Blockly.Events.VIEWPORT_CHANGE
  */
 const VIEWPORT_CHANGE = 'viewport_change';
 exports.VIEWPORT_CHANGE = VIEWPORT_CHANGE;
@@ -241,6 +265,7 @@ exports.VIEWPORT_CHANGE = VIEWPORT_CHANGE;
 /**
  * Name of event that creates a comment.
  * @const
+ * @alias Blockly.Events.COMMENT_CREATE
  */
 const COMMENT_CREATE = 'comment_create';
 exports.COMMENT_CREATE = COMMENT_CREATE;
@@ -248,6 +273,7 @@ exports.COMMENT_CREATE = COMMENT_CREATE;
 /**
  * Name of event that deletes a comment.
  * @const
+ * @alias Blockly.Events.COMMENT_DELETE
  */
 const COMMENT_DELETE = 'comment_delete';
 exports.COMMENT_DELETE = COMMENT_DELETE;
@@ -255,6 +281,7 @@ exports.COMMENT_DELETE = COMMENT_DELETE;
 /**
  * Name of event that changes a comment.
  * @const
+ * @alias Blockly.Events.COMMENT_CHANGE
  */
 const COMMENT_CHANGE = 'comment_change';
 exports.COMMENT_CHANGE = COMMENT_CHANGE;
@@ -262,12 +289,14 @@ exports.COMMENT_CHANGE = COMMENT_CHANGE;
 /**
  * Name of event that moves a comment.
  * @const
+ * @alias Blockly.Events.COMMENT_MOVE
  */
 const COMMENT_MOVE = 'comment_move';
 exports.COMMENT_MOVE = COMMENT_MOVE;
 
 /**
  * Name of event that records a workspace load.
+ * @alias Blockly.Events.FINISHED_LOADING
  */
 const FINISHED_LOADING = 'finished_loading';
 exports.FINISHED_LOADING = FINISHED_LOADING;
@@ -280,6 +309,7 @@ exports.FINISHED_LOADING = FINISHED_LOADING;
  * appear connected.
  * @typedef {!BlockCreate|!BlockMove|
  * !CommentCreate|!CommentMove}
+ * @alias Blockly.Events.BumpEvent
  */
 let BumpEvent;
 exports.BumpEvent = BumpEvent;
@@ -291,6 +321,7 @@ exports.BumpEvent = BumpEvent;
  * Not to be confused with bumping so that disconnected connections do not
  * appear connected.
  * @const
+ * @alias Blockly.Events.BUMP_EVENTS
  */
 const BUMP_EVENTS = [BLOCK_CREATE, BLOCK_MOVE, COMMENT_CREATE, COMMENT_MOVE];
 exports.BUMP_EVENTS = BUMP_EVENTS;
@@ -303,6 +334,7 @@ const FIRE_QUEUE = [];
 /**
  * Create a custom event and fire it.
  * @param {!Abstract} event Custom data for event.
+ * @alias Blockly.Events.fire
  */
 const fire = function(event) {
   if (!isEnabled()) {
@@ -339,6 +371,7 @@ const fireNow = function() {
  * @param {!Array<!Abstract>} queueIn Array of events.
  * @param {boolean} forward True if forward (redo), false if backward (undo).
  * @return {!Array<!Abstract>} Array of filtered events.
+ * @alias Blockly.Events.filter
  */
 const filter = function(queueIn, forward) {
   let queue = queueIn.slice();  // Shallow copy of queue.
@@ -412,6 +445,7 @@ exports.filter = filter;
 /**
  * Modify pending undo events so that when they are fired they don't land
  * in the undo stack.  Called by Workspace.clearUndo.
+ * @alias Blockly.Events.clearPendingUndo
  */
 const clearPendingUndo = function() {
   for (let i = 0, event; (event = FIRE_QUEUE[i]); i++) {
@@ -422,6 +456,7 @@ exports.clearPendingUndo = clearPendingUndo;
 
 /**
  * Stop sending events.  Every call to this function MUST also call enable.
+ * @alias Blockly.Events.disable
  */
 const disable = function() {
   disabled++;
@@ -431,6 +466,7 @@ exports.disable = disable;
 /**
  * Start sending events.  Unless events were already disabled when the
  * corresponding call to disable was made.
+ * @alias Blockly.Events.enable
  */
 const enable = function() {
   disabled--;
@@ -440,6 +476,7 @@ exports.enable = enable;
 /**
  * Returns whether events may be fired or not.
  * @return {boolean} True if enabled.
+ * @alias Blockly.Events.isEnabled
  */
 const isEnabled = function() {
   return disabled == 0;
@@ -449,6 +486,7 @@ exports.isEnabled = isEnabled;
 /**
  * Current group.
  * @return {string} ID string.
+ * @alias Blockly.Events.getGroup
  */
 const getGroup = function() {
   return group;
@@ -459,6 +497,7 @@ exports.getGroup = getGroup;
  * Start or stop a group.
  * @param {boolean|string} state True to start new group, false to end group.
  *   String to set group explicitly.
+ * @alias Blockly.Events.setGroup
  */
 const setGroup = function(state) {
   if (typeof state == 'boolean') {
@@ -473,6 +512,7 @@ exports.setGroup = setGroup;
  * Compute a list of the IDs of the specified block and all its descendants.
  * @param {!Block} block The root block.
  * @return {!Array<string>} List of block IDs.
+ * @alias Blockly.Events.getDescendantIds
  */
 const getDescendantIds = function(block) {
   const ids = [];
@@ -491,6 +531,7 @@ exports.getDescendantIds = getDescendantIds;
  * @param {!Workspace} workspace Target workspace for event.
  * @return {!Abstract} The event represented by the JSON.
  * @throws {Error} if an event type is not found in the registry.
+ * @alias Blockly.Events.fromJson
  */
 const fromJson = function(json, workspace) {
   const eventClass = get(json.type);
@@ -509,6 +550,7 @@ exports.fromJson = fromJson;
  * @param {string} eventType The type of the event to get.
  * @return {?function(new:Abstract, ...?)} The event class with
  *     the given type or null if none exists.
+ * @alias Blockly.Events.get
  */
 const get = function(eventType) {
   return registry.getClass(registry.Type.EVENT, eventType);
@@ -521,6 +563,7 @@ exports.get = get;
  * Recommend setting the 'disable' option to 'false' in the config so that
  * users don't try to re-enable disabled orphan blocks.
  * @param {!Abstract} event Custom data for event.
+ * @alias Blockly.Events.disableOrphans
  */
 const disableOrphans = function(event) {
   if (event.type == MOVE || event.type == CREATE) {
diff --git a/core/extensions.js b/core/extensions.js
index ef4e59bf4..f956bfed5 100644
--- a/core/extensions.js
+++ b/core/extensions.js
@@ -42,6 +42,7 @@ exports.TEST_ONLY = {allExtensions};
  * @param {Function} initFn The function to initialize an extended block.
  * @throws {Error} if the extension name is empty, the extension is already
  *     registered, or extensionFn is not a function.
+ * @alias Blockly.Extensions.register
  */
 const register = function(name, initFn) {
   if ((typeof name != 'string') || (name.trim() == '')) {
@@ -63,6 +64,7 @@ exports.register = register;
  * @param {!Object} mixinObj The values to mix in.
  * @throws {Error} if the extension name is empty or the extension is already
  *     registered.
+ * @alias Blockly.Extensions.registerMixin
  */
 const registerMixin = function(name, mixinObj) {
   if (!mixinObj || typeof mixinObj != 'object') {
@@ -86,6 +88,7 @@ exports.registerMixin = registerMixin;
  * @param {!Array<string>=} opt_blockList A list of blocks to appear in the
  *     flyout of the mutator dialog.
  * @throws {Error} if the mutation is invalid or can't be applied to the block.
+ * @alias Blockly.Extensions.registerMutator
  */
 const registerMutator = function(name, mixinObj, opt_helperFn, opt_blockList) {
   const errorPrefix = 'Error when registering mutator "' + name + '": ';
@@ -119,6 +122,7 @@ exports.registerMutator = registerMutator;
 /**
  * Unregisters the extension registered with the given name.
  * @param {string} name The name of the extension to unregister.
+ * @alias Blockly.Extensions.unregister
  */
 const unregister = function(name) {
   if (allExtensions[name]) {
@@ -137,6 +141,7 @@ exports.unregister = unregister;
  * @param {!Block} block The block to apply the named extension to.
  * @param {boolean} isMutator True if this extension defines a mutator.
  * @throws {Error} if the extension is not found.
+ * @alias Blockly.Extensions.apply
  */
 const apply = function(name, block, isMutator) {
   const extensionFn = allExtensions[name];
@@ -348,6 +353,7 @@ const mutatorPropertiesMatch = function(oldProperties, block) {
  * @param {!Object<string, string>} lookupTable The table of field values to
  *     tooltip text.
  * @return {!Function} The extension function.
+ * @alias Blockly.Extensions.buildTooltipForDropdown
  */
 const buildTooltipForDropdown = function(dropdownName, lookupTable) {
   // List of block types already validated, to minimize duplicate warnings.
@@ -430,6 +436,7 @@ const checkDropdownOptionsInTable = function(block, dropdownName, lookupTable) {
  *     %1 placeholder.
  * @param {string} fieldName The field with the replacement text.
  * @return {!Function} The extension function.
+ * @alias Blockly.Extensions.buildTooltipWithFieldText
  */
 const buildTooltipWithFieldText = function(msgTemplate, fieldName) {
   // Check the tooltip string messages for invalid references.
diff --git a/core/procedures.js b/core/procedures.js
index dbde96688..eec3484fd 100644
--- a/core/procedures.js
+++ b/core/procedures.js
@@ -40,6 +40,7 @@ goog.require('Blockly.Events.BlockChange');
 /**
  * The default argument for a procedures_mutatorarg block.
  * @type {string}
+ * @alias Blockly.Procedures.DEFAULT_ARG
  */
 const DEFAULT_ARG = 'x';
 exports.DEFAULT_ARG = DEFAULT_ARG;
@@ -51,6 +52,7 @@ exports.DEFAULT_ARG = DEFAULT_ARG;
  *    renameProcedure: function(string,string),
  *    getProcedureDef: function():!Array
  * }}
+ * @alias Blockly.Procedures.ProcedureBlock
  */
 let ProcedureBlock;
 exports.ProcedureBlock = ProcedureBlock;
@@ -62,6 +64,7 @@ exports.ProcedureBlock = ProcedureBlock;
  *     first contains procedures without return variables, the second with.
  *     Each procedure is defined by a three-element list of name, parameter
  *     list, and return value boolean.
+ * @alias Blockly.Procedures.allProcedures
  */
 const allProcedures = function(root) {
   const proceduresNoReturn =
@@ -97,6 +100,7 @@ const procTupleComparator = function(ta, tb) {
  * @param {string} name Proposed procedure name.
  * @param {!Block} block Block to disambiguate.
  * @return {string} Non-colliding name.
+ * @alias Blockly.Procedures.findLegalName
  */
 const findLegalName = function(name, block) {
   if (block.isInFlyout) {
@@ -137,6 +141,7 @@ const isLegalName = function(name, workspace, opt_exclude) {
  * @param {Block=} opt_exclude Optional block to exclude from
  *     comparisons (one doesn't want to collide with oneself).
  * @return {boolean} True if the name is used, otherwise return false.
+ * @alias Blockly.Procedures.isNameUsed
  */
 const isNameUsed = function(name, workspace, opt_exclude) {
   const blocks = workspace.getAllBlocks(false);
@@ -162,6 +167,7 @@ exports.isNameUsed = isNameUsed;
  * @param {string} name The proposed new name.
  * @return {string} The accepted name.
  * @this {Field}
+ * @alias Blockly.Procedures.rename
  */
 const rename = function(name) {
   // Strip leading and trailing whitespace.  Beyond this, all names are legal.
@@ -190,6 +196,7 @@ exports.rename = rename;
  * Construct the blocks required by the flyout for the procedure category.
  * @param {!Workspace} workspace The workspace containing procedures.
  * @return {!Array<!Element>} Array of XML block elements.
+ * @alias Blockly.Procedures.flyoutCategory
  */
 const flyoutCategory = function(workspace) {
   const xmlList = [];
@@ -297,6 +304,7 @@ const updateMutatorFlyout = function(workspace) {
  * Listens for when a procedure mutator is opened. Then it triggers a flyout
  * update and adds a mutator change listener to the mutator workspace.
  * @param {!Abstract} e The event that triggered this listener.
+ * @alias Blockly.Procedures.mutatorOpenListener
  */
 const mutatorOpenListener = function(e) {
   if (!(e.type == Events.BUBBLE_OPEN && e.bubbleType === 'mutator' &&
@@ -337,6 +345,7 @@ const mutatorChangeListener = function(e) {
  * @param {string} name Name of procedure.
  * @param {!Workspace} workspace The workspace to find callers in.
  * @return {!Array<!Block>} Array of caller blocks.
+ * @alias Blockly.Procedures.getCallers
  */
 const getCallers = function(name, workspace) {
   const callers = [];
@@ -360,6 +369,7 @@ exports.getCallers = getCallers;
  * When a procedure definition changes its parameters, find and edit all its
  * callers.
  * @param {!Block} defBlock Procedure definition block.
+ * @alias Blockly.Procedures.mutateCallers
  */
 const mutateCallers = function(defBlock) {
   const oldRecordUndo = Events.getRecordUndo();
@@ -391,6 +401,7 @@ exports.mutateCallers = mutateCallers;
  * @param {string} name Name of procedure.
  * @param {!Workspace} workspace The workspace to search.
  * @return {?Block} The procedure definition block, or null not found.
+ * @alias Blockly.Procedures.getDefinition
  */
 const getDefinition = function(name, workspace) {
   // Do not assume procedure is a top block. Some languages allow nested
diff --git a/core/serialization/priorities.js b/core/serialization/priorities.js
index 3535d5185..66efb03fd 100644
--- a/core/serialization/priorities.js
+++ b/core/serialization/priorities.js
@@ -23,6 +23,7 @@ goog.module.declareLegacyNamespace();
  * The priority for deserializing variables.
  * @type {number}
  * @const
+ * @alias Blockly.serialization.priorities.VARIABLES
  */
 exports.VARIABLES = 100;
 
@@ -30,5 +31,6 @@ exports.VARIABLES = 100;
  * The priority for deserializing blocks.
  * @type {number}
  * @const
+ * @alias Blockly.serialization.priorities.BLOCKS
  */
 exports.BLOCKS = 50;
diff --git a/core/tooltip.js b/core/tooltip.js
index b4f99de32..d0335556b 100644
--- a/core/tooltip.js
+++ b/core/tooltip.js
@@ -34,6 +34,7 @@ const deprecation = goog.require('Blockly.utils.deprecation');
  * returns either a string, or another arbitrarily nested function which
  * eventually unwinds to a string.
  * @typedef {string|{tooltip}|function(): (string|!Function)}
+ * @alias Blockly.Tooltip.TipInfo
  */
 let TipInfo;
 exports.TipInfo = TipInfo;
@@ -41,11 +42,17 @@ exports.TipInfo = TipInfo;
 /**
  * Is a tooltip currently showing?
  * @type {boolean}
+ * @alias Blockly.Tooltip.visible
  */
 let visible = false;
 /** @deprecated September 2021 */
 exports.visible;
 
+/**
+ * Returns whether or not a tooltip is showing
+ * @returns {boolean} True if a tooltip is showing
+ * @alias Blockly.Tooltip.isVisible
+ */
 const isVisible = function() {
   return visible;
 };
@@ -70,6 +77,7 @@ let blocked = false;
 
 /**
  * Maximum width (in characters) of a tooltip.
+ * @alias Blockly.Tooltip.LIMIT
  */
 const LIMIT = 50;
 exports.LIMIT = LIMIT;
@@ -109,30 +117,35 @@ let poisonedElement = null;
 
 /**
  * Horizontal offset between mouse cursor and tooltip.
+ * @alias Blockly.Tooltip.OFFSET_X
  */
 const OFFSET_X = 0;
 exports.OFFSET_X = OFFSET_X;
 
 /**
  * Vertical offset between mouse cursor and tooltip.
+ * @alias Blockly.Tooltip.OFFSET_Y
  */
 const OFFSET_Y = 10;
 exports.OFFSET_Y = OFFSET_Y;
 
 /**
  * Radius mouse can move before killing tooltip.
+ * @alias Blockly.Tooltip.RADIUS_OK
  */
 const RADIUS_OK = 10;
 exports.RADIUS_OK = RADIUS_OK;
 
 /**
  * Delay before tooltip appears.
+ * @alias Blockly.Tooltip.HOVER_MS
  */
 const HOVER_MS = 750;
 exports.HOVER_MS = HOVER_MS;
 
 /**
  * Horizontal padding between tooltip and screen edge.
+ * @alias Blockly.Tooltip.MARGINS
  */
 const MARGINS = 5;
 exports.MARGINS = MARGINS;
@@ -140,11 +153,17 @@ exports.MARGINS = MARGINS;
 /**
  * The HTML container.  Set once by createDom.
  * @type {Element}
+ * @alias Blockly.Tooltip.DIV
  */
 let DIV = null;
 /** @deprecated September 2021 */
 exports.DIV = DIV;
 
+/**
+ * Returns the HTML tooltip container.
+ * @returns {Element} The HTML tooltip container.
+ * @alias Blockly.Tooltip.getDiv
+ */
 const getDiv = function() {
   return DIV;
 };
@@ -165,6 +184,7 @@ Object.defineProperties(exports, {
  * Returns the tooltip text for the given element.
  * @param {?Object} object The object to get the tooltip text of.
  * @return {string} The tooltip text of the element.
+ * @alias Blockly.Tooltip.getTooltipOfObject
  */
 const getTooltipOfObject = function(object) {
   const obj = getTargetObject(object);
@@ -202,6 +222,7 @@ const getTargetObject = function(obj) {
 
 /**
  * Create the tooltip div and inject it onto the page.
+ * @alias Blockly.Tooltip.createDom
  */
 const createDom = function() {
   if (DIV) {
@@ -218,6 +239,7 @@ exports.createDom = createDom;
 /**
  * Binds the required mouse events onto an SVG element.
  * @param {!Element} element SVG element onto which tooltip is to be bound.
+ * @alias Blockly.Tooltip.bindMouseEvents
  */
 const bindMouseEvents = function(element) {
   element.mouseOverWrapper_ =
@@ -235,6 +257,7 @@ exports.bindMouseEvents = bindMouseEvents;
 /**
  * Unbinds tooltip mouse events from the SVG element.
  * @param {!Element} element SVG element onto which tooltip is bound.
+ * @alias Blockly.Tooltip.unbindMouseEvents
  */
 const unbindMouseEvents = function(element) {
   if (!element) {
@@ -323,6 +346,7 @@ const onMouseMove = function(e) {
 
 /**
  * Dispose of the tooltip.
+ * @alias Blockly.Tooltip.dispose
  */
 const dispose = function() {
   element = null;
@@ -334,6 +358,7 @@ exports.dispose = dispose;
 
 /**
  * Hide the tooltip.
+ * @alias Blockly.Tooltip.hide
  */
 const hide = function() {
   if (visible) {
@@ -351,6 +376,7 @@ exports.hide = hide;
 /**
  * Hide any in-progress tooltips and block showing new tooltips until the next
  * call to unblock().
+ * @alias Blockly.Tooltip.block
  */
 const block = function() {
   hide();
@@ -362,6 +388,7 @@ exports.block = block;
 /**
  * Unblock tooltips: allow them to be scheduled and shown according to their own
  * logic.
+ * @alias Blockly.Tooltip.unblock
  */
 const unblock = function() {
   blocked = false;
diff --git a/core/utils.js b/core/utils.js
index d618a90e4..2c80c6b08 100644
--- a/core/utils.js
+++ b/core/utils.js
@@ -73,6 +73,7 @@ exports.xml = xmlUtils;
  * Halts the propagation of the event without doing anything else.
  * @param {!Event} e An event.
  * @deprecated
+ * @alias Blockly.utils.noEvent
  */
 const noEvent = function(e) {
   deprecation.warn(
@@ -88,6 +89,7 @@ exports.noEvent = noEvent;
  * @param {!Event} e An event.
  * @return {boolean} True if text input.
  * @deprecated Use Blockly.browserEvents.isTargetInput instead.
+ * @alias Blockly.utils.isTargetInput
  */
 const isTargetInput = function(e) {
   deprecation.warn(
@@ -102,6 +104,7 @@ exports.isTargetInput = isTargetInput;
  * its parent.  Only for SVG elements and children (e.g. rect, g, path).
  * @param {!Element} element SVG element to find the coordinates of.
  * @return {!Coordinate} Object with .x and .y properties.
+ * @alias Blockly.utils.getRelativeXY
  */
 const getRelativeXY = function(element) {
   const xy = new Coordinate(0, 0);
@@ -146,6 +149,7 @@ exports.getRelativeXY = getRelativeXY;
  *     not a child of the div Blockly was injected into, the behaviour is
  *     undefined.
  * @return {!Coordinate} Object with .x and .y properties.
+ * @alias Blockly.utils.getInjectionDivXY_
  */
 const getInjectionDivXY = function(element) {
   let x = 0;
@@ -190,6 +194,7 @@ getRelativeXY.XY_STYLE_REGEX_ =
  * @param {!Event} e Mouse event.
  * @return {boolean} True if right-click.
  * @deprecated Use Blockly.browserEvents.isRightButton instead.
+ * @alias Blockly.utils.isRightButton
  */
 const isRightButton = function(e) {
   deprecation.warn(
@@ -207,6 +212,7 @@ exports.isRightButton = isRightButton;
  * @param {?SVGMatrix} matrix Inverted screen CTM to use.
  * @return {!SVGPoint} Object with .x and .y properties.
  * @deprecated Use Blockly.browserEvents.mouseToSvg instead;
+ * @alias Blockly.utils.mouseToSvg
  */
 const mouseToSvg = function(e, svg, matrix) {
   deprecation.warn(
@@ -222,6 +228,7 @@ exports.mouseToSvg = mouseToSvg;
  * @return {{x: number, y: number}} Scroll delta object with .x and .y
  *    properties.
  * @deprecated Use Blockly.browserEvents.getScrollDeltaPixels instead.
+ * @alias Blockly.utils.getScrollDeltaPixels
  */
 const getScrollDeltaPixels = function(e) {
   deprecation.warn(
@@ -240,6 +247,7 @@ exports.getScrollDeltaPixels = getScrollDeltaPixels;
  * @param {string} message Text which might contain string table references and
  *     interpolation tokens.
  * @return {!Array<string|number>} Array of strings and numbers.
+ * @alias Blockly.utils.tokenizeInterpolation
  */
 const tokenizeInterpolation = function(message) {
   return tokenizeInterpolation_(message, true);
@@ -253,6 +261,7 @@ exports.tokenizeInterpolation = tokenizeInterpolation;
  * @param {string|?} message Message, which may be a string that contains
  *     string table references.
  * @return {string} String with message references replaced.
+ * @alias Blockly.utils.replaceMessageReferences
  */
 const replaceMessageReferences = function(message) {
   if (typeof message != 'string') {
@@ -271,6 +280,7 @@ exports.replaceMessageReferences = replaceMessageReferences;
  * @param {string} message Text which might contain string table references.
  * @return {boolean} True if all message references have matching values.
  *     Otherwise, false.
+ * @alias Blockly.utils.checkMessageReferences
  */
 const checkMessageReferences = function(message) {
   let validSoFar = true;
@@ -434,6 +444,7 @@ const tokenizeInterpolation_ = function(message, parseInterpolationTokens) {
  * Generate a unique ID.
  * @return {string} A globally unique ID string.
  * @deprecated Use Blockly.utils.idGenerator.genUid instead.
+ * @alias Blockly.utils.genUid
  */
 const genUid = function() {
   deprecation.warn(
@@ -447,6 +458,7 @@ exports.genUid = genUid;
  * Check if 3D transforms are supported by adding an element
  * and attempting to set the property.
  * @return {boolean} True if 3D transforms are supported.
+ * @alias Blockly.utils.is3dSupported
  */
 const is3dSupported = function() {
   if (is3dSupported.cached_ !== undefined) {
@@ -498,6 +510,7 @@ exports.is3dSupported = is3dSupported;
  * Calls a function after the page has loaded, possibly immediately.
  * @param {function()} fn Function to run.
  * @throws Error Will throw if no global document can be found (e.g., Node.js).
+ * @alias Blockly.utils.runAfterPageLoad
  */
 const runAfterPageLoad = function(fn) {
   if (typeof document != 'object') {
@@ -522,6 +535,7 @@ exports.runAfterPageLoad = runAfterPageLoad;
  * scroll into account.
  * @return {!Rect} An object containing window width, height, and
  *     scroll position in window coordinates.
+ * @alias Blockly.utils.getViewportBBox
  */
 const getViewportBBox = function() {
   // Pixels, in window coordinates.
@@ -538,6 +552,7 @@ exports.getViewportBBox = getViewportBBox;
  * @param {!Array} arr Array from which to remove value.
  * @param {*} value Value to remove.
  * @return {boolean} True if an element was removed.
+ * @alias Blockly.utils.arrayRemove
  */
 const arrayRemove = function(arr, value) {
   const i = arr.indexOf(value);
@@ -554,6 +569,7 @@ exports.arrayRemove = arrayRemove;
  * Gets the document scroll distance as a coordinate object.
  * Copied from Closure's goog.dom.getDocumentScroll.
  * @return {!Coordinate} Object with values 'x' and 'y'.
+ * @alias Blockly.utils.getDocumentScroll
  */
 const getDocumentScroll = function() {
   const el = document.documentElement;
@@ -577,6 +593,7 @@ exports.getDocumentScroll = getDocumentScroll;
  *    statements (blocks that are not inside a value or statement input
  *    of the block).
  * @return {!Object} Map of types to type counts for descendants of the bock.
+ * @alias Blockly.utils.getBlockTypeCounts
  */
 const getBlockTypeCounts = function(block, opt_stripFollowing) {
   const typeCountsMap = Object.create(null);
@@ -605,6 +622,7 @@ exports.getBlockTypeCounts = getBlockTypeCounts;
  * @param {!Coordinate} screenCoordinates The screen coordinates to
  * be converted to workspace coordinates
  * @return {!Coordinate} The workspace coordinates.
+ * @alias Blockly.utils.screenToWsCoordinates
  */
 const screenToWsCoordinates = function(ws, screenCoordinates) {
   const screenX = screenCoordinates.x;
@@ -644,6 +662,7 @@ exports.screenToWsCoordinates = screenToWsCoordinates;
  * @return {{hue: ?number, hex: string}} An object containing the colour as
  *     a #RRGGBB string, and the hue if the input was an HSV hue value.
  * @throws {Error} If the colour cannot be parsed.
+ * @alias Blockly.utils.parseBlockColour
  */
 const parseBlockColour = function(colour) {
   const dereferenced =
diff --git a/core/utils/aria.js b/core/utils/aria.js
index 6d9274117..583f51786 100644
--- a/core/utils/aria.js
+++ b/core/utils/aria.js
@@ -29,6 +29,7 @@ const ROLE_ATTRIBUTE = 'role';
  * ARIA role values.
  * Copied from Closure's goog.a11y.aria.Role
  * @enum {string}
+ * @alias Blockly.utils.aria.Role
  */
 const Role = {
   // ARIA role for an interactive control of tabular data.
@@ -74,6 +75,7 @@ exports.Role = Role;
  * ARIA states and properties.
  * Copied from Closure's goog.a11y.aria.State
  * @enum {string}
+ * @alias Blockly.utils.aria.State
  */
 const State = {
   // ARIA property for setting the currently active descendant of an element,
@@ -143,6 +145,7 @@ exports.State = State;
  *
  * @param {!Element} element DOM node to set role of.
  * @param {!Blockly.utils.aria.Role} roleName Role name.
+ * @alias Blockly.utils.aria.setRole
  */
 const setRole = function(element, roleName) {
   element.setAttribute(ROLE_ATTRIBUTE, roleName);
@@ -158,6 +161,7 @@ exports.setRole = setRole;
  *     not an extra attribute.
  * @param {string|boolean|number|!Array<string>} value Value
  * for the state attribute.
+ * @alias Blockly.utils.aria.setState
  */
 const setState = function(element, stateName, value) {
   if (Array.isArray(value)) {
diff --git a/core/utils/colour.js b/core/utils/colour.js
index acdc18a8c..b12690316 100644
--- a/core/utils/colour.js
+++ b/core/utils/colour.js
@@ -31,6 +31,7 @@ const internalConstants = goog.require('Blockly.internalConstants');
  * @param {string|number} str Colour in some CSS format.
  * @return {?string} A string containing a hex representation of the colour,
  *   or null if can't be parsed.
+ * @alias Blockly.utils.colour.parse
  */
 const parse = function(str) {
   str = String(str).toLowerCase().trim();
@@ -69,6 +70,7 @@ exports.parse = parse;
  * @param {number} g Amount of green, int between 0 and 255.
  * @param {number} b Amount of blue, int between 0 and 255.
  * @return {string} Hex representation of the colour.
+ * @alias Blockly.utils.colour.rgbToHex
  */
 const rgbToHex = function(r, g, b) {
   const rgb = (r << 16) | (g << 8) | b;
@@ -84,6 +86,7 @@ exports.rgbToHex = rgbToHex;
  * @param {string} colour String representing colour in any
  *     colour format ('#ff0000', 'red', '0xff000', etc).
  * @return {!Array<number>} RGB representation of the colour.
+ * @alias Blockly.utils.colour.hexToRgb
  */
 const hexToRgb = function(colour) {
   const hex = parse(colour);
@@ -106,6 +109,7 @@ exports.hexToRgb = hexToRgb;
  * @param {number} s Saturation value in [0, 1].
  * @param {number} v Brightness in [0, 255].
  * @return {string} Hex representation of the colour.
+ * @alias Blockly.utils.colour.hsvToHex
  */
 const hsvToHex = function(h, s, v) {
   let red = 0;
@@ -167,6 +171,7 @@ exports.hsvToHex = hsvToHex;
  * @param {number} factor The weight to be given to colour1 over colour2.
  *     Values should be in the range [0, 1].
  * @return {?string} Combined colour represented in hex.
+ * @alias Blockly.utils.colour.blend
  */
 const blend = function(colour1, colour2, factor) {
   const hex1 = parse(colour1);
@@ -193,6 +198,7 @@ exports.blend = blend;
  * while the values are the "hex" values.
  *
  * @type {!Object<string, string>}
+ * @alias Blockly.utils.colour.names
  */
 const names = {
   'aqua': '#00ffff',
@@ -218,6 +224,7 @@ exports.names = names;
  * Convert a hue (HSV model) into an RGB hex triplet.
  * @param {number} hue Hue on a colour wheel (0-360).
  * @return {string} RGB code, e.g. '#5ba65b'.
+ * @alias Blockly.utils.colour.hueToHex
  */
 const hueToHex = function(hue) {
   return hsvToHex(
diff --git a/core/utils/deprecation.js b/core/utils/deprecation.js
index 4edfef9a4..a6dc9b851 100644
--- a/core/utils/deprecation.js
+++ b/core/utils/deprecation.js
@@ -27,6 +27,7 @@ goog.module('Blockly.utils.deprecation');
  *     deprecation date.
  * @param {string=} opt_use The name of a function or property to use instead,
  *     if any.
+ * @alias Blockly.utils.deprecation.warn
  */
 const warn = function(name, deprecationDate, deletionDate, opt_use) {
   let msg = name + ' was deprecated on ' + deprecationDate +
diff --git a/core/utils/dom.js b/core/utils/dom.js
index f22a1a458..f9e5f409f 100644
--- a/core/utils/dom.js
+++ b/core/utils/dom.js
@@ -26,25 +26,32 @@ const userAgent = goog.require('Blockly.utils.userAgent');
 /**
  * Required name space for SVG elements.
  * @const
+ * @alias Blockly.utils.dom.SVG_NS
  */
 const SVG_NS = 'http://www.w3.org/2000/svg';
+exports.SVG_NS = SVG_NS;
 
 /**
  * Required name space for HTML elements.
  * @const
+ * @alias Blockly.utils.dom.HTML_NS
  */
 const HTML_NS = 'http://www.w3.org/1999/xhtml';
+exports.HTML_NS = HTML_NS;
 
 /**
  * Required name space for XLINK elements.
  * @const
+ * @alias Blockly.utils.dom.XLINK_NS
  */
 const XLINK_NS = 'http://www.w3.org/1999/xlink';
+exports.XLINK_NS = XLINK_NS;
 
 /**
  * Node type constants.
  * https://developer.mozilla.org/en-US/docs/Web/API/Node/nodeType
  * @enum {number}
+ * @alias Blockly.utils.dom.NodeType
  */
 const NodeType = {
   ELEMENT_NODE: 1,
@@ -52,6 +59,7 @@ const NodeType = {
   COMMENT_NODE: 8,
   DOCUMENT_POSITION_CONTAINED_BY: 16
 };
+exports.NodeType = NodeType;
 
 /**
  * Temporary cache of text widths.
@@ -82,6 +90,7 @@ let canvasContext = null;
  * @return {T} Newly created SVG element.  The return type is {!SVGElement} if
  *     name is a string or a more specific type if it a member of Svg.
  * @template T
+ * @alias Blockly.utils.dom.createSvgElement
  */
 const createSvgElement = function(name, attrs, opt_parent) {
   const e = /** @type {T} */
@@ -100,6 +109,7 @@ const createSvgElement = function(name, attrs, opt_parent) {
   }
   return e;
 };
+exports.createSvgElement = createSvgElement;
 
 /**
  * Add a CSS class to a element.
@@ -107,6 +117,7 @@ const createSvgElement = function(name, attrs, opt_parent) {
  * @param {!Element} element DOM element to add class to.
  * @param {string} className Name of class to add.
  * @return {boolean} True if class was added, false if already present.
+ * @alias Blockly.utils.dom.addClass
  */
 const addClass = function(element, className) {
   let classes = element.getAttribute('class') || '';
@@ -119,12 +130,14 @@ const addClass = function(element, className) {
   element.setAttribute('class', classes + className);
   return true;
 };
+exports.addClass = addClass;
 
 /**
  * Removes multiple calsses from an element.
  * @param {!Element} element DOM element to remove classes from.
  * @param {string} classNames A string of one or multiple class names for an
  *    element.
+ * @alias Blockly.utils.dom.removeClasses
  */
 const removeClasses = function(element, classNames) {
   const classList = classNames.split(' ');
@@ -132,6 +145,7 @@ const removeClasses = function(element, classNames) {
     removeClass(element, classList[i]);
   }
 };
+exports.removeClasses = removeClasses;
 
 /**
  * Remove a CSS class from a element.
@@ -139,6 +153,7 @@ const removeClasses = function(element, classNames) {
  * @param {!Element} element DOM element to remove class from.
  * @param {string} className Name of class to remove.
  * @return {boolean} True if class was removed, false if never present.
+ * @alias Blockly.utils.dom.removeClass
  */
 const removeClass = function(element, className) {
   const classes = element.getAttribute('class');
@@ -159,6 +174,7 @@ const removeClass = function(element, className) {
   }
   return true;
 };
+exports.removeClass = removeClass;
 
 /**
  * Checks if an element has the specified CSS class.
@@ -166,27 +182,32 @@ const removeClass = function(element, className) {
  * @param {!Element} element DOM element to check.
  * @param {string} className Name of class to check.
  * @return {boolean} True if class exists, false otherwise.
+ * @alias Blockly.utils.dom.hasClass
  */
 const hasClass = function(element, className) {
   const classes = element.getAttribute('class');
   return (' ' + classes + ' ').indexOf(' ' + className + ' ') != -1;
 };
+exports.hasClass = hasClass;
 
 /**
  * Removes a node from its parent. No-op if not attached to a parent.
  * @param {?Node} node The node to remove.
  * @return {?Node} The node removed if removed; else, null.
+ * @alias Blockly.utils.dom.removeNode
  */
 // Copied from Closure goog.dom.removeNode
 const removeNode = function(node) {
   return node && node.parentNode ? node.parentNode.removeChild(node) : null;
 };
+exports.removeNode = removeNode;
 
 /**
  * Insert a node after a reference node.
  * Contrast with node.insertBefore function.
  * @param {!Element} newNode New element to insert.
  * @param {!Element} refNode Existing element to precede new node.
+ * @alias Blockly.utils.dom.insertAfter
  */
 const insertAfter = function(newNode, refNode) {
   const siblingNode = refNode.nextSibling;
@@ -200,18 +221,21 @@ const insertAfter = function(newNode, refNode) {
     parentNode.appendChild(newNode);
   }
 };
+exports.insertAfter = insertAfter;
 
 /**
  * Whether a node contains another node.
  * @param {!Node} parent The node that should contain the other node.
  * @param {!Node} descendant The node to test presence of.
  * @return {boolean} Whether the parent node contains the descendant node.
+ * @alias Blockly.utils.dom.containsNode
  */
 const containsNode = function(parent, descendant) {
   return !!(
       parent.compareDocumentPosition(descendant) &
       NodeType.DOCUMENT_POSITION_CONTAINED_BY);
 };
+exports.containsNode = containsNode;
 
 /**
  * Sets the CSS transform property on an element. This function sets the
@@ -219,15 +243,18 @@ const containsNode = function(parent, descendant) {
  * with older browsers. See https://caniuse.com/#feat=transforms2d
  * @param {!Element} element Element to which the CSS transform will be applied.
  * @param {string} transform The value of the CSS `transform` property.
+ * @alias Blockly.utils.dom.setCssTransform
  */
 const setCssTransform = function(element, transform) {
   element.style['transform'] = transform;
   element.style['-webkit-transform'] = transform;
 };
+exports.setCssTransform = setCssTransform;
 
 /**
  * Start caching text widths. Every call to this function MUST also call
  * stopTextWidthCache. Caches must not survive between execution threads.
+ * @alias Blockly.utils.dom.startTextWidthCache
  */
 const startTextWidthCache = function() {
   cacheReference++;
@@ -235,10 +262,12 @@ const startTextWidthCache = function() {
     cacheWidths = Object.create(null);
   }
 };
+exports.startTextWidthCache = startTextWidthCache;
 
 /**
  * Stop caching field widths. Unless caching was already on when the
  * corresponding call to startTextWidthCache was made.
+ * @alias Blockly.utils.dom.stopTextWidthCache
  */
 const stopTextWidthCache = function() {
   cacheReference--;
@@ -246,11 +275,13 @@ const stopTextWidthCache = function() {
     cacheWidths = null;
   }
 };
+exports.stopTextWidthCache = stopTextWidthCache;
 
 /**
  * Gets the width of a text element, caching it in the process.
  * @param {!Element} textElement An SVG 'text' element.
  * @return {number} Width of element.
+ * @alias Blockly.utils.dom.getTextWidth
  */
 const getTextWidth = function(textElement) {
   const key = textElement.textContent + '\n' + textElement.className.baseVal;
@@ -285,6 +316,7 @@ const getTextWidth = function(textElement) {
   }
   return width;
 };
+exports.getTextWidth = getTextWidth;
 
 /**
  * Gets the width of a text element using a faster method than `getTextWidth`.
@@ -295,12 +327,14 @@ const getTextWidth = function(textElement) {
  * @param {string} fontWeight The font weight to use.
  * @param {string} fontFamily The font family to use.
  * @return {number} Width of element.
+ * @alias Blockly.utils.dom.getFastTextWidth
  */
 const getFastTextWidth = function(
     textElement, fontSize, fontWeight, fontFamily) {
   return getFastTextWidthWithSizeString(
       textElement, fontSize + 'pt', fontWeight, fontFamily);
 };
+exports.getFastTextWidth = getFastTextWidth;
 
 /**
  * Gets the width of a text element using a faster method than `getTextWidth`.
@@ -313,6 +347,7 @@ const getFastTextWidth = function(
  * @param {string} fontWeight The font weight to use.
  * @param {string} fontFamily The font family to use.
  * @return {number} Width of element.
+ * @alias Blockly.utils.dom.getFastTextWidthWithSizeString
  */
 const getFastTextWidthWithSizeString = function(
     textElement, fontSize, fontWeight, fontFamily) {
@@ -351,6 +386,7 @@ const getFastTextWidthWithSizeString = function(
   }
   return width;
 };
+exports.getFastTextWidthWithSizeString = getFastTextWidthWithSizeString;
 
 /**
  * Measure a font's metrics. The height and baseline values.
@@ -359,6 +395,7 @@ const getFastTextWidthWithSizeString = function(
  * @param {string} fontWeight The font weight to use.
  * @param {string} fontFamily The font family to use.
  * @return {{height: number, baseline: number}} Font measurements.
+ * @alias Blockly.utils.dom.measureFontMetrics
  */
 const measureFontMetrics = function(text, fontSize, fontWeight, fontFamily) {
   const span = document.createElement('span');
@@ -386,25 +423,4 @@ const measureFontMetrics = function(text, fontSize, fontWeight, fontFamily) {
   }
   return result;
 };
-
-exports = {
-  SVG_NS,
-  HTML_NS,
-  XLINK_NS,
-  NodeType,
-  createSvgElement,
-  addClass,
-  removeClasses,
-  removeClass,
-  hasClass,
-  removeNode,
-  insertAfter,
-  containsNode,
-  setCssTransform,
-  startTextWidthCache,
-  stopTextWidthCache,
-  getTextWidth,
-  getFastTextWidth,
-  getFastTextWidthWithSizeString,
-  measureFontMetrics,
-};
+exports.measureFontMetrics = measureFontMetrics;
diff --git a/core/utils/idgenerator.js b/core/utils/idgenerator.js
index 5c8c61b08..fcd04abc1 100644
--- a/core/utils/idgenerator.js
+++ b/core/utils/idgenerator.js
@@ -39,6 +39,7 @@ let nextId = 0;
  * primarily be used for IDs that end up in the DOM.
  *
  * @return {string} The next unique identifier.
+ * @alias Blockly.utils.idGenerator.getNextUniqueId
  */
 const getNextUniqueId = function() {
   return 'blockly-' + (nextId++).toString(36);
@@ -74,6 +75,7 @@ internal.genUid = function() {
  * Generate a random unique ID.
  * @see internal.genUid
  * @return {string} A globally unique ID string.
+ * @alias Blockly.utils.idGenerator.genUid
  */
 const genUid = function() {
   return internal.genUid();
diff --git a/core/utils/keycodes.js b/core/utils/keycodes.js
index 1501fa2ac..ce7beed29 100644
--- a/core/utils/keycodes.js
+++ b/core/utils/keycodes.js
@@ -28,6 +28,7 @@ goog.module('Blockly.utils.KeyCodes');
  * correct for non US keyboard layouts. See comments below.
  *
  * @enum {number}
+ * @alias Blockly.utils.KeyCodes
  */
 const KeyCodes = {
   WIN_KEY_FF_LINUX: 0,
diff --git a/core/utils/math.js b/core/utils/math.js
index c54f6fb0f..7140ae893 100644
--- a/core/utils/math.js
+++ b/core/utils/math.js
@@ -24,6 +24,7 @@ goog.module('Blockly.utils.math');
  * Copied from Closure's goog.math.toRadians.
  * @param {number} angleDegrees Angle in degrees.
  * @return {number} Angle in radians.
+ * @alias Blockly.utils.math.toRadians
  */
 const toRadians = function(angleDegrees) {
   return angleDegrees * Math.PI / 180;
@@ -35,6 +36,7 @@ exports.toRadians = toRadians;
  * Copied from Closure's goog.math.toDegrees.
  * @param {number} angleRadians Angle in radians.
  * @return {number} Angle in degrees.
+ * @alias Blockly.utils.math.toDegrees
  */
 const toDegrees = function(angleRadians) {
   return angleRadians * 180 / Math.PI;
@@ -47,6 +49,7 @@ exports.toDegrees = toDegrees;
  * @param {number} number The number to clamp.
  * @param {number} upperBound The desired upper bound.
  * @return {number} The clamped number.
+ * @alias Blockly.utils.math.clamp
  */
 const clamp = function(lowerBound, number, upperBound) {
   if (upperBound < lowerBound) {
diff --git a/core/utils/object.js b/core/utils/object.js
index bb56d11fd..3e1795839 100644
--- a/core/utils/object.js
+++ b/core/utils/object.js
@@ -22,6 +22,7 @@ goog.module('Blockly.utils.object');
  * @param {!Function} childCtor Child class.
  * @param {!Function} parentCtor Parent class.
  * @suppress {strictMissingProperties} superClass_ is not defined on Function.
+ * @alias Blockly.utils.object.inherits
  */
 const inherits = function(childCtor, parentCtor) {
   // Set a .superClass_ property so that methods can call parent methods
@@ -45,6 +46,7 @@ exports.inherits = inherits;
  * Copies all the members of a source object to a target object.
  * @param {!Object} target Target.
  * @param {!Object} source Source.
+ * @alias Blockly.utils.object.mixin
  */
 const mixin = function(target, source) {
   for (const x in source) {
@@ -58,6 +60,7 @@ exports.mixin = mixin;
  * @param {!Object} target Target.
  * @param {!Object} source Source.
  * @return {!Object} The resulting object.
+ * @alias Blockly.utils.object.deepMerge
  */
 const deepMerge = function(target, source) {
   for (const x in source) {
@@ -75,6 +78,7 @@ exports.deepMerge = deepMerge;
  * Returns an array of a given object's own enumerable property values.
  * @param {!Object} obj Object containing values.
  * @return {!Array} Array of values.
+ * @alias Blockly.utils.object.values
  */
 const values = function(obj) {
   if (Object.values) {
diff --git a/core/utils/string.js b/core/utils/string.js
index f65673f09..f283b982f 100644
--- a/core/utils/string.js
+++ b/core/utils/string.js
@@ -25,6 +25,7 @@ goog.module('Blockly.utils.string');
  * @param {string} str The string to check.
  * @param {string} prefix A string to look for at the start of `str`.
  * @return {boolean} True if `str` begins with `prefix`.
+ * @alias Blockly.utils.string.startsWith
  */
 const startsWith = function(str, prefix) {
   return str.lastIndexOf(prefix, 0) == 0;
@@ -35,6 +36,7 @@ exports.startsWith = startsWith;
  * Given an array of strings, return the length of the shortest one.
  * @param {!Array<string>} array Array of strings.
  * @return {number} Length of shortest string.
+ * @alias Blockly.utils.string.shortestStringLength
  */
 const shortestStringLength = function(array) {
   if (!array.length) {
@@ -54,6 +56,7 @@ exports.shortestStringLength = shortestStringLength;
  * @param {!Array<string>} array Array of strings.
  * @param {number=} opt_shortest Length of shortest string.
  * @return {number} Length of common prefix.
+ * @alias Blockly.utils.string.commonWordPrefix
  */
 const commonWordPrefix = function(array, opt_shortest) {
   if (!array.length) {
@@ -91,6 +94,7 @@ exports.commonWordPrefix = commonWordPrefix;
  * @param {!Array<string>} array Array of strings.
  * @param {number=} opt_shortest Length of shortest string.
  * @return {number} Length of common suffix.
+ * @alias Blockly.utils.string.commonWordSuffix
  */
 const commonWordSuffix = function(array, opt_shortest) {
   if (!array.length) {
@@ -127,6 +131,7 @@ exports.commonWordSuffix = commonWordSuffix;
  * @param {string} text Text to wrap.
  * @param {number} limit Width to wrap each line.
  * @return {string} Wrapped text.
+ * @alias Blockly.utils.string.wrap
  */
 const wrap = function(text, limit) {
   const lines = text.split('\n');
diff --git a/core/utils/style.js b/core/utils/style.js
index 13d05e752..fac432edb 100644
--- a/core/utils/style.js
+++ b/core/utils/style.js
@@ -27,6 +27,7 @@ const Size = goog.require('Blockly.utils.Size');
  * Similar to Closure's goog.style.getSize
  * @param {!Element} element Element to get size of.
  * @return {!Size} Object with width/height properties.
+ * @alias Blockly.utils.style.getSize
  */
 const getSize = function(element) {
   if (getStyle(element, 'display') != 'none') {
@@ -94,6 +95,7 @@ const getStyle = function(element, style) {
  * @param {!Element} element Element to get style of.
  * @param {string} property Property to get (camel-case).
  * @return {string} Style value.
+ * @alias Blockly.utils.style.getComputedStyle
  */
 const getComputedStyle = function(element, property) {
   if (document.defaultView && document.defaultView.getComputedStyle) {
@@ -118,6 +120,7 @@ exports.getComputedStyle = getComputedStyle;
  * @param {!Element} element Element to get style of.
  * @param {string} style Property to get (camel-case).
  * @return {string} Style value.
+ * @alias Blockly.utils.style.getCascadedStyle
  */
 const getCascadedStyle = function(element, style) {
   return /** @type {string} */ (
@@ -130,6 +133,7 @@ exports.getCascadedStyle = getCascadedStyle;
  * Similar to Closure's goog.style.getPageOffset
  * @param {!Element} el Element to get the page offset for.
  * @return {!Coordinate} The page offset.
+ * @alias Blockly.utils.style.getPageOffset
  */
 const getPageOffset = function(el) {
   const pos = new Coordinate(0, 0);
@@ -152,6 +156,7 @@ exports.getPageOffset = getPageOffset;
  * Calculates the viewport coordinates relative to the document.
  * Similar to Closure's goog.style.getViewportPageOffset
  * @return {!Coordinate} The page offset of the viewport.
+ * @alias Blockly.utils.style.getViewportPageOffset
  */
 const getViewportPageOffset = function() {
   const body = document.body;
@@ -173,6 +178,7 @@ exports.getViewportPageOffset = getViewportPageOffset;
  * @param {!Element} el Element to show or hide.
  * @param {*} isShown True to render the element in its default style,
  *     false to disable rendering the element.
+ * @alias Blockly.utils.style.setElementShown
  */
 const setElementShown = function(el, isShown) {
   el.style.display = isShown ? '' : 'none';
@@ -185,6 +191,7 @@ exports.setElementShown = setElementShown;
  *
  * @param {!Element} el The element to test.
  * @return {boolean} True for right to left, false for left to right.
+ * @alias Blockly.utils.style.isRightToLeft
  */
 const isRightToLeft = function(el) {
   return 'rtl' == getStyle(el, 'direction');
@@ -196,6 +203,7 @@ exports.isRightToLeft = isRightToLeft;
  * Copied from Closure's goog.style.getBorderBox
  * @param {!Element} element  The element to get the border widths for.
  * @return {!Object} The computed border widths.
+ * @alias Blockly.utils.style.getBorderBox
  */
 const getBorderBox = function(element) {
   const left = getComputedStyle(element, 'borderLeftWidth');
@@ -224,6 +232,7 @@ exports.getBorderBox = getBorderBox;
  *     document scroll element will be used.
  * @param {boolean=} opt_center Whether to center the element in the container.
  *     Defaults to false.
+ * @alias Blockly.utils.style.scrollIntoContainerView
  */
 const scrollIntoContainerView = function(element, container, opt_center) {
   const offset = getContainerOffsetToScrollInto(element, container, opt_center);
@@ -246,6 +255,7 @@ exports.scrollIntoContainerView = scrollIntoContainerView;
  *     Defaults to false.
  * @return {!Coordinate} The new scroll position of the container,
  *     in form of goog.math.Coordinate(scrollLeft, scrollTop).
+ * @alias Blockly.utils.style.getContainerOffsetToScrollInto
  */
 const getContainerOffsetToScrollInto = function(element, container, opt_center) {
   // Absolute position of the element's border's top left corner.
diff --git a/core/utils/svg_paths.js b/core/utils/svg_paths.js
index a1f9bf2e8..bf4c1b2ca 100644
--- a/core/utils/svg_paths.js
+++ b/core/utils/svg_paths.js
@@ -26,6 +26,7 @@ goog.module('Blockly.utils.svgPaths');
  * @param {number} x The x coordinate.
  * @param {number} y The y coordinate.
  * @return {string} A string of the format ' x,y '
+ * @alias Blockly.utils.svgPaths.point
  */
 const point = function(x, y) {
   return ' ' + x + ',' + y + ' ';
@@ -43,6 +44,7 @@ exports.point = point;
  *     the format ' x, y '.
  * @return {string} A string defining one or more Bezier curves.  See the MDN
  *     documentation for exact format.
+ * @alias Blockly.utils.svgPaths.curve
  */
 const curve = function(command, points) {
   return ' ' + command + points.join('');
@@ -57,6 +59,7 @@ exports.curve = curve;
  * @param {number} x The absolute x coordinate.
  * @param {number} y The absolute y coordinate.
  * @return {string} A string of the format ' M x,y '
+ * @alias Blockly.utils.svgPaths.moveTo
  */
 const moveTo = function(x, y) {
   return ' M ' + x + ',' + y + ' ';
@@ -71,6 +74,7 @@ exports.moveTo = moveTo;
  * @param {number} dx The relative x coordinate.
  * @param {number} dy The relative y coordinate.
  * @return {string} A string of the format ' m dx,dy '
+ * @alias Blockly.utils.svgPaths.moveBy
  */
 const moveBy = function(dx, dy) {
   return ' m ' + dx + ',' + dy + ' ';
@@ -85,6 +89,7 @@ exports.moveBy = moveBy;
  * @param {number} dx The relative x coordinate.
  * @param {number} dy The relative y coordinate.
  * @return {string} A string of the format ' l dx,dy '
+ * @alias Blockly.utils.svgPaths.lineTo
  */
 const lineTo = function(dx, dy) {
   return ' l ' + dx + ',' + dy + ' ';
@@ -100,6 +105,7 @@ exports.lineTo = lineTo;
  *     draw lines to, in order.  The points are represented as strings of the
  *     format ' dx,dy '.
  * @return {string} A string of the format ' l (dx,dy)+ '
+ * @alias Blockly.utils.svgPaths.line
  */
 const line = function(points) {
   return ' l' + points.join('');
@@ -117,6 +123,7 @@ exports.line = line;
  * @param {number} val The coordinate to pass to the command.  It may be
  *     absolute or relative.
  * @return {string} A string of the format ' command val '
+ * @alias Blockly.utils.svgPaths.lineOnAxis
  */
 const lineOnAxis = function(command, val) {
   return ' ' + command + ' ' + val + ' ';
@@ -135,6 +142,7 @@ exports.lineOnAxis = lineOnAxis;
  *     specified either in absolute or relative coordinates depending on the
  *     command.
  * @return {string} A string of the format 'command radius radius flags point'
+ * @alias Blockly.utils.svgPaths.arc
  */
 const arc = function(command, flags, radius, point) {
   return command + ' ' + radius + ' ' + radius + ' ' + flags + point;
diff --git a/core/utils/toolbox.js b/core/utils/toolbox.js
index 3c26205b8..0be8b1715 100644
--- a/core/utils/toolbox.js
+++ b/core/utils/toolbox.js
@@ -47,6 +47,7 @@ const userAgent = goog.require('Blockly.utils.userAgent');
  *            inputs: (!Object<string, !ConnectionState>|undefined),
  *            next: (!ConnectionState|undefined)
  *          }}
+ * @alias Blockly.utils.toolbox.BlockInfo
  */
 let BlockInfo;
 exports.BlockInfo = BlockInfo;
@@ -59,6 +60,7 @@ exports.BlockInfo = BlockInfo;
  *            gap:(number|undefined),
  *            cssconfig:(!ToolboxSeparator.CssConfig|undefined)
  *          }}
+ * @alias Blockly.utils.toolbox.SeparatorInfo
  */
 let SeparatorInfo;
 exports.SeparatorInfo = SeparatorInfo;
@@ -70,6 +72,7 @@ exports.SeparatorInfo = SeparatorInfo;
  *            text:string,
  *            callbackkey:string
  *          }}
+ * @alias Blockly.utils.toolbox.ButtonInfo
  */
 let ButtonInfo;
 exports.ButtonInfo = ButtonInfo;
@@ -81,6 +84,7 @@ exports.ButtonInfo = ButtonInfo;
  *            text:string,
  *            id:(string|undefined)
  *          }}
+ * @alias Blockly.utils.toolbox.LabelInfo
  */
 let LabelInfo;
 exports.LabelInfo = LabelInfo;
@@ -89,6 +93,7 @@ exports.LabelInfo = LabelInfo;
  * The information needed to create either a button or a label in the flyout.
  * @typedef {ButtonInfo|
  *           LabelInfo}
+ * @alias Blockly.utils.toolbox.ButtonOrLabelInfo
  */
 let ButtonOrLabelInfo;
 exports.ButtonOrLabelInfo = ButtonOrLabelInfo;
@@ -105,6 +110,7 @@ exports.ButtonOrLabelInfo = ButtonOrLabelInfo;
  *            cssconfig:(!ToolboxCategory.CssConfig|undefined),
  *            hidden:(string|undefined)
  *          }}
+ * @alias Blockly.utils.toolbox.StaticCategoryInfo
  */
 let StaticCategoryInfo;
 exports.StaticCategoryInfo = StaticCategoryInfo;
@@ -120,6 +126,7 @@ exports.StaticCategoryInfo = StaticCategoryInfo;
  *            cssconfig:(!ToolboxCategory.CssConfig|undefined),
  *            hidden:(string|undefined)
  *          }}
+ * @alias Blockly.utils.toolbox.DynamicCategoryInfo
  */
 let DynamicCategoryInfo;
 exports.DynamicCategoryInfo = DynamicCategoryInfo;
@@ -128,6 +135,7 @@ exports.DynamicCategoryInfo = DynamicCategoryInfo;
  * The information needed to create either a dynamic or static category.
  * @typedef {StaticCategoryInfo|
  *           DynamicCategoryInfo}
+ * @alias Blockly.utils.toolbox.CategoryInfo
  */
 let CategoryInfo;
 exports.CategoryInfo = CategoryInfo;
@@ -136,6 +144,7 @@ exports.CategoryInfo = CategoryInfo;
  * Any information that can be used to create an item in the toolbox.
  * @typedef {FlyoutItemInfo|
  *           StaticCategoryInfo}
+ * @alias Blockly.utils.toolbox.ToolboxItemInfo
  */
 let ToolboxItemInfo;
 exports.ToolboxItemInfo = ToolboxItemInfo;
@@ -147,6 +156,7 @@ exports.ToolboxItemInfo = ToolboxItemInfo;
  *           ButtonInfo|
  *           LabelInfo|
  *           DynamicCategoryInfo}
+ * @alias Blockly.utils.toolbox.FlyoutItemInfo
  */
 let FlyoutItemInfo;
 exports.FlyoutItemInfo = FlyoutItemInfo;
@@ -157,6 +167,7 @@ exports.FlyoutItemInfo = FlyoutItemInfo;
  *            kind:(string|undefined),
  *            contents:!Array<!ToolboxItemInfo>
  *          }}
+ * @alias Blockly.utils.toolbox.ToolboxInfo
  */
 let ToolboxInfo;
 exports.ToolboxInfo = ToolboxInfo;
@@ -166,6 +177,7 @@ exports.ToolboxInfo = ToolboxInfo;
  * @typedef {
  *            Array<!FlyoutItemInfo>
  *          }
+ * @alias Blockly.utils.toolbox.FlyoutItemInfoArray
  */
 let FlyoutItemInfoArray;
 exports.FlyoutItemInfoArray = FlyoutItemInfoArray;
@@ -175,6 +187,7 @@ exports.FlyoutItemInfoArray = FlyoutItemInfoArray;
  * @typedef {Node|
  *           ToolboxInfo|
  *           string}
+ * @alias Blockly.utils.toolbox.ToolboxDefinition
  */
 let ToolboxDefinition;
 exports.ToolboxDefinition = ToolboxDefinition;
@@ -185,6 +198,7 @@ exports.ToolboxDefinition = ToolboxDefinition;
  *           NodeList|
  *           ToolboxInfo|
  *           Array<!Node>}
+ * @alias Blockly.utils.toolbox.FlyoutDefinition
  */
 let FlyoutDefinition;
 exports.FlyoutDefinition = FlyoutDefinition;
@@ -208,6 +222,7 @@ const FLYOUT_TOOLBOX_KIND = 'flyoutToolbox';
 /**
  * Position of the toolbox and/or flyout relative to the workspace.
  * @enum {number}
+ * @alias Blockly.utils.toolbox.Position
  */
 const Position = {
   TOP: 0,
@@ -223,6 +238,7 @@ exports.Position = Position;
  *     of the toolbox in one of its many forms.
  * @return {?ToolboxInfo} Object holding information
  *     for creating a toolbox.
+ * @alias Blockly.utils.toolbox.convertToolboxDefToJson
  */
 const convertToolboxDefToJson = function(toolboxDef) {
   if (!toolboxDef) {
@@ -270,6 +286,7 @@ const validateToolbox = function(toolboxJson) {
  * @param {?FlyoutDefinition} flyoutDef The definition of
  *    the flyout in one of its many forms.
  * @return {!FlyoutItemInfoArray} A list of flyout items.
+ * @alias Blockly.utils.toolbox.convertFlyoutDefToJsonArray
  */
 const convertFlyoutDefToJsonArray = function(flyoutDef) {
   if (!flyoutDef) {
@@ -296,6 +313,7 @@ exports.convertFlyoutDefToJsonArray = convertFlyoutDefToJsonArray;
  * @param {?ToolboxInfo} toolboxJson Object holding
  *     information for creating a toolbox.
  * @return {boolean} True if the toolbox has categories.
+ * @alias Blockly.utils.toolbox.hasCategories
  */
 const hasCategories = function(toolboxJson) {
   if (!toolboxJson) {
@@ -320,6 +338,7 @@ exports.hasCategories = hasCategories;
  * @param {!CategoryInfo} categoryInfo Object holing
  *    information for creating a category.
  * @return {boolean} True if the category has subcategories.
+ * @alias Blockly.utils.toolbox.isCategoryCollapsible
  */
 const isCategoryCollapsible = function(categoryInfo) {
   if (!categoryInfo || !categoryInfo['contents']) {
@@ -412,6 +431,7 @@ const addAttributes = function(node, obj) {
  * @param {?Node|?string} toolboxDef DOM tree of blocks, or text representation
  *    of same.
  * @return {?Node} DOM tree of blocks, or null.
+ * @alias Blockly.utils.toolbox.parseToolboxTree
  */
 const parseToolboxTree = function(toolboxDef) {
   if (toolboxDef) {
diff --git a/core/utils/useragent.js b/core/utils/useragent.js
index ab7cf1480..ca78461eb 100644
--- a/core/utils/useragent.js
+++ b/core/utils/useragent.js
@@ -111,44 +111,72 @@ isTablet = isIPad || (isAndroid && !has('Mobile')) || has('Silk');
 isMobile = !isTablet && (isIPod || isIPhone || isAndroid || has('IEMobile'));
 })((globalThis['navigator'] && globalThis['navigator']['userAgent']) || '');
 
-/** @const {string} */
+/** @const {string}
+ * @alias Blockly.utils.userAgent.raw
+ */
 exports.raw = rawUserAgent;
 
-/** @const {boolean} */
+/** @const {boolean}
+ * @alias Blockly.utils.userAgent.IE
+ */
 exports.IE = isIe;
 
-/** @const {boolean} */
+/** @const {boolean}
+ * @alias Blockly.utils.userAgent.EDGE
+ */
 exports.EDGE = isEdge;
 
-/** @const {boolean} */
+/** @const {boolean}
+ * @alias Blockly.utils.userAgent.JavaFx
+ */
 exports.JavaFx = isJavaFx;
 
-/** @const {boolean} */
+/** @const {boolean}
+ * @alias Blockly.utils.userAgent.CHROME
+ */
 exports.CHROME = isChrome;
 
-/** @const {boolean} */
+/** @const {boolean}
+ * @alias Blockly.utils.userAgent.WEBKIT
+ */
 exports.WEBKIT = isWebKit;
 
-/** @const {boolean} */
+/** @const {boolean}
+ * @alias Blockly.utils.userAgent.GECKO
+ */
 exports.GECKO = isGecko;
 
-/** @const {boolean} */
+/** @const {boolean}
+ * @alias Blockly.utils.userAgent.ANDROID
+ */
 exports.ANDROID = isAndroid;
 
-/** @const {boolean} */
+/** @const {boolean}
+ * @alias Blockly.utils.userAgent.IPAD
+ */
 exports.IPAD = isIPad;
 
-/** @const {boolean} */
+/** @const {boolean}
+ * @alias Blockly.utils.userAgent.IPOD
+ */
 exports.IPOD = isIPod;
 
-/** @const {boolean} */
+/** @const {boolean}
+ * @alias Blockly.utils.userAgent.IPHONE
+ */
 exports.IPHONE = isIPhone;
 
-/** @const {boolean} */
+/** @const {boolean}
+ * @alias Blockly.utils.userAgent.MAC
+ */
 exports.MAC = isMac;
 
-/** @const {boolean} */
+/** @const {boolean}
+ * @alias Blockly.utils.userAgent.TABLET
+ */
 exports.TABLET = isTablet;
 
-/** @const {boolean} */
+/** @const {boolean}
+ * @alias Blockly.utils.userAgent.MOBILE
+ */
 exports.MOBILE = isMobile;
diff --git a/core/utils/xml.js b/core/utils/xml.js
index af3043de2..b43ac0930 100644
--- a/core/utils/xml.js
+++ b/core/utils/xml.js
@@ -23,6 +23,7 @@ const {globalThis} = goog.require('Blockly.utils.global');
 
 /**
  * Namespace for Blockly's XML.
+ * @alias Blockly.utils.xml.NAME_SPACE
  */
 const NAME_SPACE = 'https://developers.google.com/blockly/xml';
 exports.NAME_SPACE = NAME_SPACE;
@@ -39,6 +40,7 @@ let xmlDocument = globalThis.document;
 /**
  * Get the document object to use for XML serialization.
  * @return {!Document} The document object.
+ * @alias Blockly.utils.xml.getDocument
  */
 const getDocument = function() {
   return xmlDocument;
@@ -48,6 +50,7 @@ exports.getDocument = getDocument;
 /**
  * Get the document object to use for XML serialization.
  * @param {!Document} document The document object to use.
+ * @alias Blockly.utils.xml.setDocument
  */
 const setDocument = function(document) {
   xmlDocument = document;
@@ -58,6 +61,7 @@ exports.setDocument = setDocument;
  * Create DOM element for XML.
  * @param {string} tagName Name of DOM element.
  * @return {!Element} New DOM element.
+ * @alias Blockly.utils.xml.createElement
  */
 const createElement = function(tagName) {
   return xmlDocument.createElementNS(NAME_SPACE, tagName);
@@ -68,6 +72,7 @@ exports.createElement = createElement;
  * Create text element for XML.
  * @param {string} text Text content.
  * @return {!Text} New DOM text node.
+ * @alias Blockly.utils.xml.createTextNode
  */
 const createTextNode = function(text) {
   return xmlDocument.createTextNode(text);
@@ -79,6 +84,7 @@ exports.createTextNode = createTextNode;
  * @param {string} text XML string.
  * @return {Document} The DOM document.
  * @throws if XML doesn't parse.
+ * @alias Blockly.utils.xml.textToDomDocument
  */
 const textToDomDocument = function(text) {
   const oParser = new DOMParser();
@@ -91,6 +97,7 @@ exports.textToDomDocument = textToDomDocument;
  * Currently the text format is fairly ugly: all one line with no whitespace.
  * @param {!Node} dom A tree of XML nodes.
  * @return {string} Text representation.
+ * @alias Blockly.utils.xml.domToText
  */
 const domToText = function(dom) {
   const oSerializer = new XMLSerializer();
diff --git a/core/variables.js b/core/variables.js
index 311ea8ea9..575793105 100644
--- a/core/variables.js
+++ b/core/variables.js
@@ -34,6 +34,7 @@ const utilsXml = goog.require('Blockly.utils.xml');
  * call Workspace.getAllVariables.
  * @param {!Workspace} ws The workspace to search for variables.
  * @return {!Array<!VariableModel>} Array of variable models.
+ * @alias Blockly.Variables.allUsedVarModels
  */
 const allUsedVarModels = function(ws) {
   const blocks = ws.getAllBlocks(false);
@@ -74,6 +75,7 @@ const ALL_DEVELOPER_VARS_WARNINGS_BY_BLOCK_TYPE = {};
  * For use by generators.
  * @param {!Workspace} workspace The workspace to search.
  * @return {!Array<string>} A list of non-duplicated variable names.
+ * @alias Blockly.Variables.allDeveloperVariables
  */
 const allDeveloperVariables = function(workspace) {
   const blocks = workspace.getAllBlocks(false);
@@ -109,6 +111,7 @@ exports.allDeveloperVariables = allDeveloperVariables;
  * variable category.
  * @param {!Workspace} workspace The workspace containing variables.
  * @return {!Array<!Element>} Array of XML elements.
+ * @alias Blockly.Variables.flyoutCategory
  */
 const flyoutCategory = function(workspace) {
   let xmlList = [];
@@ -132,6 +135,7 @@ exports.flyoutCategory = flyoutCategory;
  * Construct the blocks required by the flyout for the variable category.
  * @param {!Workspace} workspace The workspace containing variables.
  * @return {!Array<!Element>} Array of XML block elements.
+ * @alias Blockly.Variables.flyoutCategoryBlocks
  */
 const flyoutCategoryBlocks = function(workspace) {
   const variableModelList = workspace.getVariablesOfType('');
@@ -177,6 +181,9 @@ const flyoutCategoryBlocks = function(workspace) {
 };
 exports.flyoutCategoryBlocks = flyoutCategoryBlocks;
 
+/**
+ * @alias Blockly.Variables.VAR_LETTER_OPTIONS
+ */
 const VAR_LETTER_OPTIONS = 'ijkmnopqrstuvwxyzabcdefgh';  // No 'l'.
 exports.VAR_LETTER_OPTIONS = VAR_LETTER_OPTIONS;
 
@@ -187,11 +194,13 @@ exports.VAR_LETTER_OPTIONS = VAR_LETTER_OPTIONS;
  * then 'i2' to 'z2' etc.  Skip 'l'.
  * @param {!Workspace} workspace The workspace to be unique in.
  * @return {string} New variable name.
+ * @alias Blockly.Variables.generateUniqueName
  */
-exports.generateUniqueName = function(workspace) {
+const generateUniqueName = function(workspace) {
   return generateUniqueNameFromOptions(
       VAR_LETTER_OPTIONS.charAt(0), workspace.getAllVariableNames());
 };
+exports.generateUniqueName = generateUniqueName;
 
 /**
  * Returns a unique name that is not present in the usedNames array. This
@@ -200,6 +209,7 @@ exports.generateUniqueName = function(workspace) {
  * @param {string} startChar The character to start the search at.
  * @param {!Array<string>} usedNames A list of all of the used names.
  * @return {string} A unique name that is not present in the usedNames array.
+ * @alias Blockly.Variables.generateUniqueNameFromOptions
  */
 const generateUniqueNameFromOptions = function(startChar, usedNames) {
   if (!usedNames.length) {
@@ -251,6 +261,7 @@ exports.generateUniqueNameFromOptions = generateUniqueNameFromOptions;
  *     button), or undefined if an existing variable was chosen.
  * @param {string=} opt_type The type of the variable like 'int', 'string', or
  *     ''. This will default to '', which is a specific type.
+ * @alias Blockly.Variables.createVariableButtonHandler
  */
 const createVariableButtonHandler = function(
     workspace, opt_callback, opt_type) {
@@ -300,6 +311,7 @@ exports.createVariableButtonHandler = createVariableButtonHandler;
  * @param {function(?string=)=} opt_callback A callback. It will
  *     be passed an acceptable new variable name, or null if change is to be
  *     aborted (cancel button), or undefined if an existing variable was chosen.
+ * @alias Blockly.Variables.renameVariable
  */
 const renameVariable = function(workspace, variable, opt_callback) {
   // This function needs to be named so it can be called recursively.
@@ -341,6 +353,7 @@ exports.renameVariable = renameVariable;
  * @param {string} defaultText The default value to show in the prompt's field.
  * @param {function(?string)} callback A callback. It will return the new
  *     variable name, or null if the user picked something illegal.
+ * @alias Blockly.Variables.promptName
  */
 const promptName = function(promptText, defaultText, callback) {
   dialog.prompt(promptText, defaultText, function(newVar) {
@@ -387,6 +400,7 @@ const nameUsedWithOtherType = function(name, type, workspace) {
  *     variable.
  * @return {?VariableModel} The variable with the given name,
  *     or null if none was found.
+ * @alias Blockly.Variables.nameUsedWithAnyType
  */
 const nameUsedWithAnyType = function(name, workspace) {
   const allVariables = workspace.getVariableMap().getAllVariables();
@@ -406,6 +420,7 @@ exports.nameUsedWithAnyType = nameUsedWithAnyType;
  * @param {!VariableModel} variableModel The variable model to
  *     represent.
  * @return {?Element} The generated DOM.
+ * @alias Blockly.Variables.generateVariableFieldDom
  */
 const generateVariableFieldDom = function(variableModel) {
   /* Generates the following XML:
@@ -432,6 +447,7 @@ exports.generateVariableFieldDom = generateVariableFieldDom;
  * @param {string=} opt_type The type to use to look up or create the variable.
  * @return {!VariableModel} The variable corresponding to the given ID
  *     or name + type combination.
+ * @alias Blockly.Variables.getOrCreateVariablePackage
  */
 const getOrCreateVariablePackage = function(workspace, id, opt_name, opt_type) {
   let variable = getVariable(workspace, id, opt_name, opt_type);
@@ -455,6 +471,7 @@ exports.getOrCreateVariablePackage = getOrCreateVariablePackage;
  *     Only used if lookup by ID fails.
  * @return {?VariableModel} The variable corresponding to the given ID
  *     or name + type combination, or null if not found.
+ * @alias Blockly.Variables.getVariable
  */
 const getVariable = function(workspace, id, opt_name, opt_type) {
   const potentialVariableMap = workspace.getPotentialVariableMap();
@@ -524,6 +541,7 @@ const createVariable = function(workspace, id, opt_name, opt_type) {
  * @return {!Array<!VariableModel>} The new array of variables that
  *     were freshly added to the workspace after creating the new block,
  *     or [] if no new variables were added to the workspace.
+ * @alias Blockly.Variables.getAddedVariables
  */
 const getAddedVariables = function(workspace, originalVariables) {
   const allCurrentVariables = workspace.getAllVariables();
diff --git a/core/widgetdiv.js b/core/widgetdiv.js
index c3bd46cca..fabd521af 100644
--- a/core/widgetdiv.js
+++ b/core/widgetdiv.js
@@ -57,6 +57,7 @@ let themeClassName = '';
 /**
  * The HTML container for popup overlays (e.g. editor widgets).
  * @type {?Element}
+ * @alias Blockly.WidgetDiv.DIV
  */
 let DIV;
 /** @deprecated September 2021 */
@@ -65,6 +66,7 @@ exports.DIV = DIV;
 /**
  * Returns the HTML container for editor widgets.
  * @return {?Element} The editor widget container.
+ * @alias Blockly.WidgetDiv.getDiv
  */
 const getDiv = function() {
   return DIV;
@@ -93,6 +95,7 @@ Object.defineProperties(exports, {
 
 /**
  * Create the widget div and inject it onto the page.
+ * @alias Blockly.WidgetDiv.createDom
  */
 const createDom = function() {
   if (DIV) {
@@ -112,6 +115,7 @@ exports.createDom = createDom;
  * @param {boolean} rtl Right-to-left (true) or left-to-right (false).
  * @param {Function} newDispose Optional cleanup function to be run when the
  *     widget is closed.
+ * @alias Blocky.WidgetDiv.show
  */
 const show = function(newOwner, rtl, newDispose) {
   hide();
@@ -131,6 +135,7 @@ exports.show = show;
 
 /**
  * Destroy the widget and hide the div.
+ * @alias Blockly.WidgetDiv.hide
  */
 const hide = function() {
   if (!isVisible()) {
@@ -161,6 +166,7 @@ exports.hide = hide;
 /**
  * Is the container visible?
  * @return {boolean} True if visible.
+ * @alias Blockly.WidgetDiv.isVisible
  */
 const isVisible = function() {
   return !!owner;
@@ -171,6 +177,7 @@ exports.isVisible = isVisible;
  * Destroy the widget and hide the div if it is being used by the specified
  * object.
  * @param {!Object} oldOwner The object that was using this container.
+ * @alias Blockly.WidgetDiv.hideIfOwner
  */
 const hideIfOwner = function(oldOwner) {
   if (owner == oldOwner) {
@@ -205,6 +212,7 @@ const positionInternal = function(x, y, height) {
  *     the widget div, in window coordinates.
  * @param {boolean} rtl Whether the workspace is in RTL mode.  This determines
  *     horizontal alignment.
+ * @alias Blockly.WidgetDiv.positionWithAnchor
  */
 const positionWithAnchor = function(viewportBBox, anchorBBox, widgetSize, rtl) {
   const y = calculateY(viewportBBox, anchorBBox, widgetSize);

From 1504c999b892381c21b74eca6d0927a44829f812 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Wed, 22 Sep 2021 17:08:26 -0700
Subject: [PATCH 811/833] fix: updates the release task to build typings for
 msgs (#5495)

---
 scripts/gulpfiles/release_tasks.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/gulpfiles/release_tasks.js b/scripts/gulpfiles/release_tasks.js
index 793ce50d3..cfc2ebf8b 100644
--- a/scripts/gulpfiles/release_tasks.js
+++ b/scripts/gulpfiles/release_tasks.js
@@ -155,6 +155,7 @@ const rebuildAll = gulp.series(
   buildTasks.build,
   buildTasks.checkinBuilt,
   typings.typings,
+  typings.msgTypings,
   typings.checkinTypings,
   );
 

From fd917f42b8aea8783c4ecabd5114d5efbfe137ea Mon Sep 17 00:00:00 2001
From: Neil Fraser <fraser@google.com>
Date: Thu, 23 Sep 2021 09:37:23 -0700
Subject: [PATCH 812/833] Migrate core/field_angle.js to to goog.module syntax
 (#5521)

Move angle picker field to goog module and ES6.
---
 core/field_angle.js         | 307 ++++++++++++++++++------------------
 tests/deps.js               |   2 +-
 tests/deps.mocha.js         |   2 +-
 tests/mocha/test_helpers.js |   6 +-
 4 files changed, 154 insertions(+), 163 deletions(-)

diff --git a/core/field_angle.js b/core/field_angle.js
index ab877589a..ab4295a40 100644
--- a/core/field_angle.js
+++ b/core/field_angle.js
@@ -10,20 +10,21 @@
  */
 'use strict';
 
-goog.provide('Blockly.FieldAngle');
+goog.module('Blockly.FieldAngle');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.Css');
-goog.require('Blockly.DropDownDiv');
-goog.require('Blockly.fieldRegistry');
-goog.require('Blockly.FieldTextInput');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.KeyCodes');
-goog.require('Blockly.utils.math');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.userAgent');
-goog.require('Blockly.WidgetDiv');
+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');
+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');
 
 
 /**
@@ -36,45 +37,45 @@ goog.require('Blockly.WidgetDiv');
  * @param {Object=} opt_config A map of options used to configure the field.
  *    See the [field creation documentation]{@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/angle#creation}
  *    for a list of properties this parameter supports.
- * @extends {Blockly.FieldTextInput}
+ * @extends {FieldTextInput}
  * @constructor
  */
-Blockly.FieldAngle = function(opt_value, opt_validator, opt_config) {
+const FieldAngle = function(opt_value, opt_validator, opt_config) {
 
   /**
    * Should the angle increase as the angle picker is moved clockwise (true)
    * or counterclockwise (false)
-   * @see Blockly.FieldAngle.CLOCKWISE
+   * @see FieldAngle.CLOCKWISE
    * @type {boolean}
    * @private
    */
-  this.clockwise_ = Blockly.FieldAngle.CLOCKWISE;
+  this.clockwise_ = FieldAngle.CLOCKWISE;
 
   /**
    * The offset of zero degrees (and all other angles).
-   * @see Blockly.FieldAngle.OFFSET
+   * @see FieldAngle.OFFSET
    * @type {number}
    * @private
    */
-  this.offset_ = Blockly.FieldAngle.OFFSET;
+  this.offset_ = FieldAngle.OFFSET;
 
   /**
    * The maximum angle to allow before wrapping.
-   * @see Blockly.FieldAngle.WRAP
+   * @see FieldAngle.WRAP
    * @type {number}
    * @private
    */
-  this.wrap_ = Blockly.FieldAngle.WRAP;
+  this.wrap_ = FieldAngle.WRAP;
 
   /**
    * The amount to round angles to when using a mouse or keyboard nav input.
-   * @see Blockly.FieldAngle.ROUND
+   * @see FieldAngle.ROUND
    * @type {number}
    * @private
    */
-  this.round_ = Blockly.FieldAngle.ROUND;
+  this.round_ = FieldAngle.ROUND;
 
-  Blockly.FieldAngle.superClass_.constructor.call(
+  FieldAngle.superClass_.constructor.call(
       this, opt_value, opt_validator, opt_config);
 
   /**
@@ -98,26 +99,26 @@ Blockly.FieldAngle = function(opt_value, opt_validator, opt_config) {
 
   /**
    * Wrapper click event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.clickWrapper_ = null;
 
   /**
    * Surface click event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.clickSurfaceWrapper_ = null;
 
   /**
    * Surface mouse move event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.moveSurfaceWrapper_ = null;
 };
-Blockly.utils.object.inherits(Blockly.FieldAngle, Blockly.FieldTextInput);
+object.inherits(FieldAngle, FieldTextInput);
 
 
 /**
@@ -125,16 +126,16 @@ Blockly.utils.object.inherits(Blockly.FieldAngle, Blockly.FieldTextInput);
  * @type {*}
  * @protected
  */
-Blockly.FieldAngle.prototype.DEFAULT_VALUE = 0;
+FieldAngle.prototype.DEFAULT_VALUE = 0;
 
 /**
  * Construct a FieldAngle from a JSON arg object.
  * @param {!Object} options A JSON object with options (angle).
- * @return {!Blockly.FieldAngle} The new field instance.
+ * @return {!FieldAngle} The new field instance.
  * @package
  * @nocollapse
  */
-Blockly.FieldAngle.fromJson = function(options) {
+FieldAngle.fromJson = function(options) {
   // `this` might be a subclass of FieldAngle if that class doesn't override
   // the static fromJson method.
   return new this(options['angle'], undefined, options);
@@ -145,27 +146,27 @@ Blockly.FieldAngle.fromJson = function(options) {
  * are not. Editable fields should also be serializable.
  * @type {boolean}
  */
-Blockly.FieldAngle.prototype.SERIALIZABLE = true;
+FieldAngle.prototype.SERIALIZABLE = true;
 
 /**
  * The default amount to round angles to when using a mouse or keyboard nav
  * input. Must be a positive integer to support keyboard navigation.
  * @const {number}
  */
-Blockly.FieldAngle.ROUND = 15;
+FieldAngle.ROUND = 15;
 
 /**
  * Half the width of protractor image.
  * @const {number}
  */
-Blockly.FieldAngle.HALF = 100 / 2;
+FieldAngle.HALF = 100 / 2;
 
 /**
  * Default property describing which direction makes an angle field's value
  * increase. Angle increases clockwise (true) or counterclockwise (false).
  * @const {boolean}
  */
-Blockly.FieldAngle.CLOCKWISE = false;
+FieldAngle.CLOCKWISE = false;
 
 /**
  * The default offset of 0 degrees (and all angles). Always offsets in the
@@ -173,21 +174,21 @@ Blockly.FieldAngle.CLOCKWISE = false;
  * Usually either 0 (0 = right) or 90 (0 = up).
  * @const {number}
  */
-Blockly.FieldAngle.OFFSET = 0;
+FieldAngle.OFFSET = 0;
 
 /**
  * The default maximum angle to allow before wrapping.
  * Usually either 360 (for 0 to 359.9) or 180 (for -179.9 to 180).
  * @const {number}
  */
-Blockly.FieldAngle.WRAP = 360;
+FieldAngle.WRAP = 360;
 
 /**
  * Radius of protractor circle.  Slightly smaller than protractor size since
  * otherwise SVG crops off half the border at the edges.
  * @const {number}
  */
-Blockly.FieldAngle.RADIUS = Blockly.FieldAngle.HALF - 1;
+FieldAngle.RADIUS = FieldAngle.HALF - 1;
 
 /**
  * Configure the field based on the given map of options.
@@ -195,8 +196,8 @@ Blockly.FieldAngle.RADIUS = Blockly.FieldAngle.HALF - 1;
  * @protected
  * @override
  */
-Blockly.FieldAngle.prototype.configure_ = function(config) {
-  Blockly.FieldAngle.superClass_.configure_.call(this, config);
+FieldAngle.prototype.configure_ = function(config) {
+  FieldAngle.superClass_.configure_.call(this, config);
 
   switch (config['mode']) {
     case 'compass':
@@ -212,27 +213,27 @@ Blockly.FieldAngle.prototype.configure_ = function(config) {
   }
 
   // Allow individual settings to override the mode setting.
-  var clockwise = config['clockwise'];
+  const clockwise = config['clockwise'];
   if (typeof clockwise == 'boolean') {
     this.clockwise_ = clockwise;
   }
 
   // If these are passed as null then we should leave them on the default.
-  var offset = config['offset'];
+  let offset = config['offset'];
   if (offset != null) {
     offset = Number(offset);
     if (!isNaN(offset)) {
       this.offset_ = offset;
     }
   }
-  var wrap = config['wrap'];
+  let wrap = config['wrap'];
   if (wrap != null) {
     wrap = Number(wrap);
     if (!isNaN(wrap)) {
       this.wrap_ = wrap;
     }
   }
-  var round = config['round'];
+  let round = config['round'];
   if (round != null) {
     round = Number(round);
     if (!isNaN(round)) {
@@ -245,11 +246,10 @@ Blockly.FieldAngle.prototype.configure_ = function(config) {
  * Create the block UI for this field.
  * @package
  */
-Blockly.FieldAngle.prototype.initView = function() {
-  Blockly.FieldAngle.superClass_.initView.call(this);
+FieldAngle.prototype.initView = function() {
+  FieldAngle.superClass_.initView.call(this);
   // Add the degree symbol to the left of the number, even in RTL (issue #2380)
-  this.symbol_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.TSPAN, {}, null);
+  this.symbol_ = dom.createSvgElement(Svg.TSPAN, {}, null);
   this.symbol_.appendChild(document.createTextNode('\u00B0'));
   this.textElement_.appendChild(this.symbol_);
 };
@@ -259,8 +259,8 @@ Blockly.FieldAngle.prototype.initView = function() {
  * @protected
  * @override
  */
-Blockly.FieldAngle.prototype.render_ = function() {
-  Blockly.FieldAngle.superClass_.render_.call(this);
+FieldAngle.prototype.render_ = function() {
+  FieldAngle.superClass_.render_.call(this);
   this.updateGraph_();
 };
 
@@ -270,22 +270,18 @@ Blockly.FieldAngle.prototype.render_ = function() {
  *     or undefined if triggered programmatically.
  * @protected
  */
-Blockly.FieldAngle.prototype.showEditor_ = function(opt_e) {
+FieldAngle.prototype.showEditor_ = function(opt_e) {
   // Mobile browsers have issues with in-line textareas (focus & keyboards).
-  var noFocus =
-      Blockly.utils.userAgent.MOBILE ||
-      Blockly.utils.userAgent.ANDROID ||
-      Blockly.utils.userAgent.IPAD;
-  Blockly.FieldAngle.superClass_.showEditor_.call(this, opt_e, noFocus);
+  const noFocus = userAgent.MOBILE || userAgent.ANDROID || userAgent.IPAD;
+  FieldAngle.superClass_.showEditor_.call(this, opt_e, noFocus);
 
   this.dropdownCreate_();
-  Blockly.DropDownDiv.getContentDiv().appendChild(this.editor_);
+  DropDownDiv.getContentDiv().appendChild(this.editor_);
 
-  Blockly.DropDownDiv.setColour(this.sourceBlock_.style.colourPrimary,
+  DropDownDiv.setColour(this.sourceBlock_.style.colourPrimary,
       this.sourceBlock_.style.colourTertiary);
 
-  Blockly.DropDownDiv.showPositionedByField(
-      this, this.dropdownDispose_.bind(this));
+  DropDownDiv.showPositionedByField(this, this.dropdownDispose_.bind(this));
 
   this.updateGraph_();
 };
@@ -294,46 +290,46 @@ Blockly.FieldAngle.prototype.showEditor_ = function(opt_e) {
  * Create the angle dropdown editor.
  * @private
  */
-Blockly.FieldAngle.prototype.dropdownCreate_ = function() {
-  var svg = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.SVG, {
-        'xmlns': Blockly.utils.dom.SVG_NS,
-        'xmlns:html': Blockly.utils.dom.HTML_NS,
-        'xmlns:xlink': Blockly.utils.dom.XLINK_NS,
+FieldAngle.prototype.dropdownCreate_ = function() {
+  const svg = dom.createSvgElement(
+      Svg.SVG, {
+        'xmlns': dom.SVG_NS,
+        'xmlns:html': dom.HTML_NS,
+        'xmlns:xlink': dom.XLINK_NS,
         'version': '1.1',
-        'height': (Blockly.FieldAngle.HALF * 2) + 'px',
-        'width': (Blockly.FieldAngle.HALF * 2) + 'px',
+        'height': (FieldAngle.HALF * 2) + 'px',
+        'width': (FieldAngle.HALF * 2) + 'px',
         'style': 'touch-action: none'
       }, null);
-  var circle = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.CIRCLE, {
-        'cx': Blockly.FieldAngle.HALF,
-        'cy': Blockly.FieldAngle.HALF,
-        'r': Blockly.FieldAngle.RADIUS,
+  const circle = dom.createSvgElement(
+      Svg.CIRCLE, {
+        'cx': FieldAngle.HALF,
+        'cy': FieldAngle.HALF,
+        'r': FieldAngle.RADIUS,
         'class': 'blocklyAngleCircle'
       }, svg);
-  this.gauge_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH, {
+  this.gauge_ = dom.createSvgElement(
+      Svg.PATH, {
         'class': 'blocklyAngleGauge'
       }, svg);
-  this.line_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.LINE, {
-        'x1': Blockly.FieldAngle.HALF,
-        'y1': Blockly.FieldAngle.HALF,
+  this.line_ = dom.createSvgElement(
+      Svg.LINE, {
+        'x1': FieldAngle.HALF,
+        'y1': FieldAngle.HALF,
         'class': 'blocklyAngleLine'
       }, svg);
   // Draw markers around the edge.
-  for (var angle = 0; angle < 360; angle += 15) {
-    Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.LINE, {
-          'x1': Blockly.FieldAngle.HALF + Blockly.FieldAngle.RADIUS,
-          'y1': Blockly.FieldAngle.HALF,
-          'x2': Blockly.FieldAngle.HALF + Blockly.FieldAngle.RADIUS -
+  for (let angle = 0; angle < 360; angle += 15) {
+    dom.createSvgElement(
+        Svg.LINE, {
+          'x1': FieldAngle.HALF + FieldAngle.RADIUS,
+          'y1': FieldAngle.HALF,
+          'x2': FieldAngle.HALF + FieldAngle.RADIUS -
               (angle % 45 == 0 ? 10 : 5),
-          'y2': Blockly.FieldAngle.HALF,
+          'y2': FieldAngle.HALF,
           'class': 'blocklyAngleMarks',
           'transform': 'rotate(' + angle + ',' +
-              Blockly.FieldAngle.HALF + ',' + Blockly.FieldAngle.HALF + ')'
+              FieldAngle.HALF + ',' + FieldAngle.HALF + ')'
         }, svg);
   }
 
@@ -341,13 +337,13 @@ Blockly.FieldAngle.prototype.dropdownCreate_ = function() {
   // mousemove even if it's not in the middle of a drag.  In future we may
   // change this behaviour.
   this.clickWrapper_ =
-      Blockly.browserEvents.conditionalBind(svg, 'click', this, this.hide_);
+      browserEvents.conditionalBind(svg, 'click', this, this.hide_);
   // On touch devices, the picker's value is only updated with a drag. Add
   // a click handler on the drag surface to update the value if the surface
   // is clicked.
-  this.clickSurfaceWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.clickSurfaceWrapper_ = browserEvents.conditionalBind(
       circle, 'click', this, this.onMouseMove_, true, true);
-  this.moveSurfaceWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.moveSurfaceWrapper_ = browserEvents.conditionalBind(
       circle, 'mousemove', this, this.onMouseMove_, true, true);
   this.editor_ = svg;
 };
@@ -356,17 +352,17 @@ Blockly.FieldAngle.prototype.dropdownCreate_ = function() {
  * Disposes of events and DOM-references belonging to the angle editor.
  * @private
  */
-Blockly.FieldAngle.prototype.dropdownDispose_ = function() {
+FieldAngle.prototype.dropdownDispose_ = function() {
   if (this.clickWrapper_) {
-    Blockly.browserEvents.unbind(this.clickWrapper_);
+    browserEvents.unbind(this.clickWrapper_);
     this.clickWrapper_ = null;
   }
   if (this.clickSurfaceWrapper_) {
-    Blockly.browserEvents.unbind(this.clickSurfaceWrapper_);
+    browserEvents.unbind(this.clickSurfaceWrapper_);
     this.clickSurfaceWrapper_ = null;
   }
   if (this.moveSurfaceWrapper_) {
-    Blockly.browserEvents.unbind(this.moveSurfaceWrapper_);
+    browserEvents.unbind(this.moveSurfaceWrapper_);
     this.moveSurfaceWrapper_ = null;
   }
   this.gauge_ = null;
@@ -377,9 +373,9 @@ Blockly.FieldAngle.prototype.dropdownDispose_ = function() {
  * Hide the editor.
  * @private
  */
-Blockly.FieldAngle.prototype.hide_ = function() {
-  Blockly.DropDownDiv.hideIfOwner(this);
-  Blockly.WidgetDiv.hide();
+FieldAngle.prototype.hide_ = function() {
+  DropDownDiv.hideIfOwner(this);
+  WidgetDiv.hide();
 };
 
 /**
@@ -387,17 +383,17 @@ Blockly.FieldAngle.prototype.hide_ = function() {
  * @param {!Event} e Mouse move event.
  * @protected
  */
-Blockly.FieldAngle.prototype.onMouseMove_ = function(e) {
+FieldAngle.prototype.onMouseMove_ = function(e) {
   // Calculate angle.
-  var bBox = this.gauge_.ownerSVGElement.getBoundingClientRect();
-  var dx = e.clientX - bBox.left - Blockly.FieldAngle.HALF;
-  var dy = e.clientY - bBox.top - Blockly.FieldAngle.HALF;
-  var angle = Math.atan(-dy / dx);
+  const bBox = this.gauge_.ownerSVGElement.getBoundingClientRect();
+  const dx = e.clientX - bBox.left - FieldAngle.HALF;
+  const dy = e.clientY - bBox.top - FieldAngle.HALF;
+  let angle = Math.atan(-dy / dx);
   if (isNaN(angle)) {
     // This shouldn't happen, but let's not let this error propagate further.
     return;
   }
-  angle = Blockly.utils.math.toDegrees(angle);
+  angle = math.toDegrees(angle);
   // 0: East, 90: North, 180: West, 270: South.
   if (dx < 0) {
     angle += 180;
@@ -422,7 +418,7 @@ Blockly.FieldAngle.prototype.onMouseMove_ = function(e) {
  * @param {number} angle New angle.
  * @private
  */
-Blockly.FieldAngle.prototype.displayMouseOrKeyboardValue_ = function(angle) {
+FieldAngle.prototype.displayMouseOrKeyboardValue_ = function(angle) {
   if (this.round_) {
     angle = Math.round(angle / this.round_) * this.round_;
   }
@@ -436,34 +432,34 @@ Blockly.FieldAngle.prototype.displayMouseOrKeyboardValue_ = function(angle) {
  * Redraw the graph with the current angle.
  * @private
  */
-Blockly.FieldAngle.prototype.updateGraph_ = function() {
+FieldAngle.prototype.updateGraph_ = function() {
   if (!this.gauge_) {
     return;
   }
   // Always display the input (i.e. getText) even if it is invalid.
-  var angleDegrees = Number(this.getText()) + this.offset_;
+  let angleDegrees = Number(this.getText()) + this.offset_;
   angleDegrees %= 360;
-  var angleRadians = Blockly.utils.math.toRadians(angleDegrees);
-  var path = ['M ', Blockly.FieldAngle.HALF, ',', Blockly.FieldAngle.HALF];
-  var x2 = Blockly.FieldAngle.HALF;
-  var y2 = Blockly.FieldAngle.HALF;
+  let angleRadians = math.toRadians(angleDegrees);
+  const path = ['M ', FieldAngle.HALF, ',', FieldAngle.HALF];
+  let x2 = FieldAngle.HALF;
+  let y2 = FieldAngle.HALF;
   if (!isNaN(angleRadians)) {
-    var clockwiseFlag = Number(this.clockwise_);
-    var angle1 = Blockly.utils.math.toRadians(this.offset_);
-    var x1 = Math.cos(angle1) * Blockly.FieldAngle.RADIUS;
-    var y1 = Math.sin(angle1) * -Blockly.FieldAngle.RADIUS;
+    const clockwiseFlag = Number(this.clockwise_);
+    const angle1 = math.toRadians(this.offset_);
+    const x1 = Math.cos(angle1) * FieldAngle.RADIUS;
+    const y1 = Math.sin(angle1) * -FieldAngle.RADIUS;
     if (clockwiseFlag) {
       angleRadians = 2 * angle1 - angleRadians;
     }
-    x2 += Math.cos(angleRadians) * Blockly.FieldAngle.RADIUS;
-    y2 -= Math.sin(angleRadians) * Blockly.FieldAngle.RADIUS;
+    x2 += Math.cos(angleRadians) * FieldAngle.RADIUS;
+    y2 -= Math.sin(angleRadians) * FieldAngle.RADIUS;
     // Don't ask how the flag calculations work.  They just do.
-    var largeFlag = Math.abs(Math.floor((angleRadians - angle1) / Math.PI) % 2);
+    let largeFlag = Math.abs(Math.floor((angleRadians - angle1) / Math.PI) % 2);
     if (clockwiseFlag) {
       largeFlag = 1 - largeFlag;
     }
     path.push(' l ', x1, ',', y1,
-        ' A ', Blockly.FieldAngle.RADIUS, ',', Blockly.FieldAngle.RADIUS,
+        ' A ', FieldAngle.RADIUS, ',', FieldAngle.RADIUS,
         ' 0 ', largeFlag, ' ', clockwiseFlag, ' ', x2, ',', y2, ' z');
   }
   this.gauge_.setAttribute('d', path.join(''));
@@ -477,25 +473,25 @@ Blockly.FieldAngle.prototype.updateGraph_ = function() {
  * @protected
  * @override
  */
-Blockly.FieldAngle.prototype.onHtmlInputKeyDown_ = function(e) {
-  Blockly.FieldAngle.superClass_.onHtmlInputKeyDown_.call(this, e);
+FieldAngle.prototype.onHtmlInputKeyDown_ = function(e) {
+  FieldAngle.superClass_.onHtmlInputKeyDown_.call(this, e);
 
-  var multiplier;
-  if (e.keyCode === Blockly.utils.KeyCodes.LEFT) {
+  let multiplier;
+  if (e.keyCode === KeyCodes.LEFT) {
     // decrement (increment in RTL)
     multiplier = this.sourceBlock_.RTL ? 1 : -1;
-  } else if (e.keyCode === Blockly.utils.KeyCodes.RIGHT) {
+  } else if (e.keyCode === KeyCodes.RIGHT) {
     // increment (decrement in RTL)
     multiplier = this.sourceBlock_.RTL ? -1 : 1;
-  } else if (e.keyCode === Blockly.utils.KeyCodes.DOWN) {
+  } else if (e.keyCode === KeyCodes.DOWN) {
     // decrement
     multiplier = -1;
-  } else if (e.keyCode === Blockly.utils.KeyCodes.UP) {
+  } else if (e.keyCode === KeyCodes.UP) {
     // increment
     multiplier = 1;
   }
   if (multiplier) {
-    var value = /** @type {number} */ (this.getValue());
+    const value = /** @type {number} */ (this.getValue());
     this.displayMouseOrKeyboardValue_(
         value + (multiplier * this.round_));
     e.preventDefault();
@@ -510,8 +506,8 @@ Blockly.FieldAngle.prototype.onHtmlInputKeyDown_ = function(e) {
  * @protected
  * @override
  */
-Blockly.FieldAngle.prototype.doClassValidation_ = function(opt_newValue) {
-  var value = Number(opt_newValue);
+FieldAngle.prototype.doClassValidation_ = function(opt_newValue) {
+  const value = Number(opt_newValue);
   if (isNaN(value) || !isFinite(value)) {
     return null;
   }
@@ -524,7 +520,7 @@ Blockly.FieldAngle.prototype.doClassValidation_ = function(opt_newValue) {
  * @return {number} The wrapped value.
  * @private
  */
-Blockly.FieldAngle.prototype.wrapValue_ = function(value) {
+FieldAngle.prototype.wrapValue_ = function(value) {
   value %= 360;
   if (value < 0) {
     value += 360;
@@ -538,33 +534,30 @@ Blockly.FieldAngle.prototype.wrapValue_ = function(value) {
 /**
  * CSS for angle field.  See css.js for use.
  */
-Blockly.Css.register([
-  /* eslint-disable indent */
-  '.blocklyAngleCircle {',
-    'stroke: #444;',
-    'stroke-width: 1;',
-    'fill: #ddd;',
-    'fill-opacity: .8;',
-  '}',
-
-  '.blocklyAngleMarks {',
-    'stroke: #444;',
-    'stroke-width: 1;',
-  '}',
-
-  '.blocklyAngleGauge {',
-    'fill: #f88;',
-    'fill-opacity: .8;',
-    'pointer-events: none;',
-  '}',
-
-  '.blocklyAngleLine {',
-    'stroke: #f00;',
-    'stroke-width: 2;',
-    'stroke-linecap: round;',
-    'pointer-events: none;',
-  '}'
-  /* eslint-enable indent */
+Css.register([
+  `.blocklyAngleCircle {
+  stroke: #444;
+  stroke-width: 1;
+  fill: #ddd;
+  fill-opacity: .8;
+}`,
+  `.blocklyAngleMarks {
+  stroke: #444;
+  stroke-width: 1;
+}`,
+  `.blocklyAngleGauge {
+  fill: #f88;
+  fill-opacity: .8;
+  pointer-events: none;
+}`,
+  `.blocklyAngleLine {
+  stroke: #f00;
+  stroke-width: 2;
+  stroke-linecap: round;
+  pointer-events: none;
+}`
 ]);
 
-Blockly.fieldRegistry.register('field_angle', Blockly.FieldAngle);
+fieldRegistry.register('field_angle', FieldAngle);
+
+exports = FieldAngle;
diff --git a/tests/deps.js b/tests/deps.js
index be3a0b8d9..83dc22eec 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -66,7 +66,7 @@ goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.View
 goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['Blockly.DropDownDiv', 'Blockly.Field', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 668e14acf..f8f26baee 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -66,7 +66,7 @@ goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.View
 goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['Blockly.DropDownDiv', 'Blockly.Field', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/test_helpers.js b/tests/mocha/test_helpers.js
index 093560620..d761034b8 100644
--- a/tests/mocha/test_helpers.js
+++ b/tests/mocha/test_helpers.js
@@ -200,7 +200,6 @@ function sharedTestSetup(options = {}) {
   this.sharedCleanup = {
     blockTypesCleanup_: [],
     messagesCleanup_: []
-
   };
   this.blockTypesCleanup_ = this.sharedCleanup.blockTypesCleanup_;
   this.messagesCleanup_ = this.sharedCleanup.messagesCleanup_;
@@ -216,8 +215,7 @@ exports.sharedTestSetup = sharedTestSetup;
 function sharedTestTeardown() {
   var testRef = this.currentTest || this.test;
   if (!this.sharedSetupCalled_) {
-    console.error('"' + testRef.fullTitle() +
-        '" did not call sharedTestSetup');
+    console.error('"' + testRef.fullTitle() + '" did not call sharedTestSetup');
   }
 
   try {
@@ -241,7 +239,7 @@ function sharedTestTeardown() {
       // (i.e. a previous test added an event to the queue on a timeout that
       // did not use a stubbed clock).
       Blockly.Events.TEST_ONLY.FIRE_QUEUE.length = 0;
-      console.warn(testRef.fullTitle() +
+      console.warn('"' + testRef.fullTitle() +
           '" needed cleanup of Blockly.Events.TEST_ONLY.FIRE_QUEUE. This may ' +
           'indicate leakage from an earlier test');
     }

From 8bd2e8c9e263364f849da80810d2be65e0638069 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 23 Sep 2021 10:47:04 -0700
Subject: [PATCH 813/833] chore: Remove declareLegacyNamespace() from toolbox/
 files

---
 core/blockly.js                      | 10 ++++++++++
 core/toolbox/category.js             |  1 -
 core/toolbox/collapsible_category.js |  1 -
 core/toolbox/separator.js            |  1 -
 core/toolbox/toolbox.js              |  1 -
 core/toolbox/toolbox_item.js         |  1 -
 tests/deps.js                        |  2 +-
 tests/deps.mocha.js                  |  2 +-
 8 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index ffb8fa47d..5d9da89c8 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -18,6 +18,11 @@ goog.module('Blockly');
 goog.module.declareLegacyNamespace();
 
 const Blocks = goog.require('Blockly.Blocks');
+const CollapsibleToolboxCategory = goog.require('Blockly.CollapsibleToolboxCategory');
+const Toolbox = goog.require('Blockly.Toolbox');
+const ToolboxCategory = goog.require('Blockly.ToolboxCategory');
+const ToolboxItem = goog.require('Blockly.ToolboxItem');
+const ToolboxSeparator = goog.require('Blockly.ToolboxSeparator');
 /* eslint-disable-next-line no-unused-vars */
 const ICopyable = goog.requireType('Blockly.ICopyable');
 const Marker = goog.require('Blockly.Marker');
@@ -425,6 +430,11 @@ exports.Block = Block;
 exports.BlockDragger = BlockDragger;
 exports.BlockDragSurfaceSvg = BlockDragSurfaceSvg;
 exports.BlockSvg = BlockSvg;
+exports.CollapsibleToolboxCategory = CollapsibleToolboxCategory;
 exports.Cursor = Cursor;
 exports.Marker = Marker;
 exports.TabNavigateCursor = TabNavigateCursor;
+exports.Toolbox = Toolbox;
+exports.ToolboxCategory = ToolboxCategory;
+exports.ToolboxItem = ToolboxItem;
+exports.ToolboxSeparator = ToolboxSeparator;
diff --git a/core/toolbox/category.js b/core/toolbox/category.js
index d05029034..1d0a1fe7f 100644
--- a/core/toolbox/category.js
+++ b/core/toolbox/category.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.ToolboxCategory');
-goog.module.declareLegacyNamespace();
 
 const Css = goog.require('Blockly.Css');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/toolbox/collapsible_category.js b/core/toolbox/collapsible_category.js
index 923d681b2..e36a6e61c 100644
--- a/core/toolbox/collapsible_category.js
+++ b/core/toolbox/collapsible_category.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.CollapsibleToolboxCategory');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');
diff --git a/core/toolbox/separator.js b/core/toolbox/separator.js
index dbf30f4f0..359b0cdf3 100644
--- a/core/toolbox/separator.js
+++ b/core/toolbox/separator.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.ToolboxSeparator');
-goog.module.declareLegacyNamespace();
 
 const Css = goog.require('Blockly.Css');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index e0eb0f611..347b06ad0 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.Toolbox');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
diff --git a/core/toolbox/toolbox_item.js b/core/toolbox/toolbox_item.js
index 8a51a020e..dbc380b0f 100644
--- a/core/toolbox/toolbox_item.js
+++ b/core/toolbox/toolbox_item.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.ToolboxItem');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');
diff --git a/tests/deps.js b/tests/deps.js
index 83dc22eec..f2d910b89 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.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.js', ['Blockly'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.Blocks', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Cursor', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Marker', 'Blockly.Procedures', 'Blockly.TabNavigateCursor', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', '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 f8f26baee..7e1d189d8 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.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.js', ['Blockly'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.Blocks', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Cursor', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Marker', 'Blockly.Procedures', 'Blockly.TabNavigateCursor', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', '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'});

From 5f72a61b2dba14ec86c8a128060cfb38c29cde00 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 22 Sep 2021 16:02:20 -0700
Subject: [PATCH 814/833] Remove unecessary deprecation warnings stubs

---
 tests/mocha/block_test.js          | 3 ---
 tests/mocha/comment_test.js        | 9 ---------
 tests/mocha/field_registry_test.js | 6 ------
 tests/mocha/field_test.js          | 4 ----
 4 files changed, 22 deletions(-)

diff --git a/tests/mocha/block_test.js b/tests/mocha/block_test.js
index 082e43f0c..078c2ee05 100644
--- a/tests/mocha/block_test.js
+++ b/tests/mocha/block_test.js
@@ -1176,10 +1176,7 @@ suite('Blocks', function() {
           // Restored up by call to sinon.restore() in sharedTestTeardown()
           sinon.stub(this.block, 'isEditable').returns(false);
           var icon = this.block.getCommentIcon();
-          // TODO(#4186): Remove stubbing of deprecation warning after fixing.
-          var deprecationWarnStub = createDeprecationWarningStub();
           icon.setVisible(true);
-          deprecationWarnStub.restore();
 
           this.block.setCommentText('test2');
           chai.assert.equal(this.block.getCommentText(), 'test2');
diff --git a/tests/mocha/comment_test.js b/tests/mocha/comment_test.js
index 096fe6940..f156ca136 100644
--- a/tests/mocha/comment_test.js
+++ b/tests/mocha/comment_test.js
@@ -60,10 +60,7 @@ suite('Comments', function() {
     test('Not Editable', function() {
       sinon.stub(this.block, 'isEditable').returns(false);
 
-      // TODO(#4186): Remove stubbing of deprecation warning after fixing.
-      var deprecationWarnStub = createDeprecationWarningStub();
       this.comment.setVisible(true);
-      deprecationWarnStub.restore();
 
       chai.assert.isTrue(this.comment.isVisible());
       assertNotEditable(this.comment);
@@ -76,10 +73,7 @@ suite('Comments', function() {
       this.comment.setVisible(true);
       sinon.stub(this.block, 'isEditable').returns(false);
 
-      // TODO(#4186): Remove stubbing of deprecation warning after fixing.
-      var deprecationWarnStub = createDeprecationWarningStub();
       this.comment.updateEditable();
-      deprecationWarnStub.restore();
 
       chai.assert.isTrue(this.comment.isVisible());
       assertNotEditable(this.comment);
@@ -91,10 +85,7 @@ suite('Comments', function() {
     test('Not Editable -> Editable', function() {
       var editableStub = sinon.stub(this.block, 'isEditable').returns(false);
 
-      // TODO(#4186): Remove stubbing of deprecation warning after fixing.
-      var deprecationWarnStub = createDeprecationWarningStub();
       this.comment.setVisible(true);
-      deprecationWarnStub.restore();
 
       editableStub.returns(true);
 
diff --git a/tests/mocha/field_registry_test.js b/tests/mocha/field_registry_test.js
index c8978d1fb..bddb3fc64 100644
--- a/tests/mocha/field_registry_test.js
+++ b/tests/mocha/field_registry_test.js
@@ -63,10 +63,7 @@ suite('Field Registry', function() {
         value: 'ok'
       };
 
-      // TODO(#4197): Remove stubbing of deprecation warning after fixing.
-      var deprecationWarnStub = createDeprecationWarningStub();
       var field = Blockly.fieldRegistry.fromJson(json);
-      deprecationWarnStub.restore();
 
       chai.assert.isNotNull(field);
       chai.assert.equal(field.getValue(), 'ok');
@@ -91,10 +88,7 @@ suite('Field Registry', function() {
         value: 'ok'
       };
 
-      // TODO(#4197): Remove stubbing of deprecation warning after fixing.
-      var deprecationWarnStub = createDeprecationWarningStub();
       var field = Blockly.fieldRegistry.fromJson(json);
-      deprecationWarnStub.restore();
       
       chai.assert.isNotNull(field);
       chai.assert.equal(field.getValue(), 'ok');
diff --git a/tests/mocha/field_test.js b/tests/mocha/field_test.js
index ed446df71..dca8bb153 100644
--- a/tests/mocha/field_test.js
+++ b/tests/mocha/field_test.js
@@ -12,10 +12,6 @@ const {addBlockTypeToCleanup, addMessageToCleanup, createDeprecationWarningStub,
 suite('Abstract Fields', function() {
   setup(function() {
     sharedTestSetup.call(this);
-    // TODO(#4197): Remove stubbing of deprecation warning after fixing.
-    // field.setValue calls trigger a deprecation warning, capture to prevent
-    // console logs.
-    createDeprecationWarningStub();
   });
 
   teardown(function() {

From f3e8c25a50b72566741eed0405a3810413df756f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 22 Sep 2021 16:38:44 -0700
Subject: [PATCH 815/833] Catch warnings logged during registry test

---
 tests/mocha/registry_test.js | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/tests/mocha/registry_test.js b/tests/mocha/registry_test.js
index fef243d86..7fa595575 100644
--- a/tests/mocha/registry_test.js
+++ b/tests/mocha/registry_test.js
@@ -6,8 +6,7 @@
 
 goog.module('Blockly.test.registry');
 
-const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
-
+const {assertWarnings, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
 
 
 suite('Registry', function() {
@@ -99,11 +98,15 @@ suite('Registry', function() {
 
     suite('Does not have', function() {
       test('Type', function() {
-        chai.assert.isNull(Blockly.registry.getClass('bad_type', 'test_name'));
+        assertWarnings(() => {
+          chai.assert.isNull(Blockly.registry.getClass('bad_type', 'test_name'));
+        }, /Unable to find/);
       });
 
       test('Name', function() {
-        chai.assert.isNull(Blockly.registry.getClass('test', 'bad_name'));
+        assertWarnings(() => {
+          chai.assert.isNull(Blockly.registry.getClass('test', 'bad_name'));
+        }, /Unable to find/);
       });
 
       test('Throw if missing', function() {
@@ -135,11 +138,16 @@ suite('Registry', function() {
 
     suite('Does not have', function() {
       test('Type', function() {
-        chai.assert.isNull(Blockly.registry.getObject('bad_type', 'test_name'));
+        assertWarnings(() => {
+          chai.assert.isNull(Blockly.registry.getObject('bad_type', 'test_name'));
+        }, /Unable to find/);
       });
 
       test('Name', function() {
-        chai.assert.isNull(Blockly.registry.getObject('test', 'bad_name'));
+
+        assertWarnings(() => {
+          chai.assert.isNull(Blockly.registry.getObject('test', 'bad_name'));
+        }, /Unable to find/);
       });
 
       test('Throw if missing', function() {
@@ -175,7 +183,9 @@ suite('Registry', function() {
     });
 
     test('Does not have', function() {
-      chai.assert.isNull(Blockly.registry.getAllItems('bad_type'));
+      assertWarnings(() => {
+        chai.assert.isNull(Blockly.registry.getAllItems('bad_type'));
+      }, /Unable to find/);
     });
 
     test('Throw if missing', function() {

From b331d780d1a8a9a1f8f8b8b0b4a2c0ab195eaa19 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 22 Sep 2021 16:39:09 -0700
Subject: [PATCH 816/833] Initialize generators in generator tests

---
 tests/mocha/generator_test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/mocha/generator_test.js b/tests/mocha/generator_test.js
index 945786c75..8cc5d7901 100644
--- a/tests/mocha/generator_test.js
+++ b/tests/mocha/generator_test.js
@@ -94,6 +94,7 @@ suite('Generator', function() {
         var generator = testCase[0];
         var name = testCase[1];
         test(name, function() {
+          generator.init(this.workspace);
           this.blockToCodeTest(generator, false, true, 'row_block');
           this.blockToCodeTest(
               generator, false, false, 'row_blockstack_block', 'thisOnly=false');

From d7d74f4fba596173180babd65444d256b01d89a1 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 22 Sep 2021 16:51:25 -0700
Subject: [PATCH 817/833] Remove usage of deprecated method in onKeyDown
 handler

---
 core/inject.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/inject.js b/core/inject.js
index 054b97b24..dadfd50d0 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -35,7 +35,6 @@ const bumpObjects = goog.require('Blockly.bumpObjects');
 const common = goog.require('Blockly.common');
 const dom = goog.require('Blockly.utils.dom');
 const userAgent = goog.require('Blockly.utils.userAgent');
-const utils = goog.require('Blockly.utils');
 const {BlockDragSurfaceSvg} = goog.require('Blockly.BlockDragSurfaceSvg');
 
 
@@ -277,7 +276,7 @@ const onKeyDown = function(e) {
     return;
   }
 
-  if (utils.isTargetInput(e) ||
+  if (browserEvents.isTargetInput(e) ||
       (mainWorkspace.rendered && !mainWorkspace.isVisible())) {
     // When focused on an HTML text input widget, don't trap any keys.
     // Ignore keypresses on rendered workspaces that have been explicitly

From 4efdd72a24c4f058c123c63dc3604022b59b2c11 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 22 Sep 2021 17:14:41 -0700
Subject: [PATCH 818/833] Update captureWarnings usages to assertWarnings

---
 tests/mocha/registry_test.js     |  6 ++----
 tests/mocha/workspace_helpers.js | 14 +++++---------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/tests/mocha/registry_test.js b/tests/mocha/registry_test.js
index 7fa595575..cff50c38c 100644
--- a/tests/mocha/registry_test.js
+++ b/tests/mocha/registry_test.js
@@ -257,12 +257,10 @@ suite('Registry', function() {
     test('Incorrect Plugin Name', function() {
       this.options['plugins']['test'] = 'random';
       var testClass;
-      var warnings = testHelpers.captureWarnings(() => {
+      assertWarnings(() => {
         testClass = Blockly.registry.getClassFromOptions('test', this.options);
-      });
+      }, /Unable to find/);
       chai.assert.isNull(testClass);
-      chai.assert.equal(warnings.length, 1,
-          'Expecting 1 warning about no name "random" found.');
     });
   });
 });
diff --git a/tests/mocha/workspace_helpers.js b/tests/mocha/workspace_helpers.js
index f656dd48d..9d4abea4e 100644
--- a/tests/mocha/workspace_helpers.js
+++ b/tests/mocha/workspace_helpers.js
@@ -6,7 +6,7 @@
 
 goog.module('Blockly.test.workspaceHelpers');
 
-const {assertVariableValues, workspaceTeardown} = goog.require('Blockly.test.helpers');
+const {assertVariableValues, assertWarnings, workspaceTeardown} = goog.require('Blockly.test.helpers');
 
 
 function testAWorkspace() {
@@ -1294,11 +1294,9 @@ function testAWorkspace() {
           this.workspace.createVariable('name1', 'type1', 'id1');
           this.workspace.deleteVariableById('id1');
           var workspace = this.workspace;
-          var warnings = testHelpers.captureWarnings(function() {
+          assertWarnings(() => {
             workspace.deleteVariableById('id1');
-          });
-          chai.assert.equal(warnings.length, 1,
-              'Expected 1 warning for second deleteVariableById call.');
+          }, /Can't delete/);
 
           // Check the undoStack only recorded one delete event.
           var undoStack = this.workspace.undoStack_;
@@ -1323,11 +1321,9 @@ function testAWorkspace() {
           createVarBlocksNoEvents(this.workspace, ['id1']);
           this.workspace.deleteVariableById('id1');
           var workspace = this.workspace;
-          var warnings = testHelpers.captureWarnings(function() {
+          assertWarnings(() => {
             workspace.deleteVariableById('id1');
-          });
-          chai.assert.equal(warnings.length, 1,
-              'Expected 1 warning for second deleteVariableById call.');
+          }, /Can't delete/);
 
           // Check the undoStack only recorded one delete event.
           var undoStack = this.workspace.undoStack_;

From e2e8ece9ae97256e47291ab0660fd0d72389c34e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 22 Sep 2021 17:24:57 -0700
Subject: [PATCH 819/833] Update test block in trashcan_test to not trigger
 warning log

---
 tests/mocha/trashcan_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/mocha/trashcan_test.js b/tests/mocha/trashcan_test.js
index d7373235b..ec3076502 100644
--- a/tests/mocha/trashcan_test.js
+++ b/tests/mocha/trashcan_test.js
@@ -204,7 +204,7 @@ suite("Trashcan", function() {
           '</block>'
       );
       fireDeleteEvent(this.workspace,
-          '<block type="test_field_block">' +
+          '<block type="statement_block2">' +
           '  <statement name="NAME">' +
           '    <block type="statement_block2"/>' +
           '  </statement>' +

From 57ccb1e14ac8c1326eb909bc31de14739ae3744b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 22 Sep 2021 17:35:08 -0700
Subject: [PATCH 820/833] Remove unecessary block variable block definition

---
 tests/mocha/xml_test.js | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/tests/mocha/xml_test.js b/tests/mocha/xml_test.js
index 9826e2cc4..093a1b955 100644
--- a/tests/mocha/xml_test.js
+++ b/tests/mocha/xml_test.js
@@ -451,30 +451,6 @@ suite('XML', function() {
   suite('domToBlock', function() {
     setup(function() {
       this.workspace = new Blockly.Workspace();
-      Blockly.defineBlocksWithJsonArray([{
-        "type": "variables_get",
-        "message0": "%1",
-        "args0": [
-          {
-            "type": "field_variable",
-            "name": "VAR"
-          }
-        ]
-      },
-      {
-        "type": "variables_set",
-        "message0": "%1 %2",
-        "args0": [
-          {
-            "type": "field_variable",
-            "name": "VAR"
-          },
-          {
-            "type": "input_value",
-            "name": "VALUE"
-          }
-        ]
-      }]);
     });
     teardown(function() {
       workspaceTeardown.call(this, this.workspace);

From ede7e8c18d2772d34a79b2fadf396f544ab7c196 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 23 Sep 2021 09:11:03 -0700
Subject: [PATCH 821/833] chore: Remove declareLegacyNamespace() from field_*
 files

---
 core/blockly.js                    | 32 ++++++++++++++++++++++++++----
 core/events/events_block_change.js |  5 +++--
 core/field.js                      |  1 -
 core/field_checkbox.js             |  1 -
 core/field_colour.js               |  1 -
 core/field_dropdown.js             |  1 -
 core/field_image.js                |  1 -
 core/field_label.js                |  1 -
 core/field_label_serializable.js   |  1 -
 core/field_multilineinput.js       |  1 -
 core/field_number.js               |  1 -
 core/field_registry.js             |  1 -
 core/field_textinput.js            |  1 -
 core/field_variable.js             |  1 -
 tests/deps.js                      |  4 ++--
 tests/deps.mocha.js                |  4 ++--
 16 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index 5d9da89c8..602597ae5 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -19,15 +19,26 @@ goog.module.declareLegacyNamespace();
 
 const Blocks = goog.require('Blockly.Blocks');
 const CollapsibleToolboxCategory = goog.require('Blockly.CollapsibleToolboxCategory');
-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 Field = goog.require('Blockly.Field');
+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');
 /* eslint-disable-next-line no-unused-vars */
 const ICopyable = goog.requireType('Blockly.ICopyable');
 const Marker = goog.require('Blockly.Marker');
 const Size = goog.require('Blockly.utils.Size');
 const TabNavigateCursor = goog.require('Blockly.TabNavigateCursor');
+const Toolbox = goog.require('Blockly.Toolbox');
+const ToolboxCategory = goog.require('Blockly.ToolboxCategory');
+const ToolboxItem = goog.require('Blockly.ToolboxItem');
+const ToolboxSeparator = goog.require('Blockly.ToolboxSeparator');
 /* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
 /* eslint-disable-next-line no-unused-vars */
@@ -40,6 +51,7 @@ 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 fieldRegistry = goog.require('Blockly.fieldRegistry');
 const inputTypes = goog.require('Blockly.inputTypes');
 const internalConstants = goog.require('Blockly.internalConstants');
 const toolbox = goog.require('Blockly.utils.toolbox');
@@ -432,9 +444,21 @@ exports.BlockDragSurfaceSvg = BlockDragSurfaceSvg;
 exports.BlockSvg = BlockSvg;
 exports.CollapsibleToolboxCategory = CollapsibleToolboxCategory;
 exports.Cursor = Cursor;
+exports.Field = Field;
+exports.FieldCheckbox = FieldCheckbox;
+exports.FieldColour = FieldColour;
+exports.FieldDropdown = FieldDropdown;
+exports.FieldImage = FieldImage;
+exports.FieldLabel = FieldLabel;
+exports.FieldLabelSerializable = FieldLabelSerializable;
+exports.FieldMultilineInput = FieldMultilineInput;
+exports.FieldNumber = FieldNumber;
+exports.FieldTextInput = FieldTextInput;
+exports.FieldVariable = FieldVariable;
 exports.Marker = Marker;
 exports.TabNavigateCursor = TabNavigateCursor;
 exports.Toolbox = Toolbox;
 exports.ToolboxCategory = ToolboxCategory;
 exports.ToolboxItem = ToolboxItem;
 exports.ToolboxSeparator = ToolboxSeparator;
+exports.fieldRegistry = fieldRegistry;
diff --git a/core/events/events_block_change.js b/core/events/events_block_change.js
index 7934f901d..3b7d9d188 100644
--- a/core/events/events_block_change.js
+++ b/core/events/events_block_change.js
@@ -13,6 +13,7 @@
 goog.module('Blockly.Events.BlockChange');
 goog.module.declareLegacyNamespace();
 
+const BlockBase = goog.require('Blockly.Events.BlockBase');
 const Events = goog.require('Blockly.Events');
 const Xml = goog.require('Blockly.Xml');
 const object = goog.require('Blockly.utils.object');
@@ -31,7 +32,7 @@ const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
  * @param {?string=} opt_name Name of input or field affected, or null.
  * @param {*=} opt_oldValue Previous value of element.
  * @param {*=} opt_newValue New value of element.
- * @extends {Events.BlockBase}
+ * @extends {BlockBase}
  * @constructor
  */
 const BlockChange = function(
@@ -45,7 +46,7 @@ const BlockChange = function(
   this.oldValue = typeof opt_oldValue == 'undefined' ? '' : opt_oldValue;
   this.newValue = typeof opt_newValue == 'undefined' ? '' : opt_newValue;
 };
-object.inherits(BlockChange, Events.BlockBase);
+object.inherits(BlockChange, BlockBase);
 
 /**
  * Type of this event.
diff --git a/core/field.js b/core/field.js
index 4be8dfd63..94695ccad 100644
--- a/core/field.js
+++ b/core/field.js
@@ -13,7 +13,6 @@
 'use strict';
 
 goog.module('Blockly.Field');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/field_checkbox.js b/core/field_checkbox.js
index 388e18a26..cb4145d9f 100644
--- a/core/field_checkbox.js
+++ b/core/field_checkbox.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.FieldCheckbox');
-goog.module.declareLegacyNamespace();
 
 const Field = goog.require('Blockly.Field');
 const dom = goog.require('Blockly.utils.dom');
diff --git a/core/field_colour.js b/core/field_colour.js
index b05290460..0961d54b4 100644
--- a/core/field_colour.js
+++ b/core/field_colour.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.FieldColour');
-goog.module.declareLegacyNamespace();
 
 const Css = goog.require('Blockly.Css');
 const DropDownDiv = goog.require('Blockly.DropDownDiv');
diff --git a/core/field_dropdown.js b/core/field_dropdown.js
index cec7bab97..e2d390f5f 100644
--- a/core/field_dropdown.js
+++ b/core/field_dropdown.js
@@ -13,7 +13,6 @@
 'use strict';
 
 goog.module('Blockly.FieldDropdown');
-goog.module.declareLegacyNamespace();
 
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const DropDownDiv = goog.require('Blockly.DropDownDiv');
diff --git a/core/field_image.js b/core/field_image.js
index ff4460867..9df6754ff 100644
--- a/core/field_image.js
+++ b/core/field_image.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.FieldImage');
-goog.module.declareLegacyNamespace();
 
 const Field = goog.require('Blockly.Field');
 const Size = goog.require('Blockly.utils.Size');
diff --git a/core/field_label.js b/core/field_label.js
index 1a7480543..2f2e78e3a 100644
--- a/core/field_label.js
+++ b/core/field_label.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.FieldLabel');
-goog.module.declareLegacyNamespace();
 
 const Field = goog.require('Blockly.Field');
 const dom = goog.require('Blockly.utils.dom');
diff --git a/core/field_label_serializable.js b/core/field_label_serializable.js
index dee9da1ef..e8f467f69 100644
--- a/core/field_label_serializable.js
+++ b/core/field_label_serializable.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.FieldLabelSerializable');
-goog.module.declareLegacyNamespace();
 
 const FieldLabel = goog.require('Blockly.FieldLabel');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
diff --git a/core/field_multilineinput.js b/core/field_multilineinput.js
index 7d0d4bcea..a2776d294 100644
--- a/core/field_multilineinput.js
+++ b/core/field_multilineinput.js
@@ -13,7 +13,6 @@
 'use strict';
 
 goog.module('Blockly.FieldMultilineInput');
-goog.module.declareLegacyNamespace();
 
 const Css = goog.require('Blockly.Css');
 const Field = goog.require('Blockly.Field');
diff --git a/core/field_number.js b/core/field_number.js
index 4ed5ac5aa..848e397c9 100644
--- a/core/field_number.js
+++ b/core/field_number.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.FieldNumber');
-goog.module.declareLegacyNamespace();
 
 const FieldTextInput = goog.require('Blockly.FieldTextInput');
 const aria = goog.require('Blockly.utils.aria');
diff --git a/core/field_registry.js b/core/field_registry.js
index 97c149346..2d2cdf73f 100644
--- a/core/field_registry.js
+++ b/core/field_registry.js
@@ -13,7 +13,6 @@
 'use strict';
 
 goog.module('Blockly.fieldRegistry');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.Field');
diff --git a/core/field_textinput.js b/core/field_textinput.js
index eab4de6e0..57b327d85 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.FieldTextInput');
-goog.module.declareLegacyNamespace();
 
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const DropDownDiv = goog.require('Blockly.DropDownDiv');
diff --git a/core/field_variable.js b/core/field_variable.js
index c3e6988e8..c4de96edc 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.FieldVariable');
-goog.module.declareLegacyNamespace();
 
 const FieldDropdown = goog.require('Blockly.FieldDropdown');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/tests/deps.js b/tests/deps.js
index f2d910b89..91bf8ec17 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.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.Blocks', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Cursor', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Marker', 'Blockly.Procedures', 'Blockly.TabNavigateCursor', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', '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.CollapsibleToolboxCategory', 'Blockly.Cursor', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Field', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Marker', 'Blockly.Procedures', 'Blockly.TabNavigateCursor', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', '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'});
@@ -39,7 +39,7 @@ goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Block
 goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils.deprecation', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.BlockBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 7e1d189d8..189f7d09a 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.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.Blocks', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Cursor', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Marker', 'Blockly.Procedures', 'Blockly.TabNavigateCursor', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', '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.CollapsibleToolboxCategory', 'Blockly.Cursor', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Field', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Marker', 'Blockly.Procedures', 'Blockly.TabNavigateCursor', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', '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'});
@@ -39,7 +39,7 @@ goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Block
 goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils.deprecation', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.BlockBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From e0693a65d2b428b58e4c9caaf1abe346688ac4d9 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 23 Sep 2021 14:48:52 -0700
Subject: [PATCH 822/833] chore: Remove declareLegacyNamespace() from files in
 core (#5525)

* chore: Remove declareLegacyNamespace() from files in core

* fix: Update missing/errant re-exports in blockly.js
---
 core/blockly.js                    | 147 ++++++++++++++++++++++++++++-
 core/blockly_options.js            |   1 -
 core/browser_events.js             |   1 -
 core/bubble.js                     |   1 -
 core/bubble_dragger.js             |   1 -
 core/clipboard.js                  |   1 -
 core/comment.js                    |   1 -
 core/common.js                     |   1 -
 core/component_manager.js          |   1 -
 core/connection.js                 |   1 -
 core/connection_checker.js         |   1 -
 core/connection_db.js              |   1 -
 core/connection_types.js           |   1 -
 core/constants.js                  |   1 -
 core/contextmenu.js                |   3 -
 core/contextmenu_items.js          |   1 -
 core/contextmenu_registry.js       |   1 -
 core/css.js                        |   1 -
 core/delete_area.js                |   1 -
 core/dialog.js                     |   1 -
 core/drag_target.js                |   1 -
 core/dropdowndiv.js                |   1 -
 core/extensions.js                 |   1 -
 core/field_angle.js                |   1 -
 core/flyout_base.js                |   1 -
 core/flyout_button.js              |   1 -
 core/flyout_horizontal.js          |   1 -
 core/flyout_metrics_manager.js     |   1 -
 core/flyout_vertical.js            |   1 -
 core/generator.js                  |   1 -
 core/gesture.js                    |   1 -
 core/grid.js                       |   1 -
 core/icon.js                       |   1 -
 core/inject.js                     |   1 -
 core/input.js                      |   1 -
 core/input_types.js                |   1 -
 core/insertion_marker_manager.js   |   3 -
 core/internal_constants.js         |   1 -
 core/marker_manager.js             |   1 -
 core/menu.js                       |   1 -
 core/menuitem.js                   |   1 -
 core/metrics_manager.js            |   1 -
 core/mutator.js                    |   1 -
 core/names.js                      |   1 -
 core/options.js                    |   1 -
 core/positionable_helpers.js       |   1 -
 core/procedures.js                 |   1 -
 core/registry.js                   |   1 -
 core/rendered_connection.js        |   1 -
 core/scrollbar.js                  |   3 -
 core/scrollbar_pair.js             |   1 -
 core/shortcut_items.js             |   1 -
 core/shortcut_registry.js          |   1 -
 core/theme.js                      |   1 -
 core/theme_manager.js              |   1 -
 core/tooltip.js                    |   1 -
 core/touch.js                      |   1 -
 core/touch_gesture.js              |   1 -
 core/trashcan.js                   |   1 -
 core/utils.js                      |   1 -
 core/variable_map.js               |   1 -
 core/variable_model.js             |   1 -
 core/variables.js                  |   1 -
 core/variables_dynamic.js          |   1 -
 core/warning.js                    |   1 -
 core/widgetdiv.js                  |   1 -
 core/workspace.js                  |   1 -
 core/workspace_audio.js            |   1 -
 core/workspace_comment.js          |   1 -
 core/workspace_comment_svg.js      |   1 -
 core/workspace_drag_surface_svg.js |   1 -
 core/workspace_dragger.js          |   3 -
 core/workspace_svg.js              |   1 -
 core/xml.js                        |   1 -
 core/zoom_controls.js              |   1 -
 tests/deps.js                      |   4 +-
 tests/deps.mocha.js                |   4 +-
 77 files changed, 147 insertions(+), 90 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index 602597ae5..e30a54681 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -17,9 +17,26 @@
 goog.module('Blockly');
 goog.module.declareLegacyNamespace();
 
+const BlocklyOptions = goog.require('Blockly.BlocklyOptions');
 const Blocks = goog.require('Blockly.Blocks');
+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 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');
@@ -30,20 +47,63 @@ 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 Icon = goog.require('Blockly.Icon');
 /* eslint-disable-next-line no-unused-vars */
 const ICopyable = goog.requireType('Blockly.ICopyable');
+const Input = goog.require('Blockly.Input');
+const InsertionMarkerManager = goog.require('Blockly.InsertionMarkerManager');
 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 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');
-/* 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 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 browserEvents = goog.require('Blockly.browserEvents');
+const bumpObjects = goog.require('Blockly.bumpObjects');
 const clipboard = goog.require('Blockly.clipboard');
 const colour = goog.require('Blockly.utils.colour');
 const common = goog.require('Blockly.common');
@@ -52,9 +112,13 @@ const constants = goog.require('Blockly.constants');
 const deprecation = goog.require('Blockly.utils.deprecation');
 const dialog = goog.require('Blockly.dialog');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
+const inject = goog.require('Blockly.inject');
 const inputTypes = goog.require('Blockly.inputTypes');
 const internalConstants = goog.require('Blockly.internalConstants');
+const registry = goog.require('Blockly.registry');
 const toolbox = goog.require('Blockly.utils.toolbox');
+const uiPosition = goog.require('Blockly.uiPosition');
+const utils = goog.require('Blockly.utils');
 const {Block} = goog.require('Blockly.Block');
 const {BlockDragger} = goog.require('Blockly.BlockDragger');
 const {BlockDragSurfaceSvg} = goog.require('Blockly.BlockDragSurfaceSvg');
@@ -439,12 +503,29 @@ exports.COLLAPSED_FIELD_NAME = constants.COLLAPSED_FIELD_NAME;
 exports.ASTNode = ASTNode;
 exports.BasicCursor = BasicCursor;
 exports.Block = Block;
+exports.BlocklyOptions = BlocklyOptions;
 exports.BlockDragger = BlockDragger;
 exports.BlockDragSurfaceSvg = BlockDragSurfaceSvg;
 exports.BlockSvg = BlockSvg;
+exports.Bubble = Bubble;
+exports.BubbleDragger = BubbleDragger;
 exports.CollapsibleToolboxCategory = CollapsibleToolboxCategory;
+exports.Comment = Comment;
+exports.ComponentManager = ComponentManager;
+exports.Connection = Connection;
+exports.ConnectionChecker = ConnectionChecker;
+exports.ConnectionDB = ConnectionDB;
+exports.ContextMenu = ContextMenu;
+exports.ContextMenuItems = ContextMenuItems;
+exports.ContextMenuRegistry = ContextMenuRegistry;
+exports.Css = Css;
 exports.Cursor = Cursor;
+exports.DeleteArea = DeleteArea;
+exports.DragTarget = DragTarget;
+exports.DropDownDiv = DropDownDiv;
+exports.Extensions = Extensions;
 exports.Field = Field;
+exports.FieldAngle = FieldAngle;
 exports.FieldCheckbox = FieldCheckbox;
 exports.FieldColour = FieldColour;
 exports.FieldDropdown = FieldDropdown;
@@ -455,10 +536,68 @@ exports.FieldMultilineInput = FieldMultilineInput;
 exports.FieldNumber = FieldNumber;
 exports.FieldTextInput = FieldTextInput;
 exports.FieldVariable = FieldVariable;
+exports.Flyout = Flyout;
+exports.FlyoutButton = FlyoutButton;
+exports.FlyoutMetricsManager = FlyoutMetricsManager;
+exports.Generator = Generator;
+exports.Gesture = Gesture;
+exports.Grid = Grid;
+exports.HorizontalFlyout = HorizontalFlyout;
+exports.Icon = Icon;
+exports.Input = Input;
+exports.InsertionMarkerManager = InsertionMarkerManager;
 exports.Marker = Marker;
+exports.MarkerManager = MarkerManager;
+exports.Menu = Menu;
+exports.MenuItem = MenuItem;
+exports.MetricsManager = MetricsManager;
+exports.Mutator = Mutator;
+exports.Names = Names;
+exports.Options = Options;
+exports.Procedures = Procedures;
+exports.RenderedConnection = RenderedConnection;
+exports.Scrollbar = Scrollbar;
+exports.ScrollbarPair = ScrollbarPair;
+exports.ShortcutItems = ShortcutItems;
+exports.ShortcutRegistry = ShortcutRegistry;
 exports.TabNavigateCursor = TabNavigateCursor;
+exports.Theme = Theme;
+exports.ThemeManager = ThemeManager;
 exports.Toolbox = Toolbox;
 exports.ToolboxCategory = ToolboxCategory;
 exports.ToolboxItem = ToolboxItem;
 exports.ToolboxSeparator = ToolboxSeparator;
+exports.Tooltip = Tooltip;
+exports.Touch = Touch;
+exports.TouchGesture = TouchGesture;
+exports.Trashcan = Trashcan;
+exports.VariableMap = VariableMap;
+exports.VariableModel = VariableModel;
+exports.Variables = Variables;
+exports.VariablesDynamic = VariablesDynamic;
+exports.VerticalFlyout = VerticalFlyout;
+exports.Warning = Warning;
+exports.WidgetDiv = WidgetDiv;
+exports.Workspace = Workspace;
+exports.WorkspaceAudio = WorkspaceAudio;
+exports.WorkspaceComment = WorkspaceComment;
+exports.WorkspaceCommentSvg = WorkspaceCommentSvg;
+exports.WorkspaceDragSurfaceSvg = WorkspaceDragSurfaceSvg;
+exports.WorkspaceDragger = WorkspaceDragger;
+exports.WorkspaceSvg = WorkspaceSvg;
+exports.Xml = Xml;
+exports.ZoomControls = ZoomControls;
+exports.blockAnimations = blockAnimations;
+exports.browserEvents = browserEvents;
+exports.bumpObjects = bumpObjects;
+exports.clipboard = clipboard;
+exports.common = common;
+exports.connectionTypes = connectionTypes;
+exports.constants = constants;
+exports.dialog = dialog;
 exports.fieldRegistry = fieldRegistry;
+exports.inject = inject;
+exports.inputTypes = inputTypes;
+exports.registry = registry;
+exports.uiPosition = uiPosition;
+exports.utils = utils;
diff --git a/core/blockly_options.js b/core/blockly_options.js
index c9c7b62f9..ef0dffc83 100644
--- a/core/blockly_options.js
+++ b/core/blockly_options.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.BlocklyOptions');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/core/browser_events.js b/core/browser_events.js
index 6bad8bcc9..2d70dcf0a 100644
--- a/core/browser_events.js
+++ b/core/browser_events.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.browserEvents');
-goog.module.declareLegacyNamespace();
 
 const Touch = goog.require('Blockly.Touch');
 const {globalThis} = goog.require('Blockly.utils.global');
diff --git a/core/bubble.js b/core/bubble.js
index ad72c9e9b..a4581cdb9 100644
--- a/core/bubble.js
+++ b/core/bubble.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.Bubble');
-goog.module.declareLegacyNamespace();
 
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/bubble_dragger.js b/core/bubble_dragger.js
index 736332f6f..c6e87ea9e 100644
--- a/core/bubble_dragger.js
+++ b/core/bubble_dragger.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.BubbleDragger');
-goog.module.declareLegacyNamespace();
 
 const ComponentManager = goog.require('Blockly.ComponentManager');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
diff --git a/core/clipboard.js b/core/clipboard.js
index 56e0cbeab..4c7205cac 100644
--- a/core/clipboard.js
+++ b/core/clipboard.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.clipboard');
-goog.module.declareLegacyNamespace();
 
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/comment.js b/core/comment.js
index 6c7d050f6..76a9f08d3 100644
--- a/core/comment.js
+++ b/core/comment.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.Comment');
-goog.module.declareLegacyNamespace();
 
 const Bubble = goog.require('Blockly.Bubble');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/common.js b/core/common.js
index edc2ab6ce..85f611f6e 100644
--- a/core/common.js
+++ b/core/common.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.common');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Connection = goog.requireType('Blockly.Connection');
diff --git a/core/component_manager.js b/core/component_manager.js
index dfe48b1be..33c7e6784 100644
--- a/core/component_manager.js
+++ b/core/component_manager.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.ComponentManager');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const IAutoHideable = goog.requireType('Blockly.IAutoHideable');
diff --git a/core/connection.js b/core/connection.js
index fc01edebc..7bb7bb961 100644
--- a/core/connection.js
+++ b/core/connection.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.Connection');
-goog.module.declareLegacyNamespace();
 
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/connection_checker.js b/core/connection_checker.js
index e3fbc1929..96a07048a 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.ConnectionChecker');
-goog.module.declareLegacyNamespace();
 
 const Connection = goog.require('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/connection_db.js b/core/connection_db.js
index c0ee7f500..579d36164 100644
--- a/core/connection_db.js
+++ b/core/connection_db.js
@@ -13,7 +13,6 @@
 'use strict';
 
 goog.module('Blockly.ConnectionDB');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Coordinate = goog.requireType('Blockly.utils.Coordinate');
diff --git a/core/connection_types.js b/core/connection_types.js
index 569ffc442..007e3f5c1 100644
--- a/core/connection_types.js
+++ b/core/connection_types.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.connectionTypes');
-goog.module.declareLegacyNamespace();
 
 /**
  * Enum for the type of a connection or input.
diff --git a/core/constants.js b/core/constants.js
index 727e42a1f..3a247c17f 100644
--- a/core/constants.js
+++ b/core/constants.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.constants');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/core/contextmenu.js b/core/contextmenu.js
index 5afc69172..6f4deb922 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -11,10 +11,7 @@
 'use strict';
 
 goog.module('Blockly.ContextMenu');
-goog.module.declareLegacyNamespace();
 
-// TODO(#5073): Add Blockly require after fixing circular dependency.
-// goog.require('Blockly');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js
index 3e32c2ca0..ac2fb56df 100644
--- a/core/contextmenu_items.js
+++ b/core/contextmenu_items.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.ContextMenuItems');
-goog.module.declareLegacyNamespace();
 
 const ContextMenuRegistry = goog.require('Blockly.ContextMenuRegistry');
 const Events = goog.require('Blockly.Events');
diff --git a/core/contextmenu_registry.js b/core/contextmenu_registry.js
index 918a11bd6..48daec7f6 100644
--- a/core/contextmenu_registry.js
+++ b/core/contextmenu_registry.js
@@ -15,7 +15,6 @@
  * @namespace
  */
 goog.module('Blockly.ContextMenuRegistry');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
diff --git a/core/css.js b/core/css.js
index 519feac09..0e0b7fa5f 100644
--- a/core/css.js
+++ b/core/css.js
@@ -15,7 +15,6 @@
  * @namespace
  */
 goog.module('Blockly.Css');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/core/delete_area.js b/core/delete_area.js
index 9ca08bc7b..67e22d685 100644
--- a/core/delete_area.js
+++ b/core/delete_area.js
@@ -13,7 +13,6 @@
 'use strict';
 
 goog.module('Blockly.DeleteArea');
-goog.module.declareLegacyNamespace();
 
 const DragTarget = goog.require('Blockly.DragTarget');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/dialog.js b/core/dialog.js
index 7235b6f94..fe387065a 100644
--- a/core/dialog.js
+++ b/core/dialog.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.dialog');
-goog.module.declareLegacyNamespace();
 
 let alertImplementation = function(message, opt_callback) {
   window.alert(message);
diff --git a/core/drag_target.js b/core/drag_target.js
index e5a0f578b..daec4cf89 100644
--- a/core/drag_target.js
+++ b/core/drag_target.js
@@ -13,7 +13,6 @@
 'use strict';
 
 goog.module('Blockly.DragTarget');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const IDragTarget = goog.requireType('Blockly.IDragTarget');
diff --git a/core/dropdowndiv.js b/core/dropdowndiv.js
index b9d814891..c5517bf3e 100644
--- a/core/dropdowndiv.js
+++ b/core/dropdowndiv.js
@@ -14,7 +14,6 @@
 'use strict';
 
 goog.module('Blockly.DropDownDiv');
-goog.module.declareLegacyNamespace();
 
 const Rect = goog.require('Blockly.utils.Rect');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/extensions.js b/core/extensions.js
index f956bfed5..876169ff0 100644
--- a/core/extensions.js
+++ b/core/extensions.js
@@ -18,7 +18,6 @@
  * @namespace
  */
 goog.module('Blockly.Extensions');
-goog.module.declareLegacyNamespace();
 
 const utils = goog.require('Blockly.utils');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/field_angle.js b/core/field_angle.js
index ab4295a40..657adfd6d 100644
--- a/core/field_angle.js
+++ b/core/field_angle.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.FieldAngle');
-goog.module.declareLegacyNamespace();
 
 const Css = goog.require('Blockly.Css');
 const DropDownDiv = goog.require('Blockly.DropDownDiv');
diff --git a/core/flyout_base.js b/core/flyout_base.js
index c4d1832a0..73e3c9dc1 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.Flyout');
-goog.module.declareLegacyNamespace();
 
 const ComponentManager = goog.require('Blockly.ComponentManager');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
diff --git a/core/flyout_button.js b/core/flyout_button.js
index 7bb5a3e88..50f101f5a 100644
--- a/core/flyout_button.js
+++ b/core/flyout_button.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.FlyoutButton');
-goog.module.declareLegacyNamespace();
 
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Css = goog.require('Blockly.Css');
diff --git a/core/flyout_horizontal.js b/core/flyout_horizontal.js
index f7c4e9e74..877b13840 100644
--- a/core/flyout_horizontal.js
+++ b/core/flyout_horizontal.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.HorizontalFlyout');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Coordinate = goog.requireType('Blockly.utils.Coordinate');
diff --git a/core/flyout_metrics_manager.js b/core/flyout_metrics_manager.js
index b3ed243d6..dde699902 100644
--- a/core/flyout_metrics_manager.js
+++ b/core/flyout_metrics_manager.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.FlyoutMetricsManager');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const IFlyout = goog.requireType('Blockly.IFlyout');
diff --git a/core/flyout_vertical.js b/core/flyout_vertical.js
index edd8541f0..b201ebeac 100644
--- a/core/flyout_vertical.js
+++ b/core/flyout_vertical.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.VerticalFlyout');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Coordinate = goog.requireType('Blockly.utils.Coordinate');
diff --git a/core/generator.js b/core/generator.js
index ed7e20329..d121bb186 100644
--- a/core/generator.js
+++ b/core/generator.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.Generator');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Names = goog.requireType('Blockly.Names');
diff --git a/core/gesture.js b/core/gesture.js
index 077e14788..f2352050e 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.Gesture');
-goog.module.declareLegacyNamespace();
 
 const BubbleDragger = goog.require('Blockly.BubbleDragger');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
diff --git a/core/grid.js b/core/grid.js
index 1a1d5f2a3..9865364a2 100644
--- a/core/grid.js
+++ b/core/grid.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.Grid');
-goog.module.declareLegacyNamespace();
 
 const Svg = goog.require('Blockly.utils.Svg');
 const dom = goog.require('Blockly.utils.dom');
diff --git a/core/icon.js b/core/icon.js
index 83dbaf583..3fd8ccaf0 100644
--- a/core/icon.js
+++ b/core/icon.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.Icon');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Bubble = goog.requireType('Blockly.Bubble');
diff --git a/core/inject.js b/core/inject.js
index dadfd50d0..4fedf8527 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.inject');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
diff --git a/core/input.js b/core/input.js
index 04dda6620..5d503ff04 100644
--- a/core/input.js
+++ b/core/input.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.Input');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Connection = goog.requireType('Blockly.Connection');
diff --git a/core/input_types.js b/core/input_types.js
index 8bdc9e504..28f40578a 100644
--- a/core/input_types.js
+++ b/core/input_types.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.inputTypes');
-goog.module.declareLegacyNamespace();
 
 const connectionTypes = goog.require('Blockly.connectionTypes');
 
diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js
index bc4c2f311..28d975edc 100644
--- a/core/insertion_marker_manager.js
+++ b/core/insertion_marker_manager.js
@@ -11,10 +11,7 @@
 'use strict';
 
 goog.module('Blockly.InsertionMarkerManager');
-goog.module.declareLegacyNamespace();
 
-// TODO(#5073): Add Blockly require after fixing circular dependency.
-// goog.require('Blockly');
 const ComponentManager = goog.require('Blockly.ComponentManager');
 /* eslint-disable-next-line no-unused-vars */
 const Coordinate = goog.requireType('Blockly.utils.Coordinate');
diff --git a/core/internal_constants.js b/core/internal_constants.js
index b97c723b4..c7028c303 100644
--- a/core/internal_constants.js
+++ b/core/internal_constants.js
@@ -13,7 +13,6 @@
 'use strict';
 
 goog.module('Blockly.internalConstants');
-goog.module.declareLegacyNamespace();
 
 const connectionTypes = goog.require('Blockly.connectionTypes');
 
diff --git a/core/marker_manager.js b/core/marker_manager.js
index 0857e9260..f26365e0e 100644
--- a/core/marker_manager.js
+++ b/core/marker_manager.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.MarkerManager');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
diff --git a/core/menu.js b/core/menu.js
index 91cfb4d36..a142d341a 100644
--- a/core/menu.js
+++ b/core/menu.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.Menu');
-goog.module.declareLegacyNamespace();
 
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/menuitem.js b/core/menuitem.js
index b06ca83f8..a34148836 100644
--- a/core/menuitem.js
+++ b/core/menuitem.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.MenuItem');
-goog.module.declareLegacyNamespace();
 
 const aria = goog.require('Blockly.utils.aria');
 const dom = goog.require('Blockly.utils.dom');
diff --git a/core/metrics_manager.js b/core/metrics_manager.js
index 04643d74a..6331867af 100644
--- a/core/metrics_manager.js
+++ b/core/metrics_manager.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.MetricsManager');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const IFlyout = goog.requireType('Blockly.IFlyout');
diff --git a/core/mutator.js b/core/mutator.js
index a00d279e9..0ab65c5aa 100644
--- a/core/mutator.js
+++ b/core/mutator.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.Mutator');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Abstract = goog.requireType('Blockly.Events.Abstract');
diff --git a/core/names.js b/core/names.js
index b66da4c37..099d2972d 100644
--- a/core/names.js
+++ b/core/names.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.Names');
-goog.module.declareLegacyNamespace();
 
 const Msg = goog.require('Blockly.Msg');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/options.js b/core/options.js
index cc2d412ef..75eba6956 100644
--- a/core/options.js
+++ b/core/options.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.Options');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
diff --git a/core/positionable_helpers.js b/core/positionable_helpers.js
index 812c5f7be..aa5bb8fcb 100644
--- a/core/positionable_helpers.js
+++ b/core/positionable_helpers.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.uiPosition');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const MetricsManager = goog.requireType('Blockly.MetricsManager');
diff --git a/core/procedures.js b/core/procedures.js
index eec3484fd..e80f04b5b 100644
--- a/core/procedures.js
+++ b/core/procedures.js
@@ -15,7 +15,6 @@
  * @namespace
  */
 goog.module('Blockly.Procedures');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Abstract = goog.requireType('Blockly.Events.Abstract');
diff --git a/core/registry.js b/core/registry.js
index 1a03f715e..99f2e4e8b 100644
--- a/core/registry.js
+++ b/core/registry.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.registry');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Abstract = goog.requireType('Blockly.Events.Abstract');
diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index 974093b71..f9f5b425d 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.RenderedConnection');
-goog.module.declareLegacyNamespace();
 
 const Connection = goog.require('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/scrollbar.js b/core/scrollbar.js
index 4de7ecbff..8eb521bc2 100644
--- a/core/scrollbar.js
+++ b/core/scrollbar.js
@@ -11,10 +11,7 @@
 'use strict';
 
 goog.module('Blockly.Scrollbar');
-goog.module.declareLegacyNamespace();
 
-// TODO(#5073): Add Blockly require after fixing circular dependency.
-// goog.require('Blockly');
 const Touch = goog.require('Blockly.Touch');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/scrollbar_pair.js b/core/scrollbar_pair.js
index 2b240f276..2e79f1f98 100644
--- a/core/scrollbar_pair.js
+++ b/core/scrollbar_pair.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.ScrollbarPair');
-goog.module.declareLegacyNamespace();
 
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/shortcut_items.js b/core/shortcut_items.js
index 45e48eb88..41cbc85a7 100644
--- a/core/shortcut_items.js
+++ b/core/shortcut_items.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.ShortcutItems');
-goog.module.declareLegacyNamespace();
 
 const Gesture = goog.require('Blockly.Gesture');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/shortcut_registry.js b/core/shortcut_registry.js
index 3da777eae..d72a2c46c 100644
--- a/core/shortcut_registry.js
+++ b/core/shortcut_registry.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.ShortcutRegistry');
-goog.module.declareLegacyNamespace();
 
 const KeyCodes = goog.require('Blockly.utils.KeyCodes');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/theme.js b/core/theme.js
index 11c72e491..ce3b02e6d 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -10,7 +10,6 @@
 'use strict';
 
 goog.module('Blockly.Theme');
-goog.module.declareLegacyNamespace();
 
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
diff --git a/core/theme_manager.js b/core/theme_manager.js
index 308bc9088..4e95b0d9f 100644
--- a/core/theme_manager.js
+++ b/core/theme_manager.js
@@ -13,7 +13,6 @@
 'use strict';
 
 goog.module('Blockly.ThemeManager');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Theme = goog.requireType('Blockly.Theme');
diff --git a/core/tooltip.js b/core/tooltip.js
index d0335556b..4a659d918 100644
--- a/core/tooltip.js
+++ b/core/tooltip.js
@@ -20,7 +20,6 @@
  * @namespace
  */
 goog.module('Blockly.Tooltip');
-goog.module.declareLegacyNamespace();
 
 const blocklyString = goog.require('Blockly.utils.string');
 const browserEvents = goog.require('Blockly.browserEvents');
diff --git a/core/touch.js b/core/touch.js
index f17667fff..ce2b51b2b 100644
--- a/core/touch.js
+++ b/core/touch.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.Touch');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Gesture = goog.requireType('Blockly.Gesture');
diff --git a/core/touch_gesture.js b/core/touch_gesture.js
index 131ce725c..f7b89ff60 100644
--- a/core/touch_gesture.js
+++ b/core/touch_gesture.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.TouchGesture');
-goog.module.declareLegacyNamespace();
 
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Gesture = goog.require('Blockly.Gesture');
diff --git a/core/trashcan.js b/core/trashcan.js
index a0c4e71e9..bebc5569d 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.Trashcan');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Abstract = goog.requireType('Blockly.Events.Abstract');
diff --git a/core/utils.js b/core/utils.js
index 2c80c6b08..a1a4d1c89 100644
--- a/core/utils.js
+++ b/core/utils.js
@@ -17,7 +17,6 @@
  * @namespace
  */
 goog.module('Blockly.utils');
-goog.module.declareLegacyNamespace();
 
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const KeyCodes = goog.require('Blockly.utils.KeyCodes');
diff --git a/core/variable_map.js b/core/variable_map.js
index 3725df516..fb831d293 100644
--- a/core/variable_map.js
+++ b/core/variable_map.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.VariableMap');
-goog.module.declareLegacyNamespace();
 
 const Events = goog.require('Blockly.Events');
 const Msg = goog.require('Blockly.Msg');
diff --git a/core/variable_model.js b/core/variable_model.js
index f8ad7c6e3..dcded7131 100644
--- a/core/variable_model.js
+++ b/core/variable_model.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.VariableModel');
-goog.module.declareLegacyNamespace();
 
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/variables.js b/core/variables.js
index 575793105..5b83620d8 100644
--- a/core/variables.js
+++ b/core/variables.js
@@ -15,7 +15,6 @@
  * @namespace
  */
 goog.module('Blockly.Variables');
-goog.module.declareLegacyNamespace();
 
 const Blocks = goog.require('Blockly.Blocks');
 const Msg = goog.require('Blockly.Msg');
diff --git a/core/variables_dynamic.js b/core/variables_dynamic.js
index e982d733e..64969b85c 100644
--- a/core/variables_dynamic.js
+++ b/core/variables_dynamic.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.VariablesDynamic');
-goog.module.declareLegacyNamespace();
 
 const Blocks = goog.require('Blockly.Blocks');
 const Msg = goog.require('Blockly.Msg');
diff --git a/core/warning.js b/core/warning.js
index debd9d529..bf137f8d5 100644
--- a/core/warning.js
+++ b/core/warning.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.Warning');
-goog.module.declareLegacyNamespace();
 
 const Bubble = goog.require('Blockly.Bubble');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/widgetdiv.js b/core/widgetdiv.js
index fabd521af..571cfe277 100644
--- a/core/widgetdiv.js
+++ b/core/widgetdiv.js
@@ -17,7 +17,6 @@
  * @namespace
  */
 goog.module('Blockly.WidgetDiv');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Rect = goog.requireType('Blockly.utils.Rect');
diff --git a/core/workspace.js b/core/workspace.js
index 2b844d5cc..dc2d26efc 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.Workspace');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Abstract = goog.requireType('Blockly.Events.Abstract');
diff --git a/core/workspace_audio.js b/core/workspace_audio.js
index 178657baf..94c5bd06d 100644
--- a/core/workspace_audio.js
+++ b/core/workspace_audio.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.WorkspaceAudio');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
diff --git a/core/workspace_comment.js b/core/workspace_comment.js
index 0f5f981e2..a2a2aecaf 100644
--- a/core/workspace_comment.js
+++ b/core/workspace_comment.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.WorkspaceComment');
-goog.module.declareLegacyNamespace();
 
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Events = goog.require('Blockly.Events');
diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 3e4dc288b..1e8172948 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.WorkspaceCommentSvg');
-goog.module.declareLegacyNamespace();
 
 const ContextMenu = goog.require('Blockly.ContextMenu');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
diff --git a/core/workspace_drag_surface_svg.js b/core/workspace_drag_surface_svg.js
index 8cffb37d6..5b12d4a68 100644
--- a/core/workspace_drag_surface_svg.js
+++ b/core/workspace_drag_surface_svg.js
@@ -15,7 +15,6 @@
 'use strict';
 
 goog.module('Blockly.WorkspaceDragSurfaceSvg');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Coordinate = goog.requireType('Blockly.utils.Coordinate');
diff --git a/core/workspace_dragger.js b/core/workspace_dragger.js
index edce50701..92e3f0060 100644
--- a/core/workspace_dragger.js
+++ b/core/workspace_dragger.js
@@ -11,10 +11,7 @@
 'use strict';
 
 goog.module('Blockly.WorkspaceDragger');
-goog.module.declareLegacyNamespace();
 
-// TODO(#5073): Add Blockly require after fixing circular dependency.
-// goog.require('Blockly');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 2dd0dc5eb..12471ef95 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.WorkspaceSvg');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
diff --git a/core/xml.js b/core/xml.js
index c6a14f491..19bc142ca 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.Xml');
-goog.module.declareLegacyNamespace();
 
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/zoom_controls.js b/core/zoom_controls.js
index 5919c9578..ec3ddaf42 100644
--- a/core/zoom_controls.js
+++ b/core/zoom_controls.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.ZoomControls');
-goog.module.declareLegacyNamespace();
 
 const ComponentManager = goog.require('Blockly.ComponentManager');
 const Css = goog.require('Blockly.Css');
diff --git a/tests/deps.js b/tests/deps.js
index 91bf8ec17..9be60d8d7 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.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.Blocks', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Cursor', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Field', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Marker', 'Blockly.Procedures', 'Blockly.TabNavigateCursor', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', '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.BlocklyOptions', 'Blockly.Blocks', 'Blockly.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', '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.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', 'Blockly.Procedures', 'Blockly.RenderedConnection', 'Blockly.Scrollbar', 'Blockly.ScrollbarPair', 'Blockly.ShortcutItems', 'Blockly.ShortcutRegistry', 'Blockly.TabNavigateCursor', 'Blockly.Theme', 'Blockly.ThemeManager', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', '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'});
@@ -87,7 +87,7 @@ goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.c
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 189f7d09a..61a541b56 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.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.Blocks', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Cursor', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Field', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Marker', 'Blockly.Procedures', 'Blockly.TabNavigateCursor', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', '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.BlocklyOptions', 'Blockly.Blocks', 'Blockly.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', '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.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', 'Blockly.Procedures', 'Blockly.RenderedConnection', 'Blockly.Scrollbar', 'Blockly.ScrollbarPair', 'Blockly.ShortcutItems', 'Blockly.ShortcutRegistry', 'Blockly.TabNavigateCursor', 'Blockly.Theme', 'Blockly.ThemeManager', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', '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'});
@@ -87,7 +87,7 @@ goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.c
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});

From de330c887498aab09ad71b4bb40cc50fe77f3bf8 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 23 Sep 2021 11:13:01 -0700
Subject: [PATCH 823/833] chore: Remove declareLegacyNamespace() from theme
 files

---
 core/blockly.js       |  2 ++
 core/theme/classic.js |  1 -
 core/theme/themes.js  | 19 +++++++++++++++++++
 core/theme/zelos.js   |  1 -
 tests/deps.js         |  3 ++-
 tests/deps.mocha.js   |  3 ++-
 6 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 core/theme/themes.js

diff --git a/core/blockly.js b/core/blockly.js
index e30a54681..556db8194 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -76,6 +76,7 @@ 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');
@@ -562,6 +563,7 @@ exports.ShortcutItems = ShortcutItems;
 exports.ShortcutRegistry = ShortcutRegistry;
 exports.TabNavigateCursor = TabNavigateCursor;
 exports.Theme = Theme;
+exports.Themes = Themes;
 exports.ThemeManager = ThemeManager;
 exports.Toolbox = Toolbox;
 exports.ToolboxCategory = ToolboxCategory;
diff --git a/core/theme/classic.js b/core/theme/classic.js
index ab6d715f6..300a7579f 100644
--- a/core/theme/classic.js
+++ b/core/theme/classic.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.Themes.Classic');
-goog.module.declareLegacyNamespace();
 
 const Theme = goog.require('Blockly.Theme');
 
diff --git a/core/theme/themes.js b/core/theme/themes.js
new file mode 100644
index 000000000..37ca9e01c
--- /dev/null
+++ b/core/theme/themes.js
@@ -0,0 +1,19 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Namespace for themes.
+ */
+'use strict';
+
+goog.module('Blockly.Themes');
+
+const Classic = goog.require('Blockly.Themes.Classic');
+const Zelos = goog.require('Blockly.Themes.Zelos');
+
+
+exports.Classic = Classic;
+exports.Zelos = Zelos;
diff --git a/core/theme/zelos.js b/core/theme/zelos.js
index de8461a2c..4d97f4871 100644
--- a/core/theme/zelos.js
+++ b/core/theme/zelos.js
@@ -10,7 +10,6 @@
 'use strict';
 
 goog.module('Blockly.Themes.Zelos');
-goog.module.declareLegacyNamespace();
 
 const Theme = goog.require('Blockly.Theme');
 
diff --git a/tests/deps.js b/tests/deps.js
index 9be60d8d7..5e2aad243 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.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Blocks', 'Blockly.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', '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.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', 'Blockly.Procedures', 'Blockly.RenderedConnection', 'Blockly.Scrollbar', 'Blockly.ScrollbarPair', 'Blockly.ShortcutItems', 'Blockly.ShortcutRegistry', 'Blockly.TabNavigateCursor', 'Blockly.Theme', 'Blockly.ThemeManager', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', '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.BlocklyOptions', 'Blockly.Blocks', 'Blockly.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', '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.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', '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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', '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'});
@@ -207,6 +207,7 @@ goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme/themes.js', ['Blockly.Themes'], ['Blockly.Themes.Classic', 'Blockly.Themes.Zelos'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 61a541b56..1205cd57f 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.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Blocks', 'Blockly.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', '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.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', 'Blockly.Procedures', 'Blockly.RenderedConnection', 'Blockly.Scrollbar', 'Blockly.ScrollbarPair', 'Blockly.ShortcutItems', 'Blockly.ShortcutRegistry', 'Blockly.TabNavigateCursor', 'Blockly.Theme', 'Blockly.ThemeManager', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', '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.BlocklyOptions', 'Blockly.Blocks', 'Blockly.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', '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.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', '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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', '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'});
@@ -207,6 +207,7 @@ goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme/themes.js', ['Blockly.Themes'], ['Blockly.Themes.Classic', 'Blockly.Themes.Zelos'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});

From 3629ed5f6585b8d6964d9f765e55cfbda7b40b54 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshu.jaidka@gmail.com>
Date: Fri, 24 Sep 2021 17:15:10 +0530
Subject: [PATCH 824/833] refactor: Rename Blockly.connectionTypes to
 Blockly.ConnectionType (#5407)

* Renamed Blockly.connectionTypes to Blockly.ConnectionType
* Renamed core/connection_types.js to connection_type.js
* Add entry to renamings.js for renaming of Blockly.connectionTypes

Co-authored-by: Christopher Allen <cpcallen+git@google.com>
---
 core/block.js                                 | 12 +++---
 core/block_svg.js                             |  6 +--
 core/blockly.js                               | 22 ++++++-----
 core/connection.js                            | 14 +++----
 core/connection_checker.js                    | 10 ++---
 core/connection_db.js                         | 10 ++---
 ...connection_types.js => connection_type.js} |  7 ++--
 core/events/events_block_move.js              |  4 +-
 core/input_types.js                           |  6 +--
 core/insertion_marker_manager.js              |  6 +--
 core/internal_constants.js                    | 14 +++----
 core/keyboard_nav/ast_node.js                 | 12 +++---
 core/rendered_connection.js                   | 14 +++----
 core/renderers/common/constants.js            | 10 ++---
 core/renderers/common/debugger.js             | 10 ++---
 core/renderers/common/marker_svg.js           |  6 +--
 core/renderers/common/renderer.js             |  8 ++--
 core/renderers/zelos/constants.js             | 10 ++---
 core/renderers/zelos/renderer.js              |  8 ++--
 scripts/migration/renamings.js                |  3 ++
 tests/deps.js                                 | 38 +++++++++----------
 tests/deps.mocha.js                           | 38 +++++++++----------
 22 files changed, 137 insertions(+), 131 deletions(-)
 rename core/{connection_types.js => connection_type.js} (87%)

diff --git a/core/block.js b/core/block.js
index d185fe99e..bdff8bb64 100644
--- a/core/block.js
+++ b/core/block.js
@@ -18,6 +18,7 @@ const Blocks = goog.require('Blockly.Blocks');
 /* eslint-disable-next-line no-unused-vars */
 const Comment = goog.requireType('Blockly.Comment');
 const Connection = goog.require('Blockly.Connection');
+const ConnectionType = goog.require('Blockly.ConnectionType');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Events = goog.require('Blockly.Events');
 const Extensions = goog.require('Blockly.Extensions');
@@ -37,7 +38,6 @@ 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 connectionTypes = goog.require('Blockly.connectionTypes');
 const constants = goog.require('Blockly.constants');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const idGenerator = goog.require('Blockly.utils.idGenerator');
@@ -524,7 +524,7 @@ Block.prototype.getOnlyValueConnection_ = function() {
   let connection = null;
   for (let i = 0; i < this.inputList.length; i++) {
     const thisConnection = this.inputList[i].connection;
-    if (thisConnection && thisConnection.type == connectionTypes.INPUT_VALUE &&
+    if (thisConnection && thisConnection.type == ConnectionType.INPUT_VALUE &&
         thisConnection.targetConnection) {
       if (connection) {
         return null;  // More than one value input found.
@@ -689,7 +689,7 @@ Block.prototype.getPreviousBlock = function() {
 Block.prototype.getFirstStatementConnection = function() {
   for (let i = 0, input; (input = this.inputList[i]); i++) {
     if (input.connection &&
-        input.connection.type == connectionTypes.NEXT_STATEMENT) {
+        input.connection.type == ConnectionType.NEXT_STATEMENT) {
       return input.connection;
     }
   }
@@ -1187,7 +1187,7 @@ Block.prototype.setPreviousStatement = function(newBoolean, opt_check) {
             'connection.');
       }
       this.previousConnection =
-          this.makeConnection_(connectionTypes.PREVIOUS_STATEMENT);
+          this.makeConnection_(ConnectionType.PREVIOUS_STATEMENT);
     }
     this.previousConnection.setCheck(opt_check);
   } else {
@@ -1216,7 +1216,7 @@ Block.prototype.setNextStatement = function(newBoolean, opt_check) {
     }
     if (!this.nextConnection) {
       this.nextConnection =
-          this.makeConnection_(connectionTypes.NEXT_STATEMENT);
+          this.makeConnection_(ConnectionType.NEXT_STATEMENT);
     }
     this.nextConnection.setCheck(opt_check);
   } else {
@@ -1251,7 +1251,7 @@ Block.prototype.setOutput = function(newBoolean, opt_check) {
             'connection.');
       }
       this.outputConnection =
-          this.makeConnection_(connectionTypes.OUTPUT_VALUE);
+          this.makeConnection_(ConnectionType.OUTPUT_VALUE);
     }
     this.outputConnection.setCheck(opt_check);
   } else {
diff --git a/core/block_svg.js b/core/block_svg.js
index 87449ed19..3ea434000 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -57,7 +57,7 @@ const blockAnimations = goog.require('Blockly.blockAnimations');
 const blocks = goog.require('Blockly.serialization.blocks');
 const browserEvents = goog.require('Blockly.browserEvents');
 const common = goog.require('Blockly.common');
-const connectionTypes = goog.require('Blockly.connectionTypes');
+const ConnectionType = goog.require('Blockly.ConnectionType');
 const constants = goog.require('Blockly.constants');
 const dom = goog.require('Blockly.utils.dom');
 const internalConstants = goog.require('Blockly.internalConstants');
@@ -1597,8 +1597,8 @@ BlockSvg.prototype.positionNearConnection = function(
     sourceConnection, targetConnection) {
   // We only need to position the new block if it's before the existing one,
   // otherwise its position is set by the previous block.
-  if (sourceConnection.type == connectionTypes.NEXT_STATEMENT ||
-      sourceConnection.type == connectionTypes.INPUT_VALUE) {
+  if (sourceConnection.type == ConnectionType.NEXT_STATEMENT ||
+      sourceConnection.type == ConnectionType.INPUT_VALUE) {
     const dx = targetConnection.x - sourceConnection.x;
     const dy = targetConnection.y - sourceConnection.y;
 
diff --git a/core/blockly.js b/core/blockly.js
index 556db8194..c4622ed17 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -27,6 +27,7 @@ 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 ConnectionType = goog.require('Blockly.ConnectionType');
 const ContextMenu = goog.require('Blockly.ContextMenu');
 const ContextMenuItems = goog.require('Blockly.ContextMenuItems');
 const ContextMenuRegistry = goog.require('Blockly.ContextMenuRegistry');
@@ -108,7 +109,6 @@ const bumpObjects = goog.require('Blockly.bumpObjects');
 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');
@@ -421,24 +421,24 @@ exports.ALIGN_RIGHT = constants.ALIGN.RIGHT;
  */
 
 /**
- * @see connectionTypes.INPUT_VALUE
+ * @see ConnectionType.INPUT_VALUE
  */
-exports.INPUT_VALUE = connectionTypes.INPUT_VALUE;
+exports.INPUT_VALUE = ConnectionType.INPUT_VALUE;
 
 /**
- * @see connectionTypes.OUTPUT_VALUE
+ * @see ConnectionType.OUTPUT_VALUE
  */
-exports.OUTPUT_VALUE = connectionTypes.OUTPUT_VALUE;
+exports.OUTPUT_VALUE = ConnectionType.OUTPUT_VALUE;
 
 /**
- * @see connectionTypes.NEXT_STATEMENT
+ * @see ConnectionType.NEXT_STATEMENT
  */
-exports.NEXT_STATEMENT = connectionTypes.NEXT_STATEMENT;
+exports.NEXT_STATEMENT = ConnectionType.NEXT_STATEMENT;
 
 /**
- * @see connectionTypes.PREVIOUS_STATEMENT
+ * @see ConnectionType.PREVIOUS_STATEMENT
  */
-exports.PREVIOUS_STATEMENT = connectionTypes.PREVIOUS_STATEMENT;
+exports.PREVIOUS_STATEMENT = ConnectionType.PREVIOUS_STATEMENT;
 
 /**
  * @see inputTypes.DUMMY_INPUT
@@ -514,6 +514,7 @@ exports.CollapsibleToolboxCategory = CollapsibleToolboxCategory;
 exports.Comment = Comment;
 exports.ComponentManager = ComponentManager;
 exports.Connection = Connection;
+exports.ConnectionType = ConnectionType;
 exports.ConnectionChecker = ConnectionChecker;
 exports.ConnectionDB = ConnectionDB;
 exports.ContextMenu = ContextMenu;
@@ -594,7 +595,8 @@ exports.browserEvents = browserEvents;
 exports.bumpObjects = bumpObjects;
 exports.clipboard = clipboard;
 exports.common = common;
-exports.connectionTypes = connectionTypes;
+/** @deprecated Use Blockly.ConnectionType instead. */
+exports.connectionTypes = ConnectionType;
 exports.constants = constants;
 exports.dialog = dialog;
 exports.fieldRegistry = fieldRegistry;
diff --git a/core/connection.js b/core/connection.js
index 7bb7bb961..9e204f8aa 100644
--- a/core/connection.js
+++ b/core/connection.js
@@ -12,6 +12,7 @@
 
 goog.module('Blockly.Connection');
 
+const ConnectionType = goog.require('Blockly.ConnectionType');
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const IASTNodeLocationWithBlock = goog.requireType('Blockly.IASTNodeLocationWithBlock');
@@ -21,7 +22,6 @@ const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');
 const Input = goog.requireType('Blockly.Input');
 const Xml = goog.require('Blockly.Xml');
 const blocks = goog.require('Blockly.serialization.blocks');
-const connectionTypes = goog.require('Blockly.connectionTypes');
 const deprecation = goog.require('Blockly.utils.deprecation');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
@@ -108,7 +108,7 @@ Connection.prototype.y = 0;
  * @protected
  */
 Connection.prototype.connect_ = function(childConnection) {
-  const INPUT = connectionTypes.INPUT_VALUE;
+  const INPUT = ConnectionType.INPUT_VALUE;
   const parentConnection = this;
   const parentBlock = parentConnection.getSourceBlock();
   const childBlock = childConnection.getSourceBlock();
@@ -193,8 +193,8 @@ Connection.prototype.getSourceBlock = function() {
  * @return {boolean} True if connection faces down or right.
  */
 Connection.prototype.isSuperior = function() {
-  return this.type == connectionTypes.INPUT_VALUE ||
-      this.type == connectionTypes.NEXT_STATEMENT;
+  return this.type == ConnectionType.INPUT_VALUE ||
+      this.type == ConnectionType.NEXT_STATEMENT;
 };
 
 /**
@@ -386,7 +386,7 @@ const getConnectionForOrphanedOutput = function(startBlock, orphanBlock) {
  */
 Connection.getConnectionForOrphanedConnection = function(
     startBlock, orphanConnection) {
-  if (orphanConnection.type === connectionTypes.OUTPUT_VALUE) {
+  if (orphanConnection.type === ConnectionType.OUTPUT_VALUE) {
     return getConnectionForOrphanedOutput(
         startBlock, orphanConnection.getSourceBlock());
   }
@@ -770,14 +770,14 @@ Connection.prototype.createShadowBlock_ = function(attemptToConnect) {
   if (shadowDom) {
     blockShadow = Xml.domToBlock(shadowDom, parentBlock.workspace);
     if (attemptToConnect) {
-      if (this.type == connectionTypes.INPUT_VALUE) {
+      if (this.type == ConnectionType.INPUT_VALUE) {
         if (!blockShadow.outputConnection) {
           throw new Error('Shadow block is missing an output connection');
         }
         if (!this.connect(blockShadow.outputConnection)) {
           throw new Error('Could not connect shadow block to connection');
         }
-      } else if (this.type == connectionTypes.NEXT_STATEMENT) {
+      } else if (this.type == ConnectionType.NEXT_STATEMENT) {
         if (!blockShadow.previousConnection) {
           throw new Error('Shadow block is missing previous connection');
         }
diff --git a/core/connection_checker.js b/core/connection_checker.js
index 96a07048a..41389cece 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -19,7 +19,7 @@ const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');
 /* eslint-disable-next-line no-unused-vars */
 const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 const common = goog.require('Blockly.common');
-const connectionTypes = goog.require('Blockly.connectionTypes');
+const ConnectionType = goog.require('Blockly.ConnectionType');
 const internalConstants = goog.require('Blockly.internalConstants');
 const registry = goog.require('Blockly.registry');
 
@@ -201,9 +201,9 @@ ConnectionChecker.prototype.doDragChecks = function(a, b, distance) {
   }
 
   switch (b.type) {
-    case connectionTypes.PREVIOUS_STATEMENT:
+    case ConnectionType.PREVIOUS_STATEMENT:
       return this.canConnectToPrevious_(a, b);
-    case connectionTypes.OUTPUT_VALUE: {
+    case ConnectionType.OUTPUT_VALUE: {
       // Don't offer to connect an already connected left (male) value plug to
       // an available right (female) value plug.
       if ((b.isConnected() && !b.targetBlock().isInsertionMarker()) ||
@@ -212,7 +212,7 @@ ConnectionChecker.prototype.doDragChecks = function(a, b, distance) {
       }
       break;
     }
-    case connectionTypes.INPUT_VALUE: {
+    case ConnectionType.INPUT_VALUE: {
       // Offering to connect the left (male) of a value block to an already
       // connected value pair is ok, we'll splice it in.
       // However, don't offer to splice into an immovable block.
@@ -222,7 +222,7 @@ ConnectionChecker.prototype.doDragChecks = function(a, b, distance) {
       }
       break;
     }
-    case connectionTypes.NEXT_STATEMENT: {
+    case ConnectionType.NEXT_STATEMENT: {
       // Don't let a block with no next connection bump other blocks out of the
       // stack.  But covering up a shadow block or stack of shadow blocks is
       // fine.  Similarly, replacing a terminal statement with another terminal
diff --git a/core/connection_db.js b/core/connection_db.js
index 579d36164..083320ce4 100644
--- a/core/connection_db.js
+++ b/core/connection_db.js
@@ -20,7 +20,7 @@ const Coordinate = goog.requireType('Blockly.utils.Coordinate');
 const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');
 /* eslint-disable-next-line no-unused-vars */
 const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
-const connectionTypes = goog.require('Blockly.connectionTypes');
+const ConnectionType = goog.require('Blockly.ConnectionType');
 /** @suppress {extraRequire} */
 goog.require('Blockly.constants');
 
@@ -293,10 +293,10 @@ ConnectionDB.prototype.searchForClosest = function(conn, maxRadius, dxy) {
 ConnectionDB.init = function(checker) {
   // Create four databases, one for each connection type.
   const dbList = [];
-  dbList[connectionTypes.INPUT_VALUE] = new ConnectionDB(checker);
-  dbList[connectionTypes.OUTPUT_VALUE] = new ConnectionDB(checker);
-  dbList[connectionTypes.NEXT_STATEMENT] = new ConnectionDB(checker);
-  dbList[connectionTypes.PREVIOUS_STATEMENT] = new ConnectionDB(checker);
+  dbList[ConnectionType.INPUT_VALUE] = new ConnectionDB(checker);
+  dbList[ConnectionType.OUTPUT_VALUE] = new ConnectionDB(checker);
+  dbList[ConnectionType.NEXT_STATEMENT] = new ConnectionDB(checker);
+  dbList[ConnectionType.PREVIOUS_STATEMENT] = new ConnectionDB(checker);
   return dbList;
 };
 
diff --git a/core/connection_types.js b/core/connection_type.js
similarity index 87%
rename from core/connection_types.js
rename to core/connection_type.js
index 007e3f5c1..e80ff926b 100644
--- a/core/connection_types.js
+++ b/core/connection_type.js
@@ -11,13 +11,14 @@
 
 'use strict';
 
-goog.module('Blockly.connectionTypes');
+goog.module('Blockly.ConnectionType');
+
 
 /**
  * Enum for the type of a connection or input.
  * @enum {number}
  */
-const connectionTypes = {
+const ConnectionType = {
   // A right-facing value input.  E.g. 'set item to' or 'return'.
   INPUT_VALUE: 1,
   // A left-facing value output.  E.g. 'random fraction'.
@@ -28,4 +29,4 @@ const connectionTypes = {
   PREVIOUS_STATEMENT: 4
 };
 
-exports = connectionTypes;
+exports = ConnectionType;
diff --git a/core/events/events_block_move.js b/core/events/events_block_move.js
index a160441f5..b03f7e18b 100644
--- a/core/events/events_block_move.js
+++ b/core/events/events_block_move.js
@@ -16,7 +16,7 @@ goog.module.declareLegacyNamespace();
 const BlockBase = goog.require('Blockly.Events.BlockBase');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Events = goog.require('Blockly.Events');
-const connectionTypes = goog.require('Blockly.connectionTypes');
+const ConnectionType = goog.require('Blockly.ConnectionType');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
 /* eslint-disable-next-line no-unused-vars */
@@ -172,7 +172,7 @@ BlockMove.prototype.run = function(forward) {
       if (input) {
         parentConnection = input.connection;
       }
-    } else if (connectionType == connectionTypes.PREVIOUS_STATEMENT) {
+    } else if (connectionType == ConnectionType.PREVIOUS_STATEMENT) {
       parentConnection = parentBlock.nextConnection;
     }
     if (parentConnection) {
diff --git a/core/input_types.js b/core/input_types.js
index 28f40578a..889aaef5d 100644
--- a/core/input_types.js
+++ b/core/input_types.js
@@ -13,7 +13,7 @@
 
 goog.module('Blockly.inputTypes');
 
-const connectionTypes = goog.require('Blockly.connectionTypes');
+const ConnectionType = goog.require('Blockly.ConnectionType');
 
 /**
  * Enum for the type of a connection or input.
@@ -21,9 +21,9 @@ const connectionTypes = goog.require('Blockly.connectionTypes');
  */
 const inputTypes = {
   // A right-facing value input.  E.g. 'set item to' or 'return'.
-  VALUE: connectionTypes.INPUT_VALUE,
+  VALUE: ConnectionType.INPUT_VALUE,
   // A down-facing block stack.  E.g. 'if-do' or 'else'.
-  STATEMENT: connectionTypes.NEXT_STATEMENT,
+  STATEMENT: ConnectionType.NEXT_STATEMENT,
   // A dummy input.  Used to add field(s) with no input.
   DUMMY: 5
 };
diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js
index 28d975edc..cc5358757 100644
--- a/core/insertion_marker_manager.js
+++ b/core/insertion_marker_manager.js
@@ -13,6 +13,7 @@
 goog.module('Blockly.InsertionMarkerManager');
 
 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');
 const Events = goog.require('Blockly.Events');
@@ -26,7 +27,6 @@ const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const blockAnimations = goog.require('Blockly.blockAnimations');
 const common = goog.require('Blockly.common');
-const connectionTypes = goog.require('Blockly.connectionTypes');
 const constants = goog.require('Blockly.constants');
 const internalConstants = goog.require('Blockly.internalConstants');
 /* eslint-disable-next-line no-unused-vars */
@@ -660,7 +660,7 @@ InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
   const isFirstInStatementStack =
       (imConn == markerNext && !(markerPrev && markerPrev.targetConnection));
 
-  const isFirstInOutputStack = imConn.type == connectionTypes.INPUT_VALUE &&
+  const isFirstInOutputStack = imConn.type == ConnectionType.INPUT_VALUE &&
       !(markerOutput && markerOutput.targetConnection);
   // The insertion marker is the first block in a stack.  Unplug won't do
   // anything in that case.  Instead, unplug the following block.
@@ -669,7 +669,7 @@ InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
   }
   // Inside of a C-block, first statement connection.
   else if (
-      imConn.type == connectionTypes.NEXT_STATEMENT && imConn != markerNext) {
+      imConn.type == ConnectionType.NEXT_STATEMENT && imConn != markerNext) {
     const innerConnection = imConn.targetConnection;
     innerConnection.getSourceBlock().unplug(false);
 
diff --git a/core/internal_constants.js b/core/internal_constants.js
index c7028c303..ec8d07169 100644
--- a/core/internal_constants.js
+++ b/core/internal_constants.js
@@ -14,7 +14,7 @@
 
 goog.module('Blockly.internalConstants');
 
-const connectionTypes = goog.require('Blockly.connectionTypes');
+const ConnectionType = goog.require('Blockly.ConnectionType');
 
 
 /**
@@ -162,12 +162,12 @@ exports.DRAG_FREE = DRAG_FREE;
  * @const
  */
 const OPPOSITE_TYPE = [];
-OPPOSITE_TYPE[connectionTypes.INPUT_VALUE] = connectionTypes.OUTPUT_VALUE;
-OPPOSITE_TYPE[connectionTypes.OUTPUT_VALUE] = connectionTypes.INPUT_VALUE;
-OPPOSITE_TYPE[connectionTypes.NEXT_STATEMENT] =
-    connectionTypes.PREVIOUS_STATEMENT;
-OPPOSITE_TYPE[connectionTypes.PREVIOUS_STATEMENT] =
-    connectionTypes.NEXT_STATEMENT;
+OPPOSITE_TYPE[ConnectionType.INPUT_VALUE] = ConnectionType.OUTPUT_VALUE;
+OPPOSITE_TYPE[ConnectionType.OUTPUT_VALUE] = ConnectionType.INPUT_VALUE;
+OPPOSITE_TYPE[ConnectionType.NEXT_STATEMENT] =
+    ConnectionType.PREVIOUS_STATEMENT;
+OPPOSITE_TYPE[ConnectionType.PREVIOUS_STATEMENT] =
+    ConnectionType.NEXT_STATEMENT;
 
 exports.OPPOSITE_TYPE = OPPOSITE_TYPE;
 
diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index 330163fb4..9d3b290f0 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -14,6 +14,7 @@ goog.module('Blockly.ASTNode');
 
 /* eslint-disable-next-line no-unused-vars */
 const Connection = goog.requireType('Blockly.Connection');
+const ConnectionType = goog.require('Blockly.ConnectionType');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 /* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.Field');
@@ -25,7 +26,6 @@ const IASTNodeLocationWithBlock = goog.requireType('Blockly.IASTNodeLocationWith
 const Input = goog.requireType('Blockly.Input');
 /* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
-const connectionTypes = goog.require('Blockly.connectionTypes');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
 
@@ -154,16 +154,16 @@ ASTNode.createConnectionNode = function(connection) {
     return null;
   }
   const type = connection.type;
-  if (type == connectionTypes.INPUT_VALUE) {
+  if (type == ConnectionType.INPUT_VALUE) {
     return ASTNode.createInputNode(connection.getParentInput());
   } else if (
-      type == connectionTypes.NEXT_STATEMENT && connection.getParentInput()) {
+      type == ConnectionType.NEXT_STATEMENT && connection.getParentInput()) {
     return ASTNode.createInputNode(connection.getParentInput());
-  } else if (type == connectionTypes.NEXT_STATEMENT) {
+  } else if (type == ConnectionType.NEXT_STATEMENT) {
     return new ASTNode(ASTNode.types.NEXT, connection);
-  } else if (type == connectionTypes.OUTPUT_VALUE) {
+  } else if (type == ConnectionType.OUTPUT_VALUE) {
     return new ASTNode(ASTNode.types.OUTPUT, connection);
-  } else if (type == connectionTypes.PREVIOUS_STATEMENT) {
+  } else if (type == ConnectionType.PREVIOUS_STATEMENT) {
     return new ASTNode(ASTNode.types.PREVIOUS, connection);
   }
   return null;
diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index f9f5b425d..096d93c4f 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -15,11 +15,11 @@ goog.module('Blockly.RenderedConnection');
 const Connection = goog.require('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
 const ConnectionDB = goog.requireType('Blockly.ConnectionDB');
+const ConnectionType = goog.require('Blockly.ConnectionType');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Events = goog.require('Blockly.Events');
 const Svg = goog.require('Blockly.utils.Svg');
 const common = goog.require('Blockly.common');
-const connectionTypes = goog.require('Blockly.connectionTypes');
 const deprecation = goog.require('Blockly.utils.deprecation');
 const dom = goog.require('Blockly.utils.dom');
 const internalConstants = goog.require('Blockly.internalConstants');
@@ -295,8 +295,8 @@ RenderedConnection.prototype.highlight = function() {
   const sourceBlockSvg = /** @type {!BlockSvg} */ (this.sourceBlock_);
   const renderConstants = sourceBlockSvg.workspace.getRenderer().getConstants();
   const shape = renderConstants.shapeFor(this);
-  if (this.type == connectionTypes.INPUT_VALUE ||
-      this.type == connectionTypes.OUTPUT_VALUE) {
+  if (this.type == ConnectionType.INPUT_VALUE ||
+      this.type == ConnectionType.OUTPUT_VALUE) {
     // Vertical line, puzzle tab, vertical line.
     const yLen = renderConstants.TAB_OFFSET_FROM_TOP;
     steps = svgPaths.moveBy(0, -yLen) +
@@ -398,8 +398,8 @@ RenderedConnection.prototype.startTrackingAll = function() {
   // of lower blocks. Also, since rendering a block renders all its parents,
   // we only need to render the leaf nodes.
   const renderList = [];
-  if (this.type != connectionTypes.INPUT_VALUE &&
-      this.type != connectionTypes.NEXT_STATEMENT) {
+  if (this.type != ConnectionType.INPUT_VALUE &&
+      this.type != ConnectionType.NEXT_STATEMENT) {
     // Only spider down.
     return renderList;
   }
@@ -550,8 +550,8 @@ RenderedConnection.prototype.connect_ = function(childConnection) {
     childBlock.updateDisabled();
   }
   if (parentRendered && childRendered) {
-    if (parentConnection.type == connectionTypes.NEXT_STATEMENT ||
-        parentConnection.type == connectionTypes.PREVIOUS_STATEMENT) {
+    if (parentConnection.type == ConnectionType.NEXT_STATEMENT ||
+        parentConnection.type == ConnectionType.PREVIOUS_STATEMENT) {
       // Child block may need to square off its corners if it is in a stack.
       // Rendering a child will render its parent.
       childBlock.render();
diff --git a/core/renderers/common/constants.js b/core/renderers/common/constants.js
index 08c0d61ca..49b3bd430 100644
--- a/core/renderers/common/constants.js
+++ b/core/renderers/common/constants.js
@@ -19,7 +19,7 @@ const Svg = goog.require('Blockly.utils.Svg');
 /* eslint-disable-next-line no-unused-vars */
 const Theme = goog.requireType('Blockly.Theme');
 const colour = goog.require('Blockly.utils.colour');
-const connectionTypes = goog.require('Blockly.connectionTypes');
+const ConnectionType = goog.require('Blockly.ConnectionType');
 const dom = goog.require('Blockly.utils.dom');
 const object = goog.require('Blockly.utils.object');
 const svgPaths = goog.require('Blockly.utils.svgPaths');
@@ -959,11 +959,11 @@ ConstantProvider.prototype.makeOutsideCorners = function() {
  */
 ConstantProvider.prototype.shapeFor = function(connection) {
   switch (connection.type) {
-    case connectionTypes.INPUT_VALUE:
-    case connectionTypes.OUTPUT_VALUE:
+    case ConnectionType.INPUT_VALUE:
+    case ConnectionType.OUTPUT_VALUE:
       return this.PUZZLE_TAB;
-    case connectionTypes.PREVIOUS_STATEMENT:
-    case connectionTypes.NEXT_STATEMENT:
+    case ConnectionType.PREVIOUS_STATEMENT:
+    case ConnectionType.NEXT_STATEMENT:
       return this.NOTCH;
     default:
       throw Error('Unknown connection type');
diff --git a/core/renderers/common/debugger.js b/core/renderers/common/debugger.js
index 299fd0a96..23f6f0406 100644
--- a/core/renderers/common/debugger.js
+++ b/core/renderers/common/debugger.js
@@ -28,7 +28,7 @@ const RenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
 const Row = goog.requireType('Blockly.blockRendering.Row');
 const Svg = goog.require('Blockly.utils.Svg');
 const Types = goog.require('Blockly.blockRendering.Types');
-const connectionTypes = goog.require('Blockly.connectionTypes');
+const ConnectionType = goog.require('Blockly.ConnectionType');
 const dom = goog.require('Blockly.utils.dom');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
@@ -227,19 +227,19 @@ Debug.prototype.drawConnection = function(conn) {
   let colour;
   let size;
   let fill;
-  if (conn.type == connectionTypes.INPUT_VALUE) {
+  if (conn.type == ConnectionType.INPUT_VALUE) {
     size = 4;
     colour = 'magenta';
     fill = 'none';
-  } else if (conn.type == connectionTypes.OUTPUT_VALUE) {
+  } else if (conn.type == ConnectionType.OUTPUT_VALUE) {
     size = 2;
     colour = 'magenta';
     fill = colour;
-  } else if (conn.type == connectionTypes.NEXT_STATEMENT) {
+  } else if (conn.type == ConnectionType.NEXT_STATEMENT) {
     size = 4;
     colour = 'goldenrod';
     fill = 'none';
-  } else if (conn.type == connectionTypes.PREVIOUS_STATEMENT) {
+  } else if (conn.type == ConnectionType.PREVIOUS_STATEMENT) {
     size = 2;
     colour = 'goldenrod';
     fill = colour;
diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js
index ff13b59c0..b8e190267 100644
--- a/core/renderers/common/marker_svg.js
+++ b/core/renderers/common/marker_svg.js
@@ -28,7 +28,7 @@ const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 const Svg = goog.require('Blockly.utils.Svg');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
-const connectionTypes = goog.require('Blockly.connectionTypes');
+const ConnectionType = goog.require('Blockly.ConnectionType');
 const dom = goog.require('Blockly.utils.dom');
 const svgPaths = goog.require('Blockly.utils.svgPaths');
 const {ASTNode} = goog.require('Blockly.ASTNode');
@@ -217,9 +217,9 @@ MarkerSvg.prototype.showAtLocation_ = function(curNode) {
     this.showWithBlock_(curNode);
   } else if (curNode.getType() == ASTNode.types.OUTPUT) {
     this.showWithOutput_(curNode);
-  } else if (connectionType == connectionTypes.INPUT_VALUE) {
+  } else if (connectionType == ConnectionType.INPUT_VALUE) {
     this.showWithInput_(curNode);
-  } else if (connectionType == connectionTypes.NEXT_STATEMENT) {
+  } else if (connectionType == ConnectionType.NEXT_STATEMENT) {
     this.showWithNext_(curNode);
   } else if (curNode.getType() == ASTNode.types.PREVIOUS) {
     this.showWithPrevious_(curNode);
diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js
index 9afc70bed..b9615ca5e 100644
--- a/core/renderers/common/renderer.js
+++ b/core/renderers/common/renderer.js
@@ -33,7 +33,7 @@ const Theme = goog.requireType('Blockly.Theme');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const blockRendering = goog.require('Blockly.blockRendering');
-const connectionTypes = goog.require('Blockly.connectionTypes');
+const ConnectionType = goog.require('Blockly.ConnectionType');
 const object = goog.require('Blockly.utils.object');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
@@ -248,7 +248,7 @@ Renderer.prototype.shouldHighlightConnection = function(_conn) {
 Renderer.prototype.orphanCanConnectAtEnd = function(
     topBlock, orphanBlock, localType) {
   const orphanConnection =
-      (localType === connectionTypes.OUTPUT_VALUE ?
+      (localType === ConnectionType.OUTPUT_VALUE ?
            orphanBlock.outputConnection :
            orphanBlock.previousConnection);
   return !!Connection.getConnectionForOrphanedConnection(
@@ -269,8 +269,8 @@ Renderer.prototype.orphanCanConnectAtEnd = function(
  */
 Renderer.prototype.getConnectionPreviewMethod = function(
     closest, local, topBlock) {
-  if (local.type == connectionTypes.OUTPUT_VALUE ||
-      local.type == connectionTypes.PREVIOUS_STATEMENT) {
+  if (local.type == ConnectionType.OUTPUT_VALUE ||
+      local.type == ConnectionType.PREVIOUS_STATEMENT) {
     if (!closest.isConnected() ||
         this.orphanCanConnectAtEnd(
             topBlock,
diff --git a/core/renderers/zelos/constants.js b/core/renderers/zelos/constants.js
index 2c6a2971f..e6c25751b 100644
--- a/core/renderers/zelos/constants.js
+++ b/core/renderers/zelos/constants.js
@@ -16,7 +16,7 @@ goog.module.declareLegacyNamespace();
 
 const BaseConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider');
 const Svg = goog.require('Blockly.utils.Svg');
-const connectionTypes = goog.require('Blockly.connectionTypes');
+const ConnectionType = goog.require('Blockly.ConnectionType');
 const dom = goog.require('Blockly.utils.dom');
 const object = goog.require('Blockly.utils.object');
 const svgPaths = goog.require('Blockly.utils.svgPaths');
@@ -641,8 +641,8 @@ ConstantProvider.prototype.shapeFor = function(connection) {
   }
   let outputShape;
   switch (connection.type) {
-    case connectionTypes.INPUT_VALUE:
-    case connectionTypes.OUTPUT_VALUE:
+    case ConnectionType.INPUT_VALUE:
+    case ConnectionType.OUTPUT_VALUE:
       outputShape = connection.getSourceBlock().getOutputShape();
       // If the block has an output shape set, use that instead.
       if (outputShape != null) {
@@ -666,8 +666,8 @@ ConstantProvider.prototype.shapeFor = function(connection) {
         return this.ROUNDED;
       }
       return this.ROUNDED;
-    case connectionTypes.PREVIOUS_STATEMENT:
-    case connectionTypes.NEXT_STATEMENT:
+    case ConnectionType.PREVIOUS_STATEMENT:
+    case ConnectionType.NEXT_STATEMENT:
       return this.NOTCH;
     default:
       throw Error('Unknown type');
diff --git a/core/renderers/zelos/renderer.js b/core/renderers/zelos/renderer.js
index ac1e26d6b..2dac896dc 100644
--- a/core/renderers/zelos/renderer.js
+++ b/core/renderers/zelos/renderer.js
@@ -27,7 +27,7 @@ const Theme = goog.requireType('Blockly.Theme');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const blockRendering = goog.require('Blockly.blockRendering');
-const connectionTypes = goog.require('Blockly.connectionTypes');
+const ConnectionType = goog.require('Blockly.ConnectionType');
 const object = goog.require('Blockly.utils.object');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
@@ -115,8 +115,8 @@ Renderer.prototype.makePathObject = function(root, style) {
  * @override
  */
 Renderer.prototype.shouldHighlightConnection = function(conn) {
-  return conn.type != connectionTypes.INPUT_VALUE &&
-      conn.type !== connectionTypes.OUTPUT_VALUE;
+  return conn.type != ConnectionType.INPUT_VALUE &&
+      conn.type !== ConnectionType.OUTPUT_VALUE;
 };
 
 /**
@@ -124,7 +124,7 @@ Renderer.prototype.shouldHighlightConnection = function(conn) {
  */
 Renderer.prototype.getConnectionPreviewMethod = function(
     closest, local, topBlock) {
-  if (local.type == connectionTypes.OUTPUT_VALUE) {
+  if (local.type == ConnectionType.OUTPUT_VALUE) {
     if (!closest.isConnected()) {
       return InsertionMarkerManager.PREVIEW_TYPE.INPUT_OUTLINE;
     }
diff --git a/scripts/migration/renamings.js b/scripts/migration/renamings.js
index 4520d54fa..3d6813d63 100644
--- a/scripts/migration/renamings.js
+++ b/scripts/migration/renamings.js
@@ -114,6 +114,9 @@ const renamings = {
         DIV: {get: 'getDiv'},
       },
     },
+    'Blockly.connectionTypes': {
+      module: 'Blockly.ConnectionType',
+    },
     'Blockly.utils': {
       exports: {
         genUid: {module: 'Blockly.utils.idGenerator'},
diff --git a/tests/deps.js b/tests/deps.js
index 5e2aad243..b99d8bb28 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -7,12 +7,12 @@ goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'],
 goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator'], {'lang': 'es5'});
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
-goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.common', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Blocks', 'Blockly.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', '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.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', '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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ConnectionType', '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.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.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Blocks', '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.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.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', '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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', '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'});
@@ -23,10 +23,10 @@ goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.E
 goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.serialization.blocks', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Xml', 'Blockly.constants', 'Blockly.serialization.blocks', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.ConnectionType', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_type.js', ['Blockly.ConnectionType'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.dialog', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
@@ -43,7 +43,7 @@ goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.
 goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_comment_base.js', ['Blockly.Events.CommentBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
@@ -89,8 +89,8 @@ goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg',
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.ConnectionType'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], [], {'lang': 'es6', 'module': 'goog'});
@@ -120,8 +120,8 @@ goog.addDependency('../../core/interfaces/i_serializer.js', ['Blockly.serializat
 goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.IToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstants'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstants'], ['Blockly.ConnectionType'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.ConnectionType', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], [], {'lang': 'es6', 'module': 'goog'});
@@ -137,16 +137,16 @@ goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.ConnectionType', 'Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
@@ -184,7 +184,7 @@ goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimali
 goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.blockRendering.ConstantProvider', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.StatementInput', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -193,7 +193,7 @@ goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly
 goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.registry', 'Blockly.serialization.variables', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 1205cd57f..9d6c15eb9 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -7,12 +7,12 @@ goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'],
 goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator'], {'lang': 'es5'});
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
-goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.common', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Blocks', 'Blockly.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', '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.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', '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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ConnectionType', '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.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.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Blocks', '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.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.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', '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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', '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'});
@@ -23,10 +23,10 @@ goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.E
 goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.serialization.blocks', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Xml', 'Blockly.constants', 'Blockly.serialization.blocks', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.ConnectionType', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_type.js', ['Blockly.ConnectionType'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.dialog', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
@@ -43,7 +43,7 @@ goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.
 goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_comment_base.js', ['Blockly.Events.CommentBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
@@ -89,8 +89,8 @@ goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg',
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.ConnectionType'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], [], {'lang': 'es6', 'module': 'goog'});
@@ -120,8 +120,8 @@ goog.addDependency('../../core/interfaces/i_serializer.js', ['Blockly.serializat
 goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.IToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstants'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstants'], ['Blockly.ConnectionType'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.ConnectionType', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], [], {'lang': 'es6', 'module': 'goog'});
@@ -137,16 +137,16 @@ goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.ConnectionType', 'Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
@@ -184,7 +184,7 @@ goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimali
 goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.blockRendering.ConstantProvider', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.StatementInput', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -193,7 +193,7 @@ goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly
 goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.registry', 'Blockly.serialization.variables', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});

From 6b07ccab96d02a555ad5cc71962181b32ad6db66 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 24 Sep 2021 08:33:35 -0700
Subject: [PATCH 825/833] chore: Remove declareLegacyNamespace from renderers
 (#5528)

* chore: Remove declareLegacyNamespace from Geras renderer

* chore: Remove declareLegacyNamespace from minimalist renderer

* chore: Remove declareLegacyNamespace from thrasos renderer

* chore: Remove declareLegacyNamespace from zelos renderer

* fix: Move debugger functionality out of Blockly.blockRendering to avoid dependency cycle when re-exporting submodules

* chore: Remove declareLegacyNamespace from Blockly.blockRendering.*
---
 core/blockly.js                               | 10 +++
 core/renderers/common/block_rendering.js      | 90 ++++++++++++++++---
 core/renderers/common/constants.js            |  1 -
 core/renderers/common/debug.js                | 48 ++++++++++
 core/renderers/common/debugger.js             |  1 -
 core/renderers/common/drawer.js               |  5 +-
 core/renderers/common/i_path_object.js        |  1 -
 core/renderers/common/info.js                 |  1 -
 core/renderers/common/marker_svg.js           |  1 -
 core/renderers/common/path_object.js          |  1 -
 core/renderers/common/renderer.js             |  7 +-
 core/renderers/geras/constants.js             |  1 -
 core/renderers/geras/drawer.js                |  5 +-
 core/renderers/geras/geras.js                 | 32 +++++++
 core/renderers/geras/highlight_constants.js   |  1 -
 core/renderers/geras/highlighter.js           |  1 -
 core/renderers/geras/info.js                  |  1 -
 .../geras/measurables/inline_input.js         |  1 -
 .../geras/measurables/statement_input.js      |  1 -
 core/renderers/geras/path_object.js           |  1 -
 core/renderers/geras/renderer.js              |  1 -
 core/renderers/measurables/base.js            |  1 -
 core/renderers/measurables/bottom_row.js      |  1 -
 core/renderers/measurables/connection.js      |  1 -
 .../measurables/external_value_input.js       |  1 -
 core/renderers/measurables/field.js           |  1 -
 core/renderers/measurables/hat.js             |  1 -
 core/renderers/measurables/icon.js            |  1 -
 core/renderers/measurables/in_row_spacer.js   |  1 -
 core/renderers/measurables/inline_input.js    |  1 -
 .../renderers/measurables/input_connection.js |  1 -
 core/renderers/measurables/input_row.js       |  1 -
 core/renderers/measurables/jagged_edge.js     |  1 -
 core/renderers/measurables/next_connection.js |  1 -
 .../measurables/output_connection.js          |  1 -
 .../measurables/previous_connection.js        |  1 -
 core/renderers/measurables/round_corner.js    |  1 -
 core/renderers/measurables/row.js             |  1 -
 core/renderers/measurables/spacer_row.js      |  1 -
 core/renderers/measurables/square_corner.js   |  1 -
 core/renderers/measurables/statement_input.js |  1 -
 core/renderers/measurables/top_row.js         |  1 -
 core/renderers/measurables/types.js           |  1 -
 core/renderers/minimalist/constants.js        |  1 -
 core/renderers/minimalist/drawer.js           |  1 -
 core/renderers/minimalist/info.js             |  1 -
 core/renderers/minimalist/minimalist.js       | 22 +++++
 core/renderers/minimalist/renderer.js         |  1 -
 core/renderers/thrasos/info.js                |  1 -
 core/renderers/thrasos/renderer.js            |  1 -
 core/renderers/thrasos/thrasos.js             | 18 ++++
 core/renderers/zelos/constants.js             |  1 -
 core/renderers/zelos/drawer.js                |  5 +-
 core/renderers/zelos/info.js                  |  1 -
 core/renderers/zelos/marker_svg.js            |  1 -
 .../renderers/zelos/measurables/bottom_row.js |  1 -
 core/renderers/zelos/measurables/inputs.js    |  1 -
 .../zelos/measurables/row_elements.js         |  1 -
 core/renderers/zelos/measurables/top_row.js   |  1 -
 core/renderers/zelos/path_object.js           |  1 -
 core/renderers/zelos/renderer.js              |  1 -
 core/renderers/zelos/zelos.js                 | 34 +++++++
 tests/deps.js                                 | 17 ++--
 tests/deps.mocha.js                           | 17 ++--
 64 files changed, 272 insertions(+), 89 deletions(-)
 create mode 100644 core/renderers/common/debug.js
 create mode 100644 core/renderers/geras/geras.js
 create mode 100644 core/renderers/minimalist/minimalist.js
 create mode 100644 core/renderers/thrasos/thrasos.js
 create mode 100644 core/renderers/zelos/zelos.js

diff --git a/core/blockly.js b/core/blockly.js
index c4622ed17..30d5378e8 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -104,6 +104,7 @@ 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');
 const bumpObjects = goog.require('Blockly.bumpObjects');
 const clipboard = goog.require('Blockly.clipboard');
@@ -113,13 +114,17 @@ const constants = goog.require('Blockly.constants');
 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');
+const thrasos = goog.require('Blockly.thrasos');
 const toolbox = goog.require('Blockly.utils.toolbox');
 const uiPosition = goog.require('Blockly.uiPosition');
 const utils = goog.require('Blockly.utils');
+const zelos = goog.require('Blockly.zelos');
 const {Block} = goog.require('Blockly.Block');
 const {BlockDragger} = goog.require('Blockly.BlockDragger');
 const {BlockDragSurfaceSvg} = goog.require('Blockly.BlockDragSurfaceSvg');
@@ -591,6 +596,7 @@ exports.WorkspaceSvg = WorkspaceSvg;
 exports.Xml = Xml;
 exports.ZoomControls = ZoomControls;
 exports.blockAnimations = blockAnimations;
+exports.blockRendering = blockRendering;
 exports.browserEvents = browserEvents;
 exports.bumpObjects = bumpObjects;
 exports.clipboard = clipboard;
@@ -600,8 +606,12 @@ exports.connectionTypes = ConnectionType;
 exports.constants = constants;
 exports.dialog = dialog;
 exports.fieldRegistry = fieldRegistry;
+exports.geras = geras;
 exports.inject = inject;
 exports.inputTypes = inputTypes;
+exports.minimalist = minimalist;
 exports.registry = registry;
+exports.thrasos = thrasos;
 exports.uiPosition = uiPosition;
 exports.utils = utils;
+exports.zelos = zelos;
diff --git a/core/renderers/common/block_rendering.js b/core/renderers/common/block_rendering.js
index c00d58523..b1bfa911e 100644
--- a/core/renderers/common/block_rendering.js
+++ b/core/renderers/common/block_rendering.js
@@ -11,26 +11,52 @@
 'use strict';
 
 goog.module('Blockly.blockRendering');
-goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const Renderer = goog.requireType('Blockly.blockRendering.Renderer');
+const BottomRow = goog.require('Blockly.blockRendering.BottomRow');
+const Connection = goog.require('Blockly.blockRendering.Connection');
+const ConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider');
+const Debug = goog.require('Blockly.blockRendering.Debug');
+const Drawer = goog.require('Blockly.blockRendering.Drawer');
+const ExternalValueInput = goog.require('Blockly.blockRendering.ExternalValueInput');
+const Field = goog.require('Blockly.blockRendering.Field');
+const Hat = goog.require('Blockly.blockRendering.Hat');
+const Icon = goog.require('Blockly.blockRendering.Icon');
+const InRowSpacer = goog.require('Blockly.blockRendering.InRowSpacer');
+const InlineInput = goog.require('Blockly.blockRendering.InlineInput');
+const InputConnection = goog.require('Blockly.blockRendering.InputConnection');
+const InputRow = goog.require('Blockly.blockRendering.InputRow');
+const IPathObject = goog.require('Blockly.blockRendering.IPathObject');
+const JaggedEdge = goog.require('Blockly.blockRendering.JaggedEdge');
+const MarkerSvg = goog.require('Blockly.blockRendering.MarkerSvg');
+const Measurable = goog.require('Blockly.blockRendering.Measurable');
+const NextConnection = goog.require('Blockly.blockRendering.NextConnection');
+const OutputConnection = goog.require('Blockly.blockRendering.OutputConnection');
+const PathObject = goog.require('Blockly.blockRendering.PathObject');
+const PreviousConnection = goog.require('Blockly.blockRendering.PreviousConnection');
+const Renderer = goog.require('Blockly.blockRendering.Renderer');
+const RenderInfo = goog.require('Blockly.blockRendering.RenderInfo');
+const RoundCorner = goog.require('Blockly.blockRendering.RoundCorner');
+const Row = goog.require('Blockly.blockRendering.Row');
+const SpacerRow = goog.require('Blockly.blockRendering.SpacerRow');
+const SquareCorner = goog.require('Blockly.blockRendering.SquareCorner');
+const StatementInput = goog.require('Blockly.blockRendering.StatementInput');
 /* eslint-disable-next-line no-unused-vars */
 const Theme = goog.requireType('Blockly.Theme');
+const TopRow = goog.require('Blockly.blockRendering.TopRow');
+const Types = goog.require('Blockly.blockRendering.Types');
+const debug = goog.require('Blockly.blockRendering.debug');
+const deprecation = goog.require('Blockly.utils.deprecation');
 const registry = goog.require('Blockly.registry');
 
-
-/**
- * Whether or not the debugger is turned on.
- * @type {boolean}
- */
-let useDebugger = false;
 /**
  * Returns whether the debugger is turned on.
  * @return {boolean} Whether the debugger is turned on.
  */
 const isDebuggerEnabled = function() {
-  return useDebugger;
+  deprecation.warn(
+      'Blockly.blockRendering.isDebuggerEnabled()', 'September 2021',
+      'September 2022', 'Blockly.blockRendering.debug.isDebuggerEnabled()');
+  return debug.isDebuggerEnabled();
 };
 /** @package */
 exports.isDebuggerEnabled = isDebuggerEnabled;
@@ -42,7 +68,7 @@ exports.isDebuggerEnabled = isDebuggerEnabled;
  *     to register.
  * @throws {Error} if a renderer with the same name has already been registered.
  */
-const register = function(name, rendererClass) {
+ const register = function(name, rendererClass) {
   registry.register(registry.Type.RENDERER, name, rendererClass);
 };
 exports.register = register;
@@ -61,7 +87,10 @@ exports.unregister = unregister;
  * @package
  */
 const startDebugger = function() {
-  useDebugger = true;
+  deprecation.warn(
+      'Blockly.blockRendering.startDebugger()', 'September 2021',
+      'September 2022', 'Blockly.blockRendering.debug.startDebugger()');
+  debug.startDebugger();
 };
 /** @package */
 exports.startDebugger = startDebugger;
@@ -71,7 +100,10 @@ exports.startDebugger = startDebugger;
  * @package
  */
 const stopDebugger = function() {
-  useDebugger = false;
+  deprecation.warn(
+      'Blockly.blockRendering.stopDebugger()', 'September 2021',
+      'September 2022', 'Blockly.blockRendering.debug.stopDebugger()');
+  debug.stopDebugger();
 };
 /** @package */
 exports.stopDebugger = stopDebugger;
@@ -93,3 +125,35 @@ const init = function(name, theme, opt_rendererOverrides) {
 };
 /** @package */
 exports.init = init;
+
+exports.BottomRow = BottomRow;
+exports.Connection = Connection;
+exports.ConstantProvider = ConstantProvider;
+exports.Debug = Debug;
+exports.Drawer = Drawer;
+exports.ExternalValueInput = ExternalValueInput;
+exports.Field = Field;
+exports.Hat = Hat;
+exports.Icon = Icon;
+exports.InRowSpacer = InRowSpacer;
+exports.InlineInput = InlineInput;
+exports.InputConnection = InputConnection;
+exports.InputRow = InputRow;
+exports.IPathObject = IPathObject;
+exports.JaggedEdge = JaggedEdge;
+exports.MarkerSvg = MarkerSvg;
+exports.Measurable = Measurable;
+exports.NextConnection = NextConnection;
+exports.OutputConnection = OutputConnection;
+exports.PathObject = PathObject;
+exports.PreviousConnection = PreviousConnection;
+exports.Renderer = Renderer;
+exports.RenderInfo = RenderInfo;
+exports.RoundCorner = RoundCorner;
+exports.Row = Row;
+exports.SpacerRow = SpacerRow;
+exports.SquareCorner = SquareCorner;
+exports.StatementInput = StatementInput;
+exports.TopRow = TopRow;
+exports.Types = Types;
+exports.debug = debug;
diff --git a/core/renderers/common/constants.js b/core/renderers/common/constants.js
index 49b3bd430..8febc9f9a 100644
--- a/core/renderers/common/constants.js
+++ b/core/renderers/common/constants.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.blockRendering.ConstantProvider');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
diff --git a/core/renderers/common/debug.js b/core/renderers/common/debug.js
new file mode 100644
index 000000000..34c51224d
--- /dev/null
+++ b/core/renderers/common/debug.js
@@ -0,0 +1,48 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+*/
+
+/**
+ * @fileoverview Block rendering debugging functionality.
+ */
+'use strict';
+
+goog.module('Blockly.blockRendering.debug');
+
+
+/**
+ * Whether or not the debugger is turned on.
+ * @type {boolean}
+ */
+let useDebugger = false;
+/**
+ * Returns whether the debugger is turned on.
+ * @return {boolean} Whether the debugger is turned on.
+ */
+const isDebuggerEnabled = function() {
+  return useDebugger;
+};
+/** @package */
+exports.isDebuggerEnabled = isDebuggerEnabled;
+
+/**
+ * Turn on the blocks debugger.
+ * @package
+ */
+const startDebugger = function() {
+  useDebugger = true;
+};
+/** @package */
+exports.startDebugger = startDebugger;
+
+/**
+ * Turn off the blocks debugger.
+ * @package
+ */
+const stopDebugger = function() {
+  useDebugger = false;
+};
+/** @package */
+exports.stopDebugger = stopDebugger;
diff --git a/core/renderers/common/debugger.js b/core/renderers/common/debugger.js
index 23f6f0406..84c047ae5 100644
--- a/core/renderers/common/debugger.js
+++ b/core/renderers/common/debugger.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.blockRendering.Debug');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/renderers/common/drawer.js b/core/renderers/common/drawer.js
index f88e9faaa..075de23b2 100644
--- a/core/renderers/common/drawer.js
+++ b/core/renderers/common/drawer.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.blockRendering.Drawer');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
@@ -26,7 +25,7 @@ const RenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
 /* eslint-disable-next-line no-unused-vars */
 const Row = goog.requireType('Blockly.blockRendering.Row');
 const Types = goog.require('Blockly.blockRendering.Types');
-const blockRendering = goog.require('Blockly.blockRendering');
+const debug = goog.require('Blockly.blockRendering.debug');
 const svgPaths = goog.require('Blockly.utils.svgPaths');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
@@ -74,7 +73,7 @@ Drawer.prototype.draw = function() {
   if (this.info_.RTL) {
     this.block_.pathObject.flipRTL();
   }
-  if (blockRendering.isDebuggerEnabled()) {
+  if (debug.isDebuggerEnabled()) {
     this.block_.renderingDebugger.drawDebug(this.block_, this.info_);
   }
   this.recordSizeOnBlock_();
diff --git a/core/renderers/common/i_path_object.js b/core/renderers/common/i_path_object.js
index 80d465682..eddf0c593 100644
--- a/core/renderers/common/i_path_object.js
+++ b/core/renderers/common/i_path_object.js
@@ -13,7 +13,6 @@
 'use strict';
 
 goog.module('Blockly.blockRendering.IPathObject');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js
index 3d807d04d..d47660579 100644
--- a/core/renderers/common/info.js
+++ b/core/renderers/common/info.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.blockRendering.RenderInfo');
-goog.module.declareLegacyNamespace();
 
 const BottomRow = goog.require('Blockly.blockRendering.BottomRow');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js
index b8e190267..478848584 100644
--- a/core/renderers/common/marker_svg.js
+++ b/core/renderers/common/marker_svg.js
@@ -12,7 +12,6 @@
 
 
 goog.module('Blockly.blockRendering.MarkerSvg');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Connection = goog.requireType('Blockly.Connection');
diff --git a/core/renderers/common/path_object.js b/core/renderers/common/path_object.js
index 34f6ee16a..2c98e9e93 100644
--- a/core/renderers/common/path_object.js
+++ b/core/renderers/common/path_object.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.blockRendering.PathObject');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Connection = goog.requireType('Blockly.Connection');
diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js
index b9615ca5e..f2bca0eef 100644
--- a/core/renderers/common/renderer.js
+++ b/core/renderers/common/renderer.js
@@ -11,9 +11,9 @@
 'use strict';
 
 goog.module('Blockly.blockRendering.Renderer');
-goog.module.declareLegacyNamespace();
 
 const Connection = goog.require('Blockly.Connection');
+const ConnectionType = goog.require('Blockly.ConnectionType');
 const ConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider');
 /* eslint-disable-next-line no-unused-vars */
 const Debug = goog.requireType('Blockly.blockRendering.Debug');
@@ -32,8 +32,7 @@ const RenderInfo = goog.require('Blockly.blockRendering.RenderInfo');
 const Theme = goog.requireType('Blockly.Theme');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
-const blockRendering = goog.require('Blockly.blockRendering');
-const ConnectionType = goog.require('Blockly.ConnectionType');
+const debug = goog.require('Blockly.blockRendering.debug');
 const object = goog.require('Blockly.utils.object');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
@@ -289,7 +288,7 @@ Renderer.prototype.getConnectionPreviewMethod = function(
  * @package
  */
 Renderer.prototype.render = function(block) {
-  if (blockRendering.isDebuggerEnabled() && !block.renderingDebugger) {
+  if (debug.isDebuggerEnabled() && !block.renderingDebugger) {
     block.renderingDebugger = this.makeDebugger_();
   }
   const info = this.makeRenderInfo_(block);
diff --git a/core/renderers/geras/constants.js b/core/renderers/geras/constants.js
index 9a923a34a..cb5011367 100644
--- a/core/renderers/geras/constants.js
+++ b/core/renderers/geras/constants.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.geras.ConstantProvider');
-goog.module.declareLegacyNamespace();
 
 const BaseConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider');
 const object = goog.require('Blockly.utils.object');
diff --git a/core/renderers/geras/drawer.js b/core/renderers/geras/drawer.js
index 15dcff2ae..9851cdd2b 100644
--- a/core/renderers/geras/drawer.js
+++ b/core/renderers/geras/drawer.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.geras.Drawer');
-goog.module.declareLegacyNamespace();
 
 const BaseDrawer = goog.require('Blockly.blockRendering.Drawer');
 const Highlighter = goog.require('Blockly.geras.Highlighter');
@@ -19,7 +18,7 @@ const Highlighter = goog.require('Blockly.geras.Highlighter');
 const PathObject = goog.requireType('Blockly.geras.PathObject');
 /* eslint-disable-next-line no-unused-vars */
 const RenderInfo = goog.requireType('Blockly.geras.RenderInfo');
-const blockRendering = goog.require('Blockly.blockRendering');
+const debug = goog.require('Blockly.blockRendering.debug');
 const object = goog.require('Blockly.utils.object');
 const svgPaths = goog.require('Blockly.utils.svgPaths');
 /* eslint-disable-next-line no-unused-vars */
@@ -57,7 +56,7 @@ Drawer.prototype.draw = function() {
   if (this.info_.RTL) {
     pathObject.flipRTL();
   }
-  if (blockRendering.isDebuggerEnabled()) {
+  if (debug.isDebuggerEnabled()) {
     this.block_.renderingDebugger.drawDebug(this.block_, this.info_);
   }
   this.recordSizeOnBlock_();
diff --git a/core/renderers/geras/geras.js b/core/renderers/geras/geras.js
new file mode 100644
index 000000000..c15aff155
--- /dev/null
+++ b/core/renderers/geras/geras.js
@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Re-exports of Blockly.geras.* modules.
+ */
+'use strict';
+
+goog.module('Blockly.geras');
+
+const ConstantProvider = goog.require('Blockly.geras.ConstantProvider');
+const Drawer = goog.require('Blockly.geras.Drawer');
+const HighlightConstantProvider = goog.require('Blockly.geras.HighlightConstantProvider');
+const Highlighter = goog.require('Blockly.geras.Highlighter');
+const InlineInput = goog.require('Blockly.geras.InlineInput');
+const PathObject = goog.require('Blockly.geras.PathObject');
+const RenderInfo = goog.require('Blockly.geras.RenderInfo');
+const Renderer = goog.require('Blockly.geras.Renderer');
+const StatementInput = goog.require('Blockly.geras.StatementInput');
+
+exports.ConstantProvider = ConstantProvider;
+exports.Drawer = Drawer;
+exports.HighlightConstantProvider = HighlightConstantProvider;
+exports.Highlighter = Highlighter;
+exports.InlineInput = InlineInput;
+exports.PathObject = PathObject;
+exports.RenderInfo = RenderInfo;
+exports.Renderer = Renderer;
+exports.StatementInput = StatementInput;
diff --git a/core/renderers/geras/highlight_constants.js b/core/renderers/geras/highlight_constants.js
index 5689029b5..46cf341b1 100644
--- a/core/renderers/geras/highlight_constants.js
+++ b/core/renderers/geras/highlight_constants.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.geras.HighlightConstantProvider');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/renderers/geras/highlighter.js b/core/renderers/geras/highlighter.js
index f04339d29..8b6d9f63a 100644
--- a/core/renderers/geras/highlighter.js
+++ b/core/renderers/geras/highlighter.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.geras.Highlighter');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/renderers/geras/info.js b/core/renderers/geras/info.js
index 8226cb292..e5edc0fa6 100644
--- a/core/renderers/geras/info.js
+++ b/core/renderers/geras/info.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.geras.RenderInfo');
-goog.module.declareLegacyNamespace();
 
 const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo');
 const ExternalValueInput = goog.require('Blockly.blockRendering.ExternalValueInput');
diff --git a/core/renderers/geras/measurables/inline_input.js b/core/renderers/geras/measurables/inline_input.js
index b0e3dd776..ed534cd8d 100644
--- a/core/renderers/geras/measurables/inline_input.js
+++ b/core/renderers/geras/measurables/inline_input.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.geras.InlineInput');
-goog.module.declareLegacyNamespace();
 
 const BaseInlineInput = goog.require('Blockly.blockRendering.InlineInput');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/geras/measurables/statement_input.js b/core/renderers/geras/measurables/statement_input.js
index 1c49f2b42..92d58c303 100644
--- a/core/renderers/geras/measurables/statement_input.js
+++ b/core/renderers/geras/measurables/statement_input.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.geras.StatementInput');
-goog.module.declareLegacyNamespace();
 
 const BaseStatementInput = goog.require('Blockly.blockRendering.StatementInput');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/geras/path_object.js b/core/renderers/geras/path_object.js
index 9d50c672c..dc07b707e 100644
--- a/core/renderers/geras/path_object.js
+++ b/core/renderers/geras/path_object.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.geras.PathObject');
-goog.module.declareLegacyNamespace();
 
 const BasePathObject = goog.require('Blockly.blockRendering.PathObject');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/geras/renderer.js b/core/renderers/geras/renderer.js
index 9cf592c69..b9ee3d6cc 100644
--- a/core/renderers/geras/renderer.js
+++ b/core/renderers/geras/renderer.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.geras.Renderer');
-goog.module.declareLegacyNamespace();
 
 const BaseRenderer = goog.require('Blockly.blockRendering.Renderer');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/base.js b/core/renderers/measurables/base.js
index b3a16d061..a7d208f3a 100644
--- a/core/renderers/measurables/base.js
+++ b/core/renderers/measurables/base.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.blockRendering.Measurable');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/renderers/measurables/bottom_row.js b/core/renderers/measurables/bottom_row.js
index 2ed324afe..6855089c7 100644
--- a/core/renderers/measurables/bottom_row.js
+++ b/core/renderers/measurables/bottom_row.js
@@ -11,7 +11,6 @@
  */
 
 goog.module('Blockly.blockRendering.BottomRow');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/renderers/measurables/connection.js b/core/renderers/measurables/connection.js
index f8b77714e..3f608f150 100644
--- a/core/renderers/measurables/connection.js
+++ b/core/renderers/measurables/connection.js
@@ -11,7 +11,6 @@
  */
 
 goog.module('Blockly.blockRendering.Connection');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/renderers/measurables/external_value_input.js b/core/renderers/measurables/external_value_input.js
index 8835716c4..06d48df88 100644
--- a/core/renderers/measurables/external_value_input.js
+++ b/core/renderers/measurables/external_value_input.js
@@ -11,7 +11,6 @@
  */
 
 goog.module('Blockly.blockRendering.ExternalValueInput');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/renderers/measurables/field.js b/core/renderers/measurables/field.js
index 33c6b6eb3..2d224913c 100644
--- a/core/renderers/measurables/field.js
+++ b/core/renderers/measurables/field.js
@@ -11,7 +11,6 @@
  */
 
 goog.module('Blockly.blockRendering.Field');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/renderers/measurables/hat.js b/core/renderers/measurables/hat.js
index a7d5f269b..3d6f18e48 100644
--- a/core/renderers/measurables/hat.js
+++ b/core/renderers/measurables/hat.js
@@ -11,7 +11,6 @@
  */
 
 goog.module('Blockly.blockRendering.Hat');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/renderers/measurables/icon.js b/core/renderers/measurables/icon.js
index 850d123f0..d5b0b5fd4 100644
--- a/core/renderers/measurables/icon.js
+++ b/core/renderers/measurables/icon.js
@@ -11,7 +11,6 @@
  */
 
 goog.module('Blockly.blockRendering.Icon');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const BlocklyIcon = goog.requireType('Blockly.Icon');
diff --git a/core/renderers/measurables/in_row_spacer.js b/core/renderers/measurables/in_row_spacer.js
index 4177807f0..d8ef7fef0 100644
--- a/core/renderers/measurables/in_row_spacer.js
+++ b/core/renderers/measurables/in_row_spacer.js
@@ -11,7 +11,6 @@
  */
 
 goog.module('Blockly.blockRendering.InRowSpacer');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/renderers/measurables/inline_input.js b/core/renderers/measurables/inline_input.js
index 01ac0527d..d13c498bb 100644
--- a/core/renderers/measurables/inline_input.js
+++ b/core/renderers/measurables/inline_input.js
@@ -11,7 +11,6 @@
  */
 
 goog.module('Blockly.blockRendering.InlineInput');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/renderers/measurables/input_connection.js b/core/renderers/measurables/input_connection.js
index e6353c643..0466df7c2 100644
--- a/core/renderers/measurables/input_connection.js
+++ b/core/renderers/measurables/input_connection.js
@@ -10,7 +10,6 @@
  */
 
 goog.module('Blockly.blockRendering.InputConnection');
-goog.module.declareLegacyNamespace();
 
 const Connection = goog.require('Blockly.blockRendering.Connection');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/input_row.js b/core/renderers/measurables/input_row.js
index 587d8cb8b..33c57fa79 100644
--- a/core/renderers/measurables/input_row.js
+++ b/core/renderers/measurables/input_row.js
@@ -11,7 +11,6 @@
  */
 
 goog.module('Blockly.blockRendering.InputRow');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/renderers/measurables/jagged_edge.js b/core/renderers/measurables/jagged_edge.js
index 14c9dd533..c4e99faba 100644
--- a/core/renderers/measurables/jagged_edge.js
+++ b/core/renderers/measurables/jagged_edge.js
@@ -11,7 +11,6 @@
  */
 
 goog.module('Blockly.blockRendering.JaggedEdge');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/renderers/measurables/next_connection.js b/core/renderers/measurables/next_connection.js
index 79f50e7a8..3414c56a2 100644
--- a/core/renderers/measurables/next_connection.js
+++ b/core/renderers/measurables/next_connection.js
@@ -11,7 +11,6 @@
  */
 
 goog.module('Blockly.blockRendering.NextConnection');
-goog.module.declareLegacyNamespace();
 
 const Connection = goog.require('Blockly.blockRendering.Connection');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/output_connection.js b/core/renderers/measurables/output_connection.js
index 3b1030bb9..a91c309c9 100644
--- a/core/renderers/measurables/output_connection.js
+++ b/core/renderers/measurables/output_connection.js
@@ -12,7 +12,6 @@
  */
 
 goog.module('Blockly.blockRendering.OutputConnection');
-goog.module.declareLegacyNamespace();
 
 const Connection = goog.require('Blockly.blockRendering.Connection');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/previous_connection.js b/core/renderers/measurables/previous_connection.js
index 6b48d8b44..4eb2c0f31 100644
--- a/core/renderers/measurables/previous_connection.js
+++ b/core/renderers/measurables/previous_connection.js
@@ -11,7 +11,6 @@
  */
 
 goog.module('Blockly.blockRendering.PreviousConnection');
-goog.module.declareLegacyNamespace();
 
 const Connection = goog.require('Blockly.blockRendering.Connection');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/measurables/round_corner.js b/core/renderers/measurables/round_corner.js
index 605f5536b..8c79a7341 100644
--- a/core/renderers/measurables/round_corner.js
+++ b/core/renderers/measurables/round_corner.js
@@ -11,7 +11,6 @@
  */
 
 goog.module('Blockly.blockRendering.RoundCorner');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/renderers/measurables/row.js b/core/renderers/measurables/row.js
index 86be896c8..c776b1ce9 100644
--- a/core/renderers/measurables/row.js
+++ b/core/renderers/measurables/row.js
@@ -10,7 +10,6 @@
  */
 
 goog.module('Blockly.blockRendering.Row');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/renderers/measurables/spacer_row.js b/core/renderers/measurables/spacer_row.js
index 3956355cb..8dde265ed 100644
--- a/core/renderers/measurables/spacer_row.js
+++ b/core/renderers/measurables/spacer_row.js
@@ -10,7 +10,6 @@
  */
 
 goog.module('Blockly.blockRendering.SpacerRow');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/renderers/measurables/square_corner.js b/core/renderers/measurables/square_corner.js
index 7af12dad6..7674498f9 100644
--- a/core/renderers/measurables/square_corner.js
+++ b/core/renderers/measurables/square_corner.js
@@ -11,7 +11,6 @@
  */
 
 goog.module('Blockly.blockRendering.SquareCorner');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/renderers/measurables/statement_input.js b/core/renderers/measurables/statement_input.js
index 6050496d7..d151d0595 100644
--- a/core/renderers/measurables/statement_input.js
+++ b/core/renderers/measurables/statement_input.js
@@ -11,7 +11,6 @@
  */
 
 goog.module('Blockly.blockRendering.StatementInput');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/renderers/measurables/top_row.js b/core/renderers/measurables/top_row.js
index e64ba06a6..569189533 100644
--- a/core/renderers/measurables/top_row.js
+++ b/core/renderers/measurables/top_row.js
@@ -10,7 +10,6 @@
  */
 
 goog.module('Blockly.blockRendering.TopRow');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/renderers/measurables/types.js b/core/renderers/measurables/types.js
index 655375569..6c201f853 100644
--- a/core/renderers/measurables/types.js
+++ b/core/renderers/measurables/types.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.blockRendering.Types');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Measurable = goog.requireType('Blockly.blockRendering.Measurable');
diff --git a/core/renderers/minimalist/constants.js b/core/renderers/minimalist/constants.js
index 186fe2e76..bbc11be1a 100644
--- a/core/renderers/minimalist/constants.js
+++ b/core/renderers/minimalist/constants.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.minimalist.ConstantProvider');
-goog.module.declareLegacyNamespace();
 
 const BaseConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider');
 const object = goog.require('Blockly.utils.object');
diff --git a/core/renderers/minimalist/drawer.js b/core/renderers/minimalist/drawer.js
index 161287b7a..5cd9fc5fa 100644
--- a/core/renderers/minimalist/drawer.js
+++ b/core/renderers/minimalist/drawer.js
@@ -10,7 +10,6 @@
 'use strict';
 
 goog.module('Blockly.minimalist.Drawer');
-goog.module.declareLegacyNamespace();
 
 const BaseDrawer = goog.require('Blockly.blockRendering.Drawer');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/minimalist/info.js b/core/renderers/minimalist/info.js
index c46b16860..374600efd 100644
--- a/core/renderers/minimalist/info.js
+++ b/core/renderers/minimalist/info.js
@@ -10,7 +10,6 @@
 'use strict';
 
 goog.module('Blockly.minimalist.RenderInfo');
-goog.module.declareLegacyNamespace();
 
 const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/minimalist/minimalist.js b/core/renderers/minimalist/minimalist.js
new file mode 100644
index 000000000..9cb9e8bf7
--- /dev/null
+++ b/core/renderers/minimalist/minimalist.js
@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Re-exports of Blockly.minimalist.* modules.
+ */
+'use strict';
+
+goog.module('Blockly.minimalist');
+
+const ConstantProvider = goog.require('Blockly.minimalist.ConstantProvider');
+const Drawer = goog.require('Blockly.minimalist.Drawer');
+const RenderInfo = goog.require('Blockly.minimalist.RenderInfo');
+const Renderer = goog.require('Blockly.minimalist.Renderer');
+
+exports.ConstantProvider = ConstantProvider;
+exports.Drawer = Drawer;
+exports.RenderInfo = RenderInfo;
+exports.Renderer = Renderer;
diff --git a/core/renderers/minimalist/renderer.js b/core/renderers/minimalist/renderer.js
index c2d1855f1..b3adf69e4 100644
--- a/core/renderers/minimalist/renderer.js
+++ b/core/renderers/minimalist/renderer.js
@@ -10,7 +10,6 @@
 'use strict';
 
 goog.module('Blockly.minimalist.Renderer');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const BaseRenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
diff --git a/core/renderers/thrasos/info.js b/core/renderers/thrasos/info.js
index a48b3c2af..b3a924c9a 100644
--- a/core/renderers/thrasos/info.js
+++ b/core/renderers/thrasos/info.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.thrasos.RenderInfo');
-goog.module.declareLegacyNamespace();
 
 const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/thrasos/renderer.js b/core/renderers/thrasos/renderer.js
index bbe85db11..1d4077d41 100644
--- a/core/renderers/thrasos/renderer.js
+++ b/core/renderers/thrasos/renderer.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.thrasos.Renderer');
-goog.module.declareLegacyNamespace();
 
 const BaseRenderer = goog.require('Blockly.blockRendering.Renderer');
 const RenderInfo = goog.require('Blockly.thrasos.RenderInfo');
diff --git a/core/renderers/thrasos/thrasos.js b/core/renderers/thrasos/thrasos.js
new file mode 100644
index 000000000..a5a5bfc45
--- /dev/null
+++ b/core/renderers/thrasos/thrasos.js
@@ -0,0 +1,18 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Re-exports of Blockly.thrasos.* modules.
+ */
+'use strict';
+
+goog.module('Blockly.thrasos');
+
+const RenderInfo = goog.require('Blockly.thrasos.RenderInfo');
+const Renderer = goog.require('Blockly.thrasos.Renderer');
+
+exports.RenderInfo = RenderInfo;
+exports.Renderer = Renderer;
diff --git a/core/renderers/zelos/constants.js b/core/renderers/zelos/constants.js
index e6c25751b..226b0805a 100644
--- a/core/renderers/zelos/constants.js
+++ b/core/renderers/zelos/constants.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.zelos.ConstantProvider');
-goog.module.declareLegacyNamespace();
 
 const BaseConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider');
 const Svg = goog.require('Blockly.utils.Svg');
diff --git a/core/renderers/zelos/drawer.js b/core/renderers/zelos/drawer.js
index 52e371a4d..33dff7f0a 100644
--- a/core/renderers/zelos/drawer.js
+++ b/core/renderers/zelos/drawer.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.zelos.Drawer');
-goog.module.declareLegacyNamespace();
 
 const BaseDrawer = goog.require('Blockly.blockRendering.Drawer');
 /* eslint-disable-next-line no-unused-vars */
@@ -20,7 +19,7 @@ const PathObject = goog.requireType('Blockly.zelos.PathObject');
 const RenderInfo = goog.requireType('Blockly.zelos.RenderInfo');
 /* eslint-disable-next-line no-unused-vars */
 const Row = goog.requireType('Blockly.blockRendering.Row');
-const blockRendering = goog.require('Blockly.blockRendering');
+const debug = goog.require('Blockly.blockRendering.debug');
 const object = goog.require('Blockly.utils.object');
 const svgPaths = goog.require('Blockly.utils.svgPaths');
 /* eslint-disable-next-line no-unused-vars */
@@ -57,7 +56,7 @@ Drawer.prototype.draw = function() {
   if (this.info_.RTL) {
     pathObject.flipRTL();
   }
-  if (blockRendering.isDebuggerEnabled()) {
+  if (debug.isDebuggerEnabled()) {
     this.block_.renderingDebugger.drawDebug(this.block_, this.info_);
   }
   this.recordSizeOnBlock_();
diff --git a/core/renderers/zelos/info.js b/core/renderers/zelos/info.js
index 710b1f6ba..a38bda9cf 100644
--- a/core/renderers/zelos/info.js
+++ b/core/renderers/zelos/info.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.zelos.RenderInfo');
-goog.module.declareLegacyNamespace();
 
 const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo');
 const BottomRow = goog.require('Blockly.zelos.BottomRow');
diff --git a/core/renderers/zelos/marker_svg.js b/core/renderers/zelos/marker_svg.js
index 88214aa2a..c85a258a7 100644
--- a/core/renderers/zelos/marker_svg.js
+++ b/core/renderers/zelos/marker_svg.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.zelos.MarkerSvg');
-goog.module.declareLegacyNamespace();
 
 const BaseMarkerSvg = goog.require('Blockly.blockRendering.MarkerSvg');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/zelos/measurables/bottom_row.js b/core/renderers/zelos/measurables/bottom_row.js
index cf7b580cb..0c608af92 100644
--- a/core/renderers/zelos/measurables/bottom_row.js
+++ b/core/renderers/zelos/measurables/bottom_row.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.zelos.BottomRow');
-goog.module.declareLegacyNamespace();
 
 const BaseBottomRow = goog.require('Blockly.blockRendering.BottomRow');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/zelos/measurables/inputs.js b/core/renderers/zelos/measurables/inputs.js
index cff7b4dae..f412a3484 100644
--- a/core/renderers/zelos/measurables/inputs.js
+++ b/core/renderers/zelos/measurables/inputs.js
@@ -11,7 +11,6 @@
  */
 
 goog.module('Blockly.zelos.StatementInput');
-goog.module.declareLegacyNamespace();
 
 const BaseStatementInput = goog.require('Blockly.blockRendering.StatementInput');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/zelos/measurables/row_elements.js b/core/renderers/zelos/measurables/row_elements.js
index 85e59e6ad..39c58fd65 100644
--- a/core/renderers/zelos/measurables/row_elements.js
+++ b/core/renderers/zelos/measurables/row_elements.js
@@ -11,7 +11,6 @@
  */
 
 goog.module('Blockly.zelos.RightConnectionShape');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
diff --git a/core/renderers/zelos/measurables/top_row.js b/core/renderers/zelos/measurables/top_row.js
index b602e7df5..9c9aa0eda 100644
--- a/core/renderers/zelos/measurables/top_row.js
+++ b/core/renderers/zelos/measurables/top_row.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.zelos.TopRow');
-goog.module.declareLegacyNamespace();
 
 const BaseTopRow = goog.require('Blockly.blockRendering.TopRow');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/zelos/path_object.js b/core/renderers/zelos/path_object.js
index 5539fc503..d0236cc06 100644
--- a/core/renderers/zelos/path_object.js
+++ b/core/renderers/zelos/path_object.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.zelos.PathObject');
-goog.module.declareLegacyNamespace();
 
 const BasePathObject = goog.require('Blockly.blockRendering.PathObject');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/zelos/renderer.js b/core/renderers/zelos/renderer.js
index 2dac896dc..b19d2ee4b 100644
--- a/core/renderers/zelos/renderer.js
+++ b/core/renderers/zelos/renderer.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.zelos.Renderer');
-goog.module.declareLegacyNamespace();
 
 const BaseRenderer = goog.require('Blockly.blockRendering.Renderer');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/renderers/zelos/zelos.js b/core/renderers/zelos/zelos.js
new file mode 100644
index 000000000..89b3d0db0
--- /dev/null
+++ b/core/renderers/zelos/zelos.js
@@ -0,0 +1,34 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Re-exports of Blockly.zelos.* modules.
+ */
+'use strict';
+
+goog.module('Blockly.zelos');
+
+const BottomRow = goog.require('Blockly.zelos.BottomRow');
+const ConstantProvider = goog.require('Blockly.zelos.ConstantProvider');
+const Drawer = goog.require('Blockly.zelos.Drawer');
+const MarkerSvg = goog.require('Blockly.zelos.MarkerSvg');
+const PathObject = goog.require('Blockly.zelos.PathObject');
+const RenderInfo = goog.require('Blockly.zelos.RenderInfo');
+const Renderer = goog.require('Blockly.zelos.Renderer');
+const RightConnectionShape = goog.require('Blockly.zelos.RightConnectionShape');
+const StatementInput = goog.require('Blockly.zelos.StatementInput');
+const TopRow = goog.require('Blockly.zelos.TopRow');
+
+exports.BottomRow = BottomRow;
+exports.ConstantProvider = ConstantProvider;
+exports.Drawer = Drawer;
+exports.MarkerSvg = MarkerSvg;
+exports.PathObject = PathObject;
+exports.RenderInfo = RenderInfo;
+exports.Renderer = Renderer;
+exports.RightConnectionShape = RightConnectionShape;
+exports.StatementInput = StatementInput;
+exports.TopRow = TopRow;
diff --git a/tests/deps.js b/tests/deps.js
index b99d8bb28..18551fef4 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.ConnectionType', '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.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.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Blocks', '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.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.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', '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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', '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.BlocklyOptions', 'Blockly.Blocks', '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.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.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', '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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.geras', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', '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'});
@@ -138,17 +138,19 @@ goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'],
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.Connection', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Renderer', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.blockRendering.debug', 'Blockly.registry', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/debug.js', ['Blockly.blockRendering.debug'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.ConnectionType', 'Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Types', 'Blockly.blockRendering.debug', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.debug', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.blockRendering.debug', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/geras.js', ['Blockly.geras'], ['Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.Highlighter', 'Blockly.geras.InlineInput', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.geras.Renderer', 'Blockly.geras.StatementInput'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -181,11 +183,13 @@ goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockR
 goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist.RenderInfo'], ['Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/minimalist/minimalist.js', ['Blockly.minimalist'], ['Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.minimalist.Renderer'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/thrasos/thrasos.js', ['Blockly.thrasos'], ['Blockly.thrasos.RenderInfo', 'Blockly.thrasos.Renderer'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.blockRendering.ConstantProvider', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.blockRendering.debug', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.StatementInput', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/measurables/bottom_row.js', ['Blockly.zelos.BottomRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -194,6 +198,7 @@ goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['B
 goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/zelos.js', ['Blockly.zelos'], ['Blockly.zelos.BottomRow', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo', 'Blockly.zelos.Renderer', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.StatementInput', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.registry', 'Blockly.serialization.variables', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 9d6c15eb9..152124f67 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.ConnectionType', '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.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.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Blocks', '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.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.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', '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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', '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.BlocklyOptions', 'Blockly.Blocks', '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.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.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', '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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.geras', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', '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'});
@@ -138,17 +138,19 @@ goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'],
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.Connection', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Renderer', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.blockRendering.debug', 'Blockly.registry', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/debug.js', ['Blockly.blockRendering.debug'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.ConnectionType', 'Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Types', 'Blockly.blockRendering.debug', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.debug', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.blockRendering.debug', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/geras.js', ['Blockly.geras'], ['Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.Highlighter', 'Blockly.geras.InlineInput', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.geras.Renderer', 'Blockly.geras.StatementInput'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -181,11 +183,13 @@ goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockR
 goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist.RenderInfo'], ['Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/minimalist/minimalist.js', ['Blockly.minimalist'], ['Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.minimalist.Renderer'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/thrasos/thrasos.js', ['Blockly.thrasos'], ['Blockly.thrasos.RenderInfo', 'Blockly.thrasos.Renderer'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.blockRendering.ConstantProvider', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.blockRendering.debug', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.StatementInput', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/measurables/bottom_row.js', ['Blockly.zelos.BottomRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -194,6 +198,7 @@ goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['B
 goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/zelos.js', ['Blockly.zelos'], ['Blockly.zelos.BottomRow', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo', 'Blockly.zelos.Renderer', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.StatementInput', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.registry', 'Blockly.serialization.variables', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});

From 10485dd83888e41c8506f6a69ad5206c70658a02 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 23 Sep 2021 17:02:41 -0700
Subject: [PATCH 826/833] Fix typo

---
 core/serialization/blocks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index 56b07af71..33c640f66 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -306,7 +306,7 @@ exports.append = append;
  * This is defined internally so that the extra parameters don't clutter our
  * external API.
  * But it is exported so that other places within Blockly can call it directly
- * with the extra paramters.
+ * with the extra parameters.
  * @param {!State} state The state of a block to deserialize into the workspace.
  * @param {!Workspace} workspace The workspace to add the block to.
  * @param {{parentConnection: (!Connection|undefined), isShadow:

From 757878c646bc75284dc07ac959dc039950f3e373 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 23 Sep 2021 11:34:56 -0700
Subject: [PATCH 827/833] chore: Remove declareLegacyNamespace() from files
 under interfaces/*

---
 core/blockly.js                               | 58 ++++++++++++++++++-
 core/interfaces/i_ast_node_location.js        |  1 -
 core/interfaces/i_ast_node_location_svg.js    |  1 -
 .../i_ast_node_location_with_block.js         |  1 -
 core/interfaces/i_autohideable.js             |  1 -
 core/interfaces/i_block_dragger.js            |  1 -
 core/interfaces/i_bounded_element.js          |  1 -
 core/interfaces/i_bubble.js                   |  1 -
 core/interfaces/i_collapsible_toolbox_item.js |  1 -
 core/interfaces/i_component.js                |  1 -
 core/interfaces/i_connection_checker.js       |  1 -
 core/interfaces/i_contextmenu.js              |  1 -
 core/interfaces/i_copyable.js                 |  1 -
 core/interfaces/i_deletable.js                |  1 -
 core/interfaces/i_delete_area.js              |  1 -
 core/interfaces/i_drag_target.js              |  1 -
 core/interfaces/i_draggable.js                |  1 -
 core/interfaces/i_flyout.js                   |  1 -
 core/interfaces/i_keyboard_accessible.js      |  1 -
 core/interfaces/i_metrics_manager.js          |  1 -
 core/interfaces/i_movable.js                  |  1 -
 core/interfaces/i_positionable.js             |  1 -
 core/interfaces/i_registrable.js              |  1 -
 core/interfaces/i_registrable_field.js        |  3 +-
 core/interfaces/i_selectable.js               |  1 -
 core/interfaces/i_selectable_toolbox_item.js  |  1 -
 core/interfaces/i_styleable.js                |  1 -
 core/interfaces/i_toolbox.js                  |  1 -
 core/interfaces/i_toolbox_item.js             |  1 -
 tests/deps.js                                 |  2 +-
 tests/deps.mocha.js                           |  2 +-
 31 files changed, 59 insertions(+), 33 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index 30d5378e8..77f1380f8 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -55,11 +55,37 @@ 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');
-/* eslint-disable-next-line no-unused-vars */
-const ICopyable = goog.requireType('Blockly.ICopyable');
+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');
@@ -550,9 +576,37 @@ exports.Generator = Generator;
 exports.Gesture = Gesture;
 exports.Grid = Grid;
 exports.HorizontalFlyout = HorizontalFlyout;
+exports.IASTNodeLocation = IASTNodeLocation;
+exports.IASTNodeLocationSvg = IASTNodeLocationSvg;
+exports.IASTNodeLocationWithBlock = IASTNodeLocationWithBlock;
+exports.IAutoHideable = IAutoHideable;
+exports.IBlockDragger = IBlockDragger;
+exports.IBoundedElement = IBoundedElement;
+exports.IBubble = IBubble;
+exports.ICollapsibleToolboxItem = ICollapsibleToolboxItem;
+exports.IComponent = IComponent;
+exports.IConnectionChecker = IConnectionChecker;
+exports.IContextMenu = IContextMenu;
 exports.Icon = Icon;
+exports.ICopyable = ICopyable;
+exports.IDeletable = IDeletable;
+exports.IDeleteArea = IDeleteArea;
+exports.IDragTarget = IDragTarget;
+exports.IDraggable = IDraggable;
+exports.IFlyout = IFlyout;
+exports.IKeyboardAccessible = IKeyboardAccessible;
+exports.IMetricsManager = IMetricsManager;
+exports.IMovable = IMovable;
 exports.Input = Input;
 exports.InsertionMarkerManager = InsertionMarkerManager;
+exports.IPositionable = IPositionable;
+exports.IRegistrable = IRegistrable;
+exports.IRegistrableField = IRegistrableField;
+exports.ISelectable = ISelectable;
+exports.ISelectableToolboxItem = ISelectableToolboxItem;
+exports.IStyleable = IStyleable;
+exports.IToolbox = IToolbox;
+exports.IToolboxItem = IToolboxItem;
 exports.Marker = Marker;
 exports.MarkerManager = MarkerManager;
 exports.Menu = Menu;
diff --git a/core/interfaces/i_ast_node_location.js b/core/interfaces/i_ast_node_location.js
index 0ebec8ebd..ddf987c5d 100644
--- a/core/interfaces/i_ast_node_location.js
+++ b/core/interfaces/i_ast_node_location.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.IASTNodeLocation');
-goog.module.declareLegacyNamespace();
 
 /**
  * An AST node location interface.
diff --git a/core/interfaces/i_ast_node_location_svg.js b/core/interfaces/i_ast_node_location_svg.js
index 53d65a529..ffa67e6e0 100644
--- a/core/interfaces/i_ast_node_location_svg.js
+++ b/core/interfaces/i_ast_node_location_svg.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.IASTNodeLocationSvg');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const IASTNodeLocation = goog.requireType('Blockly.IASTNodeLocation');
diff --git a/core/interfaces/i_ast_node_location_with_block.js b/core/interfaces/i_ast_node_location_with_block.js
index b45bca4ea..11c71a70a 100644
--- a/core/interfaces/i_ast_node_location_with_block.js
+++ b/core/interfaces/i_ast_node_location_with_block.js
@@ -13,7 +13,6 @@
 'use strict';
 
 goog.module('Blockly.IASTNodeLocationWithBlock');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const IASTNodeLocation = goog.requireType('Blockly.IASTNodeLocation');
diff --git a/core/interfaces/i_autohideable.js b/core/interfaces/i_autohideable.js
index fa881770a..3f2919d0f 100644
--- a/core/interfaces/i_autohideable.js
+++ b/core/interfaces/i_autohideable.js
@@ -13,7 +13,6 @@
 'use strict';
 
 goog.module('Blockly.IAutoHideable');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const IComponent = goog.requireType('Blockly.IComponent');
diff --git a/core/interfaces/i_block_dragger.js b/core/interfaces/i_block_dragger.js
index a5068e192..d22f859cc 100644
--- a/core/interfaces/i_block_dragger.js
+++ b/core/interfaces/i_block_dragger.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.IBlockDragger');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Coordinate = goog.requireType('Blockly.utils.Coordinate');
diff --git a/core/interfaces/i_bounded_element.js b/core/interfaces/i_bounded_element.js
index f2c84633e..de1b3a663 100644
--- a/core/interfaces/i_bounded_element.js
+++ b/core/interfaces/i_bounded_element.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.IBoundedElement');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Rect = goog.requireType('Blockly.utils.Rect');
diff --git a/core/interfaces/i_bubble.js b/core/interfaces/i_bubble.js
index be59509b7..a8b1cfafb 100644
--- a/core/interfaces/i_bubble.js
+++ b/core/interfaces/i_bubble.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.IBubble');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Coordinate = goog.requireType('Blockly.utils.Coordinate');
diff --git a/core/interfaces/i_collapsible_toolbox_item.js b/core/interfaces/i_collapsible_toolbox_item.js
index 5915a05b4..af6bba3cc 100644
--- a/core/interfaces/i_collapsible_toolbox_item.js
+++ b/core/interfaces/i_collapsible_toolbox_item.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.ICollapsibleToolboxItem');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ISelectableToolboxItem = goog.requireType('Blockly.ISelectableToolboxItem');
diff --git a/core/interfaces/i_component.js b/core/interfaces/i_component.js
index d1acc592f..9711cd0a9 100644
--- a/core/interfaces/i_component.js
+++ b/core/interfaces/i_component.js
@@ -13,7 +13,6 @@
 'use strict';
 
 goog.module('Blockly.IComponent');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/core/interfaces/i_connection_checker.js b/core/interfaces/i_connection_checker.js
index d0eb21e24..dafd36994 100644
--- a/core/interfaces/i_connection_checker.js
+++ b/core/interfaces/i_connection_checker.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.IConnectionChecker');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Connection = goog.requireType('Blockly.Connection');
diff --git a/core/interfaces/i_contextmenu.js b/core/interfaces/i_contextmenu.js
index 79117d5ed..9a53d17a1 100644
--- a/core/interfaces/i_contextmenu.js
+++ b/core/interfaces/i_contextmenu.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.IContextMenu');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/core/interfaces/i_copyable.js b/core/interfaces/i_copyable.js
index 0ba476b72..98b58e0ba 100644
--- a/core/interfaces/i_copyable.js
+++ b/core/interfaces/i_copyable.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.ICopyable');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ISelectable = goog.requireType('Blockly.ISelectable');
diff --git a/core/interfaces/i_deletable.js b/core/interfaces/i_deletable.js
index ff24023d9..743d6ffd5 100644
--- a/core/interfaces/i_deletable.js
+++ b/core/interfaces/i_deletable.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.IDeletable');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/core/interfaces/i_delete_area.js b/core/interfaces/i_delete_area.js
index fbe54559a..ef4746c80 100644
--- a/core/interfaces/i_delete_area.js
+++ b/core/interfaces/i_delete_area.js
@@ -13,7 +13,6 @@
 'use strict';
 
 goog.module('Blockly.IDeleteArea');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const IDraggable = goog.requireType('Blockly.IDraggable');
diff --git a/core/interfaces/i_drag_target.js b/core/interfaces/i_drag_target.js
index a47798841..782d01296 100644
--- a/core/interfaces/i_drag_target.js
+++ b/core/interfaces/i_drag_target.js
@@ -13,7 +13,6 @@
 'use strict';
 
 goog.module('Blockly.IDragTarget');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const IComponent = goog.requireType('Blockly.IComponent');
diff --git a/core/interfaces/i_draggable.js b/core/interfaces/i_draggable.js
index 5e6702a1c..7dbb926d0 100644
--- a/core/interfaces/i_draggable.js
+++ b/core/interfaces/i_draggable.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.IDraggable');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const IDeletable = goog.requireType('Blockly.IDeletable');
diff --git a/core/interfaces/i_flyout.js b/core/interfaces/i_flyout.js
index 030fd89fe..f4b8ad3c4 100644
--- a/core/interfaces/i_flyout.js
+++ b/core/interfaces/i_flyout.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.IFlyout');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Coordinate = goog.requireType('Blockly.utils.Coordinate');
diff --git a/core/interfaces/i_keyboard_accessible.js b/core/interfaces/i_keyboard_accessible.js
index 04704a2fe..e935c01de 100644
--- a/core/interfaces/i_keyboard_accessible.js
+++ b/core/interfaces/i_keyboard_accessible.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.IKeyboardAccessible');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ShortcutRegistry = goog.requireType('Blockly.ShortcutRegistry');
diff --git a/core/interfaces/i_metrics_manager.js b/core/interfaces/i_metrics_manager.js
index 7dd8ef663..9d707f7fb 100644
--- a/core/interfaces/i_metrics_manager.js
+++ b/core/interfaces/i_metrics_manager.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.IMetricsManager');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Metrics = goog.requireType('Blockly.utils.Metrics');
diff --git a/core/interfaces/i_movable.js b/core/interfaces/i_movable.js
index 25a92d6bb..b52f0aca2 100644
--- a/core/interfaces/i_movable.js
+++ b/core/interfaces/i_movable.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.IMovable');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/core/interfaces/i_positionable.js b/core/interfaces/i_positionable.js
index ba1a4d2b5..26a8f26e6 100644
--- a/core/interfaces/i_positionable.js
+++ b/core/interfaces/i_positionable.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.IPositionable');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const IComponent = goog.requireType('Blockly.IComponent');
diff --git a/core/interfaces/i_registrable.js b/core/interfaces/i_registrable.js
index 5698ad313..382ccbf29 100644
--- a/core/interfaces/i_registrable.js
+++ b/core/interfaces/i_registrable.js
@@ -13,7 +13,6 @@
 'use strict';
 
 goog.module('Blockly.IRegistrable');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/core/interfaces/i_registrable_field.js b/core/interfaces/i_registrable_field.js
index c9d04325d..beb367462 100644
--- a/core/interfaces/i_registrable_field.js
+++ b/core/interfaces/i_registrable_field.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.IRegistrableField');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.Field');
@@ -26,7 +25,7 @@ const Field = goog.requireType('Blockly.Field');
  *     fromJson:IRegistrableField.fromJson
  * }}
  */
-let IRegistrableField;
+let IRegistrableField = {};
 
 /**
  * @typedef {function(!Object): Field}
diff --git a/core/interfaces/i_selectable.js b/core/interfaces/i_selectable.js
index e95b0dcfe..3b9d074a5 100644
--- a/core/interfaces/i_selectable.js
+++ b/core/interfaces/i_selectable.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.ISelectable');
-goog.module.declareLegacyNamespace();
 
 // eslint-disable-next-line no-unused-vars
 const IDeletable = goog.requireType('Blockly.IDeletable');
diff --git a/core/interfaces/i_selectable_toolbox_item.js b/core/interfaces/i_selectable_toolbox_item.js
index 2e286889f..39fd08326 100644
--- a/core/interfaces/i_selectable_toolbox_item.js
+++ b/core/interfaces/i_selectable_toolbox_item.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.ISelectableToolboxItem');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
diff --git a/core/interfaces/i_styleable.js b/core/interfaces/i_styleable.js
index 14dea3ce1..5d25bf713 100644
--- a/core/interfaces/i_styleable.js
+++ b/core/interfaces/i_styleable.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.IStyleable');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/core/interfaces/i_toolbox.js b/core/interfaces/i_toolbox.js
index ee645ba34..7e8200386 100644
--- a/core/interfaces/i_toolbox.js
+++ b/core/interfaces/i_toolbox.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.IToolbox');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const IFlyout = goog.requireType('Blockly.IFlyout');
diff --git a/core/interfaces/i_toolbox_item.js b/core/interfaces/i_toolbox_item.js
index 061b7ae27..a3b946543 100644
--- a/core/interfaces/i_toolbox_item.js
+++ b/core/interfaces/i_toolbox_item.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.IToolboxItem');
-goog.module.declareLegacyNamespace();
 
 
 /**
diff --git a/tests/deps.js b/tests/deps.js
index 18551fef4..3a8cef8ad 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.ConnectionType', '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.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.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Blocks', '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.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.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', '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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.geras', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', '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.Blocks', '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.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.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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.geras', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', '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'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 152124f67..b5aa955f9 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.ConnectionType', '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.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.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Blocks', '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.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.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', '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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.geras', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', '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.Blocks', '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.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.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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.geras', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', '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'});

From 8ab85367396c887c3aa0c28ba4c6ad189886ed1d Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Fri, 24 Sep 2021 17:38:08 +0100
Subject: [PATCH 828/833] refactor: Migrate `Blockly.ConnectionType` to named
 exports (#5533)

* refactor: Migrate Blockly.ConnectionType to named exports
* Add corresponding information to renamings.js
---
 core/block.js                       |   2 +-
 core/block_svg.js                   |   2 +-
 core/blockly.js                     |   2 +-
 core/connection.js                  |   2 +-
 core/connection_checker.js          |   2 +-
 core/connection_db.js               |   2 +-
 core/connection_type.js             |   2 +-
 core/events/events_block_move.js    |   2 +-
 core/input_types.js                 |   3 +-
 core/insertion_marker_manager.js    |   2 +-
 core/internal_constants.js          |   2 +-
 core/keyboard_nav/ast_node.js       |   2 +-
 core/rendered_connection.js         |   2 +-
 core/renderers/common/constants.js  |   2 +-
 core/renderers/common/debugger.js   |   2 +-
 core/renderers/common/marker_svg.js |   2 +-
 core/renderers/common/renderer.js   |   2 +-
 core/renderers/zelos/constants.js   |   2 +-
 core/renderers/zelos/renderer.js    |   2 +-
 scripts/migration/renamings.js      |   2 +
 tests/deps.js                       | 264 -------------------
 tests/deps.mocha.js                 | 378 ----------------------------
 22 files changed, 22 insertions(+), 661 deletions(-)

diff --git a/core/block.js b/core/block.js
index bdff8bb64..d4ba8cd00 100644
--- a/core/block.js
+++ b/core/block.js
@@ -18,7 +18,6 @@ const Blocks = goog.require('Blockly.Blocks');
 /* eslint-disable-next-line no-unused-vars */
 const Comment = goog.requireType('Blockly.Comment');
 const Connection = goog.require('Blockly.Connection');
-const ConnectionType = goog.require('Blockly.ConnectionType');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Events = goog.require('Blockly.Events');
 const Extensions = goog.require('Blockly.Extensions');
@@ -45,6 +44,7 @@ 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 {ConnectionType} = goog.require('Blockly.ConnectionType');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
diff --git a/core/block_svg.js b/core/block_svg.js
index 3ea434000..166d75aff 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -57,7 +57,6 @@ const blockAnimations = goog.require('Blockly.blockAnimations');
 const blocks = goog.require('Blockly.serialization.blocks');
 const browserEvents = goog.require('Blockly.browserEvents');
 const common = goog.require('Blockly.common');
-const ConnectionType = goog.require('Blockly.ConnectionType');
 const constants = goog.require('Blockly.constants');
 const dom = goog.require('Blockly.utils.dom');
 const internalConstants = goog.require('Blockly.internalConstants');
@@ -66,6 +65,7 @@ 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 {ConnectionType} = goog.require('Blockly.ConnectionType');
 const {TabNavigateCursor} = goog.require('Blockly.TabNavigateCursor');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockMove');
diff --git a/core/blockly.js b/core/blockly.js
index 77f1380f8..ae6957341 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -27,7 +27,6 @@ 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 ConnectionType = goog.require('Blockly.ConnectionType');
 const ContextMenu = goog.require('Blockly.ContextMenu');
 const ContextMenuItems = goog.require('Blockly.ContextMenuItems');
 const ContextMenuRegistry = goog.require('Blockly.ContextMenuRegistry');
@@ -157,6 +156,7 @@ 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 {ConnectionType} = goog.require('Blockly.ConnectionType');
 const {Cursor} = goog.require('Blockly.Cursor');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
diff --git a/core/connection.js b/core/connection.js
index 9e204f8aa..5ebd1e773 100644
--- a/core/connection.js
+++ b/core/connection.js
@@ -12,7 +12,6 @@
 
 goog.module('Blockly.Connection');
 
-const ConnectionType = goog.require('Blockly.ConnectionType');
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const IASTNodeLocationWithBlock = goog.requireType('Blockly.IASTNodeLocationWithBlock');
@@ -25,6 +24,7 @@ const blocks = goog.require('Blockly.serialization.blocks');
 const deprecation = goog.require('Blockly.utils.deprecation');
 /* 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');
 /** @suppress {extraRequire} */
diff --git a/core/connection_checker.js b/core/connection_checker.js
index 41389cece..3395b4bac 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -19,9 +19,9 @@ const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');
 /* eslint-disable-next-line no-unused-vars */
 const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 const common = goog.require('Blockly.common');
-const ConnectionType = goog.require('Blockly.ConnectionType');
 const internalConstants = goog.require('Blockly.internalConstants');
 const registry = goog.require('Blockly.registry');
+const {ConnectionType} = goog.require('Blockly.ConnectionType');
 
 
 /**
diff --git a/core/connection_db.js b/core/connection_db.js
index 083320ce4..e745a2392 100644
--- a/core/connection_db.js
+++ b/core/connection_db.js
@@ -20,7 +20,7 @@ const Coordinate = goog.requireType('Blockly.utils.Coordinate');
 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');
+const {ConnectionType} = goog.require('Blockly.ConnectionType');
 /** @suppress {extraRequire} */
 goog.require('Blockly.constants');
 
diff --git a/core/connection_type.js b/core/connection_type.js
index e80ff926b..607e20047 100644
--- a/core/connection_type.js
+++ b/core/connection_type.js
@@ -29,4 +29,4 @@ const ConnectionType = {
   PREVIOUS_STATEMENT: 4
 };
 
-exports = ConnectionType;
+exports.ConnectionType = ConnectionType;
diff --git a/core/events/events_block_move.js b/core/events/events_block_move.js
index b03f7e18b..b88ce762b 100644
--- a/core/events/events_block_move.js
+++ b/core/events/events_block_move.js
@@ -16,11 +16,11 @@ goog.module.declareLegacyNamespace();
 const BlockBase = goog.require('Blockly.Events.BlockBase');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Events = goog.require('Blockly.Events');
-const ConnectionType = goog.require('Blockly.ConnectionType');
 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 {ConnectionType} = goog.require('Blockly.ConnectionType');
 
 
 /**
diff --git a/core/input_types.js b/core/input_types.js
index 889aaef5d..b0af4ef87 100644
--- a/core/input_types.js
+++ b/core/input_types.js
@@ -13,7 +13,8 @@
 
 goog.module('Blockly.inputTypes');
 
-const ConnectionType = goog.require('Blockly.ConnectionType');
+const {ConnectionType} = goog.require('Blockly.ConnectionType');
+
 
 /**
  * Enum for the type of a connection or input.
diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js
index cc5358757..75238e9d4 100644
--- a/core/insertion_marker_manager.js
+++ b/core/insertion_marker_manager.js
@@ -13,7 +13,6 @@
 goog.module('Blockly.InsertionMarkerManager');
 
 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');
 const Events = goog.require('Blockly.Events');
@@ -31,6 +30,7 @@ const constants = goog.require('Blockly.constants');
 const internalConstants = goog.require('Blockly.internalConstants');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+const {ConnectionType} = goog.require('Blockly.ConnectionType');
 
 
 /**
diff --git a/core/internal_constants.js b/core/internal_constants.js
index ec8d07169..aa1596a4c 100644
--- a/core/internal_constants.js
+++ b/core/internal_constants.js
@@ -14,7 +14,7 @@
 
 goog.module('Blockly.internalConstants');
 
-const ConnectionType = goog.require('Blockly.ConnectionType');
+const {ConnectionType} = goog.require('Blockly.ConnectionType');
 
 
 /**
diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index 9d3b290f0..2bbe33d02 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -14,7 +14,6 @@ goog.module('Blockly.ASTNode');
 
 /* eslint-disable-next-line no-unused-vars */
 const Connection = goog.requireType('Blockly.Connection');
-const ConnectionType = goog.require('Blockly.ConnectionType');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 /* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.Field');
@@ -28,6 +27,7 @@ const Input = goog.requireType('Blockly.Input');
 const Workspace = goog.requireType('Blockly.Workspace');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+const {ConnectionType} = goog.require('Blockly.ConnectionType');
 
 
 /**
diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index 096d93c4f..ee2a386e3 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -15,7 +15,6 @@ goog.module('Blockly.RenderedConnection');
 const Connection = goog.require('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
 const ConnectionDB = goog.requireType('Blockly.ConnectionDB');
-const ConnectionType = goog.require('Blockly.ConnectionType');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Events = goog.require('Blockly.Events');
 const Svg = goog.require('Blockly.utils.Svg');
@@ -30,6 +29,7 @@ const utils = goog.require('Blockly.utils');
 const {Block} = goog.requireType('Blockly.Block');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+const {ConnectionType} = goog.require('Blockly.ConnectionType');
 
 
 /**
diff --git a/core/renderers/common/constants.js b/core/renderers/common/constants.js
index 8febc9f9a..8926ef92e 100644
--- a/core/renderers/common/constants.js
+++ b/core/renderers/common/constants.js
@@ -18,12 +18,12 @@ const Svg = goog.require('Blockly.utils.Svg');
 /* eslint-disable-next-line no-unused-vars */
 const Theme = goog.requireType('Blockly.Theme');
 const colour = goog.require('Blockly.utils.colour');
-const ConnectionType = goog.require('Blockly.ConnectionType');
 const dom = goog.require('Blockly.utils.dom');
 const object = goog.require('Blockly.utils.object');
 const svgPaths = goog.require('Blockly.utils.svgPaths');
 const userAgent = goog.require('Blockly.utils.userAgent');
 const utils = goog.require('Blockly.utils');
+const {ConnectionType} = goog.require('Blockly.ConnectionType');
 
 
 /**
diff --git a/core/renderers/common/debugger.js b/core/renderers/common/debugger.js
index 84c047ae5..5841887a1 100644
--- a/core/renderers/common/debugger.js
+++ b/core/renderers/common/debugger.js
@@ -27,10 +27,10 @@ const RenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
 const Row = goog.requireType('Blockly.blockRendering.Row');
 const Svg = goog.require('Blockly.utils.Svg');
 const Types = goog.require('Blockly.blockRendering.Types');
-const ConnectionType = goog.require('Blockly.ConnectionType');
 const dom = goog.require('Blockly.utils.dom');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+const {ConnectionType} = goog.require('Blockly.ConnectionType');
 
 
 /**
diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js
index 478848584..04e900c61 100644
--- a/core/renderers/common/marker_svg.js
+++ b/core/renderers/common/marker_svg.js
@@ -27,12 +27,12 @@ const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 const Svg = goog.require('Blockly.utils.Svg');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
-const ConnectionType = goog.require('Blockly.ConnectionType');
 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');
+const {ConnectionType} = goog.require('Blockly.ConnectionType');
 /* eslint-disable-next-line no-unused-vars */
 const {Marker} = goog.requireType('Blockly.Marker');
 /** @suppress {extraRequire} */
diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js
index f2bca0eef..223aba231 100644
--- a/core/renderers/common/renderer.js
+++ b/core/renderers/common/renderer.js
@@ -13,7 +13,6 @@
 goog.module('Blockly.blockRendering.Renderer');
 
 const Connection = goog.require('Blockly.Connection');
-const ConnectionType = goog.require('Blockly.ConnectionType');
 const ConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider');
 /* eslint-disable-next-line no-unused-vars */
 const Debug = goog.requireType('Blockly.blockRendering.Debug');
@@ -38,6 +37,7 @@ 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');
+const {ConnectionType} = goog.require('Blockly.ConnectionType');
 /* eslint-disable-next-line no-unused-vars */
 const {Marker} = goog.requireType('Blockly.Marker');
 
diff --git a/core/renderers/zelos/constants.js b/core/renderers/zelos/constants.js
index 226b0805a..daa765a3b 100644
--- a/core/renderers/zelos/constants.js
+++ b/core/renderers/zelos/constants.js
@@ -15,11 +15,11 @@ goog.module('Blockly.zelos.ConstantProvider');
 
 const BaseConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider');
 const Svg = goog.require('Blockly.utils.Svg');
-const ConnectionType = goog.require('Blockly.ConnectionType');
 const dom = goog.require('Blockly.utils.dom');
 const object = goog.require('Blockly.utils.object');
 const svgPaths = goog.require('Blockly.utils.svgPaths');
 const utilsColour = goog.require('Blockly.utils.colour');
+const {ConnectionType} = goog.require('Blockly.ConnectionType');
 
 
 /**
diff --git a/core/renderers/zelos/renderer.js b/core/renderers/zelos/renderer.js
index b19d2ee4b..b96f4cdbb 100644
--- a/core/renderers/zelos/renderer.js
+++ b/core/renderers/zelos/renderer.js
@@ -26,10 +26,10 @@ const Theme = goog.requireType('Blockly.Theme');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const blockRendering = goog.require('Blockly.blockRendering');
-const ConnectionType = goog.require('Blockly.ConnectionType');
 const object = goog.require('Blockly.utils.object');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+const {ConnectionType} = goog.require('Blockly.ConnectionType');
 /* eslint-disable-next-line no-unused-vars */
 const {Marker} = goog.requireType('Blockly.Marker');
 
diff --git a/scripts/migration/renamings.js b/scripts/migration/renamings.js
index 3d6813d63..9423c54eb 100644
--- a/scripts/migration/renamings.js
+++ b/scripts/migration/renamings.js
@@ -116,6 +116,8 @@ const renamings = {
     },
     'Blockly.connectionTypes': {
       module: 'Blockly.ConnectionType',
+      export: 'ConnectionType',  // Previous default export now named.
+      path: 'Blockly.ConnectionType',  // Type reexported directly.
     },
     'Blockly.utils': {
       exports: {
diff --git a/tests/deps.js b/tests/deps.js
index 3a8cef8ad..e69de29bb 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -1,264 +0,0 @@
-goog.addDependency('../../blocks/colour.js', ['Blockly.Blocks.colour', 'Blockly.Constants.Colour'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldColour', 'Blockly.FieldLabel']);
-goog.addDependency('../../blocks/lists.js', ['Blockly.Constants.Lists'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator'], {'lang': 'es5'});
-goog.addDependency('../../blocks/logic.js', ['Blockly.Blocks.logic', 'Blockly.Constants.Logic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator']);
-goog.addDependency('../../blocks/loops.js', ['Blockly.Blocks.loops', 'Blockly.Constants.Loops'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable', 'Blockly.Warning']);
-goog.addDependency('../../blocks/math.js', ['Blockly.Blocks.math', 'Blockly.Constants.Math'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable'], {'lang': 'es5'});
-goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'], ['Blockly', 'Blockly.Blocks', 'Blockly.Comment', 'Blockly.FieldCheckbox', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.Mutator', 'Blockly.Warning'], {'lang': 'es6'});
-goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator'], {'lang': 'es5'});
-goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
-goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
-goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.common', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-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.ConnectionType', '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.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.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Blocks', '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.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.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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.geras', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', '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'});
-goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/bump_objects.js', ['Blockly.bumpObjects'], ['Blockly.Events', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Xml', 'Blockly.constants', 'Blockly.serialization.blocks', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.ConnectionType', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_type.js', ['Blockly.ConnectionType'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.dialog', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/dialog.js', ['Blockly.dialog'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils.deprecation', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.BlockBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_comment_base.js', ['Blockly.Events.CommentBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_comment_change.js', ['Blockly.Events.CommentChange'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_comment_create.js', ['Blockly.Events.CommentCreate'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_comment_delete.js', ['Blockly.Events.CommentDelete'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_comment_move.js', ['Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_ui.js', ['Blockly.Events.Ui'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_ui_base.js', ['Blockly.Events.UiBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_var_base.js', ['Blockly.Events.VarBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_var_create.js', ['Blockly.Events.VarCreate'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.VarDelete'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['Blockly.DropDownDiv', 'Blockly.Field', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabelSerializable'], ['Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.common', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.ConnectionType'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_collapsible_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_copyable.js', ['Blockly.ICopyable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_deletable.js', ['Blockly.IDeletable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_keyboard_accessible.js', ['Blockly.IKeyboardAccessible'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_selectable_toolbox_item.js', ['Blockly.ISelectableToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_serializer.js', ['Blockly.serialization.ISerializer'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.IToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstants'], ['Blockly.ConnectionType'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.ConnectionType', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], [], {'lang': 'es6', 'module': 'goog'});
-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.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/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', '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', 'Blockly.internalConstants'], {'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'});
-goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.Connection', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Renderer', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.blockRendering.debug', 'Blockly.registry', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/debug.js', ['Blockly.blockRendering.debug'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.ConnectionType', 'Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Types', 'Blockly.blockRendering.debug', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.debug', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.blockRendering.debug', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/geras.js', ['Blockly.geras'], ['Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.Highlighter', 'Blockly.geras.InlineInput', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.geras.Renderer', 'Blockly.geras.StatementInput'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/measurables/inline_input.js', ['Blockly.geras.InlineInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/measurables/statement_input.js', ['Blockly.geras.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/bottom_row.js', ['Blockly.blockRendering.BottomRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/connection.js', ['Blockly.blockRendering.Connection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/external_value_input.js', ['Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/field.js', ['Blockly.blockRendering.Field'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/hat.js', ['Blockly.blockRendering.Hat'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/icon.js', ['Blockly.blockRendering.Icon'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/in_row_spacer.js', ['Blockly.blockRendering.InRowSpacer'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/inline_input.js', ['Blockly.blockRendering.InlineInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/input_connection.js', ['Blockly.blockRendering.InputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/input_row.js', ['Blockly.blockRendering.InputRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/jagged_edge.js', ['Blockly.blockRendering.JaggedEdge'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/next_connection.js', ['Blockly.blockRendering.NextConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/output_connection.js', ['Blockly.blockRendering.OutputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/previous_connection.js', ['Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/round_corner.js', ['Blockly.blockRendering.RoundCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/row.js', ['Blockly.blockRendering.Row'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/spacer_row.js', ['Blockly.blockRendering.SpacerRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/square_corner.js', ['Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/top_row.js', ['Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist.RenderInfo'], ['Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/minimalist/minimalist.js', ['Blockly.minimalist'], ['Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.minimalist.Renderer'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/thrasos/thrasos.js', ['Blockly.thrasos'], ['Blockly.thrasos.RenderInfo', 'Blockly.thrasos.Renderer'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.blockRendering.ConstantProvider', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.blockRendering.debug', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.StatementInput', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/measurables/bottom_row.js', ['Blockly.zelos.BottomRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/zelos.js', ['Blockly.zelos'], ['Blockly.zelos.BottomRow', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo', 'Blockly.zelos.Renderer', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.StatementInput', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.registry', 'Blockly.serialization.variables', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
-goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes', 'Blockly.serialization.ISerializer', 'Blockly.serialization.exceptions', 'Blockly.serialization.priorities', 'Blockly.serialization.registry', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/exceptions.js', ['Blockly.serialization.exceptions'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/priorities.js', ['Blockly.serialization.priorities'], [], {'module': 'goog'});
-goog.addDependency('../../core/serialization/registry.js', ['Blockly.serialization.registry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.serialization.ISerializer', 'Blockly.serialization.priorities', 'Blockly.serialization.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Events', 'Blockly.Workspace', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/theme/themes.js', ['Blockly.Themes'], ['Blockly.Themes.Classic', 'Blockly.Themes.Zelos'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], ['Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], [], {'module': 'goog'});
-goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.idGenerator'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Blockly.utils.Coordinate', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.dialog', 'Blockly.utils', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.dialog', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.idGenerator', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils.Coordinate', 'Blockly.utils.idGenerator', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.common', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.Tooltip', 'Blockly.TouchGesture', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('base.js', [], []);
-
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index b5aa955f9..e69de29bb 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -1,378 +0,0 @@
-goog.addDependency('../../blocks/colour.js', ['Blockly.Blocks.colour', 'Blockly.Constants.Colour'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldColour', 'Blockly.FieldLabel']);
-goog.addDependency('../../blocks/lists.js', ['Blockly.Constants.Lists'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator'], {'lang': 'es5'});
-goog.addDependency('../../blocks/logic.js', ['Blockly.Blocks.logic', 'Blockly.Constants.Logic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator']);
-goog.addDependency('../../blocks/loops.js', ['Blockly.Blocks.loops', 'Blockly.Constants.Loops'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable', 'Blockly.Warning']);
-goog.addDependency('../../blocks/math.js', ['Blockly.Blocks.math', 'Blockly.Constants.Math'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable'], {'lang': 'es5'});
-goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'], ['Blockly', 'Blockly.Blocks', 'Blockly.Comment', 'Blockly.FieldCheckbox', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.Mutator', 'Blockly.Warning'], {'lang': 'es6'});
-goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator'], {'lang': 'es5'});
-goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
-goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
-goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.common', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-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.ConnectionType', '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.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.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Blocks', '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.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.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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.geras', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', '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'});
-goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/bump_objects.js', ['Blockly.bumpObjects'], ['Blockly.Events', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Xml', 'Blockly.constants', 'Blockly.serialization.blocks', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.ConnectionType', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_type.js', ['Blockly.ConnectionType'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.dialog', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/dialog.js', ['Blockly.dialog'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils.deprecation', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.BlockBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_comment_base.js', ['Blockly.Events.CommentBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_comment_change.js', ['Blockly.Events.CommentChange'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_comment_create.js', ['Blockly.Events.CommentCreate'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_comment_delete.js', ['Blockly.Events.CommentDelete'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_comment_move.js', ['Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_ui.js', ['Blockly.Events.Ui'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_ui_base.js', ['Blockly.Events.UiBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_var_base.js', ['Blockly.Events.VarBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_var_create.js', ['Blockly.Events.VarCreate'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.VarDelete'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['Blockly.DropDownDiv', 'Blockly.Field', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabelSerializable'], ['Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.common', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.ConnectionType'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_collapsible_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_copyable.js', ['Blockly.ICopyable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_deletable.js', ['Blockly.IDeletable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_keyboard_accessible.js', ['Blockly.IKeyboardAccessible'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_selectable_toolbox_item.js', ['Blockly.ISelectableToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_serializer.js', ['Blockly.serialization.ISerializer'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.IToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstants'], ['Blockly.ConnectionType'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.ConnectionType', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], [], {'lang': 'es6', 'module': 'goog'});
-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.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/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', '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', 'Blockly.internalConstants'], {'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'});
-goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.Connection', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Renderer', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.blockRendering.debug', 'Blockly.registry', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/debug.js', ['Blockly.blockRendering.debug'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.ConnectionType', 'Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Types', 'Blockly.blockRendering.debug', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.debug', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.blockRendering.debug', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/geras.js', ['Blockly.geras'], ['Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.Highlighter', 'Blockly.geras.InlineInput', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.geras.Renderer', 'Blockly.geras.StatementInput'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/measurables/inline_input.js', ['Blockly.geras.InlineInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/measurables/statement_input.js', ['Blockly.geras.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/bottom_row.js', ['Blockly.blockRendering.BottomRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/connection.js', ['Blockly.blockRendering.Connection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/external_value_input.js', ['Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/field.js', ['Blockly.blockRendering.Field'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/hat.js', ['Blockly.blockRendering.Hat'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/icon.js', ['Blockly.blockRendering.Icon'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/in_row_spacer.js', ['Blockly.blockRendering.InRowSpacer'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/inline_input.js', ['Blockly.blockRendering.InlineInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/input_connection.js', ['Blockly.blockRendering.InputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/input_row.js', ['Blockly.blockRendering.InputRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/jagged_edge.js', ['Blockly.blockRendering.JaggedEdge'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/next_connection.js', ['Blockly.blockRendering.NextConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/output_connection.js', ['Blockly.blockRendering.OutputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/previous_connection.js', ['Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/round_corner.js', ['Blockly.blockRendering.RoundCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/row.js', ['Blockly.blockRendering.Row'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/spacer_row.js', ['Blockly.blockRendering.SpacerRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/square_corner.js', ['Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/top_row.js', ['Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist.RenderInfo'], ['Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/minimalist/minimalist.js', ['Blockly.minimalist'], ['Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.minimalist.Renderer'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/thrasos/thrasos.js', ['Blockly.thrasos'], ['Blockly.thrasos.RenderInfo', 'Blockly.thrasos.Renderer'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.blockRendering.ConstantProvider', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.blockRendering.debug', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.StatementInput', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/measurables/bottom_row.js', ['Blockly.zelos.BottomRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/zelos/zelos.js', ['Blockly.zelos'], ['Blockly.zelos.BottomRow', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo', 'Blockly.zelos.Renderer', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.StatementInput', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.registry', 'Blockly.serialization.variables', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
-goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes', 'Blockly.serialization.ISerializer', 'Blockly.serialization.exceptions', 'Blockly.serialization.priorities', 'Blockly.serialization.registry', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/exceptions.js', ['Blockly.serialization.exceptions'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/priorities.js', ['Blockly.serialization.priorities'], [], {'module': 'goog'});
-goog.addDependency('../../core/serialization/registry.js', ['Blockly.serialization.registry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.serialization.ISerializer', 'Blockly.serialization.priorities', 'Blockly.serialization.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Events', 'Blockly.Workspace', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/theme/themes.js', ['Blockly.Themes'], ['Blockly.Themes.Classic', 'Blockly.Themes.Zelos'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], ['Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], [], {'module': 'goog'});
-goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.idGenerator'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Blockly.utils.Coordinate', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.dialog', 'Blockly.utils', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.dialog', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.idGenerator', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils.Coordinate', 'Blockly.utils.idGenerator', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.common', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.Tooltip', 'Blockly.TouchGesture', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../generators/dart.js', ['Blockly.Dart'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.string']);
-goog.addDependency('../../generators/dart/colour.js', ['Blockly.Dart.colour'], ['Blockly.Dart']);
-goog.addDependency('../../generators/dart/lists.js', ['Blockly.Dart.lists'], ['Blockly.Dart']);
-goog.addDependency('../../generators/dart/logic.js', ['Blockly.Dart.logic'], ['Blockly.Dart']);
-goog.addDependency('../../generators/dart/loops.js', ['Blockly.Dart.loops'], ['Blockly.Dart']);
-goog.addDependency('../../generators/dart/math.js', ['Blockly.Dart.math'], ['Blockly.Dart']);
-goog.addDependency('../../generators/dart/procedures.js', ['Blockly.Dart.procedures'], ['Blockly.Dart']);
-goog.addDependency('../../generators/dart/text.js', ['Blockly.Dart.texts'], ['Blockly.Dart']);
-goog.addDependency('../../generators/dart/variables.js', ['Blockly.Dart.variables'], ['Blockly.Dart']);
-goog.addDependency('../../generators/dart/variables_dynamic.js', ['Blockly.Dart.variablesDynamic'], ['Blockly.Dart', 'Blockly.Dart.variables']);
-goog.addDependency('../../generators/javascript.js', ['Blockly.JavaScript'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.global', 'Blockly.utils.object', 'Blockly.utils.string']);
-goog.addDependency('../../generators/javascript/colour.js', ['Blockly.JavaScript.colour'], ['Blockly.JavaScript']);
-goog.addDependency('../../generators/javascript/lists.js', ['Blockly.JavaScript.lists'], ['Blockly.JavaScript']);
-goog.addDependency('../../generators/javascript/logic.js', ['Blockly.JavaScript.logic'], ['Blockly.JavaScript']);
-goog.addDependency('../../generators/javascript/loops.js', ['Blockly.JavaScript.loops'], ['Blockly.JavaScript']);
-goog.addDependency('../../generators/javascript/math.js', ['Blockly.JavaScript.math'], ['Blockly.JavaScript']);
-goog.addDependency('../../generators/javascript/procedures.js', ['Blockly.JavaScript.procedures'], ['Blockly.JavaScript']);
-goog.addDependency('../../generators/javascript/text.js', ['Blockly.JavaScript.texts'], ['Blockly.JavaScript']);
-goog.addDependency('../../generators/javascript/variables.js', ['Blockly.JavaScript.variables'], ['Blockly.JavaScript']);
-goog.addDependency('../../generators/javascript/variables_dynamic.js', ['Blockly.JavaScript.variablesDynamic'], ['Blockly.JavaScript', 'Blockly.JavaScript.variables']);
-goog.addDependency('../../generators/lua.js', ['Blockly.Lua'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.utils.string']);
-goog.addDependency('../../generators/lua/colour.js', ['Blockly.Lua.colour'], ['Blockly.Lua']);
-goog.addDependency('../../generators/lua/lists.js', ['Blockly.Lua.lists'], ['Blockly.Lua']);
-goog.addDependency('../../generators/lua/logic.js', ['Blockly.Lua.logic'], ['Blockly.Lua']);
-goog.addDependency('../../generators/lua/loops.js', ['Blockly.Lua.loops'], ['Blockly.Lua']);
-goog.addDependency('../../generators/lua/math.js', ['Blockly.Lua.math'], ['Blockly.Lua']);
-goog.addDependency('../../generators/lua/procedures.js', ['Blockly.Lua.procedures'], ['Blockly.Lua']);
-goog.addDependency('../../generators/lua/text.js', ['Blockly.Lua.texts'], ['Blockly.Lua'], {'lang': 'es5'});
-goog.addDependency('../../generators/lua/variables.js', ['Blockly.Lua.variables'], ['Blockly.Lua']);
-goog.addDependency('../../generators/lua/variables_dynamic.js', ['Blockly.Lua.variablesDynamic'], ['Blockly.Lua', 'Blockly.Lua.variables']);
-goog.addDependency('../../generators/php.js', ['Blockly.PHP'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.utils.string']);
-goog.addDependency('../../generators/php/colour.js', ['Blockly.PHP.colour'], ['Blockly.PHP']);
-goog.addDependency('../../generators/php/lists.js', ['Blockly.PHP.lists'], ['Blockly.PHP']);
-goog.addDependency('../../generators/php/logic.js', ['Blockly.PHP.logic'], ['Blockly.PHP']);
-goog.addDependency('../../generators/php/loops.js', ['Blockly.PHP.loops'], ['Blockly.PHP']);
-goog.addDependency('../../generators/php/math.js', ['Blockly.PHP.math'], ['Blockly.PHP']);
-goog.addDependency('../../generators/php/procedures.js', ['Blockly.PHP.procedures'], ['Blockly.PHP']);
-goog.addDependency('../../generators/php/text.js', ['Blockly.PHP.texts'], ['Blockly.PHP']);
-goog.addDependency('../../generators/php/variables.js', ['Blockly.PHP.variables'], ['Blockly.PHP']);
-goog.addDependency('../../generators/php/variables_dynamic.js', ['Blockly.PHP.variablesDynamic'], ['Blockly.PHP', 'Blockly.PHP.variables']);
-goog.addDependency('../../generators/python.js', ['Blockly.Python'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.string']);
-goog.addDependency('../../generators/python/colour.js', ['Blockly.Python.colour'], ['Blockly.Python']);
-goog.addDependency('../../generators/python/lists.js', ['Blockly.Python.lists'], ['Blockly.Python']);
-goog.addDependency('../../generators/python/logic.js', ['Blockly.Python.logic'], ['Blockly.Python']);
-goog.addDependency('../../generators/python/loops.js', ['Blockly.Python.loops'], ['Blockly.Python']);
-goog.addDependency('../../generators/python/math.js', ['Blockly.Python.math'], ['Blockly.Python']);
-goog.addDependency('../../generators/python/procedures.js', ['Blockly.Python.procedures'], ['Blockly.Python']);
-goog.addDependency('../../generators/python/text.js', ['Blockly.Python.texts'], ['Blockly.Python']);
-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.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'});
-goog.addDependency('../../tests/mocha/block_test.js', ['Blockly.test.blocks'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/comment_test.js', ['Blockly.test.comments'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/connection_checker_test.js', ['Blockly.test.connectionChecker'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-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.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.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'});
-goog.addDependency('../../tests/mocha/field_colour_test.js', ['Blockly.test.fieldColour'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/field_dropdown_test.js', ['Blockly.test.fieldDropdown'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/field_image_test.js', ['Blockly.test.fieldImage'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/field_label_serializable_test.js', ['Blockly.test.fieldLabelSerialization'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/field_label_test.js', ['Blockly.test.fieldLabel'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/field_multilineinput_test.js', ['Blockly.test.fieldMultiline'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/field_number_test.js', ['Blockly.test.fieldNumber'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/field_registry_test.js', ['Blockly.test.fieldRegistry'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/field_test.js', ['Blockly.test.fieldTest'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/field_textinput_test.js', ['Blockly.test.fieldTextInput'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/field_variable_test.js', ['Blockly.test.fieldVariable'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/flyout_test.js', ['Blockly.test.flyout'], ['Blockly.test.helpers', 'Blockly.test.toolboxHelpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/generator_test.js', ['Blockly.test.generator'], ['Blockly.Dart', 'Blockly.JavaScript', 'Blockly.Lua', 'Blockly.PHP', 'Blockly.Python', 'Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/gesture_test.js', ['Blockly.test.gesture'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/input_test.js', ['Blockly.test.input'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/insertion_marker_test.js', ['Blockly.test.insertionMarker'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/jso_deserialization_test.js', ['Blockly.test.jsoDeserialization'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/jso_serialization_test.js', ['Blockly.test.jsoSerialization'], ['Blockly.test.helpers'], {'lang': 'es8', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/json_test.js', ['Blockly.test.json'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/keydown_test.js', ['Blockly.test.keydown'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/logic_ternary_test.js', ['Blockly.test.logicTernary'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/metrics_test.js', ['Blockly.test.metrics'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/mutator_test.js', ['Blockly.test.mutator'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/names_test.js', ['Blockly.test.names'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/procedures_test.js', ['Blockly.test.procedures'], ['Blockly.Blocks.procedures', 'Blockly.Msg', 'Blockly.test.helpers', 'Blockly.test.procedureHelpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/procedures_test_helpers.js', ['Blockly.test.procedureHelpers'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/registry_test.js', ['Blockly.test.registry'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/run_mocha_tests_in_browser.js', [], [], {'lang': 'es8'});
-goog.addDependency('../../tests/mocha/serializer_test.js', ['Blockly.test.serialization'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/shortcut_registry_test.js', ['Blockly.test.shortcutRegistry'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/test_helpers.js', ['Blockly.test.helpers'], ['Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/theme_test.js', ['Blockly.test.theme'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/toolbox_helper.js', ['Blockly.test.toolboxHelpers'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/toolbox_test.js', ['Blockly.test.toolbox'], ['Blockly.test.helpers', 'Blockly.test.toolboxHelpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/tooltip_test.js', ['Blockly.test.tooltip'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/trashcan_test.js', ['Blockly.test.trashcan'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/utils_test.js', ['Blockly.test.utils'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/variable_map_test.js', ['Blockly.test.variableMap'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/variable_model_test.js', ['Blockly.test.variableModel'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/variables_test.js', ['Blockly.test.variables'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/widget_div_test.js', ['Blockly.test.widgetDiv'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/workspace_comment_test.js', ['Blockly.test.workspaceComment'], ['Blockly.WorkspaceComment', 'Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/workspace_helpers.js', ['Blockly.test.workspaceHelpers'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/workspace_svg_test.js', ['Blockly.test.workspaceSvg'], ['Blockly.test.helpers', 'Blockly.test.workspaceHelpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/workspace_test.js', ['Blockly.test.workspace'], ['Blockly.test.helpers', 'Blockly.test.workspaceHelpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/xml_test.js', ['Blockly.test.xml'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/zoom_controls_test.js', ['Blockly.test.zoomControls'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('base.js', [], []);
-

From f931b2eb36b01b0f06137d99e4012dec04c4283b Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Fri, 24 Sep 2021 18:47:43 +0100
Subject: [PATCH 829/833] Reexport global.globalThis as Blockly.utils.global
 (#5534)

Fixes #5503

This makes the value of Blockly.utils.global the same as it was
before PR #5451.
---
 core/utils.js                  | 2 +-
 scripts/migration/renamings.js | 1 +
 scripts/package/node/core.js   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/utils.js b/core/utils.js
index a1a4d1c89..594b3ddff 100644
--- a/core/utils.js
+++ b/core/utils.js
@@ -52,7 +52,7 @@ exports.colour = colourUtils;
 exports.Coordinate = Coordinate;
 exports.deprecation = deprecation;
 exports.dom = dom;
-exports.global = global;
+exports.global = global.globalThis;
 exports.idGenerator = idGenerator;
 exports.KeyCodes = KeyCodes;
 exports.math = math;
diff --git a/scripts/migration/renamings.js b/scripts/migration/renamings.js
index 9423c54eb..d5e75d071 100644
--- a/scripts/migration/renamings.js
+++ b/scripts/migration/renamings.js
@@ -130,6 +130,7 @@ const renamings = {
     },
     'Blockly.utils.global': {
       export: 'globalThis',  // Previous default export now named.
+      path: 'Blockly.utils.global',  // But still exported under original name.
     },
     'Blockly.utils.IdGenerator': {
       module: 'Blockly.utils.idGenerator',
diff --git a/scripts/package/node/core.js b/scripts/package/node/core.js
index 35e063b91..9692855d3 100644
--- a/scripts/package/node/core.js
+++ b/scripts/package/node/core.js
@@ -22,7 +22,7 @@ Blockly.setLocale = function (locale) {
 
 // Override textToDomDocument and provide Node.js alternatives to DOMParser and
 // XMLSerializer.
-const globalThis = Blockly.utils.global.globalThis;
+const globalThis = Blockly.utils.global;
 if (typeof globalThis.document !== 'object') {
   const jsdom = require('jsdom/lib/jsdom/living');
   globalThis.DOMParser = jsdom.DOMParser;

From 16b6d4526a296ed2e80041effff5b4896e35d6db Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Fri, 24 Sep 2021 19:12:03 +0100
Subject: [PATCH 830/833] refactor: Rename `Blockly.Blocks`, migrate to named
 exports (#5515)

* Rename Blockly.Blocks to Blockly.blocks
  Because it does not export a type as its default export.

  Part of #5073.

* Name default export of Blockly.blocks Blocks.

  Use named exports in Blockly.blocks by giving the former default
  export the name Blocks.

  Part of #5153.

* Reexport Blockly.blocks from blockly.js

* Document the format of renamings.js better.
---
 blocks/colour.js               |   1 -
 blocks/lists.js                |   1 -
 blocks/logic.js                |   1 -
 blocks/loops.js                |   1 -
 blocks/math.js                 |   1 -
 blocks/procedures.js           |   1 -
 blocks/text.js                 |   1 -
 blocks/variables.js            |   1 -
 blocks/variables_dynamic.js    |   1 -
 core/block.js                  |   2 +-
 core/blockly.js                |   8 +-
 core/blocks.js                 |   6 +-
 core/procedures.js             |   2 +-
 core/variables.js              |   2 +-
 core/variables_dynamic.js      |   2 +-
 externs/block-externs.js       |   2 +-
 scripts/migration/renamings.js |  63 ++++++
 tests/deps.js                  | 264 +++++++++++++++++++++++
 tests/deps.mocha.js            | 378 +++++++++++++++++++++++++++++++++
 tests/mocha/block_test.js      |   3 +-
 tests/mocha/procedures_test.js |   2 +-
 tests/mocha/test_helpers.js    |   3 +-
 22 files changed, 723 insertions(+), 23 deletions(-)

diff --git a/blocks/colour.js b/blocks/colour.js
index 9ab3acb95..3e697c174 100644
--- a/blocks/colour.js
+++ b/blocks/colour.js
@@ -19,7 +19,6 @@ goog.provide('Blockly.Blocks.colour');  // Deprecated
 goog.provide('Blockly.Constants.Colour');
 
 goog.require('Blockly');
-goog.require('Blockly.Blocks');
 goog.require('Blockly.FieldColour');
 goog.require('Blockly.FieldLabel');
 
diff --git a/blocks/lists.js b/blocks/lists.js
index 00dedd555..5aa43b269 100644
--- a/blocks/lists.js
+++ b/blocks/lists.js
@@ -18,7 +18,6 @@
 goog.provide('Blockly.Constants.Lists');
 
 goog.require('Blockly');
-goog.require('Blockly.Blocks');
 goog.require('Blockly.FieldDropdown');
 goog.require('Blockly.FieldLabel');
 goog.require('Blockly.Mutator');
diff --git a/blocks/logic.js b/blocks/logic.js
index 19112e18a..a00fdba0a 100644
--- a/blocks/logic.js
+++ b/blocks/logic.js
@@ -19,7 +19,6 @@ goog.provide('Blockly.Blocks.logic');  // Deprecated
 goog.provide('Blockly.Constants.Logic');
 
 goog.require('Blockly');
-goog.require('Blockly.Blocks');
 goog.require('Blockly.FieldDropdown');
 goog.require('Blockly.FieldLabel');
 goog.require('Blockly.Mutator');
diff --git a/blocks/loops.js b/blocks/loops.js
index 6e7ad1997..cbb76b59e 100644
--- a/blocks/loops.js
+++ b/blocks/loops.js
@@ -19,7 +19,6 @@ goog.provide('Blockly.Blocks.loops');  // Deprecated
 goog.provide('Blockly.Constants.Loops');
 
 goog.require('Blockly');
-goog.require('Blockly.Blocks');
 goog.require('Blockly.FieldDropdown');
 goog.require('Blockly.FieldLabel');
 goog.require('Blockly.FieldNumber');
diff --git a/blocks/math.js b/blocks/math.js
index d86da5d5d..62eb81337 100644
--- a/blocks/math.js
+++ b/blocks/math.js
@@ -19,7 +19,6 @@ goog.provide('Blockly.Blocks.math');  // Deprecated
 goog.provide('Blockly.Constants.Math');
 
 goog.require('Blockly');
-goog.require('Blockly.Blocks');
 goog.require('Blockly.FieldDropdown');
 goog.require('Blockly.FieldLabel');
 goog.require('Blockly.FieldNumber');
diff --git a/blocks/procedures.js b/blocks/procedures.js
index 4e3327d62..34697ce50 100644
--- a/blocks/procedures.js
+++ b/blocks/procedures.js
@@ -13,7 +13,6 @@
 goog.provide('Blockly.Blocks.procedures');
 
 goog.require('Blockly');
-goog.require('Blockly.Blocks');
 goog.require('Blockly.Comment');
 goog.require('Blockly.FieldCheckbox');
 goog.require('Blockly.FieldLabel');
diff --git a/blocks/text.js b/blocks/text.js
index 2738c047f..a226752e1 100644
--- a/blocks/text.js
+++ b/blocks/text.js
@@ -14,7 +14,6 @@ goog.provide('Blockly.Blocks.texts');  // Deprecated
 goog.provide('Blockly.Constants.Text');
 
 goog.require('Blockly');
-goog.require('Blockly.Blocks');
 goog.require('Blockly.FieldDropdown');
 goog.require('Blockly.FieldImage');
 goog.require('Blockly.FieldMultilineInput');
diff --git a/blocks/variables.js b/blocks/variables.js
index 65967f921..aabc9ec51 100644
--- a/blocks/variables.js
+++ b/blocks/variables.js
@@ -19,7 +19,6 @@ goog.provide('Blockly.Blocks.variables');  // Deprecated.
 goog.provide('Blockly.Constants.Variables');
 
 goog.require('Blockly');
-goog.require('Blockly.Blocks');
 goog.require('Blockly.FieldLabel');
 goog.require('Blockly.FieldVariable');
 
diff --git a/blocks/variables_dynamic.js b/blocks/variables_dynamic.js
index de9a364fd..041d1144a 100644
--- a/blocks/variables_dynamic.js
+++ b/blocks/variables_dynamic.js
@@ -18,7 +18,6 @@
 goog.provide('Blockly.Constants.VariablesDynamic');
 
 goog.require('Blockly');
-goog.require('Blockly.Blocks');
 goog.require('Blockly.FieldLabel');
 goog.require('Blockly.FieldVariable');
 
diff --git a/core/block.js b/core/block.js
index d4ba8cd00..f83f43180 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 Blocks = goog.require('Blockly.Blocks');
 /* eslint-disable-next-line no-unused-vars */
 const Comment = goog.requireType('Blockly.Comment');
 const Connection = goog.require('Blockly.Connection');
@@ -44,6 +43,7 @@ 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');
 const {ConnectionType} = goog.require('Blockly.ConnectionType');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
diff --git a/core/blockly.js b/core/blockly.js
index ae6957341..4ccb0fbb9 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -18,7 +18,6 @@ goog.module('Blockly');
 goog.module.declareLegacyNamespace();
 
 const BlocklyOptions = goog.require('Blockly.BlocklyOptions');
-const Blocks = goog.require('Blockly.Blocks');
 const Bubble = goog.require('Blockly.Bubble');
 const BubbleDragger = goog.require('Blockly.BubbleDragger');
 const CollapsibleToolboxCategory = goog.require('Blockly.CollapsibleToolboxCategory');
@@ -150,12 +149,13 @@ const toolbox = goog.require('Blockly.utils.toolbox');
 const uiPosition = goog.require('Blockly.uiPosition');
 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 {BlockSvg} = goog.require('Blockly.BlockSvg');
-const {ASTNode} = goog.require('Blockly.ASTNode');
-const {BasicCursor} = goog.require('Blockly.BasicCursor');
+const {Blocks} = goog.require('Blockly.blocks');
 const {ConnectionType} = goog.require('Blockly.ConnectionType');
 const {Cursor} = goog.require('Blockly.Cursor');
 /** @suppress {extraRequire} */
@@ -532,6 +532,7 @@ exports.DELETE_VARIABLE_ID = internalConstants.DELETE_VARIABLE_ID;
 exports.COLLAPSED_INPUT_NAME = constants.COLLAPSED_INPUT_NAME;
 exports.COLLAPSED_FIELD_NAME = constants.COLLAPSED_FIELD_NAME;
 
+// Re-export submodules that no longer declareLegacyNamespace.
 exports.ASTNode = ASTNode;
 exports.BasicCursor = BasicCursor;
 exports.Block = Block;
@@ -539,6 +540,7 @@ exports.BlocklyOptions = BlocklyOptions;
 exports.BlockDragger = BlockDragger;
 exports.BlockDragSurfaceSvg = BlockDragSurfaceSvg;
 exports.BlockSvg = BlockSvg;
+exports.Blocks = Blocks;
 exports.Bubble = Bubble;
 exports.BubbleDragger = BubbleDragger;
 exports.CollapsibleToolboxCategory = CollapsibleToolboxCategory;
diff --git a/core/blocks.js b/core/blocks.js
index 37c2105ce..7bd3362ea 100644
--- a/core/blocks.js
+++ b/core/blocks.js
@@ -14,8 +14,8 @@
  * A mapping of block type names to block prototype objects.
  * @name Blockly.Blocks
  */
-goog.module('Blockly.Blocks');
-goog.module.declareLegacyNamespace();
+goog.module('Blockly.blocks');
+
 
 /**
  * A mapping of block type names to block prototype objects.
@@ -23,4 +23,4 @@ goog.module.declareLegacyNamespace();
  */
 const Blocks = Object.create(null);
 
-exports = Blocks;
+exports.Blocks = Blocks;
diff --git a/core/procedures.js b/core/procedures.js
index e80f04b5b..ff15b4dcf 100644
--- a/core/procedures.js
+++ b/core/procedures.js
@@ -18,7 +18,6 @@ goog.module('Blockly.Procedures');
 
 /* eslint-disable-next-line no-unused-vars */
 const Abstract = goog.requireType('Blockly.Events.Abstract');
-const Blocks = goog.require('Blockly.Blocks');
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.Field');
@@ -32,6 +31,7 @@ const Xml = goog.require('Blockly.Xml');
 const utilsXml = goog.require('Blockly.utils.xml');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+const {Blocks} = goog.require('Blockly.blocks');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 
diff --git a/core/variables.js b/core/variables.js
index 5b83620d8..fe121c3cb 100644
--- a/core/variables.js
+++ b/core/variables.js
@@ -16,7 +16,6 @@
  */
 goog.module('Blockly.Variables');
 
-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 */
@@ -24,6 +23,7 @@ const Workspace = goog.requireType('Blockly.Workspace');
 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');
 
 
 /**
diff --git a/core/variables_dynamic.js b/core/variables_dynamic.js
index 64969b85c..051f00774 100644
--- a/core/variables_dynamic.js
+++ b/core/variables_dynamic.js
@@ -13,13 +13,13 @@
 
 goog.module('Blockly.VariablesDynamic');
 
-const Blocks = goog.require('Blockly.Blocks');
 const Msg = goog.require('Blockly.Msg');
 const VariableModel = goog.require('Blockly.VariableModel');
 const Variables = goog.require('Blockly.Variables');
 /* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
 const xml = goog.require('Blockly.utils.xml');
+const {Blocks} = goog.require('Blockly.blocks');
 
 
 const onCreateVariableButtonClick_String = function(button) {
diff --git a/externs/block-externs.js b/externs/block-externs.js
index 870fbd5a5..d270a4da7 100644
--- a/externs/block-externs.js
+++ b/externs/block-externs.js
@@ -24,4 +24,4 @@ goog.provide('Blockly.FieldVariable');
 goog.provide('Blockly.Mutator');
 goog.provide('Blockly.Warning');
 
-var Blockly;
\ No newline at end of file
+var Blockly;
diff --git a/scripts/migration/renamings.js b/scripts/migration/renamings.js
index d5e75d071..6b7553546 100644
--- a/scripts/migration/renamings.js
+++ b/scripts/migration/renamings.js
@@ -20,6 +20,64 @@
  * @type {Object<string, ?>}
  */
 const renamings = {
+  // Example entry:
+  '0.0.0': {  // These renaming were made after version 0.0.0 was published.
+    // Each entry is keyed by the original module name.
+    'module.name.Old': {
+      // If the module has been renamed, its new name will be listed.
+      module: 'module.name.new',
+
+      // Modules which had a default export that has been turned into
+      // a named export the new name will be given.
+      export: 'defaultName',
+
+      // For backward-compatibility reasons, we may choose to continue
+      // to reexport default exports in the same place in the Blockly
+      // tree that they were previously (or nearby).  If so, the full
+      // path to the former default export will be listed.  This path
+      // is only relevant to code that accesses the export via the
+      // namespace tree rather than by a named import.
+      //
+      // The given example implies that:
+      //     module.name.Old ===
+      //         goog.require('module.name.new').defaultExport
+      // which may not be what what one expects but is very handy.
+      path: 'module.name.Old',
+      // If path is not given explicitly then it can be assumed to be
+      // `${module}.${export}`.
+
+      // Modules which already had named exports can instead list
+      // information about exports which have been renamed or moved in
+      // the exports subsection, which is a map from old export name
+      // to object with info about the new export name.
+      exports: {
+        oldExportName: {  // No need to quote this.
+
+          // If the export has been moved to a different module, that
+          // module is listed.
+          module: 'module.name.other',
+
+          // If the export has been given a new name, that is listed.
+          export: 'newExportName',
+
+          // As with default exports, if a named export has been
+          // reexported on the namespace tree somewhere other than at
+          // `${module}.${export}` then that can specified explicitly.
+          path: 'module.name.Old.oldExportName',
+          // This given example implies that code that previously
+          // accessed this export via module.name.Old.oldExportName
+          // can continue to do so; only code using named requires
+          // needs to update from
+          //      goog.require('module.name.Old').oldExportName
+          // to
+          //      goog.require('module.name.new').newExportName
+        },
+        // More individual exports in this module can be listed here.
+      },
+    },
+    // More modules with renamings can be listed here.
+  },
+
   '4.20201217.0': {
     'Blockly': {
       exports: {
@@ -93,6 +151,11 @@ const renamings = {
         },
       },
     },
+    'Blockly.Blocks': {
+      module: 'Blockly.blocks',
+      export: 'Blocks',  // Previous default export now named.
+      path: 'Blockly.Blocks',  // But still on tree with original name.
+    },
     'Blockly.ContextMenu': {
       exports: {
         currentBlock: {get: 'getCurrentBlock', set: 'setCurrentBlock'},
diff --git a/tests/deps.js b/tests/deps.js
index e69de29bb..892ccb970 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -0,0 +1,264 @@
+goog.addDependency('../../blocks/colour.js', ['Blockly.Blocks.colour', 'Blockly.Constants.Colour'], ['Blockly', 'Blockly.FieldColour', 'Blockly.FieldLabel']);
+goog.addDependency('../../blocks/lists.js', ['Blockly.Constants.Lists'], ['Blockly', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator'], {'lang': 'es5'});
+goog.addDependency('../../blocks/logic.js', ['Blockly.Blocks.logic', 'Blockly.Constants.Logic'], ['Blockly', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator']);
+goog.addDependency('../../blocks/loops.js', ['Blockly.Blocks.loops', 'Blockly.Constants.Loops'], ['Blockly', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable', 'Blockly.Warning']);
+goog.addDependency('../../blocks/math.js', ['Blockly.Blocks.math', 'Blockly.Constants.Math'], ['Blockly', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable'], {'lang': 'es5'});
+goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'], ['Blockly', 'Blockly.Comment', 'Blockly.FieldCheckbox', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.Mutator', 'Blockly.Warning'], {'lang': 'es6'});
+goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator'], {'lang': 'es5'});
+goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
+goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
+goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.blocks', 'Blockly.common', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+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.ConnectionType', '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.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.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.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.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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.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.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', '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'});
+goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/bump_objects.js', ['Blockly.bumpObjects'], ['Blockly.Events', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Xml', 'Blockly.constants', 'Blockly.serialization.blocks', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.ConnectionType', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_type.js', ['Blockly.ConnectionType'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.dialog', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/dialog.js', ['Blockly.dialog'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils.deprecation', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.BlockBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_base.js', ['Blockly.Events.CommentBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_change.js', ['Blockly.Events.CommentChange'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_create.js', ['Blockly.Events.CommentCreate'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_delete.js', ['Blockly.Events.CommentDelete'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_move.js', ['Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_ui.js', ['Blockly.Events.Ui'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_ui_base.js', ['Blockly.Events.UiBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_base.js', ['Blockly.Events.VarBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_create.js', ['Blockly.Events.VarCreate'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.VarDelete'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['Blockly.DropDownDiv', 'Blockly.Field', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabelSerializable'], ['Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.common', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.ConnectionType'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_collapsible_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_copyable.js', ['Blockly.ICopyable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_deletable.js', ['Blockly.IDeletable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_keyboard_accessible.js', ['Blockly.IKeyboardAccessible'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_selectable_toolbox_item.js', ['Blockly.ISelectableToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_serializer.js', ['Blockly.serialization.ISerializer'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.IToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstants'], ['Blockly.ConnectionType'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.ConnectionType', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], [], {'lang': 'es6', 'module': 'goog'});
+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.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/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', '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', 'Blockly.internalConstants'], {'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'});
+goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.blocks', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.Connection', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Renderer', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.blockRendering.debug', 'Blockly.registry', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/debug.js', ['Blockly.blockRendering.debug'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.ConnectionType', 'Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Types', 'Blockly.blockRendering.debug', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.debug', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.blockRendering.debug', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/geras.js', ['Blockly.geras'], ['Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.Highlighter', 'Blockly.geras.InlineInput', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.geras.Renderer', 'Blockly.geras.StatementInput'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/measurables/inline_input.js', ['Blockly.geras.InlineInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/measurables/statement_input.js', ['Blockly.geras.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/bottom_row.js', ['Blockly.blockRendering.BottomRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/connection.js', ['Blockly.blockRendering.Connection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/external_value_input.js', ['Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/field.js', ['Blockly.blockRendering.Field'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/hat.js', ['Blockly.blockRendering.Hat'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/icon.js', ['Blockly.blockRendering.Icon'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/in_row_spacer.js', ['Blockly.blockRendering.InRowSpacer'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/inline_input.js', ['Blockly.blockRendering.InlineInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/input_connection.js', ['Blockly.blockRendering.InputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/input_row.js', ['Blockly.blockRendering.InputRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/jagged_edge.js', ['Blockly.blockRendering.JaggedEdge'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/next_connection.js', ['Blockly.blockRendering.NextConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/output_connection.js', ['Blockly.blockRendering.OutputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/previous_connection.js', ['Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/round_corner.js', ['Blockly.blockRendering.RoundCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/row.js', ['Blockly.blockRendering.Row'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/spacer_row.js', ['Blockly.blockRendering.SpacerRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/square_corner.js', ['Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/top_row.js', ['Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist.RenderInfo'], ['Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/minimalist/minimalist.js', ['Blockly.minimalist'], ['Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.minimalist.Renderer'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/thrasos/thrasos.js', ['Blockly.thrasos'], ['Blockly.thrasos.RenderInfo', 'Blockly.thrasos.Renderer'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.blockRendering.ConstantProvider', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.blockRendering.debug', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.StatementInput', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/measurables/bottom_row.js', ['Blockly.zelos.BottomRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/zelos.js', ['Blockly.zelos'], ['Blockly.zelos.BottomRow', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo', 'Blockly.zelos.Renderer', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.StatementInput', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.registry', 'Blockly.serialization.variables', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
+goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes', 'Blockly.serialization.ISerializer', 'Blockly.serialization.exceptions', 'Blockly.serialization.priorities', 'Blockly.serialization.registry', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/exceptions.js', ['Blockly.serialization.exceptions'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/priorities.js', ['Blockly.serialization.priorities'], [], {'module': 'goog'});
+goog.addDependency('../../core/serialization/registry.js', ['Blockly.serialization.registry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.serialization.ISerializer', 'Blockly.serialization.priorities', 'Blockly.serialization.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Events', 'Blockly.Workspace', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme/themes.js', ['Blockly.Themes'], ['Blockly.Themes.Classic', 'Blockly.Themes.Zelos'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], ['Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], [], {'module': 'goog'});
+goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.idGenerator'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Blockly.utils.Coordinate', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.dialog', 'Blockly.utils', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.blocks', 'Blockly.dialog', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.blocks', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.idGenerator', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils.Coordinate', 'Blockly.utils.idGenerator', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.common', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.Tooltip', 'Blockly.TouchGesture', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('base.js', [], []);
+
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index e69de29bb..7784cd000 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -0,0 +1,378 @@
+goog.addDependency('../../blocks/colour.js', ['Blockly.Blocks.colour', 'Blockly.Constants.Colour'], ['Blockly', 'Blockly.FieldColour', 'Blockly.FieldLabel']);
+goog.addDependency('../../blocks/lists.js', ['Blockly.Constants.Lists'], ['Blockly', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator'], {'lang': 'es5'});
+goog.addDependency('../../blocks/logic.js', ['Blockly.Blocks.logic', 'Blockly.Constants.Logic'], ['Blockly', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator']);
+goog.addDependency('../../blocks/loops.js', ['Blockly.Blocks.loops', 'Blockly.Constants.Loops'], ['Blockly', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable', 'Blockly.Warning']);
+goog.addDependency('../../blocks/math.js', ['Blockly.Blocks.math', 'Blockly.Constants.Math'], ['Blockly', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable'], {'lang': 'es5'});
+goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'], ['Blockly', 'Blockly.Comment', 'Blockly.FieldCheckbox', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.Mutator', 'Blockly.Warning'], {'lang': 'es6'});
+goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator'], {'lang': 'es5'});
+goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
+goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
+goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.blocks', 'Blockly.common', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+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.ConnectionType', '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.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.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.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.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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.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.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', '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'});
+goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/bump_objects.js', ['Blockly.bumpObjects'], ['Blockly.Events', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Xml', 'Blockly.constants', 'Blockly.serialization.blocks', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.ConnectionType', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_type.js', ['Blockly.ConnectionType'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.dialog', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/dialog.js', ['Blockly.dialog'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils.deprecation', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.BlockBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_base.js', ['Blockly.Events.CommentBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_change.js', ['Blockly.Events.CommentChange'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_create.js', ['Blockly.Events.CommentCreate'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_delete.js', ['Blockly.Events.CommentDelete'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_move.js', ['Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_ui.js', ['Blockly.Events.Ui'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_ui_base.js', ['Blockly.Events.UiBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_base.js', ['Blockly.Events.VarBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_create.js', ['Blockly.Events.VarCreate'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.VarDelete'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_dropdown.js', ['Blockly.FieldDropdown'], ['Blockly.DropDownDiv', 'Blockly.Field', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_image.js', ['Blockly.FieldImage'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_label.js', ['Blockly.FieldLabel'], ['Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabelSerializable'], ['Blockly.FieldLabel', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.common', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.ConnectionType'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_collapsible_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_copyable.js', ['Blockly.ICopyable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_deletable.js', ['Blockly.IDeletable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_keyboard_accessible.js', ['Blockly.IKeyboardAccessible'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_selectable_toolbox_item.js', ['Blockly.ISelectableToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_serializer.js', ['Blockly.serialization.ISerializer'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.IToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstants'], ['Blockly.ConnectionType'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.ConnectionType', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], [], {'lang': 'es6', 'module': 'goog'});
+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.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/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', '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', 'Blockly.internalConstants'], {'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'});
+goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.blocks', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.Connection', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Renderer', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.blockRendering.debug', 'Blockly.registry', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/debug.js', ['Blockly.blockRendering.debug'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.ConnectionType', 'Blockly.FieldLabel', 'Blockly.blockRendering.Types', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Types', 'Blockly.blockRendering.debug', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.debug', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.blockRendering.debug', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/geras.js', ['Blockly.geras'], ['Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.Highlighter', 'Blockly.geras.InlineInput', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.geras.Renderer', 'Blockly.geras.StatementInput'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/measurables/inline_input.js', ['Blockly.geras.InlineInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/measurables/statement_input.js', ['Blockly.geras.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/bottom_row.js', ['Blockly.blockRendering.BottomRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/connection.js', ['Blockly.blockRendering.Connection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/external_value_input.js', ['Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/field.js', ['Blockly.blockRendering.Field'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/hat.js', ['Blockly.blockRendering.Hat'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/icon.js', ['Blockly.blockRendering.Icon'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/in_row_spacer.js', ['Blockly.blockRendering.InRowSpacer'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/inline_input.js', ['Blockly.blockRendering.InlineInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/input_connection.js', ['Blockly.blockRendering.InputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/input_row.js', ['Blockly.blockRendering.InputRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/jagged_edge.js', ['Blockly.blockRendering.JaggedEdge'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/next_connection.js', ['Blockly.blockRendering.NextConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/output_connection.js', ['Blockly.blockRendering.OutputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/previous_connection.js', ['Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/round_corner.js', ['Blockly.blockRendering.RoundCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/row.js', ['Blockly.blockRendering.Row'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/spacer_row.js', ['Blockly.blockRendering.SpacerRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/square_corner.js', ['Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/top_row.js', ['Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist.RenderInfo'], ['Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/minimalist/minimalist.js', ['Blockly.minimalist'], ['Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.minimalist.Renderer'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/thrasos/thrasos.js', ['Blockly.thrasos'], ['Blockly.thrasos.RenderInfo', 'Blockly.thrasos.Renderer'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.blockRendering.ConstantProvider', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.blockRendering.debug', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.StatementInput', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/measurables/bottom_row.js', ['Blockly.zelos.BottomRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/zelos/zelos.js', ['Blockly.zelos'], ['Blockly.zelos.BottomRow', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo', 'Blockly.zelos.Renderer', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.StatementInput', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.registry', 'Blockly.serialization.variables', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
+goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes', 'Blockly.serialization.ISerializer', 'Blockly.serialization.exceptions', 'Blockly.serialization.priorities', 'Blockly.serialization.registry', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/exceptions.js', ['Blockly.serialization.exceptions'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/priorities.js', ['Blockly.serialization.priorities'], [], {'module': 'goog'});
+goog.addDependency('../../core/serialization/registry.js', ['Blockly.serialization.registry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.serialization.ISerializer', 'Blockly.serialization.priorities', 'Blockly.serialization.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Events', 'Blockly.Workspace', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme/themes.js', ['Blockly.Themes'], ['Blockly.Themes.Classic', 'Blockly.Themes.Zelos'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], ['Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], [], {'module': 'goog'});
+goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.idGenerator'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/style.js', ['Blockly.utils.style'], ['Blockly.utils.Coordinate', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/svg.js', ['Blockly.utils.Svg'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.dialog', 'Blockly.utils', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.blocks', 'Blockly.dialog', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.blocks', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.idGenerator', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils.Coordinate', 'Blockly.utils.idGenerator', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.common', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.Tooltip', 'Blockly.TouchGesture', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../generators/dart.js', ['Blockly.Dart'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.string']);
+goog.addDependency('../../generators/dart/colour.js', ['Blockly.Dart.colour'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/lists.js', ['Blockly.Dart.lists'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/logic.js', ['Blockly.Dart.logic'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/loops.js', ['Blockly.Dart.loops'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/math.js', ['Blockly.Dart.math'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/procedures.js', ['Blockly.Dart.procedures'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/text.js', ['Blockly.Dart.texts'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/variables.js', ['Blockly.Dart.variables'], ['Blockly.Dart']);
+goog.addDependency('../../generators/dart/variables_dynamic.js', ['Blockly.Dart.variablesDynamic'], ['Blockly.Dart', 'Blockly.Dart.variables']);
+goog.addDependency('../../generators/javascript.js', ['Blockly.JavaScript'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.global', 'Blockly.utils.object', 'Blockly.utils.string']);
+goog.addDependency('../../generators/javascript/colour.js', ['Blockly.JavaScript.colour'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/lists.js', ['Blockly.JavaScript.lists'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/logic.js', ['Blockly.JavaScript.logic'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/loops.js', ['Blockly.JavaScript.loops'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/math.js', ['Blockly.JavaScript.math'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/procedures.js', ['Blockly.JavaScript.procedures'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/text.js', ['Blockly.JavaScript.texts'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/variables.js', ['Blockly.JavaScript.variables'], ['Blockly.JavaScript']);
+goog.addDependency('../../generators/javascript/variables_dynamic.js', ['Blockly.JavaScript.variablesDynamic'], ['Blockly.JavaScript', 'Blockly.JavaScript.variables']);
+goog.addDependency('../../generators/lua.js', ['Blockly.Lua'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.utils.string']);
+goog.addDependency('../../generators/lua/colour.js', ['Blockly.Lua.colour'], ['Blockly.Lua']);
+goog.addDependency('../../generators/lua/lists.js', ['Blockly.Lua.lists'], ['Blockly.Lua']);
+goog.addDependency('../../generators/lua/logic.js', ['Blockly.Lua.logic'], ['Blockly.Lua']);
+goog.addDependency('../../generators/lua/loops.js', ['Blockly.Lua.loops'], ['Blockly.Lua']);
+goog.addDependency('../../generators/lua/math.js', ['Blockly.Lua.math'], ['Blockly.Lua']);
+goog.addDependency('../../generators/lua/procedures.js', ['Blockly.Lua.procedures'], ['Blockly.Lua']);
+goog.addDependency('../../generators/lua/text.js', ['Blockly.Lua.texts'], ['Blockly.Lua'], {'lang': 'es5'});
+goog.addDependency('../../generators/lua/variables.js', ['Blockly.Lua.variables'], ['Blockly.Lua']);
+goog.addDependency('../../generators/lua/variables_dynamic.js', ['Blockly.Lua.variablesDynamic'], ['Blockly.Lua', 'Blockly.Lua.variables']);
+goog.addDependency('../../generators/php.js', ['Blockly.PHP'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.utils.string']);
+goog.addDependency('../../generators/php/colour.js', ['Blockly.PHP.colour'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/lists.js', ['Blockly.PHP.lists'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/logic.js', ['Blockly.PHP.logic'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/loops.js', ['Blockly.PHP.loops'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/math.js', ['Blockly.PHP.math'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/procedures.js', ['Blockly.PHP.procedures'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/text.js', ['Blockly.PHP.texts'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/variables.js', ['Blockly.PHP.variables'], ['Blockly.PHP']);
+goog.addDependency('../../generators/php/variables_dynamic.js', ['Blockly.PHP.variablesDynamic'], ['Blockly.PHP', 'Blockly.PHP.variables']);
+goog.addDependency('../../generators/python.js', ['Blockly.Python'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.string']);
+goog.addDependency('../../generators/python/colour.js', ['Blockly.Python.colour'], ['Blockly.Python']);
+goog.addDependency('../../generators/python/lists.js', ['Blockly.Python.lists'], ['Blockly.Python']);
+goog.addDependency('../../generators/python/logic.js', ['Blockly.Python.logic'], ['Blockly.Python']);
+goog.addDependency('../../generators/python/loops.js', ['Blockly.Python.loops'], ['Blockly.Python']);
+goog.addDependency('../../generators/python/math.js', ['Blockly.Python.math'], ['Blockly.Python']);
+goog.addDependency('../../generators/python/procedures.js', ['Blockly.Python.procedures'], ['Blockly.Python']);
+goog.addDependency('../../generators/python/text.js', ['Blockly.Python.texts'], ['Blockly.Python']);
+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.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'});
+goog.addDependency('../../tests/mocha/block_test.js', ['Blockly.test.blocks'], ['Blockly.blocks', 'Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/comment_test.js', ['Blockly.test.comments'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/connection_checker_test.js', ['Blockly.test.connectionChecker'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+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.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.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'});
+goog.addDependency('../../tests/mocha/field_colour_test.js', ['Blockly.test.fieldColour'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/field_dropdown_test.js', ['Blockly.test.fieldDropdown'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/field_image_test.js', ['Blockly.test.fieldImage'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/field_label_serializable_test.js', ['Blockly.test.fieldLabelSerialization'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/field_label_test.js', ['Blockly.test.fieldLabel'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/field_multilineinput_test.js', ['Blockly.test.fieldMultiline'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/field_number_test.js', ['Blockly.test.fieldNumber'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/field_registry_test.js', ['Blockly.test.fieldRegistry'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/field_test.js', ['Blockly.test.fieldTest'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/field_textinput_test.js', ['Blockly.test.fieldTextInput'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/field_variable_test.js', ['Blockly.test.fieldVariable'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/flyout_test.js', ['Blockly.test.flyout'], ['Blockly.test.helpers', 'Blockly.test.toolboxHelpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/generator_test.js', ['Blockly.test.generator'], ['Blockly.Dart', 'Blockly.JavaScript', 'Blockly.Lua', 'Blockly.PHP', 'Blockly.Python', 'Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/gesture_test.js', ['Blockly.test.gesture'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/input_test.js', ['Blockly.test.input'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/insertion_marker_test.js', ['Blockly.test.insertionMarker'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/jso_deserialization_test.js', ['Blockly.test.jsoDeserialization'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/jso_serialization_test.js', ['Blockly.test.jsoSerialization'], ['Blockly.test.helpers'], {'lang': 'es8', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/json_test.js', ['Blockly.test.json'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/keydown_test.js', ['Blockly.test.keydown'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/logic_ternary_test.js', ['Blockly.test.logicTernary'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/metrics_test.js', ['Blockly.test.metrics'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/mutator_test.js', ['Blockly.test.mutator'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/names_test.js', ['Blockly.test.names'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/procedures_test.js', ['Blockly.test.procedures'], ['Blockly', 'Blockly.Msg', 'Blockly.test.helpers', 'Blockly.test.procedureHelpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/procedures_test_helpers.js', ['Blockly.test.procedureHelpers'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/registry_test.js', ['Blockly.test.registry'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/run_mocha_tests_in_browser.js', [], [], {'lang': 'es8'});
+goog.addDependency('../../tests/mocha/serializer_test.js', ['Blockly.test.serialization'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/shortcut_registry_test.js', ['Blockly.test.shortcutRegistry'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/test_helpers.js', ['Blockly.test.helpers'], ['Blockly.blocks', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/theme_test.js', ['Blockly.test.theme'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/toolbox_helper.js', ['Blockly.test.toolboxHelpers'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/toolbox_test.js', ['Blockly.test.toolbox'], ['Blockly.test.helpers', 'Blockly.test.toolboxHelpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/tooltip_test.js', ['Blockly.test.tooltip'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/trashcan_test.js', ['Blockly.test.trashcan'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/utils_test.js', ['Blockly.test.utils'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/variable_map_test.js', ['Blockly.test.variableMap'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/variable_model_test.js', ['Blockly.test.variableModel'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/variables_test.js', ['Blockly.test.variables'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/widget_div_test.js', ['Blockly.test.widgetDiv'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/workspace_comment_test.js', ['Blockly.test.workspaceComment'], ['Blockly.WorkspaceComment', 'Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/workspace_helpers.js', ['Blockly.test.workspaceHelpers'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/workspace_svg_test.js', ['Blockly.test.workspaceSvg'], ['Blockly.test.helpers', 'Blockly.test.workspaceHelpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/workspace_test.js', ['Blockly.test.workspace'], ['Blockly.test.helpers', 'Blockly.test.workspaceHelpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/xml_test.js', ['Blockly.test.xml'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/zoom_controls_test.js', ['Blockly.test.zoomControls'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('base.js', [], []);
+
diff --git a/tests/mocha/block_test.js b/tests/mocha/block_test.js
index 078c2ee05..26f4eda52 100644
--- a/tests/mocha/block_test.js
+++ b/tests/mocha/block_test.js
@@ -6,6 +6,7 @@
 
 goog.module('Blockly.test.blocks');
 
+const {Blocks} = goog.require('Blockly.blocks');
 const {createDeprecationWarningStub, createRenderedBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
 
 
@@ -1985,7 +1986,7 @@ suite('Blocks', function() {
       // so we assert init was called to be safe.
       var initCalled = false;
       var recordUndoDuringInit;
-      Blockly.Blocks['init_test_block'].init = function() {
+      Blocks['init_test_block'].init = function() {
         initCalled = true;
         recordUndoDuringInit = Blockly.Events.getRecordUndo();
         throw new Error();
diff --git a/tests/mocha/procedures_test.js b/tests/mocha/procedures_test.js
index 713c0aea1..bbeeb2c49 100644
--- a/tests/mocha/procedures_test.js
+++ b/tests/mocha/procedures_test.js
@@ -6,7 +6,7 @@
 
 goog.module('Blockly.test.procedures');
 
-goog.require('Blockly.Blocks.procedures');
+goog.require('Blockly');
 goog.require('Blockly.Msg');
 const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
 const {assertCallBlockStructure, assertDefBlockStructure, createProcDefBlock, createProcCallBlock} = goog.require('Blockly.test.procedureHelpers');
diff --git a/tests/mocha/test_helpers.js b/tests/mocha/test_helpers.js
index d761034b8..b5f044d14 100644
--- a/tests/mocha/test_helpers.js
+++ b/tests/mocha/test_helpers.js
@@ -7,6 +7,7 @@
 goog.module('Blockly.test.helpers');
 
 const KeyCodes = goog.require('Blockly.utils.KeyCodes');
+const {Blocks} = goog.require('Blockly.blocks');
 
 
 /**
@@ -250,7 +251,7 @@ function sharedTestTeardown() {
 
     var blockTypes = this.sharedCleanup.blockTypesCleanup_;
     for (let i = 0; i < blockTypes.length; i++) {
-      delete Blockly.Blocks[blockTypes[i]];
+      delete Blocks[blockTypes[i]];
     }
     var messages = this.sharedCleanup.messagesCleanup_;
     for (let i = 0; i < messages.length; i++) {

From 2b34748e0e1af1d8e071ef3b7cbb8322cc53fb20 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Fri, 24 Sep 2021 14:20:32 -0700
Subject: [PATCH 831/833] chore: remove declareLegacyNamespace from events
 (#5532)

- Adds an extra events/utils.js file to hold helper methods related to events.
---
 core/block.js                             |  40 +-
 core/block_dragger.js                     |  20 +-
 core/block_svg.js                         |  34 +-
 core/blockly.js                           |   2 +
 core/bubble_dragger.js                    |  12 +-
 core/bump_objects.js                      |  29 +-
 core/clipboard.js                         |   7 +-
 core/comment.js                           |   8 +-
 core/connection.js                        |  26 +-
 core/contextmenu.js                       |  14 +-
 core/contextmenu_items.js                 |  12 +-
 core/events/events.js                     | 677 ++++------------------
 core/events/events_abstract.js            |   7 +-
 core/events/events_block_base.js          |   1 -
 core/events/events_block_change.js        |   9 +-
 core/events/events_block_create.js        |   9 +-
 core/events/events_block_delete.js        |   9 +-
 core/events/events_block_drag.js          |   7 +-
 core/events/events_block_move.js          |   7 +-
 core/events/events_bubble_open.js         |   7 +-
 core/events/events_click.js               |   8 +-
 core/events/events_comment_base.js        |  13 +-
 core/events/events_comment_change.js      |   7 +-
 core/events/events_comment_create.js      |   7 +-
 core/events/events_comment_delete.js      |   7 +-
 core/events/events_comment_move.js        |   7 +-
 core/events/events_marker_move.js         |   9 +-
 core/events/events_selected.js            |   7 +-
 core/events/events_theme_change.js        |   7 +-
 core/events/events_toolbox_item_select.js |   7 +-
 core/events/events_trashcan_open.js       |   7 +-
 core/events/events_ui.js                  |   7 +-
 core/events/events_ui_base.js             |   1 -
 core/events/events_var_base.js            |   1 -
 core/events/events_var_create.js          |   7 +-
 core/events/events_var_delete.js          |   7 +-
 core/events/events_var_rename.js          |   7 +-
 core/events/events_viewport.js            |   7 +-
 core/events/utils.js                      | 579 ++++++++++++++++++
 core/events/workspace_events.js           |  15 +-
 core/field.js                             |   6 +-
 core/field_textinput.js                   |  10 +-
 core/flyout_base.js                       |  14 +-
 core/gesture.js                           |  18 +-
 core/insertion_marker_manager.js          |  22 +-
 core/mutator.js                           |  31 +-
 core/procedures.js                        |  16 +-
 core/rendered_connection.js               |  10 +-
 core/renderers/common/marker_svg.js       |   6 +-
 core/scrollbar_pair.js                    |   6 +-
 core/serialization/blocks.js              |  22 +-
 core/serialization/workspaces.js          |  16 +-
 core/toolbox/toolbox.js                   |   8 +-
 core/trashcan.js                          |   8 +-
 core/variable_map.js                      |  18 +-
 core/variable_model.js                    |   4 +-
 core/warning.js                           |   6 +-
 core/workspace.js                         |  16 +-
 core/workspace_comment.js                 |  24 +-
 core/workspace_comment_svg.js             |  30 +-
 core/workspace_svg.js                     |  34 +-
 core/xml.js                               |  22 +-
 core/zoom_controls.js                     |   6 +-
 tests/deps.js                             | 119 ++--
 tests/deps.mocha.js                       | 131 ++---
 tests/mocha/block_test.js                 |  15 +-
 tests/mocha/comment_test.js               |   2 +-
 tests/mocha/event_test.js                 |  53 +-
 tests/mocha/logic_ternary_test.js         |   7 +-
 tests/mocha/test_helpers.js               |  15 +-
 tests/mocha/trashcan_test.js              |   5 +-
 tests/mocha/workspace_helpers.js          |  15 +-
 72 files changed, 1243 insertions(+), 1126 deletions(-)
 create mode 100644 core/events/utils.js

diff --git a/core/block.js b/core/block.js
index f83f43180..7654d2537 100644
--- a/core/block.js
+++ b/core/block.js
@@ -18,7 +18,6 @@ const Abstract = goog.requireType('Blockly.Events.Abstract');
 const Comment = goog.requireType('Blockly.Comment');
 const Connection = goog.require('Blockly.Connection');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
-const Events = goog.require('Blockly.Events');
 const Extensions = goog.require('Blockly.Extensions');
 /* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.Field');
@@ -37,6 +36,7 @@ const VariableModel = goog.requireType('Blockly.VariableModel');
 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');
@@ -221,31 +221,31 @@ const Block = function(workspace, prototypeName, opt_id) {
   // All events fired should be part of the same group.
   // Any events fired during init should not be undoable,
   // so that block creation is atomic.
-  const existingGroup = Events.getGroup();
+  const existingGroup = eventUtils.getGroup();
   if (!existingGroup) {
-    Events.setGroup(true);
+    eventUtils.setGroup(true);
   }
-  const initialUndoFlag = Events.getRecordUndo();
+  const initialUndoFlag = eventUtils.getRecordUndo();
 
   try {
     // Call an initialization function, if it exists.
     if (typeof this.init == 'function') {
-      Events.setRecordUndo(false);
+      eventUtils.setRecordUndo(false);
       this.init();
-      Events.setRecordUndo(initialUndoFlag);
+      eventUtils.setRecordUndo(initialUndoFlag);
     }
 
     // Fire a create event.
-    if (Events.isEnabled()) {
-      Events.fire(new (Events.get(Events.BLOCK_CREATE))(this));
+    if (eventUtils.isEnabled()) {
+      eventUtils.fire(new (eventUtils.get(eventUtils.BLOCK_CREATE))(this));
     }
 
   } finally {
     if (!existingGroup) {
-      Events.setGroup(false);
+      eventUtils.setGroup(false);
     }
     // In case init threw, recordUndo flag should still be reset.
-    Events.setRecordUndo(initialUndoFlag);
+    eventUtils.setRecordUndo(initialUndoFlag);
   }
 
   // Record initial inline state.
@@ -392,10 +392,10 @@ Block.prototype.dispose = function(healStack) {
   }
 
   this.unplug(healStack);
-  if (Events.isEnabled()) {
-    Events.fire(new (Events.get(Events.BLOCK_DELETE))(this));
+  if (eventUtils.isEnabled()) {
+    eventUtils.fire(new (eventUtils.get(eventUtils.BLOCK_DELETE))(this));
   }
-  Events.disable();
+  eventUtils.disable();
 
   try {
     // This block is now at the top of the workspace.
@@ -432,7 +432,7 @@ Block.prototype.dispose = function(healStack) {
       connection.dispose();
     }
   } finally {
-    Events.enable();
+    eventUtils.enable();
     this.disposed = true;
   }
 };
@@ -1271,7 +1271,7 @@ Block.prototype.setOutput = function(newBoolean, opt_check) {
  */
 Block.prototype.setInputsInline = function(newBoolean) {
   if (this.inputsInline != newBoolean) {
-    Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
+    eventUtils.fire(new (eventUtils.get(eventUtils.BLOCK_CHANGE))(
         this, 'inline', null, this.inputsInline, newBoolean));
     this.inputsInline = newBoolean;
   }
@@ -1336,7 +1336,7 @@ Block.prototype.setEnabled = function(enabled) {
   if (this.isEnabled() != enabled) {
     const oldValue = this.disabled;
     this.disabled = !enabled;
-    Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
+    eventUtils.fire(new (eventUtils.get(eventUtils.BLOCK_CHANGE))(
         this, 'disabled', null, oldValue, !enabled));
   }
 };
@@ -1372,7 +1372,7 @@ Block.prototype.isCollapsed = function() {
  */
 Block.prototype.setCollapsed = function(collapsed) {
   if (this.collapsed_ != collapsed) {
-    Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
+    eventUtils.fire(new (eventUtils.get(eventUtils.BLOCK_CHANGE))(
         this, 'collapsed', null, this.collapsed_, collapsed));
     this.collapsed_ = collapsed;
   }
@@ -2045,7 +2045,7 @@ Block.prototype.setCommentText = function(text) {
   if (this.commentModel.text == text) {
     return;
   }
-  Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
+  eventUtils.fire(new (eventUtils.get(eventUtils.BLOCK_CHANGE))(
       this, 'comment', null, this.commentModel.text, text));
   this.commentModel.text = text;
   this.comment = text;  // For backwards compatibility.
@@ -2088,10 +2088,10 @@ Block.prototype.moveBy = function(dx, dy) {
   if (this.parentBlock_) {
     throw Error('Block has parent.');
   }
-  const event = new (Events.get(Events.BLOCK_MOVE))(this);
+  const event = new (eventUtils.get(eventUtils.BLOCK_MOVE))(this);
   this.xy_.translate(dx, dy);
   event.recordNew();
-  Events.fire(event);
+  eventUtils.fire(event);
 };
 
 /**
diff --git a/core/block_dragger.js b/core/block_dragger.js
index 650cf4a88..9e9c4e1cd 100644
--- a/core/block_dragger.js
+++ b/core/block_dragger.js
@@ -24,7 +24,7 @@ const blockAnimation = goog.require('Blockly.blockAnimations');
 const bumpObjects = goog.require('Blockly.bumpObjects');
 const common = goog.require('Blockly.common');
 const dom = goog.require('Blockly.utils.dom');
-const events = goog.require('Blockly.Events');
+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');
@@ -146,8 +146,8 @@ const initIconData = function(block) {
  * @public
  */
 BlockDragger.prototype.startDrag = function(currentDragDeltaXY, healStack) {
-  if (!events.getGroup()) {
-    events.setGroup(true);
+  if (!eventUtils.getGroup()) {
+    eventUtils.setGroup(true);
   }
   this.fireDragStartEvent_();
 
@@ -213,9 +213,9 @@ BlockDragger.prototype.disconnectBlock_ = function(
  * @protected
  */
 BlockDragger.prototype.fireDragStartEvent_ = function() {
-  const event = new (events.get(events.BLOCK_DRAG))(
+  const event = new (eventUtils.get(eventUtils.BLOCK_DRAG))(
       this.draggingBlock_, true, this.draggingBlock_.getDescendants(false));
-  events.fire(event);
+  eventUtils.fire(event);
 };
 
 /**
@@ -301,7 +301,7 @@ BlockDragger.prototype.endDrag = function(e, currentDragDeltaXY) {
   }
   this.workspace_.setResizesEnabled(true);
 
-  events.setGroup(false);
+  eventUtils.setGroup(false);
 };
 
 /**
@@ -362,9 +362,9 @@ BlockDragger.prototype.updateBlockAfterMove_ = function(delta) {
  * @protected
  */
 BlockDragger.prototype.fireDragEndEvent_ = function() {
-  const event = new (events.get(events.BLOCK_DRAG))(
+  const event = new (eventUtils.get(eventUtils.BLOCK_DRAG))(
       this.draggingBlock_, false, this.draggingBlock_.getDescendants(false));
-  events.fire(event);
+  eventUtils.fire(event);
 };
 
 /**
@@ -395,10 +395,10 @@ BlockDragger.prototype.updateToolboxStyle_ = function(isEnd) {
  * @protected
  */
 BlockDragger.prototype.fireMoveEvent_ = function() {
-  const event = new (events.get(events.BLOCK_MOVE))(this.draggingBlock_);
+  const event = new (eventUtils.get(eventUtils.BLOCK_MOVE))(this.draggingBlock_);
   event.oldCoordinate = this.startXY_;
   event.recordNew();
-  events.fire(event);
+  eventUtils.fire(event);
 };
 
 /**
diff --git a/core/block_svg.js b/core/block_svg.js
index 166d75aff..838592305 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -21,7 +21,6 @@ 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');
-const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.Field');
 const FieldLabel = goog.require('Blockly.FieldLabel');
@@ -59,6 +58,7 @@ const browserEvents = goog.require('Blockly.browserEvents');
 const common = goog.require('Blockly.common');
 const constants = goog.require('Blockly.constants');
 const dom = goog.require('Blockly.utils.dom');
+const eventUtils = goog.require('Blockly.Events.utils');
 const internalConstants = goog.require('Blockly.internalConstants');
 const object = goog.require('Blockly.utils.object');
 const userAgent = goog.require('Blockly.utils.userAgent');
@@ -289,16 +289,16 @@ BlockSvg.prototype.select = function() {
   if (common.getSelected()) {
     oldId = common.getSelected().id;
     // Unselect any previously selected block.
-    Events.disable();
+    eventUtils.disable();
     try {
       common.getSelected().unselect();
     } finally {
-      Events.enable();
+      eventUtils.enable();
     }
   }
   const event =
-      new (Events.get(Events.SELECTED))(oldId, this.id, this.workspace.id);
-  Events.fire(event);
+      new (eventUtils.get(eventUtils.SELECTED))(oldId, this.id, this.workspace.id);
+  eventUtils.fire(event);
   common.setSelected(this);
   this.addSelect();
 };
@@ -312,9 +312,9 @@ BlockSvg.prototype.unselect = function() {
     return;
   }
   const event =
-      new (Events.get(Events.SELECTED))(this.id, null, this.workspace.id);
+      new (eventUtils.get(eventUtils.SELECTED))(this.id, null, this.workspace.id);
   event.workspaceId = this.workspace.id;
-  Events.fire(event);
+  eventUtils.fire(event);
   common.setSelected(null);
   this.removeSelect();
 };
@@ -453,17 +453,17 @@ BlockSvg.prototype.moveBy = function(dx, dy) {
   if (this.parentBlock_) {
     throw Error('Block has parent.');
   }
-  const eventsEnabled = Events.isEnabled();
+  const eventsEnabled = eventUtils.isEnabled();
   let event;
   if (eventsEnabled) {
-    event = new (Events.get(Events.BLOCK_MOVE))(this);
+    event = new (eventUtils.get(eventUtils.BLOCK_MOVE))(this);
   }
   const xy = this.getRelativeToSurfaceXY();
   this.translate(xy.x + dx, xy.y + dy);
   this.moveConnections(dx, dy);
   if (eventsEnabled) {
     event.recordNew();
-    Events.fire(event);
+    eventUtils.fire(event);
   }
   this.workspace.resizeContents();
 };
@@ -943,7 +943,7 @@ BlockSvg.prototype.checkAndDelete = function() {
   if (this.workspace.isFlyout) {
     return;
   }
-  Events.setGroup(true);
+  eventUtils.setGroup(true);
   this.workspace.hideChaff();
   if (this.outputConnection) {
     // Do not attempt to heal rows
@@ -952,7 +952,7 @@ BlockSvg.prototype.checkAndDelete = function() {
   } else {
     this.dispose(/* heal */ true, true);
   }
-  Events.setGroup(false);
+  eventUtils.setGroup(false);
 };
 
 /**
@@ -1568,18 +1568,18 @@ BlockSvg.prototype.bumpNeighbours = function() {
 BlockSvg.prototype.scheduleSnapAndBump = function() {
   const block = this;
   // Ensure that any snap and bump are part of this move's event group.
-  const group = Events.getGroup();
+  const group = eventUtils.getGroup();
 
   setTimeout(function() {
-    Events.setGroup(group);
+    eventUtils.setGroup(group);
     block.snapToGrid();
-    Events.setGroup(false);
+    eventUtils.setGroup(false);
   }, internalConstants.BUMP_DELAY / 2);
 
   setTimeout(function() {
-    Events.setGroup(group);
+    eventUtils.setGroup(group);
     block.bumpNeighbours();
-    Events.setGroup(false);
+    eventUtils.setGroup(false);
   }, internalConstants.BUMP_DELAY);
 };
 
diff --git a/core/blockly.js b/core/blockly.js
index 4ccb0fbb9..a02835e1a 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -33,6 +33,7 @@ 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');
@@ -558,6 +559,7 @@ exports.Cursor = Cursor;
 exports.DeleteArea = DeleteArea;
 exports.DragTarget = DragTarget;
 exports.DropDownDiv = DropDownDiv;
+exports.Events = Events;
 exports.Extensions = Extensions;
 exports.Field = Field;
 exports.FieldAngle = FieldAngle;
diff --git a/core/bubble_dragger.js b/core/bubble_dragger.js
index c6e87ea9e..83aadb24b 100644
--- a/core/bubble_dragger.js
+++ b/core/bubble_dragger.js
@@ -14,7 +14,6 @@ goog.module('Blockly.BubbleDragger');
 
 const ComponentManager = goog.require('Blockly.ComponentManager');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
-const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const IBubble = goog.requireType('Blockly.IBubble');
 /* eslint-disable-next-line no-unused-vars */
@@ -25,6 +24,7 @@ const IDragTarget = goog.requireType('Blockly.IDragTarget');
 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');
@@ -109,8 +109,8 @@ BubbleDragger.prototype.dispose = function() {
  * @package
  */
 BubbleDragger.prototype.startBubbleDrag = function() {
-  if (!Events.getGroup()) {
-    Events.setGroup(true);
+  if (!eventUtils.getGroup()) {
+    eventUtils.setGroup(true);
   }
 
   this.workspace_.setResizesEnabled(false);
@@ -226,7 +226,7 @@ BubbleDragger.prototype.endBubbleDrag = function(e, currentDragDeltaXY) {
   }
   this.workspace_.setResizesEnabled(true);
 
-  Events.setGroup(false);
+  eventUtils.setGroup(false);
 };
 
 /**
@@ -236,11 +236,11 @@ BubbleDragger.prototype.endBubbleDrag = function(e, currentDragDeltaXY) {
 BubbleDragger.prototype.fireMoveEvent_ = function() {
   if (this.draggingBubble_.isComment) {
     // TODO (adodson): Resolve build errors when requiring WorkspaceCommentSvg.
-    const event = new (Events.get(Events.COMMENT_MOVE))(
+    const event = new (eventUtils.get(eventUtils.COMMENT_MOVE))(
         /** @type {!WorkspaceCommentSvg} */ (this.draggingBubble_));
     event.setOldCoordinate(this.startXY_);
     event.recordNew();
-    Events.fire(event);
+    eventUtils.fire(event);
   }
   // TODO (fenichel): move events for comments.
   return;
diff --git a/core/bump_objects.js b/core/bump_objects.js
index 200e2d0d2..80f42ab91 100644
--- a/core/bump_objects.js
+++ b/core/bump_objects.js
@@ -13,15 +13,18 @@
 goog.module('Blockly.bumpObjects');
 
 /* eslint-disable-next-line no-unused-vars */
-const Events = goog.require('Blockly.Events');
+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');
@@ -81,7 +84,7 @@ exports.bumpIntoBounds = bumpObjectIntoBounds;
 /**
  * Creates a handler for bumping objects when they cross fixed bounds.
  * @param {!WorkspaceSvg} workspace The workspace to handle.
- * @return {function(Events.Abstract)} The event handler.
+ * @return {function(Abstract)} The event handler.
  */
 const bumpIntoBoundsHandler = function(workspace) {
   return function(e) {
@@ -90,7 +93,7 @@ const bumpIntoBoundsHandler = function(workspace) {
       return;
     }
 
-    if (Events.BUMP_EVENTS.indexOf(e.type) !== -1) {
+    if (eventUtils.BUMP_EVENTS.indexOf(e.type) !== -1) {
       const scrollMetricsInWsCoords = metricsManager.getScrollMetrics(true);
 
       // Triggered by move/create event
@@ -99,8 +102,8 @@ const bumpIntoBoundsHandler = function(workspace) {
         return;
       }
       // Handle undo.
-      const oldGroup = Events.getGroup();
-      Events.setGroup(e.group);
+      const oldGroup = eventUtils.getGroup();
+      eventUtils.setGroup(e.group);
 
       const wasBumped = bumpObjectIntoBounds(
           workspace, scrollMetricsInWsCoords,
@@ -112,10 +115,10 @@ const bumpIntoBoundsHandler = function(workspace) {
             ' event group. This may break undo.');
       }
       if (oldGroup !== null) {
-        Events.setGroup(oldGroup);
+        eventUtils.setGroup(oldGroup);
       }
-    } else if (e.type === Events.VIEWPORT_CHANGE) {
-      const viewportEvent = /** @type {!Events.ViewportChange} */ (e);
+    } else if (e.type === eventUtils.VIEWPORT_CHANGE) {
+      const viewportEvent = /** @type {!ViewportChange} */ (e);
       if (viewportEvent.scale > viewportEvent.oldScale) {
         bumpTopObjectsIntoBounds(workspace);
       }
@@ -128,22 +131,22 @@ exports.bumpIntoBoundsHandler = bumpIntoBoundsHandler;
  * Extracts the object from the given event.
  * @param {!WorkspaceSvg} workspace The workspace the event originated
  *    from.
- * @param {!Events.BumpEvent} e An event containing an object.
+ * @param {!eventUtils.BumpEvent} e An event containing an object.
  * @return {?BlockSvg|?WorkspaceCommentSvg} The extracted
  *    object.
  */
 const extractObjectFromEvent = function(workspace, e) {
   let object = null;
   switch (e.type) {
-    case Events.BLOCK_CREATE:
-    case Events.BLOCK_MOVE:
+    case eventUtils.BLOCK_CREATE:
+    case eventUtils.BLOCK_MOVE:
       object = workspace.getBlockById(e.blockId);
       if (object) {
         object = object.getRootBlock();
       }
       break;
-    case Events.COMMENT_CREATE:
-    case Events.COMMENT_MOVE:
+    case eventUtils.COMMENT_CREATE:
+    case eventUtils.COMMENT_MOVE:
       object = (
           /** @type {?WorkspaceCommentSvg} */
           (workspace.getCommentById(e.commentId)));
diff --git a/core/clipboard.js b/core/clipboard.js
index 4c7205cac..33a1b9c24 100644
--- a/core/clipboard.js
+++ b/core/clipboard.js
@@ -12,9 +12,10 @@
 
 goog.module('Blockly.clipboard');
 
-const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const ICopyable = goog.requireType('Blockly.ICopyable');
+const eventUtils = goog.require('Blockly.Events.utils');
+
 
 /**
  * Metadata about the object that is currently on the clipboard.
@@ -48,9 +49,9 @@ const paste = function() {
   }
   if (copyData.typeCounts &&
       workspace.isCapacityAvailable(copyData.typeCounts)) {
-    Events.setGroup(true);
+    eventUtils.setGroup(true);
     workspace.paste(copyData.saveInfo);
-    Events.setGroup(false);
+    eventUtils.setGroup(false);
     return true;
   }
   return false;
diff --git a/core/comment.js b/core/comment.js
index 76a9f08d3..149b9f65d 100644
--- a/core/comment.js
+++ b/core/comment.js
@@ -16,7 +16,6 @@ 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 Events = goog.require('Blockly.Events');
 const Icon = goog.require('Blockly.Icon');
 /* eslint-disable-next-line no-unused-vars */
 const Size = goog.requireType('Blockly.utils.Size');
@@ -25,6 +24,7 @@ const Svg = goog.require('Blockly.utils.Svg');
 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 */
@@ -180,7 +180,7 @@ Comment.prototype.createEditor_ = function() {
   this.onChangeWrapper_ =
       browserEvents.conditionalBind(textarea, 'change', this, function(_e) {
         if (this.cachedText_ != this.model_.text) {
-          Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
+          eventUtils.fire(new (eventUtils.get(eventUtils.BLOCK_CHANGE))(
               this.block_, 'comment', null, this.cachedText_,
               this.model_.text));
         }
@@ -245,8 +245,8 @@ Comment.prototype.setVisible = function(visible) {
   if (visible == this.isVisible()) {
     return;
   }
-  Events.fire(
-      new (Events.get(Events.BUBBLE_OPEN))(this.block_, visible, 'comment'));
+  eventUtils.fire(
+      new (eventUtils.get(eventUtils.BUBBLE_OPEN))(this.block_, visible, 'comment'));
   this.model_.pinned = visible;
   if (visible) {
     this.createBubble_();
diff --git a/core/connection.js b/core/connection.js
index 5ebd1e773..30dcab1f9 100644
--- a/core/connection.js
+++ b/core/connection.js
@@ -12,7 +12,6 @@
 
 goog.module('Blockly.Connection');
 
-const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const IASTNodeLocationWithBlock = goog.requireType('Blockly.IASTNodeLocationWithBlock');
 /* eslint-disable-next-line no-unused-vars */
@@ -22,6 +21,7 @@ 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');
+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');
@@ -134,14 +134,14 @@ Connection.prototype.connect_ = function(childConnection) {
 
   // Connect the new connection to the parent.
   let event;
-  if (Events.isEnabled()) {
-    event = new (Events.get(Events.BLOCK_MOVE))(childBlock);
+  if (eventUtils.isEnabled()) {
+    event = new (eventUtils.get(eventUtils.BLOCK_MOVE))(childBlock);
   }
   connectReciprocally(parentConnection, childConnection);
   childBlock.setParent(parentBlock);
   if (event) {
     event.recordNew();
-    Events.fire(event);
+    eventUtils.fire(event);
   }
 
   // Deal with the orphan if it exists.
@@ -289,9 +289,9 @@ Connection.prototype.connect = function(otherConnection) {
 
   const checker = this.getConnectionChecker();
   if (checker.canConnect(this, otherConnection, false)) {
-    const eventGroup = Events.getGroup();
+    const eventGroup = eventUtils.getGroup();
     if (!eventGroup) {
-      Events.setGroup(true);
+      eventUtils.setGroup(true);
     }
     // Determine which block is superior (higher in the source stack).
     if (this.isSuperior()) {
@@ -302,7 +302,7 @@ Connection.prototype.connect = function(otherConnection) {
       otherConnection.connect_(this);
     }
     if (!eventGroup) {
-      Events.setGroup(false);
+      eventUtils.setGroup(false);
     }
   }
 
@@ -423,9 +423,9 @@ Connection.prototype.disconnect = function() {
     parentConnection = otherConnection;
   }
 
-  const eventGroup = Events.getGroup();
+  const eventGroup = eventUtils.getGroup();
   if (!eventGroup) {
-    Events.setGroup(true);
+    eventUtils.setGroup(true);
   }
   this.disconnectInternal_(parentBlock, childBlock);
   if (!childBlock.isShadow()) {
@@ -433,7 +433,7 @@ Connection.prototype.disconnect = function() {
     parentConnection.respawnShadow_();
   }
   if (!eventGroup) {
-    Events.setGroup(false);
+    eventUtils.setGroup(false);
   }
 };
 
@@ -445,8 +445,8 @@ Connection.prototype.disconnect = function() {
  */
 Connection.prototype.disconnectInternal_ = function(parentBlock, childBlock) {
   let event;
-  if (Events.isEnabled()) {
-    event = new (Events.get(Events.BLOCK_MOVE))(childBlock);
+  if (eventUtils.isEnabled()) {
+    event = new (eventUtils.get(eventUtils.BLOCK_MOVE))(childBlock);
   }
   const otherConnection = this.targetConnection;
   otherConnection.targetConnection = null;
@@ -454,7 +454,7 @@ Connection.prototype.disconnectInternal_ = function(parentBlock, childBlock) {
   childBlock.setParent(null);
   if (event) {
     event.recordNew();
-    Events.fire(event);
+    eventUtils.fire(event);
   }
 };
 
diff --git a/core/contextmenu.js b/core/contextmenu.js
index 6f4deb922..274b2a6e4 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -15,7 +15,6 @@ 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 Events = goog.require('Blockly.Events');
 const Menu = goog.require('Blockly.Menu');
 const MenuItem = goog.require('Blockly.MenuItem');
 const Msg = goog.require('Blockly.Msg');
@@ -27,6 +26,7 @@ const browserEvents = goog.require('Blockly.browserEvents');
 const clipboard = goog.require('Blockly.clipboard');
 const deprecation = goog.require('Blockly.utils.deprecation');
 const dom = goog.require('Blockly.utils.dom');
+const eventUtils = goog.require('Blockly.Events.utils');
 const internalConstants = goog.require('Blockly.internalConstants');
 const userAgent = goog.require('Blockly.utils.userAgent');
 const utils = goog.require('Blockly.utils');
@@ -242,7 +242,7 @@ exports.dispose = dispose;
  */
 const callbackFactory = function(block, xml) {
   return function() {
-    Events.disable();
+    eventUtils.disable();
     let newBlock;
     try {
       newBlock = Xml.domToBlock(xml, block.workspace);
@@ -256,10 +256,10 @@ const callbackFactory = function(block, xml) {
       xy.y += internalConstants.SNAP_RADIUS * 2;
       newBlock.moveBy(xy.x, xy.y);
     } finally {
-      Events.enable();
+      eventUtils.enable();
     }
-    if (Events.isEnabled() && !newBlock.isShadow()) {
-      Events.fire(new (Events.get(Events.BLOCK_CREATE))(newBlock));
+    if (eventUtils.isEnabled() && !newBlock.isShadow()) {
+      eventUtils.fire(new (eventUtils.get(eventUtils.BLOCK_CREATE))(newBlock));
     }
     newBlock.select();
   };
@@ -279,9 +279,9 @@ const commentDeleteOption = function(comment) {
     text: Msg['REMOVE_COMMENT'],
     enabled: true,
     callback: function() {
-      Events.setGroup(true);
+      eventUtils.setGroup(true);
       comment.dispose();
-      Events.setGroup(false);
+      eventUtils.setGroup(false);
     }
   };
   return deleteOption;
diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js
index ac2fb56df..f8af8893d 100644
--- a/core/contextmenu_items.js
+++ b/core/contextmenu_items.js
@@ -13,12 +13,12 @@
 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');
@@ -242,7 +242,7 @@ const getDeletableBlocks_ = function(workspace) {
  */
 const deleteNext_ = function(deleteList, eventGroup) {
   const DELAY = 10;
-  Events.setGroup(eventGroup);
+  eventUtils.setGroup(eventGroup);
   const block = deleteList.shift();
   if (block) {
     if (block.workspace) {
@@ -252,7 +252,7 @@ const deleteNext_ = function(deleteList, eventGroup) {
       deleteNext_(deleteList, eventGroup);
     }
   }
-  Events.setGroup(false);
+  eventUtils.setGroup(false);
 };
 
 /** Option to delete all blocks. */
@@ -484,13 +484,13 @@ const registerDisable = function() {
     callback: function(/** @type {!ContextMenuRegistry.Scope} */
                        scope) {
       const block = scope.block;
-      const group = Events.getGroup();
+      const group = eventUtils.getGroup();
       if (!group) {
-        Events.setGroup(true);
+        eventUtils.setGroup(true);
       }
       block.setEnabled(!block.isEnabled());
       if (!group) {
-        Events.setGroup(false);
+        eventUtils.setGroup(false);
       }
     },
     scopeType: ContextMenuRegistry.ScopeType.BLOCK,
diff --git a/core/events/events.js b/core/events/events.js
index 4c88f1c03..69ce19420 100644
--- a/core/events/events.js
+++ b/core/events/events.js
@@ -15,589 +15,134 @@
  * @namespace Blockly.Events
  */
 goog.module('Blockly.Events');
-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 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 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 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 idGenerator = goog.require('Blockly.utils.idGenerator');
-const registry = goog.require('Blockly.registry');
-/* eslint-disable-next-line no-unused-vars */
-const {Block} = goog.requireType('Blockly.Block');
+const eventUtils = goog.require('Blockly.Events.utils');
 
 
-/**
- * Group ID for new events.  Grouped events are indivisible.
- * @type {string}
- */
-let group = '';
+// Events.
+exports.Abstract = Abstract;
+exports.BubbleOpen = BubbleOpen;
+exports.BlockBase = BlockBase;
+exports.BlockChange = BlockChange;
+exports.BlockCreate = BlockCreate;
+exports.BlockDelete = BlockDelete;
+exports.BlockDrag = BlockDrag;
+exports.BlockMove = BlockMove;
+exports.Click = Click;
+exports.CommentBase = CommentBase;
+exports.CommentChange = CommentChange;
+exports.CommentCreate = CommentCreate;
+exports.CommentDelete = CommentDelete;
+exports.CommentMove = CommentMove;
+exports.FinishedLoading = FinishedLoading;
+exports.MarkerMove = MarkerMove;
+exports.Selected = Selected;
+exports.ThemeChange = ThemeChange;
+exports.ToolboxItemSelect = ToolboxItemSelect;
+exports.TrashcanOpen = TrashcanOpen;
+exports.Ui = Ui;
+exports.UiBase = UiBase;
+exports.VarBase = VarBase;
+exports.VarCreate = VarCreate;
+exports.VarDelete = VarDelete;
+exports.VarRename = VarRename;
+exports.ViewportChange = ViewportChange;
+
+// Event types.
+exports.BLOCK_CHANGE = eventUtils.BLOCK_CHANGE;
+exports.BLOCK_CREATE = eventUtils.BLOCK_CREATE;
+exports.BLOCK_DELETE = eventUtils.BLOCK_DELETE;
+exports.BLOCK_DRAG = eventUtils.BLOCK_DRAG;
+exports.BLOCK_MOVE = eventUtils.BLOCK_MOVE;
+exports.BUBBLE_OPEN = eventUtils.BUBBLE_OPEN;
+exports.BumpEvent = eventUtils.BumpEvent;
+exports.BUMP_EVENTS = eventUtils.BUMP_EVENTS;
+exports.CHANGE = eventUtils.CHANGE;
+exports.CLICK = eventUtils.CLICK;
+exports.COMMENT_CHANGE = eventUtils.COMMENT_CHANGE;
+exports.COMMENT_CREATE = eventUtils.COMMENT_CREATE;
+exports.COMMENT_DELETE = eventUtils.COMMENT_DELETE;
+exports.COMMENT_MOVE = eventUtils.COMMENT_MOVE;
+exports.CREATE = eventUtils.CREATE;
+exports.DELETE = eventUtils.DELETE;
+exports.FINISHED_LOADING = eventUtils.FINISHED_LOADING;
+exports.MARKER_MOVE = eventUtils.MARKER_MOVE;
+exports.MOVE = eventUtils.MOVE;
+exports.SELECTED = eventUtils.SELECTED;
+exports.THEME_CHANGE = eventUtils.THEME_CHANGE;
+exports.TOOLBOX_ITEM_SELECT = eventUtils.TOOLBOX_ITEM_SELECT;
+exports.TRASHCAN_OPEN = eventUtils.TRASHCAN_OPEN;
+exports.UI = eventUtils.UI;
+exports.VAR_CREATE = eventUtils.VAR_CREATE;
+exports.VAR_DELETE = eventUtils.VAR_DELETE;
+exports.VAR_RENAME = eventUtils.VAR_RENAME;
+exports.VIEWPORT_CHANGE = eventUtils.VIEWPORT_CHANGE;
+
+// Event utils.
+exports.clearPendingUndo = eventUtils.clearPendingUndo;
+exports.disable = eventUtils.disable;
+exports.enable = eventUtils.enable;
+exports.filter = eventUtils.filter;
+exports.fire = eventUtils.fire;
+exports.fromJson = eventUtils.fromJson;
+exports.getDescendantIds = eventUtils.getDescendantIds;
+exports.get = eventUtils.get;
+exports.getGroup = eventUtils.getGroup;
+exports.getRecordUndo = eventUtils.getRecordUndo;
+exports.isEnabled = eventUtils.isEnabled;
+exports.setGroup = eventUtils.setGroup;
+exports.setRecordUndo = eventUtils.setRecordUndo;
+exports.disableOrphans = eventUtils.disableOrphans;
 
 /**
  * Sets whether the next event should be added to the undo stack.
  * @type {boolean}
- * @alias Blockly.Events.recordUndo
+ * @deprecated September 2021
  */
-let recordUndo = true;
-/** @deprecated September 2021 */
-exports.recordUndo = recordUndo;
-
-/**
- * Sets whether events should be added to the undo stack.
- * @param {boolean} newValue True if events should be added to the undo stack.
- * @alias Blockly.Events.setRecordUndo
- */
-const setRecordUndo = function(newValue) {
-  recordUndo = newValue;
-};
-exports.setRecordUndo = setRecordUndo;
-
-/**
- * Returns whether or not events will be added to the undo stack.
- * @returns {boolean} True if events will be added to the undo stack.
- * @alias Blockly.Events.getRecordUndo
- */
-const getRecordUndo = function() {
-  return recordUndo;
-};
-exports.getRecordUndo = getRecordUndo;
+exports.recordUndo = false;
 
 Object.defineProperties(exports, {
   recordUndo: {
     get: function() {
       deprecation.warn(
-        'Blockly.Events.recordUndo', 'September 2021', 'September 2022',
-        'Blockly.Events.getRecordUndo()');
-      return getRecordUndo();
+          'Blockly.Events.recordUndo', 'September 2021', 'September 2022',
+          'Blockly.Events.getRecordUndo()');
+      return eventUtils.getRecordUndo();
     },
     set: function(record) {
       deprecation.warn(
-        'Blockly.Events.recordUndo', 'September 2021', 'September 2022',
-        'Blockly.Events.setRecordUndo()');
-      setRecordUndo(record);
+          'Blockly.Events.recordUndo', 'September 2021', 'September 2022',
+          'Blockly.Events.setRecordUndo()');
+      eventUtils.setRecordUndo(record);
     },
   }
- });
+});
 
-/**
- * Allow change events to be created and fired.
- * @type {number}
- */
-let disabled = 0;
-
-/**
- * Name of event that creates a block. Will be deprecated for BLOCK_CREATE.
- * @const
- * @alias Blockly.Events.CREATE
- */
-const CREATE = 'create';
-exports.CREATE = CREATE;
-
-/**
- * Name of event that creates a block.
- * @const
- * @alias Blockly.Events.BLOCK_CREATE
- */
-const BLOCK_CREATE = CREATE;
-exports.BLOCK_CREATE = BLOCK_CREATE;
-
-/**
- * Name of event that deletes a block. Will be deprecated for BLOCK_DELETE.
- * @const
- * @alias Blockly.Events.DELETE
- */
-const DELETE = 'delete';
-exports.DELETE = DELETE;
-
-/**
- * Name of event that deletes a block.
- * @const
- * @alias Blockly.Events.BLOCK_DELETE
- */
-const BLOCK_DELETE = DELETE;
-exports.BLOCK_DELETE = BLOCK_DELETE;
-
-/**
- * Name of event that changes a block. Will be deprecated for BLOCK_CHANGE.
- * @const
- * @alias Blockly.Events.CHANGE
- */
-const CHANGE = 'change';
-exports.CHANGE = CHANGE;
-
-/**
- * Name of event that changes a block.
- * @const
- * @alias Blockly.Events.BLOCK_CHANGE
- */
-const BLOCK_CHANGE = CHANGE;
-exports.BLOCK_CHANGE = BLOCK_CHANGE;
-
-/**
- * Name of event that moves a block. Will be deprecated for BLOCK_MOVE.
- * @const
- * @alias Blockly.Events.MOVE
- */
-const MOVE = 'move';
-exports.MOVE = MOVE;
-
-/**
- * Name of event that moves a block.
- * @const
- * @alias Blockly.Events.BLOCK_MOVE
- */
-const BLOCK_MOVE = MOVE;
-exports.BLOCK_MOVE = BLOCK_MOVE;
-
-/**
- * Name of event that creates a variable.
- * @const
- * @alias Blockly.Events.VAR_CREATE
- */
-const VAR_CREATE = 'var_create';
-exports.VAR_CREATE = VAR_CREATE;
-
-/**
- * Name of event that deletes a variable.
- * @const
- * @alias Blockly.Events.VAR_DELETE
- */
-const VAR_DELETE = 'var_delete';
-exports.VAR_DELETE = VAR_DELETE;
-
-/**
- * Name of event that renames a variable.
- * @const
- * @alias Blockly.Events.VAR_RENAME
- */
-const VAR_RENAME = 'var_rename';
-exports.VAR_RENAME = VAR_RENAME;
-
-/**
- * Name of generic event that records a UI change.
- * @const
- * @alias Blockly.Events.UI
- */
-const UI = 'ui';
-exports.UI = UI;
-
-/**
- * Name of event that record a block drags a block.
- * @const
- * @alias Blockly.Events.BLOCK_DRAG
- */
-const BLOCK_DRAG = 'drag';
-exports.BLOCK_DRAG = BLOCK_DRAG;
-
-/**
- * Name of event that records a change in selected element.
- * @const
- * @alias Blockly.Events.SELECTED
- */
-const SELECTED = 'selected';
-exports.SELECTED = SELECTED;
-
-/**
- * Name of event that records a click.
- * @const
- * @alias Blockly.Events.CLICK
- */
-const CLICK = 'click';
-exports.CLICK = CLICK;
-
-/**
- * Name of event that records a marker move.
- * @const
- * @alias Blockly.Events.MARKER_MOVE
- */
-const MARKER_MOVE = 'marker_move';
-exports.MARKER_MOVE = MARKER_MOVE;
-
-/**
- * Name of event that records a bubble open.
- * @const
- * @alias Blockly.Events.BUBBLE_OPEN
- */
-const BUBBLE_OPEN = 'bubble_open';
-exports.BUBBLE_OPEN = BUBBLE_OPEN;
-
-/**
- * Name of event that records a trashcan open.
- * @const
- * @alias Blockly.Events.TRASHCAN_OPEN
- */
-const TRASHCAN_OPEN = 'trashcan_open';
-exports.TRASHCAN_OPEN = TRASHCAN_OPEN;
-
-/**
- * Name of event that records a toolbox item select.
- * @const
- * @alias Blockly.Events.TOOLBOX_ITEM_SELECT
- */
-const TOOLBOX_ITEM_SELECT = 'toolbox_item_select';
-exports.TOOLBOX_ITEM_SELECT = TOOLBOX_ITEM_SELECT;
-
-/**
- * Name of event that records a theme change.
- * @const
- * @alias Blockly.Events.THEME_CHANGE
- */
-const THEME_CHANGE = 'theme_change';
-exports.THEME_CHANGE = THEME_CHANGE;
-
-/**
- * Name of event that records a viewport change.
- * @const
- * @alias Blockly.Events.VIEWPORT_CHANGE
- */
-const VIEWPORT_CHANGE = 'viewport_change';
-exports.VIEWPORT_CHANGE = VIEWPORT_CHANGE;
-
-/**
- * Name of event that creates a comment.
- * @const
- * @alias Blockly.Events.COMMENT_CREATE
- */
-const COMMENT_CREATE = 'comment_create';
-exports.COMMENT_CREATE = COMMENT_CREATE;
-
-/**
- * Name of event that deletes a comment.
- * @const
- * @alias Blockly.Events.COMMENT_DELETE
- */
-const COMMENT_DELETE = 'comment_delete';
-exports.COMMENT_DELETE = COMMENT_DELETE;
-
-/**
- * Name of event that changes a comment.
- * @const
- * @alias Blockly.Events.COMMENT_CHANGE
- */
-const COMMENT_CHANGE = 'comment_change';
-exports.COMMENT_CHANGE = COMMENT_CHANGE;
-
-/**
- * Name of event that moves a comment.
- * @const
- * @alias Blockly.Events.COMMENT_MOVE
- */
-const COMMENT_MOVE = 'comment_move';
-exports.COMMENT_MOVE = COMMENT_MOVE;
-
-/**
- * Name of event that records a workspace load.
- * @alias Blockly.Events.FINISHED_LOADING
- */
-const FINISHED_LOADING = 'finished_loading';
-exports.FINISHED_LOADING = FINISHED_LOADING;
-
-/**
- * Type of events that cause objects to be bumped back into the visible
- * portion of the workspace.
- *
- * Not to be confused with bumping so that disconnected connections do not
- * appear connected.
- * @typedef {!BlockCreate|!BlockMove|
- * !CommentCreate|!CommentMove}
- * @alias Blockly.Events.BumpEvent
- */
-let BumpEvent;
-exports.BumpEvent = BumpEvent;
-
-/**
- * List of events that cause objects to be bumped back into the visible
- * portion of the workspace.
- *
- * Not to be confused with bumping so that disconnected connections do not
- * appear connected.
- * @const
- * @alias Blockly.Events.BUMP_EVENTS
- */
-const BUMP_EVENTS = [BLOCK_CREATE, BLOCK_MOVE, COMMENT_CREATE, COMMENT_MOVE];
-exports.BUMP_EVENTS = BUMP_EVENTS;
-
-/**
- * List of events queued for firing.
- */
-const FIRE_QUEUE = [];
-
-/**
- * Create a custom event and fire it.
- * @param {!Abstract} event Custom data for event.
- * @alias Blockly.Events.fire
- */
-const fire = function(event) {
-  if (!isEnabled()) {
-    return;
-  }
-  if (!FIRE_QUEUE.length) {
-    // First event added; schedule a firing of the event queue.
-    setTimeout(fireNow, 0);
-  }
-  FIRE_QUEUE.push(event);
-};
-exports.fire = fire;
-
-/**
- * Fire all queued events.
- */
-const fireNow = function() {
-  const queue = filter(FIRE_QUEUE, true);
-  FIRE_QUEUE.length = 0;
-  for (let i = 0, event; (event = queue[i]); i++) {
-    if (!event.workspaceId) {
-      continue;
-    }
-    const Workspace = goog.module.get('Blockly.Workspace');
-    const eventWorkspace = Workspace.getById(event.workspaceId);
-    if (eventWorkspace) {
-      eventWorkspace.fireChangeListener(event);
-    }
-  }
-};
-
-/**
- * Filter the queued events and merge duplicates.
- * @param {!Array<!Abstract>} queueIn Array of events.
- * @param {boolean} forward True if forward (redo), false if backward (undo).
- * @return {!Array<!Abstract>} Array of filtered events.
- * @alias Blockly.Events.filter
- */
-const filter = function(queueIn, forward) {
-  let queue = queueIn.slice();  // Shallow copy of queue.
-  if (!forward) {
-    // Undo is merged in reverse order.
-    queue.reverse();
-  }
-  const mergedQueue = [];
-  const hash = Object.create(null);
-  // Merge duplicates.
-  for (let i = 0, event; (event = queue[i]); i++) {
-    if (!event.isNull()) {
-      // Treat all UI events as the same type in hash table.
-      const eventType = event.isUiEvent ? UI : event.type;
-      const key = [eventType, event.blockId, event.workspaceId].join(' ');
-
-      const lastEntry = hash[key];
-      const lastEvent = lastEntry ? lastEntry.event : null;
-      if (!lastEntry) {
-        // Each item in the hash table has the event and the index of that event
-        // in the input array.  This lets us make sure we only merge adjacent
-        // move events.
-        hash[key] = {event: event, index: i};
-        mergedQueue.push(event);
-      } else if (event.type == MOVE && lastEntry.index == i - 1) {
-        // Merge move events.
-        lastEvent.newParentId = event.newParentId;
-        lastEvent.newInputName = event.newInputName;
-        lastEvent.newCoordinate = event.newCoordinate;
-        lastEntry.index = i;
-      } else if (
-          event.type == CHANGE && event.element == lastEvent.element &&
-          event.name == lastEvent.name) {
-        // Merge change events.
-        lastEvent.newValue = event.newValue;
-      } else if (event.type == VIEWPORT_CHANGE) {
-        // Merge viewport change events.
-        lastEvent.viewTop = event.viewTop;
-        lastEvent.viewLeft = event.viewLeft;
-        lastEvent.scale = event.scale;
-        lastEvent.oldScale = event.oldScale;
-      } else if (event.type == CLICK && lastEvent.type == BUBBLE_OPEN) {
-        // Drop click events caused by opening/closing bubbles.
-      } else {
-        // Collision: newer events should merge into this event to maintain
-        // order.
-        hash[key] = {event: event, index: i};
-        mergedQueue.push(event);
-      }
-    }
-  }
-  // Filter out any events that have become null due to merging.
-  queue = mergedQueue.filter(function(e) {
-    return !e.isNull();
-  });
-  if (!forward) {
-    // Restore undo order.
-    queue.reverse();
-  }
-  // Move mutation events to the top of the queue.
-  // Intentionally skip first event.
-  for (let i = 1, event; (event = queue[i]); i++) {
-    if (event.type == CHANGE && event.element == 'mutation') {
-      queue.unshift(queue.splice(i, 1)[0]);
-    }
-  }
-  return queue;
-};
-exports.filter = filter;
-
-/**
- * Modify pending undo events so that when they are fired they don't land
- * in the undo stack.  Called by Workspace.clearUndo.
- * @alias Blockly.Events.clearPendingUndo
- */
-const clearPendingUndo = function() {
-  for (let i = 0, event; (event = FIRE_QUEUE[i]); i++) {
-    event.recordUndo = false;
-  }
-};
-exports.clearPendingUndo = clearPendingUndo;
-
-/**
- * Stop sending events.  Every call to this function MUST also call enable.
- * @alias Blockly.Events.disable
- */
-const disable = function() {
-  disabled++;
-};
-exports.disable = disable;
-
-/**
- * Start sending events.  Unless events were already disabled when the
- * corresponding call to disable was made.
- * @alias Blockly.Events.enable
- */
-const enable = function() {
-  disabled--;
-};
-exports.enable = enable;
-
-/**
- * Returns whether events may be fired or not.
- * @return {boolean} True if enabled.
- * @alias Blockly.Events.isEnabled
- */
-const isEnabled = function() {
-  return disabled == 0;
-};
-exports.isEnabled = isEnabled;
-
-/**
- * Current group.
- * @return {string} ID string.
- * @alias Blockly.Events.getGroup
- */
-const getGroup = function() {
-  return group;
-};
-exports.getGroup = getGroup;
-
-/**
- * Start or stop a group.
- * @param {boolean|string} state True to start new group, false to end group.
- *   String to set group explicitly.
- * @alias Blockly.Events.setGroup
- */
-const setGroup = function(state) {
-  if (typeof state == 'boolean') {
-    group = state ? idGenerator.genUid() : '';
-  } else {
-    group = state;
-  }
-};
-exports.setGroup = setGroup;
-
-/**
- * Compute a list of the IDs of the specified block and all its descendants.
- * @param {!Block} block The root block.
- * @return {!Array<string>} List of block IDs.
- * @alias Blockly.Events.getDescendantIds
- */
-const getDescendantIds = function(block) {
-  const ids = [];
-  const descendants = block.getDescendants(false);
-  for (let i = 0, descendant; (descendant = descendants[i]); i++) {
-    ids[i] = descendant.id;
-  }
-  return ids;
-};
-/** @package */
-exports.getDescendantIds = getDescendantIds;
-
-/**
- * Decode the JSON into an event.
- * @param {!Object} json JSON representation.
- * @param {!Workspace} workspace Target workspace for event.
- * @return {!Abstract} The event represented by the JSON.
- * @throws {Error} if an event type is not found in the registry.
- * @alias Blockly.Events.fromJson
- */
-const fromJson = function(json, workspace) {
-  const eventClass = get(json.type);
-  if (!eventClass) {
-    throw Error('Unknown event type.');
-  }
-  const event = new eventClass();
-  event.fromJson(json);
-  event.workspaceId = workspace.id;
-  return event;
-};
-exports.fromJson = fromJson;
-
-/**
- * Gets the class for a specific event type from the registry.
- * @param {string} eventType The type of the event to get.
- * @return {?function(new:Abstract, ...?)} The event class with
- *     the given type or null if none exists.
- * @alias Blockly.Events.get
- */
-const get = function(eventType) {
-  return registry.getClass(registry.Type.EVENT, eventType);
-};
-exports.get = get;
-
-/**
- * Enable/disable a block depending on whether it is properly connected.
- * Use this on applications where all blocks should be connected to a top block.
- * Recommend setting the 'disable' option to 'false' in the config so that
- * users don't try to re-enable disabled orphan blocks.
- * @param {!Abstract} event Custom data for event.
- * @alias Blockly.Events.disableOrphans
- */
-const disableOrphans = function(event) {
-  if (event.type == MOVE || event.type == CREATE) {
-    if (!event.workspaceId) {
-      return;
-    }
-    const Workspace = goog.module.get('Blockly.Workspace');
-    const eventWorkspace = Workspace.getById(event.workspaceId);
-    let block = eventWorkspace.getBlockById(event.blockId);
-    if (block) {
-      // Changing blocks as part of this event shouldn't be undoable.
-      const initialUndoFlag = recordUndo;
-      try {
-        recordUndo = false;
-        const parent = block.getParent();
-        if (parent && parent.isEnabled()) {
-          const children = block.getDescendants(false);
-          for (let i = 0, child; (child = children[i]); i++) {
-            child.setEnabled(true);
-          }
-        } else if (
-            (block.outputConnection || block.previousConnection) &&
-            !eventWorkspace.isDragging()) {
-          do {
-            block.setEnabled(false);
-            block = block.getNextBlock();
-          } while (block);
-        }
-      } finally {
-        recordUndo = initialUndoFlag;
-      }
-    }
-  }
-};
-exports.disableOrphans = disableOrphans;
-
-exports.TEST_ONLY = {FIRE_QUEUE, fireNow};
diff --git a/core/events/events_abstract.js b/core/events/events_abstract.js
index eff43fdac..051ea4960 100644
--- a/core/events/events_abstract.js
+++ b/core/events/events_abstract.js
@@ -12,9 +12,8 @@
 'use strict';
 
 goog.module('Blockly.Events.Abstract');
-goog.module.declareLegacyNamespace();
 
-const Events = goog.require('Blockly.Events');
+const eventUtils = goog.require('Blockly.Events.utils');
 /* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
 
@@ -42,13 +41,13 @@ const Abstract = function() {
    * perspective, and should be undone together.
    * @type {string}
    */
-  this.group = Events.getGroup();
+  this.group = eventUtils.getGroup();
 
   /**
    * Sets whether the event should be added to the undo stack.
    * @type {boolean}
    */
-  this.recordUndo = Events.getRecordUndo();
+  this.recordUndo = eventUtils.getRecordUndo();
 };
 
 /**
diff --git a/core/events/events_block_base.js b/core/events/events_block_base.js
index 96cf24dc3..62769dc2b 100644
--- a/core/events/events_block_base.js
+++ b/core/events/events_block_base.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.Events.BlockBase');
-goog.module.declareLegacyNamespace();
 
 const Abstract = goog.require('Blockly.Events.Abstract');
 const object = goog.require('Blockly.utils.object');
diff --git a/core/events/events_block_change.js b/core/events/events_block_change.js
index 3b7d9d188..526d09bc6 100644
--- a/core/events/events_block_change.js
+++ b/core/events/events_block_change.js
@@ -11,11 +11,10 @@
 'use strict';
 
 goog.module('Blockly.Events.BlockChange');
-goog.module.declareLegacyNamespace();
 
 const BlockBase = goog.require('Blockly.Events.BlockBase');
-const Events = goog.require('Blockly.Events');
 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 */
@@ -52,7 +51,7 @@ object.inherits(BlockChange, BlockBase);
  * Type of this event.
  * @type {string}
  */
-BlockChange.prototype.type = Events.BLOCK_CHANGE;
+BlockChange.prototype.type = eventUtils.BLOCK_CHANGE;
 
 /**
  * Encode the event as JSON.
@@ -136,7 +135,7 @@ BlockChange.prototype.run = function(forward) {
         block.domToMutation(
             Xml.textToDom(/** @type {string} */ (value) || '<mutation/>'));
       }
-      Events.fire(new BlockChange(block, 'mutation', null, oldState, value));
+      eventUtils.fire(new BlockChange(block, 'mutation', null, oldState, value));
       break;
     }
     default:
@@ -164,6 +163,6 @@ BlockChange.getExtraBlockState_ = function(block) {
   return '';
 };
 
-registry.register(registry.Type.EVENT, Events.CHANGE, BlockChange);
+registry.register(registry.Type.EVENT, eventUtils.CHANGE, BlockChange);
 
 exports = BlockChange;
diff --git a/core/events/events_block_create.js b/core/events/events_block_create.js
index a43c2985b..acf9e8824 100644
--- a/core/events/events_block_create.js
+++ b/core/events/events_block_create.js
@@ -11,12 +11,11 @@
 'use strict';
 
 goog.module('Blockly.Events.BlockCreate');
-goog.module.declareLegacyNamespace();
 
 const BlockBase = goog.require('Blockly.Events.BlockBase');
-const Events = goog.require('Blockly.Events');
 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');
 /* eslint-disable-next-line no-unused-vars */
@@ -41,7 +40,7 @@ const BlockCreate = function(opt_block) {
   }
 
   this.xml = Xml.blockToDomWithXY(opt_block);
-  this.ids = Events.getDescendantIds(opt_block);
+  this.ids = eventUtils.getDescendantIds(opt_block);
 
   /**
    * JSON representation of the block that was just created.
@@ -56,7 +55,7 @@ object.inherits(BlockCreate, BlockBase);
  * Type of this event.
  * @type {string}
  */
-BlockCreate.prototype.type = Events.BLOCK_CREATE;
+BlockCreate.prototype.type = eventUtils.BLOCK_CREATE;
 
 /**
  * Encode the event as JSON.
@@ -109,6 +108,6 @@ BlockCreate.prototype.run = function(forward) {
   }
 };
 
-registry.register(registry.Type.EVENT, Events.CREATE, BlockCreate);
+registry.register(registry.Type.EVENT, eventUtils.CREATE, BlockCreate);
 
 exports = BlockCreate;
diff --git a/core/events/events_block_delete.js b/core/events/events_block_delete.js
index 023023322..5a7e03cc6 100644
--- a/core/events/events_block_delete.js
+++ b/core/events/events_block_delete.js
@@ -11,12 +11,11 @@
 'use strict';
 
 goog.module('Blockly.Events.BlockDelete');
-goog.module.declareLegacyNamespace();
 
 const BlockBase = goog.require('Blockly.Events.BlockBase');
-const Events = goog.require('Blockly.Events');
 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');
 /* eslint-disable-next-line no-unused-vars */
@@ -44,7 +43,7 @@ const BlockDelete = function(opt_block) {
   }
 
   this.oldXml = Xml.blockToDomWithXY(opt_block);
-  this.ids = Events.getDescendantIds(opt_block);
+  this.ids = eventUtils.getDescendantIds(opt_block);
 
   /**
    * Was the block that was just deleted a shadow?
@@ -65,7 +64,7 @@ object.inherits(BlockDelete, BlockBase);
  * Type of this event.
  * @type {string}
  */
-BlockDelete.prototype.type = Events.BLOCK_DELETE;
+BlockDelete.prototype.type = eventUtils.BLOCK_DELETE;
 
 /**
  * Encode the event as JSON.
@@ -121,6 +120,6 @@ BlockDelete.prototype.run = function(forward) {
   }
 };
 
-registry.register(registry.Type.EVENT, Events.DELETE, BlockDelete);
+registry.register(registry.Type.EVENT, eventUtils.DELETE, BlockDelete);
 
 exports = BlockDelete;
diff --git a/core/events/events_block_drag.js b/core/events/events_block_drag.js
index caef95ba7..3e36d6588 100644
--- a/core/events/events_block_drag.js
+++ b/core/events/events_block_drag.js
@@ -11,10 +11,9 @@
 'use strict';
 
 goog.module('Blockly.Events.BlockDrag');
-goog.module.declareLegacyNamespace();
 
-const Events = goog.require('Blockly.Events');
 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 */
@@ -55,7 +54,7 @@ object.inherits(BlockDrag, UiBase);
  * Type of this event.
  * @type {string}
  */
-BlockDrag.prototype.type = Events.BLOCK_DRAG;
+BlockDrag.prototype.type = eventUtils.BLOCK_DRAG;
 
 /**
  * Encode the event as JSON.
@@ -80,6 +79,6 @@ BlockDrag.prototype.fromJson = function(json) {
   this.blocks = json['blocks'];
 };
 
-registry.register(registry.Type.EVENT, Events.BLOCK_DRAG, BlockDrag);
+registry.register(registry.Type.EVENT, eventUtils.BLOCK_DRAG, BlockDrag);
 
 exports = BlockDrag;
diff --git a/core/events/events_block_move.js b/core/events/events_block_move.js
index b88ce762b..036c97a64 100644
--- a/core/events/events_block_move.js
+++ b/core/events/events_block_move.js
@@ -11,11 +11,10 @@
 'use strict';
 
 goog.module('Blockly.Events.BlockMove');
-goog.module.declareLegacyNamespace();
 
 const BlockBase = goog.require('Blockly.Events.BlockBase');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
-const Events = goog.require('Blockly.Events');
+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 */
@@ -51,7 +50,7 @@ object.inherits(BlockMove, BlockBase);
  * Type of this event.
  * @type {string}
  */
-BlockMove.prototype.type = Events.BLOCK_MOVE;
+BlockMove.prototype.type = eventUtils.BLOCK_MOVE;
 
 /**
  * Encode the event as JSON.
@@ -183,6 +182,6 @@ BlockMove.prototype.run = function(forward) {
   }
 };
 
-registry.register(registry.Type.EVENT, Events.MOVE, BlockMove);
+registry.register(registry.Type.EVENT, eventUtils.MOVE, BlockMove);
 
 exports = BlockMove;
diff --git a/core/events/events_bubble_open.js b/core/events/events_bubble_open.js
index 5c2718c02..dd4611ffe 100644
--- a/core/events/events_bubble_open.js
+++ b/core/events/events_bubble_open.js
@@ -11,10 +11,9 @@
 'use strict';
 
 goog.module('Blockly.Events.BubbleOpen');
-goog.module.declareLegacyNamespace();
 
-const Events = goog.require('Blockly.Events');
 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 */
@@ -56,7 +55,7 @@ object.inherits(BubbleOpen, UiBase);
  * Type of this event.
  * @type {string}
  */
-BubbleOpen.prototype.type = Events.BUBBLE_OPEN;
+BubbleOpen.prototype.type = eventUtils.BUBBLE_OPEN;
 
 /**
  * Encode the event as JSON.
@@ -81,6 +80,6 @@ BubbleOpen.prototype.fromJson = function(json) {
   this.blockId = json['blockId'];
 };
 
-registry.register(registry.Type.EVENT, Events.BUBBLE_OPEN, BubbleOpen);
+registry.register(registry.Type.EVENT, eventUtils.BUBBLE_OPEN, BubbleOpen);
 
 exports = BubbleOpen;
diff --git a/core/events/events_click.js b/core/events/events_click.js
index 3b3ca8ad2..ea64c7446 100644
--- a/core/events/events_click.js
+++ b/core/events/events_click.js
@@ -11,15 +11,15 @@
 'use strict';
 
 goog.module('Blockly.Events.Click');
-goog.module.declareLegacyNamespace();
 
-const Events = goog.require('Blockly.Events');
 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');
 
+
 /**
  * Class for a click event.
  * @param {?Block=} opt_block The affected block. Null for click events
@@ -49,7 +49,7 @@ object.inherits(Click, UiBase);
  * Type of this event.
  * @type {string}
  */
-Click.prototype.type = Events.CLICK;
+Click.prototype.type = eventUtils.CLICK;
 
 /**
  * Encode the event as JSON.
@@ -74,6 +74,6 @@ Click.prototype.fromJson = function(json) {
   this.blockId = json['blockId'];
 };
 
-registry.register(registry.Type.EVENT, Events.CLICK, Click);
+registry.register(registry.Type.EVENT, eventUtils.CLICK, Click);
 
 exports = Click;
diff --git a/core/events/events_comment_base.js b/core/events/events_comment_base.js
index 59880d3db..a3ecd866c 100644
--- a/core/events/events_comment_base.js
+++ b/core/events/events_comment_base.js
@@ -11,13 +11,16 @@
 'use strict';
 
 goog.module('Blockly.Events.CommentBase');
-goog.module.declareLegacyNamespace();
 
 const AbstractEvents = goog.require('Blockly.Events.Abstract');
-const Events = goog.require('Blockly.Events');
+/* 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');
 
@@ -54,13 +57,13 @@ const CommentBase = function(opt_comment) {
    * perspective, and should be undone together.
    * @type {string}
    */
-  this.group = Events.getGroup();
+  this.group = eventUtils.getGroup();
 
   /**
    * Sets whether the event should be added to the undo stack.
    * @type {boolean}
    */
-  this.recordUndo = Events.getRecordUndo();
+  this.recordUndo = eventUtils.getRecordUndo();
 };
 object.inherits(CommentBase, AbstractEvents);
 
@@ -87,7 +90,7 @@ CommentBase.prototype.fromJson = function(json) {
 
 /**
  * Helper function for Comment[Create|Delete]
- * @param {!Events.CommentCreate|!Events.CommentDelete} event
+ * @param {!CommentCreate|!CommentDelete} event
  *     The event to run.
  * @param {boolean} create if True then Create, if False then Delete
  */
diff --git a/core/events/events_comment_change.js b/core/events/events_comment_change.js
index 458785db3..7289d2779 100644
--- a/core/events/events_comment_change.js
+++ b/core/events/events_comment_change.js
@@ -11,12 +11,11 @@
 'use strict';
 
 goog.module('Blockly.Events.CommentChange');
-goog.module.declareLegacyNamespace();
 
 const CommentBase = goog.require('Blockly.Events.CommentBase');
-const Events = goog.require('Blockly.Events');
 /* 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');
 
@@ -47,7 +46,7 @@ object.inherits(CommentChange, CommentBase);
  * Type of this event.
  * @type {string}
  */
-CommentChange.prototype.type = Events.COMMENT_CHANGE;
+CommentChange.prototype.type = eventUtils.COMMENT_CHANGE;
 
 /**
  * Encode the event as JSON.
@@ -94,6 +93,6 @@ CommentChange.prototype.run = function(forward) {
   comment.setContent(contents);
 };
 
-registry.register(registry.Type.EVENT, Events.COMMENT_CHANGE, CommentChange);
+registry.register(registry.Type.EVENT, eventUtils.COMMENT_CHANGE, CommentChange);
 
 exports = CommentChange;
diff --git a/core/events/events_comment_create.js b/core/events/events_comment_create.js
index 330d6ce4e..9964fc135 100644
--- a/core/events/events_comment_create.js
+++ b/core/events/events_comment_create.js
@@ -11,13 +11,12 @@
 'use strict';
 
 goog.module('Blockly.Events.CommentCreate');
-goog.module.declareLegacyNamespace();
 
 const CommentBase = goog.require('Blockly.Events.CommentBase');
-const Events = goog.require('Blockly.Events');
 /* 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');
 
@@ -43,7 +42,7 @@ object.inherits(CommentCreate, CommentBase);
  * Type of this event.
  * @type {string}
  */
-CommentCreate.prototype.type = Events.COMMENT_CREATE;
+CommentCreate.prototype.type = eventUtils.COMMENT_CREATE;
 
 /**
  * Encode the event as JSON.
@@ -73,6 +72,6 @@ CommentCreate.prototype.run = function(forward) {
   CommentBase.CommentCreateDeleteHelper(this, forward);
 };
 
-registry.register(registry.Type.EVENT, Events.COMMENT_CREATE, CommentCreate);
+registry.register(registry.Type.EVENT, eventUtils.COMMENT_CREATE, CommentCreate);
 
 exports = CommentCreate;
diff --git a/core/events/events_comment_delete.js b/core/events/events_comment_delete.js
index 85db6cb83..b33a154d7 100644
--- a/core/events/events_comment_delete.js
+++ b/core/events/events_comment_delete.js
@@ -11,12 +11,11 @@
 'use strict';
 
 goog.module('Blockly.Events.CommentDelete');
-goog.module.declareLegacyNamespace();
 
 const CommentBase = goog.require('Blockly.Events.CommentBase');
-const Events = goog.require('Blockly.Events');
 /* 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');
 
@@ -42,7 +41,7 @@ object.inherits(CommentDelete, CommentBase);
  * Type of this event.
  * @type {string}
  */
-CommentDelete.prototype.type = Events.COMMENT_DELETE;
+CommentDelete.prototype.type = eventUtils.COMMENT_DELETE;
 
 /**
  * Encode the event as JSON.
@@ -70,6 +69,6 @@ CommentDelete.prototype.run = function(forward) {
   CommentBase.CommentCreateDeleteHelper(this, !forward);
 };
 
-registry.register(registry.Type.EVENT, Events.COMMENT_DELETE, CommentDelete);
+registry.register(registry.Type.EVENT, eventUtils.COMMENT_DELETE, CommentDelete);
 
 exports = CommentDelete;
diff --git a/core/events/events_comment_move.js b/core/events/events_comment_move.js
index 148bff8ad..b2f53fea8 100644
--- a/core/events/events_comment_move.js
+++ b/core/events/events_comment_move.js
@@ -11,13 +11,12 @@
 'use strict';
 
 goog.module('Blockly.Events.CommentMove');
-goog.module.declareLegacyNamespace();
 
 const CommentBase = goog.require('Blockly.Events.CommentBase');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
-const Events = goog.require('Blockly.Events');
 /* 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');
 
@@ -74,7 +73,7 @@ CommentMove.prototype.recordNew = function() {
  * Type of this event.
  * @type {string}
  */
-CommentMove.prototype.type = Events.COMMENT_MOVE;
+CommentMove.prototype.type = eventUtils.COMMENT_MOVE;
 
 /**
  * Override the location before the move.  Use this if you don't create the
@@ -147,6 +146,6 @@ CommentMove.prototype.run = function(forward) {
   comment.moveBy(target.x - current.x, target.y - current.y);
 };
 
-registry.register(registry.Type.EVENT, Events.COMMENT_MOVE, CommentMove);
+registry.register(registry.Type.EVENT, eventUtils.COMMENT_MOVE, CommentMove);
 
 exports = CommentMove;
diff --git a/core/events/events_marker_move.js b/core/events/events_marker_move.js
index 8a57736b5..3d55f0d97 100644
--- a/core/events/events_marker_move.js
+++ b/core/events/events_marker_move.js
@@ -11,17 +11,16 @@
 'use strict';
 
 goog.module('Blockly.Events.MarkerMove');
-goog.module.declareLegacyNamespace();
 
-const Events = goog.require('Blockly.Events');
 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 {ASTNode} = goog.require('Blockly.ASTNode');
 
 
 /**
@@ -74,7 +73,7 @@ object.inherits(MarkerMove, UiBase);
  * Type of this event.
  * @type {string}
  */
-MarkerMove.prototype.type = Events.MARKER_MOVE;
+MarkerMove.prototype.type = eventUtils.MARKER_MOVE;
 
 /**
  * Encode the event as JSON.
@@ -101,6 +100,6 @@ MarkerMove.prototype.fromJson = function(json) {
   this.newNode = json['newNode'];
 };
 
-registry.register(registry.Type.EVENT, Events.MARKER_MOVE, MarkerMove);
+registry.register(registry.Type.EVENT, eventUtils.MARKER_MOVE, MarkerMove);
 
 exports = MarkerMove;
diff --git a/core/events/events_selected.js b/core/events/events_selected.js
index 47fcee5df..12dba4891 100644
--- a/core/events/events_selected.js
+++ b/core/events/events_selected.js
@@ -11,11 +11,10 @@
 'use strict';
 
 goog.module('Blockly.Events.Selected');
-goog.module.declareLegacyNamespace();
 
-const Events = goog.require('Blockly.Events');
 const UiBase = goog.require('Blockly.Events.UiBase');
 const object = goog.require('Blockly.utils.object');
+const eventUtils = goog.require('Blockly.Events.utils');
 const registry = goog.require('Blockly.registry');
 
 
@@ -51,7 +50,7 @@ object.inherits(Selected, UiBase);
  * Type of this event.
  * @type {string}
  */
-Selected.prototype.type = Events.SELECTED;
+Selected.prototype.type = eventUtils.SELECTED;
 
 /**
  * Encode the event as JSON.
@@ -74,6 +73,6 @@ Selected.prototype.fromJson = function(json) {
   this.newElementId = json['newElementId'];
 };
 
-registry.register(registry.Type.EVENT, Events.SELECTED, Selected);
+registry.register(registry.Type.EVENT, eventUtils.SELECTED, Selected);
 
 exports = Selected;
diff --git a/core/events/events_theme_change.js b/core/events/events_theme_change.js
index c58d11158..13e1f35fc 100644
--- a/core/events/events_theme_change.js
+++ b/core/events/events_theme_change.js
@@ -11,10 +11,9 @@
 'use strict';
 
 goog.module('Blockly.Events.ThemeChange');
-goog.module.declareLegacyNamespace();
 
-const Events = goog.require('Blockly.Events');
 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');
 
@@ -42,7 +41,7 @@ object.inherits(ThemeChange, UiBase);
  * Type of this event.
  * @type {string}
  */
-ThemeChange.prototype.type = Events.THEME_CHANGE;
+ThemeChange.prototype.type = eventUtils.THEME_CHANGE;
 
 /**
  * Encode the event as JSON.
@@ -63,6 +62,6 @@ ThemeChange.prototype.fromJson = function(json) {
   this.themeName = json['themeName'];
 };
 
-registry.register(registry.Type.EVENT, Events.THEME_CHANGE, ThemeChange);
+registry.register(registry.Type.EVENT, eventUtils.THEME_CHANGE, ThemeChange);
 
 exports = ThemeChange;
diff --git a/core/events/events_toolbox_item_select.js b/core/events/events_toolbox_item_select.js
index 0fddaf4e9..44d0a1594 100644
--- a/core/events/events_toolbox_item_select.js
+++ b/core/events/events_toolbox_item_select.js
@@ -11,10 +11,9 @@
 'use strict';
 
 goog.module('Blockly.Events.ToolboxItemSelect');
-goog.module.declareLegacyNamespace();
 
-const Events = goog.require('Blockly.Events');
 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');
 
@@ -51,7 +50,7 @@ object.inherits(ToolboxItemSelect, UiBase);
  * Type of this event.
  * @type {string}
  */
-ToolboxItemSelect.prototype.type = Events.TOOLBOX_ITEM_SELECT;
+ToolboxItemSelect.prototype.type = eventUtils.TOOLBOX_ITEM_SELECT;
 
 /**
  * Encode the event as JSON.
@@ -75,6 +74,6 @@ ToolboxItemSelect.prototype.fromJson = function(json) {
 };
 
 registry.register(
-    registry.Type.EVENT, Events.TOOLBOX_ITEM_SELECT, ToolboxItemSelect);
+    registry.Type.EVENT, eventUtils.TOOLBOX_ITEM_SELECT, ToolboxItemSelect);
 
 exports = ToolboxItemSelect;
diff --git a/core/events/events_trashcan_open.js b/core/events/events_trashcan_open.js
index 6f5318213..1bb49dea8 100644
--- a/core/events/events_trashcan_open.js
+++ b/core/events/events_trashcan_open.js
@@ -11,10 +11,9 @@
 'use strict';
 
 goog.module('Blockly.Events.TrashcanOpen');
-goog.module.declareLegacyNamespace();
 
-const Events = goog.require('Blockly.Events');
 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');
 
@@ -43,7 +42,7 @@ object.inherits(TrashcanOpen, UiBase);
  * Type of this event.
  * @type {string}
  */
-TrashcanOpen.prototype.type = Events.TRASHCAN_OPEN;
+TrashcanOpen.prototype.type = eventUtils.TRASHCAN_OPEN;
 
 /**
  * Encode the event as JSON.
@@ -64,6 +63,6 @@ TrashcanOpen.prototype.fromJson = function(json) {
   this.isOpen = json['isOpen'];
 };
 
-registry.register(registry.Type.EVENT, Events.TRASHCAN_OPEN, TrashcanOpen);
+registry.register(registry.Type.EVENT, eventUtils.TRASHCAN_OPEN, TrashcanOpen);
 
 exports = TrashcanOpen;
diff --git a/core/events/events_ui.js b/core/events/events_ui.js
index 42a5e9bb6..44a743fef 100644
--- a/core/events/events_ui.js
+++ b/core/events/events_ui.js
@@ -12,10 +12,9 @@
 'use strict';
 
 goog.module('Blockly.Events.Ui');
-goog.module.declareLegacyNamespace();
 
-const Events = goog.require('Blockly.Events');
 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 */
@@ -49,7 +48,7 @@ object.inherits(Ui, UiBase);
  * Type of this event.
  * @type {string}
  */
-Ui.prototype.type = Events.UI;
+Ui.prototype.type = eventUtils.UI;
 
 /**
  * Encode the event as JSON.
@@ -78,6 +77,6 @@ Ui.prototype.fromJson = function(json) {
   this.blockId = json['blockId'];
 };
 
-registry.register(registry.Type.EVENT, Events.UI, Ui);
+registry.register(registry.Type.EVENT, eventUtils.UI, Ui);
 
 exports = Ui;
diff --git a/core/events/events_ui_base.js b/core/events/events_ui_base.js
index 5bcf7270c..f0204616e 100644
--- a/core/events/events_ui_base.js
+++ b/core/events/events_ui_base.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.Events.UiBase');
-goog.module.declareLegacyNamespace();
 
 const Abstract = goog.require('Blockly.Events.Abstract');
 const object = goog.require('Blockly.utils.object');
diff --git a/core/events/events_var_base.js b/core/events/events_var_base.js
index cedf349b7..20710c73c 100644
--- a/core/events/events_var_base.js
+++ b/core/events/events_var_base.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.Events.VarBase');
-goog.module.declareLegacyNamespace();
 
 const Abstract = goog.require('Blockly.Events.Abstract');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/events/events_var_create.js b/core/events/events_var_create.js
index 8db58be74..00ba59cfe 100644
--- a/core/events/events_var_create.js
+++ b/core/events/events_var_create.js
@@ -11,12 +11,11 @@
 'use strict';
 
 goog.module('Blockly.Events.VarCreate');
-goog.module.declareLegacyNamespace();
 
-const Events = goog.require('Blockly.Events');
 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');
 
@@ -43,7 +42,7 @@ object.inherits(VarCreate, VarBase);
  * Type of this event.
  * @type {string}
  */
-VarCreate.prototype.type = Events.VAR_CREATE;
+VarCreate.prototype.type = eventUtils.VAR_CREATE;
 
 /**
  * Encode the event as JSON.
@@ -79,6 +78,6 @@ VarCreate.prototype.run = function(forward) {
   }
 };
 
-registry.register(registry.Type.EVENT, Events.VAR_CREATE, VarCreate);
+registry.register(registry.Type.EVENT, eventUtils.VAR_CREATE, VarCreate);
 
 exports = VarCreate;
diff --git a/core/events/events_var_delete.js b/core/events/events_var_delete.js
index 48497bdd7..32d5644aa 100644
--- a/core/events/events_var_delete.js
+++ b/core/events/events_var_delete.js
@@ -11,12 +11,11 @@
 'use strict';
 
 goog.module('Blockly.Events.VarDelete');
-goog.module.declareLegacyNamespace();
 
-const Events = goog.require('Blockly.Events');
 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');
 
@@ -43,7 +42,7 @@ object.inherits(VarDelete, VarBase);
  * Type of this event.
  * @type {string}
  */
-VarDelete.prototype.type = Events.VAR_DELETE;
+VarDelete.prototype.type = eventUtils.VAR_DELETE;
 
 /**
  * Encode the event as JSON.
@@ -79,6 +78,6 @@ VarDelete.prototype.run = function(forward) {
   }
 };
 
-registry.register(registry.Type.EVENT, Events.VAR_DELETE, VarDelete);
+registry.register(registry.Type.EVENT, eventUtils.VAR_DELETE, VarDelete);
 
 exports = VarDelete;
diff --git a/core/events/events_var_rename.js b/core/events/events_var_rename.js
index 9fa5f7058..f7c9f8890 100644
--- a/core/events/events_var_rename.js
+++ b/core/events/events_var_rename.js
@@ -11,12 +11,11 @@
 'use strict';
 
 goog.module('Blockly.Events.VarRename');
-goog.module.declareLegacyNamespace();
 
-const Events = goog.require('Blockly.Events');
 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');
 
@@ -44,7 +43,7 @@ object.inherits(VarRename, VarBase);
  * Type of this event.
  * @type {string}
  */
-VarRename.prototype.type = Events.VAR_RENAME;
+VarRename.prototype.type = eventUtils.VAR_RENAME;
 
 /**
  * Encode the event as JSON.
@@ -80,6 +79,6 @@ VarRename.prototype.run = function(forward) {
   }
 };
 
-registry.register(registry.Type.EVENT, Events.VAR_RENAME, VarRename);
+registry.register(registry.Type.EVENT, eventUtils.VAR_RENAME, VarRename);
 
 exports = VarRename;
diff --git a/core/events/events_viewport.js b/core/events/events_viewport.js
index 2cfd94a7f..6eccd0a85 100644
--- a/core/events/events_viewport.js
+++ b/core/events/events_viewport.js
@@ -11,10 +11,9 @@
 'use strict';
 
 goog.module('Blockly.Events.ViewportChange');
-goog.module.declareLegacyNamespace();
 
-const Events = goog.require('Blockly.Events');
 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');
 
@@ -70,7 +69,7 @@ object.inherits(ViewportChange, UiBase);
  * Type of this event.
  * @type {string}
  */
-ViewportChange.prototype.type = Events.VIEWPORT_CHANGE;
+ViewportChange.prototype.type = eventUtils.VIEWPORT_CHANGE;
 
 /**
  * Encode the event as JSON.
@@ -97,6 +96,6 @@ ViewportChange.prototype.fromJson = function(json) {
   this.oldScale = json['oldScale'];
 };
 
-registry.register(registry.Type.EVENT, Events.VIEWPORT_CHANGE, ViewportChange);
+registry.register(registry.Type.EVENT, eventUtils.VIEWPORT_CHANGE, ViewportChange);
 
 exports = ViewportChange;
diff --git a/core/events/utils.js b/core/events/utils.js
new file mode 100644
index 000000000..18a42f060
--- /dev/null
+++ b/core/events/utils.js
@@ -0,0 +1,579 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Helper methods for events that are fired as a result of
+ * actions in Blockly's editor.
+ */
+'use strict';
+
+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');
+const {Block} = goog.requireType('Blockly.Block');
+
+
+/**
+ * Group ID for new events.  Grouped events are indivisible.
+ * @type {string}
+ */
+let group = '';
+
+/**
+ * Sets whether the next event should be added to the undo stack.
+ * @type {boolean}
+ */
+let recordUndo = true;
+
+/**
+ * Sets whether events should be added to the undo stack.
+ * @param {boolean} newValue True if events should be added to the undo stack.
+ * @alias Blockly.Events.setRecordUndo
+ */
+const setRecordUndo = function(newValue) {
+  recordUndo = newValue;
+};
+exports.setRecordUndo = setRecordUndo;
+
+/**
+ * Returns whether or not events will be added to the undo stack.
+ * @returns {boolean} True if events will be added to the undo stack.
+ * @alias Blockly.Events.getRecordUndo
+ */
+const getRecordUndo = function() {
+  return recordUndo;
+};
+exports.getRecordUndo = getRecordUndo;
+
+/**
+ * Allow change events to be created and fired.
+ * @type {number}
+ */
+let disabled = 0;
+
+/**
+ * Name of event that creates a block. Will be deprecated for BLOCK_CREATE.
+ * @const
+ * @alias Blockly.Events.CREATE
+ */
+const CREATE = 'create';
+exports.CREATE = CREATE;
+
+/**
+ * Name of event that creates a block.
+ * @const
+ * @alias Blockly.Events.BLOCK_CREATE
+ */
+const BLOCK_CREATE = CREATE;
+exports.BLOCK_CREATE = BLOCK_CREATE;
+
+/**
+ * Name of event that deletes a block. Will be deprecated for BLOCK_DELETE.
+ * @const
+ * @alias Blockly.Events.DELETE
+ */
+const DELETE = 'delete';
+exports.DELETE = DELETE;
+
+/**
+ * Name of event that deletes a block.
+ * @const
+ * @alias Blockly.Events.BLOCK_DELETE
+ */
+const BLOCK_DELETE = DELETE;
+exports.BLOCK_DELETE = BLOCK_DELETE;
+
+/**
+ * Name of event that changes a block. Will be deprecated for BLOCK_CHANGE.
+ * @const
+ * @alias Blockly.Events.CHANGE
+ */
+const CHANGE = 'change';
+exports.CHANGE = CHANGE;
+
+/**
+ * Name of event that changes a block.
+ * @const
+ * @alias Blockly.Events.BLOCK_CHANGE
+ */
+const BLOCK_CHANGE = CHANGE;
+exports.BLOCK_CHANGE = BLOCK_CHANGE;
+
+/**
+ * Name of event that moves a block. Will be deprecated for BLOCK_MOVE.
+ * @const
+ * @alias Blockly.Events.MOVE
+ */
+const MOVE = 'move';
+exports.MOVE = MOVE;
+
+/**
+ * Name of event that moves a block.
+ * @const
+ * @alias Blockly.Events.BLOCK_MOVE
+ */
+const BLOCK_MOVE = MOVE;
+exports.BLOCK_MOVE = BLOCK_MOVE;
+
+/**
+ * Name of event that creates a variable.
+ * @const
+ * @alias Blockly.Events.VAR_CREATE
+ */
+const VAR_CREATE = 'var_create';
+exports.VAR_CREATE = VAR_CREATE;
+
+/**
+ * Name of event that deletes a variable.
+ * @const
+ * @alias Blockly.Events.VAR_DELETE
+ */
+const VAR_DELETE = 'var_delete';
+exports.VAR_DELETE = VAR_DELETE;
+
+/**
+ * Name of event that renames a variable.
+ * @const
+ * @alias Blockly.Events.VAR_RENAME
+ */
+const VAR_RENAME = 'var_rename';
+exports.VAR_RENAME = VAR_RENAME;
+
+/**
+ * Name of generic event that records a UI change.
+ * @const
+ * @alias Blockly.Events.UI
+ */
+const UI = 'ui';
+exports.UI = UI;
+
+/**
+ * Name of event that record a block drags a block.
+ * @const
+ * @alias Blockly.Events.BLOCK_DRAG
+ */
+const BLOCK_DRAG = 'drag';
+exports.BLOCK_DRAG = BLOCK_DRAG;
+
+/**
+ * Name of event that records a change in selected element.
+ * @const
+ * @alias Blockly.Events.SELECTED
+ */
+const SELECTED = 'selected';
+exports.SELECTED = SELECTED;
+
+/**
+ * Name of event that records a click.
+ * @const
+ * @alias Blockly.Events.CLICK
+ */
+const CLICK = 'click';
+exports.CLICK = CLICK;
+
+/**
+ * Name of event that records a marker move.
+ * @const
+ * @alias Blockly.Events.MARKER_MOVE
+ */
+const MARKER_MOVE = 'marker_move';
+exports.MARKER_MOVE = MARKER_MOVE;
+
+/**
+ * Name of event that records a bubble open.
+ * @const
+ * @alias Blockly.Events.BUBBLE_OPEN
+ */
+const BUBBLE_OPEN = 'bubble_open';
+exports.BUBBLE_OPEN = BUBBLE_OPEN;
+
+/**
+ * Name of event that records a trashcan open.
+ * @const
+ * @alias Blockly.Events.TRASHCAN_OPEN
+ */
+const TRASHCAN_OPEN = 'trashcan_open';
+exports.TRASHCAN_OPEN = TRASHCAN_OPEN;
+
+/**
+ * Name of event that records a toolbox item select.
+ * @const
+ * @alias Blockly.Events.TOOLBOX_ITEM_SELECT
+ */
+const TOOLBOX_ITEM_SELECT = 'toolbox_item_select';
+exports.TOOLBOX_ITEM_SELECT = TOOLBOX_ITEM_SELECT;
+
+/**
+ * Name of event that records a theme change.
+ * @const
+ * @alias Blockly.Events.THEME_CHANGE
+ */
+const THEME_CHANGE = 'theme_change';
+exports.THEME_CHANGE = THEME_CHANGE;
+
+/**
+ * Name of event that records a viewport change.
+ * @const
+ * @alias Blockly.Events.VIEWPORT_CHANGE
+ */
+const VIEWPORT_CHANGE = 'viewport_change';
+exports.VIEWPORT_CHANGE = VIEWPORT_CHANGE;
+
+/**
+ * Name of event that creates a comment.
+ * @const
+ * @alias Blockly.Events.COMMENT_CREATE
+ */
+const COMMENT_CREATE = 'comment_create';
+exports.COMMENT_CREATE = COMMENT_CREATE;
+
+/**
+ * Name of event that deletes a comment.
+ * @const
+ * @alias Blockly.Events.COMMENT_DELETE
+ */
+const COMMENT_DELETE = 'comment_delete';
+exports.COMMENT_DELETE = COMMENT_DELETE;
+
+/**
+ * Name of event that changes a comment.
+ * @const
+ * @alias Blockly.Events.COMMENT_CHANGE
+ */
+const COMMENT_CHANGE = 'comment_change';
+exports.COMMENT_CHANGE = COMMENT_CHANGE;
+
+/**
+ * Name of event that moves a comment.
+ * @const
+ * @alias Blockly.Events.COMMENT_MOVE
+ */
+const COMMENT_MOVE = 'comment_move';
+exports.COMMENT_MOVE = COMMENT_MOVE;
+
+/**
+ * Name of event that records a workspace load.
+ * @alias Blockly.Events.FINISHED_LOADING
+ */
+const FINISHED_LOADING = 'finished_loading';
+exports.FINISHED_LOADING = FINISHED_LOADING;
+
+/**
+ * Type of events that cause objects to be bumped back into the visible
+ * portion of the workspace.
+ *
+ * Not to be confused with bumping so that disconnected connections do not
+ * appear connected.
+ * @typedef {!BlockCreate|!BlockMove|
+ * !CommentCreate|!CommentMove}
+ * @alias Blockly.Events.BumpEvent
+ */
+let BumpEvent;
+exports.BumpEvent = BumpEvent;
+
+/**
+ * List of events that cause objects to be bumped back into the visible
+ * portion of the workspace.
+ *
+ * Not to be confused with bumping so that disconnected connections do not
+ * appear connected.
+ * @const
+ * @alias Blockly.Events.BUMP_EVENTS
+ */
+const BUMP_EVENTS = [BLOCK_CREATE, BLOCK_MOVE, COMMENT_CREATE, COMMENT_MOVE];
+exports.BUMP_EVENTS = BUMP_EVENTS;
+
+/**
+ * List of events queued for firing.
+ */
+const FIRE_QUEUE = [];
+
+/**
+ * Create a custom event and fire it.
+ * @param {!Abstract} event Custom data for event.
+ * @alias Blockly.Events.fire
+ */
+const fire = function(event) {
+  if (!isEnabled()) {
+    return;
+  }
+  if (!FIRE_QUEUE.length) {
+    // First event added; schedule a firing of the event queue.
+    setTimeout(fireNow, 0);
+  }
+  FIRE_QUEUE.push(event);
+};
+exports.fire = fire;
+
+/**
+ * Fire all queued events.
+ */
+const fireNow = function() {
+  const queue = filter(FIRE_QUEUE, true);
+  FIRE_QUEUE.length = 0;
+  for (let i = 0, event; (event = queue[i]); i++) {
+    if (!event.workspaceId) {
+      continue;
+    }
+    const Workspace = goog.module.get('Blockly.Workspace');
+    const eventWorkspace = Workspace.getById(event.workspaceId);
+    if (eventWorkspace) {
+      eventWorkspace.fireChangeListener(event);
+    }
+  }
+};
+
+/**
+ * Filter the queued events and merge duplicates.
+ * @param {!Array<!Abstract>} queueIn Array of events.
+ * @param {boolean} forward True if forward (redo), false if backward (undo).
+ * @return {!Array<!Abstract>} Array of filtered events.
+ * @alias Blockly.Events.filter
+ */
+const filter = function(queueIn, forward) {
+  let queue = queueIn.slice();  // Shallow copy of queue.
+  if (!forward) {
+    // Undo is merged in reverse order.
+    queue.reverse();
+  }
+  const mergedQueue = [];
+  const hash = Object.create(null);
+  // Merge duplicates.
+  for (let i = 0, event; (event = queue[i]); i++) {
+    if (!event.isNull()) {
+      // Treat all UI events as the same type in hash table.
+      const eventType = event.isUiEvent ? UI : event.type;
+      const key = [eventType, event.blockId, event.workspaceId].join(' ');
+
+      const lastEntry = hash[key];
+      const lastEvent = lastEntry ? lastEntry.event : null;
+      if (!lastEntry) {
+        // Each item in the hash table has the event and the index of that event
+        // in the input array.  This lets us make sure we only merge adjacent
+        // move events.
+        hash[key] = {event: event, index: i};
+        mergedQueue.push(event);
+      } else if (event.type == MOVE && lastEntry.index == i - 1) {
+        // Merge move events.
+        lastEvent.newParentId = event.newParentId;
+        lastEvent.newInputName = event.newInputName;
+        lastEvent.newCoordinate = event.newCoordinate;
+        lastEntry.index = i;
+      } else if (
+          event.type == CHANGE && event.element == lastEvent.element &&
+          event.name == lastEvent.name) {
+        // Merge change events.
+        lastEvent.newValue = event.newValue;
+      } else if (event.type == VIEWPORT_CHANGE) {
+        // Merge viewport change events.
+        lastEvent.viewTop = event.viewTop;
+        lastEvent.viewLeft = event.viewLeft;
+        lastEvent.scale = event.scale;
+        lastEvent.oldScale = event.oldScale;
+      } else if (event.type == CLICK && lastEvent.type == BUBBLE_OPEN) {
+        // Drop click events caused by opening/closing bubbles.
+      } else {
+        // Collision: newer events should merge into this event to maintain
+        // order.
+        hash[key] = {event: event, index: i};
+        mergedQueue.push(event);
+      }
+    }
+  }
+  // Filter out any events that have become null due to merging.
+  queue = mergedQueue.filter(function(e) {
+    return !e.isNull();
+  });
+  if (!forward) {
+    // Restore undo order.
+    queue.reverse();
+  }
+  // Move mutation events to the top of the queue.
+  // Intentionally skip first event.
+  for (let i = 1, event; (event = queue[i]); i++) {
+    if (event.type == CHANGE && event.element == 'mutation') {
+      queue.unshift(queue.splice(i, 1)[0]);
+    }
+  }
+  return queue;
+};
+exports.filter = filter;
+
+/**
+ * Modify pending undo events so that when they are fired they don't land
+ * in the undo stack.  Called by Workspace.clearUndo.
+ * @alias Blockly.Events.clearPendingUndo
+ */
+const clearPendingUndo = function() {
+  for (let i = 0, event; (event = FIRE_QUEUE[i]); i++) {
+    event.recordUndo = false;
+  }
+};
+exports.clearPendingUndo = clearPendingUndo;
+
+/**
+ * Stop sending events.  Every call to this function MUST also call enable.
+ * @alias Blockly.Events.disable
+ */
+const disable = function() {
+  disabled++;
+};
+exports.disable = disable;
+
+/**
+ * Start sending events.  Unless events were already disabled when the
+ * corresponding call to disable was made.
+ * @alias Blockly.Events.enable
+ */
+const enable = function() {
+  disabled--;
+};
+exports.enable = enable;
+
+/**
+ * Returns whether events may be fired or not.
+ * @return {boolean} True if enabled.
+ * @alias Blockly.Events.isEnabled
+ */
+const isEnabled = function() {
+  return disabled == 0;
+};
+exports.isEnabled = isEnabled;
+
+/**
+ * Current group.
+ * @return {string} ID string.
+ * @alias Blockly.Events.getGroup
+ */
+const getGroup = function() {
+  return group;
+};
+exports.getGroup = getGroup;
+
+/**
+ * Start or stop a group.
+ * @param {boolean|string} state True to start new group, false to end group.
+ *   String to set group explicitly.
+ * @alias Blockly.Events.setGroup
+ */
+const setGroup = function(state) {
+  if (typeof state == 'boolean') {
+    group = state ? idGenerator.genUid() : '';
+  } else {
+    group = state;
+  }
+};
+exports.setGroup = setGroup;
+
+/**
+ * Compute a list of the IDs of the specified block and all its descendants.
+ * @param {!Block} block The root block.
+ * @return {!Array<string>} List of block IDs.
+ * @alias Blockly.Events.getDescendantIds
+ */
+const getDescendantIds = function(block) {
+  const ids = [];
+  const descendants = block.getDescendants(false);
+  for (let i = 0, descendant; (descendant = descendants[i]); i++) {
+    ids[i] = descendant.id;
+  }
+  return ids;
+};
+/** @package */
+exports.getDescendantIds = getDescendantIds;
+
+/**
+ * Decode the JSON into an event.
+ * @param {!Object} json JSON representation.
+ * @param {!Workspace} workspace Target workspace for event.
+ * @return {!Abstract} The event represented by the JSON.
+ * @throws {Error} if an event type is not found in the registry.
+ * @alias Blockly.Events.fromJson
+ */
+const fromJson = function(json, workspace) {
+  const eventClass = get(json.type);
+  if (!eventClass) {
+    throw Error('Unknown event type.');
+  }
+  const event = new eventClass();
+  event.fromJson(json);
+  event.workspaceId = workspace.id;
+  return event;
+};
+exports.fromJson = fromJson;
+
+/**
+ * Gets the class for a specific event type from the registry.
+ * @param {string} eventType The type of the event to get.
+ * @return {?function(new:Abstract, ...?)} The event class with
+ *     the given type or null if none exists.
+ * @alias Blockly.Events.get
+ */
+const get = function(eventType) {
+  return registry.getClass(registry.Type.EVENT, eventType);
+};
+exports.get = get;
+
+/**
+ * Enable/disable a block depending on whether it is properly connected.
+ * Use this on applications where all blocks should be connected to a top block.
+ * Recommend setting the 'disable' option to 'false' in the config so that
+ * users don't try to re-enable disabled orphan blocks.
+ * @param {!Abstract} event Custom data for event.
+ * @alias Blockly.Events.disableOrphans
+ */
+const disableOrphans = function(event) {
+  if (event.type == MOVE || event.type == CREATE) {
+    if (!event.workspaceId) {
+      return;
+    }
+    const Workspace = goog.module.get('Blockly.Workspace');
+    const eventWorkspace = Workspace.getById(event.workspaceId);
+    let block = eventWorkspace.getBlockById(event.blockId);
+    if (block) {
+      // Changing blocks as part of this event shouldn't be undoable.
+      const initialUndoFlag = recordUndo;
+      try {
+        recordUndo = false;
+        const parent = block.getParent();
+        if (parent && parent.isEnabled()) {
+          const children = block.getDescendants(false);
+          for (let i = 0, child; (child = children[i]); i++) {
+            child.setEnabled(true);
+          }
+        } else if (
+            (block.outputConnection || block.previousConnection) &&
+            !eventWorkspace.isDragging()) {
+          do {
+            block.setEnabled(false);
+            block = block.getNextBlock();
+          } while (block);
+        }
+      } finally {
+        recordUndo = initialUndoFlag;
+      }
+    }
+  }
+};
+exports.disableOrphans = disableOrphans;
+
+exports.TEST_ONLY = {
+  FIRE_QUEUE,
+  fireNow
+};
diff --git a/core/events/workspace_events.js b/core/events/workspace_events.js
index df832602e..61351375b 100644
--- a/core/events/workspace_events.js
+++ b/core/events/workspace_events.js
@@ -11,12 +11,11 @@
 'use strict';
 
 goog.module('Blockly.Events.FinishedLoading');
-goog.module.declareLegacyNamespace();
 
-const Events = goog.require('Blockly.Events');
-const EventsAbstract = goog.require('Blockly.Events.Abstract');
+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');
 
@@ -28,7 +27,7 @@ const registry = goog.require('Blockly.registry');
  * Finished loading events do not record undo or redo.
  * @param {!Workspace=} opt_workspace The workspace that has finished
  *    loading.  Undefined for a blank event.
- * @extends {EventsAbstract}
+ * @extends {Abstract}
  * @constructor
  */
 const FinishedLoading = function(opt_workspace) {
@@ -50,18 +49,18 @@ const FinishedLoading = function(opt_workspace) {
    * perspective, and should be undone together.
    * @type {string}
    */
-  this.group = Events.getGroup();
+  this.group = eventUtils.getGroup();
 
   // Workspace events do not undo or redo.
   this.recordUndo = false;
 };
-object.inherits(FinishedLoading, EventsAbstract);
+object.inherits(FinishedLoading, Abstract);
 
 /**
  * Type of this event.
  * @type {string}
  */
-FinishedLoading.prototype.type = Events.FINISHED_LOADING;
+FinishedLoading.prototype.type = eventUtils.FINISHED_LOADING;
 
 /**
  * Encode the event as JSON.
@@ -91,6 +90,6 @@ FinishedLoading.prototype.fromJson = function(json) {
 };
 
 registry.register(
-    registry.Type.EVENT, Events.FINISHED_LOADING, FinishedLoading);
+    registry.Type.EVENT, eventUtils.FINISHED_LOADING, FinishedLoading);
 
 exports = FinishedLoading;
diff --git a/core/field.js b/core/field.js
index 94695ccad..be6318797 100644
--- a/core/field.js
+++ b/core/field.js
@@ -19,7 +19,6 @@ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvid
 /* eslint-disable-next-line no-unused-vars */
 const Coordinate = goog.requireType('Blockly.utils.Coordinate');
 const DropDownDiv = goog.require('Blockly.DropDownDiv');
-const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const IASTNodeLocationSvg = goog.requireType('Blockly.IASTNodeLocationSvg');
 /* eslint-disable-next-line no-unused-vars */
@@ -42,6 +41,7 @@ const WidgetDiv = goog.require('Blockly.WidgetDiv');
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const Xml = goog.require('Blockly.Xml');
 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');
@@ -951,8 +951,8 @@ Field.prototype.setValue = function(newValue) {
   }
 
   this.doValueUpdate_(newValue);
-  if (source && Events.isEnabled()) {
-    Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
+  if (source && eventUtils.isEnabled()) {
+    eventUtils.fire(new (eventUtils.get(eventUtils.BLOCK_CHANGE))(
         source, 'field', this.name || null, oldValue, newValue));
   }
   if (this.isDirty_) {
diff --git a/core/field_textinput.js b/core/field_textinput.js
index 57b327d85..706ddec94 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -14,7 +14,6 @@ goog.module('Blockly.FieldTextInput');
 
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const DropDownDiv = goog.require('Blockly.DropDownDiv');
-const Events = goog.require('Blockly.Events');
 const Field = goog.require('Blockly.Field');
 const KeyCodes = goog.require('Blockly.utils.KeyCodes');
 const Msg = goog.require('Blockly.Msg');
@@ -25,6 +24,7 @@ const aria = goog.require('Blockly.utils.aria');
 const browserEvents = goog.require('Blockly.browserEvents');
 const dialog = goog.require('Blockly.dialog');
 const dom = goog.require('Blockly.utils.dom');
+const eventUtils = goog.require('Blockly.Events.utils');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const object = goog.require('Blockly.utils.object');
 const userAgent = goog.require('Blockly.utils.userAgent');
@@ -209,8 +209,8 @@ FieldTextInput.prototype.doValueInvalid_ = function(_invalidValue) {
     const oldValue = this.value_;
     // Revert value when the text becomes invalid.
     this.value_ = this.htmlInput_.untypedDefaultValue_;
-    if (this.sourceBlock_ && Events.isEnabled()) {
-      Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
+    if (this.sourceBlock_ && eventUtils.isEnabled()) {
+      eventUtils.fire(new (eventUtils.get(eventUtils.BLOCK_CHANGE))(
           this.sourceBlock_, 'field', this.name || null, oldValue,
           this.value_));
     }
@@ -339,7 +339,7 @@ FieldTextInput.prototype.showInlineEditor_ = function(quietInput) {
  * @protected
  */
 FieldTextInput.prototype.widgetCreate_ = function() {
-  Events.setGroup(true);
+  eventUtils.setGroup(true);
   const div = WidgetDiv.getDiv();
 
   dom.addClass(this.getClickTarget_(), 'editing');
@@ -401,7 +401,7 @@ FieldTextInput.prototype.widgetDispose_ = function() {
   if (this.onFinishEditing_) {
     this.onFinishEditing_(this.value_);
   }
-  Events.setGroup(false);
+  eventUtils.setGroup(false);
 
   // Actual disposal.
   this.unbindInputEvents_();
diff --git a/core/flyout_base.js b/core/flyout_base.js
index 73e3c9dc1..7793a2813 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -15,7 +15,6 @@ goog.module('Blockly.Flyout');
 const ComponentManager = goog.require('Blockly.ComponentManager');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const DeleteArea = goog.require('Blockly.DeleteArea');
-const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const FlyoutButton = goog.requireType('Blockly.FlyoutButton');
 const FlyoutMetricsManager = goog.require('Blockly.FlyoutMetricsManager');
@@ -32,6 +31,7 @@ const Xml = goog.require('Blockly.Xml');
 const blocks = goog.require('Blockly.serialization.blocks');
 const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
+const eventUtils = goog.require('Blockly.Events.utils');
 const idGenerator = goog.require('Blockly.utils.idGenerator');
 const object = goog.require('Blockly.utils.object');
 const toolbox = goog.require('Blockly.utils.toolbox');
@@ -909,13 +909,13 @@ Flyout.prototype.isBlockCreatable_ = function(block) {
  */
 Flyout.prototype.createBlock = function(originalBlock) {
   let newBlock = null;
-  Events.disable();
+  eventUtils.disable();
   const variablesBeforeCreation = this.targetWorkspace.getAllVariables();
   this.targetWorkspace.setResizesEnabled(false);
   try {
     newBlock = this.placeNewBlock_(originalBlock);
   } finally {
-    Events.enable();
+    eventUtils.enable();
   }
 
   // Close the flyout.
@@ -924,17 +924,17 @@ Flyout.prototype.createBlock = function(originalBlock) {
   const newVariables = Variables.getAddedVariables(
       this.targetWorkspace, variablesBeforeCreation);
 
-  if (Events.isEnabled()) {
-    Events.setGroup(true);
+  if (eventUtils.isEnabled()) {
+    eventUtils.setGroup(true);
     // Fire a VarCreate event for each (if any) new variable created.
     for (let i = 0; i < newVariables.length; i++) {
       const thisVariable = newVariables[i];
-      Events.fire(new (Events.get(Events.VAR_CREATE))(thisVariable));
+      eventUtils.fire(new (eventUtils.get(eventUtils.VAR_CREATE))(thisVariable));
     }
 
     // Block events come after var events, in case they refer to newly created
     // variables.
-    Events.fire(new (Events.get(Events.BLOCK_CREATE))(newBlock));
+    eventUtils.fire(new (eventUtils.get(eventUtils.BLOCK_CREATE))(newBlock));
   }
   if (this.autoClose) {
     this.hide();
diff --git a/core/gesture.js b/core/gesture.js
index f2352050e..425773140 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -15,7 +15,6 @@ goog.module('Blockly.Gesture');
 
 const BubbleDragger = goog.require('Blockly.BubbleDragger');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
-const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.Field');
 /* eslint-disable-next-line no-unused-vars */
@@ -33,6 +32,7 @@ const WorkspaceDragger = goog.require('Blockly.WorkspaceDragger');
 const blockAnimations = goog.require('Blockly.blockAnimations');
 const browserEvents = goog.require('Blockly.browserEvents');
 const common = goog.require('Blockly.common');
+const eventUtils = goog.require('Blockly.Events.utils');
 const internalConstants = goog.require('Blockly.internalConstants');
 const registry = goog.require('Blockly.registry');
 /* eslint-disable-next-line no-unused-vars */
@@ -331,8 +331,8 @@ Gesture.prototype.updateIsDraggingFromFlyout_ = function() {
     this.startWorkspace_.updateScreenCalculationsIfScrolled();
     // Start the event group now, so that the same event group is used for block
     // creation and block dragging.
-    if (!Events.getGroup()) {
-      Events.setGroup(true);
+    if (!eventUtils.getGroup()) {
+      eventUtils.setGroup(true);
     }
     // The start block is no longer relevant, because this is a drag.
     this.startBlock_ = null;
@@ -663,7 +663,7 @@ Gesture.prototype.handleWsStart = function(e, ws) {
  * @private
  */
 Gesture.prototype.fireWorkspaceClick_ = function(ws) {
-  Events.fire(new (Events.get(Events.CLICK))(null, ws.id, 'workspace'));
+  eventUtils.fire(new (eventUtils.get(eventUtils.CLICK))(null, ws.id, 'workspace'));
 };
 
 /**
@@ -745,20 +745,20 @@ Gesture.prototype.doBlockClick_ = function() {
   // Block click in an autoclosing flyout.
   if (this.flyout_ && this.flyout_.autoClose) {
     if (this.targetBlock_.isEnabled()) {
-      if (!Events.getGroup()) {
-        Events.setGroup(true);
+      if (!eventUtils.getGroup()) {
+        eventUtils.setGroup(true);
       }
       const newBlock = this.flyout_.createBlock(this.targetBlock_);
       newBlock.scheduleSnapAndBump();
     }
   } else {
     // Clicks events are on the start block, even if it was a shadow.
-    const event = new (Events.get(Events.CLICK))(
+    const event = new (eventUtils.get(eventUtils.CLICK))(
         this.startBlock_, this.startWorkspace_.id, 'block');
-    Events.fire(event);
+    eventUtils.fire(event);
   }
   this.bringBlockToFront_();
-  Events.setGroup(false);
+  eventUtils.setGroup(false);
 };
 
 /**
diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js
index 75238e9d4..1012bd867 100644
--- a/core/insertion_marker_manager.js
+++ b/core/insertion_marker_manager.js
@@ -15,7 +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');
-const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const IDeleteArea = goog.requireType('Blockly.IDeleteArea');
 /* eslint-disable-next-line no-unused-vars */
@@ -27,6 +26,7 @@ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const blockAnimations = goog.require('Blockly.blockAnimations');
 const common = goog.require('Blockly.common');
 const constants = goog.require('Blockly.constants');
+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');
@@ -175,7 +175,7 @@ InsertionMarkerManager.DUPLICATE_BLOCK_ERROR = 'The insertion marker ' +
 InsertionMarkerManager.prototype.dispose = function() {
   this.availableConnections_.length = 0;
 
-  Events.disable();
+  eventUtils.disable();
   try {
     if (this.firstMarker_) {
       this.firstMarker_.dispose();
@@ -184,7 +184,7 @@ InsertionMarkerManager.prototype.dispose = function() {
       this.lastMarker_.dispose();
     }
   } finally {
-    Events.enable();
+    eventUtils.enable();
   }
 };
 
@@ -226,9 +226,9 @@ InsertionMarkerManager.prototype.wouldConnectBlock = function() {
 InsertionMarkerManager.prototype.applyConnections = function() {
   if (this.closestConnection_) {
     // Don't fire events for insertion markers.
-    Events.disable();
+    eventUtils.disable();
     this.hidePreview_();
-    Events.enable();
+    eventUtils.enable();
     // Connect two blocks together.
     this.localConnection_.connect(this.closestConnection_);
     if (this.topBlock_.rendered) {
@@ -263,10 +263,10 @@ InsertionMarkerManager.prototype.update = function(dxy, dragTarget) {
 
   if (shouldUpdate) {
     // Don't fire events for insertion marker creation or movement.
-    Events.disable();
+    eventUtils.disable();
     this.maybeHidePreview_(candidate);
     this.maybeShowPreview_(candidate);
-    Events.enable();
+    eventUtils.enable();
   }
 };
 
@@ -281,7 +281,7 @@ InsertionMarkerManager.prototype.update = function(dxy, dragTarget) {
 InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlock) {
   const imType = sourceBlock.type;
 
-  Events.disable();
+  eventUtils.disable();
   let result;
   try {
     result = this.workspace_.newBlock(imType);
@@ -327,7 +327,7 @@ InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlock) {
     result.initSvg();
     result.getSvgRoot().setAttribute('visibility', 'hidden');
   } finally {
-    Events.enable();
+    eventUtils.enable();
   }
 
   return result;
@@ -350,11 +350,11 @@ InsertionMarkerManager.prototype.initAvailableConnections_ = function() {
     available.push(lastOnStack);
     this.lastOnStack_ = lastOnStack;
     if (this.lastMarker_) {
-      Events.disable();
+      eventUtils.disable();
       try {
         this.lastMarker_.dispose();
       } finally {
-        Events.enable();
+        eventUtils.enable();
       }
     }
     this.lastMarker_ = this.createMarkerBlock_(lastOnStack.getSourceBlock());
diff --git a/core/mutator.js b/core/mutator.js
index 0ab65c5aa..c605608a4 100644
--- a/core/mutator.js
+++ b/core/mutator.js
@@ -15,6 +15,7 @@ goog.module('Blockly.Mutator');
 
 /* eslint-disable-next-line no-unused-vars */
 const Abstract = goog.requireType('Blockly.Events.Abstract');
+const BlockChange = goog.require('Blockly.Events.BlockChange');
 /* eslint-disable-next-line no-unused-vars */
 const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
 const Bubble = goog.require('Blockly.Bubble');
@@ -22,7 +23,6 @@ const Bubble = goog.require('Blockly.Bubble');
 const Connection = goog.requireType('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
 const Coordinate = goog.requireType('Blockly.utils.Coordinate');
-const Events = goog.require('Blockly.Events');
 const Icon = goog.require('Blockly.Icon');
 const Options = goog.require('Blockly.Options');
 const Svg = goog.require('Blockly.utils.Svg');
@@ -30,6 +30,7 @@ const Svg = goog.require('Blockly.utils.Svg');
 const Workspace = goog.requireType('Blockly.Workspace');
 const WorkspaceSvg = goog.require('Blockly.WorkspaceSvg');
 const dom = goog.require('Blockly.utils.dom');
+const eventUtils = goog.require('Blockly.Events.utils');
 const internalConstants = goog.require('Blockly.internalConstants');
 const object = goog.require('Blockly.utils.object');
 const toolbox = goog.require('Blockly.utils.toolbox');
@@ -39,8 +40,6 @@ const {Block} = goog.requireType('Blockly.Block');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 /** @suppress {extraRequire} */
-goog.require('Blockly.Events.BlockChange');
-/** @suppress {extraRequire} */
 goog.require('Blockly.Events.BubbleOpen');
 
 
@@ -188,7 +187,7 @@ Mutator.prototype.createEditor_ = function() {
   }
   this.workspace_ = new WorkspaceSvg(workspaceOptions);
   this.workspace_.isMutator = true;
-  this.workspace_.addChangeListener(Events.disableOrphans);
+  this.workspace_.addChangeListener(eventUtils.disableOrphans);
 
   // Mutator flyouts go inside the mutator workspace's <g> rather than in
   // a top level SVG. Instead of handling scale themselves, mutators
@@ -294,8 +293,8 @@ Mutator.prototype.setVisible = function(visible) {
     // No change.
     return;
   }
-  Events.fire(
-      new (Events.get(Events.BUBBLE_OPEN))(this.block_, visible, 'mutator'));
+  eventUtils.fire(
+      new (eventUtils.get(eventUtils.BUBBLE_OPEN))(this.block_, visible, 'mutator'));
   if (visible) {
     // Create the bubble.
     this.bubble_ = new Bubble(
@@ -373,8 +372,8 @@ Mutator.prototype.setVisible = function(visible) {
  */
 Mutator.prototype.workspaceChanged_ = function(e) {
   if (!(e.isUiEvent ||
-      (e.type == Events.CHANGE && e.element == 'disabled') ||
-      e.type == Events.CREATE)) {
+      (e.type == eventUtils.CHANGE && e.element == 'disabled') ||
+      e.type == eventUtils.CREATE)) {
     this.updateWorkspace_();
   }
 };
@@ -414,9 +413,9 @@ Mutator.prototype.updateWorkspace_ = function() {
 
   // When the mutator's workspace changes, update the source block.
   if (this.rootBlock_.workspace == this.workspace_) {
-    Events.setGroup(true);
+    eventUtils.setGroup(true);
     const block = /** @type {!BlockSvg} */ (this.block_);
-    const oldExtraState = Events.BlockChange.getExtraBlockState_(block);
+    const oldExtraState = BlockChange.getExtraBlockState_(block);
 
     // Switch off rendering while the source block is rebuilt.
     const savedRendered = block.rendered;
@@ -434,16 +433,16 @@ Mutator.prototype.updateWorkspace_ = function() {
       block.render();
     }
 
-    const newExtraState = Events.BlockChange.getExtraBlockState_(block);
+    const newExtraState = BlockChange.getExtraBlockState_(block);
     if (oldExtraState != newExtraState) {
-      Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
+      eventUtils.fire(new (eventUtils.get(eventUtils.BLOCK_CHANGE))(
           block, 'mutation', null, oldExtraState, newExtraState));
       // Ensure that any bump is part of this mutation's event group.
-      const group = Events.getGroup();
+      const group = eventUtils.getGroup();
       setTimeout(function() {
-        Events.setGroup(group);
+        eventUtils.setGroup(group);
         block.bumpNeighbours();
-        Events.setGroup(false);
+        eventUtils.setGroup(false);
       }, internalConstants.BUMP_DELAY);
     }
 
@@ -452,7 +451,7 @@ Mutator.prototype.updateWorkspace_ = function() {
     if (!this.workspace_.isDragging()) {
       this.resizeBubble_();
     }
-    Events.setGroup(false);
+    eventUtils.setGroup(false);
   }
 };
 
diff --git a/core/procedures.js b/core/procedures.js
index ff15b4dcf..ff2081860 100644
--- a/core/procedures.js
+++ b/core/procedures.js
@@ -18,7 +18,6 @@ goog.module('Blockly.Procedures');
 
 /* eslint-disable-next-line no-unused-vars */
 const Abstract = goog.requireType('Blockly.Events.Abstract');
-const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.Field');
 const Msg = goog.require('Blockly.Msg');
@@ -28,6 +27,7 @@ const Workspace = goog.require('Blockly.Workspace');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const Xml = goog.require('Blockly.Xml');
+const eventUtils = goog.require('Blockly.Events.utils');
 const utilsXml = goog.require('Blockly.utils.xml');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
@@ -306,7 +306,7 @@ const updateMutatorFlyout = function(workspace) {
  * @alias Blockly.Procedures.mutatorOpenListener
  */
 const mutatorOpenListener = function(e) {
-  if (!(e.type == Events.BUBBLE_OPEN && e.bubbleType === 'mutator' &&
+  if (!(e.type == eventUtils.BUBBLE_OPEN && e.bubbleType === 'mutator' &&
         e.isOpen)) {
     return;
   }
@@ -329,8 +329,8 @@ exports.mutatorOpenListener = mutatorOpenListener;
  * @param {!Abstract} e The event that triggered this listener.
  */
 const mutatorChangeListener = function(e) {
-  if (e.type != Events.BLOCK_CREATE && e.type != Events.BLOCK_DELETE &&
-      e.type != Events.BLOCK_CHANGE) {
+  if (e.type != eventUtils.BLOCK_CREATE && e.type != eventUtils.BLOCK_DELETE &&
+      e.type != eventUtils.BLOCK_CHANGE) {
     return;
   }
   const workspaceId = /** @type {string} */ (e.workspaceId);
@@ -371,7 +371,7 @@ exports.getCallers = getCallers;
  * @alias Blockly.Procedures.mutateCallers
  */
 const mutateCallers = function(defBlock) {
-  const oldRecordUndo = Events.getRecordUndo();
+  const oldRecordUndo = eventUtils.getRecordUndo();
   const procedureBlock = /** @type {!ProcedureBlock} */ (defBlock);
   const name = procedureBlock.getProcedureDef()[0];
   const xmlElement = defBlock.mutationToDom(true);
@@ -386,10 +386,10 @@ const mutateCallers = function(defBlock) {
       // Fire a mutation on every caller block.  But don't record this as an
       // undo action since it is deterministically tied to the procedure's
       // definition mutation.
-      Events.setRecordUndo(false);
-      Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
+      eventUtils.setRecordUndo(false);
+      eventUtils.fire(new (eventUtils.get(eventUtils.BLOCK_CHANGE))(
           caller, 'mutation', null, oldMutation, newMutation));
-      Events.setRecordUndo(oldRecordUndo);
+      eventUtils.setRecordUndo(oldRecordUndo);
     }
   }
 };
diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index ee2a386e3..da509e4e9 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -16,11 +16,11 @@ const Connection = goog.require('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
 const ConnectionDB = goog.requireType('Blockly.ConnectionDB');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
-const Events = goog.require('Blockly.Events');
 const Svg = goog.require('Blockly.utils.Svg');
 const common = goog.require('Blockly.common');
 const deprecation = goog.require('Blockly.utils.deprecation');
 const dom = goog.require('Blockly.utils.dom');
+const eventUtils = goog.require('Blockly.Events.utils');
 const internalConstants = goog.require('Blockly.internalConstants');
 const object = goog.require('Blockly.utils.object');
 const svgPaths = goog.require('Blockly.utils.svgPaths');
@@ -459,13 +459,13 @@ RenderedConnection.prototype.isConnectionAllowed = function(
  */
 RenderedConnection.prototype.onFailedConnect = function(otherConnection) {
   const block = this.getSourceBlock();
-  if (Events.getRecordUndo()) {
-    const group = Events.getGroup();
+  if (eventUtils.getRecordUndo()) {
+    const group = eventUtils.getGroup();
     setTimeout(function() {
       if (!block.isDisposed() && !block.getParent()) {
-        Events.setGroup(group);
+        eventUtils.setGroup(group);
         this.bumpAwayFrom(otherConnection);
-        Events.setGroup(false);
+        eventUtils.setGroup(false);
       }
     }.bind(this), internalConstants.BUMP_DELAY);
   }
diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js
index 04e900c61..770b57a6c 100644
--- a/core/renderers/common/marker_svg.js
+++ b/core/renderers/common/marker_svg.js
@@ -17,7 +17,6 @@ goog.module('Blockly.blockRendering.MarkerSvg');
 const Connection = goog.requireType('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
-const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.Field');
 /* eslint-disable-next-line no-unused-vars */
@@ -28,6 +27,7 @@ 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 eventUtils = goog.require('Blockly.Events.utils');
 const svgPaths = goog.require('Blockly.utils.svgPaths');
 const {ASTNode} = goog.require('Blockly.ASTNode');
 /* eslint-disable-next-line no-unused-vars */
@@ -557,9 +557,9 @@ MarkerSvg.prototype.hide = function() {
  */
 MarkerSvg.prototype.fireMarkerEvent_ = function(oldNode, curNode) {
   const curBlock = curNode.getSourceBlock();
-  const event = new (Events.get(Events.MARKER_MOVE))(
+  const event = new (eventUtils.get(eventUtils.MARKER_MOVE))(
       curBlock, this.isCursor(), oldNode, curNode);
-  Events.fire(event);
+  eventUtils.fire(event);
 };
 
 /**
diff --git a/core/scrollbar_pair.js b/core/scrollbar_pair.js
index 2e79f1f98..f2754700c 100644
--- a/core/scrollbar_pair.js
+++ b/core/scrollbar_pair.js
@@ -12,7 +12,6 @@
 
 goog.module('Blockly.ScrollbarPair');
 
-const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const Metrics = goog.requireType('Blockly.utils.Metrics');
 const Scrollbar = goog.require('Blockly.Scrollbar');
@@ -20,6 +19,7 @@ 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 eventUtils = goog.require('Blockly.Events.utils');
 
 
 /**
@@ -135,7 +135,7 @@ ScrollbarPair.prototype.resize = function() {
 
   if (resizeH || resizeV) {
     try {
-      Events.disable();
+      eventUtils.disable();
       if (this.hScroll && resizeH) {
         this.hScroll.resize(hostMetrics);
       }
@@ -143,7 +143,7 @@ ScrollbarPair.prototype.resize = function() {
         this.vScroll.resize(hostMetrics);
       }
     } finally {
-      Events.enable();
+      eventUtils.enable();
     }
     this.workspace_.maybeFireViewportChangeEvent();
   }
diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
index 33c640f66..1f43fb03b 100644
--- a/core/serialization/blocks.js
+++ b/core/serialization/blocks.js
@@ -16,13 +16,13 @@ goog.module.declareLegacyNamespace();
 const {BadConnectionCheck, MissingBlockType, MissingConnection, RealChildOfShadow} = goog.require('Blockly.serialization.exceptions');
 // eslint-disable-next-line no-unused-vars
 const Connection = goog.requireType('Blockly.Connection');
-const Events = goog.require('Blockly.Events');
 // eslint-disable-next-line no-unused-vars
 const {ISerializer} = goog.require('Blockly.serialization.ISerializer');
 const Size = goog.require('Blockly.utils.Size');
 // eslint-disable-next-line no-unused-vars
 const Workspace = goog.requireType('Blockly.Workspace');
 const Xml = goog.require('Blockly.Xml');
+const eventUtils = goog.require('Blockly.Events.utils');
 const inputTypes = goog.require('Blockly.inputTypes');
 const priorities = goog.require('Blockly.serialization.priorities');
 const serializationRegistry = goog.require('Blockly.serialization.registry');
@@ -328,20 +328,20 @@ const appendInternal = function(
       recordUndo = false
     } = {}
 ) {
-  const prevRecordUndo = Events.getRecordUndo();
-  Events.setRecordUndo(recordUndo);
-  const existingGroup = Events.getGroup();
+  const prevRecordUndo = eventUtils.getRecordUndo();
+  eventUtils.setRecordUndo(recordUndo);
+  const existingGroup = eventUtils.getGroup();
   if (!existingGroup) {
-    Events.setGroup(true);
+    eventUtils.setGroup(true);
   }
-  Events.disable();
+  eventUtils.disable();
 
   const block = appendPrivate(state, workspace, {parentConnection, isShadow});
 
-  Events.enable();
-  Events.fire(new (Events.get(Events.BLOCK_CREATE))(block));
-  Events.setGroup(existingGroup);
-  Events.setRecordUndo(prevRecordUndo);
+  eventUtils.enable();
+  eventUtils.fire(new (eventUtils.get(eventUtils.BLOCK_CREATE))(block));
+  eventUtils.setGroup(existingGroup);
+  eventUtils.setRecordUndo(prevRecordUndo);
 
   // Adding connections to the connection db is expensive. This defers that
   // operation to decrease load time.
@@ -672,7 +672,7 @@ class BlockSerializer {
   load(state, workspace) {
     const blockStates = state['blocks'];
     for (const state of blockStates) {
-      append(state, workspace, {recordUndo: Events.getRecordUndo()});
+      append(state, workspace, {recordUndo: eventUtils.getRecordUndo()});
     }
   }
 
diff --git a/core/serialization/workspaces.js b/core/serialization/workspaces.js
index 2c180099b..25598116e 100644
--- a/core/serialization/workspaces.js
+++ b/core/serialization/workspaces.js
@@ -13,10 +13,10 @@
 goog.module('Blockly.serialization.workspaces');
 goog.module.declareLegacyNamespace();
  
-const Events = goog.require('Blockly.Events');
 // eslint-disable-next-line no-unused-vars
 const Workspace = goog.require('Blockly.Workspace');
 const dom = goog.require('Blockly.utils.dom');
+const eventUtils = goog.require('Blockly.Events.utils');
 const registry = goog.require('Blockly.registry');
  
 
@@ -57,11 +57,11 @@ const load = function(state, workspace, {recordUndo = false} = {}) {
       .sort(([, {priority: priorityA}], [, {priority: priorityB}]) =>
         priorityB - priorityA);
 
-  const prevRecordUndo = Events.getRecordUndo();
-  Events.setRecordUndo(recordUndo);
-  const existingGroup = Events.getGroup();
+  const prevRecordUndo = eventUtils.getRecordUndo();
+  eventUtils.setRecordUndo(recordUndo);
+  const existingGroup = eventUtils.getGroup();
   if (!existingGroup) {
-    Events.setGroup(true);
+    eventUtils.setGroup(true);
   }
 
   dom.startTextWidthCache();
@@ -89,9 +89,9 @@ const load = function(state, workspace, {recordUndo = false} = {}) {
   }
   dom.stopTextWidthCache();
 
-  Events.fire(new (Events.get(Events.FINISHED_LOADING))(workspace));
+  eventUtils.fire(new (eventUtils.get(eventUtils.FINISHED_LOADING))(workspace));
 
-  Events.setGroup(existingGroup);
-  Events.setRecordUndo(prevRecordUndo);
+  eventUtils.setGroup(existingGroup);
+  eventUtils.setRecordUndo(prevRecordUndo);
 };
 exports.load = load;
diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index 347b06ad0..9062766a7 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -18,7 +18,6 @@ const CollapsibleToolboxCategory = goog.require('Blockly.CollapsibleToolboxCateg
 const ComponentManager = goog.require('Blockly.ComponentManager');
 const Css = goog.require('Blockly.Css');
 const DeleteArea = goog.require('Blockly.DeleteArea');
-const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const IAutoHideable = goog.requireType('Blockly.IAutoHideable');
 /* eslint-disable-next-line no-unused-vars */
@@ -46,8 +45,9 @@ const Touch = goog.require('Blockly.Touch');
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const aria = goog.require('Blockly.utils.aria');
 const browserEvents = goog.require('Blockly.browserEvents');
-const dom = goog.require('Blockly.utils.dom');
 const common = goog.require('Blockly.common');
+const dom = goog.require('Blockly.utils.dom');
+const eventUtils = goog.require('Blockly.Events.utils');
 const keyCodes = goog.require('Blockly.utils.KeyCodes');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
@@ -988,9 +988,9 @@ Toolbox.prototype.fireSelectEvent_ = function(oldItem, newItem) {
   if (oldItem == newItem) {
     newElement = null;
   }
-  const event = new (Events.get(Events.TOOLBOX_ITEM_SELECT))(
+  const event = new (eventUtils.get(eventUtils.TOOLBOX_ITEM_SELECT))(
       oldElement, newElement, this.workspace_.id);
-  Events.fire(event);
+  eventUtils.fire(event);
 };
 
 /**
diff --git a/core/trashcan.js b/core/trashcan.js
index bebc5569d..36c59edbc 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -18,7 +18,6 @@ const Abstract = goog.requireType('Blockly.Events.Abstract');
 const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
 const ComponentManager = goog.require('Blockly.ComponentManager');
 const DeleteArea = goog.require('Blockly.DeleteArea');
-const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const IAutoHideable = goog.requireType('Blockly.IAutoHideable');
 /* eslint-disable-next-line no-unused-vars */
@@ -39,6 +38,7 @@ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const blocks = goog.requireType('Blockly.serialization.blocks');
 const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
+const eventUtils = goog.require('Blockly.Events.utils');
 const internalConstants = goog.require('Blockly.internalConstants');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
@@ -627,8 +627,8 @@ Trashcan.prototype.click = function() {
  */
 Trashcan.prototype.fireUiEvent_ = function(trashcanOpen) {
   const uiEvent =
-      new (Events.get(Events.TRASHCAN_OPEN))(trashcanOpen, this.workspace_.id);
-  Events.fire(uiEvent);
+      new (eventUtils.get(eventUtils.TRASHCAN_OPEN))(trashcanOpen, this.workspace_.id);
+  eventUtils.fire(uiEvent);
 };
 
 /**
@@ -672,7 +672,7 @@ Trashcan.prototype.onDelete_ = function(event) {
   if (this.workspace_.options.maxTrashcanContents <= 0) {
     return;
   }
-  if (event.type == Events.BLOCK_DELETE && !event.wasShadow) {
+  if (event.type == eventUtils.BLOCK_DELETE && !event.wasShadow) {
     const cleanedJson = this.cleanBlockJson_(event.oldJson);
     if (this.contents_.indexOf(cleanedJson) != -1) {
       return;
diff --git a/core/variable_map.js b/core/variable_map.js
index fb831d293..d0a69e6c8 100644
--- a/core/variable_map.js
+++ b/core/variable_map.js
@@ -12,13 +12,13 @@
 
 goog.module('Blockly.VariableMap');
 
-const Events = goog.require('Blockly.Events');
 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 */
 const Workspace = goog.requireType('Blockly.Workspace');
 const dialog = goog.require('Blockly.dialog');
+const eventUtils = goog.require('Blockly.Events.utils');
 const idGenerator = goog.require('Blockly.utils.idGenerator');
 const object = goog.require('Blockly.utils.object');
 const utils = goog.require('Blockly.utils');
@@ -73,7 +73,7 @@ VariableMap.prototype.renameVariable = function(variable, newName) {
   const type = variable.type;
   const conflictVar = this.getVariable(newName, type);
   const blocks = this.workspace.getAllBlocks(false);
-  Events.setGroup(true);
+  eventUtils.setGroup(true);
   try {
     // The IDs may match if the rename is a simple case change (name1 -> Name1).
     if (!conflictVar || conflictVar.getId() == variable.getId()) {
@@ -82,7 +82,7 @@ VariableMap.prototype.renameVariable = function(variable, newName) {
       this.renameVariableWithConflict_(variable, newName, conflictVar, blocks);
     }
   } finally {
-    Events.setGroup(false);
+    eventUtils.setGroup(false);
   }
 };
 
@@ -112,7 +112,7 @@ VariableMap.prototype.renameVariableById = function(id, newName) {
  */
 VariableMap.prototype.renameVariableAndUses_ = function(
     variable, newName, blocks) {
-  Events.fire(new (Events.get(Events.VAR_RENAME))(variable, newName));
+  eventUtils.fire(new (eventUtils.get(eventUtils.VAR_RENAME))(variable, newName));
   variable.name = newName;
   for (let i = 0; i < blocks.length; i++) {
     blocks[i].updateVarName(variable);
@@ -149,7 +149,7 @@ VariableMap.prototype.renameVariableWithConflict_ = function(
   }
 
   // Finally delete the original variable, which is now unreferenced.
-  Events.fire(new (Events.get(Events.VAR_DELETE))(variable));
+  eventUtils.fire(new (eventUtils.get(eventUtils.VAR_DELETE))(variable));
   // And remove it from the list.
   utils.arrayRemove(this.variableMap_[type], variable);
 };
@@ -210,7 +210,7 @@ VariableMap.prototype.deleteVariable = function(variable) {
     const tempVar = variableList[i];
     if (tempVar.getId() == variableId) {
       variableList.splice(i, 1);
-      Events.fire(new (Events.get(Events.VAR_DELETE))(variable));
+      eventUtils.fire(new (eventUtils.get(eventUtils.VAR_DELETE))(variable));
       return;
     }
   }
@@ -267,9 +267,9 @@ VariableMap.prototype.deleteVariableById = function(id) {
  * @package
  */
 VariableMap.prototype.deleteVariableInternal = function(variable, uses) {
-  const existingGroup = Events.getGroup();
+  const existingGroup = eventUtils.getGroup();
   if (!existingGroup) {
-    Events.setGroup(true);
+    eventUtils.setGroup(true);
   }
   try {
     for (let i = 0; i < uses.length; i++) {
@@ -278,7 +278,7 @@ VariableMap.prototype.deleteVariableInternal = function(variable, uses) {
     this.deleteVariable(variable);
   } finally {
     if (!existingGroup) {
-      Events.setGroup(false);
+      eventUtils.setGroup(false);
     }
   }
 };
diff --git a/core/variable_model.js b/core/variable_model.js
index dcded7131..150ac98fd 100644
--- a/core/variable_model.js
+++ b/core/variable_model.js
@@ -12,9 +12,9 @@
 
 goog.module('Blockly.VariableModel');
 
-const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
+const eventUtils = goog.require('Blockly.Events.utils');
 const idGenerator = goog.require('Blockly.utils.idGenerator');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.VarCreate');
@@ -66,7 +66,7 @@ const VariableModel = function(workspace, name, opt_type, opt_id) {
    */
   this.id_ = opt_id || idGenerator.genUid();
 
-  Events.fire(new (Events.get(Events.VAR_CREATE))(this));
+  eventUtils.fire(new (eventUtils.get(eventUtils.VAR_CREATE))(this));
 };
 
 /**
diff --git a/core/warning.js b/core/warning.js
index bf137f8d5..b3495e2b7 100644
--- a/core/warning.js
+++ b/core/warning.js
@@ -15,10 +15,10 @@ goog.module('Blockly.Warning');
 const Bubble = goog.require('Blockly.Bubble');
 /* eslint-disable-next-line no-unused-vars */
 const Coordinate = goog.requireType('Blockly.utils.Coordinate');
-const Events = goog.require('Blockly.Events');
 const Icon = goog.require('Blockly.Icon');
 const Svg = goog.require('Blockly.utils.Svg');
 const dom = goog.require('Blockly.utils.dom');
+const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
@@ -89,8 +89,8 @@ Warning.prototype.setVisible = function(visible) {
   if (visible == this.isVisible()) {
     return;
   }
-  Events.fire(
-      new (Events.get(Events.BUBBLE_OPEN))(this.block_, visible, 'warning'));
+  eventUtils.fire(
+      new (eventUtils.get(eventUtils.BUBBLE_OPEN))(this.block_, visible, 'warning'));
   if (visible) {
     this.createBubble_();
   } else {
diff --git a/core/workspace.js b/core/workspace.js
index dc2d26efc..5a739761a 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -18,7 +18,6 @@ const Abstract = goog.requireType('Blockly.Events.Abstract');
 const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
 /* eslint-disable-next-line no-unused-vars */
 const ConnectionDB = goog.requireType('Blockly.ConnectionDB');
-const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const IASTNodeLocation = goog.requireType('Blockly.IASTNodeLocation');
 /* eslint-disable-next-line no-unused-vars */
@@ -30,6 +29,7 @@ const VariableModel = goog.requireType('Blockly.VariableModel');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment');
 const idGenerator = goog.require('Blockly.utils.idGenerator');
+const eventUtils = goog.require('Blockly.Events.utils');
 const math = goog.require('Blockly.utils.math');
 const registry = goog.require('Blockly.registry');
 /* eslint-disable-next-line no-unused-vars */
@@ -379,9 +379,9 @@ Workspace.prototype.getAllBlocks = function(ordered) {
 Workspace.prototype.clear = function() {
   this.isClearing = true;
   try {
-    const existingGroup = Events.getGroup();
+    const existingGroup = eventUtils.getGroup();
     if (!existingGroup) {
-      Events.setGroup(true);
+      eventUtils.setGroup(true);
     }
     while (this.topBlocks_.length) {
       this.topBlocks_[0].dispose(false);
@@ -390,7 +390,7 @@ Workspace.prototype.clear = function() {
       this.topComments_[this.topComments_.length - 1].dispose();
     }
     if (!existingGroup) {
-      Events.setGroup(false);
+      eventUtils.setGroup(false);
     }
     this.variableMap_.clear();
     if (this.potentialVariableMap_) {
@@ -634,15 +634,15 @@ Workspace.prototype.undo = function(redo) {
     const event = events[i];
     outputStack.push(event);
   }
-  events = Events.filter(events, redo);
-  Events.setRecordUndo(false);
+  events = eventUtils.filter(events, redo);
+  eventUtils.setRecordUndo(false);
   try {
     for (let i = 0; i < events.length; i++) {
       const event = events[i];
       event.run(redo);
     }
   } finally {
-    Events.setRecordUndo(true);
+    eventUtils.setRecordUndo(true);
   }
 };
 
@@ -653,7 +653,7 @@ Workspace.prototype.clearUndo = function() {
   this.undoStack_.length = 0;
   this.redoStack_.length = 0;
   // Stop any events already in the firing queue from being undoable.
-  Events.clearPendingUndo();
+  eventUtils.clearPendingUndo();
 };
 
 /**
diff --git a/core/workspace_comment.js b/core/workspace_comment.js
index a2a2aecaf..362132bd8 100644
--- a/core/workspace_comment.js
+++ b/core/workspace_comment.js
@@ -13,10 +13,10 @@
 goog.module('Blockly.WorkspaceComment');
 
 const Coordinate = goog.require('Blockly.utils.Coordinate');
-const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
 const idGenerator = goog.require('Blockly.utils.idGenerator');
+const eventUtils = goog.require('Blockly.Events.utils');
 const xml = goog.require('Blockly.utils.xml');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.CommentChange');
@@ -128,8 +128,8 @@ WorkspaceComment.prototype.dispose = function() {
     return;
   }
 
-  if (Events.isEnabled()) {
-    Events.fire(new (Events.get(Events.COMMENT_DELETE))(this));
+  if (eventUtils.isEnabled()) {
+    eventUtils.fire(new (eventUtils.get(eventUtils.COMMENT_DELETE))(this));
   }
 
   // Remove from the list of top comments and the comment database.
@@ -193,10 +193,10 @@ WorkspaceComment.prototype.getXY = function() {
  * @package
  */
 WorkspaceComment.prototype.moveBy = function(dx, dy) {
-  const event = new (Events.get(Events.COMMENT_MOVE))(this);
+  const event = new (eventUtils.get(eventUtils.COMMENT_MOVE))(this);
   this.xy_.translate(dx, dy);
   event.recordNew();
-  Events.fire(event);
+  eventUtils.fire(event);
 };
 
 /**
@@ -268,8 +268,8 @@ WorkspaceComment.prototype.getContent = function() {
  */
 WorkspaceComment.prototype.setContent = function(content) {
   if (this.content_ != content) {
-    Events.fire(
-        new (Events.get(Events.COMMENT_CHANGE))(this, this.content_, content));
+    eventUtils.fire(
+        new (eventUtils.get(eventUtils.COMMENT_CHANGE))(this, this.content_, content));
     this.content_ = content;
   }
 };
@@ -312,16 +312,16 @@ WorkspaceComment.prototype.toXml = function(opt_noId) {
  * @package
  */
 WorkspaceComment.fireCreateEvent = function(comment) {
-  if (Events.isEnabled()) {
-    const existingGroup = Events.getGroup();
+  if (eventUtils.isEnabled()) {
+    const existingGroup = eventUtils.getGroup();
     if (!existingGroup) {
-      Events.setGroup(true);
+      eventUtils.setGroup(true);
     }
     try {
-      Events.fire(new (Events.get(Events.COMMENT_CREATE))(comment));
+      eventUtils.fire(new (eventUtils.get(eventUtils.COMMENT_CREATE))(comment));
     } finally {
       if (!existingGroup) {
-        Events.setGroup(false);
+        eventUtils.setGroup(false);
       }
     }
   }
diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 1e8172948..d21820c1f 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -15,7 +15,6 @@ goog.module('Blockly.WorkspaceCommentSvg');
 const ContextMenu = goog.require('Blockly.ContextMenu');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Css = goog.require('Blockly.Css');
-const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const IBoundedElement = goog.requireType('Blockly.IBoundedElement');
 /* eslint-disable-next-line no-unused-vars */
@@ -31,6 +30,7 @@ const WorkspaceComment = goog.require('Blockly.WorkspaceComment');
 const browserEvents = goog.require('Blockly.browserEvents');
 const common = goog.require('Blockly.common');
 const dom = goog.require('Blockly.utils.dom');
+const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const utils = goog.require('Blockly.utils');
 /* eslint-disable-next-line no-unused-vars */
@@ -171,17 +171,17 @@ WorkspaceCommentSvg.prototype.dispose = function() {
     this.workspace.cancelCurrentGesture();
   }
 
-  if (Events.isEnabled()) {
-    Events.fire(new (Events.get(Events.COMMENT_DELETE))(this));
+  if (eventUtils.isEnabled()) {
+    eventUtils.fire(new (eventUtils.get(eventUtils.COMMENT_DELETE))(this));
   }
 
   dom.removeNode(this.svgGroup_);
   // Dispose of any rendered components
   this.disposeInternal_();
 
-  Events.disable();
+  eventUtils.disable();
   WorkspaceCommentSvg.superClass_.dispose.call(this);
-  Events.enable();
+  eventUtils.enable();
 };
 
 /**
@@ -260,16 +260,16 @@ WorkspaceCommentSvg.prototype.select = function() {
   if (common.getSelected()) {
     oldId = common.getSelected().id;
     // Unselect any previously selected block.
-    Events.disable();
+    eventUtils.disable();
     try {
       common.getSelected().unselect();
     } finally {
-      Events.enable();
+      eventUtils.enable();
     }
   }
   const event =
-      new (Events.get(Events.SELECTED))(oldId, this.id, this.workspace.id);
-  Events.fire(event);
+      new (eventUtils.get(eventUtils.SELECTED))(oldId, this.id, this.workspace.id);
+  eventUtils.fire(event);
   common.setSelected(this);
   this.addSelect();
 };
@@ -283,8 +283,8 @@ WorkspaceCommentSvg.prototype.unselect = function() {
     return;
   }
   const event =
-      new (Events.get(Events.SELECTED))(this.id, null, this.workspace.id);
-  Events.fire(event);
+      new (eventUtils.get(eventUtils.SELECTED))(this.id, null, this.workspace.id);
+  eventUtils.fire(event);
   common.setSelected(null);
   this.removeSelect();
   this.blurFocus();
@@ -376,13 +376,13 @@ WorkspaceCommentSvg.prototype.getRelativeToSurfaceXY = function() {
  * @package
  */
 WorkspaceCommentSvg.prototype.moveBy = function(dx, dy) {
-  const event = new (Events.get(Events.COMMENT_MOVE))(this);
+  const event = new (eventUtils.get(eventUtils.COMMENT_MOVE))(this);
   // TODO: Do I need to look up the relative to surface XY position here?
   const xy = this.getRelativeToSurfaceXY();
   this.translate(xy.x + dx, xy.y + dy);
   this.xy_ = new Coordinate(xy.x + dx, xy.y + dy);
   event.recordNew();
-  Events.fire(event);
+  eventUtils.fire(event);
   this.workspace.resizeContents();
 };
 
@@ -606,7 +606,7 @@ WorkspaceCommentSvg.prototype.setAutoLayout = function(_enable) {
  * @package
  */
 WorkspaceCommentSvg.fromXml = function(xmlComment, workspace, opt_wsWidth) {
-  Events.disable();
+  eventUtils.disable();
   let comment;
   try {
     const info = WorkspaceComment.parseAttributes(xmlComment);
@@ -628,7 +628,7 @@ WorkspaceCommentSvg.fromXml = function(xmlComment, workspace, opt_wsWidth) {
       }
     }
   } finally {
-    Events.enable();
+    eventUtils.enable();
   }
 
   WorkspaceComment.fireCreateEvent(
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 12471ef95..c56602a33 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -21,7 +21,6 @@ const ContextMenu = goog.require('Blockly.ContextMenu');
 const ContextMenuRegistry = goog.require('Blockly.ContextMenuRegistry');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const DropDownDiv = goog.require('Blockly.DropDownDiv');
-const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const FlyoutButton = goog.requireType('Blockly.FlyoutButton');
 const Gesture = goog.require('Blockly.Gesture');
@@ -81,6 +80,7 @@ const blocks = goog.require('Blockly.serialization.blocks');
 const browserEvents = goog.require('Blockly.browserEvents');
 const common = goog.require('Blockly.common');
 const dom = goog.require('Blockly.utils.dom');
+const eventUtils = goog.require('Blockly.Events.utils');
 const internalConstants = goog.require('Blockly.internalConstants');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
@@ -714,8 +714,8 @@ WorkspaceSvg.prototype.refreshTheme = function() {
   }
 
   const event =
-      new (Events.get(Events.THEME_CHANGE))(this.getTheme().name, this.id);
-  Events.fire(event);
+      new (eventUtils.get(eventUtils.THEME_CHANGE))(this.getTheme().name, this.id);
+  eventUtils.fire(event);
 };
 
 /**
@@ -1282,7 +1282,7 @@ WorkspaceSvg.prototype.getParentSvg = function() {
  * @package
  */
 WorkspaceSvg.prototype.maybeFireViewportChangeEvent = function() {
-  if (!Events.isEnabled()) {
+  if (!eventUtils.isEnabled()) {
     return;
   }
   const scale = this.scale;
@@ -1294,12 +1294,12 @@ WorkspaceSvg.prototype.maybeFireViewportChangeEvent = function() {
     // negligible changes in viewport top/left.
     return;
   }
-  const event = new (Events.get(Events.VIEWPORT_CHANGE))(
+  const event = new (eventUtils.get(eventUtils.VIEWPORT_CHANGE))(
       top, left, scale, this.id, this.oldScale_);
   this.oldScale_ = scale;
   this.oldTop_ = top;
   this.oldLeft_ = left;
-  Events.fire(event);
+  eventUtils.fire(event);
 };
 
 /**
@@ -1540,7 +1540,7 @@ WorkspaceSvg.prototype.paste = function(state) {
  * @private
  */
 WorkspaceSvg.prototype.pasteBlock_ = function(xmlBlock, jsonBlock) {
-  Events.disable();
+  eventUtils.disable();
   let block;
   try {
     let blockX;
@@ -1598,10 +1598,10 @@ WorkspaceSvg.prototype.pasteBlock_ = function(xmlBlock, jsonBlock) {
       block.moveTo(new Coordinate(blockX, blockY));
     }
   } finally {
-    Events.enable();
+    eventUtils.enable();
   }
-  if (Events.isEnabled() && !block.isShadow()) {
-    Events.fire(new (Events.get(Events.BLOCK_CREATE))(block));
+  if (eventUtils.isEnabled() && !block.isShadow()) {
+    eventUtils.fire(new (eventUtils.get(eventUtils.BLOCK_CREATE))(block));
   }
   block.select();
 };
@@ -1614,7 +1614,7 @@ WorkspaceSvg.prototype.pasteBlock_ = function(xmlBlock, jsonBlock) {
  *     bundled in.
  */
 WorkspaceSvg.prototype.pasteWorkspaceComment_ = function(xmlComment) {
-  Events.disable();
+  eventUtils.disable();
   let comment;
   try {
     comment = goog.module.get('Blockly.WorkspaceCommentSvg')
@@ -1634,9 +1634,9 @@ WorkspaceSvg.prototype.pasteWorkspaceComment_ = function(xmlComment) {
       comment.moveBy(commentX, commentY);
     }
   } finally {
-    Events.enable();
+    eventUtils.enable();
   }
-  if (Events.isEnabled()) {
+  if (eventUtils.isEnabled()) {
     goog.module.get('Blockly.WorkspaceComment').fireCreateEvent(comment);
   }
   comment.select();
@@ -1938,7 +1938,7 @@ WorkspaceSvg.prototype.getBlocksBoundingBox = function() {
  */
 WorkspaceSvg.prototype.cleanUp = function() {
   this.setResizesEnabled(false);
-  Events.setGroup(true);
+  eventUtils.setGroup(true);
   const topBlocks = this.getTopBlocks(true);
   let cursorY = 0;
   for (let i = 0, block; (block = topBlocks[i]); i++) {
@@ -1951,7 +1951,7 @@ WorkspaceSvg.prototype.cleanUp = function() {
     cursorY = block.getRelativeToSurfaceXY().y + block.getHeightWidth().height +
         this.renderer_.getConstants().MIN_BLOCK_HEIGHT;
   }
-  Events.setGroup(false);
+  eventUtils.setGroup(false);
   this.setResizesEnabled(true);
 };
 
@@ -2171,12 +2171,12 @@ WorkspaceSvg.prototype.zoomToFit = function() {
   // Scale Units: (pixels / workspaceUnit)
   const ratioX = workspaceWidth / blocksWidth;
   const ratioY = workspaceHeight / blocksHeight;
-  Events.disable();
+  eventUtils.disable();
   try {
     this.setScale(Math.min(ratioX, ratioY));
     this.scrollCenter();
   } finally {
-    Events.enable();
+    eventUtils.enable();
   }
   this.maybeFireViewportChangeEvent();
 };
diff --git a/core/xml.js b/core/xml.js
index 19bc142ca..b5c25d06e 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -12,7 +12,6 @@
 
 goog.module('Blockly.Xml');
 
-const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const Connection = goog.requireType('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
@@ -25,6 +24,7 @@ const Workspace = goog.requireType('Blockly.Workspace');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const dom = goog.require('Blockly.utils.dom');
+const eventUtils = goog.require('Blockly.Events.utils');
 const inputTypes = goog.require('Blockly.inputTypes');
 const utilsXml = goog.require('Blockly.utils.xml');
 /* eslint-disable-next-line no-unused-vars */
@@ -423,9 +423,9 @@ const domToWorkspace = function(xml, workspace) {
   }
   const newBlockIds = [];  // A list of block IDs added by this call.
   dom.startTextWidthCache();
-  const existingGroup = Events.getGroup();
+  const existingGroup = eventUtils.getGroup();
   if (!existingGroup) {
-    Events.setGroup(true);
+    eventUtils.setGroup(true);
   }
 
   // Disable workspace resizes as an optimization.
@@ -437,7 +437,7 @@ const domToWorkspace = function(xml, workspace) {
     for (let i = 0, xmlChild; (xmlChild = xml.childNodes[i]); i++) {
       const name = xmlChild.nodeName.toLowerCase();
       const xmlChildElement = /** @type {!Element} */ (xmlChild);
-      if (name == 'block' || (name == 'shadow' && !Events.getRecordUndo())) {
+      if (name == 'block' || (name == 'shadow' && !eventUtils.getRecordUndo())) {
         // Allow top-level shadow blocks if recordUndo is disabled since
         // that means an undo is in progress.  Such a block is expected
         // to be moved to a nested destination in the next operation.
@@ -492,7 +492,7 @@ const domToWorkspace = function(xml, workspace) {
     }
   } finally {
     if (!existingGroup) {
-      Events.setGroup(false);
+      eventUtils.setGroup(false);
     }
     dom.stopTextWidthCache();
   }
@@ -500,7 +500,7 @@ const domToWorkspace = function(xml, workspace) {
   if (workspace.setResizesEnabled) {
     workspace.setResizesEnabled(true);
   }
-  Events.fire(new (Events.get(Events.FINISHED_LOADING))(workspace));
+  eventUtils.fire(new (eventUtils.get(eventUtils.FINISHED_LOADING))(workspace));
   return newBlockIds;
 };
 exports.domToWorkspace = domToWorkspace;
@@ -574,7 +574,7 @@ const domToBlock = function(xmlBlock, workspace) {
         'swap the arguments.');
   }
   // Create top-level block.
-  Events.disable();
+  eventUtils.disable();
   const variablesBeforeCreation = workspace.getAllVariables();
   let topBlock;
   try {
@@ -608,20 +608,20 @@ const domToBlock = function(xmlBlock, workspace) {
       }
     }
   } finally {
-    Events.enable();
+    eventUtils.enable();
   }
-  if (Events.isEnabled()) {
+  if (eventUtils.isEnabled()) {
     const newVariables =
         goog.module.get('Blockly.Variables')
             .getAddedVariables(workspace, variablesBeforeCreation);
     // Fire a VarCreate event for each (if any) new variable created.
     for (let i = 0; i < newVariables.length; i++) {
       const thisVariable = newVariables[i];
-      Events.fire(new (Events.get(Events.VAR_CREATE))(thisVariable));
+      eventUtils.fire(new (eventUtils.get(eventUtils.VAR_CREATE))(thisVariable));
     }
     // Block events come after var events, in case they refer to newly created
     // variables.
-    Events.fire(new (Events.get(Events.CREATE))(topBlock));
+    eventUtils.fire(new (eventUtils.get(eventUtils.CREATE))(topBlock));
   }
   return topBlock;
 };
diff --git a/core/zoom_controls.js b/core/zoom_controls.js
index ec3ddaf42..5ba045f50 100644
--- a/core/zoom_controls.js
+++ b/core/zoom_controls.js
@@ -14,7 +14,6 @@ goog.module('Blockly.ZoomControls');
 
 const ComponentManager = goog.require('Blockly.ComponentManager');
 const Css = goog.require('Blockly.Css');
-const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const IPositionable = goog.requireType('Blockly.IPositionable');
 /* eslint-disable-next-line no-unused-vars */
@@ -27,6 +26,7 @@ const Touch = goog.require('Blockly.Touch');
 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 internalConstants = goog.require('Blockly.internalConstants');
 const uiPosition = goog.require('Blockly.uiPosition');
 /** @suppress {extraRequire} */
@@ -487,8 +487,8 @@ ZoomControls.prototype.resetZoom_ = function(e) {
  */
 ZoomControls.prototype.fireZoomEvent_ = function() {
   const uiEvent =
-      new (Events.get(Events.CLICK))(null, this.workspace_.id, 'zoom_controls');
-  Events.fire(uiEvent);
+      new (eventUtils.get(eventUtils.CLICK))(null, this.workspace_.id, 'zoom_controls');
+  eventUtils.fire(uiEvent);
 };
 
 /**
diff --git a/tests/deps.js b/tests/deps.js
index 892ccb970..6d8e9e4cc 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -7,65 +7,66 @@ goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'],
 goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator'], {'lang': 'es5'});
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
-goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.blocks', 'Blockly.common', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Events.utils', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.blocks', 'Blockly.common', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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.ConnectionType', '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.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.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.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.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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.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.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox', 'Blockly.zelos'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.Events.utils', '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.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', '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.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.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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.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.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', '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'});
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/bump_objects.js', ['Blockly.bumpObjects'], ['Blockly.Events', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events.CommentMove', 'Blockly.Events.utils', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/bump_objects.js', ['Blockly.bumpObjects'], ['Blockly.Events.utils', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events.utils'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Events.utils', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Xml', 'Blockly.constants', 'Blockly.serialization.blocks', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.ConnectionType', 'Blockly.Events.BlockMove', 'Blockly.Events.utils', 'Blockly.Xml', 'Blockly.constants', 'Blockly.serialization.blocks', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.ConnectionType', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_type.js', ['Blockly.ConnectionType'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.dialog', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events.BlockCreate', 'Blockly.Events.utils', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events.utils', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.dialog', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/dialog.js', ['Blockly.dialog'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils.deprecation', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.Events.Abstract', 'Blockly.Events.BlockBase', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.Events.BubbleOpen', 'Blockly.Events.Click', 'Blockly.Events.CommentBase', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.FinishedLoading', 'Blockly.Events.MarkerMove', 'Blockly.Events.Selected', 'Blockly.Events.ThemeChange', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Events.TrashcanOpen', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarBase', 'Blockly.Events.VarCreate', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Events.ViewportChange', 'Blockly.Events.utils', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events.utils'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.BlockBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_comment_base.js', ['Blockly.Events.CommentBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_comment_change.js', ['Blockly.Events.CommentChange'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_comment_create.js', ['Blockly.Events.CommentCreate'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_comment_delete.js', ['Blockly.Events.CommentDelete'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_comment_move.js', ['Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_ui.js', ['Blockly.Events.Ui'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events.BlockBase', 'Blockly.Events.utils', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events.BlockBase', 'Blockly.Events.utils', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events.BlockBase', 'Blockly.Events.utils', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events.UiBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.ConnectionType', 'Blockly.Events.BlockBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events.UiBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events.UiBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_base.js', ['Blockly.Events.CommentBase'], ['Blockly.Events.Abstract', 'Blockly.Events.utils', 'Blockly.Xml', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_change.js', ['Blockly.Events.CommentChange'], ['Blockly.Events.CommentBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_create.js', ['Blockly.Events.CommentCreate'], ['Blockly.Events.CommentBase', 'Blockly.Events.utils', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_delete.js', ['Blockly.Events.CommentDelete'], ['Blockly.Events.CommentBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_move.js', ['Blockly.Events.CommentMove'], ['Blockly.Events.CommentBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events.UiBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events.UiBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events.UiBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events.UiBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events.UiBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_ui.js', ['Blockly.Events.Ui'], ['Blockly.Events.UiBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_ui_base.js', ['Blockly.Events.UiBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_var_base.js', ['Blockly.Events.VarBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_var_create.js', ['Blockly.Events.VarCreate'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.VarDelete'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_create.js', ['Blockly.Events.VarCreate'], ['Blockly.Events.VarBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.VarDelete'], ['Blockly.Events.VarBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.VarRename'], ['Blockly.Events.VarBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events.UiBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/utils.js', ['Blockly.Events.utils'], ['Blockly.registry', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events.Abstract', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Events.utils', 'Blockly.Gesture', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -76,21 +77,21 @@ goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabe
 goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Events.utils', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.Events.utils', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.common', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events.Click', 'Blockly.Events.utils', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.ConnectionType'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.ConnectionType', 'Blockly.Events.utils', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], [], {'lang': 'es6', 'module': 'goog'});
@@ -131,13 +132,13 @@ goog.addDependency('../../core/menu.js', ['Blockly.Menu'], ['Blockly.browserEven
 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.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/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', '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/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', 'Blockly.internalConstants'], {'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'});
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.blocks', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Events.BlockChange', 'Blockly.Events.utils', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.blocks', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events.utils', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.Connection', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Renderer', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.blockRendering.debug', 'Blockly.registry', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/debug.js', ['Blockly.blockRendering.debug'], [], {'lang': 'es6', 'module': 'goog'});
@@ -145,7 +146,7 @@ goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRen
 goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Types', 'Blockly.blockRendering.debug', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.ConnectionType', 'Blockly.Events.MarkerMove', 'Blockly.Events.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.debug', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -201,13 +202,13 @@ goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Ren
 goog.addDependency('../../core/renderers/zelos/zelos.js', ['Blockly.zelos'], ['Blockly.zelos.BottomRow', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo', 'Blockly.zelos.Renderer', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.StatementInput', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.registry', 'Blockly.serialization.variables', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes', 'Blockly.serialization.ISerializer', 'Blockly.serialization.exceptions', 'Blockly.serialization.priorities', 'Blockly.serialization.registry', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events.utils', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events.utils', 'Blockly.Xml', 'Blockly.inputTypes', 'Blockly.serialization.ISerializer', 'Blockly.serialization.exceptions', 'Blockly.serialization.priorities', 'Blockly.serialization.registry', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/exceptions.js', ['Blockly.serialization.exceptions'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/priorities.js', ['Blockly.serialization.priorities'], [], {'module': 'goog'});
 goog.addDependency('../../core/serialization/registry.js', ['Blockly.serialization.registry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.serialization.ISerializer', 'Blockly.serialization.priorities', 'Blockly.serialization.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Events', 'Blockly.Workspace', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Events.utils', 'Blockly.Workspace', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -218,12 +219,12 @@ goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Bl
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Events.utils', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events.TrashcanOpen', 'Blockly.Events.utils', 'Blockly.Options', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], ['Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
@@ -245,20 +246,20 @@ goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'],
 goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.dialog', 'Blockly.utils', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Events.utils', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.dialog', 'Blockly.utils', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events.VarCreate', 'Blockly.Events.utils', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.blocks', 'Blockly.dialog', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.blocks', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events.BubbleOpen', 'Blockly.Events.utils', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.idGenerator', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events.utils', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.idGenerator', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils.Coordinate', 'Blockly.utils.idGenerator', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.idGenerator', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Events.utils', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.common', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.Tooltip', 'Blockly.TouchGesture', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.DropDownDiv', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Events.utils', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.Tooltip', 'Blockly.TouchGesture', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events.utils', 'Blockly.inputTypes', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events.Click', 'Blockly.Events.utils', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);
 
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 7784cd000..23ffa5d68 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -7,65 +7,66 @@ goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'],
 goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator'], {'lang': 'es5'});
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
-goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.blocks', 'Blockly.common', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Events.utils', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.blocks', 'Blockly.common', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 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.ConnectionType', '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.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.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.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.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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.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.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox', 'Blockly.zelos'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.Events.utils', '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.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', '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.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.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.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', '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.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.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', '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'});
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/bump_objects.js', ['Blockly.bumpObjects'], ['Blockly.Events', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events.CommentMove', 'Blockly.Events.utils', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/bump_objects.js', ['Blockly.bumpObjects'], ['Blockly.Events.utils', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events.utils'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Events.utils', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Xml', 'Blockly.constants', 'Blockly.serialization.blocks', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.ConnectionType', 'Blockly.Events.BlockMove', 'Blockly.Events.utils', 'Blockly.Xml', 'Blockly.constants', 'Blockly.serialization.blocks', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.ConnectionType', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_type.js', ['Blockly.ConnectionType'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.dialog', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events.BlockCreate', 'Blockly.Events.utils', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events.utils', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.dialog', 'Blockly.inputTypes', 'Blockly.utils.idGenerator', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/dialog.js', ['Blockly.dialog'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils.deprecation', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.Events.Abstract', 'Blockly.Events.BlockBase', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.Events.BubbleOpen', 'Blockly.Events.Click', 'Blockly.Events.CommentBase', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.FinishedLoading', 'Blockly.Events.MarkerMove', 'Blockly.Events.Selected', 'Blockly.Events.ThemeChange', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Events.TrashcanOpen', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarBase', 'Blockly.Events.VarCreate', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Events.ViewportChange', 'Blockly.Events.utils', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events.utils'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.BlockBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_comment_base.js', ['Blockly.Events.CommentBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_comment_change.js', ['Blockly.Events.CommentChange'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_comment_create.js', ['Blockly.Events.CommentCreate'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_comment_delete.js', ['Blockly.Events.CommentDelete'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_comment_move.js', ['Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.CommentBase', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_ui.js', ['Blockly.Events.Ui'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events.BlockBase', 'Blockly.Events.utils', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events.BlockBase', 'Blockly.Events.utils', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events.BlockBase', 'Blockly.Events.utils', 'Blockly.Xml', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events.UiBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.ConnectionType', 'Blockly.Events.BlockBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events.UiBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events.UiBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_base.js', ['Blockly.Events.CommentBase'], ['Blockly.Events.Abstract', 'Blockly.Events.utils', 'Blockly.Xml', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_change.js', ['Blockly.Events.CommentChange'], ['Blockly.Events.CommentBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_create.js', ['Blockly.Events.CommentCreate'], ['Blockly.Events.CommentBase', 'Blockly.Events.utils', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_delete.js', ['Blockly.Events.CommentDelete'], ['Blockly.Events.CommentBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_comment_move.js', ['Blockly.Events.CommentMove'], ['Blockly.Events.CommentBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events.UiBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events.UiBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events.UiBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events.UiBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events.UiBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_ui.js', ['Blockly.Events.Ui'], ['Blockly.Events.UiBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_ui_base.js', ['Blockly.Events.UiBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_var_base.js', ['Blockly.Events.VarBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_var_create.js', ['Blockly.Events.VarCreate'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.VarDelete'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_create.js', ['Blockly.Events.VarCreate'], ['Blockly.Events.VarBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.VarDelete'], ['Blockly.Events.VarBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.VarRename'], ['Blockly.Events.VarBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events.UiBase', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/utils.js', ['Blockly.Events.utils'], ['Blockly.registry', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events.Abstract', 'Blockly.Events.utils', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Events.utils', 'Blockly.Gesture', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -76,21 +77,21 @@ goog.addDependency('../../core/field_label_serializable.js', ['Blockly.FieldLabe
 goog.addDependency('../../core/field_multilineinput.js', ['Blockly.FieldMultilineInput'], ['Blockly.Css', 'Blockly.Field', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Blockly.FieldTextInput', 'Blockly.fieldRegistry', 'Blockly.utils.aria', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Events.utils', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.Events.utils', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.idGenerator', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_metrics_manager.js', ['Blockly.FlyoutMetricsManager'], ['Blockly.MetricsManager', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.common', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events.Click', 'Blockly.Events.utils', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.ConnectionType'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.ConnectionType', 'Blockly.Events.utils', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], [], {'lang': 'es6', 'module': 'goog'});
@@ -131,13 +132,13 @@ goog.addDependency('../../core/menu.js', ['Blockly.Menu'], ['Blockly.browserEven
 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.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/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', '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/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', 'Blockly.internalConstants'], {'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'});
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.blocks', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Events.BlockChange', 'Blockly.Events.utils', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.blocks', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.Events.utils', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.Connection', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Renderer', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.blockRendering.debug', 'Blockly.registry', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.ConnectionType', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/debug.js', ['Blockly.blockRendering.debug'], [], {'lang': 'es6', 'module': 'goog'});
@@ -145,7 +146,7 @@ goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRen
 goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Types', 'Blockly.blockRendering.debug', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.ConnectionType', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.ConnectionType', 'Blockly.Events.MarkerMove', 'Blockly.Events.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.ConnectionType', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.debug', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -201,13 +202,13 @@ goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Ren
 goog.addDependency('../../core/renderers/zelos/zelos.js', ['Blockly.zelos'], ['Blockly.zelos.BottomRow', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo', 'Blockly.zelos.Renderer', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.StatementInput', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.serialization.blocks', 'Blockly.serialization.registry', 'Blockly.serialization.variables', 'Blockly.serialization.workspaces', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.inputTypes', 'Blockly.serialization.ISerializer', 'Blockly.serialization.exceptions', 'Blockly.serialization.priorities', 'Blockly.serialization.registry', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events.utils', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/blocks.js', ['Blockly.serialization.blocks'], ['Blockly.Events.utils', 'Blockly.Xml', 'Blockly.inputTypes', 'Blockly.serialization.ISerializer', 'Blockly.serialization.exceptions', 'Blockly.serialization.priorities', 'Blockly.serialization.registry', 'Blockly.utils.Size'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/exceptions.js', ['Blockly.serialization.exceptions'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/priorities.js', ['Blockly.serialization.priorities'], [], {'module': 'goog'});
 goog.addDependency('../../core/serialization/registry.js', ['Blockly.serialization.registry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/serialization/variables.js', ['Blockly.serialization.variables'], ['Blockly.serialization.ISerializer', 'Blockly.serialization.priorities', 'Blockly.serialization.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Events', 'Blockly.Workspace', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/serialization/workspaces.js', ['Blockly.serialization.workspaces'], ['Blockly.Events.utils', 'Blockly.Workspace', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.common', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -218,12 +219,12 @@ goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Bl
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Events.utils', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events.TrashcanOpen', 'Blockly.Events.utils', 'Blockly.Options', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.global', 'Blockly.utils.idGenerator', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.svgPaths', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], ['Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
@@ -245,21 +246,21 @@ goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'],
 goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.dialog', 'Blockly.utils', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Events.utils', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.dialog', 'Blockly.utils', 'Blockly.utils.idGenerator', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events.VarCreate', 'Blockly.Events.utils', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.blocks', 'Blockly.dialog', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.blocks', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events.BubbleOpen', 'Blockly.Events.utils', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.common', 'Blockly.utils.deprecation', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.idGenerator', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events.utils', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.idGenerator', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils.Coordinate', 'Blockly.utils.idGenerator', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.idGenerator', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Events.utils', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.common', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.Tooltip', 'Blockly.TouchGesture', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.DropDownDiv', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Events.utils', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.Tooltip', 'Blockly.TouchGesture', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events.utils', 'Blockly.inputTypes', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events.Click', 'Blockly.Events.utils', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../generators/dart.js', ['Blockly.Dart'], ['Blockly.Generator', 'Blockly.inputTypes', 'Blockly.utils.string']);
 goog.addDependency('../../generators/dart/colour.js', ['Blockly.Dart.colour'], ['Blockly.Dart']);
 goog.addDependency('../../generators/dart/lists.js', ['Blockly.Dart.lists'], ['Blockly.Dart']);
@@ -315,7 +316,7 @@ goog.addDependency('../../tests/mocha/astnode_test.js', ['Blockly.test.astNode']
 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'});
-goog.addDependency('../../tests/mocha/block_test.js', ['Blockly.test.blocks'], ['Blockly.blocks', 'Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/block_test.js', ['Blockly.test.blocks'], ['Blockly.Events.utils', 'Blockly.blocks', 'Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/comment_test.js', ['Blockly.test.comments'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/connection_checker_test.js', ['Blockly.test.connectionChecker'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/connection_db_test.js', ['Blockly.test.connectionDb'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
@@ -323,7 +324,7 @@ goog.addDependency('../../tests/mocha/connection_test.js', ['Blockly.test.connec
 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.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.ASTNode', 'Blockly.WorkspaceComment', 'Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/event_test.js', ['Blockly.test.event'], ['Blockly.ASTNode', 'Blockly.Events.utils', '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'});
@@ -347,7 +348,7 @@ goog.addDependency('../../tests/mocha/jso_deserialization_test.js', ['Blockly.te
 goog.addDependency('../../tests/mocha/jso_serialization_test.js', ['Blockly.test.jsoSerialization'], ['Blockly.test.helpers'], {'lang': 'es8', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/json_test.js', ['Blockly.test.json'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/keydown_test.js', ['Blockly.test.keydown'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/logic_ternary_test.js', ['Blockly.test.logicTernary'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/logic_ternary_test.js', ['Blockly.test.logicTernary'], ['Blockly.Events.utils', 'Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/metrics_test.js', ['Blockly.test.metrics'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/mutator_test.js', ['Blockly.test.mutator'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/names_test.js', ['Blockly.test.names'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
@@ -357,19 +358,19 @@ goog.addDependency('../../tests/mocha/registry_test.js', ['Blockly.test.registry
 goog.addDependency('../../tests/mocha/run_mocha_tests_in_browser.js', [], [], {'lang': 'es8'});
 goog.addDependency('../../tests/mocha/serializer_test.js', ['Blockly.test.serialization'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/shortcut_registry_test.js', ['Blockly.test.shortcutRegistry'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/test_helpers.js', ['Blockly.test.helpers'], ['Blockly.blocks', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/test_helpers.js', ['Blockly.test.helpers'], ['Blockly.Events.utils', 'Blockly.blocks', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/theme_test.js', ['Blockly.test.theme'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/toolbox_helper.js', ['Blockly.test.toolboxHelpers'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/toolbox_test.js', ['Blockly.test.toolbox'], ['Blockly.test.helpers', 'Blockly.test.toolboxHelpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/tooltip_test.js', ['Blockly.test.tooltip'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/trashcan_test.js', ['Blockly.test.trashcan'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/trashcan_test.js', ['Blockly.test.trashcan'], ['Blockly.Events.utils', 'Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/utils_test.js', ['Blockly.test.utils'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/variable_map_test.js', ['Blockly.test.variableMap'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/variable_model_test.js', ['Blockly.test.variableModel'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/variables_test.js', ['Blockly.test.variables'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/widget_div_test.js', ['Blockly.test.widgetDiv'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/workspace_comment_test.js', ['Blockly.test.workspaceComment'], ['Blockly.WorkspaceComment', 'Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/workspace_helpers.js', ['Blockly.test.workspaceHelpers'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/workspace_helpers.js', ['Blockly.test.workspaceHelpers'], ['Blockly.Events.utils', 'Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/workspace_svg_test.js', ['Blockly.test.workspaceSvg'], ['Blockly.test.helpers', 'Blockly.test.workspaceHelpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/workspace_test.js', ['Blockly.test.workspace'], ['Blockly.test.helpers', 'Blockly.test.workspaceHelpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/xml_test.js', ['Blockly.test.xml'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/block_test.js b/tests/mocha/block_test.js
index 26f4eda52..04c205e9d 100644
--- a/tests/mocha/block_test.js
+++ b/tests/mocha/block_test.js
@@ -6,6 +6,7 @@
 
 goog.module('Blockly.test.blocks');
 
+const eventUtils = goog.require('Blockly.Events.utils');
 const {Blocks} = goog.require('Blockly.blocks');
 const {createDeprecationWarningStub, createRenderedBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
 
@@ -1082,7 +1083,7 @@ suite('Blocks', function() {
       function assertCommentEvent(eventSpy, oldValue, newValue) {
         var calls = eventSpy.getCalls();
         var event = calls[calls.length - 1].args[0];
-        chai.assert.equal(event.type, Blockly.Events.BLOCK_CHANGE);
+        chai.assert.equal(event.type, eventUtils.BLOCK_CHANGE);
         chai.assert.equal(event.element, 'comment');
         chai.assert.equal(event.oldValue, oldValue);
         chai.assert.equal(event.newValue, newValue);
@@ -1090,10 +1091,10 @@ suite('Blocks', function() {
       function assertNoCommentEvent(eventSpy) {
         var calls = eventSpy.getCalls();
         var event = calls[calls.length - 1].args[0];
-        chai.assert.notEqual(event.type, Blockly.Events.BLOCK_CHANGE);
+        chai.assert.notEqual(event.type, eventUtils.BLOCK_CHANGE);
       }
       setup(function() {
-        this.eventsFireSpy = sinon.spy(Blockly.Events, 'fire');
+        this.eventsFireSpy = sinon.spy(eventUtils, 'fire');
       });
       teardown(function() {
         this.eventsFireSpy.restore();
@@ -1364,7 +1365,7 @@ suite('Blocks', function() {
     }
 
     setup(function() {
-      Blockly.Events.disable();
+      eventUtils.disable();
       // We need a visible workspace.
       this.workspace = Blockly.inject('blocklyDiv', {});
       Blockly.defineBlocksWithJsonArray([
@@ -1382,7 +1383,7 @@ suite('Blocks', function() {
       ]);
     });
     teardown(function() {
-      Blockly.Events.enable();
+      eventUtils.enable();
       workspaceTeardown.call(this, this.workspace);
     });
     suite('Connecting and Disconnecting', function() {
@@ -1988,7 +1989,7 @@ suite('Blocks', function() {
       var recordUndoDuringInit;
       Blocks['init_test_block'].init = function() {
         initCalled = true;
-        recordUndoDuringInit = Blockly.Events.getRecordUndo();
+        recordUndoDuringInit = eventUtils.getRecordUndo();
         throw new Error();
       };
       chai.assert.throws(function() {
@@ -1996,7 +1997,7 @@ suite('Blocks', function() {
       }.bind(this));
       chai.assert.isFalse(recordUndoDuringInit,
           'recordUndo should be false during block init function');
-      chai.assert.isTrue(Blockly.Events.getRecordUndo(),
+      chai.assert.isTrue(eventUtils.getRecordUndo(),
           'recordUndo should be reset to true after init');
       chai.assert.isTrue(initCalled, 'expected init function to be called');
     });
diff --git a/tests/mocha/comment_test.js b/tests/mocha/comment_test.js
index f156ca136..32f7c6b89 100644
--- a/tests/mocha/comment_test.js
+++ b/tests/mocha/comment_test.js
@@ -6,7 +6,7 @@
 
 goog.module('Blockly.test.comments');
 
-const {assertEventFired, createDeprecationWarningStub, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+const {assertEventFired, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
 
 
 suite('Comments', function() {
diff --git a/tests/mocha/event_test.js b/tests/mocha/event_test.js
index 1f0117024..26f1f29f0 100644
--- a/tests/mocha/event_test.js
+++ b/tests/mocha/event_test.js
@@ -6,6 +6,7 @@
 
 goog.module('Blockly.test.event');
 
+const eventUtils = goog.require('Blockly.Events.utils');
 const {assertEventEquals, assertNthCallEventArgEquals, assertVariableValues, createFireChangeListenerSpy, createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
 const {ASTNode} = goog.require('Blockly.ASTNode');
 goog.require('Blockly.WorkspaceComment');
@@ -14,7 +15,7 @@ goog.require('Blockly.WorkspaceComment');
 suite('Events', function() {
   setup(function() {
     sharedTestSetup.call(this, {fireEventsNow: false});
-    this.eventsFireSpy = sinon.spy(Blockly.Events, 'fire');
+    this.eventsFireSpy = sinon.spy(eventUtils, 'fire');
     this.workspace = new Blockly.Workspace();
     Blockly.defineBlocksWithJsonArray([{
       'type': 'field_variable_test_block',
@@ -41,15 +42,15 @@ suite('Events', function() {
     // Disable events while constructing the block: this is a test of the
     // Blockly.Event constructors, not the block constructors.
     // Set the group id to avoid an extra call to genUid.
-    Blockly.Events.disable();
+    eventUtils.disable();
     try {
-      Blockly.Events.setGroup('unused');
+      eventUtils.setGroup('unused');
       var block = new Blockly.Block(
           workspace, 'simple_test_block');
     } finally {
-      Blockly.Events.setGroup(false);
+      eventUtils.setGroup(false);
     }
-    Blockly.Events.enable();
+    eventUtils.enable();
     return block;
   }
 
@@ -81,7 +82,7 @@ suite('Events', function() {
 
     test('Old UI event without block', function() {
       var TEST_GROUP_ID = 'testGroup';
-      Blockly.Events.setGroup(TEST_GROUP_ID);
+      eventUtils.setGroup(TEST_GROUP_ID);
       var event = new Blockly.Events.Ui(null, 'foo', 'bar', 'baz');
       assertEventEquals(event, Blockly.Events.UI, '', null, {
         'element': 'foo',
@@ -138,7 +139,7 @@ suite('Events', function() {
 
       test('Old UI event with block', function() {
         var TEST_GROUP_ID = 'testGroup';
-        Blockly.Events.setGroup(TEST_GROUP_ID);
+        eventUtils.setGroup(TEST_GROUP_ID);
         var event = new Blockly.Events.Ui(this.block, 'foo', 'bar', 'baz');
         sinon.assert.calledOnce(this.genUidStub);
         assertEventEquals(event, Blockly.Events.UI, this.workspace.id,
@@ -154,7 +155,7 @@ suite('Events', function() {
 
       test('Click with block', function() {
         var TEST_GROUP_ID = 'testGroup';
-        Blockly.Events.setGroup(TEST_GROUP_ID);
+        eventUtils.setGroup(TEST_GROUP_ID);
         var event = new Blockly.Events.Click(this.block, null, 'block');
         assertEventEquals(event, Blockly.Events.CLICK, this.workspace.id,
             this.TEST_BLOCK_ID, {
@@ -716,7 +717,7 @@ suite('Events', function() {
       test('Var create', function() {
         var json = {type: "var_create", varId: "id2", varType: "type2",
           varName: "name2"};
-        var event = Blockly.Events.fromJson(json, this.workspace);
+        var event = eventUtils.fromJson(json, this.workspace);
         var x = this.workspace.getVariableById('id2');
         chai.assert.isNull(x);
         event.run(true);
@@ -747,7 +748,7 @@ suite('Events', function() {
       test('Var delete', function() {
         var json = {type: "var_delete", varId: "id2", varType: "type2",
           varName: "name2"};
-        var event = Blockly.Events.fromJson(json, this.workspace);
+        var event = eventUtils.fromJson(json, this.workspace);
         chai.assert.isNull(this.workspace.getVariableById('id2'));
         event.run(false);
         assertVariableValues(this.workspace, 'name2', 'type2', 'id2');
@@ -783,7 +784,7 @@ suite('Events', function() {
         new Blockly.Events.BlockChange(block, 'field', 'VAR', 'id1', 'id2'),
         new Blockly.Events.Click(block)
       ];
-      var filteredEvents = Blockly.Events.filter(events, true);
+      var filteredEvents = eventUtils.filter(events, true);
       chai.assert.equal(filteredEvents.length, 4);  // no event should have been removed.
       // test that the order hasn't changed
       chai.assert.isTrue(filteredEvents[0] instanceof Blockly.Events.BlockCreate);
@@ -801,7 +802,7 @@ suite('Events', function() {
         new Blockly.Events.BlockCreate(block2),
         new Blockly.Events.BlockMove(block2)
       ];
-      var filteredEvents = Blockly.Events.filter(events, true);
+      var filteredEvents = eventUtils.filter(events, true);
       chai.assert.equal(filteredEvents.length, 4);  // no event should have been removed.
     });
 
@@ -811,7 +812,7 @@ suite('Events', function() {
       addMoveEvent(events, block, 1, 1);
       addMoveEvent(events, block, 2, 2);
       addMoveEvent(events, block, 3, 3);
-      var filteredEvents = Blockly.Events.filter(events, true);
+      var filteredEvents = eventUtils.filter(events, true);
       chai.assert.equal(filteredEvents.length, 2);  // duplicate moves should have been removed.
       // test that the order hasn't changed
       chai.assert.isTrue(filteredEvents[0] instanceof Blockly.Events.BlockCreate);
@@ -826,7 +827,7 @@ suite('Events', function() {
       addMoveEvent(events, block, 1, 1);
       addMoveEvent(events, block, 2, 2);
       addMoveEvent(events, block, 3, 3);
-      var filteredEvents = Blockly.Events.filter(events, false);
+      var filteredEvents = eventUtils.filter(events, false);
       chai.assert.equal(filteredEvents.length, 2);  // duplicate event should have been removed.
       // test that the order hasn't changed
       chai.assert.isTrue(filteredEvents[0] instanceof Blockly.Events.BlockCreate);
@@ -840,7 +841,7 @@ suite('Events', function() {
       var events = [];
       addMoveEvent(events, block, 0, 0);
       addMoveEvent(events, block, 1, 1);
-      var filteredEvents = Blockly.Events.filter(events, true);
+      var filteredEvents = eventUtils.filter(events, true);
       chai.assert.equal(filteredEvents.length, 1);  // second move event merged into first
       chai.assert.equal(filteredEvents[0].newCoordinate.x, 1);
       chai.assert.equal(filteredEvents[0].newCoordinate.y, 1);
@@ -852,7 +853,7 @@ suite('Events', function() {
         new Blockly.Events.BlockChange(block1, 'field', 'VAR', 'item', 'item1'),
         new Blockly.Events.BlockChange(block1, 'field', 'VAR', 'item1', 'item2')
       ];
-      var filteredEvents = Blockly.Events.filter(events, true);
+      var filteredEvents = eventUtils.filter(events, true);
       chai.assert.equal(filteredEvents.length, 1);  // second change event merged into first
       chai.assert.equal(filteredEvents[0].oldValue, 'item');
       chai.assert.equal(filteredEvents[0].newValue, 'item2');
@@ -863,7 +864,7 @@ suite('Events', function() {
         new Blockly.Events.ViewportChange(1, 2, 3, this.workspace, 4),
         new Blockly.Events.ViewportChange(5, 6, 7, this.workspace, 8)
       ];
-      var filteredEvents = Blockly.Events.filter(events, true);
+      var filteredEvents = eventUtils.filter(events, true);
       chai.assert.equal(filteredEvents.length, 1);  // second change event merged into first
       chai.assert.equal(filteredEvents[0].viewTop, 5);
       chai.assert.equal(filteredEvents[0].viewLeft, 6);
@@ -883,7 +884,7 @@ suite('Events', function() {
         new Blockly.Events.BubbleOpen(block3, true, 'warning'),
         new Blockly.Events.Click(block3)
       ];
-      var filteredEvents = Blockly.Events.filter(events, true);
+      var filteredEvents = eventUtils.filter(events, true);
       // click event merged into corresponding *Open event
       chai.assert.equal(filteredEvents.length, 3);
       chai.assert.isTrue(filteredEvents[0] instanceof Blockly.Events.BubbleOpen);
@@ -902,7 +903,7 @@ suite('Events', function() {
         new Blockly.Events.Click(block),
         new Blockly.Events.Ui(block, 'stackclick', undefined, undefined)
       ];
-      var filteredEvents = Blockly.Events.filter(events, true);
+      var filteredEvents = eventUtils.filter(events, true);
       // click and stackclick should both exist
       chai.assert.equal(filteredEvents.length, 2);
       chai.assert.isTrue(filteredEvents[0] instanceof Blockly.Events.Click);
@@ -922,7 +923,7 @@ suite('Events', function() {
       var events = [];
       addMoveEventParent(events, block, null);
       addMoveEventParent(events, block, null);
-      var filteredEvents = Blockly.Events.filter(events, true);
+      var filteredEvents = eventUtils.filter(events, true);
       // The two events should be merged, but because nothing has changed
       // they will be filtered out.
       chai.assert.equal(filteredEvents.length, 0);
@@ -943,7 +944,7 @@ suite('Events', function() {
       events.push(new Blockly.Events.BlockDelete(block2));
       addMoveEvent(events, block1, 2, 2);
 
-      var filteredEvents = Blockly.Events.filter(events, true);
+      var filteredEvents = eventUtils.filter(events, true);
       // Nothing should have merged.
       chai.assert.equal(filteredEvents.length, 4);
       // test that the order hasn't changed
@@ -1099,7 +1100,7 @@ suite('Events', function() {
       workspaceTeardown.call(this, this.workspace);
     });
     test('Created orphan block is disabled', function() {
-      this.workspace.addChangeListener(Blockly.Events.disableOrphans);
+      this.workspace.addChangeListener(eventUtils.disableOrphans);
       var block = this.workspace.newBlock('controls_for');
       block.initSvg();
       block.render();
@@ -1111,7 +1112,7 @@ suite('Events', function() {
           'Expected orphan block to be disabled after creation');
     });
     test('Created procedure block is enabled', function() {
-      this.workspace.addChangeListener(Blockly.Events.disableOrphans);
+      this.workspace.addChangeListener(eventUtils.disableOrphans);
 
       // Procedure block is never an orphan
       var functionBlock = this.workspace.newBlock('procedures_defnoreturn');
@@ -1125,7 +1126,7 @@ suite('Events', function() {
           'Expected top-level procedure block to be enabled');
     });
     test('Moving a block to top-level disables it', function() {
-      this.workspace.addChangeListener(Blockly.Events.disableOrphans);
+      this.workspace.addChangeListener(eventUtils.disableOrphans);
       var functionBlock = this.workspace.newBlock('procedures_defnoreturn');
       functionBlock.initSvg();
       functionBlock.render();
@@ -1147,7 +1148,7 @@ suite('Events', function() {
           'Expected disconnected block to be disabled');
     });
     test('Giving block a parent enables it', function() {
-      this.workspace.addChangeListener(Blockly.Events.disableOrphans);
+      this.workspace.addChangeListener(eventUtils.disableOrphans);
       var functionBlock = this.workspace.newBlock('procedures_defnoreturn');
       functionBlock.initSvg();
       functionBlock.render();
@@ -1166,7 +1167,7 @@ suite('Events', function() {
           'Expected block to be enabled after connecting to parent');
     });
     test('disableOrphans events are not undoable', function() {
-      this.workspace.addChangeListener(Blockly.Events.disableOrphans);
+      this.workspace.addChangeListener(eventUtils.disableOrphans);
       var functionBlock = this.workspace.newBlock('procedures_defnoreturn');
       functionBlock.initSvg();
       functionBlock.render();
diff --git a/tests/mocha/logic_ternary_test.js b/tests/mocha/logic_ternary_test.js
index 763db44f3..b25b12362 100644
--- a/tests/mocha/logic_ternary_test.js
+++ b/tests/mocha/logic_ternary_test.js
@@ -7,6 +7,7 @@
 goog.module('Blockly.test.logicTernary');
 
 const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
+const eventUtils = goog.require('Blockly.Events.utils');
 
 
 suite('Logic ternary', function() {
@@ -78,7 +79,7 @@ suite('Logic ternary', function() {
     function connectParentAndCheckConnections(
         block, parent, parentInputName, opt_thenInput, opt_elseInput) {
       parent.getInput(parentInputName).connection.connect(block.outputConnection);
-      Blockly.Events.TEST_ONLY.fireNow();  // Force synchronous onchange() call.
+      eventUtils.TEST_ONLY.fireNow();  // Force synchronous onchange() call.
       chai.assert.equal(block.getParent(), parent,
           'Successful connection to parent');
       if (opt_thenInput) {
@@ -93,7 +94,7 @@ suite('Logic ternary', function() {
     function connectThenInputAndCheckConnections(
         block, thenInput, opt_elseInput, opt_parent) {
       block.getInput('THEN').connection.connect(thenInput.outputConnection);
-      Blockly.Events.TEST_ONLY.fireNow();  // Force synchronous onchange() call.
+      eventUtils.TEST_ONLY.fireNow();  // Force synchronous onchange() call.
       chai.assert.equal(thenInput.getParent(), block, 'THEN is connected');
       if (opt_parent) {
         chai.assert.equal(block.getParent(), opt_parent,
@@ -107,7 +108,7 @@ suite('Logic ternary', function() {
     function connectElseInputAndCheckConnections(
         block, elseInput, opt_thenInput, opt_parent) {
       block.getInput('ELSE').connection.connect(elseInput.outputConnection);
-      Blockly.Events.TEST_ONLY.fireNow();  // Force synchronous onchange() call.
+      eventUtils.TEST_ONLY.fireNow();  // Force synchronous onchange() call.
       chai.assert.equal(elseInput.getParent(), block, 'ELSE is connected');
       if (opt_parent) {
         chai.assert.equal(block.getParent(), opt_parent,
diff --git a/tests/mocha/test_helpers.js b/tests/mocha/test_helpers.js
index b5f044d14..7f4245070 100644
--- a/tests/mocha/test_helpers.js
+++ b/tests/mocha/test_helpers.js
@@ -7,6 +7,7 @@
 goog.module('Blockly.test.helpers');
 
 const KeyCodes = goog.require('Blockly.utils.KeyCodes');
+const eventUtils = goog.require('Blockly.Events.utils');
 const {Blocks} = goog.require('Blockly.blocks');
 
 
@@ -114,7 +115,7 @@ exports.workspaceTeardown = workspaceTeardown;
  * @private
  */
 function createEventsFireStubFireImmediately_(clock) {
-  var stub = sinon.stub(Blockly.Events, 'fire');
+  var stub = sinon.stub(eventUtils, 'fire');
   stub.callsFake(function(event) {
     // Call original method.
     stub.wrappedMethod.call(this, ...arguments);
@@ -230,16 +231,16 @@ function sharedTestTeardown() {
     console.error(testRef.fullTitle() + '\n', e);
   } finally {
     // Clear Blockly.Event state.
-    Blockly.Events.setGroup(false);
-    while (!Blockly.Events.isEnabled()) {
-      Blockly.Events.enable();
+    eventUtils.setGroup(false);
+    while (!eventUtils.isEnabled()) {
+      eventUtils.enable();
     }
-    Blockly.Events.setRecordUndo(true);
-    if (Blockly.Events.TEST_ONLY.FIRE_QUEUE.length) {
+    eventUtils.setRecordUndo(true);
+    if (eventUtils.TEST_ONLY.FIRE_QUEUE.length) {
       // If this happens, it may mean that some previous test is missing cleanup
       // (i.e. a previous test added an event to the queue on a timeout that
       // did not use a stubbed clock).
-      Blockly.Events.TEST_ONLY.FIRE_QUEUE.length = 0;
+      eventUtils.TEST_ONLY.FIRE_QUEUE.length = 0;
       console.warn('"' + testRef.fullTitle() +
           '" needed cleanup of Blockly.Events.TEST_ONLY.FIRE_QUEUE. This may ' +
           'indicate leakage from an earlier test');
diff --git a/tests/mocha/trashcan_test.js b/tests/mocha/trashcan_test.js
index ec3076502..f24022740 100644
--- a/tests/mocha/trashcan_test.js
+++ b/tests/mocha/trashcan_test.js
@@ -7,6 +7,7 @@
 goog.module('Blockly.test.trashcan');
 
 const {assertEventFired, assertEventNotFired, defineBasicBlockWithField, defineRowBlock, defineStatementBlock, defineStackBlock, defineMutatorBlocks, sharedTestSetup, sharedTestTeardown, simulateClick} = goog.require('Blockly.test.helpers');
+const eventUtils = goog.require('Blockly.Events.utils');
 
 
 suite("Trashcan", function() {
@@ -17,7 +18,7 @@ suite("Trashcan", function() {
     xml = xml.children[0];
     var block = Blockly.Xml.domToBlock(xml, workspace);
     var event = new Blockly.Events.BlockDelete(block);
-    Blockly.Events.fire(event);
+    eventUtils.fire(event);
   }
   function fireNonDeleteEvent(workspace, oldXml) {
     var event = new Blockly.Events.Abstract();
@@ -26,7 +27,7 @@ suite("Trashcan", function() {
     if (oldXml) {
       event.oldXml = oldXml;
     }
-    Blockly.Events.fire(/** @type {Blockly.Events.Abstract} */ event);
+    eventUtils.fire(/** @type {Blockly.Events.Abstract} */ event);
   }
 
   setup(function() {
diff --git a/tests/mocha/workspace_helpers.js b/tests/mocha/workspace_helpers.js
index 9d4abea4e..72134e386 100644
--- a/tests/mocha/workspace_helpers.js
+++ b/tests/mocha/workspace_helpers.js
@@ -7,6 +7,7 @@
 goog.module('Blockly.test.workspaceHelpers');
 
 const {assertVariableValues, assertWarnings, workspaceTeardown} = goog.require('Blockly.test.helpers');
+const eventUtils = goog.require('Blockly.Events.utils');
 
 
 function testAWorkspace() {
@@ -26,8 +27,10 @@ function testAWorkspace() {
 
   teardown(function() {
     // Clear Blockly.Event state.
-    Blockly.Events.setGroup(false);
-    Blockly.Events.disabled_ = 0;
+    eventUtils.setGroup(false);
+    while (!eventUtils.isEnabled()) {
+      eventUtils.enable();
+    }
     sinon.restore();
   });
 
@@ -45,19 +48,19 @@ function testAWorkspace() {
   function createVarBlocksNoEvents(workspace, ids) {
     var blocks = [];
     // Turn off events to avoid testing XML at the same time.
-    Blockly.Events.disable();
+    eventUtils.disable();
     for (var i = 0, id; (id = ids[i]); i++) {
       var block = new Blockly.Block(workspace, 'get_var_block');
       block.inputList[0].fieldRow[0].setValue(id);
       blocks.push(block);
     }
-    Blockly.Events.enable();
+    eventUtils.enable();
     return blocks;
   }
 
   suite('clear', function() {
     test('Trivial', function() {
-      sinon.stub(Blockly.Events, "setGroup").returns(null);
+      sinon.stub(eventUtils, "setGroup").returns(null);
       this.workspace.createVariable('name1', 'type1', 'id1');
       this.workspace.createVariable('name2', 'type2', 'id2');
       this.workspace.newBlock('');
@@ -70,7 +73,7 @@ function testAWorkspace() {
     });
 
     test('No variables', function() {
-      sinon.stub(Blockly.Events, "setGroup").returns(null);
+      sinon.stub(eventUtils, "setGroup").returns(null);
       this.workspace.newBlock('');
 
       this.workspace.clear();

From a598751d48600525cb44da8cc1f51793363f136c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 23 Sep 2021 16:20:31 -0700
Subject: [PATCH 832/833] Fix typo in alias

---
 core/widgetdiv.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/widgetdiv.js b/core/widgetdiv.js
index 571cfe277..cfacd2f04 100644
--- a/core/widgetdiv.js
+++ b/core/widgetdiv.js
@@ -114,7 +114,7 @@ exports.createDom = createDom;
  * @param {boolean} rtl Right-to-left (true) or left-to-right (false).
  * @param {Function} newDispose Optional cleanup function to be run when the
  *     widget is closed.
- * @alias Blocky.WidgetDiv.show
+ * @alias Blockly.WidgetDiv.show
  */
 const show = function(newOwner, rtl, newDispose) {
   hide();

From 06a41de61e776a64b4ef7cff727aed679d1ce6f5 Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Mon, 27 Sep 2021 17:51:59 +0100
Subject: [PATCH 833/833] fix: Add hack to copy accessors to global Blockly
 namespace object (#5536)

Ugly, but it works.
---
 core/blockly.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/core/blockly.js b/core/blockly.js
index a02835e1a..c39ae3e79 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -159,6 +159,7 @@ const {BlockSvg} = goog.require('Blockly.BlockSvg');
 const {Blocks} = goog.require('Blockly.blocks');
 const {ConnectionType} = goog.require('Blockly.ConnectionType');
 const {Cursor} = goog.require('Blockly.Cursor');
+const {globalThis} = goog.require('Blockly.utils.global');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
 /** @suppress {extraRequire} */
@@ -673,3 +674,20 @@ exports.thrasos = thrasos;
 exports.uiPosition = uiPosition;
 exports.utils = utils;
 exports.zelos = zelos;
+
+// 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
+// declareLegacyNamespace only copies normal data properties, not
+// accessors.  This can be removed once all remaining calls to
+// declareLegacyNamspace have been removed.
+if (globalThis.Blockly && typeof globalThis.Blockly === 'object') {
+  const descriptors = Object.getOwnPropertyDescriptors(exports);
+  const accessors = {};
+  for (const key in descriptors) {
+    if (descriptors[key].get || descriptors[key].set) {
+      accessors[key] = descriptors[key];
+    }
+  }
+  Object.defineProperties(globalThis.Blockly, accessors);
+}